fix(agents): always force synthetic operator client for in-process subagent dispatch

xiaobao-k8s · xiaobao-k8s · commit cd202ae99a47 · 2026-07-10T10:53:58.000+08:00
When in-process subagent Gateway dispatch omitted forceSyntheticClient for non-admin methods (e.g. "agent"), the call could inherit the caller's channel-plugin client, which may not carry operator.write (#98614). Always force the synthetic operator client for in-process dispatch so scope resolution does not depend on the calling channel plugin's client scopes. Closes #98614
diff --git a/src/agents/subagent-spawn.test.ts b/src/agents/subagent-spawn.test.ts
@@ -346,6 +346,7 @@ describe("spawnSubagentDirect seam flow", () => {
         sessionKey: result.childSessionKey,
       }),
       expect.objectContaining({
+        forceSyntheticClient: true,
         timeoutMs: expect.any(Number),
       }),
     );
diff --git a/src/agents/subagent-spawn.ts b/src/agents/subagent-spawn.ts
@@ -241,9 +241,12 @@ async function callSubagentGateway(
   // scope-upgrade handshake that headless gateway-client connections cannot
   // complete interactively, causing close(1008) "pairing required" (#59428).
   //
+  // In-process dispatch always uses a synthetic operator client so that scope
+  // resolution does not depend on the calling channel plugin's client scopes.
   // Only admin-requiring calls are pinned to ADMIN_SCOPE; other methods (e.g.
-  // "agent" -> write) keep their least-privilege scope. The params-aware
-  // resolver keeps spawn-metadata sessions.patch calls on the admin tier.
+  // "agent" -> write) keep the synthetic client's least-privilege default.
+  // The params-aware resolver keeps spawn-metadata sessions.patch calls on the
+  // admin tier.
   const leastPrivilegeScopes = resolveLeastPrivilegeOperatorScopesForMethod(
     params.method,
     params.params,
@@ -267,7 +270,7 @@ async function callSubagentGateway(
       request.params as Record<string, unknown>,
       {
         expectFinal: request.expectFinal,
-        ...(scopes != null ? { forceSyntheticClient: true } : {}),
+        forceSyntheticClient: true,
         ...(typeof request.timeoutMs === "number" ? { timeoutMs: request.timeoutMs } : {}),
         ...(scopes != null ? { syntheticScopes: scopes } : {}),
       },
