wogiflow 2.26.1 → 2.29.0

package/lib/skill-proposal-store.js

@@ -0,0 +1,432 @@
+'use strict';
+
+/**
+ * Wogi Flow — Skill Proposal Store
+ *
+ * Durable storage for agent-proposed skill changes (new / edit / remove).
+ * Proposals are staged until the user reviews them at session-end and approves
+ * or rejects. Approved proposals are applied by `promote`; rejected proposals
+ * are removed without touching `.claude/skills/`.
+ *
+ * Storage layout:
+ *   .workflow/state/skill-proposals.json          — proposal records (array)
+ *   .claude/skills/pending/<name>.md              — staged content for propose/patch
+ *   .claude/skills/archived/<name>.md             — destination after approved remove
+ *
+ * Record schema:
+ *   {
+ *     id:          "prop-<8hex>",
+ *     action:      "propose" | "patch" | "remove",
+ *     skillName:   string,
+ *     contentPath: string | null,       // repo-relative; null for remove
+ *     rationale:   string,
+ *     proposedAt:  ISO-8601 timestamp,
+ *     proposedBy:  "agent" | "user",
+ *     status:      "pending" | "approved" | "rejected"
+ *   }
+ */
+
+const fs = require('node:fs');
+const path = require('node:path');
+const crypto = require('node:crypto');
+
+const { PATHS, isPathWithinProject } = require('../scripts/flow-paths');
+const { safeJsonParse } = require('../scripts/flow-io');
+const { applyFuzzyPatch, DEFAULT_THRESHOLD } = require('./fuzzy-patch');
+
+const PROPOSALS_FILE = path.join(PATHS.state, 'skill-proposals.json');
+const PENDING_DIR = path.join(PATHS.claude, 'skills', 'pending');
+const ARCHIVED_DIR = path.join(PATHS.claude, 'skills', 'archived');
+const ACTIVE_SKILLS_DIR = path.join(PATHS.claude, 'skills');
+
+/**
+ * Read `skills.fuzzyPatchThreshold` from .workflow/config.json. Falls back to
+ * the library default (0.85) on any error. Config read is deferred so test
+ * harnesses can point at temp project roots without a stale cache.
+ */
+function getFuzzyPatchThreshold() {
+  const configPath = path.join(PATHS.root, '.workflow', 'config.json');
+  const cfg = safeJsonParse(configPath, null);
+  const v = cfg && cfg.skills && cfg.skills.fuzzyPatchThreshold;
+  if (typeof v === 'number' && v >= 0 && v <= 1) return v;
+  return DEFAULT_THRESHOLD;
+}
+
+const VALID_SKILL_NAME = /^[a-z][a-z0-9-]*(?:\/[a-z][a-z0-9-]*)*$/;
+const VALID_ACTIONS = new Set(['propose', 'patch', 'remove']);
+
+// ============================================================
+// Low-level helpers
+// ============================================================
+
+function ensureDir(dir) {
+  fs.mkdirSync(dir, { recursive: true });
+}
+
+function readProposals() {
+  if (!fs.existsSync(PROPOSALS_FILE)) return [];
+  try {
+    const raw = fs.readFileSync(PROPOSALS_FILE, 'utf-8');
+    const parsed = JSON.parse(raw);
+    return Array.isArray(parsed) ? parsed : [];
+  } catch (_err) {
+    return [];
+  }
+}
+
+function writeProposals(list) {
+  ensureDir(path.dirname(PROPOSALS_FILE));
+  fs.writeFileSync(PROPOSALS_FILE, JSON.stringify(list, null, 2) + '\n', 'utf-8');
+}
+
+function generateProposalId() {
+  return `prop-${crypto.randomBytes(4).toString('hex')}`;
+}
+
+function validateSkillName(name) {
+  if (!name || typeof name !== 'string') {
+    throw new Error('skill name is required');
+  }
+  if (!VALID_SKILL_NAME.test(name)) {
+    throw new Error(
+      `invalid skill name '${name}': use lowercase letters, digits, hyphens (kebab-case); forward-slashes allowed for nesting`
+    );
+  }
+}
+
+function skillNameToFile(name) {
+  return `${name}.md`;
+}
+
+function resolveWithinProject(relOrAbs) {
+  const abs = path.isAbsolute(relOrAbs) ? relOrAbs : path.resolve(PATHS.root, relOrAbs);
+  if (!isPathWithinProject(abs)) {
+    throw new Error(`path escapes project root: ${relOrAbs}`);
+  }
+  return abs;
+}
+
+function toRepoRelative(absPath) {
+  return path.relative(PATHS.root, absPath);
+}
+
+function activeSkillPath(name) {
+  return path.join(ACTIVE_SKILLS_DIR, skillNameToFile(name));
+}
+
+function pendingSkillPath(name) {
+  return path.join(PENDING_DIR, skillNameToFile(name));
+}
+
+function pendingFindPath(name) {
+  return path.join(PENDING_DIR, `${name}.find.md`);
+}
+
+function pendingReplacePath(name) {
+  return path.join(PENDING_DIR, `${name}.replace.md`);
+}
+
+function archivedSkillPath(name) {
+  return path.join(ARCHIVED_DIR, skillNameToFile(name));
+}
+
+// ============================================================
+// Public API
+// ============================================================
+
+/**
+ * Stage a proposal record. For propose/patch, copies `contentFile` into
+ * .claude/skills/pending/<name>.md. For remove, no content is copied.
+ */
+function createProposal({
+  action,
+  skillName,
+  contentFile = null,
+  findFile = null,
+  replaceFile = null,
+  rationale = '',
+  proposedBy = 'agent',
+}) {
+  if (!VALID_ACTIONS.has(action)) {
+    throw new Error(`invalid action '${action}': expected propose|patch|remove`);
+  }
+  validateSkillName(skillName);
+
+  let contentPath = null;
+  let findPath = null;
+  let replacePath = null;
+  let patchMode = null;
+
+  if (action === 'propose') {
+    if (!contentFile) throw new Error(`--content is required for ${action}`);
+    const srcAbs = resolveWithinProject(contentFile);
+    if (!fs.existsSync(srcAbs)) throw new Error(`content file not found: ${contentFile}`);
+    ensureDir(PENDING_DIR);
+    const destAbs = pendingSkillPath(skillName);
+    ensureDir(path.dirname(destAbs));
+    fs.copyFileSync(srcAbs, destAbs);
+    contentPath = toRepoRelative(destAbs);
+  } else if (action === 'patch') {
+    // Two mutually-exclusive modes:
+    //   1. full-replace: --content <file> (legacy / F1 behavior)
+    //   2. fuzzy-patch:  --find <file> --replace <file> (F3)
+    const hasFuzzy = Boolean(findFile || replaceFile);
+    const hasFull = Boolean(contentFile);
+    if (hasFuzzy && hasFull) {
+      throw new Error('patch accepts either --content OR --find/--replace, not both');
+    }
+    if (!hasFuzzy && !hasFull) {
+      throw new Error('patch requires --content, or --find + --replace');
+    }
+    ensureDir(PENDING_DIR);
+
+    if (hasFull) {
+      patchMode = 'full-replace';
+      const srcAbs = resolveWithinProject(contentFile);
+      if (!fs.existsSync(srcAbs)) throw new Error(`content file not found: ${contentFile}`);
+      const destAbs = pendingSkillPath(skillName);
+      ensureDir(path.dirname(destAbs));
+      fs.copyFileSync(srcAbs, destAbs);
+      contentPath = toRepoRelative(destAbs);
+    } else {
+      patchMode = 'fuzzy';
+      if (!findFile || !replaceFile) {
+        throw new Error('fuzzy patch requires both --find and --replace');
+      }
+      const findAbs = resolveWithinProject(findFile);
+      const replAbs = resolveWithinProject(replaceFile);
+      if (!fs.existsSync(findAbs)) throw new Error(`find file not found: ${findFile}`);
+      if (!fs.existsSync(replAbs)) throw new Error(`replace file not found: ${replaceFile}`);
+      // Active skill must exist to fuzzy-patch against.
+      const activeAbs = activeSkillPath(skillName);
+      if (!fs.existsSync(activeAbs)) {
+        throw new Error(`cannot stage fuzzy patch — no active skill at ${toRepoRelative(activeAbs)}`);
+      }
+      const findDest = pendingFindPath(skillName);
+      const replDest = pendingReplacePath(skillName);
+      ensureDir(path.dirname(findDest));
+      fs.copyFileSync(findAbs, findDest);
+      fs.copyFileSync(replAbs, replDest);
+      findPath = toRepoRelative(findDest);
+      replacePath = toRepoRelative(replDest);
+    }
+  }
+
+  if (action === 'remove') {
+    const activeAbs = activeSkillPath(skillName);
+    if (!fs.existsSync(activeAbs)) {
+      throw new Error(`cannot propose remove — no active skill at ${toRepoRelative(activeAbs)}`);
+    }
+  }
+
+  const record = {
+    id: generateProposalId(),
+    action,
+    skillName,
+    contentPath,
+    findPath,
+    replacePath,
+    patchMode,
+    rationale: String(rationale || ''),
+    proposedAt: new Date().toISOString(),
+    proposedBy: proposedBy === 'user' ? 'user' : 'agent',
+    status: 'pending',
+  };
+
+  const list = readProposals();
+  list.push(record);
+  writeProposals(list);
+
+  return record;
+}
+
+function listProposals(filter = {}) {
+  const list = readProposals();
+  if (!filter || Object.keys(filter).length === 0) return list;
+  return list.filter((r) =>
+    Object.entries(filter).every(([k, v]) => r[k] === v)
+  );
+}
+
+function findProposal({ id = null, skillName = null, action = null, status = 'pending' }) {
+  const list = readProposals();
+  return list.find((r) =>
+    (id ? r.id === id : true) &&
+    (skillName ? r.skillName === skillName : true) &&
+    (action ? r.action === action : true) &&
+    (status ? r.status === status : true)
+  );
+}
+
+function updateProposalStatus(id, status) {
+  const list = readProposals();
+  const idx = list.findIndex((r) => r.id === id);
+  if (idx < 0) throw new Error(`no proposal with id ${id}`);
+  list[idx].status = status;
+  list[idx].decidedAt = new Date().toISOString();
+  writeProposals(list);
+  return list[idx];
+}
+
+/**
+ * Apply a pending proposal (user-invoked only).
+ *   propose → move pending/<name>.md → .claude/skills/<name>.md
+ *   patch   → overwrite .claude/skills/<name>.md with pending content
+ *   remove  → move .claude/skills/<name>.md → .claude/skills/archived/<name>.md
+ *
+ * Selector: `skillName` (finds the most recent pending proposal for that skill)
+ * or `id` (exact proposal id). `id` wins when both provided.
+ */
+function promoteProposal({ skillName = null, id = null } = {}) {
+  if (!skillName && !id) throw new Error('promoteProposal requires skillName or id');
+  const proposal = id
+    ? findProposal({ id })
+    : findProposal({ skillName });
+  if (!proposal) {
+    throw new Error(`no pending proposal found for ${id || skillName}`);
+  }
+  if (proposal.status !== 'pending') {
+    throw new Error(`proposal ${proposal.id} already ${proposal.status}`);
+  }
+  validateSkillName(proposal.skillName);
+
+  const activeAbs = activeSkillPath(proposal.skillName);
+  const pendingAbs = pendingSkillPath(proposal.skillName);
+  const archivedAbs = archivedSkillPath(proposal.skillName);
+
+  if (proposal.action === 'propose') {
+    if (fs.existsSync(activeAbs)) {
+      throw new Error(`cannot promote propose — active skill already exists at ${toRepoRelative(activeAbs)}; use patch instead`);
+    }
+    if (!fs.existsSync(pendingAbs)) {
+      throw new Error(`pending content missing at ${toRepoRelative(pendingAbs)}`);
+    }
+    ensureDir(path.dirname(activeAbs));
+    fs.renameSync(pendingAbs, activeAbs);
+  } else if (proposal.action === 'patch') {
+    if (!fs.existsSync(activeAbs)) {
+      throw new Error(`cannot promote patch — no active skill at ${toRepoRelative(activeAbs)}`);
+    }
+
+    if (proposal.patchMode === 'fuzzy') {
+      const findAbs = pendingFindPath(proposal.skillName);
+      const replAbs = pendingReplacePath(proposal.skillName);
+      if (!fs.existsSync(findAbs) || !fs.existsSync(replAbs)) {
+        throw new Error(`pending fuzzy-patch blobs missing for ${proposal.skillName}`);
+      }
+      const haystack = fs.readFileSync(activeAbs, 'utf-8');
+      const find = fs.readFileSync(findAbs, 'utf-8');
+      const replace = fs.readFileSync(replAbs, 'utf-8');
+      const threshold = getFuzzyPatchThreshold();
+      const result = applyFuzzyPatch(haystack, find, replace, { threshold });
+      if (!result.applied) {
+        // Atomic rejection — leave active skill untouched, leave proposal
+        // pending so the user can inspect or reject it manually.
+        throw new Error(
+          `fuzzy patch rejected for '${proposal.skillName}': ${result.reason} ` +
+          `(threshold ${threshold})`
+        );
+      }
+      fs.writeFileSync(activeAbs, result.result, 'utf-8');
+      try { fs.unlinkSync(findAbs); } catch (_err) { /* non-critical */ }
+      try { fs.unlinkSync(replAbs); } catch (_err) { /* non-critical */ }
+    } else {
+      // full-replace (legacy / F1 behavior, default when patchMode is absent)
+      if (!fs.existsSync(pendingAbs)) {
+        throw new Error(`pending content missing at ${toRepoRelative(pendingAbs)}`);
+      }
+      fs.copyFileSync(pendingAbs, activeAbs);
+      fs.unlinkSync(pendingAbs);
+    }
+  } else if (proposal.action === 'remove') {
+    if (!fs.existsSync(activeAbs)) {
+      throw new Error(`cannot promote remove — active skill gone at ${toRepoRelative(activeAbs)}`);
+    }
+    ensureDir(ARCHIVED_DIR);
+    ensureDir(path.dirname(archivedAbs));
+    fs.renameSync(activeAbs, archivedAbs);
+  }
+
+  return updateProposalStatus(proposal.id, 'approved');
+}
+
+function rejectProposal({ skillName = null, id = null } = {}) {
+  if (!skillName && !id) throw new Error('rejectProposal requires skillName or id');
+  const proposal = id ? findProposal({ id }) : findProposal({ skillName });
+  if (!proposal) {
+    throw new Error(`no pending proposal found for ${id || skillName}`);
+  }
+  if (proposal.status !== 'pending') {
+    throw new Error(`proposal ${proposal.id} already ${proposal.status}`);
+  }
+
+  // Clean up staged content for propose/patch
+  if (proposal.action === 'propose' || proposal.action === 'patch') {
+    const pendingAbs = pendingSkillPath(proposal.skillName);
+    if (fs.existsSync(pendingAbs)) {
+      try { fs.unlinkSync(pendingAbs); } catch (_err) { /* non-critical */ }
+    }
+    if (proposal.patchMode === 'fuzzy') {
+      const findAbs = pendingFindPath(proposal.skillName);
+      const replAbs = pendingReplacePath(proposal.skillName);
+      if (fs.existsSync(findAbs)) { try { fs.unlinkSync(findAbs); } catch (_err) {} }
+      if (fs.existsSync(replAbs)) { try { fs.unlinkSync(replAbs); } catch (_err) {} }
+    }
+  }
+
+  return updateProposalStatus(proposal.id, 'rejected');
+}
+
+/**
+ * Direct archival of an active skill. User-invoked; bypasses proposal staging.
+ */
+function archiveSkill(skillName) {
+  validateSkillName(skillName);
+  const activeAbs = activeSkillPath(skillName);
+  if (!fs.existsSync(activeAbs)) {
+    throw new Error(`no active skill at ${toRepoRelative(activeAbs)}`);
+  }
+  const archivedAbs = archivedSkillPath(skillName);
+  ensureDir(path.dirname(archivedAbs));
+  fs.renameSync(activeAbs, archivedAbs);
+  return { skillName, archivedPath: toRepoRelative(archivedAbs) };
+}
+
+// ============================================================
+// Exports
+// ============================================================
+
+module.exports = {
+  // Core API
+  createProposal,
+  listProposals,
+  findProposal,
+  promoteProposal,
+  rejectProposal,
+  archiveSkill,
+
+  // Path helpers (for tests & hooks)
+  pathFor: {
+    proposals: PROPOSALS_FILE,
+    pending: PENDING_DIR,
+    archived: ARCHIVED_DIR,
+    active: ACTIVE_SKILLS_DIR,
+    activeSkill: activeSkillPath,
+    pendingSkill: pendingSkillPath,
+    archivedSkill: archivedSkillPath,
+    pendingFind: pendingFindPath,
+    pendingReplace: pendingReplacePath,
+  },
+
+  // Config access (exposed for tests)
+  getFuzzyPatchThreshold,
+
+  // Low-level helpers (exposed for targeted tests)
+  _internal: {
+    readProposals,
+    writeProposals,
+    updateProposalStatus,
+    validateSkillName,
+    VALID_ACTIONS,
+  },
+};

package/lib/skill-registry.js

@@ -20,7 +20,7 @@ const {
   safeReadJson,
   httpsGet,
   validatePath,
-  safeWriteFile
+  _safeWriteFile
 } = require('./utils');
 
 // Registry configuration

package/lib/wogi-claude

@@ -41,36 +41,151 @@ set -u
 WOGI_CLAUDE_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 WOGI_EXPECT_SCRIPT="$WOGI_CLAUDE_DIR/wogi-claude-expect.exp"
 
-# Detect whether to use the expect wrapper (v2.22.4: OPT-IN only).
-# Four conditions must all hold:
-#   1. WOGI_USE_EXPECT=1 is explicitly set (opt-in)
-#   2. WOGI_NO_EXPECT is NOT set (legacy escape hatch still honored)
-#   3. `expect` is on PATH and the wogi-claude-expect.exp script exists
-#   4. The args include --dangerously-load-development-channels (the only
-#      flag that triggers the dialog we want to auto-dismiss)
+# Detect whether to use the expect wrapper for auto-dismissing the
+# --dangerously-load-development-channels modal.
 #
-# 2.22.3 tried opt-out by default; in practice, expect's text match can miss
-# Ink's ANSI-fragmented output, which deadlocks the dialog (user keystrokes
-# get held in expect's buffer instead of reaching claude). 2.22.4 flips to
-# opt-in so the default UX is predictable.
+# Precedence (highest to lowest):
+#   1. WOGI_NO_EXPECT=1 → always OFF (kill switch)
+#   2. Workspace worker mode → ON automatically (headless, cannot Enter by hand)
+#   3. WOGI_USE_EXPECT=1 → ON (explicit opt-in for interactive users)
+#   4. Default → OFF (interactive users get the native Claude Code dialog)
+#
+# Worker auto-enable (v2.26.2): WOGI_WORKSPACE_ROOT + WOGI_REPO_NAME (worker
+# side) are set by `flow workspace start` before spawning this wrapper, so
+# detection here is reliable. Interactive users never set these vars, so their
+# default remains opt-in — the v2.22.3 regression (expect's text match miss on
+# Ink ANSI output) is bounded to users who explicitly asked for expect.
+#
+# v2.26.3: the expect script now uses `interact -o -re` from second zero —
+# stdin flows to claude throughout, so user keystrokes are NEVER captured
+# by expect. The v2.26.2 approach (rolling buffer + ANSI strip in an expect
+# watch block) had a worse failure mode: on match miss, expect owned stdin
+# for 30s and user keystrokes went into its buffer, making the dialog
+# appear frozen. The new interact approach falls back gracefully — mismatch
+# just means the user dismisses the dialog themselves, no black hole.
+
+__wogi_is_worker=0
+if [ -n "${WOGI_WORKSPACE_ROOT:-}" ] && [ -n "${WOGI_REPO_NAME:-}" ] && \
+   [ "${WOGI_REPO_NAME}" != "manager" ]; then
+  __wogi_is_worker=1
+fi
+
+# --- wf-8294d960 (Story A): worker MCP-stripping + init banner ---
+#
+# Root cause (measured 2026-04-24): cold-boot of claude --print in a project
+# with claude.ai OAuth + 7 integrations takes 10-20s; claude --bare --print is
+# <1s. The ~10-19s gap is Claude Code's init (OAuth + remote MCP handshakes
+# + LSP + plugin sync + CLAUDE.md discovery + background prefetches).
+# WogiFlow's SessionStart hook is ~128ms — <1% of the problem. See
+# .workflow/scratch/wf-8294d960-investigation/root-cause.md for full data.
+#
+# Workers are specialized autonomous code executors; they typically do NOT
+# need Gmail/Slack/Atlassian/etc. integrations for refactoring code. Stripping
+# claude.ai MCP from worker boot saves ~3-7s per restart. Users who genuinely
+# need these integrations per-worker can opt in via the config key below.
+#
+# Opt-in: set config.workspace.inheritClaudeAiMcpIntegrations to true in
+# .workflow/config.json (or env var WOGI_WORKER_INHERIT_MCP=1) to keep
+# claude.ai MCP integrations active in worker mode. Default: strip (fast).
+__wogi_strip_mcp=0
+if [ "$__wogi_is_worker" -eq 1 ]; then
+  __wogi_strip_mcp=1
+  # Env override wins
+  if [ "${WOGI_WORKER_INHERIT_MCP:-}" = "1" ]; then
+    __wogi_strip_mcp=0
+  elif command -v node >/dev/null 2>&1; then
+    # Check config.json; fail-open (strip on any error, matching spec non-negotiable)
+    __wogi_config_inherit="$(node -e '
+      try {
+        const cfg = require(process.cwd() + "/.workflow/config.json");
+        process.stdout.write(String(!!(cfg.workspace && cfg.workspace.inheritClaudeAiMcpIntegrations)));
+      } catch (_e) { process.stdout.write("false"); }
+    ' 2>/dev/null)"
+    if [ "$__wogi_config_inherit" = "true" ]; then
+      __wogi_strip_mcp=0
+    fi
+  fi
+fi
+
+# Resolve the empty-MCP config used for stripping. Persistent path so we don't
+# regenerate a tmpfile on every restart; living in .workflow/state/ keeps it
+# alongside other worker state.
+__wogi_empty_mcp_config=""
+if [ "$__wogi_strip_mcp" -eq 1 ]; then
+  __wogi_empty_mcp_config="${WOGI_WORKSPACE_ROOT:-$(pwd)}/.workflow/state/worker-empty-mcp.json"
+  if [ ! -f "$__wogi_empty_mcp_config" ]; then
+    mkdir -p "$(dirname "$__wogi_empty_mcp_config")" 2>/dev/null
+    printf '{"mcpServers":{}}\n' > "$__wogi_empty_mcp_config" 2>/dev/null || __wogi_strip_mcp=0
+  fi
+fi
+
+# Init banner (C-2): workers take ~5-10s even with MCP stripped; tell the user
+# it's not frozen. Interactive solo users don't see this (only workers).
+if [ "$__wogi_is_worker" -eq 1 ] && [ -t 2 ]; then
+  __wogi_banner_msg="[wogi-claude] worker '${WOGI_REPO_NAME}' initializing"
+  if [ "$__wogi_strip_mcp" -eq 1 ]; then
+    __wogi_banner_msg="$__wogi_banner_msg (claude.ai MCP integrations stripped for speed)"
+  else
+    __wogi_banner_msg="$__wogi_banner_msg (claude.ai MCP inherited — expect +3-7s boot)"
+  fi
+  echo "$__wogi_banner_msg — expected boot ~5-10s, please wait..." >&2
+fi
+
+__wogi_wants_expect=0
+if [ -z "${WOGI_NO_EXPECT:-}" ]; then
+  if [ "$__wogi_is_worker" -eq 1 ] || [ "${WOGI_USE_EXPECT:-}" = "1" ]; then
+    __wogi_wants_expect=1
+  fi
+fi
+
 __wogi_use_expect=0
-if [ "${WOGI_USE_EXPECT:-}" = "1" ] && [ -z "${WOGI_NO_EXPECT:-}" ] && \
-   command -v expect >/dev/null 2>&1 && [ -x "$WOGI_EXPECT_SCRIPT" ]; then
+if [ "$__wogi_wants_expect" -eq 1 ]; then
+  # The dialog only fires when --dangerously-load-development-channels is in
+  # argv; skip the expect dance otherwise.
+  __wogi_has_flag=0
   for arg in "$@"; do
     if [ "$arg" = "--dangerously-load-development-channels" ]; then
-      __wogi_use_expect=1
+      __wogi_has_flag=1
       break
     fi
   done
+  if [ "$__wogi_has_flag" -eq 1 ]; then
+    if command -v expect >/dev/null 2>&1 && [ -x "$WOGI_EXPECT_SCRIPT" ]; then
+      __wogi_use_expect=1
+      if [ "$__wogi_is_worker" -eq 1 ]; then
+        echo "[wogi-claude] worker mode detected — auto-enabled expect-based dialog dismissal" >&2
+      fi
+    elif [ "$__wogi_is_worker" -eq 1 ]; then
+      # Headless worker + missing expect = the dialog WILL deadlock this
+      # worker on restart. Warn loudly so the operator can install expect,
+      # but still start claude (better than failing the worker outright).
+      echo "[wogi-claude] WARNING: worker mode detected (repo '${WOGI_REPO_NAME}') but 'expect' is not installed." >&2
+      echo "[wogi-claude] The --dangerously-load-development-channels dialog will block this worker on the next restart." >&2
+      echo "[wogi-claude] Install expect to enable headless auto-dismiss:" >&2
+      echo "[wogi-claude]   macOS:           brew install expect" >&2
+      echo "[wogi-claude]   Debian/Ubuntu:   apt install expect" >&2
+    fi
+  fi
 fi
 
+# __wogi_claude_args — emit argv with MCP-stripping flags prepended when needed.
+# Uses bash global array so callers expand it with "${__wogi_claude_argv[@]+"${__wogi_claude_argv[@]}"}".
+__wogi_build_argv() {
+  __wogi_claude_argv=()
+  if [ "$__wogi_strip_mcp" -eq 1 ] && [ -n "$__wogi_empty_mcp_config" ]; then
+    __wogi_claude_argv+=(--strict-mcp-config --mcp-config "$__wogi_empty_mcp_config")
+  fi
+  __wogi_claude_argv+=("$@")
+}
+
 # run_claude — invoke claude, routing through expect when we can auto-dismiss
 # the dev-channels dialog. Preserves stdin/stdout/stderr exactly.
 run_claude() {
+  __wogi_build_argv "$@"
   if [ "$__wogi_use_expect" -eq 1 ]; then
-    expect "$WOGI_EXPECT_SCRIPT" "$CLAUDE_BIN" "$@"
+    expect "$WOGI_EXPECT_SCRIPT" "$CLAUDE_BIN" "${__wogi_claude_argv[@]+"${__wogi_claude_argv[@]}"}"
   else
-    "$CLAUDE_BIN" "$@"
+    "$CLAUDE_BIN" "${__wogi_claude_argv[@]+"${__wogi_claude_argv[@]}"}"
   fi
 }
 
@@ -81,10 +196,11 @@ for arg in "$@"; do
     filtered=()
     for a in "$@"; do [ "$a" = "--no-wogi-restart" ] || filtered+=("$a"); done
     CLAUDE_BIN="${WOGI_CLAUDE_BIN:-claude}"
+    __wogi_build_argv "${filtered[@]}"
     if [ "$__wogi_use_expect" -eq 1 ]; then
-      exec expect "$WOGI_EXPECT_SCRIPT" "$CLAUDE_BIN" "${filtered[@]}"
+      exec expect "$WOGI_EXPECT_SCRIPT" "$CLAUDE_BIN" "${__wogi_claude_argv[@]+"${__wogi_claude_argv[@]}"}"
     else
-      exec "$CLAUDE_BIN" "${filtered[@]}"
+      exec "$CLAUDE_BIN" "${__wogi_claude_argv[@]+"${__wogi_claude_argv[@]}"}"
     fi
   fi
 done