poe-code 3.0.191 → 3.0.192

package/dist/providers/poe-agent.js

@@ -609,8 +609,8 @@ function resourceNotFound(resource) {
     `Resource not found: ${resource}`
   );
 }
-function assertAbsolutePath(path28) {
-  if (!isAbsolute(path28)) {
+function assertAbsolutePath(path29) {
+  if (!isAbsolute(path29)) {
     throw invalidParams('"path" must be an absolute path');
   }
 }
@@ -1242,8 +1242,8 @@ async function generateRunReportFromSessionUpdateStream(stream, options = {}) {
   const toolCalls = await extractToolCallSummariesFromSessionUpdateStream(bufferedEntries);
   const usageUpdates = await extractUsageFromSessionUpdateStream(bufferedEntries);
   const usage = summarizeUsage(usageUpdates);
-  const errors = collectErrors(toolCalls, options.errors);
-  const exitStatus = options.exitStatus ?? (errors.length > 0 ? "failed" : "success");
+  const errors2 = collectErrors(toolCalls, options.errors);
+  const exitStatus = options.exitStatus ?? (errors2.length > 0 ? "failed" : "success");
   return {
     runId,
     startTime,
@@ -1251,7 +1251,7 @@ async function generateRunReportFromSessionUpdateStream(stream, options = {}) {
     exitStatus,
     toolCalls,
     usage,
-    errors
+    errors: errors2
   };
 }
 function isSessionUpdateNotification2(entry) {
@@ -1291,12 +1291,12 @@ function summarizeUsage(updates) {
   return usage;
 }
 function collectErrors(toolCalls, additionalErrors) {
-  const errors = [];
+  const errors2 = [];
   for (const toolCall of toolCalls) {
     if (toolCall.status !== "failed") {
       continue;
     }
-    errors.push({
+    errors2.push({
       toolCallId: toolCall.toolCallId,
       message: toErrorMessage(toolCall)
     });
@@ -1305,11 +1305,11 @@ function collectErrors(toolCalls, additionalErrors) {
     for (const message2 of additionalErrors) {
       const text4 = toNonEmptyString(message2);
       if (text4) {
-        errors.push({ message: text4 });
+        errors2.push({ message: text4 });
       }
     }
   }
-  return errors;
+  return errors2;
 }
 function toErrorMessage(toolCall) {
   if (typeof toolCall.rawOutput === "string" && toolCall.rawOutput.length > 0) {
@@ -1392,6 +1392,20 @@ var require_config_toml = __commonJS({
   }
 });
 
+// src/templates/tiny-http-mcp-server/server.mjs.mustache
+var require_server_mjs = __commonJS({
+  "src/templates/tiny-http-mcp-server/server.mjs.mustache"(exports, module) {
+    module.exports = 'import path from "node:path";\nimport { readFile } from "node:fs/promises";\nimport { fileURLToPath, pathToFileURL } from "node:url";\nimport { createHttpServer } from "tiny-http-mcp-server";\n\nfunction isWindowsAbsolutePath(value) {\n  if (value.length < 3) {\n    return false;\n  }\n\n  const drive = value.charCodeAt(0);\n  const separator = value[2];\n  const isLetter =\n    (drive >= 65 && drive <= 90) || (drive >= 97 && drive <= 122);\n\n  return isLetter && value[1] === ":" && (separator === "\\\\" || separator === "/");\n}\n\nfunction resolveModuleSpecifier(baseDir, value) {\n  if (value.startsWith("file:")) {\n    return value;\n  }\n\n  if (value.startsWith(".") || value.startsWith("/") || isWindowsAbsolutePath(value)) {\n    const resolvedPath = path.isAbsolute(value)\n      ? value\n      : path.resolve(baseDir, value);\n    return pathToFileURL(resolvedPath).href;\n  }\n\n  return value;\n}\n\nconst directory = path.dirname(fileURLToPath(import.meta.url));\nconst config = JSON.parse(\n  await readFile(new URL("./config.json", import.meta.url), "utf8")\n);\n\nconst verifierModule = await import(\n  resolveModuleSpecifier(directory, config.oauth.verifierModule)\n);\nconst verifier = verifierModule[config.oauth.verifierExport ?? "default"];\n\nif (!verifier || typeof verifier.verify !== "function") {\n  throw new Error("Verifier module must export an object with a verify() method.");\n}\n\nconst server = createHttpServer({\n  name: config.name,\n  version: config.version,\n  oauth: {\n    resource: config.oauth.resource,\n    authorizationServers: config.oauth.authorizationServers,\n    requiredScopes: config.oauth.requiredScopes,\n    scopesSupported: config.oauth.scopesSupported,\n    bearerMethodsSupported: config.oauth.bearerMethodsSupported,\n    verifier,\n  },\n});\n\nconst handle = await server.listenHttp(config.listen);\n\nconsole.log(handle.url);\n\nconst shutdown = async () => {\n  await handle.close();\n  process.exit(0);\n};\n\nprocess.once("SIGINT", () => {\n  void shutdown();\n});\n\nprocess.once("SIGTERM", () => {\n  void shutdown();\n});\n';
+  }
+});
+
+// src/templates/tiny-http-mcp-server/verify-token.mjs.mustache
+var require_verify_token_mjs = __commonJS({
+  "src/templates/tiny-http-mcp-server/verify-token.mjs.mustache"(exports, module) {
+    module.exports = 'import { TokenVerificationError } from "tiny-http-mcp-server";\n\nexport default {\n  async verify(_input) {\n    throw new TokenVerificationError({\n      error: "invalid_token",\n      errorDescription: "Replace ~/.poe-code/tiny-http-mcp-server/verify-token.mjs with your token verifier.",\n    });\n  },\n};\n';
+  }
+});
+
 // packages/poe-agent/src/runtime/config.ts
 function cloneStringArray(values) {
   if (!values) {
@@ -6830,7 +6844,7 @@ var init_run_context = __esm({
         if (!this.abortController.signal.aborted) {
           this.abortController.abort();
         }
-        const errors = [];
+        const errors2 = [];
         for (let index = this.#disposeHooks.length - 1; index >= 0; index -= 1) {
           const hook = this.#disposeHooks[index];
           if (!hook) {
@@ -6839,12 +6853,12 @@ var init_run_context = __esm({
           try {
             await hook();
           } catch (error2) {
-            errors.push(error2);
+            errors2.push(error2);
             this.#logger.error("Dispose hook failed.", error2);
           }
         }
-        if (errors.length > 0) {
-          throw new AggregateError(errors, "RunContext disposal failed.");
+        if (errors2.length > 0) {
+          throw new AggregateError(errors2, "RunContext disposal failed.");
         }
       }
     };
@@ -7258,6 +7272,107 @@ var init_agent_host = __esm({
   }
 });
 
+// packages/mcp-oauth/src/resource-indicator.ts
+var init_resource_indicator = __esm({
+  "packages/mcp-oauth/src/resource-indicator.ts"() {
+    "use strict";
+  }
+});
+
+// packages/mcp-oauth/src/client/auth-store-session-store.ts
+import crypto from "node:crypto";
+import path12 from "node:path";
+var init_auth_store_session_store = __esm({
+  "packages/mcp-oauth/src/client/auth-store-session-store.ts"() {
+    "use strict";
+    init_src2();
+    init_resource_indicator();
+  }
+});
+
+// packages/mcp-oauth/src/client/authorization-state.ts
+import crypto2 from "node:crypto";
+var init_authorization_state = __esm({
+  "packages/mcp-oauth/src/client/authorization-state.ts"() {
+    "use strict";
+  }
+});
+
+// packages/mcp-oauth/src/client/loopback-authorization.ts
+import http from "node:http";
+var init_loopback_authorization = __esm({
+  "packages/mcp-oauth/src/client/loopback-authorization.ts"() {
+    "use strict";
+    init_authorization_state();
+  }
+});
+
+// packages/mcp-oauth/src/client/pkce.ts
+import crypto3 from "node:crypto";
+var init_pkce = __esm({
+  "packages/mcp-oauth/src/client/pkce.ts"() {
+    "use strict";
+  }
+});
+
+// packages/mcp-oauth/src/client/token-endpoint.ts
+var init_token_endpoint = __esm({
+  "packages/mcp-oauth/src/client/token-endpoint.ts"() {
+    "use strict";
+    init_resource_indicator();
+  }
+});
+
+// packages/mcp-oauth/src/client/default-oauth-client-provider.ts
+import { URL as URL2 } from "node:url";
+var init_default_oauth_client_provider = __esm({
+  "packages/mcp-oauth/src/client/default-oauth-client-provider.ts"() {
+    "use strict";
+    init_auth_store_session_store();
+    init_loopback_authorization();
+    init_authorization_state();
+    init_pkce();
+    init_token_endpoint();
+    init_resource_indicator();
+  }
+});
+
+// packages/mcp-oauth/src/server/jwks-token-verifier.ts
+import {
+  decodeProtectedHeader,
+  errors,
+  importJWK,
+  jwtVerify
+} from "jose";
+var init_jwks_token_verifier = __esm({
+  "packages/mcp-oauth/src/server/jwks-token-verifier.ts"() {
+    "use strict";
+    init_resource_indicator();
+  }
+});
+
+// packages/mcp-oauth/src/index.ts
+var init_src3 = __esm({
+  "packages/mcp-oauth/src/index.ts"() {
+    "use strict";
+    init_auth_store_session_store();
+    init_default_oauth_client_provider();
+    init_loopback_authorization();
+    init_pkce();
+    init_token_endpoint();
+    init_resource_indicator();
+    init_jwks_token_verifier();
+  }
+});
+
+// packages/tiny-mcp-client/src/oauth-discovery.ts
+var init_oauth_discovery = __esm({
+  "packages/tiny-mcp-client/src/oauth-discovery.ts"() {
+    "use strict";
+    init_src3();
+  }
+});
+
 // packages/tiny-mcp-client/src/internal.ts
 import { spawn as spawn3 } from "node:child_process";
 import { PassThrough } from "node:stream";
@@ -7433,6 +7548,10 @@ var MCP_PROTOCOL_VERSION, McpClient, ERROR_PARSE, ERROR_INVALID_REQUEST, ERROR_M
 var init_internal = __esm({
   "packages/tiny-mcp-client/src/internal.ts"() {
     "use strict";
+    init_src3();
+    init_oauth_discovery();
+    init_oauth_discovery();
+    init_src3();
     MCP_PROTOCOL_VERSION = "2025-03-26";
     McpClient = class {
       currentState = "disconnected";
@@ -8179,7 +8298,7 @@ var init_internal = __esm({
 });
 
 // packages/tiny-mcp-client/src/index.ts
-var init_src3 = __esm({
+var init_src4 = __esm({
   "packages/tiny-mcp-client/src/index.ts"() {
     "use strict";
     init_internal();
@@ -8250,7 +8369,7 @@ var DEFAULT_MCP_CLIENT_INFO, PluginApiImpl;
 var init_plugin_api_impl = __esm({
   "packages/poe-agent/src/runtime/plugin-api-impl.ts"() {
     "use strict";
-    init_src3();
+    init_src4();
     init_hooks();
     init_config();
     init_tool_results();
@@ -8495,7 +8614,7 @@ var init_resolve_provider = __esm({
 });
 
 // packages/poe-agent/src/runtime/transcript.ts
-import path12 from "node:path";
+import path13 from "node:path";
 function mapAcpEventToSessionUpdates(event) {
   if (event.type === "message.delta") {
     if (event.content.length === 0) return [];
@@ -8556,11 +8675,11 @@ function mapAcpEventToSessionUpdates(event) {
   return [];
 }
 function createTranscriptWriter(options) {
-  const join2 = options.pathJoin ?? path12.join;
+  const join2 = options.pathJoin ?? path13.join;
   const filePath = resolveTranscriptFilePath(options, join2);
   let dirEnsured;
   let disabled = false;
-  const logDir = path12.dirname(filePath);
+  const logDir = path13.dirname(filePath);
   const ensureDir = () => {
     if (!dirEnsured) {
       dirEnsured = options.fs.mkdir(logDir, { recursive: true });
@@ -9402,7 +9521,7 @@ var init_specifier = __esm({
 });
 
 // packages/agent-defs/src/index.ts
-var init_src4 = __esm({
+var init_src5 = __esm({
   "packages/agent-defs/src/index.ts"() {
     "use strict";
     init_agents();
@@ -9703,7 +9822,7 @@ var allSpawnConfigs, lookup2, acpLookup;
 var init_configs = __esm({
   "packages/agent-spawn/src/configs/index.ts"() {
     "use strict";
-    init_src4();
+    init_src5();
     init_claude_code2();
     init_codex2();
     init_opencode2();
@@ -9744,7 +9863,7 @@ function resolveConfig(agentId) {
 var init_resolve_config = __esm({
   "packages/agent-spawn/src/configs/resolve-config.ts"() {
     "use strict";
-    init_src4();
+    init_src5();
     init_configs();
   }
 });
@@ -9801,7 +9920,7 @@ var init_model_utils = __esm({
 // packages/agent-spawn/src/spawn.ts
 import { spawn as spawnChildProcess2 } from "node:child_process";
 import { mkdirSync, openSync, writeSync, closeSync } from "node:fs";
-import path13 from "node:path";
+import path14 from "node:path";
 function createAbortError() {
   const error2 = new Error("Agent spawn aborted");
   error2.name = "AbortError";
@@ -9986,11 +10105,11 @@ function resolveSpawnLogPath(options) {
   if (!options.logDir || !options.logFileName) {
     return void 0;
   }
-  return path13.join(options.logDir, options.logFileName);
+  return path14.join(options.logDir, options.logFileName);
 }
 function openSpawnLog(filePath) {
   try {
-    mkdirSync(path13.dirname(filePath), { recursive: true });
+    mkdirSync(path14.dirname(filePath), { recursive: true });
     return openSync(filePath, "a");
   } catch {
     return void 0;
@@ -16463,7 +16582,7 @@ var init_static = __esm({
 });
 
 // packages/design-system/src/index.ts
-var init_src5 = __esm({
+var init_src6 = __esm({
   "packages/design-system/src/index.ts"() {
     "use strict";
     init_tokens();
@@ -16587,7 +16706,7 @@ async function renderAcpStream(events) {
 var init_renderer2 = __esm({
   "packages/agent-spawn/src/acp/renderer.ts"() {
     "use strict";
-    init_src5();
+    init_src6();
     init_session_update_converter();
   }
 });
@@ -16604,7 +16723,7 @@ var init_autonomous = __esm({
 });
 
 // packages/agent-spawn/src/acp/replay.ts
-import path14 from "node:path";
+import path15 from "node:path";
 import { homedir as homedir3 } from "node:os";
 import { open, readdir } from "node:fs/promises";
 import { createInterface } from "node:readline";
@@ -16724,21 +16843,21 @@ async function* adaptClaude(lines) {
         if (blockType !== "tool_result") continue;
         const kind = toolKindsById.get(item.tool_use_id);
         toolKindsById.delete(item.tool_use_id);
-        let path28;
+        let path29;
         if (typeof item.content === "string") {
-          path28 = item.content;
+          path29 = item.content;
         } else {
           try {
-            path28 = JSON.stringify(item.content);
+            path29 = JSON.stringify(item.content);
           } catch {
-            path28 = String(item.content);
+            path29 = String(item.content);
           }
         }
         yield {
           event: "tool_complete",
           id: item.tool_use_id,
           kind,
-          path: path28
+          path: path29
         };
       }
     }
@@ -16861,10 +16980,10 @@ async function* adaptCodex(lines) {
         const kindFromStart = toolKindById.get(item.id);
         const kind = kindFromStart ?? (itemType === "command_execution" ? "exec" : itemType === "file_edit" ? "edit" : "other");
         const titleFromEvent = isNonEmptyString(item.path) ? item.path : itemType === "mcp_tool_call" ? `${isNonEmptyString(item.server) ? item.server : "unknown"}.${isNonEmptyString(item.tool) ? item.tool : "unknown"}` : void 0;
-        const path28 = titleFromEvent ?? toolTitleById.get(item.id) ?? "";
+        const path29 = titleFromEvent ?? toolTitleById.get(item.id) ?? "";
         toolTitleById.delete(item.id);
         toolKindById.delete(item.id);
-        yield { event: "tool_complete", id: item.id, kind, path: path28 };
+        yield { event: "tool_complete", id: item.id, kind, path: path29 };
       }
     }
   }
@@ -17299,7 +17418,7 @@ var init_spawn2 = __esm({
 var init_spawn_acp = __esm({
   "packages/agent-spawn/src/acp/spawn-acp.ts"() {
     "use strict";
-    init_src4();
+    init_src5();
     init_src();
     init_configs();
     init_session_update_converter();
@@ -17388,7 +17507,7 @@ function updateSessionFromEvent(ctx, event, toolCallsById) {
   }
   const id = readString(event.id);
   const kind = readString(event.kind);
-  const path28 = readString(event.path);
+  const path29 = readString(event.path);
   let toolCall = id ? toolCallsById.get(id) : void 0;
   if (!toolCall) {
     toolCall = {};
@@ -17403,8 +17522,8 @@ function updateSessionFromEvent(ctx, event, toolCallsById) {
   if (kind) {
     toolCall.kind = kind;
   }
-  if (path28) {
-    toolCall.path = path28;
+  if (path29) {
+    toolCall.path = path29;
   }
 }
 var sessionCapture;
@@ -17490,7 +17609,7 @@ var init_usage_capture = __esm({
 });
 
 // packages/agent-spawn/src/acp/middlewares/spawn-log.ts
-import path15 from "node:path";
+import path16 from "node:path";
 import { homedir as homedir4 } from "node:os";
 import { mkdir as mkdir2, open as open2 } from "node:fs/promises";
 function pad(value, width) {
@@ -17527,14 +17646,14 @@ function resolveLogFilePath(ctx) {
   if (ctx.logPath) {
     return ctx.logPath;
   }
-  const baseDir = ctx.logDir ?? path15.join(homedir4(), ".poe-code", "spawn-logs");
+  const baseDir = ctx.logDir ?? path16.join(homedir4(), ".poe-code", "spawn-logs");
   if (ctx.logFileName) {
-    return path15.join(baseDir, ctx.logFileName);
+    return path16.join(baseDir, ctx.logFileName);
   }
   const startedAt = resolveStartedAt(ctx.startedAt);
   const { day, time, milliseconds } = formatTimestamp(startedAt);
   const fileName = `${day}-${time}-${milliseconds}-${normalizeAgent(ctx.agent)}.jsonl`;
-  return path15.join(baseDir, fileName);
+  return path16.join(baseDir, fileName);
 }
 async function writePreloadedEvents(writer, events) {
   for (const event of events) {
@@ -17552,7 +17671,7 @@ var init_spawn_log = __esm({
       logDirPath;
       constructor(ctx) {
         this.filePath = resolveLogFilePath(ctx);
-        this.logDirPath = path15.dirname(this.filePath);
+        this.logDirPath = path16.dirname(this.filePath);
       }
       async writeEvent(event) {
         if (this.isDisabled) {
@@ -17620,7 +17739,7 @@ var init_spawn_log = __esm({
 });
 
 // packages/agent-spawn/src/index.ts
-var init_src6 = __esm({
+var init_src7 = __esm({
   "packages/agent-spawn/src/index.ts"() {
     "use strict";
     init_run_command();
@@ -17649,7 +17768,7 @@ var gitContext, poe_agent_plugin_git_context_default;
 var init_poe_agent_plugin_git_context = __esm({
   "packages/poe-agent/src/plugins/poe-agent-plugin-git-context.ts"() {
     "use strict";
-    init_src6();
+    init_src7();
     gitContext = (cwd) => ({
       name: "git-context",
       async prompt(ctx) {
@@ -17888,7 +18007,7 @@ __export(src_exports, {
   systemPromptPlugin: () => poe_agent_plugin_system_prompt_default,
   webPlugin: () => poe_agent_plugin_web_default
 });
-var init_src7 = __esm({
+var init_src8 = __esm({
   "packages/poe-agent/src/index.ts"() {
     "use strict";
     init_agent();
@@ -17920,7 +18039,7 @@ var init_src7 = __esm({
 
 // src/providers/poe-agent.ts
 import fsPromises8 from "node:fs/promises";
-import os3 from "node:os";
+import os4 from "node:os";
 
 // src/cli/constants.ts
 var DEFAULT_FRONTIER_MODEL = "anthropic/claude-opus-4.7";
@@ -18064,11 +18183,11 @@ function stripBom(content) {
 function mergeLayers(layers) {
   return mergeObjectLayers(layers, []);
 }
-function mergeObjectLayers(layers, path28) {
+function mergeObjectLayers(layers, path29) {
   const data = {};
   const sources = {};
   for (const key2 of collectKeys(layers)) {
-    const resolved = resolveKey(layers, key2, path28);
+    const resolved = resolveKey(layers, key2, path29);
     if (resolved === void 0) {
       continue;
     }
@@ -18086,7 +18205,7 @@ function collectKeys(layers) {
   }
   return [...keys];
 }
-function resolveKey(layers, key2, path28) {
+function resolveKey(layers, key2, path29) {
   let winningSource;
   let winningValue;
   const objectLayers = [];
@@ -18116,9 +18235,9 @@ function resolveKey(layers, key2, path28) {
   if (winningSource === void 0) {
     return void 0;
   }
-  const fullPath = buildPath(path28, key2);
+  const fullPath = buildPath(path29, key2);
   if (isPlainObject(winningValue)) {
-    const merged = mergeObjectLayers(objectLayers, [...path28, key2]);
+    const merged = mergeObjectLayers(objectLayers, [...path29, key2]);
     return {
       value: merged.data,
       sources: {
@@ -18143,8 +18262,8 @@ function isWinningCandidate(key2, value) {
   }
   return true;
 }
-function buildPath(path28, key2) {
-  return [...path28, key2].join(".");
+function buildPath(path29, key2) {
+  return [...path29, key2].join(".");
 }
 function isPlainObject(value) {
   if (value === null || Array.isArray(value) || typeof value !== "object") {
@@ -18489,13 +18608,13 @@ function parse2(content) {
   if (!content || content.trim() === "") {
     return {};
   }
-  const errors = [];
-  const parsed = jsonc.parse(content, errors, {
+  const errors2 = [];
+  const parsed = jsonc.parse(content, errors2, {
     allowTrailingComma: true,
     disallowComments: false
   });
-  if (errors.length > 0) {
-    throw new Error(`JSON parse error: ${jsonc.printParseErrorCode(errors[0].error)}`);
+  if (errors2.length > 0) {
+    throw new Error(`JSON parse error: ${jsonc.printParseErrorCode(errors2[0].error)}`);
   }
   if (parsed === null || parsed === void 0) {
     return {};
@@ -18739,16 +18858,16 @@ function getConfigFormat(pathOrFormat) {
   }
   return formatRegistry[formatName];
 }
-function detectFormat2(path28) {
-  const ext = getExtension(path28);
+function detectFormat2(path29) {
+  const ext = getExtension(path29);
   return extensionMap[ext];
 }
-function getExtension(path28) {
-  const lastDot = path28.lastIndexOf(".");
+function getExtension(path29) {
+  const lastDot = path29.lastIndexOf(".");
   if (lastDot === -1) {
     return "";
   }
-  return path28.slice(lastDot).toLowerCase();
+  return path29.slice(lastDot).toLowerCase();
 }
 
 // packages/config-mutations/src/execution/path-utils.ts
@@ -19731,7 +19850,9 @@ var templateImports = {
   "py-poe-spawn/env.mustache": () => Promise.resolve().then(() => __toESM(require_env(), 1)),
   "py-poe-spawn/main.py.mustache": () => Promise.resolve().then(() => __toESM(require_main_py(), 1)),
   "py-poe-spawn/requirements.txt.mustache": () => Promise.resolve().then(() => __toESM(require_requirements_txt(), 1)),
-  "codex/config.toml.mustache": () => Promise.resolve().then(() => __toESM(require_config_toml(), 1))
+  "codex/config.toml.mustache": () => Promise.resolve().then(() => __toESM(require_config_toml(), 1)),
+  "tiny-http-mcp-server/server.mjs.mustache": () => Promise.resolve().then(() => __toESM(require_server_mjs(), 1)),
+  "tiny-http-mcp-server/verify-token.mjs.mustache": () => Promise.resolve().then(() => __toESM(require_verify_token_mjs(), 1))
 };
 async function loadTemplate(templateId) {
   const loader = templateImports[templateId];
@@ -19752,6 +19873,7 @@ function createProvider(opts) {
     disabled: opts.disabled,
     supportsStdinPrompt: opts.supportsStdinPrompt,
     supportsMcpSpawn: opts.supportsMcpSpawn,
+    requiresProvider: opts.requiresProvider ?? true,
     configurePrompts: opts.configurePrompts,
     postConfigureMessages: opts.postConfigureMessages,
     extendConfigurePayload: opts.extendConfigurePayload,
@@ -19804,16 +19926,16 @@ function createInstallRunner(definition) {
 }
 
 // src/services/config.ts
-import path27 from "node:path";
-init_src7();
+import path28 from "node:path";
+init_src8();
 
 // packages/superintendent/src/document/parse.ts
-import path16 from "node:path";
+import path17 from "node:path";
 import { parseDocument as parseDocument2 } from "yaml";
 var superintendentDocumentSchemaId = "https://poe-platform.github.io/poe-code/schemas/plans/superintendent.schema.json";
 var validStatusStates = /* @__PURE__ */ new Set(["in_progress", "review", "completed"]);
 function parseSuperintendentDoc(filePath, content) {
-  const resolvedFilePath = path16.resolve(filePath);
+  const resolvedFilePath = path17.resolve(filePath);
   const { frontmatterText, body } = splitFrontmatter(resolvedFilePath, content);
   const parsedFrontmatter = parseYamlFrontmatter(resolvedFilePath, frontmatterText);
   return {
@@ -20003,7 +20125,7 @@ function isRecord3(value) {
 }
 
 // packages/superintendent/src/document/write.ts
-import path17 from "node:path";
+import path18 from "node:path";
 import { isMap, parseDocument as parseDocument3 } from "yaml";
 function updateStatus(filePath, content, status) {
   return updateFrontmatter(filePath, content, (frontmatterDocument) => {
@@ -20024,7 +20146,7 @@ function setStatusReason(filePath, content, reason) {
   });
 }
 function updateFrontmatter(filePath, content, mutate) {
-  const resolvedFilePath = path17.resolve(filePath);
+  const resolvedFilePath = path18.resolve(filePath);
   const parts = splitDocument(resolvedFilePath, content);
   const frontmatterDocument = parseDocument3(parts.frontmatterText);
   if (frontmatterDocument.errors.length > 0) {
@@ -20148,7 +20270,7 @@ function formatFrontmatter(serialized, lineBreak) {
 }
 
 // packages/superintendent/src/document/tasks.ts
-init_src5();
+init_src6();
 function parseTaskBoard(body) {
   const sectionNodes = readTaskBoardSection(body);
   const tasks = [];
@@ -20249,26 +20371,78 @@ function extractText(node) {
 }
 
 // packages/superintendent/src/runtime/loop.ts
-import path21 from "node:path";
+import path22 from "node:path";
 import * as fsPromises6 from "node:fs/promises";
 
 // packages/agent-harness-tools/src/paths.ts
-import path18 from "node:path";
+import path19 from "node:path";
 function resolveWorkflowPath(inputPath, cwd, homeDir) {
   if (inputPath.startsWith("~/")) {
-    return path18.join(homeDir, inputPath.slice(2));
+    return path19.join(homeDir, inputPath.slice(2));
   }
   if (inputPath === "~") {
     return homeDir;
   }
-  return path18.isAbsolute(inputPath) ? inputPath : path18.resolve(cwd, inputPath);
+  return path19.isAbsolute(inputPath) ? inputPath : path19.resolve(cwd, inputPath);
 }
 
 // packages/agent-harness-tools/src/participant.ts
-init_src4();
+init_src5();
 
-// packages/agent-harness-tools/src/lock.ts
+// packages/agent-harness-tools/src/select-agent.ts
+init_src5();
+var supportedAgents = allAgents.map((agent2) => agent2.id).join(", ");
+function resolveSelectedAgent(agent2) {
+  const specifier = parseAgentSpecifier(agent2);
+  const resolvedAgentId = resolveAgentId(specifier.agent);
+  if (!resolvedAgentId) {
+    throw new Error(
+      `Unsupported agent "${agent2}". Supported agents: ${supportedAgents}`
+    );
+  }
+  return {
+    agent: specifier.model ? `${resolvedAgentId}:${specifier.model}` : resolvedAgentId
+  };
+}
+async function resolveLoopAgent(input) {
+  if (input.providedAgent !== void 0) {
+    return resolveSelectedAgent(input.providedAgent);
+  }
+  if (Array.isArray(input.frontmatterAgent)) {
+    throw new Error("array handled by caller");
+  }
+  if (typeof input.frontmatterAgent === "string") {
+    return resolveSelectedAgent(input.frontmatterAgent);
+  }
+  if (input.configuredDefaultAgent !== void 0 && input.configuredDefaultAgent !== null) {
+    return resolveSelectedAgent(input.configuredDefaultAgent);
+  }
+  if (input.assumeYes) {
+    return resolveSelectedAgent(input.fallbackAgent);
+  }
+  const selectedAgent = await input.select({
+    message: input.message,
+    options: allAgents.map((agent2) => ({
+      value: agent2.id,
+      label: agent2.label,
+      hint: agent2.summary
+    }))
+  });
+  if (input.isCancel(selectedAgent)) {
+    return { cancelled: true };
+  }
+  return resolveSelectedAgent(selectedAgent);
+}
+
+// packages/file-lock/src/lock.ts
 import * as fsPromises5 from "node:fs/promises";
+import * as os2 from "node:os";
+var LockTimeoutError = class extends Error {
+  constructor(message2) {
+    super(message2);
+    this.name = "LockTimeoutError";
+  }
+};
 function createAbortError3() {
   const error2 = new Error("The operation was aborted.");
   error2.name = "AbortError";
@@ -20300,7 +20474,7 @@ function sleep(ms, signal) {
   });
 }
 function backoff(attempt, minTimeout, maxTimeout) {
-  const delay = Math.min(maxTimeout, minTimeout * Math.pow(2, attempt));
+  const delay = Math.min(maxTimeout, minTimeout * 2 ** attempt);
   return delay + Math.random() * delay * 0.1;
 }
 function hasErrorCode(error2, code) {
@@ -20308,81 +20482,91 @@ function hasErrorCode(error2, code) {
 }
 function createDefaultFs() {
   return {
-    mkdir: async (path28, options) => {
-      await fsPromises5.mkdir(path28, options);
-    },
-    rmdir: fsPromises5.rmdir,
-    stat: async (path28) => {
-      const stat7 = await fsPromises5.stat(path28);
-      return {
-        isFile: () => stat7.isFile(),
-        isDirectory: () => stat7.isDirectory(),
-        mtimeMs: stat7.mtimeMs
-      };
-    }
+    open: (path29, flags) => fsPromises5.open(path29, flags),
+    stat: fsPromises5.stat,
+    unlink: fsPromises5.unlink
   };
 }
-async function removeLockDirectory(fs4, lockPath) {
+async function removeLockFile(fs4, lockPath) {
   try {
-    await fs4.rmdir(lockPath);
+    await fs4.unlink(lockPath);
   } catch (error2) {
     if (!hasErrorCode(error2, "ENOENT")) {
       throw error2;
     }
   }
 }
-async function lockWorkflow(docPath, options = {}) {
+async function writeLockMetadata(handle) {
+  try {
+    await handle.writeFile(
+      JSON.stringify({ pid: process.pid, host: os2.hostname(), acquiredAt: (/* @__PURE__ */ new Date()).toISOString() }),
+      { encoding: "utf8" }
+    );
+  } catch (ignoredError) {
+    void ignoredError;
+  }
+  try {
+    await handle.close();
+  } catch (ignoredError) {
+    void ignoredError;
+  }
+}
+async function acquireFileLock(filePath, options = {}) {
   const fs4 = options.fs ?? createDefaultFs();
   const retries = options.retries ?? 20;
   const minTimeout = options.minTimeout ?? 25;
   const maxTimeout = options.maxTimeout ?? 250;
   const staleMs = options.staleMs ?? 3e4;
-  const lockPath = `${docPath}.lock`;
-  for (let attempt = 0; attempt <= retries; attempt += 1) {
+  const lockPath = `${filePath}.lock`;
+  let attempt = 0;
+  while (attempt <= retries) {
     throwIfAborted(options.signal);
     try {
-      await fs4.mkdir(lockPath);
+      const handle = await fs4.open(lockPath, "wx");
+      await writeLockMetadata(handle);
       let released = false;
       return async () => {
         if (released) {
           return;
         }
         released = true;
-        await removeLockDirectory(fs4, lockPath);
+        await removeLockFile(fs4, lockPath);
       };
     } catch (error2) {
       if (!hasErrorCode(error2, "EEXIST")) {
         throw error2;
       }
-      let stat7;
-      try {
-        stat7 = await fs4.stat(lockPath);
-      } catch (statError) {
-        if (hasErrorCode(statError, "ENOENT")) {
-          continue;
-        }
-        throw statError;
-      }
-      if (Date.now() - stat7.mtimeMs > staleMs) {
-        await removeLockDirectory(fs4, lockPath);
+    }
+    let stat7;
+    try {
+      stat7 = await fs4.stat(lockPath);
+    } catch (statError) {
+      if (hasErrorCode(statError, "ENOENT")) {
         continue;
       }
-      if (attempt < retries) {
-        await sleep(backoff(attempt, minTimeout, maxTimeout), options.signal);
-      }
+      throw statError;
     }
+    if (Date.now() - stat7.mtimeMs > staleMs) {
+      await removeLockFile(fs4, lockPath);
+      continue;
+    }
+    if (attempt >= retries) {
+      break;
+    }
+    await sleep(backoff(attempt, minTimeout, maxTimeout), options.signal);
+    attempt += 1;
   }
-  throw new Error(`Failed to acquire lock on "${docPath}".`);
+  throw new LockTimeoutError(`Failed to acquire lock on "${filePath}".`);
 }
 
 // packages/agent-harness-tools/src/run-logs.ts
-import path19 from "node:path";
+import path20 from "node:path";
 function resolveRunLogDir(options) {
   const slug = slugifyPlanPath(options.planPath);
-  return path19.join(options.homeDir, ".poe-code", "logs", options.runner, slug);
+  return path20.join(options.homeDir, ".poe-code", "logs", options.runner, slug);
 }
 function slugifyPlanPath(planPath) {
-  const base = path19.basename(planPath);
+  const base = path20.basename(planPath);
   const dot = base.lastIndexOf(".");
   const stem = dot > 0 ? base.slice(0, dot) : base;
   return slugifyLabel(stem);
@@ -20443,7 +20627,7 @@ Write the plan file to \`<plan-directory>/<name>.md\`.`;
 }
 
 // packages/superintendent/src/runtime/loop.ts
-init_src6();
+init_src7();
 
 // packages/superintendent/src/state/machine.ts
 var DEFAULT_MAX_ROUNDS = 100;
@@ -20459,18 +20643,18 @@ function createLoopState(doc) {
 }
 
 // packages/superintendent/src/runtime/run-builder.ts
-init_src6();
+init_src7();
 
 // packages/superintendent/src/runtime/resolve-cwd.ts
-import path20 from "node:path";
+import path21 from "node:path";
 function resolveRoleCwd(role, docPath, defaultCwd) {
   if (role.cwd === void 0) {
     return defaultCwd;
   }
-  if (path20.isAbsolute(role.cwd)) {
+  if (path21.isAbsolute(role.cwd)) {
     return role.cwd;
   }
-  return path20.resolve(path20.dirname(docPath), role.cwd);
+  return path21.resolve(path21.dirname(docPath), role.cwd);
 }
 
 // packages/superintendent/src/runtime/templates.ts
@@ -20594,7 +20778,7 @@ function readString2(value) {
 }
 
 // packages/superintendent/src/runtime/run-inspector.ts
-init_src6();
+init_src7();
 
 // packages/superintendent/src/runtime/system-prompt.ts
 function buildSuperintendentSystemPrompt(input) {
@@ -20780,7 +20964,7 @@ function readString3(value) {
 }
 
 // packages/superintendent/src/runtime/run-owner-review.ts
-init_src6();
+init_src7();
 
 // packages/superintendent/src/runtime/workflow-tool.ts
 function createWorkflowTool(role, state) {
@@ -21075,7 +21259,7 @@ function isRecord6(value) {
 }
 
 // packages/superintendent/src/runtime/run-superintendent.ts
-init_src6();
+init_src7();
 var SUPERINTENDENT_TOOLS_SERVER_NAME = "superintendent-tools";
 var SUPERINTENDENT_TOOLS_SERVER_COMMAND = "poe-superintendent-mcp";
 var SUPERINTENDENT_TOOLS_SERVER_SUBCOMMAND = "superintendent-tools";
@@ -21274,7 +21458,9 @@ function isRecord7(value) {
 // packages/superintendent/src/runtime/loop.ts
 async function runLoop2(input, callbacks) {
   const options = normalizeOptions(input, callbacks);
-  const releaseLock = await lockWorkflow(options.docPath, { fs: options.fs });
+  const releaseLock = await acquireFileLock(options.docPath, {
+    fs: options.fs
+  });
   try {
     return await withInjectedAgentRunner(options, async () => {
       let state = createLoopState(await readDocument2(options.fs, options.docPath));
@@ -21296,7 +21482,7 @@ async function runLoop2(input, callbacks) {
           options.callbacks.onBuilderStart?.();
           let builderResult;
           try {
-            builderResult = await runBuilder(
+            builderResult = await options.runners.builder(
               await readDocument2(options.fs, options.docPath),
               createTemplateContext(context),
               buildRoleOptions(options, "builder")
@@ -21329,7 +21515,7 @@ async function runLoop2(input, callbacks) {
             const inspectorSnapshot = await readDocumentContent(options.fs, options.docPath);
             let inspectorResult;
             try {
-              inspectorResult = await runInspector(
+              inspectorResult = await options.runners.inspector(
                 name,
                 config,
                 await readDocument2(options.fs, options.docPath),
@@ -21420,7 +21606,7 @@ async function runLoop2(input, callbacks) {
         const ownerSnapshot = await readDocumentContent(options.fs, options.docPath);
         let ownerResult;
         try {
-          ownerResult = await runOwnerReview(
+          ownerResult = await options.runners.ownerReview(
             await readDocument2(options.fs, options.docPath),
             createTemplateContext(context),
             buildRoleOptions(options, "owner")
@@ -21475,6 +21661,7 @@ function normalizeOptions(input, callbacks) {
       homeDir: input.homeDir,
       fs: input.fs ?? createDefaultFs2(),
       callbacks: input.callbacks ?? {},
+      runners: resolveRunners(input.runners),
       ...input.runAgent ? { runAgent: input.runAgent } : {},
       ...input.signal ? { signal: input.signal } : {},
       ...input.logDir ? { logDir: input.logDir } : {}
@@ -21487,14 +21674,24 @@ function normalizeOptions(input, callbacks) {
     cwd,
     homeDir,
     fs: createDefaultFs2(),
-    callbacks: callbacks ?? {}
+    callbacks: callbacks ?? {},
+    runners: resolveRunners()
   };
 }
-function createDefaultFs2() {
+function resolveRunners(overrides) {
   return {
+    builder: overrides?.builder ?? runBuilder,
+    inspector: overrides?.inspector ?? runInspector,
+    superintendent: overrides?.superintendent ?? runSuperintendent,
+    ownerReview: overrides?.ownerReview ?? runOwnerReview
+  };
+}
+function createDefaultFs2() {
+  const fs4 = {
     readFile: fsPromises6.readFile,
     writeFile: fsPromises6.writeFile,
     readdir: fsPromises6.readdir,
+    open: (filePath, flags) => fsPromises6.open(filePath, flags),
     stat: async (filePath) => {
       const stat7 = await fsPromises6.stat(filePath);
       return {
@@ -21503,6 +21700,9 @@ function createDefaultFs2() {
         mtimeMs: stat7.mtimeMs
       };
     },
+    unlink: async (filePath) => {
+      await fsPromises6.unlink(filePath);
+    },
     mkdir: async (filePath, options) => {
       await fsPromises6.mkdir(filePath, options);
     },
@@ -21513,6 +21713,7 @@ function createDefaultFs2() {
       await fsPromises6.rename(oldPath, newPath);
     }
   };
+  return fs4;
 }
 async function readDocument2(fs4, docPath) {
   const content = await readDocumentContent(fs4, docPath);
@@ -21585,7 +21786,7 @@ async function executeSuperintendent(options, context) {
   const snapshot = await readDocumentContent(options.fs, options.docPath);
   try {
     const doc = await readDocument2(options.fs, options.docPath);
-    const result = await runSuperintendent(
+    const result = await options.runners.superintendent(
       doc,
       createTemplateContext(context),
       buildRoleOptions(options, "superintendent")
@@ -21600,7 +21801,7 @@ async function executeSuperintendent(options, context) {
 function buildRoleOptions(options, role) {
   return {
     defaultCwd: options.cwd,
-    ...options.logDir ? { logPath: path21.join(options.logDir, makeRunLogFileName(role)) } : {}
+    ...options.logDir ? { logPath: path22.join(options.logDir, makeRunLogFileName(role)) } : {}
   };
 }
 function shouldContinueReview(doc) {
@@ -21699,6 +21900,96 @@ async function withInjectedAgentRunner(options, operation) {
 // packages/toolcraft/src/index.ts
 import { fileURLToPath as fileURLToPath2 } from "node:url";
 
+// packages/toolcraft/src/user-error.ts
+var UserError = class extends Error {
+  constructor(message2) {
+    super(message2);
+    this.name = "UserError";
+  }
+};
+
+// packages/toolcraft/src/human-in-loop/config.ts
+function validateHumanInLoopOnDefine(config) {
+  const label = Array.isArray(config.children) ? "group" : "command";
+  if (config.confirm === true && config.humanInLoop !== void 0 && config.humanInLoop !== null) {
+    throw new Error(`${label} '${config.name}': use either confirm or humanInLoop, not both`);
+  }
+  if (config.humanInLoop === void 0 || config.humanInLoop === null) {
+    return;
+  }
+  if (config.humanInLoop.mode !== "sync" && config.humanInLoop.mode !== "async") {
+    throw new Error(`${label} '${config.name}': humanInLoop.mode must be "sync" or "async"`);
+  }
+  if (typeof config.humanInLoop.message !== "function") {
+    throw new Error(`${label} '${config.name}': humanInLoop.message must be a function`);
+  }
+}
+function mergeHumanInLoopFromGroup(groupHumanInLoop, childHumanInLoop) {
+  if (childHumanInLoop !== void 0) {
+    return childHumanInLoop;
+  }
+  return groupHumanInLoop;
+}
+
+// packages/toolcraft-schema/src/json.ts
+function Json() {
+  return {
+    kind: "json"
+  };
+}
+
+// packages/toolcraft-schema/src/oneof.ts
+function assertValidBranches(branches) {
+  if (Object.keys(branches).length === 0) {
+    throw new Error("OneOf schema requires at least one branch");
+  }
+}
+function OneOf(config) {
+  assertValidBranches(config.branches);
+  return {
+    kind: "oneOf",
+    discriminator: config.discriminator,
+    branches: config.branches
+  };
+}
+
+// packages/toolcraft-schema/src/record.ts
+function Record(value) {
+  return {
+    kind: "record",
+    value
+  };
+}
+
+// packages/toolcraft-schema/src/union.ts
+function isOptionalSchema(schema) {
+  return schema.kind === "optional";
+}
+function getRequiredKeyFingerprint(schema) {
+  const requiredKeys = Object.keys(schema.shape).filter((key2) => !isOptionalSchema(schema.shape[key2])).sort();
+  return JSON.stringify(requiredKeys);
+}
+function assertValidBranches2(branches) {
+  if (branches.length === 0) {
+    throw new Error("Union schema requires at least one branch");
+  }
+  const fingerprints = /* @__PURE__ */ new Set();
+  for (const branch of branches) {
+    const fingerprint = getRequiredKeyFingerprint(branch);
+    if (fingerprints.has(fingerprint)) {
+      throw new Error("Union schema branches must have unique required-key fingerprints");
+    }
+    fingerprints.add(fingerprint);
+  }
+}
+function Union(branches) {
+  assertValidBranches2(branches);
+  return {
+    kind: "union",
+    branches
+  };
+}
+
 // packages/toolcraft-schema/src/index.ts
 function assertValidEnumValues(values) {
   if (values.length === 0) {
@@ -21755,19 +22046,17 @@ var S = {
       kind: "optional",
       inner
     };
-  }
+  },
+  OneOf,
+  Union,
+  Record,
+  Json
 };
 
 // packages/toolcraft/src/index.ts
 var commandConfigSymbol = /* @__PURE__ */ Symbol("toolcraft.command.config");
 var groupConfigSymbol = /* @__PURE__ */ Symbol("toolcraft.group.config");
 var commandSourcePathSymbol = /* @__PURE__ */ Symbol("toolcraft.command.sourcePath");
-var UserError = class extends Error {
-  constructor(message2) {
-    super(message2);
-    this.name = "UserError";
-  }
-};
 function cloneScope(scope) {
   return scope === void 0 ? void 0 : [...scope];
 }
@@ -21796,6 +22085,56 @@ function cloneRequires(requires) {
     check: requires.check
   };
 }
+function cloneStringArray2(values) {
+  return values === void 0 ? void 0 : [...values];
+}
+function cloneStringRecord4(values) {
+  return values === void 0 ? void 0 : { ...values };
+}
+function cloneMcpServerConfig2(config) {
+  if (config === void 0) {
+    return void 0;
+  }
+  if (config.transport === "stdio") {
+    return {
+      transport: "stdio",
+      command: config.command,
+      args: cloneStringArray2(config.args),
+      env: cloneStringRecord4(config.env)
+    };
+  }
+  return {
+    transport: "http",
+    url: config.url,
+    headers: cloneStringRecord4(config.headers)
+  };
+}
+function cloneRenameMap(rename3) {
+  return rename3 === void 0 ? void 0 : { ...rename3 };
+}
+function validateRenameMap(rename3) {
+  if (rename3 === void 0) {
+    return;
+  }
+  const seenTargets = /* @__PURE__ */ new Map();
+  for (const [upstreamName, targetPath] of Object.entries(rename3)) {
+    if (targetPath.length === 0) {
+      throw new UserError(`Invalid rename target for upstream tool "${upstreamName}": path cannot be empty.`);
+    }
+    if (targetPath.split(".").some((segment) => segment.length === 0)) {
+      throw new UserError(
+        `Invalid rename target for upstream tool "${upstreamName}": "${targetPath}" contains an empty segment.`
+      );
+    }
+    const existingUpstreamName = seenTargets.get(targetPath);
+    if (existingUpstreamName !== void 0) {
+      throw new UserError(
+        `Duplicate rename target "${targetPath}" for upstream tools "${existingUpstreamName}" and "${upstreamName}".`
+      );
+    }
+    seenTargets.set(targetPath, upstreamName);
+  }
+}
 function parseStackPath(candidate) {
   if (candidate.startsWith("file://")) {
     try {
@@ -21898,6 +22237,7 @@ function createBaseCommand(config) {
     secrets: cloneSecrets(config.secrets),
     scope: resolveCommandScope(config.scope, void 0),
     confirm: config.confirm ?? false,
+    humanInLoop: config.humanInLoop,
     requires: cloneRequires(config.requires),
     handler: config.handler,
     render: config.render
@@ -21905,6 +22245,7 @@ function createBaseCommand(config) {
   Object.defineProperty(command, commandConfigSymbol, {
     value: {
       scope: cloneScope(config.scope),
+      humanInLoop: config.humanInLoop,
       secrets: cloneSecrets(config.secrets),
       requires: cloneRequires(config.requires),
       sourcePath: inferCommandSourcePath()
@@ -21919,6 +22260,7 @@ function createBaseGroup(config) {
     description: config.description,
     aliases: [...config.aliases ?? []],
     scope: resolveGroupScope(config.scope, void 0),
+    humanInLoop: config.humanInLoop,
     secrets: cloneSecrets(config.secrets),
     requires: cloneRequires(config.requires),
     children: [],
@@ -21926,8 +22268,12 @@ function createBaseGroup(config) {
   };
   Object.defineProperty(group, groupConfigSymbol, {
     value: {
+      mcp: cloneMcpServerConfig2(config.mcp),
       scope: cloneScope(config.scope),
+      humanInLoop: config.humanInLoop,
       secrets: cloneSecrets(config.secrets),
+      tools: cloneStringArray2(config.tools),
+      rename: cloneRenameMap(config.rename),
       requires: cloneRequires(config.requires),
       children: [...config.children],
       default: config.default
@@ -21953,6 +22299,7 @@ function materializeCommand(command, inherited) {
     secrets: mergeSecrets(inherited.secrets, internal.secrets),
     scope: resolveCommandScope(internal.scope, inherited.scope),
     confirm: command.confirm,
+    humanInLoop: mergeHumanInLoopFromGroup(inherited.humanInLoop, internal.humanInLoop),
     requires: mergeRequires(inherited.requires, internal.requires),
     handler: command.handler,
     render: command.render
@@ -21960,6 +22307,7 @@ function materializeCommand(command, inherited) {
   Object.defineProperty(materialized, commandConfigSymbol, {
     value: {
       scope: cloneScope(internal.scope),
+      humanInLoop: internal.humanInLoop,
       secrets: cloneSecrets(internal.secrets),
       requires: cloneRequires(internal.requires),
       sourcePath: internal.sourcePath
@@ -21970,18 +22318,18 @@ function materializeCommand(command, inherited) {
   });
   return materialized;
 }
+function mergeInheritedMetadata(group, inherited) {
+  return {
+    scope: resolveGroupScope(group.scope, inherited.scope),
+    humanInLoop: mergeHumanInLoopFromGroup(inherited.humanInLoop, group.humanInLoop),
+    secrets: mergeSecrets(inherited.secrets, group.secrets),
+    requires: mergeRequires(inherited.requires, group.requires)
+  };
+}
 function materializeGroup(group, inherited) {
   const internal = getInternalGroupConfig(group);
-  const scope = resolveGroupScope(internal.scope, inherited.scope);
-  const secrets = mergeSecrets(inherited.secrets, internal.secrets);
-  const requires = mergeRequires(inherited.requires, internal.requires);
-  const materializedChildren = internal.children.map(
-    (child) => materializeNode(child, {
-      scope,
-      secrets,
-      requires
-    })
-  );
+  const mergedInherited = mergeInheritedMetadata(internal, inherited);
+  const materializedChildren = internal.children.map((child) => materializeNode(child, mergedInherited));
   let defaultChild;
   if (internal.default !== void 0) {
     const defaultIndex = internal.children.indexOf(internal.default);
@@ -21999,16 +22347,21 @@ function materializeGroup(group, inherited) {
     name: group.name,
     description: group.description,
     aliases: [...group.aliases],
-    scope,
-    secrets,
-    requires,
+    scope: mergedInherited.scope,
+    humanInLoop: mergedInherited.humanInLoop,
+    secrets: mergedInherited.secrets,
+    requires: mergedInherited.requires,
     children: materializedChildren,
     default: defaultChild
   };
   Object.defineProperty(materialized, groupConfigSymbol, {
     value: {
+      mcp: cloneMcpServerConfig2(internal.mcp),
       scope: cloneScope(internal.scope),
+      humanInLoop: internal.humanInLoop,
       secrets: cloneSecrets(internal.secrets),
+      tools: cloneStringArray2(internal.tools),
+      rename: cloneRenameMap(internal.rename),
       requires: cloneRequires(internal.requires),
       children: [...internal.children],
       default: internal.default
@@ -22023,54 +22376,66 @@ function materializeNode(node, inherited) {
   return materializeGroup(node, inherited);
 }
 function defineCommand(config) {
+  validateHumanInLoopOnDefine(config);
   return materializeCommand(createBaseCommand(config), {
     scope: void 0,
+    humanInLoop: void 0,
     secrets: {},
     requires: void 0
   });
 }
 function defineGroup(config) {
+  validateRenameMap(config.rename);
+  validateHumanInLoopOnDefine(config);
   return materializeGroup(createBaseGroup(config), {
     scope: void 0,
+    humanInLoop: void 0,
     secrets: {},
     requires: void 0
   });
 }
 
 // packages/superintendent/src/commands/builder-group.ts
-init_src5();
+init_src6();
 var builderRunParams = S.Object({
   path: S.String({ description: "Path to the superintendent markdown document" })
 });
-var builderRunCommand = defineCommand({
-  name: "run",
-  description: "Run the configured builder agent.",
-  positional: ["path"],
-  params: builderRunParams,
-  scope: ["cli", "mcp", "sdk"],
-  handler: async ({ params, fs: fs4 }) => {
-    const content = await readDocument3(params.path, fs4);
-    const document = parseSuperintendentDoc(params.path, content);
-    return runBuilder(document, {}, { defaultCwd: process.cwd() });
-  },
-  render: {
-    rich: (result, { logger: logger2 }) => {
-      logger2.success("Builder run completed.");
-      logger2.message(text.section("Summary:"));
-      logger2.message(result.summary);
-      logger2.message(text.section("Log:"));
-      logger2.message(result.log || "(no output)");
+function createBuilderRunCommand(runners) {
+  const runBuilderImpl = runners?.runBuilder ?? runBuilder;
+  return defineCommand({
+    name: "run",
+    description: "Run the configured builder agent.",
+    positional: ["path"],
+    params: builderRunParams,
+    scope: ["cli", "mcp", "sdk"],
+    handler: async ({ params, fs: fs4 }) => {
+      const content = await readDocument3(params.path, fs4);
+      const document = parseSuperintendentDoc(params.path, content);
+      return runBuilderImpl(document, {}, { defaultCwd: process.cwd() });
     },
-    markdown: (result) => renderBuilderMarkdown(result),
-    json: (result) => result
-  }
-});
-var builderGroup = defineGroup({
-  name: "builder",
-  description: "Builder commands.",
-  scope: ["cli", "mcp", "sdk"],
-  children: [builderRunCommand]
-});
+    render: {
+      rich: (result, { logger: logger2 }) => {
+        logger2.success("Builder run completed.");
+        logger2.message(text.section("Summary:"));
+        logger2.message(result.summary);
+        logger2.message(text.section("Log:"));
+        logger2.message(result.log || "(no output)");
+      },
+      markdown: (result) => renderBuilderMarkdown(result),
+      json: (result) => result
+    }
+  });
+}
+var builderRunCommand = createBuilderRunCommand();
+function createBuilderGroup(runners) {
+  return defineGroup({
+    name: "builder",
+    description: "Builder commands.",
+    scope: ["cli", "mcp", "sdk"],
+    children: [createBuilderRunCommand(runners)]
+  });
+}
+var builderGroup = createBuilderGroup();
 async function readDocument3(filePath, fs4) {
   try {
     return await fs4.readFile(filePath, "utf8");
@@ -22102,14 +22467,14 @@ function hasCode2(error2, code) {
 }
 
 // packages/superintendent/src/commands/install.ts
-import path24 from "node:path";
-import { readFile as readFile4, stat as stat4, mkdir as mkdir5, writeFile as writeFile2, unlink, readdir as readdir3, chmod as chmod2 } from "node:fs/promises";
+import path25 from "node:path";
+import { readFile as readFile4, stat as stat4, mkdir as mkdir4, writeFile as writeFile2, unlink as unlink3, readdir as readdir3, chmod as chmod2 } from "node:fs/promises";
 import { fileURLToPath as fileURLToPath4 } from "node:url";
 
 // packages/agent-skill-config/src/configs.ts
-init_src4();
-import os2 from "node:os";
-import path22 from "node:path";
+init_src5();
+import os3 from "node:os";
+import path23 from "node:path";
 var agentSkillConfigs = {
   "claude-code": {
     globalSkillDir: "~/.claude/skills",
@@ -22128,7 +22493,7 @@ var agentSkillConfigs = {
     localSkillDir: ".agents/skills"
   }
 };
-var supportedAgents = Object.keys(agentSkillConfigs);
+var supportedAgents2 = Object.keys(agentSkillConfigs);
 function resolveAgentSupport(input, registry = agentSkillConfigs) {
   const resolvedId = resolveAgentId(input);
   if (!resolvedId) {
@@ -22143,7 +22508,7 @@ function resolveAgentSupport(input, registry = agentSkillConfigs) {
 
 // packages/agent-skill-config/src/templates.ts
 import { readFile as readFile3, stat as stat3 } from "node:fs/promises";
-import path23 from "node:path";
+import path24 from "node:path";
 import { fileURLToPath as fileURLToPath3 } from "node:url";
 
 // packages/agent-skill-config/src/apply.ts
@@ -22204,8 +22569,8 @@ async function installSkill(agentId, skill, options) {
 var fs2 = {
   readFile: (p, encoding) => readFile4(p, encoding),
   writeFile: (p, content) => writeFile2(p, content),
-  mkdir: (p, options) => mkdir5(p, options).then(() => void 0),
-  unlink: (p) => unlink(p),
+  mkdir: (p, options) => mkdir4(p, options).then(() => void 0),
+  unlink: (p) => unlink3(p),
   stat: (p) => stat4(p).then((s) => ({ mode: s.mode })),
   readdir: (p) => readdir3(p),
   chmod: (p, mode) => chmod2(p, mode)
@@ -22252,7 +22617,7 @@ var installCommand = defineCommand({
     const absolutePlanDirectory = resolveAbsoluteDirectory(planDirectory, cwd, homeDir);
     let planDirectoryCreated = false;
     if (!await pathExists2(absolutePlanDirectory)) {
-      await mkdir5(absolutePlanDirectory, { recursive: true });
+      await mkdir4(absolutePlanDirectory, { recursive: true });
       planDirectoryCreated = true;
     }
     return {
@@ -22297,9 +22662,9 @@ async function resolvePlanDirectory(cwd, homeDir, env) {
 }
 function resolveAbsoluteDirectory(dir, cwd, homeDir) {
   if (dir.startsWith("~/")) {
-    return path24.join(homeDir, dir.slice(2));
+    return path25.join(homeDir, dir.slice(2));
   }
-  return path24.isAbsolute(dir) ? dir : path24.resolve(cwd, dir);
+  return path25.isAbsolute(dir) ? dir : path25.resolve(cwd, dir);
 }
 async function pathExists2(targetPath) {
   try {
@@ -22319,15 +22684,15 @@ async function loadSkillTemplate() {
   }
   const packageRoot = await findPackageRoot(fileURLToPath4(import.meta.url));
   const templateRoots = [
-    path24.join(packageRoot, "src", "templates"),
-    path24.join(packageRoot, "dist", "templates")
+    path25.join(packageRoot, "src", "templates"),
+    path25.join(packageRoot, "dist", "templates")
   ];
   for (const templateRoot of templateRoots) {
     if (!await pathExists2(templateRoot)) {
       continue;
     }
     skillTemplateCache = await readFile4(
-      path24.join(templateRoot, "SKILL_superintendent.md"),
+      path25.join(templateRoot, "SKILL_superintendent.md"),
       "utf8"
     );
     return skillTemplateCache;
@@ -22335,12 +22700,12 @@ async function loadSkillTemplate() {
   throw new Error("Unable to locate Superintendent skill template.");
 }
 async function findPackageRoot(entryFilePath) {
-  let currentPath = path24.dirname(entryFilePath);
+  let currentPath = path25.dirname(entryFilePath);
   while (true) {
-    if (await pathExists2(path24.join(currentPath, "package.json"))) {
+    if (await pathExists2(path25.join(currentPath, "package.json"))) {
       return currentPath;
     }
-    const parentPath = path24.dirname(currentPath);
+    const parentPath = path25.dirname(currentPath);
     if (parentPath === currentPath) {
       throw new Error("Unable to locate package root for Superintendent templates.");
     }
@@ -22397,46 +22762,54 @@ var inspectorListCommand = defineCommand({
     json: (result) => result
   }
 });
-var inspectorRunCommand = defineCommand({
-  name: "run",
-  description: "Run one configured inspector, or all inspectors when no name is provided.",
-  positional: ["path", "name"],
-  params: inspectorRunParams,
-  scope: ["cli", "mcp", "sdk"],
-  handler: async ({ params, fs: fs4 }) => {
-    const content = await readDocument4(params.path, fs4);
-    const document = parseSuperintendentDoc(params.path, content);
-    const defaultCwd = process.cwd();
-    if (params.name === void 0) {
-      return runAllInspectors(document, {}, { defaultCwd });
-    }
-    const config = document.frontmatter.inspectors?.[params.name];
-    if (config === void 0) {
-      throw new UserError(`Inspector not found: ${params.name}`);
-    }
-    return [await runInspector(params.name, config, document, {}, { defaultCwd })];
-  },
-  render: {
-    rich: (result, { logger: logger2 }) => {
-      if (result.length === 0) {
-        logger2.message("No inspectors configured.");
-        return;
-      }
-      logger2.success(`Completed ${result.length} inspector run${result.length === 1 ? "" : "s"}.`);
-      for (const inspector of result) {
-        logger2.message(`${inspector.name}: ${inspector.summary || "(no output)"}`);
-      }
+function createInspectorRunCommand(runners) {
+  const runInspectorImpl = runners?.runInspector ?? runInspector;
+  const runAllInspectorsImpl = runners?.runAllInspectors ?? runAllInspectors;
+  return defineCommand({
+    name: "run",
+    description: "Run one configured inspector, or all inspectors when no name is provided.",
+    positional: ["path", "name"],
+    params: inspectorRunParams,
+    scope: ["cli", "mcp", "sdk"],
+    handler: async ({ params, fs: fs4 }) => {
+      const content = await readDocument4(params.path, fs4);
+      const document = parseSuperintendentDoc(params.path, content);
+      const defaultCwd = process.cwd();
+      if (params.name === void 0) {
+        return runAllInspectorsImpl(document, {}, { defaultCwd });
+      }
+      const config = document.frontmatter.inspectors?.[params.name];
+      if (config === void 0) {
+        throw new UserError(`Inspector not found: ${params.name}`);
+      }
+      return [await runInspectorImpl(params.name, config, document, {}, { defaultCwd })];
     },
-    markdown: (result) => renderInspectorRunMarkdown(result),
-    json: (result) => result
-  }
-});
-var inspectorGroup = defineGroup({
-  name: "inspector",
-  description: "Inspector commands.",
-  scope: ["cli", "mcp", "sdk"],
-  children: [inspectorListCommand, inspectorRunCommand]
-});
+    render: {
+      rich: (result, { logger: logger2 }) => {
+        if (result.length === 0) {
+          logger2.message("No inspectors configured.");
+          return;
+        }
+        logger2.success(`Completed ${result.length} inspector run${result.length === 1 ? "" : "s"}.`);
+        for (const inspector of result) {
+          logger2.message(`${inspector.name}: ${inspector.summary || "(no output)"}`);
+        }
+      },
+      markdown: (result) => renderInspectorRunMarkdown(result),
+      json: (result) => result
+    }
+  });
+}
+var inspectorRunCommand = createInspectorRunCommand();
+function createInspectorGroup(runners) {
+  return defineGroup({
+    name: "inspector",
+    description: "Inspector commands.",
+    scope: ["cli", "mcp", "sdk"],
+    children: [inspectorListCommand, createInspectorRunCommand(runners)]
+  });
+}
+var inspectorGroup = createInspectorGroup();
 async function readDocument4(filePath, fs4) {
   try {
     return await fs4.readFile(filePath, "utf8");
@@ -22474,7 +22847,7 @@ function hasCode3(error2, code) {
 }
 
 // packages/superintendent/src/commands/superintendent-group.ts
-init_src5();
+init_src6();
 
 // packages/superintendent/src/commands/complete.ts
 var completeParams = S.Object({
@@ -22530,13 +22903,13 @@ function hasCode4(error2, code) {
 }
 
 // packages/superintendent/src/commands/plan-path.ts
-import path25 from "node:path";
-import { readFile as readFile5, writeFile as writeFile3, mkdir as mkdir6, unlink as unlink2, stat as stat5, readdir as readdir4 } from "node:fs/promises";
+import path26 from "node:path";
+import { readFile as readFile5, writeFile as writeFile3, mkdir as mkdir5, unlink as unlink4, stat as stat5, readdir as readdir4 } from "node:fs/promises";
 var fs3 = {
   readFile: (p, encoding) => readFile5(p, encoding),
   writeFile: (p, content) => writeFile3(p, content),
-  mkdir: (p, options) => mkdir6(p, options).then(() => void 0),
-  unlink: (p) => unlink2(p),
+  mkdir: (p, options) => mkdir5(p, options).then(() => void 0),
+  unlink: (p) => unlink4(p),
   stat: (p) => stat5(p).then((s) => ({ mode: s.mode })),
   readdir: (p) => readdir4(p)
 };
@@ -22565,21 +22938,21 @@ var planPathCommand = defineCommand({
 });
 function resolveAbsoluteDirectory2(dir, cwd, homeDir) {
   if (dir.startsWith("~/")) {
-    return path25.join(homeDir, dir.slice(2));
+    return path26.join(homeDir, dir.slice(2));
   }
-  return path25.isAbsolute(dir) ? dir : path25.resolve(cwd, dir);
+  return path26.isAbsolute(dir) ? dir : path26.resolve(cwd, dir);
 }
 
 // packages/superintendent/src/commands/run.ts
-import path26 from "node:path";
+import path27 from "node:path";
 import * as fsPromises7 from "node:fs/promises";
 import { spawn as nodeSpawn, spawnSync as nodeSpawnSync } from "node:child_process";
-init_src6();
-init_src4();
+init_src7();
+init_src5();
 
 // packages/superintendent/src/commands/poe-agent-runner.ts
-init_src4();
-init_src7();
+init_src5();
+init_src8();
 async function executePoeAgent(agentSpec, input, createAgent = agent) {
   const { model } = parseAgentSpecifier(agentSpec);
   if (!model) {
@@ -22596,7 +22969,7 @@ async function executePoeAgent(agentSpec, input, createAgent = agent) {
 }
 
 // packages/superintendent/src/commands/run.ts
-init_src5();
+init_src6();
 
 // packages/superintendent/src/config-scope.ts
 var superintendentConfigScope = defineScope("superintendent", {
@@ -22609,6 +22982,14 @@ var superintendentConfigScope = defineScope("superintendent", {
 });
 
 // packages/superintendent/src/commands/run.ts
+var coreDefaultAgentConfigSchema = {
+  defaultAgent: {
+    type: "string",
+    default: "",
+    env: "POE_DEFAULT_AGENT",
+    doc: "Default agent used when no explicit Superintendent builder agent is provided"
+  }
+};
 var runParams = S.Object({
   doc: S.Optional(S.String({ description: "Path to the superintendent markdown document" })),
   agent: S.Optional(S.String({
@@ -22632,6 +23013,7 @@ var runCommand2 = defineCommand({
       homeDir,
       docPath: params.doc,
       ...params.agent ? { builderAgent: params.agent } : {},
+      configuredDefaultAgent: commandConfig.configuredDefaultAgent,
       assumeYes: process.argv.includes("--yes"),
       interactive: Boolean(process.stdin.isTTY),
       useDashboard: shouldUseInteractiveDashboard(tuiEnabled) && resolveOutputFormat() === "terminal",
@@ -22667,30 +23049,35 @@ var runCommand2 = defineCommand({
     json: (result) => result
   }
 });
-var runMcpCommand = defineCommand({
-  name: "run",
-  description: "Run the full superintendent loop without the dashboard UI.",
-  positional: ["doc"],
-  params: runParams,
-  scope: ["mcp"],
-  handler: async ({ params }) => {
-    const cwd = process.cwd();
-    const homeDir = process.env.HOME ?? process.env.USERPROFILE ?? cwd;
-    const commandConfig = await resolveSuperintendentCommandConfig(cwd, homeDir, process.env);
-    return runSuperintendentCommand({
-      cwd,
-      homeDir,
-      docPath: params.doc,
-      ...params.agent ? { builderAgent: params.agent } : {},
-      assumeYes: true,
-      interactive: false,
-      useDashboard: false,
-      env: process.env,
-      ...commandConfig.planDirectory ? { planDirectory: commandConfig.planDirectory } : {}
-    });
-  },
-  render: runCommand2.render
-});
+function createRunMcpCommand(runners) {
+  return defineCommand({
+    name: "run",
+    description: "Run the full superintendent loop without the dashboard UI.",
+    positional: ["doc"],
+    params: runParams,
+    scope: ["mcp"],
+    handler: async ({ params }) => {
+      const cwd = process.cwd();
+      const homeDir = process.env.HOME ?? process.env.USERPROFILE ?? cwd;
+      const commandConfig = await resolveSuperintendentCommandConfig(cwd, homeDir, process.env);
+      return runSuperintendentCommand({
+        cwd,
+        homeDir,
+        docPath: params.doc,
+        ...params.agent ? { builderAgent: params.agent } : {},
+        configuredDefaultAgent: commandConfig.configuredDefaultAgent,
+        assumeYes: true,
+        interactive: false,
+        useDashboard: false,
+        env: process.env,
+        ...commandConfig.planDirectory ? { planDirectory: commandConfig.planDirectory } : {},
+        ...runners?.runLoop ? { runLoop: runners.runLoop } : {}
+      });
+    },
+    render: runCommand2.render
+  });
+}
+var runMcpCommand = createRunMcpCommand();
 async function resolveSuperintendentCommandConfig(cwd, homeDir, env, fs4) {
   const configPath = resolveConfigPath(homeDir);
   const projectConfigPath = resolveProjectConfigPath(cwd);
@@ -22706,12 +23093,14 @@ async function resolveSuperintendentCommandConfig(cwd, homeDir, env, fs4) {
       document[superintendentConfigScope.scope],
       env
     );
+    const coreResolved = resolveScope(coreDefaultAgentConfigSchema, document.core, env);
     return {
+      configuredDefaultAgent: normalizeAgentSelection(coreResolved.defaultAgent) ?? null,
       ...planDirectory ? { planDirectory } : {},
       tui: superintendentResolved.tui === true
     };
   } catch {
-    return { tui: false };
+    return { configuredDefaultAgent: null, tui: false };
   }
 }
 async function resolveSuperintendentPlanDirectory(cwd, homeDir, env, fs4) {
@@ -22785,8 +23174,21 @@ async function runSuperintendentCommand(options) {
     homeDir: options.homeDir
   });
   const document = parseSuperintendentDoc(selectedDocPath, await fs4.readFile(selectedDocPath, "utf8"));
-  const builderAgent = options.builderAgent ?? document.frontmatter.builder.agent;
-  const selectedBuilderAgent = resolveAgentId(builderAgent) ?? builderAgent;
+  const selectedBuilder = await resolveLoopAgent({
+    providedAgent: normalizeAgentSelection(options.builderAgent),
+    frontmatterAgent: normalizeAgentSelection(document.frontmatter.builder.agent),
+    configuredDefaultAgent: normalizeAgentSelection(options.configuredDefaultAgent) ?? null,
+    assumeYes,
+    fallbackAgent: "claude-code",
+    message: "Select agent to run Superintendent builder with:",
+    select: selectPrompt,
+    isCancel
+  });
+  if ("cancelled" in selectedBuilder) {
+    cancel("Operation cancelled.");
+    throw new UserError("Operation cancelled.");
+  }
+  const selectedBuilderAgent = selectedBuilder.agent;
   if (!useDashboard) {
     let activeStage = void 0;
     const headlessAbort = new AbortController();
@@ -23050,7 +23452,7 @@ async function runSuperintendentCommand(options) {
         session.pauseRequested = true;
       }
       editPlan(session.dashboard, session.latestLogFile, env, options.openInEditor);
-      appendEvent("info", `Log opened: ${path26.basename(session.latestLogFile)}`);
+      appendEvent("info", `Log opened: ${path27.basename(session.latestLogFile)}`);
       syncStats();
     }
   };
@@ -23199,13 +23601,20 @@ async function listPlanDirectoryDocs(fs4, planDirectory, cwd, homeDir) {
     }
     throw error2;
   }
-  return entries.filter((entry) => entry.toLowerCase().endsWith(".md")).map((entry) => path26.join(absoluteDir, entry)).sort((left, right) => left.localeCompare(right));
+  return entries.filter((entry) => entry.toLowerCase().endsWith(".md")).map((entry) => path27.join(absoluteDir, entry)).sort((left, right) => left.localeCompare(right));
 }
 function resolveAbsolutePlanDirectory(dir, cwd, homeDir) {
   if (dir.startsWith("~/")) {
-    return path26.join(homeDir, dir.slice(2));
+    return path27.join(homeDir, dir.slice(2));
   }
-  return path26.isAbsolute(dir) ? dir : path26.resolve(cwd, dir);
+  return path27.isAbsolute(dir) ? dir : path27.resolve(cwd, dir);
+}
+function normalizeAgentSelection(value) {
+  if (typeof value !== "string") {
+    return void 0;
+  }
+  const trimmed = value.trim();
+  return trimmed.length > 0 ? trimmed : void 0;
 }
 function isMissingDirectory(error2) {
   if (!error2 || typeof error2 !== "object" || !("code" in error2)) {
@@ -23399,14 +23808,14 @@ function formatTimestamp2(timestamp) {
 }
 function editPlan(dashboard, absolutePath, env, openInEditor) {
   const editor = resolveEditor(env);
-  const open3 = openInEditor ?? openInEditorWithSystem;
+  const open6 = openInEditor ?? openInEditorWithSystem;
   if (editor.mode === "gui") {
-    open3(absolutePath, env);
+    open6(absolutePath, env);
     return;
   }
   dashboard.stop();
   try {
-    open3(absolutePath, env);
+    open6(absolutePath, env);
   } finally {
     dashboard.start();
   }
@@ -23435,7 +23844,7 @@ function resolveEditor(env) {
   const parts = raw.split(/\s+/);
   const command = parts[0] ?? "vi";
   const args = parts.slice(1);
-  const binary = path26.basename(command);
+  const binary = path27.basename(command);
   const mode = GUI_EDITOR_BINARIES.has(binary) ? "gui" : "tty";
   return { command, args, mode };
 }
@@ -23462,19 +23871,20 @@ function stripStopReason(result) {
   };
 }
 function displayPath(filePath, cwd, homeDir) {
-  if (filePath.startsWith(`${cwd}${path26.sep}`)) {
-    return path26.relative(cwd, filePath);
+  if (filePath.startsWith(`${cwd}${path27.sep}`)) {
+    return path27.relative(cwd, filePath);
   }
-  if (filePath.startsWith(`${homeDir}${path26.sep}`)) {
-    return `~/${path26.relative(homeDir, filePath)}`;
+  if (filePath.startsWith(`${homeDir}${path27.sep}`)) {
+    return `~/${path27.relative(homeDir, filePath)}`;
   }
   return filePath;
 }
 function createDefaultFs3() {
-  return {
+  const fs4 = {
     readFile: fsPromises7.readFile,
     writeFile: fsPromises7.writeFile,
     readdir: fsPromises7.readdir,
+    open: (filePath, flags) => fsPromises7.open(filePath, flags),
     stat: async (filePath) => {
       const stat7 = await fsPromises7.stat(filePath);
       return {
@@ -23483,6 +23893,9 @@ function createDefaultFs3() {
         mtimeMs: stat7.mtimeMs
       };
     },
+    unlink: async (filePath) => {
+      await fsPromises7.unlink(filePath);
+    },
     mkdir: async (filePath, mkdirOptions) => {
       await fsPromises7.mkdir(filePath, mkdirOptions);
     },
@@ -23493,6 +23906,7 @@ function createDefaultFs3() {
       await fsPromises7.rename(oldPath, newPath);
     }
   };
+  return fs4;
 }
 function toError6(error2) {
   return error2 instanceof Error ? error2 : new Error(String(error2));
@@ -23514,13 +23928,13 @@ var validateCommand = defineCommand({
   },
   render: {
     rich: (result, { logger: logger2 }) => {
-      const errors = result.problems.filter((problem) => problem.level === "error");
+      const errors2 = result.problems.filter((problem) => problem.level === "error");
       const warnings = result.problems.filter((problem) => problem.level === "warning");
       if (result.valid) {
         logger2.success("Superintendent document is valid.");
       } else {
         logger2.error(
-          `Superintendent document is invalid (${errors.length} error${errors.length === 1 ? "" : "s"}).`
+          `Superintendent document is invalid (${errors2.length} error${errors2.length === 1 ? "" : "s"}).`
         );
       }
       if (warnings.length > 0) {
@@ -23544,12 +23958,21 @@ var superintendentGroup = defineGroup({
   scope: ["cli", "mcp", "sdk"],
   children: [runCommand2, validateCommand, completeCommand, installCommand, planPathCommand, builderGroup, inspectorGroup]
 });
-var superintendentMcpGroup = defineGroup({
-  name: "superintendent",
-  description: "Superintendent workflow commands.",
-  scope: ["mcp"],
-  children: [runMcpCommand, validateCommand, completeCommand, builderGroup, inspectorGroup]
-});
+function createSuperintendentMcpGroup(runners) {
+  return defineGroup({
+    name: "superintendent",
+    description: "Superintendent workflow commands.",
+    scope: ["mcp"],
+    children: [
+      createRunMcpCommand(runners),
+      validateCommand,
+      completeCommand,
+      createBuilderGroup(runners),
+      createInspectorGroup(runners)
+    ]
+  });
+}
+var superintendentMcpGroup = createSuperintendentMcpGroup();
 function validateSuperintendentDocument(filePath, content) {
   const problems = [];
   let document;
@@ -24075,7 +24498,7 @@ function emitEvent(callback, event) {
 }
 async function loadConfiguredPlugins(options) {
   const fs4 = createConfigFileSystem(options.fs);
-  const homeDir = options.homeDir ?? os3.homedir();
+  const homeDir = options.homeDir ?? os4.homedir();
   const store = createConfigStore({
     fs: fs4,
     filePath: options.configPath ?? resolveConfigPath(homeDir),
@@ -24146,7 +24569,7 @@ function createInMemoryAcpTransport2(options) {
       }
       if (method === "session/new") {
         const request = params;
-        const { createAgentSession: createAgentSession2 } = await Promise.resolve().then(() => (init_src7(), src_exports));
+        const { createAgentSession: createAgentSession2 } = await Promise.resolve().then(() => (init_src8(), src_exports));
         const session = await createAgentSession2({
           model: options.model,
           cwd: request.cwd || options.cwd,