@adhdev/daemon-core 1.0.22 → 1.0.23-rc.1

package/dist/providers/sdk/v1/builders/cli/detect-status.d.ts

@@ -76,17 +76,29 @@ declare function scopeText(input: CliStatusInput, scope: SpinnerSpec['scope'] |
 declare function spinnerMatches(spec: SpinnerSpec, input: CliStatusInput): boolean;
 declare function settledPromptMatches(spec: SettledPromptSpec, input: CliStatusInput): boolean;
 /**
- * APPROVAL-PICKER-MISROUTE (mission f1d25e11) defense-in-depth: an
+ * APPROVAL-PICKER-MISROUTE (mission f1d25e11 / fb2a7053) defense-in-depth: an
  * AskUserQuestion multi-choice picker is NOT an approval modal. Its option rows
  * ("❯ 1. label") can otherwise satisfy the approval button cue and get
  * mis-classified as `waiting_approval`, so the worker's question is surfaced to
  * the coordinator as a task_approval_needed (→ mesh_approve, which cannot answer
- * it). The picker carries a distinctive signature the approval FSM never does:
- * the claude TUI select footer ("Enter to select … Esc to cancel") together with
- * the freeform escape hatch ("Type something" / "Chat about this"). When both are
- * present the screen is a question picker — surfaced separately as
- * waiting_choice — so the approval matchers must yield. Mirrors the legacy
- * looksLikeSelectionPicker guard (cli-provider-instance.ts) ported to SDK-v1.
+ * it), with no promptId for mesh_answer_question.
+ *
+ * The picker's distinguishing signature is its footer: the claude TUI select
+ * hints "Enter to select" AND "Esc to cancel". A genuine tool-consent approval
+ * modal (Yes/No/Allow/Deny) NEVER renders that footer pair — it uses the ordinary
+ * "? for shortcuts" prompt line instead — so the footer alone reliably separates
+ * the two even though BOTH draw numbered option rows.
+ *
+ * The original guard additionally required the freeform escape hatch ("Type
+ * something" / "Chat about this"). That made the guard collapse whenever the
+ * escape-hatch rows were absent or scrolled out of the captured frame: the
+ * picker then fell through to the approval matchers → waiting_approval. The
+ * escape hatch is therefore DOWNGRADED from a required signal to an optional
+ * supporting one: the guard now fires on the select footer plus at least one
+ * numbered option row (which every picker draws), and the escape hatch merely
+ * reinforces an already-matching footer. The numbered-row requirement keeps a
+ * bare "Enter to select" string (e.g. inside prose) from being mistaken for a
+ * picker.
  */
 export declare function isAskUserQuestionPickerSignature(text: string): boolean;
 declare function modalMatches(spec: ModalSpec, input: CliStatusInput): boolean;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adhdev/daemon-core",
-  "version": "1.0.22",
+  "version": "1.0.23-rc.1",
   "description": "ADHDev daemon core — CDP, IDE detection, providers, command execution",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -47,8 +47,8 @@
   "author": "vilmire",
   "license": "AGPL-3.0-or-later",
   "dependencies": {
-    "@adhdev/mesh-shared": "*",
-    "@adhdev/session-host-core": "*",
+    "@adhdev/mesh-shared": "1.0.23-rc.1",
+    "@adhdev/session-host-core": "1.0.23-rc.1",
     "@agentclientprotocol/sdk": "^0.16.1",
     "ajv": "^8.20.0",
     "ajv-formats": "^3.0.1",

package/src/commands/high-family/mesh-coordinator-launch.ts

@@ -17,6 +17,7 @@ import { registerMeshCoordinator } from '../../mesh/coordinator-registry.js';
 import { partitionSessionHostRecords } from '../../session-host/runtime-surface.js';
 import { createHermesManualMeshCoordinatorSetup, resolveMeshCoordinatorSetup } from '../mesh-coordinator.js';
 import { normalizeMeshNodeId } from '@adhdev/mesh-shared';
+import { delegatedWorkerAutoApproveSettings } from '../../repo-mesh-types.js';
 import {
     readProviderPriorityFromPolicy,
     resolveProviderTypeFromPriority,
@@ -429,7 +430,25 @@ export const meshCoordinatorLaunchHandlers: Record<string, HighFamilyHandler> =
                             dir: workspace,
                             cliArgs: cliCmdArgs.length > 0 ? cliCmdArgs : undefined,
                             env: Object.keys(cliCmdEnv).length > 0 ? cliCmdEnv : undefined,
-                            settings: { meshCoordinatorFor: meshId },
+                            settings: {
+                                meshCoordinatorFor: meshId,
+                                // AUTOAPPROVE-COORD: the coordinator is a mesh session too, so it
+                                // must inherit the workspace's declarative auto-approve MODE
+                                // (.adhdev/mesh.json providerDefaults.autoApproveModes) exactly like
+                                // a delegated worker does at dispatch. Reuse the already-loaded repo
+                                // config so the launch args carry --permission-mode. NB: we deliberately
+                                // do NOT stamp launchedByCoordinator here — that flag is a WORKER-only
+                                // dangerous-mode downgrade signal (auto-approve-modes.ts); the coordinator
+                                // is the owner, not a worker. The dangerous gate is already applied inside
+                                // delegatedWorkerAutoApproveSettings via mesh/node policy.
+                                ...delegatedWorkerAutoApproveSettings(
+                                    effectiveMesh?.policy,
+                                    coordinatorNode?.policy,
+                                    providerMeta,
+                                    repoMeshConfigLoad.config,
+                                    cliType,
+                                ),
+                            },
                             ...(initialModel ? { initialModel } : {}),
                             ...(initialThinkingLevel ? { initialThinkingLevel } : {}),
                         });
@@ -650,7 +669,17 @@ export const meshCoordinatorLaunchHandlers: Record<string, HighFamilyHandler> =
                         cliArgs: cliArgs.length > 0 ? cliArgs : undefined,
                         env: Object.keys(launchEnv).length > 0 ? launchEnv : undefined,
                         settings: {
-                            meshCoordinatorFor: meshId
+                            meshCoordinatorFor: meshId,
+                            // AUTOAPPROVE-COORD: inherit the workspace declarative auto-approve MODE
+                            // for the coordinator session (see the cli_command branch for the full
+                            // rationale). No launchedByCoordinator stamp — the coordinator is the owner.
+                            ...delegatedWorkerAutoApproveSettings(
+                                effectiveMesh?.policy,
+                                coordinatorNode?.policy,
+                                providerMeta,
+                                repoMeshConfigLoad.config,
+                                cliType,
+                            ),
                         },
                         ...(initialModel ? { initialModel } : {}),
                         ...(initialThinkingLevel ? { initialThinkingLevel } : {}),

package/src/providers/sdk/v1/builders/cli/detect-status.ts

@@ -204,30 +204,50 @@ function extractButtonLabels(spec: ModalSpec, text: string): string[] {
  * an assistant enumeration lacks that pair and does not fire the cue.
  */
 function buttonBlockApprovalCue(spec: ModalSpec, text: string): boolean {
+  // Defense-in-depth (mission fb2a7053): even if some caller reaches here on a
+  // question picker, its "Enter to select"/"Esc to cancel" footer marks it as a
+  // choice, not an approval — never derive an approval cue from picker rows.
+  if (/Enter to select/i.test(text) && /Esc to cancel/i.test(text)) return false;
   const labels = extractButtonLabels(spec, text);
   if (labels.length < 2) return false;
   if (pickApprovalButton(labels).index < 0) return false;
   return hasNegativeApprovalOption(labels);
 }
 
+// A claude-cli AskUserQuestion picker option row: an optional cursor / checkbox
+// followed by a "N." number marker. The picker draws AT LEAST one such row.
+const PICKER_OPTION_ROW = /^\s*(?:[❯›>]\s*)?(?:\[[ xX]\]|[☐☒◻◼]\s*)?\d+[.)]\s+\S/m;
+
 /**
- * APPROVAL-PICKER-MISROUTE (mission f1d25e11) defense-in-depth: an
+ * APPROVAL-PICKER-MISROUTE (mission f1d25e11 / fb2a7053) defense-in-depth: an
  * AskUserQuestion multi-choice picker is NOT an approval modal. Its option rows
  * ("❯ 1. label") can otherwise satisfy the approval button cue and get
  * mis-classified as `waiting_approval`, so the worker's question is surfaced to
  * the coordinator as a task_approval_needed (→ mesh_approve, which cannot answer
- * it). The picker carries a distinctive signature the approval FSM never does:
- * the claude TUI select footer ("Enter to select … Esc to cancel") together with
- * the freeform escape hatch ("Type something" / "Chat about this"). When both are
- * present the screen is a question picker — surfaced separately as
- * waiting_choice — so the approval matchers must yield. Mirrors the legacy
- * looksLikeSelectionPicker guard (cli-provider-instance.ts) ported to SDK-v1.
+ * it), with no promptId for mesh_answer_question.
+ *
+ * The picker's distinguishing signature is its footer: the claude TUI select
+ * hints "Enter to select" AND "Esc to cancel". A genuine tool-consent approval
+ * modal (Yes/No/Allow/Deny) NEVER renders that footer pair — it uses the ordinary
+ * "? for shortcuts" prompt line instead — so the footer alone reliably separates
+ * the two even though BOTH draw numbered option rows.
+ *
+ * The original guard additionally required the freeform escape hatch ("Type
+ * something" / "Chat about this"). That made the guard collapse whenever the
+ * escape-hatch rows were absent or scrolled out of the captured frame: the
+ * picker then fell through to the approval matchers → waiting_approval. The
+ * escape hatch is therefore DOWNGRADED from a required signal to an optional
+ * supporting one: the guard now fires on the select footer plus at least one
+ * numbered option row (which every picker draws), and the escape hatch merely
+ * reinforces an already-matching footer. The numbered-row requirement keeps a
+ * bare "Enter to select" string (e.g. inside prose) from being mistaken for a
+ * picker.
  */
 export function isAskUserQuestionPickerSignature(text: string): boolean {
   if (!text) return false;
   const hasSelectFooter = /Enter to select/i.test(text) && /Esc to cancel/i.test(text);
   if (!hasSelectFooter) return false;
-  return /Type something\.?|Chat about this/i.test(text);
+  return PICKER_OPTION_ROW.test(text);
 }
 
 function modalMatches(spec: ModalSpec, input: CliStatusInput): boolean {

package/src/providers/sdk/v1/builders/cli/parse-approval.ts

@@ -78,20 +78,30 @@ function compile(re: string, flags?: string): RegExp {
   }
 }
 
+// See detect-status.PICKER_OPTION_ROW — kept in lockstep so both layers gate on
+// the identical picker signature.
+const PICKER_OPTION_ROW = /^\s*(?:[❯›>]\s*)?(?:\[[ xX]\]|[☐☒◻◼]\s*)?\d+[.)]\s+\S/m;
+
 /**
- * APPROVAL-PICKER-MISROUTE (mission f1d25e11) defense-in-depth: mirror
+ * APPROVAL-PICKER-MISROUTE (mission f1d25e11 / fb2a7053) defense-in-depth: mirror
  * detect-status.isAskUserQuestionPickerSignature at the button-parse layer. A
  * multi-choice AskUserQuestion picker is not an approval modal; its numbered
  * option rows can otherwise be extracted as approval buttons and produce a
- * spurious approval modal. When the picker signature (claude TUI select footer +
- * "Type something"/"Chat about this" freeform escape hatch) is present, return
- * null early so the screen is surfaced as waiting_choice, never approval.
+ * spurious approval modal.
+ *
+ * The picker signature is the claude TUI select footer ("Enter to select" +
+ * "Esc to cancel") plus at least one numbered option row. A genuine approval
+ * modal never renders that footer pair, so it is safe even though approval modals
+ * also draw numbered rows. The freeform escape hatch ("Type something" / "Chat
+ * about this") used to be REQUIRED here too, which broke the guard whenever the
+ * hatch rows were absent or scrolled out of frame; it is now downgraded to an
+ * optional supporting signal (mirrors detect-status).
  */
 function isAskUserQuestionPickerSignature(text: string): boolean {
   if (!text) return false;
   const hasSelectFooter = /Enter to select/i.test(text) && /Esc to cancel/i.test(text);
   if (!hasSelectFooter) return false;
-  return /Type something\.?|Chat about this/i.test(text);
+  return PICKER_OPTION_ROW.test(text);
 }
 
 function findQuestionLineIndex(

package/src/providers/types/interactive-prompt.ts

@@ -303,8 +303,15 @@ function readClaudeOptionDescription(lines: string[], optionLineIndex: number):
 }
 
 function parseClaudeHeaderlessInteractiveTuiQuestion(page: ClaudeInteractiveTuiPage, index: number): InteractiveQuestion | null {
+  // The claude TUI select footer ("Enter to select" + "Esc to cancel") is the
+  // picker's defining signature. The freeform escape hatch ("Type something" /
+  // "Chat about this") used to be REQUIRED here, but those option rows can be
+  // absent or scrolled out of the captured frame — in which case the picker
+  // failed to parse, activeInteractivePrompt stayed null, and detect-status
+  // then mis-classified the screen as waiting_approval (mission fb2a7053).
+  // Requiring only the footer plus (below) a real option block is sufficient;
+  // the escape hatch, when present, is still picked up as allowFreeform.
   if (!isClaudeTuiSelectFooter(page.screenText)) return null;
-  if (!/Type something\.?|Chat about this/i.test(page.screenText)) return null;
 
   const lines = page.screenText.split(/\r?\n/);
   let footerIndex = -1;