@adhdev/daemon-core 1.0.18-rc.15 → 1.0.18-rc.17

package/src/providers/auto-approve-modes.ts

@@ -0,0 +1,97 @@
+import type {
+  AutoApproveMode,
+  AutoApproveModeRisk,
+  AutoApproveModeStrategy,
+  ProviderModule,
+} from './contracts.js';
+
+const KNOWN_DANGEROUS_LAUNCH_ARGS = new Set([
+  '--dangerously-skip-permissions',
+  '--dangerously-bypass-approvals-and-sandbox',
+  'bypassPermissions',
+  'sandbox_mode=danger-full-access',
+  'approval_policy=never',
+]);
+
+export interface ResolvedAutoApproveMode {
+  active: boolean;
+  strategy: AutoApproveModeStrategy;
+  modeId: string;
+}
+
+function isKnownDangerousLaunchArg(arg: string): boolean {
+  const normalized = arg.trim();
+  if (KNOWN_DANGEROUS_LAUNCH_ARGS.has(normalized)) return true;
+  return normalized.startsWith('--dangerously-skip-permissions=')
+    || normalized.startsWith('--dangerously-bypass-approvals-and-sandbox=');
+}
+
+/** Runtime defense-in-depth for provider definitions that bypass schema validation. */
+export function deriveAutoApproveModeRisk(mode: Pick<AutoApproveMode, 'risk' | 'launchArgs'>): AutoApproveModeRisk {
+  return Array.isArray(mode.launchArgs) && mode.launchArgs.some(isKnownDangerousLaunchArg)
+    ? 'dangerous'
+    : mode.risk;
+}
+
+function inactiveMode(modeId = ''): ResolvedAutoApproveMode {
+  return { active: false, strategy: 'pty-parse-default', modeId };
+}
+
+function resolveConfiguredMode(
+  provider: ProviderModule,
+  mode: AutoApproveMode,
+  settings: Record<string, unknown> | undefined,
+): ResolvedAutoApproveMode {
+  if (mode.strategy === 'post-boot-command') return inactiveMode(mode.id);
+  if (settings?.launchedByCoordinator === true
+      && settings.delegatedWorkerDangerousModeAllow !== true
+      && deriveAutoApproveModeRisk(mode) === 'dangerous') {
+    const fallback = provider.autoApproveModes?.modes.find((candidate) =>
+      candidate.strategy === 'pty-parse-default'
+      && deriveAutoApproveModeRisk(candidate) !== 'dangerous');
+    return fallback
+      ? { active: true, strategy: fallback.strategy, modeId: fallback.id }
+      : inactiveMode(mode.id);
+  }
+  return { active: true, strategy: mode.strategy, modeId: mode.id };
+}
+
+/**
+ * Resolve new mode settings before the legacy boolean. A stale/unknown explicit
+ * mode id fails closed instead of falling through to an enabled legacy setting.
+ */
+export function resolveProviderAutoApproveMode(
+  provider: ProviderModule,
+  settings: Record<string, unknown> | undefined,
+): ResolvedAutoApproveMode {
+  const config = provider.autoApproveModes;
+  const explicitModeId = settings?.autoApproveMode;
+  if (typeof explicitModeId === 'string') {
+    const mode = config?.modes.find((candidate) => candidate.id === explicitModeId);
+    if (!mode) return inactiveMode(explicitModeId);
+    return resolveConfiguredMode(provider, mode, settings);
+  }
+
+  const explicitLegacy = settings?.autoApprove;
+  const providerLegacyDefault = provider.settings?.autoApprove?.default;
+  const legacyActive = typeof explicitLegacy === 'boolean'
+    ? explicitLegacy
+    : typeof providerLegacyDefault === 'boolean'
+      ? providerLegacyDefault
+      : false;
+  if (!legacyActive) return inactiveMode();
+
+  if (!config) {
+    return { active: true, strategy: 'pty-parse-default', modeId: 'legacy' };
+  }
+  const defaultMode = config.modes.find((mode) => mode.id === config.default);
+  if (!defaultMode) return inactiveMode(config.default);
+  return resolveConfiguredMode(provider, defaultMode, settings);
+}
+
+export function findProviderAutoApproveMode(
+  provider: ProviderModule | undefined,
+  modeId: string,
+): AutoApproveMode | undefined {
+  return provider?.autoApproveModes?.modes.find((mode) => mode.id === modeId);
+}

package/src/providers/chat-message-normalization.ts

@@ -156,6 +156,59 @@ export function selectFinalAssistantTurnEndMessage(
   return null;
 }
 
+/**
+ * EARLY-IDLE-COMPLETION-FALSE-POSITIVE — trailing tool/terminal activity detector.
+ *
+ * True when the transcript's LAST non-empty user-facing assistant bubble is followed
+ * by one or more TOOL / TERMINAL activity bubbles (a tool_use/command the assistant
+ * fired AFTER its text) — i.e. the assistant emitted a preamble ("Let me explore…"),
+ * then started running Read/Grep, so the turn is still executing and its answer has
+ * not landed. Callers that would otherwise promote that preamble to a turn-end summary
+ * off a momentary (startup-grace / inter-tool) idle read use this as a veto.
+ *
+ * Deliberately NARROW so the pure-PTY completion rescue is preserved:
+ *   - Only TOOL/TERMINAL activity trailing the assistant vetoes. A trailing THOUGHT or
+ *     status bubble does NOT (a finished turn can end on an internal thought), matching
+ *     selectFinalAssistantTurnEndMessage's skip set minus the "still-working" signals.
+ *   - A genuinely FINISHED worker (final assistant last, no trailing tool activity —
+ *     the kimi pure-PTY continuous-idle shape) returns false, so its early completion
+ *     is untouched.
+ *
+ * Returns false when there is no final assistant bubble at all (the caller's
+ * selectFinalAssistantTurnEndMessage already handles that as "not a turn end").
+ */
+export function hasTrailingToolActivityAfterFinalAssistant(
+  messages: ChatMessage[] | null | undefined,
+): boolean {
+  if (!Array.isArray(messages) || messages.length === 0) return false;
+  let sawTrailingToolActivity = false;
+  for (let i = messages.length - 1; i >= 0; i--) {
+    const msg = messages[i];
+    if (!msg) continue;
+    const classification = classifyChatMessageVisibility(msg);
+    // A trailing user-facing assistant/model bubble with real text ends the scan:
+    // whether we saw a tool AFTER it is the verdict.
+    if (classification.isUserFacing && (msg.role === 'assistant' || msg.role === 'model')) {
+      if (flattenContent(msg.content).trim()) return sawTrailingToolActivity;
+      // Empty streaming assistant bubble — keep scanning back past it, same as
+      // selectFinalAssistantTurnEndMessage (which returns null here); an empty tail
+      // isn't a turn end, so there is nothing to veto.
+      return false;
+    }
+    if (classification.isUserFacing) {
+      // A trailing user bubble (freshly dispatched task, no reply) → no assistant
+      // turn end below it to veto.
+      return false;
+    }
+    // Non-user-facing activity/internal bubble sitting AFTER the (not-yet-seen)
+    // assistant bubble. Only tool/terminal activity signals an in-flight turn.
+    if (classification.kind === 'tool' || classification.kind === 'terminal') {
+      sawTrailingToolActivity = true;
+    }
+  }
+  return false;
+}
+
 export const BUILTIN_CHAT_MESSAGE_KINDS = ['standard', 'thought', 'tool', 'terminal', 'system'] as const;
 
 export type BuiltinChatMessageKind = typeof BUILTIN_CHAT_MESSAGE_KINDS[number];

package/src/providers/cli-provider-instance.ts

@@ -75,6 +75,7 @@ import type {
 } from './cli-provider-instance-types.js';
 import { mergeConversationMessages, buildExternalTranscriptProbe } from './cli-provider-transcript-merge.js';
 import { getEffectDedupKey, formatApprovalRequestMessage, formatMarkerTimestamp } from './cli-provider-effect-format.js';
+import { resolveProviderAutoApproveMode, type ResolvedAutoApproveMode } from './auto-approve-modes.js';
 
 // Re-export moved public symbols so existing importers (index.ts, tests) keep
 // their `./cli-provider-instance.js` path. Pure move — no behavior change.
@@ -2780,7 +2781,7 @@ export class CliProviderInstance implements ProviderInstance {
      * resolveModal, so a plain turn that never saw an approval always returns false.
      */
     private inApprovalResumeGrace(now = Date.now()): boolean {
-        if (!this.isAutonomousMeshSession() || !this.shouldAutoApprove()) return false;
+        if (!this.isAutonomousMeshSession() || !this.shouldUsePtyAutoApprove()) return false;
         const resolvedAt = typeof (this.adapter as any)?.lastApprovalResolvedAt === 'number'
             ? (this.adapter as any).lastApprovalResolvedAt as number
             : 0;
@@ -2897,7 +2898,7 @@ export class CliProviderInstance implements ProviderInstance {
         }
 
         const latestStatus = this.adapter.getStatus({ allowParse: false });
-        const latestAutoApproveActive = latestStatus.status === 'waiting_approval' && this.shouldAutoApprove();
+        const latestAutoApproveActive = latestStatus.status === 'waiting_approval' && this.shouldUsePtyAutoApprove();
         const latestVisibleStatus = latestAutoApproveActive || this.autoApproveBusy ? 'generating' : latestStatus.status;
         LOG.debug('CLI', `[${this.type}] flush attempt: adapterStatus=${latestStatus.status} latestVisible=${latestVisibleStatus} generatingStartedAt=${this.generatingStartedAt} isWaitingForResponse=${!!(this.adapter as any)?.isWaitingForResponse} hasPartial=${!!this.adapter.getPartialResponse?.()}`);
         if (latestVisibleStatus !== 'idle') {
@@ -3300,7 +3301,7 @@ export class CliProviderInstance implements ProviderInstance {
     private stabilizeFlappingApprovalStatus(adapterStatus: any, now = Date.now()): any {
         // Only autonomous auto-approving mesh sessions are subject to the delegated flap;
         // never overlay for attended/foreground/non-mesh sessions.
-        if (!this.isAutonomousMeshSession() || !this.shouldAutoApprove()) return adapterStatus;
+        if (!this.isAutonomousMeshSession() || !this.shouldUsePtyAutoApprove()) return adapterStatus;
 
         const rawStatus = adapterStatus?.status;
         const resolvedAt = typeof (this.adapter as any)?.lastApprovalResolvedAt === 'number'
@@ -3347,6 +3348,13 @@ export class CliProviderInstance implements ProviderInstance {
     }
 
     private maybeAutoApproveStatus(adapterStatus: any, now = Date.now()): boolean {
+        // launch-args modes grant approval in the CLI process itself and therefore
+        // must never enter the PTY modal parser/fire/settle/mask/nudge subsystem.
+        // post-boot-command is reserved and resolves inactive in v1.
+        if (!this.shouldUsePtyAutoApprove()) {
+            this.resetPtyAutoApproveState();
+            return false;
+        }
         // Manual-attendance suppression (provider-common): when a human is
         // Manual-attendance suppression (provider-common): when a human is
         // actively driving this session from the dashboard, hold auto-approve so
@@ -3358,7 +3366,7 @@ export class CliProviderInstance implements ProviderInstance {
         // would otherwise never re-drive this decision. Background mesh workers
         // are never attended, so their delegated auto-approve is untouched.
         if (adapterStatus?.status === 'waiting_approval'
-            && this.shouldAutoApprove()
+            && this.shouldUsePtyAutoApprove()
             && this.manualAttendance.isAttended(now)) {
             this.lastAutoApprovalSignature = '';
             this.pendingAutoApprovalSignature = '';
@@ -3376,7 +3384,7 @@ export class CliProviderInstance implements ProviderInstance {
             }, this.manualAttendance.remainingMs(now) + 20);
             return false;
         }
-        const autoApproveActive = adapterStatus?.status === 'waiting_approval' && this.shouldAutoApprove();
+        const autoApproveActive = adapterStatus?.status === 'waiting_approval' && this.shouldUsePtyAutoApprove();
         // Guard re-entry: onStatusChange/getState can observe the same modal multiple
         // times while the PTY absorbs the approval key. Without this flag, repeated
         // snapshots would write stray keys into the input once the modal dismisses.
@@ -4652,15 +4660,37 @@ export class CliProviderInstance implements ProviderInstance {
     get cliType(): string { return this.type; }
     get cliName(): string { return this.provider.name; }
 
+    private resolveAutoApproveMode(): ResolvedAutoApproveMode {
+        return resolveProviderAutoApproveMode(this.provider, this.settings);
+    }
+
+    /** Legacy boolean view retained for internal/test compatibility. */
     private shouldAutoApprove(): boolean {
-        if (typeof this.settings.autoApprove === 'boolean') {
-            return this.settings.autoApprove;
+        return this.resolveAutoApproveMode().active;
+    }
+
+    private shouldUsePtyAutoApprove(): boolean {
+        const resolved = this.resolveAutoApproveMode();
+        return this.shouldAutoApprove() && resolved.strategy === 'pty-parse-default';
+    }
+
+    private resetPtyAutoApproveState(): void {
+        this.lastAutoApprovalSignature = '';
+        this.pendingAutoApprovalSignature = '';
+        this.pendingAutoApprovalSince = 0;
+        this.autoApproveInactiveSince = 0;
+        this.autoApproveMaskSince = 0;
+        this.stalledApprovalNudgeEpisode = 0;
+        this.autoApproveLastModalSeenAt = 0;
+        this.autoApproveBusy = false;
+        if (this.autoApproveSettleTimer) {
+            clearTimeout(this.autoApproveSettleTimer);
+            this.autoApproveSettleTimer = null;
         }
-        const providerDefault = this.provider.settings?.autoApprove?.default;
-        if (typeof providerDefault === 'boolean') {
-            return providerDefault;
+        if (this.autoApproveBusyTimer) {
+            clearTimeout(this.autoApproveBusyTimer);
+            this.autoApproveBusyTimer = null;
         }
-        return false;
     }
 
     /** @see ProviderInstance.noteManualInteraction */
@@ -4687,7 +4717,7 @@ export class CliProviderInstance implements ProviderInstance {
      */
     private autoApproveEffectivelyActive(status: string | undefined, now = Date.now()): boolean {
         return status === 'waiting_approval'
-            && this.shouldAutoApprove()
+            && this.shouldUsePtyAutoApprove()
             && !this.manualAttendance.isAttended(now);
     }
 
@@ -4699,7 +4729,8 @@ export class CliProviderInstance implements ProviderInstance {
     // maybeAutoApproveStatus (driven by getState + the recheck timer during a waiting episode);
     // this read is side-effect-free so getStatusMetadata can consult it too.
     private autoApproveMaskStalled(now = Date.now()): boolean {
-        return this.autoApproveMaskSince > 0
+        return this.shouldUsePtyAutoApprove()
+            && this.autoApproveMaskSince > 0
             && now - this.autoApproveMaskSince > CliProviderInstance.AUTO_APPROVE_MASK_STALL_MS;
     }
 
@@ -4725,6 +4756,7 @@ export class CliProviderInstance implements ProviderInstance {
      * mask-clock value) so a modal that flaps between parsed/unparsed states is announced once.
      */
     private maybeEmitStalledApprovalNudge(adapterStatus: any, now: number): void {
+        if (!this.shouldUsePtyAutoApprove()) return;
         if (!this.isMeshWorkerSession()) return;
         if (adapterStatus?.status !== 'waiting_approval') return;
         if (!this.autoApproveMaskStalled(now)) return;

package/src/providers/contracts.ts

@@ -488,6 +488,28 @@ export interface ProviderCompatibilityEntry {
   scriptDir: string;
 }
 
+export type AutoApproveModeStrategy =
+  | 'pty-parse-default'
+  | 'launch-args'
+  | 'post-boot-command';
+
+export type AutoApproveModeRisk = 'safe' | 'caution' | 'dangerous';
+
+export interface AutoApproveMode {
+  id: string;
+  label: string;
+  strategy: AutoApproveModeStrategy;
+  risk: AutoApproveModeRisk;
+  warning?: string;
+  launchArgs?: string[];
+  removeArgs?: string[];
+}
+
+export interface AutoApproveModesConfig {
+  default: string;
+  modes: AutoApproveMode[];
+}
+
 export interface ProviderModule {
  /** Unique identifier (e.g. 'cline', 'cursor', 'gemini-cli') */
   type: string;
@@ -519,7 +541,9 @@ export interface ProviderModule {
   status?: string;
  /** Inventory/support detail string maintained in adhdev-providers */
   details?: string;
- /** Install instructions (shown when command is missing) */
+  /** Provider-specific auto-approve choices and their launch/runtime strategy. */
+  autoApproveModes?: AutoApproveModesConfig;
+  /** Install instructions (shown when command is missing) */
   install?: string;
  /** Custom version detection command (e.g. 'cursor --version', 'claude -v') */
   versionCommand?: ProviderVersionCommand;

package/src/providers/provider-schema.ts

@@ -1,4 +1,5 @@
 import type { ProviderControlDef, ProviderControlType, ProviderModule } from './contracts.js'
+import { deriveAutoApproveModeRisk } from './auto-approve-modes.js'
 import { providerHasOpenPanelSupport } from './open-panel-support.js'
 
 const VALID_CAPABILITY_MEDIA_TYPES = new Set(['text', 'image', 'audio', 'video', 'resource'])
@@ -66,6 +67,7 @@ const KNOWN_PROVIDER_FIELDS = new Set<string>([
   'providerVersion',
   'status',
   'details',
+  'autoApproveModes',
   'modelLaunchArgs',
   'modelOptions',
   'thinkingLaunchArgs',
@@ -144,6 +146,7 @@ export function validateProviderDefinition(raw: unknown): ProviderValidationResu
   validateCapabilities(provider as unknown as ProviderModule, controls, errors)
   validateNativeHistory(provider.nativeHistory, errors)
   validateMeshCoordinator(provider.meshCoordinator, errors)
+  validateAutoApproveModes(provider.autoApproveModes, errors)
 
   for (const control of controls) {
     validateControl(control as ProviderControlDef, errors)
@@ -160,6 +163,86 @@ export function validateProviderDefinition(raw: unknown): ProviderValidationResu
   return { errors, warnings }
 }
 
+export function validateAutoApproveModes(raw: unknown, errors: string[]): void {
+  if (raw === undefined) return
+  if (!raw || typeof raw !== 'object' || Array.isArray(raw)) {
+    errors.push('autoApproveModes must be an object')
+    return
+  }
+
+  const config = raw as Record<string, unknown>
+  const defaultModeId = typeof config.default === 'string' ? config.default.trim() : ''
+  if (!defaultModeId) {
+    errors.push('autoApproveModes.default must be a non-empty string')
+  } else {
+    config.default = defaultModeId
+  }
+  if (!Array.isArray(config.modes) || config.modes.length === 0) {
+    errors.push('autoApproveModes.modes must be a non-empty array')
+    return
+  }
+
+  const ids = new Set<string>()
+  for (const [index, rawMode] of config.modes.entries()) {
+    const prefix = `autoApproveModes.modes[${index}]`
+    if (!rawMode || typeof rawMode !== 'object' || Array.isArray(rawMode)) {
+      errors.push(`${prefix} must be an object`)
+      continue
+    }
+    const mode = rawMode as Record<string, unknown>
+    const id = typeof mode.id === 'string' ? mode.id.trim() : ''
+    if (!id) {
+      errors.push(`${prefix}.id must be a non-empty string`)
+    } else if (ids.has(id)) {
+      errors.push(`${prefix}.id must be unique (duplicate: ${id})`)
+    } else {
+      ids.add(id)
+      mode.id = id
+    }
+    if (typeof mode.label !== 'string' || !mode.label.trim()) {
+      errors.push(`${prefix}.label must be a non-empty string`)
+    }
+
+    const strategy = mode.strategy
+    if (!['pty-parse-default', 'launch-args', 'post-boot-command'].includes(String(strategy))) {
+      errors.push(`${prefix}.strategy must be one of: pty-parse-default, launch-args, post-boot-command`)
+    } else if (strategy === 'post-boot-command') {
+      errors.push(`${prefix}.strategy post-boot-command is reserved and unsupported in v1`)
+    }
+
+    const risk = mode.risk
+    if (!['safe', 'caution', 'dangerous'].includes(String(risk))) {
+      errors.push(`${prefix}.risk must be one of: safe, caution, dangerous`)
+    }
+
+    for (const field of ['launchArgs', 'removeArgs'] as const) {
+      const value = mode[field]
+      if (value !== undefined && (!Array.isArray(value) || value.some((arg) => typeof arg !== 'string' || !arg.trim()))) {
+        errors.push(`${prefix}.${field} must be an array of non-empty strings when provided`)
+      }
+    }
+    if (strategy === 'launch-args' && (!Array.isArray(mode.launchArgs) || mode.launchArgs.length === 0)) {
+      errors.push(`${prefix}.launchArgs must be a non-empty array for launch-args strategy`)
+    }
+
+    // Mutate the validated provider object so downstream runtime/UI consumers see
+    // the effective risk. The runtime resolver repeats this derivation as defense-in-depth.
+    if (['safe', 'caution', 'dangerous'].includes(String(risk))
+        && deriveAutoApproveModeRisk(mode as any) === 'dangerous') {
+      mode.risk = 'dangerous'
+    }
+    if (mode.risk === 'dangerous' && (typeof mode.warning !== 'string' || !mode.warning.trim())) {
+      errors.push(`${prefix}.warning is required for dangerous modes`)
+    } else if (mode.warning !== undefined && (typeof mode.warning !== 'string' || !mode.warning.trim())) {
+      errors.push(`${prefix}.warning must be a non-empty string when provided`)
+    }
+  }
+
+  if (defaultModeId && !ids.has(defaultModeId)) {
+    errors.push(`autoApproveModes.default must reference an existing mode id: ${defaultModeId}`)
+  }
+}
+
 function validateCapabilities(provider: ProviderModule, controls: ProviderControlDef[], errors: string[]): void {
   const capabilities = provider.capabilities
   if (provider.contractVersion === 2) {

package/src/providers/sdk/v1/schemas/cli/provider.schema.json

@@ -119,6 +119,20 @@
         }
       }
     },
+    "autoApproveModes": {
+      "type": "object",
+      "description": "Provider-specific auto-approve choices and their launch/runtime strategy.",
+      "required": ["default", "modes"],
+      "additionalProperties": false,
+      "properties": {
+        "default": { "type": "string", "minLength": 1 },
+        "modes": {
+          "type": "array",
+          "minItems": 1,
+          "items": { "$ref": "#/$defs/autoApproveMode" }
+        }
+      }
+    },
     "sendDelayMs": {
       "type": "number",
       "minimum": 0,
@@ -476,6 +490,36 @@
     }
   },
   "$defs": {
+    "autoApproveMode": {
+      "type": "object",
+      "required": ["id", "label", "strategy", "risk"],
+      "additionalProperties": false,
+      "properties": {
+        "id": { "type": "string", "minLength": 1 },
+        "label": { "type": "string", "minLength": 1 },
+        "strategy": { "enum": ["pty-parse-default", "launch-args", "post-boot-command"] },
+        "risk": { "enum": ["safe", "caution", "dangerous"] },
+        "warning": { "type": "string", "minLength": 1 },
+        "launchArgs": {
+          "type": "array",
+          "items": { "type": "string", "minLength": 1 }
+        },
+        "removeArgs": {
+          "type": "array",
+          "items": { "type": "string", "minLength": 1 }
+        }
+      },
+      "allOf": [
+        {
+          "if": { "properties": { "strategy": { "const": "launch-args" } }, "required": ["strategy"] },
+          "then": { "required": ["launchArgs"], "properties": { "launchArgs": { "minItems": 1 } } }
+        },
+        {
+          "if": { "properties": { "risk": { "const": "dangerous" } }, "required": ["risk"] },
+          "then": { "required": ["warning"] }
+        }
+      ]
+    },
     "patternList": {
       "type": "array",
       "items": {

package/src/repo-mesh-types.ts

@@ -15,6 +15,8 @@ import type { GitRepoStatus, GitCompactSummary } from './git/git-types.js';
 import type { MeshMissionSummary, MeshMissionSlimSummary } from './mesh/mesh-missions.js';
 import type { MeshMagiActivitySummary } from './mesh/mesh-magi-status.js';
 import type { MagiKindPanelMap, DifficultyBrainMap, NodeCapabilitySlot } from '@adhdev/mesh-shared';
+import type { ProviderModule } from './providers/contracts.js';
+import { deriveAutoApproveModeRisk } from './providers/auto-approve-modes.js';
 
 // ─── Core Mesh Types ────────────────────────────
 
@@ -350,6 +352,8 @@ export interface RepoMeshPolicy {
      * A node policy may override this per-node (RepoMeshNodePolicy.delegatedWorkerAutoApprove).
      */
     delegatedWorkerAutoApprove?: boolean;
+    /** Explicit opt-in required before delegated workers may use a dangerous provider mode. */
+    delegatedWorkerDangerousModeAllow?: boolean;
     /**
      * MESH-SEND-KEYS (feature 3): opt-in to allow the coordinator to inject
      * DESTRUCTIVE keys (CTRL_C / ESC) into a worker PTY via mesh_send_keys. These
@@ -505,6 +509,8 @@ export interface RepoMeshNodePolicy {
      * precedence over the mesh-level policy for worker sessions launched onto this node.
      */
     delegatedWorkerAutoApprove?: boolean;
+    /** Per-node override for dangerous delegated worker mode authorization. */
+    delegatedWorkerDangerousModeAllow?: boolean;
     /**
      * MESH-SEND-KEYS (feature 3): per-node override for
      * RepoMeshPolicy.allowSendKeysDestructive.
@@ -550,6 +556,7 @@ export const DEFAULT_MESH_POLICY: RepoMeshPolicy = {
     // any specific session manually; that override is preserved per-device.
     spawnedSessionVisibility: 'hidden',
     delegatedWorkerAutoApprove: true,
+    delegatedWorkerDangerousModeAllow: false,
     sessionCleanupOnNodeRemove: 'preserve',
     // MAGI auto-launches a worker session per pinned replica target with no idle
     // session; those stay idle-LIVE after their turn. Default ON (stop_and_delete)
@@ -776,6 +783,13 @@ export function mergeAndNormalizePolicy(
     } else {
         delete policy.autoConvergeCodeChange;
     }
+    // Dangerous delegated-worker provider modes are fail-closed and only persist
+    // when the mesh owner has explicitly opted in.
+    if (policy.delegatedWorkerDangerousModeAllow === true) {
+        policy.delegatedWorkerDangerousModeAllow = true;
+    } else {
+        delete policy.delegatedWorkerDangerousModeAllow;
+    }
     // Coordinator idle-push policy: strict opt-in. Only persist the explicit
     // 'auto_silent_on_dispatch' value; any other/invalid value normalizes to the
     // 'always' default and is dropped so existing meshes.json stays byte-for-byte
@@ -789,23 +803,62 @@ export function mergeAndNormalizePolicy(
 }
 
 /**
- * Resolve whether a delegated worker session launched onto `nodePolicy` (within a mesh
- * governed by `meshPolicy`) should auto-approve. Precedence: node override → mesh policy
- * → default true. The result is stamped into the worker launch settings envelope as
- * `autoApprove`; it wins over the global per-provider-type autoApprove config because the
- * launch path merges the envelope as a settingsOverride on top of the provider defaults.
+ * Resolve delegated worker auto-approve. Legacy providers return a boolean. Providers
+ * with modes return the default mode id, except a dangerous default is downgraded to a
+ * non-dangerous PTY mode unless mesh/node policy explicitly opts in.
  */
 export function resolveDelegatedWorkerAutoApprove(
-    meshPolicy?: Pick<RepoMeshPolicy, 'delegatedWorkerAutoApprove'> | null,
-    nodePolicy?: Pick<RepoMeshNodePolicy, 'delegatedWorkerAutoApprove'> | null,
-): boolean {
+    meshPolicy?: Pick<RepoMeshPolicy, 'delegatedWorkerAutoApprove' | 'delegatedWorkerDangerousModeAllow'> | null,
+    nodePolicy?: Pick<RepoMeshNodePolicy, 'delegatedWorkerAutoApprove' | 'delegatedWorkerDangerousModeAllow'> | null,
+    provider?: Pick<ProviderModule, 'autoApproveModes'> | null,
+): boolean | string {
+    let enabled = true;
     if (typeof nodePolicy?.delegatedWorkerAutoApprove === 'boolean') {
-        return nodePolicy.delegatedWorkerAutoApprove;
+        enabled = nodePolicy.delegatedWorkerAutoApprove;
+    } else if (typeof meshPolicy?.delegatedWorkerAutoApprove === 'boolean') {
+        enabled = meshPolicy.delegatedWorkerAutoApprove;
     }
-    if (typeof meshPolicy?.delegatedWorkerAutoApprove === 'boolean') {
-        return meshPolicy.delegatedWorkerAutoApprove;
+    if (!enabled) return false;
+
+    const modes = provider?.autoApproveModes;
+    if (!modes) return true;
+    const defaultMode = modes.modes.find((mode) => mode.id === modes.default);
+    if (!defaultMode || defaultMode.strategy === 'post-boot-command') return false;
+
+    const dangerousAllowed = resolveDelegatedWorkerDangerousModeAllow(meshPolicy, nodePolicy);
+    if (deriveAutoApproveModeRisk(defaultMode) === 'dangerous' && !dangerousAllowed) {
+        const ptyFallback = modes!.modes.find((mode) =>
+            mode.strategy === 'pty-parse-default' && deriveAutoApproveModeRisk(mode) !== 'dangerous');
+        return ptyFallback?.id || false;
     }
-    return true;
+    return defaultMode.id;
+}
+
+export function resolveDelegatedWorkerDangerousModeAllow(
+    meshPolicy?: Pick<RepoMeshPolicy, 'delegatedWorkerDangerousModeAllow'> | null,
+    nodePolicy?: Pick<RepoMeshNodePolicy, 'delegatedWorkerDangerousModeAllow'> | null,
+): boolean {
+    if (typeof nodePolicy?.delegatedWorkerDangerousModeAllow === 'boolean') {
+        return nodePolicy.delegatedWorkerDangerousModeAllow;
+    }
+    return meshPolicy?.delegatedWorkerDangerousModeAllow === true;
+}
+
+/** Shape a boolean-or-mode resolution for the settings precedence contract. */
+export function delegatedWorkerAutoApproveSettings(
+    meshPolicy?: Pick<RepoMeshPolicy, 'delegatedWorkerAutoApprove' | 'delegatedWorkerDangerousModeAllow'> | null,
+    nodePolicy?: Pick<RepoMeshNodePolicy, 'delegatedWorkerAutoApprove' | 'delegatedWorkerDangerousModeAllow'> | null,
+    provider?: Pick<ProviderModule, 'autoApproveModes'> | null,
+): {
+    autoApprove: boolean | undefined;
+    autoApproveMode: string | undefined;
+    delegatedWorkerDangerousModeAllow: boolean;
+} {
+    const resolved = resolveDelegatedWorkerAutoApprove(meshPolicy, nodePolicy, provider);
+    const delegatedWorkerDangerousModeAllow = resolveDelegatedWorkerDangerousModeAllow(meshPolicy, nodePolicy);
+    return typeof resolved === 'string'
+        ? { autoApprove: undefined, autoApproveMode: resolved, delegatedWorkerDangerousModeAllow }
+        : { autoApprove: resolved, autoApproveMode: undefined, delegatedWorkerDangerousModeAllow };
 }
 
 /**

package/src/shared-types.ts

@@ -52,7 +52,7 @@ export type { ProviderErrorReason } from './providers/provider-instance.js';
 // Local import for use in Managed*Entry types below
 import type { ActiveChatData as _ActiveChatData, ProviderErrorReason as _ProviderErrorReason } from './providers/provider-instance.js';
 import type { WorkspaceEntry } from './config/workspaces.js';
-import type { ProviderMeshCoordinatorConfig, ProviderResumeCapability } from './providers/contracts.js';
+import type { AutoApproveModesConfig, ProviderMeshCoordinatorConfig, ProviderResumeCapability } from './providers/contracts.js';
 import type {
     GitCompactSummary,
     GitDiffSummary,
@@ -563,6 +563,8 @@ export interface AvailableProviderInfo {
     lastVerification?: MachineProviderCheckResult;
     /** Provider-declared Repo Mesh coordinator/MCP behavior. */
     meshCoordinator?: ProviderMeshCoordinatorConfig;
+    /** Provider-declared auto-approve choices shown by session launch UIs. */
+    autoApproveModes?: AutoApproveModesConfig;
     /** BRAIN-ROUTING: suggested model values for the new-session model dropdown. */
     modelOptions?: string[];
     /** BRAIN-ROUTING: reasoning-effort values for the new-session thinking dropdown. */

package/src/status/snapshot.ts

@@ -145,6 +145,7 @@ export function buildAvailableProviders(
         lastDetection?: AvailableProviderInfo['lastDetection'];
         lastVerification?: AvailableProviderInfo['lastVerification'];
         meshCoordinator?: AvailableProviderInfo['meshCoordinator'];
+        autoApproveModes?: AvailableProviderInfo['autoApproveModes'];
         _sourceTrust?: AvailableProviderInfo['trust'];
         _sourceLayer?: AvailableProviderInfo['sourceLayer'];
         _sourceName?: string | null;
@@ -183,6 +184,7 @@ export function buildAvailableProviders(
             ...(provider.lastDetection !== undefined ? { lastDetection: provider.lastDetection } : {}),
             ...(provider.lastVerification !== undefined ? { lastVerification: provider.lastVerification } : {}),
             ...(provider.meshCoordinator !== undefined ? { meshCoordinator: provider.meshCoordinator } : {}),
+            ...(provider.autoApproveModes !== undefined ? { autoApproveModes: provider.autoApproveModes } : {}),
             ...(trust ? {
                 trust,
                 trustDescription: describeTrust(trust),