@drisp/cli 0.5.2 → 0.5.6

package/dist/{chunk-A54HGVML.js → chunk-7E54JMXH.js}

@@ -206,14 +206,6 @@ function ensureRepo(owner, repo) {
         `Failed to clone marketplace repo ${owner}/${repo}: ${error.message}`
       );
     }
-  } else {
-    try {
-      execFileSync("git", ["pull", "--ff-only"], {
-        cwd: repoDir,
-        stdio: "ignore"
-      });
-    } catch {
-    }
   }
   return repoDir;
 }
@@ -734,15 +726,41 @@ function refreshVersionedMarketplacePluginTarget(ref, version, sourceRepoDir) {
 // src/infra/plugins/marketplace.ts
 function pullMarketplaceRepo(owner, repo) {
   const repoDir = marketplaceRepoCacheDir(owner, repo);
+  const repoUrl = `https://github.com/${owner}/${repo}.git`;
   if (!fs4.existsSync(repoDir)) {
+    cloneMarketplaceRepo(owner, repo, repoUrl, repoDir);
+    return;
+  }
+  try {
+    execFileSync3("git", ["pull", "--ff-only"], {
+      cwd: repoDir,
+      stdio: "ignore"
+    });
+    return;
+  } catch (pullError) {
+    const backupDir = `${repoDir}.backup-${Date.now()}`;
+    try {
+      fs4.renameSync(repoDir, backupDir);
+      cloneMarketplaceRepo(owner, repo, repoUrl, repoDir);
+    } catch (recoveryError) {
+      throw new Error(
+        `Failed to refresh marketplace repo ${owner}/${repo}: ${pullError.message}. Recovery clone failed: ${recoveryError.message}. Preserved previous cache at ${backupDir}.`
+      );
+    }
+  }
+}
+function cloneMarketplaceRepo(owner, repo, repoUrl, repoDir) {
+  fs4.mkdirSync(repoDir, { recursive: true });
+  try {
+    execFileSync3("git", ["clone", "--depth", "1", repoUrl, repoDir], {
+      stdio: "ignore"
+    });
+  } catch (error) {
+    fs4.rmSync(repoDir, { recursive: true, force: true });
     throw new Error(
-      `Marketplace repo ${owner}/${repo} is not cached. It will be cloned on first use.`
+      `Failed to clone marketplace repo ${owner}/${repo}: ${error.message}`
     );
   }
-  execFileSync3("git", ["pull", "--ff-only"], {
-    cwd: repoDir,
-    stdio: "ignore"
-  });
 }
 function resolveMarketplacePlugin(ref) {
   requireGitForMarketplace("plugins");
@@ -934,31 +952,6 @@ function hasProjectWorkflow(projectDir) {
   return hasActiveWorkflow(projectConfigPath(projectDir));
 }
 
-// src/infra/plugins/mcpOptions.ts
-import fs6 from "fs";
-import path5 from "path";
-function collectMcpServersWithOptions(pluginDirs) {
-  const result = [];
-  const seen = /* @__PURE__ */ new Set();
-  for (const dir of pluginDirs) {
-    const mcpPath = path5.join(dir, ".mcp.json");
-    if (!fs6.existsSync(mcpPath)) {
-      continue;
-    }
-    const config = JSON.parse(fs6.readFileSync(mcpPath, "utf-8"));
-    for (const [serverName, serverConfig] of Object.entries(
-      config.mcpServers ?? {}
-    )) {
-      if (seen.has(serverName) || !Array.isArray(serverConfig.options) || serverConfig.options.length === 0) {
-        continue;
-      }
-      seen.add(serverName);
-      result.push({ serverName, options: serverConfig.options });
-    }
-  }
-  return result;
-}
-
 // src/core/workflows/types.ts
 function pluginSpecRef(spec) {
   return typeof spec === "string" ? spec : spec.ref;
@@ -1052,17 +1045,17 @@ function refreshPinnedWorkflowPlugins(workflow) {
 }
 
 // src/core/workflows/registry.ts
-import fs10 from "fs";
+import fs9 from "fs";
 import os5 from "os";
-import path8 from "path";
+import path7 from "path";
 
 // src/core/workflows/builtins/index.ts
-import fs8 from "fs";
+import fs7 from "fs";
 import os4 from "os";
-import path6 from "path";
+import path5 from "path";
 
 // src/core/workflows/loopManager.ts
-import fs7 from "fs";
+import fs6 from "fs";
 
 // src/core/workflows/templateVars.ts
 function substituteVariables(text, ctx) {
@@ -1093,7 +1086,7 @@ function createLoopManager(trackerPath, config) {
   const blockedMarker = config.blockedMarker ?? DEFAULT_BLOCKED_MARKER;
   function readTracker() {
     try {
-      return fs7.readFileSync(trackerPath, "utf-8");
+      return fs6.readFileSync(trackerPath, "utf-8");
     } catch {
       return "";
     }
@@ -1205,17 +1198,17 @@ If you are blocked and cannot make further progress:
 3. Explain what needs to happen to unblock the task whenever possible
 `;
 function ensureSystemPromptFile() {
-  const dir = path6.join(
+  const dir = path5.join(
     os4.homedir(),
     ".config",
     "athena",
     "builtins",
     "default"
   );
-  const filePath = path6.join(dir, "system_prompt.md");
-  if (!fs8.existsSync(filePath) || fs8.readFileSync(filePath, "utf-8") !== SYSTEM_PROMPT) {
-    fs8.mkdirSync(dir, { recursive: true });
-    fs8.writeFileSync(filePath, SYSTEM_PROMPT, "utf-8");
+  const filePath = path5.join(dir, "system_prompt.md");
+  if (!fs7.existsSync(filePath) || fs7.readFileSync(filePath, "utf-8") !== SYSTEM_PROMPT) {
+    fs7.mkdirSync(dir, { recursive: true });
+    fs7.writeFileSync(filePath, SYSTEM_PROMPT, "utf-8");
   }
   return filePath;
 }
@@ -1242,19 +1235,19 @@ function listBuiltinWorkflows() {
 }
 
 // src/core/workflows/sourceMetadata.ts
-import fs9 from "fs";
-import path7 from "path";
+import fs8 from "fs";
+import path6 from "path";
 function legacyLocalToNew(legacyPath, legacyRepoDir) {
   const repoDir = legacyRepoDir ?? findMarketplaceRepoDir(legacyPath);
   if (!repoDir) {
     return { kind: "filesystem", path: legacyPath };
   }
   try {
-    const canonicalRepoDir = fs9.realpathSync(repoDir);
+    const canonicalRepoDir = fs8.realpathSync(repoDir);
     const listings = listMarketplaceWorkflowsFromRepo(canonicalRepoDir);
-    const absolutePath = fs9.realpathSync(legacyPath);
+    const absolutePath = fs8.realpathSync(legacyPath);
     const match = listings.find(
-      (l) => fs9.realpathSync(l.workflowPath) === absolutePath
+      (l) => fs8.realpathSync(l.workflowPath) === absolutePath
     );
     if (match) {
       return {
@@ -1269,11 +1262,11 @@ function legacyLocalToNew(legacyPath, legacyRepoDir) {
   return { kind: "filesystem", path: legacyPath };
 }
 function readWorkflowSourceMetadata(workflowDir) {
-  const sourceFile = path7.join(workflowDir, "source.json");
-  if (!fs9.existsSync(sourceFile)) return void 0;
+  const sourceFile = path6.join(workflowDir, "source.json");
+  if (!fs8.existsSync(sourceFile)) return void 0;
   let raw;
   try {
-    raw = JSON.parse(fs9.readFileSync(sourceFile, "utf-8"));
+    raw = JSON.parse(fs8.readFileSync(sourceFile, "utf-8"));
   } catch {
     throw new Error(`Invalid source.json: ${sourceFile} is not valid JSON`);
   }
@@ -1315,9 +1308,9 @@ function readWorkflowSourceMetadata(workflowDir) {
   throw new Error(`Invalid source.json: ${sourceFile} kind is not supported`);
 }
 function writeWorkflowSourceMetadata(workflowDir, metadata) {
-  fs9.mkdirSync(workflowDir, { recursive: true });
-  fs9.writeFileSync(
-    path7.join(workflowDir, "source.json"),
+  fs8.mkdirSync(workflowDir, { recursive: true });
+  fs8.writeFileSync(
+    path6.join(workflowDir, "source.json"),
     JSON.stringify({ v: 2, ...metadata }),
     "utf-8"
   );
@@ -1325,19 +1318,19 @@ function writeWorkflowSourceMetadata(workflowDir, metadata) {
 
 // src/core/workflows/registry.ts
 function registryDir() {
-  return path8.join(os5.homedir(), ".config", "athena", "workflows");
+  return path7.join(os5.homedir(), ".config", "athena", "workflows");
 }
 function ensurePathWithinRoot(rootDir, targetPath, label) {
-  const relative = path8.relative(rootDir, targetPath);
-  if (relative === "" || !relative.startsWith("..") && !path8.isAbsolute(relative)) {
+  const relative = path7.relative(rootDir, targetPath);
+  if (relative === "" || !relative.startsWith("..") && !path7.isAbsolute(relative)) {
     return;
   }
   throw new Error(`${label} resolves outside the workflow root: ${targetPath}`);
 }
 function resolveWorkflow(name) {
-  const workflowDir = path8.join(registryDir(), name);
-  const workflowPath = path8.join(workflowDir, "workflow.json");
-  if (!fs10.existsSync(workflowPath)) {
+  const workflowDir = path7.join(registryDir(), name);
+  const workflowPath = path7.join(workflowDir, "workflow.json");
+  if (!fs9.existsSync(workflowPath)) {
     const builtin = resolveBuiltinWorkflow(name);
     if (builtin) {
       return builtin;
@@ -1347,7 +1340,7 @@ function resolveWorkflow(name) {
     );
   }
   const source = readWorkflowSourceMetadata(workflowDir);
-  const raw = JSON.parse(fs10.readFileSync(workflowPath, "utf-8"));
+  const raw = JSON.parse(fs9.readFileSync(workflowPath, "utf-8"));
   if (!Array.isArray(raw["plugins"])) {
     throw new Error(
       `Invalid workflow.json: "plugins" must be an array (got ${typeof raw["plugins"]})`
@@ -1387,15 +1380,15 @@ function resolveWorkflow(name) {
     );
   }
   const workflowFile = raw["workflowFile"];
-  if (typeof workflowFile === "string" && !path8.isAbsolute(workflowFile)) {
-    const workflowFilePath = path8.resolve(workflowDir, workflowFile);
-    if (!fs10.existsSync(workflowFilePath)) {
+  if (typeof workflowFile === "string" && !path7.isAbsolute(workflowFile)) {
+    const workflowFilePath = path7.resolve(workflowDir, workflowFile);
+    if (!fs9.existsSync(workflowFilePath)) {
       throw new Error(
         `Invalid workflow.json: workflowFile "${workflowFile}" not found at ${workflowFilePath}`
       );
     }
     raw["workflowFile"] = workflowFilePath;
-  } else if (typeof workflowFile === "string" && !fs10.existsSync(workflowFile)) {
+  } else if (typeof workflowFile === "string" && !fs9.existsSync(workflowFile)) {
     throw new Error(
       `Invalid workflow.json: workflowFile "${workflowFile}" not found`
     );
@@ -1406,29 +1399,29 @@ function resolveWorkflow(name) {
   };
 }
 function readWorkflowSource(sourcePath) {
-  const content = fs10.readFileSync(sourcePath, "utf-8");
+  const content = fs9.readFileSync(sourcePath, "utf-8");
   return { content, workflow: JSON.parse(content) };
 }
 function copyWorkflowFiles(sourcePath, destDir) {
   const { content, workflow } = readWorkflowSource(sourcePath);
-  const absoluteSourcePath = path8.resolve(sourcePath);
-  const sourceDir = path8.dirname(absoluteSourcePath);
-  const absoluteDestDir = path8.resolve(destDir);
-  fs10.mkdirSync(absoluteDestDir, { recursive: true });
-  fs10.writeFileSync(
-    path8.join(absoluteDestDir, "workflow.json"),
+  const absoluteSourcePath = path7.resolve(sourcePath);
+  const sourceDir = path7.dirname(absoluteSourcePath);
+  const absoluteDestDir = path7.resolve(destDir);
+  fs9.mkdirSync(absoluteDestDir, { recursive: true });
+  fs9.writeFileSync(
+    path7.join(absoluteDestDir, "workflow.json"),
     content,
     "utf-8"
   );
   const copyRelativeAsset = (assetPath) => {
-    if (!assetPath || path8.isAbsolute(assetPath)) return;
-    const sourceAssetPath = path8.resolve(sourceDir, assetPath);
+    if (!assetPath || path7.isAbsolute(assetPath)) return;
+    const sourceAssetPath = path7.resolve(sourceDir, assetPath);
     ensurePathWithinRoot(sourceDir, sourceAssetPath, "Workflow asset");
-    if (!fs10.existsSync(sourceAssetPath)) return;
-    const destAssetPath = path8.resolve(absoluteDestDir, assetPath);
+    if (!fs9.existsSync(sourceAssetPath)) return;
+    const destAssetPath = path7.resolve(absoluteDestDir, assetPath);
     ensurePathWithinRoot(absoluteDestDir, destAssetPath, "Workflow asset");
-    fs10.mkdirSync(path8.dirname(destAssetPath), { recursive: true });
-    fs10.copyFileSync(sourceAssetPath, destAssetPath);
+    fs9.mkdirSync(path7.dirname(destAssetPath), { recursive: true });
+    fs9.copyFileSync(sourceAssetPath, destAssetPath);
   };
   const rawWorkflow = workflow;
   const promptAsset = rawWorkflow["workflowFile"];
@@ -1465,7 +1458,7 @@ function installWorkflowFromSource(source, name) {
       'Workflow has no "name" field. Provide --name to specify one.'
     );
   }
-  const destDir = path8.join(registryDir(), workflowName);
+  const destDir = path7.join(registryDir(), workflowName);
   copyWorkflowFiles(source.workflowPath, destDir);
   const metadata = toStoredMetadata(source);
   writeWorkflowSourceMetadata(destDir, metadata);
@@ -1477,13 +1470,7 @@ function reResolveFromMetadata(metadata) {
     const slashIdx = slug.indexOf("/");
     const owner = slug.slice(0, slashIdx);
     const repo = slug.slice(slashIdx + 1);
-    try {
-      pullMarketplaceRepo(owner, repo);
-    } catch (error) {
-      if (!(error instanceof Error) || !error.message.includes("is not cached")) {
-        throw error;
-      }
-    }
+    pullMarketplaceRepo(owner, repo);
     return resolveWorkflowInstall(metadata.ref, []);
   }
   if (metadata.kind === "marketplace-local") {
@@ -1507,7 +1494,7 @@ function reResolveFromMetadata(metadata) {
   return { kind: "filesystem", workflowPath: metadata.path };
 }
 function updateWorkflow(name) {
-  const workflowDir = path8.join(registryDir(), name);
+  const workflowDir = path7.join(registryDir(), name);
   const metadata = readWorkflowSourceMetadata(workflowDir);
   if (!metadata) {
     throw new Error(
@@ -1521,8 +1508,8 @@ function updateWorkflow(name) {
 }
 function listWorkflows() {
   const dir = registryDir();
-  const installed = fs10.existsSync(dir) ? fs10.readdirSync(dir, { withFileTypes: true }).filter(
-    (entry) => entry.isDirectory() && fs10.existsSync(path8.join(dir, entry.name, "workflow.json"))
+  const installed = fs9.existsSync(dir) ? fs9.readdirSync(dir, { withFileTypes: true }).filter(
+    (entry) => entry.isDirectory() && fs9.existsSync(path7.join(dir, entry.name, "workflow.json"))
   ).map((entry) => entry.name) : [];
   const builtins = listBuiltinWorkflows().filter(
     (name) => !installed.includes(name)
@@ -1530,11 +1517,11 @@ function listWorkflows() {
   return [...builtins, ...installed];
 }
 function removeWorkflow(name) {
-  const dir = path8.join(registryDir(), name);
-  if (!fs10.existsSync(dir)) {
+  const dir = path7.join(registryDir(), name);
+  if (!fs9.existsSync(dir)) {
     throw new Error(`Workflow "${name}" not found.`);
   }
-  fs10.rmSync(dir, { recursive: true, force: true });
+  fs9.rmSync(dir, { recursive: true, force: true });
 }
 
 // src/core/workflows/applyWorkflow.ts
@@ -1568,8 +1555,8 @@ function compileWorkflowPlan(input) {
 }
 
 // src/core/workflows/sessionPlan.ts
-import fs11 from "fs";
-import path9 from "path";
+import fs10 from "fs";
+import path8 from "path";
 
 // src/core/workflows/stateMachine.md
 var stateMachine_default = "# Stateless Session Protocol\n\nYou run in a stateless loop. Each session is a fresh process with no memory of prior sessions. **The tracker file is your only continuity** \u2014 read it, work, write it. Assume interruption: the runner may kill a long session, your context may collapse under tool output, you may hit token limits mid-task. Anything not in the tracker is gone.\n\n## First action, every session\n\n1. Read the tracker at the configured path (default: `.athena/<session_id>/tracker.md`). The runner provides the session ID \u2014 do not invent one.\n2. If the tracker contains `<!-- TRACKER_SKELETON -->` \u2192 this is session 1, run [**Orient**](#orient-session-1).\n3. Otherwise \u2192 this is a continuation, run [**Execute**](#execute-session-2) from where the tracker says, not from the start of the flow.\n\nReading first prevents two failure modes that waste whole sessions: redoing work already done, or contradicting decisions a prior session made.\n\n## Tracker contract\n\nThe tracker must always answer four questions:\n\n1. What are we trying to accomplish?\n2. What has been done?\n3. What's left?\n4. What should the next session do first?\n\nA future session has no other context. If something isn't here, it doesn't exist. Section headings may vary by workflow, but these four answers must be explicit and easy to find.\n\n### Terminal markers\n\nDefault markers (workflows may override \u2014 use the markers configured for the active workflow):\n\n- `<!-- WORKFLOW_COMPLETE -->` \u2014 all work done and verified\n- `<!-- WORKFLOW_BLOCKED -->` or `<!-- WORKFLOW_BLOCKED: reason -->` \u2014 cannot proceed without external intervention\n\nRules:\n\n- Only the last non-empty line of the tracker is authoritative. Marker-like text in notes, examples, or quoted instructions earlier in the file is ignored.\n- The runner trusts markers unconditionally. A premature marker ends the loop with no automatic recovery \u2014 write one only when its criteria are fully met.\n- Include a concrete reason after `WORKFLOW_BLOCKED:` whenever possible; the bare form is still valid.\n\n## Phases\n\n### Orient (session 1)\n\n1. **Replace the skeleton immediately**, before any domain work. Even a three-line tracker (goal + \"orienting\") protects you if the session dies during setup.\n2. Run the workflow's orientation steps. These vary by domain \u2014 a test-writing workflow explores the product in a browser; a migration workflow audits the schema. The workflow defines what orientation means.\n3. Refine the tracker into a granular plan. Each task a concrete, verifiable unit of work, including verification steps (running checks, reviewing output) \u2014 not just implementation. Vague tasks (\"write tests\") cannot be meaningfully resumed by a future session that has no idea what they mean here.\n4. Record concrete observations \u2014 what you actually saw, not what you assumed. Wrong assumptions burn entire future sessions on rework.\n5. **Single-turn requests still go through this phase.** If the entire request is satisfied in one turn, write a minimal tracker (what was asked, what was done, the outcome) and append `<!-- WORKFLOW_COMPLETE -->`. Leaving the skeleton in place causes the runner to classify the session as a failure.\n\n### Execute (session 2+)\n\n- Work from where the tracker says, in the workflow's prescribed sequence. Not every session covers every step.\n- If the workflow defines a skill table, **load the relevant skill before each activity**. Skills carry the implementation detail (scaffolding steps, locator rules, anti-patterns, code templates) that this protocol intentionally doesn't repeat.\n- Delegate heavy exploration or generation to subagents via the Task tool. Pass file paths, conventions, and concrete output expectations; tell them which skill to load. Respect the workflow's **delegation constraints** \u2014 some operations must run in the main agent because their output is proof, or because the main agent needs to interpret results in context.\n- Run quality gates in order. Do not skip \u2014 they exist because skipping cascades into rework. On a failing verdict, address the issues and re-run before proceeding. Respect the workflow's **retry limits**: repeated failure usually signals a deeper issue another retry won't fix.\n\n### End\n\n1. Tracker reflects all progress, discoveries, and blockers.\n2. Tracker says clearly what the next session should do first.\n3. If all work is verified: append the completion marker.\n4. If an unrecoverable blocker prevents progress: append the blocked marker, with a reason if you have one.\n\n## When to write the tracker\n\nWrite on **concrete triggers**, not on a vague sense of \"meaningful progress.\" The right cadence sits between every-tool-call (noisy log, wastes tokens) and end-of-session (everything lost if you die mid-task).\n\n- **Discrete unit done** \u2014 file written, fix applied, test run, gate passed. Reflect the new reality before starting the next unit.\n- **Insight learned** \u2014 API quirk, config field that turned out to matter, dead end ruled out, decision between two approaches. Insights are tracker-worthy even when no code changed; rediscovering them costs the next session a full re-exploration. The tracker is a knowledge ledger, not just a task log.\n- **About to do something risky or long-running** \u2014 subagent dispatch, long build, flaky external call, large refactor. Write _first_, then act. If the operation kills your session, only what's on disk survives.\n- **Plan changed** \u2014 task resequenced, new task surfaced, planned task no longer needed. Stale plans poison continuation sessions.\n- **You haven't written in a while** \u2014 if you can't remember the last update, you've gone too long. A short defensive update (\"doing X, last completed Y, next is Z\") beats nothing.\n\nEach update covers: what changed (work or knowledge), what's now next, and any caveat the next session needs. Don't transcribe tool calls \u2014 the tracker is a contract with your future self, not a replay log.\n\nThe cost of one extra tracker update is a few tokens. The cost of dying without one is a whole wasted session. Bias toward writing.\n\n## Task UI projection\n\nThe tracker is the durable source of truth. Your harness's task tools are a session-scoped UI projection of the same plan, shown to the user in their CLI widget. They do not survive process exit.\n\n{{TASK_TOOL_INSTRUCTIONS}}\n\n- **Session 1, after orientation:** project the tracker's task plan into the task tools.\n- **Session 2+, after reading the tracker:** recreate the projection from the tracker; do not assume task IDs from prior sessions still exist.\n- **During work:** update both \u2014 the task tools for immediate UI feedback, the tracker for persistence \u2014 in the same working phase.\n\n## Session bounding\n\nEach fresh session starts with a clean context window and a compact tracker \u2014 effectively self-compaction. As you work, context fills with tool outputs and intermediate state. The longer you run, the more attention is spread across tokens that are no longer relevant, degrading precision on the work that matters now.\n\nWork a bounded chunk per session. Ending early and letting the next session pick up from a clean tracker is almost always better than pushing through with a heavy context. Natural checkpoints:\n\n- After a quality gate\n- After crossing multiple phases (explored \u2192 planned \u2192 wrote specs) \u2014 stop before pushing into the next\n- When your context is visibly heavy with tool output from earlier work\n\n## Quick reference\n\n- [ ] Read the tracker before doing anything else\n- [ ] Replace the skeleton immediately, even for single-turn requests\n- [ ] Update on concrete triggers \u2014 unit done, insight learned, risky op pending, plan changed\n- [ ] Project the tracker plan into task tools at session start; keep both in sync as work lands\n- [ ] Load the workflow's skill before each activity\n- [ ] Run quality gates in order; respect delegation constraints and retry limits\n- [ ] Write the completion marker only when all work is verified\n- [ ] Checkpoint and end before context goes stale\n";
@@ -1612,10 +1599,10 @@ function readWorkflowOverride(projectDir, workflow, sessionId, trackerPath, harn
   if (!workflow?.workflowFile) {
     return { workflowOverride: void 0, warnings: [] };
   }
-  const resolvedPath = path9.isAbsolute(workflow.workflowFile) ? workflow.workflowFile : path9.resolve(projectDir, workflow.workflowFile);
+  const resolvedPath = path8.isAbsolute(workflow.workflowFile) ? workflow.workflowFile : path8.resolve(projectDir, workflow.workflowFile);
   let workflowContent;
   try {
-    workflowContent = fs11.readFileSync(resolvedPath, "utf-8");
+    workflowContent = fs10.readFileSync(resolvedPath, "utf-8");
   } catch {
     return {
       workflowOverride: void 0,
@@ -1629,9 +1616,9 @@ function readWorkflowOverride(projectDir, workflow, sessionId, trackerPath, harn
     sessionId,
     trackerPath: trackerPath ?? void 0
   });
-  const workflowDir = path9.dirname(resolvedPath);
-  const composedPath = path9.join(workflowDir, ".composed-system-prompt.md");
-  fs11.writeFileSync(composedPath, composed, "utf-8");
+  const workflowDir = path8.dirname(resolvedPath);
+  const composedPath = path8.join(workflowDir, ".composed-system-prompt.md");
+  fs10.writeFileSync(composedPath, composed, "utf-8");
   return {
     workflowOverride: {
       appendSystemPromptFile: composedPath,
@@ -1658,7 +1645,7 @@ function resolveTrackerPath(input) {
     return null;
   }
   const promptPath = input.sessionId ? rawPath.replaceAll("{sessionId}", input.sessionId) : rawPath;
-  const absolutePath = path9.isAbsolute(promptPath) ? promptPath : path9.resolve(input.projectDir, promptPath);
+  const absolutePath = path8.isAbsolute(promptPath) ? promptPath : path8.resolve(input.projectDir, promptPath);
   return {
     absolutePath,
     promptPath
@@ -1704,7 +1691,7 @@ function shouldContinueWorkflowRun(state) {
     return null;
   }
   const loopState = loopManager.getState();
-  if (!fs11.existsSync(loopManager.trackerPath)) {
+  if (!fs10.existsSync(loopManager.trackerPath)) {
     cleanupWorkflowRun(state);
     return {
       reason: "missing_tracker",
@@ -1750,8 +1737,8 @@ import { useCallback, useEffect, useRef, useState } from "react";
 
 // src/core/workflows/workflowRunner.ts
 import crypto from "crypto";
-import fs12 from "fs";
-import path10 from "path";
+import fs11 from "fs";
+import path9 from "path";
 var NULL_TOKENS = {
   input: null,
   output: null,
@@ -1808,9 +1795,9 @@ function mergeTokens(base, next) {
   };
 }
 function defaultCreateTracker(trackerPath, content) {
-  fs12.mkdirSync(path10.dirname(trackerPath), { recursive: true });
+  fs11.mkdirSync(path9.dirname(trackerPath), { recursive: true });
   try {
-    fs12.writeFileSync(trackerPath, content, { encoding: "utf-8", flag: "wx" });
+    fs11.writeFileSync(trackerPath, content, { encoding: "utf-8", flag: "wx" });
   } catch (e) {
     if (e.code !== "EEXIST") throw e;
   }
@@ -2067,6 +2054,31 @@ function useWorkflowSessionController(base, input) {
   };
 }
 
+// src/infra/plugins/mcpOptions.ts
+import fs12 from "fs";
+import path10 from "path";
+function collectMcpServersWithOptions(pluginDirs) {
+  const result = [];
+  const seen = /* @__PURE__ */ new Set();
+  for (const dir of pluginDirs) {
+    const mcpPath = path10.join(dir, ".mcp.json");
+    if (!fs12.existsSync(mcpPath)) {
+      continue;
+    }
+    const config = JSON.parse(fs12.readFileSync(mcpPath, "utf-8"));
+    for (const [serverName, serverConfig] of Object.entries(
+      config.mcpServers ?? {}
+    )) {
+      if (seen.has(serverName) || !Array.isArray(serverConfig.options) || serverConfig.options.length === 0) {
+        continue;
+      }
+      seen.add(serverName);
+      result.push({ serverName, options: serverConfig.options });
+    }
+  }
+  return result;
+}
+
 export {
   createWorkflowRunner,
   useWorkflowSessionController,
@@ -2085,7 +2097,6 @@ export {
   writeGlobalConfig,
   writeProjectConfig,
   hasProjectWorkflow,
-  collectMcpServersWithOptions,
   installWorkflowPlugins,
   resolveWorkflowPlugins,
   listBuiltinWorkflows,
@@ -2094,6 +2105,7 @@ export {
   updateWorkflow,
   listWorkflows,
   removeWorkflow,
-  compileWorkflowPlan
+  compileWorkflowPlan,
+  collectMcpServersWithOptions
 };
-//# sourceMappingURL=chunk-A54HGVML.js.map
+//# sourceMappingURL=chunk-7E54JMXH.js.map