acpx 0.11.0 → 0.11.2

package/README.md

@@ -267,6 +267,9 @@ real GitHub PRs if you run it against a live repository.
 
 CLI flags always win over config values.
 
+Use `--mcp-config <path>` to load only the `mcpServers` array from an external JSON file without
+writing a project config file. Relative paths resolve from `--cwd`.
+
 Supported keys:
 
 ```json

package/dist/{cli-CC2w0U-A.js → cli-CXlEcGWV.js}

@@ -1,6 +1,6 @@
-import { N as permissionModeSatisfies } from "./live-checkpoint-BZrk9Mjz.js";
-import { _ as resolveGlobalFlags, a as hasExplicitPermissionModeFlag, g as resolveAgentInvocation, v as resolveOutputPolicy, x as loadPermissionPolicySpec, y as resolvePermissionMode } from "./flags-BKjjl3tF.js";
-import { c as validateFlowDefinition, h as isDefinedFlow, o as FlowRunner } from "./flows-BabqiU0u.js";
+import { R as permissionModeSatisfies } from "./live-checkpoint-mdAaF3qJ.js";
+import { _ as resolveGlobalFlags, a as hasExplicitPermissionModeFlag, g as resolveAgentInvocation, v as resolveOutputPolicy, x as loadPermissionPolicySpec, y as resolvePermissionMode } from "./flags-Dl_mhic3.js";
+import { c as validateFlowDefinition, h as isDefinedFlow, o as FlowRunner } from "./flows-7OHjgEgq.js";
 import { fileURLToPath, pathToFileURL } from "node:url";
 import path from "node:path";
 import { InvalidArgumentError } from "commander";
@@ -8,7 +8,7 @@ import fs from "node:fs/promises";
 import { randomUUID } from "node:crypto";
 //#region src/flows/cli.ts
 const FLOW_RUNTIME_SPECIFIER = "acpx/flows";
-const TEXT_MODULE_EXTENSIONS = new Set([
+const TEXT_MODULE_EXTENSIONS = /* @__PURE__ */ new Set([
 	".js",
 	".mjs",
 	".cjs",
@@ -194,4 +194,4 @@ function printFlowRunResult(result, globalFlags) {
 //#endregion
 export { handleFlowRun };
 
-//# sourceMappingURL=cli-CC2w0U-A.js.map
+//# sourceMappingURL=cli-CXlEcGWV.js.map

package/dist/{cli-CC2w0U-A.js.map → cli-CXlEcGWV.js.map}

@@ -1 +1 @@
-{"version":3,"file":"cli-CC2w0U-A.js","names":[],"sources":["../src/flows/cli.ts"],"sourcesContent":["import { randomUUID } from \"node:crypto\";\nimport fs from \"node:fs/promises\";\nimport path from \"node:path\";\nimport { fileURLToPath, pathToFileURL } from \"node:url\";\nimport { InvalidArgumentError, type Command } from \"commander\";\nimport type { ResolvedAcpxConfig } from \"../cli/config.js\";\nimport {\n  hasExplicitPermissionModeFlag,\n  resolveAgentInvocation,\n  resolveGlobalFlags,\n  resolveOutputPolicy,\n  resolvePermissionMode,\n  type GlobalFlags,\n} from \"../cli/flags.js\";\nimport { type FlowDefinition, FlowRunner } from \"../flows.js\";\nimport { loadPermissionPolicySpec } from \"../permission-policy.js\";\nimport { permissionModeSatisfies } from \"../permissions.js\";\nimport type { PermissionMode } from \"../types.js\";\nimport { isDefinedFlow } from \"./authoring.js\";\nimport { validateFlowDefinition } from \"./graph.js\";\n\ntype FlowRunFlags = {\n  inputJson?: string;\n  inputFile?: string;\n  defaultAgent?: string;\n};\n\nconst FLOW_RUNTIME_SPECIFIER = \"acpx/flows\";\nconst TEXT_MODULE_EXTENSIONS = new Set([\".js\", \".mjs\", \".cjs\", \".ts\", \".tsx\", \".mts\", \".cts\"]);\n\nexport async function handleFlowRun(\n  flowFile: string,\n  flags: FlowRunFlags,\n  command: Command,\n  config: ResolvedAcpxConfig,\n): Promise<void> {\n  const globalFlags = resolveGlobalFlags(command, config);\n  const permissionMode = resolvePermissionMode(globalFlags, config.defaultPermissions);\n  const permissionPolicy = await resolveFlowPermissionPolicy(globalFlags);\n  const outputPolicy = resolveOutputPolicy(globalFlags.format, globalFlags.jsonStrict === true);\n  const input = await readFlowInput(flags);\n  const flowPath = path.resolve(flowFile);\n  const flow = await loadFlowModule(flowPath);\n  assertFlowPermissionRequirements(flow, permissionMode, globalFlags);\n\n  const runner = new FlowRunner({\n    resolveAgent: (profile?: string) => {\n      return resolveAgentInvocation(profile ?? flags.defaultAgent, globalFlags, config);\n    },\n    permissionMode,\n    mcpServers: config.mcpServers,\n    nonInteractivePermissions: globalFlags.nonInteractivePermissions,\n    permissionPolicy,\n    authCredentials: config.auth,\n    authPolicy: globalFlags.authPolicy,\n    timeoutMs: globalFlags.timeout,\n    ttlMs: globalFlags.ttl,\n    verbose: globalFlags.verbose,\n    suppressSdkConsoleErrors: outputPolicy.suppressSdkConsoleErrors,\n    sessionOptions: {\n      model: globalFlags.model,\n      allowedTools: globalFlags.allowedTools,\n      maxTurns: globalFlags.maxTurns,\n    },\n  });\n\n  const result = await runner.run(flow, input, {\n    flowPath,\n  });\n\n  printFlowRunResult(result, globalFlags);\n}\n\nasync function resolveFlowPermissionPolicy(globalFlags: GlobalFlags) {\n  try {\n    return await loadPermissionPolicySpec(globalFlags.permissionPolicy, globalFlags.cwd);\n  } catch (error) {\n    const message = error instanceof Error ? error.message : String(error);\n    throw new InvalidArgumentError(`Invalid permission policy: ${message}`);\n  }\n}\n\nfunction assertFlowPermissionRequirements(\n  flow: FlowDefinition,\n  permissionMode: PermissionMode,\n  globalFlags: GlobalFlags,\n): void {\n  const permissions = flow.permissions;\n  if (!permissions) {\n    return;\n  }\n\n  if (permissions.requireExplicitGrant && !hasExplicitPermissionModeFlag(globalFlags)) {\n    throw new InvalidArgumentError(\n      buildFlowPermissionFailureMessage(flow, permissions.requiredMode, permissions.reason, true),\n    );\n  }\n\n  if (!permissionModeSatisfies(permissionMode, permissions.requiredMode)) {\n    throw new InvalidArgumentError(\n      buildFlowPermissionFailureMessage(flow, permissions.requiredMode, permissions.reason, false),\n    );\n  }\n}\n\nfunction buildFlowPermissionFailureMessage(\n  flow: FlowDefinition,\n  requiredMode: PermissionMode,\n  reason?: string,\n  explicit = false,\n): string {\n  return [\n    explicit\n      ? `Flow \"${flow.name}\" requires an explicit ${requiredMode} grant.`\n      : `Flow \"${flow.name}\" requires permission mode ${requiredMode}.`,\n    `Rerun with --${requiredMode}.`,\n    ...(reason ? [`Reason: ${reason}`] : []),\n  ].join(\" \");\n}\n\nasync function readFlowInput(flags: FlowRunFlags): Promise<unknown> {\n  if (flags.inputJson && flags.inputFile) {\n    throw new InvalidArgumentError(\"Use only one of --input-json or --input-file\");\n  }\n\n  if (flags.inputJson) {\n    return parseJsonInput(flags.inputJson, \"--input-json\");\n  }\n\n  if (flags.inputFile) {\n    const inputPath = path.resolve(flags.inputFile);\n    const payload = await fs.readFile(inputPath, \"utf8\");\n    return parseJsonInput(payload, \"--input-file\");\n  }\n\n  return {};\n}\n\nasync function loadFlowModule(flowPath: string): Promise<FlowDefinition> {\n  const extension = path.extname(flowPath).toLowerCase();\n  const prepared = await prepareFlowModuleImport(flowPath, extension);\n  try {\n    const module = await loadFlowRuntimeModule(prepared.flowUrl, extension);\n\n    const candidate = findFlowDefinition(module);\n    if (!candidate) {\n      throw new Error(\n        `Flow module must export default defineFlow({...}) from \"acpx/flows\": ${flowPath}`,\n      );\n    }\n    validateFlowDefinition(candidate);\n    return candidate;\n  } finally {\n    await prepared.cleanup?.();\n  }\n}\n\nasync function prepareFlowModuleImport(\n  flowPath: string,\n  extension: string,\n): Promise<{\n  flowUrl: string;\n  cleanup?: () => Promise<void>;\n}> {\n  const flowUrl = pathToFileURL(flowPath).href;\n  if (!TEXT_MODULE_EXTENSIONS.has(extension)) {\n    return { flowUrl };\n  }\n\n  const source = await fs.readFile(flowPath, \"utf8\");\n  if (!source.includes(FLOW_RUNTIME_SPECIFIER)) {\n    return { flowUrl };\n  }\n\n  const runtimeSpecifier = resolveFlowRuntimeImportSpecifier();\n  const rewritten = source.replaceAll(\n    /([\"'])acpx\\/flows\\1/g,\n    (_match, quote: string) => `${quote}${runtimeSpecifier}${quote}`,\n  );\n  if (rewritten === source) {\n    return { flowUrl };\n  }\n\n  const tempPath = path.join(path.dirname(flowPath), `.acpx-flow-load-${randomUUID()}${extension}`);\n  await fs.writeFile(tempPath, rewritten, \"utf8\");\n  return {\n    flowUrl: pathToFileURL(tempPath).href,\n    cleanup: async () => {\n      await fs.rm(tempPath, { force: true });\n    },\n  };\n}\n\nfunction resolveFlowRuntimeImportSpecifier(): string {\n  const selfPath = fileURLToPath(import.meta.url);\n  let runtimePath: string;\n\n  if (selfPath.endsWith(`${path.sep}src${path.sep}flows${path.sep}cli.ts`)) {\n    runtimePath = fileURLToPath(new URL(\"../flows.ts\", import.meta.url));\n  } else if (selfPath.endsWith(`${path.sep}src${path.sep}flows${path.sep}cli.js`)) {\n    runtimePath = fileURLToPath(new URL(\"../flows.js\", import.meta.url));\n  } else {\n    runtimePath = fileURLToPath(new URL(\"./flows.js\", import.meta.url));\n  }\n  return runtimePath.replaceAll(path.sep, \"/\");\n}\n\nasync function loadFlowRuntimeModule(\n  flowUrl: string,\n  extension: string,\n): Promise<{\n  default?: unknown;\n  \"module.exports\"?: unknown;\n}> {\n  if (extension === \".ts\" || extension === \".tsx\" || extension === \".cts\") {\n    const { register } = (await import(\"tsx/cjs/api\")) as {\n      register: (options: { namespace: string }) => {\n        require: (\n          specifier: string,\n          parentURL: string,\n        ) => {\n          default?: unknown;\n          \"module.exports\"?: unknown;\n        };\n        unregister: () => void;\n      };\n    };\n    const loader = register({ namespace: randomUUID() });\n    try {\n      return loader.require(flowUrl, import.meta.url);\n    } finally {\n      loader.unregister();\n    }\n  }\n\n  if (extension === \".mts\") {\n    const { register } = (await import(\"tsx/esm/api\")) as {\n      register: (options: { namespace: string }) => {\n        import: (\n          specifier: string,\n          parentURL: string,\n        ) => Promise<{\n          default?: unknown;\n          \"module.exports\"?: unknown;\n        }>;\n        unregister: () => Promise<void>;\n      };\n    };\n    const loader = register({ namespace: randomUUID() });\n    try {\n      return (await loader.import(flowUrl, import.meta.url)) as {\n        default?: unknown;\n        \"module.exports\"?: unknown;\n      };\n    } finally {\n      await loader.unregister();\n    }\n  }\n\n  return (await import(flowUrl)) as {\n    default?: unknown;\n    \"module.exports\"?: unknown;\n  };\n}\n\nfunction findFlowDefinition(module: {\n  default?: unknown;\n  \"module.exports\"?: unknown;\n}): FlowDefinition | null {\n  const candidates = [\n    module.default,\n    module[\"module.exports\"],\n    getNestedDefault(module.default),\n    getNestedDefault(module[\"module.exports\"]),\n  ];\n\n  for (const candidate of candidates) {\n    if (isDefinedFlow(candidate)) {\n      return candidate;\n    }\n  }\n\n  return null;\n}\n\nfunction getNestedDefault(value: unknown): unknown {\n  if (!value || typeof value !== \"object\" || !(\"default\" in value)) {\n    return null;\n  }\n  return (value as { default?: unknown }).default ?? null;\n}\n\nfunction parseJsonInput(raw: string, label: string): unknown {\n  try {\n    return JSON.parse(raw);\n  } catch (error) {\n    throw new InvalidArgumentError(\n      `${label} must contain valid JSON: ${error instanceof Error ? error.message : String(error)}`,\n    );\n  }\n}\n\nfunction printFlowRunResult(\n  result: Awaited<ReturnType<FlowRunner[\"run\"]>>,\n  globalFlags: GlobalFlags,\n): void {\n  const payload = {\n    action: \"flow_run_result\",\n    runId: result.state.runId,\n    flowName: result.state.flowName,\n    runTitle: result.state.runTitle,\n    flowPath: result.state.flowPath,\n    status: result.state.status,\n    currentNode: result.state.currentNode,\n    currentNodeType: result.state.currentNodeType,\n    currentNodeStartedAt: result.state.currentNodeStartedAt,\n    lastHeartbeatAt: result.state.lastHeartbeatAt,\n    statusDetail: result.state.statusDetail,\n    waitingOn: result.state.waitingOn,\n    runDir: result.runDir,\n    outputs: result.state.outputs,\n    sessionBindings: result.state.sessionBindings,\n  };\n\n  if (globalFlags.format === \"json\") {\n    process.stdout.write(`${JSON.stringify(payload)}\\n`);\n    return;\n  }\n\n  if (globalFlags.format === \"quiet\") {\n    process.stdout.write(`${result.state.runId}\\n`);\n    return;\n  }\n\n  process.stdout.write(`runId: ${payload.runId}\\n`);\n  process.stdout.write(`flow: ${payload.flowName}\\n`);\n  if (payload.runTitle) {\n    process.stdout.write(`title: ${payload.runTitle}\\n`);\n  }\n  process.stdout.write(`status: ${payload.status}\\n`);\n  process.stdout.write(`runDir: ${payload.runDir}\\n`);\n  if (payload.currentNode) {\n    process.stdout.write(`currentNode: ${payload.currentNode}\\n`);\n  }\n  if (payload.statusDetail) {\n    process.stdout.write(`statusDetail: ${payload.statusDetail}\\n`);\n  }\n  if (payload.waitingOn) {\n    process.stdout.write(`waitingOn: ${payload.waitingOn}\\n`);\n  }\n  process.stdout.write(`${JSON.stringify(payload.outputs, null, 2)}\\n`);\n}\n"],"mappings":"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"}
+{"version":3,"file":"cli-CXlEcGWV.js","names":[],"sources":["../src/flows/cli.ts"],"sourcesContent":["import { randomUUID } from \"node:crypto\";\nimport fs from \"node:fs/promises\";\nimport path from \"node:path\";\nimport { fileURLToPath, pathToFileURL } from \"node:url\";\nimport { InvalidArgumentError, type Command } from \"commander\";\nimport type { ResolvedAcpxConfig } from \"../cli/config.js\";\nimport {\n  hasExplicitPermissionModeFlag,\n  resolveAgentInvocation,\n  resolveGlobalFlags,\n  resolveOutputPolicy,\n  resolvePermissionMode,\n  type GlobalFlags,\n} from \"../cli/flags.js\";\nimport { type FlowDefinition, FlowRunner } from \"../flows.js\";\nimport { loadPermissionPolicySpec } from \"../permission-policy.js\";\nimport { permissionModeSatisfies } from \"../permissions.js\";\nimport type { PermissionMode } from \"../types.js\";\nimport { isDefinedFlow } from \"./authoring.js\";\nimport { validateFlowDefinition } from \"./graph.js\";\n\ntype FlowRunFlags = {\n  inputJson?: string;\n  inputFile?: string;\n  defaultAgent?: string;\n};\n\nconst FLOW_RUNTIME_SPECIFIER = \"acpx/flows\";\nconst TEXT_MODULE_EXTENSIONS = new Set([\".js\", \".mjs\", \".cjs\", \".ts\", \".tsx\", \".mts\", \".cts\"]);\n\nexport async function handleFlowRun(\n  flowFile: string,\n  flags: FlowRunFlags,\n  command: Command,\n  config: ResolvedAcpxConfig,\n): Promise<void> {\n  const globalFlags = resolveGlobalFlags(command, config);\n  const permissionMode = resolvePermissionMode(globalFlags, config.defaultPermissions);\n  const permissionPolicy = await resolveFlowPermissionPolicy(globalFlags);\n  const outputPolicy = resolveOutputPolicy(globalFlags.format, globalFlags.jsonStrict === true);\n  const input = await readFlowInput(flags);\n  const flowPath = path.resolve(flowFile);\n  const flow = await loadFlowModule(flowPath);\n  assertFlowPermissionRequirements(flow, permissionMode, globalFlags);\n\n  const runner = new FlowRunner({\n    resolveAgent: (profile?: string) => {\n      return resolveAgentInvocation(profile ?? flags.defaultAgent, globalFlags, config);\n    },\n    permissionMode,\n    mcpServers: config.mcpServers,\n    nonInteractivePermissions: globalFlags.nonInteractivePermissions,\n    permissionPolicy,\n    authCredentials: config.auth,\n    authPolicy: globalFlags.authPolicy,\n    timeoutMs: globalFlags.timeout,\n    ttlMs: globalFlags.ttl,\n    verbose: globalFlags.verbose,\n    suppressSdkConsoleErrors: outputPolicy.suppressSdkConsoleErrors,\n    sessionOptions: {\n      model: globalFlags.model,\n      allowedTools: globalFlags.allowedTools,\n      maxTurns: globalFlags.maxTurns,\n    },\n  });\n\n  const result = await runner.run(flow, input, {\n    flowPath,\n  });\n\n  printFlowRunResult(result, globalFlags);\n}\n\nasync function resolveFlowPermissionPolicy(globalFlags: GlobalFlags) {\n  try {\n    return await loadPermissionPolicySpec(globalFlags.permissionPolicy, globalFlags.cwd);\n  } catch (error) {\n    const message = error instanceof Error ? error.message : String(error);\n    throw new InvalidArgumentError(`Invalid permission policy: ${message}`);\n  }\n}\n\nfunction assertFlowPermissionRequirements(\n  flow: FlowDefinition,\n  permissionMode: PermissionMode,\n  globalFlags: GlobalFlags,\n): void {\n  const permissions = flow.permissions;\n  if (!permissions) {\n    return;\n  }\n\n  if (permissions.requireExplicitGrant && !hasExplicitPermissionModeFlag(globalFlags)) {\n    throw new InvalidArgumentError(\n      buildFlowPermissionFailureMessage(flow, permissions.requiredMode, permissions.reason, true),\n    );\n  }\n\n  if (!permissionModeSatisfies(permissionMode, permissions.requiredMode)) {\n    throw new InvalidArgumentError(\n      buildFlowPermissionFailureMessage(flow, permissions.requiredMode, permissions.reason, false),\n    );\n  }\n}\n\nfunction buildFlowPermissionFailureMessage(\n  flow: FlowDefinition,\n  requiredMode: PermissionMode,\n  reason?: string,\n  explicit = false,\n): string {\n  return [\n    explicit\n      ? `Flow \"${flow.name}\" requires an explicit ${requiredMode} grant.`\n      : `Flow \"${flow.name}\" requires permission mode ${requiredMode}.`,\n    `Rerun with --${requiredMode}.`,\n    ...(reason ? [`Reason: ${reason}`] : []),\n  ].join(\" \");\n}\n\nasync function readFlowInput(flags: FlowRunFlags): Promise<unknown> {\n  if (flags.inputJson && flags.inputFile) {\n    throw new InvalidArgumentError(\"Use only one of --input-json or --input-file\");\n  }\n\n  if (flags.inputJson) {\n    return parseJsonInput(flags.inputJson, \"--input-json\");\n  }\n\n  if (flags.inputFile) {\n    const inputPath = path.resolve(flags.inputFile);\n    const payload = await fs.readFile(inputPath, \"utf8\");\n    return parseJsonInput(payload, \"--input-file\");\n  }\n\n  return {};\n}\n\nasync function loadFlowModule(flowPath: string): Promise<FlowDefinition> {\n  const extension = path.extname(flowPath).toLowerCase();\n  const prepared = await prepareFlowModuleImport(flowPath, extension);\n  try {\n    const module = await loadFlowRuntimeModule(prepared.flowUrl, extension);\n\n    const candidate = findFlowDefinition(module);\n    if (!candidate) {\n      throw new Error(\n        `Flow module must export default defineFlow({...}) from \"acpx/flows\": ${flowPath}`,\n      );\n    }\n    validateFlowDefinition(candidate);\n    return candidate;\n  } finally {\n    await prepared.cleanup?.();\n  }\n}\n\nasync function prepareFlowModuleImport(\n  flowPath: string,\n  extension: string,\n): Promise<{\n  flowUrl: string;\n  cleanup?: () => Promise<void>;\n}> {\n  const flowUrl = pathToFileURL(flowPath).href;\n  if (!TEXT_MODULE_EXTENSIONS.has(extension)) {\n    return { flowUrl };\n  }\n\n  const source = await fs.readFile(flowPath, \"utf8\");\n  if (!source.includes(FLOW_RUNTIME_SPECIFIER)) {\n    return { flowUrl };\n  }\n\n  const runtimeSpecifier = resolveFlowRuntimeImportSpecifier();\n  const rewritten = source.replaceAll(\n    /([\"'])acpx\\/flows\\1/g,\n    (_match, quote: string) => `${quote}${runtimeSpecifier}${quote}`,\n  );\n  if (rewritten === source) {\n    return { flowUrl };\n  }\n\n  const tempPath = path.join(path.dirname(flowPath), `.acpx-flow-load-${randomUUID()}${extension}`);\n  await fs.writeFile(tempPath, rewritten, \"utf8\");\n  return {\n    flowUrl: pathToFileURL(tempPath).href,\n    cleanup: async () => {\n      await fs.rm(tempPath, { force: true });\n    },\n  };\n}\n\nfunction resolveFlowRuntimeImportSpecifier(): string {\n  const selfPath = fileURLToPath(import.meta.url);\n  let runtimePath: string;\n\n  if (selfPath.endsWith(`${path.sep}src${path.sep}flows${path.sep}cli.ts`)) {\n    runtimePath = fileURLToPath(new URL(\"../flows.ts\", import.meta.url));\n  } else if (selfPath.endsWith(`${path.sep}src${path.sep}flows${path.sep}cli.js`)) {\n    runtimePath = fileURLToPath(new URL(\"../flows.js\", import.meta.url));\n  } else {\n    runtimePath = fileURLToPath(new URL(\"./flows.js\", import.meta.url));\n  }\n  return runtimePath.replaceAll(path.sep, \"/\");\n}\n\nasync function loadFlowRuntimeModule(\n  flowUrl: string,\n  extension: string,\n): Promise<{\n  default?: unknown;\n  \"module.exports\"?: unknown;\n}> {\n  if (extension === \".ts\" || extension === \".tsx\" || extension === \".cts\") {\n    const { register } = (await import(\"tsx/cjs/api\")) as {\n      register: (options: { namespace: string }) => {\n        require: (\n          specifier: string,\n          parentURL: string,\n        ) => {\n          default?: unknown;\n          \"module.exports\"?: unknown;\n        };\n        unregister: () => void;\n      };\n    };\n    const loader = register({ namespace: randomUUID() });\n    try {\n      return loader.require(flowUrl, import.meta.url);\n    } finally {\n      loader.unregister();\n    }\n  }\n\n  if (extension === \".mts\") {\n    const { register } = (await import(\"tsx/esm/api\")) as {\n      register: (options: { namespace: string }) => {\n        import: (\n          specifier: string,\n          parentURL: string,\n        ) => Promise<{\n          default?: unknown;\n          \"module.exports\"?: unknown;\n        }>;\n        unregister: () => Promise<void>;\n      };\n    };\n    const loader = register({ namespace: randomUUID() });\n    try {\n      return (await loader.import(flowUrl, import.meta.url)) as {\n        default?: unknown;\n        \"module.exports\"?: unknown;\n      };\n    } finally {\n      await loader.unregister();\n    }\n  }\n\n  return (await import(flowUrl)) as {\n    default?: unknown;\n    \"module.exports\"?: unknown;\n  };\n}\n\nfunction findFlowDefinition(module: {\n  default?: unknown;\n  \"module.exports\"?: unknown;\n}): FlowDefinition | null {\n  const candidates = [\n    module.default,\n    module[\"module.exports\"],\n    getNestedDefault(module.default),\n    getNestedDefault(module[\"module.exports\"]),\n  ];\n\n  for (const candidate of candidates) {\n    if (isDefinedFlow(candidate)) {\n      return candidate;\n    }\n  }\n\n  return null;\n}\n\nfunction getNestedDefault(value: unknown): unknown {\n  if (!value || typeof value !== \"object\" || !(\"default\" in value)) {\n    return null;\n  }\n  return (value as { default?: unknown }).default ?? null;\n}\n\nfunction parseJsonInput(raw: string, label: string): unknown {\n  try {\n    return JSON.parse(raw);\n  } catch (error) {\n    throw new InvalidArgumentError(\n      `${label} must contain valid JSON: ${error instanceof Error ? error.message : String(error)}`,\n    );\n  }\n}\n\nfunction printFlowRunResult(\n  result: Awaited<ReturnType<FlowRunner[\"run\"]>>,\n  globalFlags: GlobalFlags,\n): void {\n  const payload = {\n    action: \"flow_run_result\",\n    runId: result.state.runId,\n    flowName: result.state.flowName,\n    runTitle: result.state.runTitle,\n    flowPath: result.state.flowPath,\n    status: result.state.status,\n    currentNode: result.state.currentNode,\n    currentNodeType: result.state.currentNodeType,\n    currentNodeStartedAt: result.state.currentNodeStartedAt,\n    lastHeartbeatAt: result.state.lastHeartbeatAt,\n    statusDetail: result.state.statusDetail,\n    waitingOn: result.state.waitingOn,\n    runDir: result.runDir,\n    outputs: result.state.outputs,\n    sessionBindings: result.state.sessionBindings,\n  };\n\n  if (globalFlags.format === \"json\") {\n    process.stdout.write(`${JSON.stringify(payload)}\\n`);\n    return;\n  }\n\n  if (globalFlags.format === \"quiet\") {\n    process.stdout.write(`${result.state.runId}\\n`);\n    return;\n  }\n\n  process.stdout.write(`runId: ${payload.runId}\\n`);\n  process.stdout.write(`flow: ${payload.flowName}\\n`);\n  if (payload.runTitle) {\n    process.stdout.write(`title: ${payload.runTitle}\\n`);\n  }\n  process.stdout.write(`status: ${payload.status}\\n`);\n  process.stdout.write(`runDir: ${payload.runDir}\\n`);\n  if (payload.currentNode) {\n    process.stdout.write(`currentNode: ${payload.currentNode}\\n`);\n  }\n  if (payload.statusDetail) {\n    process.stdout.write(`statusDetail: ${payload.statusDetail}\\n`);\n  }\n  if (payload.waitingOn) {\n    process.stdout.write(`waitingOn: ${payload.waitingOn}\\n`);\n  }\n  process.stdout.write(`${JSON.stringify(payload.outputs, null, 2)}\\n`);\n}\n"],"mappings":"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"}

package/dist/cli.d.ts

@@ -1,4 +1,4 @@
-import { f as SessionRecord } from "./session-options-Co1oGEK8.js";
+import { f as SessionRecord } from "./session-options-jkYbBxGE.js";
 import { Command } from "commander";
 
 //#region src/cli/flags.d.ts

package/dist/cli.js

@@ -1,14 +1,14 @@
 #!/usr/bin/env node
-import { a as runSessionQueueOwner, c as buildQueueOwnerArgOverride, g as __exportAll, h as isProcessAlive, l as flushPerfMetricsCapture, n as getTextErrorRemediationHints, o as runOnce, p as probeQueueOwnerHealth, t as createOutputFormatter, u as installPerfMetricsCapture } from "./output-D_BGt1YI.js";
-import { B as listSessions, Bt as OUTPUT_FORMATS, Et as normalizeAgentName$1, G as writeSessionRecord, Gt as AgentSpawnError, H as normalizeName, I as findGitRepositoryRoot, It as EXIT_CODES, L as findSession, M as getAcpxVersion, Ot as exitCodeForOutputErrorCode, R as findSessionByDirectoryWalk, Tt as listBuiltInAgents, Wt as AcpxOperationalError, _t as parsePromptSource, at as defaultSessionEventLog, bt as InterruptedError, ct as sessionEventLockPath, dt as isAcpJsonRpcMessage, gt as mergePromptSourceWithText, jt as normalizeOutputError, lt as sessionEventSegmentPath, mt as PromptInputValidationError, nt as serializeSessionRecordForDisk, rt as normalizeRuntimeSessionId, st as sessionEventActivePath, tt as parseSessionRecord, wt as DEFAULT_AGENT_NAME, xt as TimeoutError, yt as textPrompt } from "./live-checkpoint-BZrk9Mjz.js";
-import { _ as resolveGlobalFlags, b as resolveSessionNameFromFlags, c as parseHistoryLimit, d as parseOutputFormat$1, f as parsePruneBeforeDate, g as resolveAgentInvocation, h as parseTtlSeconds, i as addSessionOption, l as parseMaxTurns, m as parseTimeoutSeconds, n as addPromptInputOption, o as parseAllowedTools, p as parseSessionName, r as addSessionNameOption, s as parseDaysOlderThan, t as addGlobalFlags, u as parseNonEmptyValue, v as resolveOutputPolicy, x as loadPermissionPolicySpec, y as resolvePermissionMode } from "./flags-BKjjl3tF.js";
+import { a as runSessionQueueOwner, c as buildQueueOwnerArgOverride, g as __exportAll, h as isProcessAlive, l as flushPerfMetricsCapture, n as getTextErrorRemediationHints, o as runOnce, p as probeQueueOwnerHealth, t as createOutputFormatter, u as installPerfMetricsCapture } from "./output-Smw6kFL_.js";
+import { At as listBuiltInAgents, Et as TimeoutError, G as listSessions, Gt as OUTPUT_FORMATS, H as findSession, It as normalizeOutputError, L as getAcpxVersion, Nt as exitCodeForOutputErrorCode, St as parsePromptSource, Tt as InterruptedError, U as findSessionByDirectoryWalk, V as findGitRepositoryRoot, Vt as EXIT_CODES, X as writeSessionRecord, Xt as AgentSpawnError, Yt as AcpxOperationalError, ct as normalizeRuntimeSessionId, ft as sessionEventActivePath, gt as isAcpJsonRpcMessage, jt as normalizeAgentName$1, kt as DEFAULT_AGENT_NAME, mt as sessionEventSegmentPath, ot as parseSessionRecord, pt as sessionEventLockPath, q as normalizeName, st as serializeSessionRecordForDisk, ut as defaultSessionEventLog, wt as textPrompt, xt as mergePromptSourceWithText, yt as PromptInputValidationError } from "./live-checkpoint-mdAaF3qJ.js";
+import { _ as resolveGlobalFlags, b as resolveSessionNameFromFlags, c as parseHistoryLimit, d as parseOutputFormat$1, f as parsePruneBeforeDate, g as resolveAgentInvocation, h as parseTtlSeconds, i as addSessionOption, l as parseMaxTurns, m as parseTimeoutSeconds, n as addPromptInputOption, o as parseAllowedTools, p as parseSessionName, r as addSessionNameOption, s as parseDaysOlderThan, t as addGlobalFlags, u as parseNonEmptyValue, v as resolveOutputPolicy, x as loadPermissionPolicySpec, y as resolvePermissionMode } from "./flags-Dl_mhic3.js";
 import { realpathSync } from "node:fs";
 import { fileURLToPath, pathToFileURL } from "node:url";
 import path from "node:path";
 import { Command, CommanderError, InvalidArgumentError, Option } from "commander";
 import fs$1 from "node:fs/promises";
 import os from "node:os";
-import { randomUUID } from "node:crypto";
+import { createHash, randomUUID } from "node:crypto";
 import { ZodError, z } from "zod";
 import { performance } from "node:perf_hooks";
 //#region src/cli-public.ts
@@ -387,11 +387,11 @@ let sessionModulePromise;
 let outputModulePromise;
 let outputRenderModulePromise;
 function loadSessionModule() {
-	sessionModulePromise ??= import("./output-D_BGt1YI.js").then((n) => n.i);
+	sessionModulePromise ??= import("./output-Smw6kFL_.js").then((n) => n.i);
 	return sessionModulePromise;
 }
 function loadOutputModule() {
-	outputModulePromise ??= import("./output-D_BGt1YI.js").then((n) => n.r);
+	outputModulePromise ??= import("./output-Smw6kFL_.js").then((n) => n.r);
 	return outputModulePromise;
 }
 function loadOutputRenderModule() {
@@ -525,6 +525,8 @@ async function handlePrompt(explicitAgentName, promptParts, flags, command, conf
 		sessionId: record.acpxRecordId,
 		prompt,
 		mcpServers: config.mcpServers,
+		mcpConfigPath: config.mcpConfigPath,
+		mcpConfigFingerprint: config.mcpConfigFingerprint,
 		permissionMode,
 		nonInteractivePermissions: globalFlags.nonInteractivePermissions,
 		permissionPolicy,
@@ -1378,14 +1380,14 @@ const DEFAULT_AUTH_POLICY = "skip";
 const DEFAULT_OUTPUT_FORMAT = "text";
 const DEFAULT_QUEUE_MAX_DEPTH = 16;
 const DEFAULT_DISABLE_EXEC = false;
-const VALID_PERMISSION_MODES = new Set([
+const VALID_PERMISSION_MODES = /* @__PURE__ */ new Set([
 	"approve-all",
 	"approve-reads",
 	"deny-all"
 ]);
-const VALID_NON_INTERACTIVE_PERMISSION_POLICIES = new Set(["deny", "fail"]);
-const VALID_AUTH_POLICIES = new Set(["skip", "fail"]);
-const VALID_OUTPUT_FORMATS = new Set([
+const VALID_NON_INTERACTIVE_PERMISSION_POLICIES = /* @__PURE__ */ new Set(["deny", "fail"]);
+const VALID_AUTH_POLICIES = /* @__PURE__ */ new Set(["skip", "fail"]);
+const VALID_OUTPUT_FORMATS = /* @__PURE__ */ new Set([
 	"text",
 	"json",
 	"quiet"
@@ -1498,6 +1500,16 @@ async function readConfigFile(filePath) {
 		throw error;
 	}
 }
+async function loadExplicitMcpConfig(cwd, configuredPath) {
+	if (!configuredPath) return {};
+	const resolvedPath = path.resolve(cwd, configuredPath);
+	const result = await readConfigFile(resolvedPath);
+	if (!result.exists) throw new Error(`MCP config file not found: ${resolvedPath}`);
+	return {
+		path: resolvedPath,
+		config: result.config
+	};
+}
 function mergeAgents(globalAgents, projectAgents) {
 	return {
 		...globalAgents,
@@ -1510,16 +1522,20 @@ function mergeAuth(globalAuth, projectAuth) {
 		...projectAuth
 	};
 }
-async function loadResolvedConfig(cwd) {
+async function loadResolvedConfig(cwd, options = {}) {
 	const globalPath = defaultGlobalConfigPath();
 	const projectPath = projectConfigPath(cwd);
-	const [globalResult, projectResult] = await Promise.all([readConfigFile(globalPath), readConfigFile(projectPath)]);
+	const [globalResult, projectResult, explicitMcp] = await Promise.all([
+		readConfigFile(globalPath),
+		readConfigFile(projectPath),
+		loadExplicitMcpConfig(cwd, options.mcpConfigPath)
+	]);
 	const globalConfig = globalResult.config;
 	const projectConfig = projectResult.config;
 	const scalar = resolveScalarConfigValues(projectConfig, projectPath, globalConfig, globalPath);
 	const agents = mergeAgents(parseAgents(globalConfig?.agents, globalPath), parseAgents(projectConfig?.agents, projectPath));
 	const auth = mergeAuth(parseAuth(globalConfig?.auth, globalPath), parseAuth(projectConfig?.auth, projectPath));
-	const mcpServers = resolveMcpServers(projectConfig, projectPath, globalConfig, globalPath);
+	const mcpServers = resolveMcpServers(projectConfig, projectPath, globalConfig, globalPath, explicitMcp.config, explicitMcp.path);
 	const disableExec = resolveDisableExec(projectConfig, projectPath, globalConfig, globalPath);
 	return {
 		...scalar,
@@ -1529,6 +1545,8 @@ async function loadResolvedConfig(cwd) {
 		mcpServers,
 		globalPath,
 		projectPath,
+		mcpConfigPath: explicitMcp.path,
+		mcpConfigFingerprint: explicitMcp.path ? createHash("sha256").update(JSON.stringify(mcpServers)).digest("hex") : void 0,
 		hasGlobalConfig: globalResult.exists,
 		hasProjectConfig: projectResult.exists
 	};
@@ -1573,7 +1591,8 @@ function resolveTimeoutMs(projectConfig, projectPath, globalConfig, globalPath)
 	if (hasConfigKey(projectConfig, "timeout")) return parseTimeoutMs(projectConfig?.timeout, projectPath);
 	if (hasConfigKey(globalConfig, "timeout")) return parseTimeoutMs(globalConfig?.timeout, globalPath);
 }
-function resolveMcpServers(projectConfig, projectPath, globalConfig, globalPath) {
+function resolveMcpServers(projectConfig, projectPath, globalConfig, globalPath, mcpConfig, mcpConfigPath) {
+	if (mcpConfigPath) return parseMcpServers(mcpConfig?.mcpServers, mcpConfigPath);
 	if (hasConfigKey(projectConfig, "mcpServers")) return parseMcpServers(projectConfig?.mcpServers, projectPath);
 	if (hasConfigKey(globalConfig, "mcpServers")) return parseMcpServers(globalConfig?.mcpServers, globalPath);
 	return [];
@@ -1620,7 +1639,18 @@ async function initGlobalConfigFile() {
 		agents: {},
 		auth: {}
 	};
-	await fs$1.writeFile(configPath, `${JSON.stringify(payload, null, 2)}\n`, "utf8");
+	try {
+		await fs$1.writeFile(configPath, `${JSON.stringify(payload, null, 2)}\n`, {
+			encoding: "utf8",
+			flag: "wx"
+		});
+	} catch (error) {
+		if (error.code === "EEXIST") return {
+			path: configPath,
+			created: false
+		};
+		throw error;
+	}
 	return {
 		path: configPath,
 		created: true
@@ -1634,7 +1664,8 @@ async function handleConfigShow(command, config) {
 		...toConfigDisplay(config),
 		paths: {
 			global: config.globalPath,
-			project: config.projectPath
+			project: config.projectPath,
+			...config.mcpConfigPath ? { mcp: config.mcpConfigPath } : {}
 		},
 		loaded: {
 			global: config.hasGlobalConfig,
@@ -2141,7 +2172,7 @@ function registerAgentCommand(program, agentName, config) {
 }
 function registerFlowCommand(program, config) {
 	program.command("flow").description("Run multi-step ACP workflows from flow files").command("run").description("Run a flow file").argument("<file>", "Flow module path").option("--input-json <json>", "Flow input as JSON").option("--input-file <path>", "Read flow input JSON from file").option("--default-agent <name>", "Default agent profile for ACP nodes without profile", (value) => parseNonEmptyValue("Default agent", value)).action(async function(file, flags) {
-		const { handleFlowRun } = await import("./cli-CC2w0U-A.js");
+		const { handleFlowRun } = await import("./cli-CXlEcGWV.js");
 		await handleFlowRun(file, flags, this, config);
 	});
 }
@@ -2161,6 +2192,8 @@ function registerDefaultCommands(program, config) {
 }
 //#endregion
 //#region src/cli/queue/owner-env.ts
+const QUEUE_OWNER_PAYLOAD_FILE_ENV = "ACPX_QUEUE_OWNER_PAYLOAD_FILE";
+const QUEUE_OWNER_PAYLOAD_ENV = "ACPX_QUEUE_OWNER_PAYLOAD";
 function asRecord(value) {
 	if (!value || typeof value !== "object" || Array.isArray(value)) return;
 	return value;
@@ -2182,6 +2215,8 @@ function parseQueueOwnerPayload(raw) {
 function assignQueueOwnerTransportOptions(options, record) {
 	const parsedMcpServers = parseOptionalMcpServers(record.mcpServers, "queue owner payload");
 	if (parsedMcpServers) options.mcpServers = parsedMcpServers;
+	if (typeof record.mcpConfigPath === "string" && record.mcpConfigPath.length > 0) options.mcpConfigPath = record.mcpConfigPath;
+	if (typeof record.mcpConfigFingerprint === "string" && record.mcpConfigFingerprint.length > 0) options.mcpConfigFingerprint = record.mcpConfigFingerprint;
 	if (record.authCredentials && typeof record.authCredentials === "object") {
 		const entries = Object.entries(record.authCredentials).filter(([, value]) => typeof value === "string");
 		options.authCredentials = Object.fromEntries(entries);
@@ -2214,6 +2249,7 @@ function assignQueueOwnerSessionOptions(options, rawSessionOptions) {
 	assignSessionAllowedTools(options.sessionOptions, sessionOpts.allowedTools);
 	assignSessionMaxTurns(options.sessionOptions, sessionOpts.maxTurns);
 	assignSessionSystemPrompt(options.sessionOptions, sessionOpts.systemPrompt);
+	assignSessionEnv(options.sessionOptions, sessionOpts.env);
 }
 function assignSessionModel(options, value) {
 	if (typeof value === "string" && value.trim().length > 0) options.model = value;
@@ -2232,14 +2268,39 @@ function assignSessionSystemPrompt(options, value) {
 	const systemPrompt = asRecord(value);
 	if (typeof systemPrompt?.append === "string") options.systemPrompt = { append: systemPrompt.append };
 }
+function assignSessionEnv(options, value) {
+	const env = asRecord(value);
+	if (!env) return;
+	const entries = Object.entries(env).filter((entry) => typeof entry[1] === "string");
+	if (entries.length > 0) options.env = Object.fromEntries(entries);
+}
 async function runQueueOwnerFromEnv(env) {
-	const payload = env.ACPX_QUEUE_OWNER_PAYLOAD;
-	if (!payload) throw new Error("missing ACPX_QUEUE_OWNER_PAYLOAD");
-	await runSessionQueueOwner(parseQueueOwnerPayload(payload));
+	await runSessionQueueOwner(parseQueueOwnerPayload(await readQueueOwnerPayloadFromEnv(env)));
+}
+async function readQueueOwnerPayloadFromEnv(env) {
+	const payloadFile = env[QUEUE_OWNER_PAYLOAD_FILE_ENV];
+	if (payloadFile) {
+		const payload = await fs$1.readFile(payloadFile, "utf8");
+		await cleanupQueueOwnerPayloadFile(payloadFile).catch(() => {});
+		return payload;
+	}
+	const payload = env[QUEUE_OWNER_PAYLOAD_ENV];
+	if (!payload) throw new Error(`missing ${QUEUE_OWNER_PAYLOAD_ENV}`);
+	return payload;
+}
+async function cleanupQueueOwnerPayloadFile(payloadFile) {
+	if (!isQueueOwnerPayloadFile(payloadFile)) return;
+	await fs$1.unlink(payloadFile).catch(() => {});
+	await fs$1.rmdir(path.dirname(payloadFile)).catch(() => {});
+}
+function isQueueOwnerPayloadFile(payloadFile) {
+	const resolved = path.resolve(payloadFile);
+	const payloadDir = path.dirname(resolved);
+	return path.dirname(payloadDir) === path.resolve(os.tmpdir()) && path.basename(payloadDir).startsWith("acpx-queue-owner-") && path.basename(resolved) === "payload.json";
 }
 //#endregion
 //#region src/cli-core.ts
-const TOP_LEVEL_VERBS = new Set([
+const TOP_LEVEL_VERBS = /* @__PURE__ */ new Set([
 	"prompt",
 	"exec",
 	"cancel",
@@ -2267,10 +2328,11 @@ const TOP_LEVEL_VERSION_VALUE_FLAG_VALUES = [
 	"--append-system-prompt",
 	"--prompt-retries",
 	"--timeout",
-	"--ttl"
+	"--ttl",
+	"--mcp-config"
 ];
 const TOP_LEVEL_VERSION_VALUE_FLAGS = new Set(TOP_LEVEL_VERSION_VALUE_FLAG_VALUES);
-const TOP_LEVEL_VERSION_BOOLEAN_FLAGS = new Set([
+const TOP_LEVEL_VERSION_BOOLEAN_FLAGS = /* @__PURE__ */ new Set([
 	"--approve-all",
 	"--approve-reads",
 	"--deny-all",
@@ -2338,31 +2400,69 @@ function detectAgentToken(argv) {
 function detectInitialCwd(argv) {
 	for (let index = 0; index < argv.length; index += 1) {
 		const token = argv[index];
-		if (token === "--cwd") {
-			const next = argv[index + 1];
-			if (next && next !== "--") return path.resolve(next);
-			break;
-		}
-		if (token.startsWith("--cwd=")) {
-			const value = token.slice(6).trim();
-			if (value.length > 0) return path.resolve(value);
-			break;
-		}
-		if (token === "--") break;
+		const scan = classifyTopLevelFlagScan(token);
+		if (scan.stop) break;
+		const cwd = readCwdFlagValue(token, argv[index + 1]);
+		if (cwd) return path.resolve(cwd);
+		if (isCwdFlagToken(token)) break;
+		if (scan.skipNext) index += 1;
 	}
 	return process.cwd();
 }
+function detectMcpConfigPath(argv, cwd) {
+	for (let index = 0; index < argv.length; index += 1) {
+		const scan = scanMcpConfigToken(argv[index], argv[index + 1], cwd);
+		if (scan.stop) return scan.path;
+		if (scan.skipNext) index += 1;
+	}
+}
+function scanMcpConfigToken(token, nextToken, cwd) {
+	if (token === "--" || !token.startsWith("-") || token === "-") return { stop: true };
+	if (token === "--mcp-config") return {
+		path: resolveMcpConfigPath(nextToken, cwd),
+		stop: true
+	};
+	if (token.startsWith("--mcp-config=")) return {
+		path: resolveMcpConfigPath(token.slice(13), cwd),
+		stop: true
+	};
+	return { skipNext: TOP_LEVEL_VERSION_VALUE_FLAGS.has(token) };
+}
+function resolveMcpConfigPath(value, cwd) {
+	const trimmed = value?.trim();
+	return trimmed && trimmed !== "--" ? path.resolve(cwd, trimmed) : void 0;
+}
+function isCwdFlagToken(token) {
+	return token === "--cwd" || token.startsWith("--cwd=");
+}
+function readCwdFlagValue(token, nextToken) {
+	const value = (token === "--cwd" ? nextToken : readInlineFlagValue(token, "--cwd"))?.trim();
+	if (!value || value === "--") return;
+	return value;
+}
 function detectRequestedOutputFormat(argv, fallback) {
 	let detectedFormat = fallback;
 	for (let index = 0; index < argv.length; index += 1) {
 		const token = argv[index];
-		if (token === "--") break;
+		const scan = classifyTopLevelFlagScan(token);
+		if (scan.stop) break;
 		if (isJsonStrictToken(token)) return "json";
 		const format = readFormatFlagValue(token, argv[index + 1]);
 		if (format) detectedFormat = format;
+		if (scan.skipNext) index += 1;
 	}
 	return detectedFormat;
 }
+function classifyTopLevelFlagScan(token) {
+	if (token === "--" || !token.startsWith("-") || token === "-") return {
+		stop: true,
+		skipNext: false
+	};
+	return {
+		stop: false,
+		skipNext: TOP_LEVEL_VERSION_VALUE_FLAGS.has(token)
+	};
+}
 function readFormatFlagValue(token, nextToken) {
 	const raw = token === "--format" ? nextToken : readInlineFlagValue(token, "--format");
 	return isOutputFormat(raw) ? raw : void 0;
@@ -2380,8 +2480,10 @@ function isJsonStrictToken(token) {
 function detectJsonStrict(argv) {
 	for (let index = 0; index < argv.length; index += 1) {
 		const token = argv[index];
-		if (token === "--") break;
+		const scan = classifyTopLevelFlagScan(token);
+		if (scan.stop) break;
 		if (isJsonStrictToken(token)) return true;
+		if (scan.skipNext) index += 1;
 	}
 	return false;
 }
@@ -2493,7 +2595,8 @@ async function main(argv = process.argv) {
 		return;
 	}
 	await maybeHandleSkillflag(normalizedArgv);
-	const config = await loadResolvedConfig(detectInitialCwd(rawArgs));
+	const initialCwd = detectInitialCwd(rawArgs);
+	const config = await loadResolvedConfig(initialCwd, { mcpConfigPath: detectMcpConfigPath(rawArgs, initialCwd) });
 	const requestedJsonStrict = detectJsonStrict(rawArgs);
 	const requestedOutputPolicy = {
 		...resolveOutputPolicy(detectRequestedOutputFormat(rawArgs, config.format), requestedJsonStrict),