Merge branch 'replatform/tauri-shell' into cx/openwork-tauri-pr2

Author: yiliang114

integration-tests/cli/_daemon-harness.ts

@@ -340,9 +340,8 @@ export function startRssPolling(pid: number, intervalMs = 100): RssPoller {
  * `qwen --acp` process between the daemon-facing ACP child and stdio MCP
  * servers.
  *
- * `pgrepOpts.acpFilter` defaults to `'qwen.*--acp'` (matches the spawned
- * `qwen --acp` child); pass an override only if a future bridge changes
- * the ACP child invocation shape.
+ * `pgrepOpts.acpFilter` defaults to matching the `--acp` argument; pass an
+ * override only if a future bridge changes the ACP child invocation shape.
  *
  * Returns explicit PID arrays so callers can cross-check (e.g., assert
  * the ACP child PID matches what the test setup observed). `total` is
@@ -358,7 +357,8 @@ export function countDescendants(
   daemonPid: number,
   pgrepOpts: { acpFilter?: string; mcpFilter?: string } = {},
 ): DescendantCount {
-  const acpFilter = pgrepOpts.acpFilter ?? 'qwen.*--acp';
+  const acpFilter =
+    pgrepOpts.acpFilter ?? '(^|[[:space:]])--acp([[:space:]]|$)';
   const acpChildren = pgrepChildren(daemonPid, acpFilter);
   const mcpGrandchildren: number[] = [];
   for (const acpPid of acpChildren) {

integration-tests/cli/qwen-serve-streaming.test.ts

@@ -60,6 +60,7 @@ import {
   startFakeOpenAIServer,
   type FakeOpenAIServer,
 } from '../fake-openai-server.js';
+import { countDescendants } from './_daemon-harness.js';
 
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
 const REPO_ROOT = path.resolve(__dirname, '../..');
@@ -395,13 +396,7 @@ describePOSIX('qwen serve — child-crash recovery (real SIGKILL)', () => {
       workspaceCwd: workspaceDir,
     });
 
-    // Find the daemon's direct `--acp` child PID.
-    const childPids = execSync(`pgrep -P ${daemon.pid} -f "qwen.*--acp"`, {
-      encoding: 'utf8',
-    })
-      .trim()
-      .split('\n')
-      .filter(Boolean);
+    const childPids = countDescendants(daemon.pid!).acpChildren;
     expect(childPids.length).toBeGreaterThanOrEqual(1);
 
     const ac = new AbortController();