flavor-code 1.2.16 → 1.2.18

package/dist/agent/types.d.ts

@@ -15,7 +15,7 @@ export interface AgentRunRequest {
     /** Messages supplied while a tool batch is running, injected before the next model call. */
     getSteeringMessages?(): readonly string[];
 }
-export type AgentErrorCode = ProviderErrorCode | "iteration_limit" | "incomplete_stream";
+export type AgentErrorCode = ProviderErrorCode | "iteration_limit" | "incomplete_stream" | "empty_response";
 export interface AgentError {
     code: AgentErrorCode;
     message: string;

package/dist/{app-7ZCJ3UOI.js → app-YE3I7JMR.js}

@@ -14,8 +14,9 @@ import {
   modelContentTranscriptText,
   packageVersion,
   redactErrorText,
-  transcriptReducer
-} from "./chunk-5SRARNAC.js";
+  transcriptReducer,
+  withTimeout
+} from "./chunk-STZQ3Y3P.js";
 import "./chunk-IG4Z23CL.js";
 import {
   Box_default,
@@ -874,21 +875,27 @@ function CodeBlock({ token }) {
   const langLabel = token.lang?.trim();
   const label = langLabel && langLabel.length > 0 ? langLabel : "code";
   const topBarWidth = Math.max(0, columns - 4 - label.length - 4);
-  return /* @__PURE__ */ jsxs(Box_default, { flexDirection: "column", paddingX: 1, children: [
-    /* @__PURE__ */ jsxs(Text, { color: "gray", children: [
-      "\u256D\u2500 ",
-      /* @__PURE__ */ jsx(Text, { color: "cyan", children: label }),
-      " ",
-      "\u2500".repeat(topBarWidth),
-      "\u256E"
-    ] }),
-    /* @__PURE__ */ jsx(Box_default, { flexDirection: "column", paddingX: 1, children: truncated.map((line, i) => /* @__PURE__ */ jsx(Text, { color: "gray", children: line }, i)) }),
-    /* @__PURE__ */ jsxs(Text, { color: "gray", children: [
-      "\u2570",
-      "\u2500".repeat(Math.max(0, columns - 6)),
-      "\u256F"
+  return (
+    // Code blocks are self-contained painted regions. Marking the region
+    // opaque prevents ScrollBox's incremental renderer from blitting cached
+    // blank cells over clean, single-line code bodies during transcript
+    // scrolls/redraws.
+    /* @__PURE__ */ jsxs(Box_default, { flexDirection: "column", paddingX: 1, opaque: true, children: [
+      /* @__PURE__ */ jsxs(Text, { color: "gray", children: [
+        "\u256D\u2500 ",
+        /* @__PURE__ */ jsx(Text, { color: "cyan", children: label }),
+        " ",
+        "\u2500".repeat(topBarWidth),
+        "\u256E"
+      ] }),
+      /* @__PURE__ */ jsx(Box_default, { flexDirection: "column", paddingX: 1, children: truncated.map((line, i) => /* @__PURE__ */ jsx(Text, { color: "gray", children: line }, i)) }),
+      /* @__PURE__ */ jsxs(Text, { color: "gray", children: [
+        "\u2570",
+        "\u2500".repeat(Math.max(0, columns - 6)),
+        "\u256F"
+      ] })
     ] })
-  ] });
+  );
 }
 function BlockquoteView({ token }) {
   return /* @__PURE__ */ jsx(Box_default, { flexDirection: "column", children: token.tokens.map((child, i) => {
@@ -1098,9 +1105,15 @@ function AssistantTextInner({ text }) {
 var AssistantText = React2.memo(AssistantTextInner);
 
 // src/ui/signals.ts
-function createSessionInterruptHandler(getSession, shutdown) {
+function createSessionInterruptHandler(getSession, shutdown, options) {
+  let shuttingDown = false;
   return () => {
+    if (shuttingDown) {
+      options.forceExit();
+      return;
+    }
     if (getSession()?.interrupt() === "cancelled") return;
+    shuttingDown = true;
     void shutdown();
   };
 }
@@ -1901,7 +1914,8 @@ function App({ workspace, home, resumeSession, instanceId, palAlias }) {
   const interruptRef = useRef4(void 0);
   interruptRef.current ??= createSessionInterruptHandler(
     () => runtimeRef.current?.session,
-    () => shutdownRef.current(runtimeRef.current)
+    () => shutdownRef.current(runtimeRef.current),
+    { forceExit: () => process.exit(1) }
   );
   const interrupt = interruptRef.current;
   useEffect3(() => {
@@ -3529,11 +3543,23 @@ async function submitSafely(session, prompt, report) {
     safeReport(report, safeUiError(error));
   }
 }
-async function shutdownRuntime(runtime, exit, report) {
+var SHUTDOWN_TIMEOUT_MS = 8e3;
+var FORCE_EXIT_GRACE_MS = 250;
+async function shutdownRuntime(runtime, exit, report, options = {}) {
+  const timeoutMs = options.shutdownTimeoutMs ?? SHUTDOWN_TIMEOUT_MS;
+  let timedOut = false;
   try {
-    await closeAndDisposeRuntime(runtime, report);
+    const outcome = await withTimeout(closeAndDisposeRuntime(runtime, report), timeoutMs);
+    timedOut = outcome.timedOut;
+    if (timedOut) report(`Shutdown timed out after ${timeoutMs}ms; forcing exit.`);
   } finally {
     exit();
+    if (timedOut) {
+      const forceExit = options.forceExit ?? (() => {
+        process.exit(1);
+      });
+      setTimeout(forceExit, FORCE_EXIT_GRACE_MS);
+    }
   }
 }
 async function closeAndDisposeRuntime(runtime, report) {
@@ -3565,6 +3591,7 @@ export {
   HISTORY_CAP,
   MentionMenu,
   PromptLine,
+  SHUTDOWN_TIMEOUT_MS,
   SinglePendingPrompt,
   TerminalLayout,
   appRuntimeOptions,

package/dist/{chunk-PGS3M32Y.js → chunk-JB57IX2A.js}

@@ -4,7 +4,7 @@ import {
   message,
   redactErrorText,
   redactSecrets
-} from "./chunk-5SRARNAC.js";
+} from "./chunk-STZQ3Y3P.js";
 
 // src/rpc/server.ts
 import { createInterface } from "readline";

package/dist/{chunk-5SRARNAC.js → chunk-STZQ3Y3P.js}

@@ -62,6 +62,52 @@ function normalizeProviderError(error) {
   return { code, message: message2 };
 }
 
+// src/utils/async.ts
+function withTimeout(promise, ms) {
+  return new Promise((resolve26, reject) => {
+    let settled = false;
+    const timer = setTimeout(() => {
+      if (settled) return;
+      settled = true;
+      resolve26({ timedOut: true, value: void 0 });
+    }, ms);
+    timer.unref?.();
+    promise.then(
+      (value) => {
+        if (!settled) {
+          settled = true;
+          clearTimeout(timer);
+          resolve26({ timedOut: false, value });
+        }
+      },
+      (error) => {
+        if (!settled) {
+          settled = true;
+          clearTimeout(timer);
+          reject(error);
+        }
+      }
+    );
+  });
+}
+function awaitWithSignal(promise, signal) {
+  signal.throwIfAborted();
+  return new Promise((resolve26, reject) => {
+    const onAbort = () => reject(signal.reason);
+    signal.addEventListener("abort", onAbort, { once: true });
+    promise.then(
+      (value) => {
+        signal.removeEventListener("abort", onAbort);
+        resolve26(value);
+      },
+      (error) => {
+        signal.removeEventListener("abort", onAbort);
+        reject(error);
+      }
+    );
+  });
+}
+
 // src/utils/error.ts
 function message(error) {
   return error instanceof Error ? error.message : String(error);
@@ -5058,25 +5104,6 @@ function hasCycle(nodes) {
   return visited !== nodes.length;
 }
 
-// src/utils/async.ts
-function awaitWithSignal(promise, signal) {
-  signal.throwIfAborted();
-  return new Promise((resolve26, reject) => {
-    const onAbort = () => reject(signal.reason);
-    signal.addEventListener("abort", onAbort, { once: true });
-    promise.then(
-      (value) => {
-        signal.removeEventListener("abort", onAbort);
-        resolve26(value);
-      },
-      (error) => {
-        signal.removeEventListener("abort", onAbort);
-        reject(error);
-      }
-    );
-  });
-}
-
 // src/agent/subagents.ts
 var SubagentResultSchema = z5.object({
   taskId: z5.string().min(1),
@@ -6539,7 +6566,8 @@ var RECOVERABLE_MODEL_ERRORS = /* @__PURE__ */ new Set([
   "network",
   "rate_limit",
   "unknown",
-  "incomplete_stream"
+  "incomplete_stream",
+  "empty_response"
 ]);
 function envMaxIterations() {
   const raw = process.env["FLAVOR_MAX_ITERATIONS"];
@@ -6733,6 +6761,12 @@ var AgentLoop = class {
         } finally {
           if (!completed && terminalError === void 0) {
             terminalError = { code: "incomplete_stream", message: "Provider stream ended without a done or error event" };
+          } else if (completed && assistantText.trim().length === 0 && collectedToolCalls.length === 0) {
+            completed = false;
+            terminalError = {
+              code: "empty_response",
+              message: "Provider completed without visible text or tool calls"
+            };
           }
           providerError = terminalError !== void 0;
           try {
@@ -6772,7 +6806,7 @@ var AgentLoop = class {
           totalCacheCreationTokens += usage.cacheCreationTokens ?? 0;
           yield { type: "usage", ...usage, totalInputTokens, totalOutputTokens };
         }
-        const providerProducedOutput = assistantText.length > 0 || collectedToolCalls.length > 0;
+        const providerProducedOutput = assistantText.trim().length > 0 || collectedToolCalls.length > 0;
         if (terminalError?.code === "context_overflow" && !reactiveRetried && !providerProducedOutput && attempt < maxAttempts) {
           let compacted = false;
           try {
@@ -18986,6 +19020,7 @@ var INTERRUPTED_TASK_PLAN_CONTEXT = [
   "Reassess the current query independently.",
   "If the current work needs a plan, create a fresh one with TaskPlan before using TaskUpdate."
 ].join(" ");
+var DEFAULT_SHUTDOWN_STEP_TIMEOUT_MS = 3e3;
 function createPromptEnvironment(input = {}) {
   const now = input.now ?? /* @__PURE__ */ new Date();
   return {
@@ -19755,7 +19790,7 @@ async function createProductionRuntime(options) {
       const messages = allMessages.slice(memoryLifecycle.messageStart ?? 0);
       const transcriptHash = memoryTranscriptHash(messages);
       if (memoryLifecycle.status === "completed" && memoryLifecycle.transcriptHash === transcriptHash) {
-        return "Task was already completed and evaluated for long-term memory.";
+        return "This conversation segment was already evaluated for long-term memory.";
       }
       if (!manual && memoryBehavior.autoExtractPaused) {
         return "Automatic long-term-memory extraction is paused after repeated dismissals; use /finish, /remember, or an explicit \u201Cremember\u201D request to store memory manually.";
@@ -19763,7 +19798,7 @@ async function createProductionRuntime(options) {
       autoStoredContents.length = 0;
       const finalization = memoryCoordinator === void 0 || !config.memory.autoExtract || options.approvalPolicy === "deny" ? { evaluated: true, candidates: false, stored: 0 } : await memoryCoordinator.finalize(memoryLifecycle.taskId ?? sessionId, messages);
       if (!finalization.evaluated) {
-        return "Task memory evaluation failed and was not marked complete; retry /finish after checking diagnostics.";
+        return "Long-term-memory evaluation failed; retry /finish after checking diagnostics.";
       }
       memoryLifecycle = {
         status: "completed",
@@ -19775,9 +19810,9 @@ async function createProductionRuntime(options) {
       await persist();
       if (finalization.candidates && finalization.stored > 0) {
         const storedText = autoStoredContents[0] ?? "a high-confidence memory";
-        return `Task completed. Stored high-confidence long-term memory directly: "${storedText}". Run /forget to remove it if undesired.`;
+        return `Long-term memory updated. Stored high-confidence entry: "${storedText}". Run /forget to remove it if undesired.`;
       }
-      return finalization.candidates ? "Task completed. Review the generated long-term-memory candidates before anything is stored." : "Task completed; no durable long-term-memory candidates passed the threshold.";
+      return finalization.candidates ? "Long-term-memory evaluation completed. Review the generated candidates before anything is stored." : "Long-term-memory evaluation completed; no durable candidates passed the threshold.";
     };
     let explicitMemoryRequest;
     let automaticMemoryTask = false;
@@ -19788,10 +19823,10 @@ async function createProductionRuntime(options) {
       timelineState = transcriptReducer(timelineState, { type: "submit", prompt });
       automaticMemoryTask = !prompt.startsWith("/") && harness.permissionProfile !== "d2c";
       if (automaticMemoryTask) memoryReviews.dismissAll();
-      if (!prompt.startsWith("/") && memoryLifecycle.status === "completed") {
+      if (!prompt.startsWith("/")) {
         memoryLifecycle = {
           status: "active",
-          taskId: createMemoryTaskId(),
+          taskId: memoryLifecycle.status === "completed" ? createMemoryTaskId() : memoryLifecycle.taskId ?? createMemoryTaskId(),
           messageStart: harness.main.context.snapshot().messages.length
         };
       }
@@ -19833,9 +19868,9 @@ async function createProductionRuntime(options) {
       }
       if (explicit === void 0 && automatic && event.payload.outcome === "completed" && memoryCoordinator !== void 0 && config.memory.autoExtract && options.approvalPolicy !== "deny" && !memoryBehavior.autoExtractPaused) {
         const result = await finalizeMemoryTask();
-        if (result.startsWith("Task memory evaluation failed")) {
+        if (result.startsWith("Long-term-memory evaluation failed")) {
           emitOutput({ type: "notice", message: "Automatic long-term-memory evaluation failed; use /finish to retry after checking diagnostics." });
-        } else if (result.startsWith("Task completed. Review") || result.startsWith("Task completed. Stored")) {
+        } else if (result.startsWith("Long-term-memory evaluation completed. Review") || result.startsWith("Long-term memory updated.")) {
           emitOutput({ type: "notice", message: result });
         }
       }
@@ -20554,23 +20589,24 @@ ${renderMemoryDocument(entries)}`;
       async dispose() {
         if (disposed) return;
         disposed = true;
+        const stepTimeoutMs = options.shutdownStepTimeoutMs ?? DEFAULT_SHUTDOWN_STEP_TIMEOUT_MS;
         collaborationEventsOpen = false;
         unsubscribeCollaboration?.();
-        await collaborationEventPump;
+        if (collaborationEventPump !== void 0) await boundedStep(stepTimeoutMs, diagnostics, "collaboration-event-pump", collaborationEventPump);
         mcpDiscarded = true;
-        await sleepScheduler?.dispose();
-        await memoryCoordinator?.flush();
-        await persist();
-        await persistTail;
-        if (ideSessionId !== void 0) await ide.endSession(ideSessionId);
-        await executionEnvironment?.dispose();
+        if (sleepScheduler !== void 0) await boundedStep(stepTimeoutMs, diagnostics, "sleep-scheduler", sleepScheduler.dispose());
+        if (memoryCoordinator !== void 0) await boundedStep(stepTimeoutMs, diagnostics, "memory-flush", memoryCoordinator.flush());
+        await boundedStep(stepTimeoutMs, diagnostics, "persist", persist());
+        if (persistTail !== void 0) await boundedStep(stepTimeoutMs, diagnostics, "persist-tail", persistTail);
+        if (ideSessionId !== void 0) await boundedStep(stepTimeoutMs, diagnostics, "ide-end-session", ide.endSession(ideSessionId));
+        if (executionEnvironment !== void 0) await boundedStep(stepTimeoutMs, diagnostics, "execution-environment", executionEnvironment.dispose());
         terminals.dispose();
-        await jobs.dispose();
+        await boundedStep(stepTimeoutMs, diagnostics, "jobs", jobs.dispose());
         auditLogger.close();
         evolveService.dispose();
         memoryReviews.dispose();
-        await collaborationClient?.close();
-        await cleanupProduction(approvals, questions, pluginHost, mcpManager, harness);
+        if (collaborationClient !== void 0) await boundedStep(stepTimeoutMs, diagnostics, "collaboration-close", collaborationClient.close());
+        await cleanupProduction(approvals, questions, pluginHost, mcpManager, harness, { stepTimeoutMs });
       }
     };
   } catch (primaryError) {
@@ -20578,16 +20614,17 @@ ${renderMemoryDocument(entries)}`;
     mcpDiscarded = true;
     memoryReviews.dispose();
     try {
-      if (ideSessionId !== void 0) await ide.endSession(ideSessionId);
-      await sleepScheduler?.dispose();
-      await executionEnvironment?.dispose();
+      const stepTimeoutMs = options.shutdownStepTimeoutMs ?? DEFAULT_SHUTDOWN_STEP_TIMEOUT_MS;
+      if (ideSessionId !== void 0) await boundedStep(stepTimeoutMs, diagnostics, "ide-end-session", ide.endSession(ideSessionId));
+      if (sleepScheduler !== void 0) await boundedStep(stepTimeoutMs, diagnostics, "sleep-scheduler", sleepScheduler.dispose());
+      if (executionEnvironment !== void 0) await boundedStep(stepTimeoutMs, diagnostics, "execution-environment", executionEnvironment.dispose());
       terminals.dispose();
-      await jobs.dispose();
+      await boundedStep(stepTimeoutMs, diagnostics, "jobs", jobs.dispose());
       unsubscribeCollaboration?.();
       pendingCollaborationEvents.length = 0;
-      await collaborationEventPump;
-      await collaborationClient?.close();
-      await cleanupProduction(approvals, questions, pluginHost, mcpManager, harnessCreated ? harness : void 0);
+      if (collaborationEventPump !== void 0) await boundedStep(stepTimeoutMs, diagnostics, "collaboration-event-pump", collaborationEventPump);
+      if (collaborationClient !== void 0) await boundedStep(stepTimeoutMs, diagnostics, "collaboration-close", collaborationClient.close());
+      await cleanupProduction(approvals, questions, pluginHost, mcpManager, harnessCreated ? harness : void 0, { stepTimeoutMs });
     } catch (cleanupError) {
       attachCleanupError(primaryError, cleanupError);
     }
@@ -21208,7 +21245,8 @@ function storedConversation(snapshot4) {
     })
   };
 }
-async function cleanupProduction(approvals, questions, pluginHost, mcpManager, harness) {
+async function cleanupProduction(approvals, questions, pluginHost, mcpManager, harness, cleanupOptions = { stepTimeoutMs: DEFAULT_SHUTDOWN_STEP_TIMEOUT_MS }) {
+  const { stepTimeoutMs } = cleanupOptions;
   let primary;
   try {
     approvals.resolve("deny");
@@ -21222,7 +21260,8 @@ async function cleanupProduction(approvals, questions, pluginHost, mcpManager, h
     else attachCleanupError(primary, error);
   }
   try {
-    await pluginHost.unloadAll();
+    const outcome = await withTimeout(pluginHost.unloadAll(), stepTimeoutMs);
+    if (outcome.timedOut) primary = new Error(`Plugin unload timed out after ${stepTimeoutMs}ms`);
   } catch (error) {
     if (primary === void 0) primary = error;
     else attachCleanupError(primary, error);
@@ -21234,7 +21273,14 @@ async function cleanupProduction(approvals, questions, pluginHost, mcpManager, h
       else attachCleanupError(primary, error);
     }
     try {
-      await mcpManager?.close();
+      if (mcpManager !== void 0) {
+        const outcome = await withTimeout(mcpManager.close(), stepTimeoutMs);
+        if (outcome.timedOut) {
+          const timeoutError = new Error(`MCP shutdown timed out after ${stepTimeoutMs}ms`);
+          if (primary === void 0) primary = timeoutError;
+          else attachCleanupError(primary, timeoutError);
+        }
+      }
     } catch (error) {
       if (primary === void 0) primary = error;
       else attachCleanupError(primary, error);
@@ -21242,6 +21288,10 @@ async function cleanupProduction(approvals, questions, pluginHost, mcpManager, h
   }
   if (primary !== void 0) throw primary;
 }
+async function boundedStep(timeoutMs, diagnostics, name, step) {
+  const outcome = await withTimeout(step, timeoutMs);
+  if (outcome.timedOut) diagnostics.push(`Shutdown step "${name}" timed out after ${timeoutMs}ms and was abandoned.`);
+}
 function attachCleanupError(primary, cleanup) {
   if (typeof primary !== "object" && typeof primary !== "function" || primary === null || !Object.isExtensible(primary)) return;
   try {
@@ -21327,6 +21377,7 @@ function createMemoryTaskId() {
 
 export {
   modelContentTranscriptText,
+  withTimeout,
   message,
   isDestructiveTool,
   redactErrorText,

package/dist/cli.js

@@ -3,7 +3,7 @@ import { createRequire } from "node:module"; const require = createRequire(impor
 import {
   FlavorRpcServer,
   TraceRecorder
-} from "./chunk-PGS3M32Y.js";
+} from "./chunk-JB57IX2A.js";
 import {
   staticTaskLines
 } from "./chunk-KKIBYDJI.js";
@@ -22,7 +22,7 @@ import {
   packageVersion,
   redactErrorText,
   runPalBroker
-} from "./chunk-5SRARNAC.js";
+} from "./chunk-STZQ3Y3P.js";
 import {
   McpServerConfigSchema,
   McpServerNameSchema,
@@ -861,7 +861,7 @@ async function runInteractiveCli(props) {
   const [{ render, AlternateScreen }, { createElement }, { App }] = await Promise.all([
     import("./claude-ink-ORUA7GWG.js"),
     import("react"),
-    import("./app-7ZCJ3UOI.js")
+    import("./app-YE3I7JMR.js")
   ]);
   const instance = await render(createElement(
     AlternateScreen,

package/dist/desktop/main.js

@@ -4348,6 +4348,33 @@ function hasCycle(nodes) {
 }
 
 // src/utils/async.ts
+function withTimeout(promise, ms) {
+  return new Promise((resolve34, reject) => {
+    let settled = false;
+    const timer = setTimeout(() => {
+      if (settled) return;
+      settled = true;
+      resolve34({ timedOut: true, value: void 0 });
+    }, ms);
+    timer.unref?.();
+    promise.then(
+      (value) => {
+        if (!settled) {
+          settled = true;
+          clearTimeout(timer);
+          resolve34({ timedOut: false, value });
+        }
+      },
+      (error) => {
+        if (!settled) {
+          settled = true;
+          clearTimeout(timer);
+          reject(error);
+        }
+      }
+    );
+  });
+}
 function awaitWithSignal3(promise, signal) {
   signal.throwIfAborted();
   return new Promise((resolve34, reject) => {
@@ -6128,7 +6155,8 @@ var RECOVERABLE_MODEL_ERRORS = /* @__PURE__ */ new Set([
   "network",
   "rate_limit",
   "unknown",
-  "incomplete_stream"
+  "incomplete_stream",
+  "empty_response"
 ]);
 function envMaxIterations() {
   const raw = process.env["FLAVOR_MAX_ITERATIONS"];
@@ -6322,6 +6350,12 @@ var AgentLoop = class {
         } finally {
           if (!completed && terminalError === void 0) {
             terminalError = { code: "incomplete_stream", message: "Provider stream ended without a done or error event" };
+          } else if (completed && assistantText.trim().length === 0 && collectedToolCalls.length === 0) {
+            completed = false;
+            terminalError = {
+              code: "empty_response",
+              message: "Provider completed without visible text or tool calls"
+            };
           }
           providerError = terminalError !== void 0;
           try {
@@ -6361,7 +6395,7 @@ var AgentLoop = class {
           totalCacheCreationTokens += usage.cacheCreationTokens ?? 0;
           yield { type: "usage", ...usage, totalInputTokens, totalOutputTokens };
         }
-        const providerProducedOutput = assistantText.length > 0 || collectedToolCalls.length > 0;
+        const providerProducedOutput = assistantText.trim().length > 0 || collectedToolCalls.length > 0;
         if (terminalError?.code === "context_overflow" && !reactiveRetried && !providerProducedOutput && attempt < maxAttempts) {
           let compacted = false;
           try {
@@ -22689,6 +22723,7 @@ var INTERRUPTED_TASK_PLAN_CONTEXT = [
   "Reassess the current query independently.",
   "If the current work needs a plan, create a fresh one with TaskPlan before using TaskUpdate."
 ].join(" ");
+var DEFAULT_SHUTDOWN_STEP_TIMEOUT_MS = 3e3;
 function createPromptEnvironment(input = {}) {
   const now = input.now ?? /* @__PURE__ */ new Date();
   return {
@@ -23458,7 +23493,7 @@ async function createProductionRuntime(options) {
       const messages = allMessages.slice(memoryLifecycle.messageStart ?? 0);
       const transcriptHash = memoryTranscriptHash(messages);
       if (memoryLifecycle.status === "completed" && memoryLifecycle.transcriptHash === transcriptHash) {
-        return "Task was already completed and evaluated for long-term memory.";
+        return "This conversation segment was already evaluated for long-term memory.";
       }
       if (!manual && memoryBehavior.autoExtractPaused) {
         return "Automatic long-term-memory extraction is paused after repeated dismissals; use /finish, /remember, or an explicit \u201Cremember\u201D request to store memory manually.";
@@ -23466,7 +23501,7 @@ async function createProductionRuntime(options) {
       autoStoredContents.length = 0;
       const finalization = memoryCoordinator === void 0 || !config.memory.autoExtract || options.approvalPolicy === "deny" ? { evaluated: true, candidates: false, stored: 0 } : await memoryCoordinator.finalize(memoryLifecycle.taskId ?? sessionId, messages);
       if (!finalization.evaluated) {
-        return "Task memory evaluation failed and was not marked complete; retry /finish after checking diagnostics.";
+        return "Long-term-memory evaluation failed; retry /finish after checking diagnostics.";
       }
       memoryLifecycle = {
         status: "completed",
@@ -23478,9 +23513,9 @@ async function createProductionRuntime(options) {
       await persist();
       if (finalization.candidates && finalization.stored > 0) {
         const storedText = autoStoredContents[0] ?? "a high-confidence memory";
-        return `Task completed. Stored high-confidence long-term memory directly: "${storedText}". Run /forget to remove it if undesired.`;
+        return `Long-term memory updated. Stored high-confidence entry: "${storedText}". Run /forget to remove it if undesired.`;
       }
-      return finalization.candidates ? "Task completed. Review the generated long-term-memory candidates before anything is stored." : "Task completed; no durable long-term-memory candidates passed the threshold.";
+      return finalization.candidates ? "Long-term-memory evaluation completed. Review the generated candidates before anything is stored." : "Long-term-memory evaluation completed; no durable candidates passed the threshold.";
     };
     let explicitMemoryRequest;
     let automaticMemoryTask = false;
@@ -23491,10 +23526,10 @@ async function createProductionRuntime(options) {
       timelineState = transcriptReducer(timelineState, { type: "submit", prompt });
       automaticMemoryTask = !prompt.startsWith("/") && harness.permissionProfile !== "d2c";
       if (automaticMemoryTask) memoryReviews.dismissAll();
-      if (!prompt.startsWith("/") && memoryLifecycle.status === "completed") {
+      if (!prompt.startsWith("/")) {
         memoryLifecycle = {
           status: "active",
-          taskId: createMemoryTaskId(),
+          taskId: memoryLifecycle.status === "completed" ? createMemoryTaskId() : memoryLifecycle.taskId ?? createMemoryTaskId(),
           messageStart: harness.main.context.snapshot().messages.length
         };
       }
@@ -23536,9 +23571,9 @@ async function createProductionRuntime(options) {
       }
       if (explicit === void 0 && automatic && event.payload.outcome === "completed" && memoryCoordinator !== void 0 && config.memory.autoExtract && options.approvalPolicy !== "deny" && !memoryBehavior.autoExtractPaused) {
         const result = await finalizeMemoryTask();
-        if (result.startsWith("Task memory evaluation failed")) {
+        if (result.startsWith("Long-term-memory evaluation failed")) {
           emitOutput({ type: "notice", message: "Automatic long-term-memory evaluation failed; use /finish to retry after checking diagnostics." });
-        } else if (result.startsWith("Task completed. Review") || result.startsWith("Task completed. Stored")) {
+        } else if (result.startsWith("Long-term-memory evaluation completed. Review") || result.startsWith("Long-term memory updated.")) {
           emitOutput({ type: "notice", message: result });
         }
       }
@@ -24257,23 +24292,24 @@ ${renderMemoryDocument(entries)}`;
       async dispose() {
         if (disposed) return;
         disposed = true;
+        const stepTimeoutMs = options.shutdownStepTimeoutMs ?? DEFAULT_SHUTDOWN_STEP_TIMEOUT_MS;
         collaborationEventsOpen = false;
         unsubscribeCollaboration?.();
-        await collaborationEventPump;
+        if (collaborationEventPump !== void 0) await boundedStep(stepTimeoutMs, diagnostics, "collaboration-event-pump", collaborationEventPump);
         mcpDiscarded = true;
-        await sleepScheduler?.dispose();
-        await memoryCoordinator?.flush();
-        await persist();
-        await persistTail;
-        if (ideSessionId !== void 0) await ide.endSession(ideSessionId);
-        await executionEnvironment?.dispose();
+        if (sleepScheduler !== void 0) await boundedStep(stepTimeoutMs, diagnostics, "sleep-scheduler", sleepScheduler.dispose());
+        if (memoryCoordinator !== void 0) await boundedStep(stepTimeoutMs, diagnostics, "memory-flush", memoryCoordinator.flush());
+        await boundedStep(stepTimeoutMs, diagnostics, "persist", persist());
+        if (persistTail !== void 0) await boundedStep(stepTimeoutMs, diagnostics, "persist-tail", persistTail);
+        if (ideSessionId !== void 0) await boundedStep(stepTimeoutMs, diagnostics, "ide-end-session", ide.endSession(ideSessionId));
+        if (executionEnvironment !== void 0) await boundedStep(stepTimeoutMs, diagnostics, "execution-environment", executionEnvironment.dispose());
         terminals.dispose();
-        await jobs.dispose();
+        await boundedStep(stepTimeoutMs, diagnostics, "jobs", jobs.dispose());
         auditLogger.close();
         evolveService.dispose();
         memoryReviews.dispose();
-        await collaborationClient?.close();
-        await cleanupProduction(approvals, questions, pluginHost, mcpManager, harness);
+        if (collaborationClient !== void 0) await boundedStep(stepTimeoutMs, diagnostics, "collaboration-close", collaborationClient.close());
+        await cleanupProduction(approvals, questions, pluginHost, mcpManager, harness, { stepTimeoutMs });
       }
     };
   } catch (primaryError) {
@@ -24281,16 +24317,17 @@ ${renderMemoryDocument(entries)}`;
     mcpDiscarded = true;
     memoryReviews.dispose();
     try {
-      if (ideSessionId !== void 0) await ide.endSession(ideSessionId);
-      await sleepScheduler?.dispose();
-      await executionEnvironment?.dispose();
+      const stepTimeoutMs = options.shutdownStepTimeoutMs ?? DEFAULT_SHUTDOWN_STEP_TIMEOUT_MS;
+      if (ideSessionId !== void 0) await boundedStep(stepTimeoutMs, diagnostics, "ide-end-session", ide.endSession(ideSessionId));
+      if (sleepScheduler !== void 0) await boundedStep(stepTimeoutMs, diagnostics, "sleep-scheduler", sleepScheduler.dispose());
+      if (executionEnvironment !== void 0) await boundedStep(stepTimeoutMs, diagnostics, "execution-environment", executionEnvironment.dispose());
       terminals.dispose();
-      await jobs.dispose();
+      await boundedStep(stepTimeoutMs, diagnostics, "jobs", jobs.dispose());
       unsubscribeCollaboration?.();
       pendingCollaborationEvents.length = 0;
-      await collaborationEventPump;
-      await collaborationClient?.close();
-      await cleanupProduction(approvals, questions, pluginHost, mcpManager, harnessCreated ? harness : void 0);
+      if (collaborationEventPump !== void 0) await boundedStep(stepTimeoutMs, diagnostics, "collaboration-event-pump", collaborationEventPump);
+      if (collaborationClient !== void 0) await boundedStep(stepTimeoutMs, diagnostics, "collaboration-close", collaborationClient.close());
+      await cleanupProduction(approvals, questions, pluginHost, mcpManager, harnessCreated ? harness : void 0, { stepTimeoutMs });
     } catch (cleanupError) {
       attachCleanupError(primaryError, cleanupError);
     }
@@ -24911,7 +24948,8 @@ function storedConversation(snapshot4) {
     })
   };
 }
-async function cleanupProduction(approvals, questions, pluginHost, mcpManager, harness) {
+async function cleanupProduction(approvals, questions, pluginHost, mcpManager, harness, cleanupOptions = { stepTimeoutMs: DEFAULT_SHUTDOWN_STEP_TIMEOUT_MS }) {
+  const { stepTimeoutMs } = cleanupOptions;
   let primary;
   try {
     approvals.resolve("deny");
@@ -24925,7 +24963,8 @@ async function cleanupProduction(approvals, questions, pluginHost, mcpManager, h
     else attachCleanupError(primary, error);
   }
   try {
-    await pluginHost.unloadAll();
+    const outcome = await withTimeout(pluginHost.unloadAll(), stepTimeoutMs);
+    if (outcome.timedOut) primary = new Error(`Plugin unload timed out after ${stepTimeoutMs}ms`);
   } catch (error) {
     if (primary === void 0) primary = error;
     else attachCleanupError(primary, error);
@@ -24937,7 +24976,14 @@ async function cleanupProduction(approvals, questions, pluginHost, mcpManager, h
       else attachCleanupError(primary, error);
     }
     try {
-      await mcpManager?.close();
+      if (mcpManager !== void 0) {
+        const outcome = await withTimeout(mcpManager.close(), stepTimeoutMs);
+        if (outcome.timedOut) {
+          const timeoutError = new Error(`MCP shutdown timed out after ${stepTimeoutMs}ms`);
+          if (primary === void 0) primary = timeoutError;
+          else attachCleanupError(primary, timeoutError);
+        }
+      }
     } catch (error) {
       if (primary === void 0) primary = error;
       else attachCleanupError(primary, error);
@@ -24945,6 +24991,10 @@ async function cleanupProduction(approvals, questions, pluginHost, mcpManager, h
   }
   if (primary !== void 0) throw primary;
 }
+async function boundedStep(timeoutMs, diagnostics, name, step) {
+  const outcome = await withTimeout(step, timeoutMs);
+  if (outcome.timedOut) diagnostics.push(`Shutdown step "${name}" timed out after ${timeoutMs}ms and was abandoned.`);
+}
 function attachCleanupError(primary, cleanup) {
   if (typeof primary !== "object" && typeof primary !== "function" || primary === null || !Object.isExtensible(primary)) return;
   try {

package/dist/production.d.ts

@@ -11,6 +11,12 @@ import { type TranscriptState } from "./ui/transcript.js";
 import { MemoryReviewBridge } from "./memory/review.js";
 import { type JobSnapshot } from "./jobs/registry.js";
 import { type PalClientLike } from "./pals/tools.js";
+/**
+ * Per-step shutdown budget. On Windows a hung child-process pipe, named pipe,
+ * or MCP stdio server can block one cleanup step forever; abandoning that step
+ * after the budget lets the remaining steps — and process exit — proceed.
+ */
+export declare const DEFAULT_SHUTDOWN_STEP_TIMEOUT_MS = 3000;
 export interface ProductionRuntimeOptions {
     workspace?: string;
     home?: string;
@@ -27,6 +33,8 @@ export interface ProductionRuntimeOptions {
     resumeSession?: string | true;
     /** Test and embedding seam for creating configured MCP clients. */
     mcpClientFactory?: McpClientFactory;
+    /** Per-step timeout (ms) for shutdown/disposal steps so a hung cleanup cannot block process exit. */
+    shutdownStepTimeoutMs?: number;
     /** Additional tools provided by embedders (e.g. desktop-only D2C tools). */
     extraTools?: readonly ToolDefinition<unknown>[];
     /** Explicitly opt into CLI-local collaboration. Omit for print/RPC/eval callers. */

package/dist/sdk/index.js

@@ -4,7 +4,7 @@ import {
   FlavorRpcServer,
   TraceRecordSchema,
   TraceRecorder
-} from "../chunk-PGS3M32Y.js";
+} from "../chunk-JB57IX2A.js";
 import {
   AgentMessageQueue,
   DockerExecutionEnvironment,
@@ -13,7 +13,7 @@ import {
   WorkspaceCheckpointStore,
   buildDockerInvocation,
   createProductionRuntime
-} from "../chunk-5SRARNAC.js";
+} from "../chunk-STZQ3Y3P.js";
 import "../chunk-IG4Z23CL.js";
 import "../chunk-RQTYHUMK.js";
 import "../chunk-S32JRDZK.js";

package/dist/utils/async.d.ts

@@ -1,3 +1,17 @@
+export interface TimeoutOutcome<T> {
+    /** True when the deadline passed before the promise settled. */
+    timedOut: boolean;
+    /** The promise value; undefined when timed out (or when the value itself is undefined). */
+    value: T | undefined;
+}
+/**
+ * Race a promise against a deadline. Settles like the promise when it finishes
+ * in time; when the deadline passes first it resolves with `{ timedOut: true }`.
+ * The timer is always cleared so it never keeps the event loop alive on its own.
+ * The underlying promise is NOT cancelled — it keeps running in the background —
+ * so only use this for work you are willing to abandon (e.g. shutdown cleanup).
+ */
+export declare function withTimeout<T>(promise: Promise<T>, ms: number): Promise<TimeoutOutcome<T>>;
 /**
  * Race a promise against an AbortSignal. If the signal fires before the
  * promise settles the returned promise rejects with the signal's reason.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "flavor-code",
-  "version": "1.2.16",
+  "version": "1.2.18",
   "author": "YachuanWzh",
   "type": "module",
   "publishConfig": {