Merge remote-tracking branch 'origin/master' into fix/subagent-empty-terminal-message-output

packages/subagent/subagent-acp/src/index.ts

@@ -42,7 +42,7 @@ export interface Config {
   /**
    * How to auto-answer the child's `session/request_permission` prompts:
    * `reject` (default — decline every prompt) or `allow` (approve via the first
-   * allow-shaped option). No prompt is surfaced to a human.
+   * `allow_once` or `allow_always` option). No prompt is surfaced to a human.
    */
   permission: PermissionPolicy
   /**

packages/subagent/subagent-acp/src/run.ts

@@ -251,8 +251,8 @@ export async function startAcpRun(request: SubagentStartRequest, spec: AcpRunSpe
       return Promise.resolve()
     },
     requestPermission(params: RequestPermissionRequest): Promise<RequestPermissionResponse> {
-      // Auto-answer by the configured policy. `allow` selects the first
-      // allow-shaped option the child offered; if it offered none (or we
+      // Auto-answer by the configured policy. `allow` selects the first option
+      // whose kind is `allow_once` or `allow_always`; if the child offered none (or we
       // reject), answer `cancelled` so the child does not proceed.
       if (spec.permission === 'allow') {
         const allow = params.options.find(o => o.kind === 'allow_once' || o.kind === 'allow_always')