@schoolai/shipyard 3.0.0-rc.20260413.2 → 3.0.0

package/dist/index.js

@@ -106,7 +106,7 @@ async function handleSubcommand() {
     return true;
   }
   if (subcommand === "start") {
-    const { startCommand } = await import("./start-MJUFHZ3L.js");
+    const { startCommand } = await import("./start-G6D7XOCQ.js");
     await startCommand();
     return true;
   }
@@ -118,7 +118,7 @@ async function main() {
   const args = parseCliArgs();
   if (args.serve) {
     await loadAuthFromConfig(env);
-    const { serve } = await import("./serve-IGUWRAXT.js");
+    const { serve } = await import("./serve-LL6LUMZI.js");
     return serve({ isDev: env.SHIPYARD_DEV });
   }
   logger.error("Use `shipyard start` to run the daemon. Use --help for usage.");

package/dist/{serve-IGUWRAXT.js → serve-LL6LUMZI.js}

@@ -25302,6 +25302,7 @@ var TaskRecordSchema = external_exports.object({
   currentActivity: external_exports.string().nullable(),
   cwd: external_exports.string(),
   acknowledgedAt: external_exports.number().nullable().optional(),
+  attentionAt: external_exports.number().nullable().optional(),
   pinned: external_exports.boolean().optional(),
   scheduleId: external_exports.string().optional(),
   scheduleName: external_exports.string().optional(),
@@ -29569,7 +29570,7 @@ var IFRAME_BLOCKING_HEADERS = /* @__PURE__ */ new Set([
   "content-security-policy",
   "content-security-policy-report-only"
 ]);
-var HISTORY_GUARD = `<script>(function(){var p=history.pushState,r=history.replaceState;history.pushState=function(){try{p.apply(this,arguments)}catch(e){if(!(e instanceof DOMException&&e.name==="SecurityError"))throw e}};history.replaceState=function(){try{r.apply(this,arguments)}catch(e){if(!(e instanceof DOMException&&e.name==="SecurityError"))throw e}}})();</script>`;
+var HISTORY_GUARD = `<script>(function(){var p=history.pushState,r=history.replaceState;history.pushState=function(){try{p.apply(this,arguments)}catch(e){if(!(e instanceof DOMException&&e.name==="SecurityError"))throw e}};history.replaceState=function(){try{r.apply(this,arguments)}catch(e){if(!(e instanceof DOMException&&e.name==="SecurityError"))throw e}};var la=Location.prototype.assign,lr=Location.prototype.replace;function patchLoc(orig,hFn){return function(url){if(typeof url==="string"&&url.charAt(0)==="#"){try{hFn.call(history,null,"",location.origin+location.pathname+location.search+url)}catch(e){location.hash=url}return}try{return orig.call(this,url)}catch(e){if(!(e instanceof DOMException&&e.name==="SecurityError"))throw e}}}try{Location.prototype.assign=patchLoc(la,p);Location.prototype.replace=patchLoc(lr,r)}catch(e){}})();</script>`;
 function injectBaseHref(html, origin) {
   const baseTag = `<base href="${origin}/">`;
   const injection = HISTORY_GUARD + baseTag + ANNOTATION_BRIDGE_TAG;
@@ -30236,6 +30237,12 @@ async function resolveLinearToken(deps) {
   }
   return null;
 }
+var LinearAuthError = class extends Error {
+  constructor(message) {
+    super(message);
+    this.name = "LinearAuthError";
+  }
+};
 async function graphql(token, query3, variables) {
   const res = await fetch(LINEAR_API_URL, {
     method: "POST",
@@ -30247,7 +30254,7 @@ async function graphql(token, query3, variables) {
   });
   if (!res.ok) {
     if (res.status === 401) {
-      throw new Error("Linear authentication expired");
+      throw new LinearAuthError("Linear authentication expired");
     }
     throw new Error(`Linear API error: ${res.status} ${res.statusText}`);
   }
@@ -30480,6 +30487,9 @@ async function handleLinearPluginRequest(method, params, deps) {
   } catch (err) {
     const message = err instanceof Error ? err.message : String(err);
     deps.log({ event: "linear_plugin_error", method, error: message });
+    if (err instanceof LinearAuthError) {
+      return { authError: message };
+    }
     return { error: message };
   }
 }
@@ -30723,7 +30733,28 @@ function handlePluginDataRequest(requestId, pluginId, method, params, sendContro
       });
     }
   };
-  plugin.onPluginDataRequest(method, params, pluginDeps).then(respond).catch((err) => {
+  plugin.onPluginDataRequest(method, params, pluginDeps).then((result) => {
+    if ("authError" in result && result.authError) {
+      const oauthConfig = plugin.oauthConfig;
+      if (oauthConfig && deps.tokenStore) {
+        const vaultKey = oauthConfig.vaultTokenKey;
+        const baseName = vaultKey.replace(/-oauth$/, "");
+        void deps.tokenStore.deleteToken(vaultKey);
+        if (baseName !== vaultKey) {
+          void deps.tokenStore.deleteToken(baseName);
+        }
+      }
+      sendControl({
+        type: "plugin_auth_status",
+        pluginId,
+        status: "error",
+        error: result.authError
+      });
+      respond({ error: result.authError });
+    } else {
+      respond(result);
+    }
+  }).catch((err) => {
     respond({ error: err instanceof Error ? err.message : String(err) });
   });
 }
@@ -31583,6 +31614,28 @@ var McpProxyServer = class {
       return { name, status: "pending" };
     });
   }
+  /** Whether a server is tracked (connected or failed). */
+  hasConfigured(name) {
+    return this.#allConfigured.has(name);
+  }
+  /**
+   * Dynamically add and connect a server after initialization.
+   * Used when an HTTP/SSE server is toggled on after daemon start.
+   */
+  async addServer(name, config2) {
+    this.#allConfigured.set(name, config2);
+    try {
+      await this.connectServer(name, config2);
+    } catch (err) {
+      if (!this.#connectErrors.has(name)) this.#connectErrors.set(name, "transport");
+      this.#deps.log({
+        event: "mcp_proxy_connect_failed",
+        serverName: name,
+        url: config2.url,
+        error: err instanceof Error ? err.message : String(err)
+      });
+    }
+  }
   /** Disconnect a single server. */
   async disconnectServer(name) {
     const server = this.#servers.get(name);
@@ -31751,15 +31804,6 @@ async function sweepStaleTasks(taskStateStore, taskManager, log) {
     }
   }
 }
-async function resealAcknowledgements(taskStateStore, log) {
-  const tasks = await taskStateStore.listTasks();
-  for (const [taskId, task] of Object.entries(tasks)) {
-    if (task.acknowledgedAt != null && task.updatedAt > task.acknowledgedAt) {
-      await taskStateStore.acknowledge(taskId);
-      log({ event: "acknowledgement_resealed", taskId });
-    }
-  }
-}
 
 // src/services/credentials/credentials-sync.ts
 import {
@@ -65293,10 +65337,12 @@ var PreWarmManager = class {
         serverCount: statuses.length,
         servers: statuses.map((s2) => ({ name: s2.name, status: s2.status, error: s2.error }))
       });
-      const proxyStatuses = this.#deps.getProxyStatuses();
-      const proxyNames = new Set(proxyStatuses.map((s2) => s2.name));
-      const merged = [...statuses.filter((s2) => !proxyNames.has(s2.name)), ...proxyStatuses];
-      this.#deps.broadcastControl({ type: "mcp_server_status", servers: merged });
+      if (!this.#deps.hasLiveSubprocesses()) {
+        const proxyStatuses = this.#deps.getProxyStatuses();
+        const proxyNames = new Set(proxyStatuses.map((s2) => s2.name));
+        const merged = [...statuses.filter((s2) => !proxyNames.has(s2.name)), ...proxyStatuses];
+        this.#deps.broadcastControl({ type: "mcp_server_status", servers: merged });
+      }
       this.#disableNativePluginsForProxy(statuses);
     }).catch((err) => {
       const msg = err instanceof Error ? err.message : String(err);
@@ -75475,7 +75521,7 @@ var AgentSessionManager = class {
 var DEFAULTS = {
   assistantHeadChars: 400,
   assistantTailChars: 400,
-  toolResultMaxChars: 100,
+  errorResultMaxChars: 200,
   maxTotalChars: 5e4
 };
 function serializeConversationContext(messages, options) {
@@ -75504,7 +75550,7 @@ function partitionBlockLines(blockLines) {
   const textLines = [];
   const toolLines = [];
   for (const line of blockLines) {
-    if (line.startsWith("  [Tool:") || line.startsWith("  \u2192")) {
+    if (line.startsWith("  [") || line.startsWith("  \u2192")) {
       toolLines.push(line);
     } else {
       textLines.push(line);
@@ -75525,22 +75571,39 @@ function serializeBlock(block2, senderKind, opts) {
     case "resource":
       return serializeEmbeddedResource(block2);
     case "thinking":
-      return "  [thinking]";
+      return null;
     case "compaction_boundary":
       return `  [compaction boundary: ${block2.messageCount} messages compacted]`;
     case "diff_review_feedback":
-    case "preview_annotation_feedback":
+      return serializeDiffReviewFeedback(block2);
     case "annotation_feedback":
+      return serializeAnnotationFeedback(block2);
+    case "preview_annotation_feedback":
+      return serializePreviewAnnotationFeedback(block2);
     case "task_feedback":
+      return `  [task feedback: ${block2.changes.map((c) => `${c.subject} (${c.changeType})`).join(", ")}]`;
     case "review_comment":
+      return `  [review: ${block2.body}]`;
     case "review_decision":
-      return `  [${block2.type}]`;
+      return `  [review decision: ${block2.decision}${block2.feedback ? ` \u2014 ${block2.feedback}` : ""}]`;
     default: {
       block2;
       return null;
     }
   }
 }
+function serializeDiffReviewFeedback(block2) {
+  const comments = block2.comments.map((c) => `${c.filePath}:${c.lineNumber ?? ""} \u2014 ${c.body}`).join("; ");
+  return `  [diff feedback: ${comments}]`;
+}
+function serializeAnnotationFeedback(block2) {
+  const bodies = block2.annotations.map((a) => a.body).join("; ");
+  return `  [annotation feedback: ${bodies}]`;
+}
+function serializePreviewAnnotationFeedback(block2) {
+  const comments = block2.comments.map((c) => `${c.url}: ${c.body}`).join("; ");
+  return `  [preview feedback: ${comments}]`;
+}
 function serializeBlocks(blocks, senderKind, opts) {
   const result = [];
   for (const block2 of blocks) {
@@ -75559,26 +75622,50 @@ function serializeTextBlock(text2, senderKind, opts) {
   return `${head} [truncated ${truncatedChars} chars] ${tail}`;
 }
 function serializeToolUse(block2) {
-  const inputSummary = summarizeToolInput(block2.input);
-  return `  [Tool: ${block2.toolName} ${inputSummary}]`;
-}
-function summarizeToolInput(input) {
-  const parts = [];
-  for (const [, value] of Object.entries(input)) {
-    if (typeof value === "string") {
-      parts.push(value.length > 60 ? value.slice(0, 60) : value);
-    } else if (typeof value === "number" || typeof value === "boolean") {
-      parts.push(String(value));
+  const name = shortToolName(block2.toolName);
+  const key = extractKeyParam(block2.toolName, block2.input);
+  return key ? `  [${name}: ${key}]` : `  [${name}]`;
+}
+function shortToolName(toolName) {
+  if (toolName.startsWith("mcp__")) {
+    const parts = toolName.split("__");
+    return parts[parts.length - 1] ?? toolName;
+  }
+  return toolName;
+}
+function extractKeyParam(toolName, input) {
+  const baseName = shortToolName(toolName);
+  switch (baseName) {
+    case "Read":
+    case "Edit":
+    case "Write":
+      return truncParam(input.file_path);
+    case "Bash":
+      return truncParam(input.command, 80);
+    case "Grep":
+      return truncParam(input.pattern);
+    case "Glob":
+      return truncParam(input.pattern);
+    case "Agent":
+      return truncParam(input.prompt, 80);
+    case "WebSearch":
+      return truncParam(input.query);
+    case "WebFetch":
+      return truncParam(input.url);
+    default: {
+      const firstStr = Object.values(input).find((v2) => typeof v2 === "string");
+      return typeof firstStr === "string" ? truncParam(firstStr, 60) : null;
     }
   }
-  const summary = parts.join(" ").slice(0, 60);
-  return summary || Object.keys(input).join(", ");
+}
+function truncParam(value, max = 120) {
+  if (typeof value !== "string") return null;
+  return value.length > max ? value.slice(0, max) : value;
 }
 function serializeToolResult(block2, opts) {
-  const maxChars = block2.isError ? opts.toolResultMaxChars * 2 : opts.toolResultMaxChars;
-  const status = block2.isError ? "error" : "success";
-  const content = block2.content.length > maxChars ? block2.content.slice(0, maxChars) : block2.content;
-  return `  \u2192 ${status}: ${content}`;
+  if (!block2.isError) return null;
+  const content = block2.content.length > opts.errorResultMaxChars ? block2.content.slice(0, opts.errorResultMaxChars) : block2.content;
+  return `  \u2192 error: ${content}`;
 }
 function serializeEmbeddedResource(block2) {
   const uri = block2.resource.uri ?? "unknown";
@@ -76866,6 +76953,8 @@ var PlanHandler = class {
   #processedPlanToolUseIds = /* @__PURE__ */ new Set();
   /** Tracks whether we have already published the plan (first ExitPlanMode). */
   #planPublished = false;
+  /** Plan files this task's agent created (from Write tool results). */
+  #createdPlanFiles = /* @__PURE__ */ new Set();
   constructor(deps) {
     this.#deps = deps;
   }
@@ -76876,30 +76965,18 @@ var PlanHandler = class {
     return this.#lastPlanDetection;
   }
   /**
-   * One-shot scan for an existing plan file on task init or reconnect.
-   * If a plan file exists and the bridge isn't already running, attaches
-   * the bridge and sends plan_detected so the browser shows the TipTap editor.
+   * Record a plan file path created by this task's agent.
+   * Called when a Write tool result mentions a file in ~/.claude/plans/.
    */
-  tryAttachExistingPlan() {
-    if (this.#planFileBridge) return;
+  trackCreatedFile(filePath) {
     const plansDir = join28(homedir4(), ".claude", "plans");
-    if (!existsSync4(plansDir)) return;
-    try {
-      const files = readdirSync(plansDir).filter((f2) => f2.endsWith(".md")).map((f2) => ({
-        name: f2,
-        path: join28(plansDir, f2),
-        mtime: statSync2(join28(plansDir, f2)).mtimeMs
-      })).sort((a, b2) => b2.mtime - a.mtime);
-      const recent = files[0];
-      if (!recent) return;
-      const syntheticToolUseId = `plan-reattach-${Date.now()}`;
+    if (filePath.startsWith(plansDir) && filePath.endsWith(".md")) {
+      this.#createdPlanFiles.add(filePath);
       this.#deps.log({
-        event: "plan_existing_file_found",
+        event: "plan_file_tracked",
         taskId: this.#deps.taskId,
-        filePath: recent.path
+        filePath
       });
-      this.#handlePlanDetected(syntheticToolUseId, recent.path);
-    } catch {
     }
   }
   /**
@@ -76997,22 +77074,16 @@ var PlanHandler = class {
         taskId: this.#deps.taskId,
         toolUseId: block2.toolUseId
       });
-      const plansDir = join28(homedir4(), ".claude", "plans");
-      if (!existsSync4(plansDir)) continue;
-      const files = readdirSync(plansDir).filter((f2) => f2.endsWith(".md")).map((f2) => ({
-        name: f2,
-        path: join28(plansDir, f2),
-        mtime: statSync2(join28(plansDir, f2)).mtimeMs
-      })).sort((a, b2) => b2.mtime - a.mtime);
-      const recent = files[0];
-      if (recent && Date.now() - recent.mtime < 3e4) {
+      const match2 = this.#findTaskPlanFile();
+      if (match2) {
         this.#deps.log({
           event: "plan_file_found_from_message",
           taskId: this.#deps.taskId,
           toolUseId: block2.toolUseId,
-          filePath: recent.path
+          filePath: match2,
+          source: this.#createdPlanFiles.size > 0 ? "tracked" : "mtime_fallback"
         });
-        this.#handlePlanDetected(block2.toolUseId, recent.path);
+        this.#handlePlanDetected(block2.toolUseId, match2);
       }
     }
   }
@@ -77045,6 +77116,7 @@ var PlanHandler = class {
     this.#lastPlanDetection = null;
     this.#processedPlanToolUseIds.clear();
     this.#pendingPlanAllowedPrompts.clear();
+    this.#createdPlanFiles.clear();
     this.#planFileBridge?.dispose();
     this.#planFileBridge = null;
   }
@@ -77059,37 +77131,23 @@ var PlanHandler = class {
     this.#planFileBridge = null;
     this.#processedPlanToolUseIds.clear();
     this.#pendingPlanAllowedPrompts.clear();
+    this.#createdPlanFiles.clear();
   }
   #pollForPlanFile(toolUseId) {
-    const plansDir = join28(homedir4(), ".claude", "plans");
-    if (!existsSync4(plansDir)) {
-      this.#deps.log({ event: "plan_dir_not_found", taskId: this.#deps.taskId, plansDir });
-      return;
-    }
-    const startTime = Date.now();
-    const lookbackMs = 3e4;
     let attempts = 0;
     const checkForPlanFile = () => {
-      try {
-        const files = readdirSync(plansDir);
-        for (const file of files) {
-          if (!file.endsWith(".md")) continue;
-          const filePath = join28(plansDir, file);
-          const { mtimeMs } = statSync2(filePath);
-          if (mtimeMs > startTime - lookbackMs) {
-            this.#deps.log({
-              event: "plan_file_found",
-              taskId: this.#deps.taskId,
-              toolUseId,
-              filePath,
-              attempts
-            });
-            this.#handlePlanDetected(toolUseId, filePath);
-            return true;
-          }
-        }
-      } catch {
-        return false;
+      const match2 = this.#findTaskPlanFile();
+      if (match2) {
+        this.#deps.log({
+          event: "plan_file_found",
+          taskId: this.#deps.taskId,
+          toolUseId,
+          filePath: match2,
+          attempts,
+          source: this.#createdPlanFiles.size > 0 ? "tracked" : "mtime_fallback"
+        });
+        this.#handlePlanDetected(toolUseId, match2);
+        return true;
       }
       return false;
     };
@@ -77114,6 +77172,35 @@ var PlanHandler = class {
     }, PLAN_POLL_INTERVAL_MS);
     this.#pollInterval = interval;
   }
+  /**
+   * Find a plan file for this task. Prefers files tracked from Write tool
+   * results (task-scoped). Falls back to global mtime scan for backwards
+   * compat with sessions that started before tracking was added.
+   */
+  #findTaskPlanFile() {
+    if (this.#createdPlanFiles.size > 0) {
+      const newest = [...this.#createdPlanFiles].map((f2) => {
+        try {
+          return { path: f2, mtime: statSync2(f2).mtimeMs };
+        } catch {
+          return null;
+        }
+      }).filter((f2) => f2 !== null).sort((a, b2) => b2.mtime - a.mtime)[0];
+      return newest?.path ?? null;
+    }
+    const plansDir = join28(homedir4(), ".claude", "plans");
+    if (!existsSync4(plansDir)) return null;
+    try {
+      const files = readdirSync(plansDir).filter((f2) => f2.endsWith(".md")).map((f2) => ({
+        path: join28(plansDir, f2),
+        mtime: statSync2(join28(plansDir, f2)).mtimeMs
+      })).sort((a, b2) => b2.mtime - a.mtime);
+      const recent = files[0];
+      if (recent && Date.now() - recent.mtime < 3e4) return recent.path;
+    } catch {
+    }
+    return null;
+  }
   #handlePlanDetected(toolUseId, filePath) {
     if (this.#processedPlanToolUseIds.has(toolUseId)) {
       this.#deps.log({
@@ -79251,6 +79338,7 @@ var McpPoller = class {
   start() {
     this.stop();
     this.#deps.log({ event: "mcp_poll_start", taskId: this.#deps.taskId });
+    this.pollOnce();
     this.#schedulePoll(MCP_POLL_IDLE_MS);
   }
   enterFastMode() {
@@ -81603,6 +81691,7 @@ Use this context to maintain continuity. You have already done this work \u2014
           this.#deps.updateTodoProgress(todoProgress);
         }
         this.#structuredTaskTracker.processStructuredTaskEvents(event.content);
+        this.#trackPlanFileFromToolUse(event.content);
         this.#planHandler.detectPlanEvents(event.content);
         this.#trackWorktreeToolUse(event.content);
         this.#subagentManager.trackAgentToolUse(event.content);
@@ -81614,6 +81703,7 @@ Use this context to maintain continuity. You have already done this work \u2014
         this.#structuredTaskTracker.resolveStructuredTaskCreates(event.content);
         this.#handleWorktreeToolResults(event.content);
         this.#subagentManager.handleSubagentToolResults(event.content);
+        this.#trackPlanFileCreation(event.content);
         break;
       case "api_usage_snapshot":
         this.#lastApiUsage = {
@@ -81840,6 +81930,26 @@ Use this context to maintain continuity. You have already done this work \u2014
       this.#deps.onCwdChanged(this.#deps.taskId, newCwd);
     }
   }
+  #trackPlanFileFromToolUse(content) {
+    for (const block2 of content) {
+      if (block2.type !== "tool_use") continue;
+      if (block2.toolName !== "Write") continue;
+      const filePath = block2.input?.file_path;
+      if (typeof filePath === "string") {
+        this.#planHandler.trackCreatedFile(filePath);
+      }
+    }
+  }
+  #trackPlanFileCreation(content) {
+    const writeResultPattern = /File created successfully at: (\/[^\s"')]+\.claude\/plans\/[^\s"')]+\.md)\b/;
+    for (const block2 of content) {
+      if (block2.type !== "tool_result" || block2.isError) continue;
+      const match2 = block2.content.match(writeResultPattern);
+      if (match2?.[1]) {
+        this.#planHandler.trackCreatedFile(match2[1]);
+      }
+    }
+  }
   applyOverlay(overlay) {
     this.#structuredTaskTracker.applyOverlay(overlay);
   }
@@ -82939,13 +83049,10 @@ function applyStatusTransition(task, status, now) {
     ...task,
     status,
     updatedAt: now,
-    taskStartedAt: status === "in_progress" ? now : null
+    taskStartedAt: status === "in_progress" ? now : null,
+    attentionAt: status === "input_required" ? now : null
   };
 }
-function hasTodoProgressChanged(task, todoProgress) {
-  if (!todoProgress) return false;
-  return task.todoCompleted !== todoProgress.todoCompleted || task.todoTotal !== todoProgress.todoTotal || task.currentActivity !== todoProgress.currentActivity;
-}
 function buildTaskStateStore(dataDir) {
   const store = buildJsonDocumentStore({
     filePath: join35(dataDir, "tasks.json"),
@@ -83042,9 +83149,6 @@ function buildTaskStateStore(dataDir) {
     async updateStructuredTasks(taskId, tasks, todoProgress) {
       const task = await store.get(taskId);
       if (!task) return;
-      const progressChanged = hasTodoProgressChanged(task, todoProgress);
-      const tasksChanged = JSON.stringify(task.structuredTasks ?? {}) !== JSON.stringify(tasks);
-      if (!progressChanged && !tasksChanged) return;
       await store.set(taskId, {
         ...task,
         structuredTasks: tasks,
@@ -83059,7 +83163,6 @@ function buildTaskStateStore(dataDir) {
     async updateTaskOverlay(taskId, overlay) {
       const task = await store.get(taskId);
       if (!task) return;
-      if (JSON.stringify(task.taskOverlay ?? {}) === JSON.stringify(overlay)) return;
       await store.set(taskId, {
         ...task,
         taskOverlay: overlay,
@@ -83737,7 +83840,8 @@ async function createDaemon(deps) {
     broadcastControl: (msg) => taskManager.broadcastControl(msg),
     resolveMcpServers,
     getProxyStatuses: () => proxyRef.current?.getServerStatuses() ?? [],
-    getProxyManagedNames: () => proxyRef.current?.getAllManagedNames() ?? []
+    getProxyManagedNames: () => proxyRef.current?.getAllManagedNames() ?? [],
+    hasLiveSubprocesses: () => taskManager.hasLiveSubprocesses
   });
   taskManager.setPreWarmManager(preWarmManager);
   const scheduleStore = buildScheduleStore(deps.dataDir);
@@ -83858,7 +83962,6 @@ async function createDaemon(deps) {
   }
   await rehydrateFromPersistence(sessionPersistence, taskManager, deps.log, taskStateStore);
   await sweepStaleTasks(taskStateStore, taskManager, deps.log);
-  await resealAcknowledgements(taskStateStore, deps.log);
   const taskStoreUnsub = taskStateStore.subscribe((event) => {
     switch (event.kind) {
       case "set": {
@@ -85791,6 +85894,28 @@ function applyMcpServerToggles(daemon, prevDisabled, nextDisabled, log) {
     if (!nextDisabled.has(name)) {
       log({ event: "mcp_server_enabling", serverName: name });
       daemon.taskManager.toggleMcpServer(name, true);
+      if (daemon.proxyServer && !daemon.proxyServer.hasConfigured(name)) {
+        const proxyServer = daemon.proxyServer;
+        const server = daemon.capabilities.mcpServers?.find(
+          (s2) => s2.name === name && (s2.type === "http" || s2.type === "sse") && s2.url
+        );
+        if (server?.url) {
+          log({ event: "mcp_proxy_dynamic_add", serverName: name, url: server.url });
+          proxyServer.addServer(name, { url: server.url, callbackPort: server.oauth?.callbackPort }).then(() => {
+            daemon.taskManager.triggerFastMcpPolling();
+            daemon.taskManager.broadcastControl({
+              type: "mcp_server_status",
+              servers: proxyServer.getServerStatuses()
+            });
+          }).catch((err) => {
+            log({
+              event: "mcp_proxy_dynamic_add_failed",
+              serverName: name,
+              error: err instanceof Error ? err.message : String(err)
+            });
+          });
+        }
+      }
     }
   }
   const resolved = daemon.resolveMcpServers() ?? {};
@@ -86148,11 +86273,17 @@ function wireControlChannel(rawChannel, daemon, logAdapter, deps) {
             )
           };
           handler.sendControl(buildCapabilitiesMessage());
-          if (daemon.proxyServer) {
-            handler.sendControl({
-              type: "mcp_server_status",
-              servers: daemon.proxyServer.getServerStatuses()
-            });
+          {
+            const subprocessStatuses = daemon.preWarmManager.getLastMcpStatuses() ?? [];
+            const proxyStatuses = daemon.proxyServer?.getServerStatuses() ?? [];
+            const proxyNames = new Set(proxyStatuses.map((s2) => s2.name));
+            const merged = [
+              ...subprocessStatuses.filter((s2) => !proxyNames.has(s2.name)),
+              ...proxyStatuses
+            ];
+            if (merged.length > 0) {
+              handler.sendControl({ type: "mcp_server_status", servers: merged });
+            }
           }
           const resolved = daemon.resolveMcpServers();
           if (resolved) {
@@ -86534,6 +86665,9 @@ function wireControlChannel(rawChannel, daemon, logAdapter, deps) {
     const merged = [...subprocessStatuses.filter((s2) => !proxyNames.has(s2.name)), ...proxyStatuses];
     if (merged.length > 0) {
       handler.sendControl({ type: "mcp_server_status", servers: merged });
+      if (subprocessStatuses.length === 0 && retriesLeft > 0) {
+        setTimeout(() => pushMcpStatus(retriesLeft - 1), 3e3);
+      }
       return;
     }
     if (retriesLeft > 0) {
@@ -90568,4 +90702,4 @@ export {
   classifyLogLevel,
   serve
 };
-//# sourceMappingURL=serve-IGUWRAXT.js.map
+//# sourceMappingURL=serve-LL6LUMZI.js.map