replicas-engine 0.1.792 → 0.1.794

package/dist/src/{asp-host-PBOXFMW6.js → asp-host-7MK76RUF.js}

@@ -5,11 +5,11 @@ import {
   getCodexAspHost,
   restartCodexAspHost,
   restartCodexAspHostIfRunning
-} from "./chunk-SXPLAER7.js";
-import "./chunk-AG2K2YOL.js";
-import "./chunk-4HOBB56C.js";
+} from "./chunk-I7R6CFGP.js";
+import "./chunk-TWYPZ3JQ.js";
+import "./chunk-W3VEIZU4.js";
 import "./chunk-UZSNFLDQ.js";
-import "./chunk-4TBKZTNN.js";
+import "./chunk-YTUHYLO6.js";
 import "./chunk-VEQXQN22.js";
 export {
   getCodexAspHost,

package/dist/src/{chunk-SXPLAER7.js → chunk-I7R6CFGP.js}

@@ -5,18 +5,18 @@ import {
   ENGINE_ENV,
   monolithRequest,
   setAgentCredentialSnapshot
-} from "./chunk-AG2K2YOL.js";
+} from "./chunk-TWYPZ3JQ.js";
 import {
   AppServerProcess,
   buildCodexAgentEnv
-} from "./chunk-4HOBB56C.js";
+} from "./chunk-W3VEIZU4.js";
 import {
   CODEX_AUTH_ENV_KEYS,
   CODEX_AUTH_ENV_KEYS_BY_METHOD,
   codexAuthEnvFromResponse,
   createErrorResult,
   createSuccessResult
-} from "./chunk-4TBKZTNN.js";
+} from "./chunk-YTUHYLO6.js";
 
 // src/managers/codex-token-manager.ts
 import { promises as fs } from "fs";
@@ -232,7 +232,7 @@ var CodexTokenManager = class extends BaseRefreshManager {
     const data = await response.json();
     await this.applyCredentialsResponse(data);
     if (restartOnChange && CODEX_AUTH_ENV_KEYS.some((key, index) => process.env[key] !== previousEnv[index])) {
-      const { restartCodexAspHostIfRunning: restartCodexAspHostIfRunning2 } = await import("./asp-host-PBOXFMW6.js");
+      const { restartCodexAspHostIfRunning: restartCodexAspHostIfRunning2 } = await import("./asp-host-7MK76RUF.js");
       await restartCodexAspHostIfRunning2();
     }
     if (data.scope) {

package/dist/src/{chunk-SAAXKNYR.js → chunk-OMD6VAVE.js}

@@ -3,12 +3,12 @@ import { createRequire as __createRequire } from 'node:module';
 const require = __createRequire(import.meta.url);
 import {
   monolithRequest
-} from "./chunk-AG2K2YOL.js";
+} from "./chunk-TWYPZ3JQ.js";
 import {
   extractCommandProtectionCommandText,
   findGitCommitSignals,
   findPrMergeSignals
-} from "./chunk-4TBKZTNN.js";
+} from "./chunk-YTUHYLO6.js";
 
 // src/services/command-protection-service.ts
 var DEFAULT_COMMAND_PROTECTION_BLOCK_MESSAGE = "Blocked by Replicas command protection.";

package/dist/src/{chunk-FWOLDPOO.js → chunk-QLOVT464.js}

@@ -4,7 +4,7 @@ const require = __createRequire(import.meta.url);
 import {
   findCodeHostPullRequestUrls,
   mayCreatePullRequest
-} from "./chunk-4TBKZTNN.js";
+} from "./chunk-YTUHYLO6.js";
 
 // src/services/post-tool-pr-notifier.ts
 async function notifyPostToolUse(toolName, toolInput, toolResult) {

package/dist/src/{chunk-AG2K2YOL.js → chunk-TWYPZ3JQ.js}

@@ -15,7 +15,7 @@ import {
   isValidRelayBaseProvider,
   parsePosixEnvFile,
   readReplicasRuntimeEnv
-} from "./chunk-4TBKZTNN.js";
+} from "./chunk-YTUHYLO6.js";
 
 // src/engine-env.ts
 import { readFileSync as readFileSync2 } from "fs";
@@ -112,10 +112,12 @@ var IS_WARMING_MODE = process.argv.includes("--warming");
 function loadEngineEnv() {
   loadRuntimeEnvFile();
   const HOME_DIR = homedir2();
+  const backgroundTaskTimeoutMs = Number(readEnv("REPLICAS_CLAUDE_BACKGROUND_TASK_TIMEOUT_MS"));
   const env = {
     // Defined: always available
     REPLICAS_ENGINE_SECRET: requireDefined(readEnv("REPLICAS_ENGINE_SECRET"), "REPLICAS_ENGINE_SECRET"),
     REPLICAS_ENGINE_PORT: parsePort(readEnv("REPLICAS_ENGINE_PORT")),
+    REPLICAS_CLAUDE_BACKGROUND_TASK_TIMEOUT_MS: Number.isInteger(backgroundTaskTimeoutMs) && backgroundTaskTimeoutMs >= 1e3 && backgroundTaskTimeoutMs <= 2147483647 ? backgroundTaskTimeoutMs : 36e5,
     REPLICAS_MONOLITH_URL: requireValidURL(
       requireDefined(readReplicasRuntimeEnv(readEnv, REPLICAS_RUNTIME_ENV_ALIASES.monolithUrl), "REPLICAS_MONOLITH_URL"),
       "REPLICAS_MONOLITH_URL"

package/dist/src/{chunk-4HOBB56C.js → chunk-W3VEIZU4.js}

@@ -4,7 +4,7 @@ const require = __createRequire(import.meta.url);
 import {
   HOOK_EXEC_MAX_BUFFER_BYTES,
   isVersionBelow
-} from "./chunk-4TBKZTNN.js";
+} from "./chunk-YTUHYLO6.js";
 
 // src/utils/codex-agent-env.ts
 function buildCodexAgentEnv(source = process.env) {
@@ -241,7 +241,7 @@ var DEFAULT_CODEX_ARGS = [
 var MIN_CODEX_CLI_VERSION = "0.153.3";
 var CODEX_UPGRADE_TIMEOUT_MS = 12e4;
 var codexCliVersionEnsured = null;
-var ENGINE_PACKAGE_VERSION = "0.1.792";
+var ENGINE_PACKAGE_VERSION = "0.1.794";
 var INITIALIZE_METHOD = "initialize";
 var INITIALIZED_NOTIFICATION = "initialized";
 var ACCOUNT_LOGIN_START_METHOD = "account/login/start";

package/dist/src/{chunk-4TBKZTNN.js → chunk-YTUHYLO6.js}

@@ -153,7 +153,7 @@ var GPT_5_6_TERRA_MODEL = "gpt-5.6-terra";
 var GPT_5_6_LUNA_MODEL = "gpt-5.6-luna";
 var DEFAULT_CODEX_MODEL = GPT_5_6_SOL_MODEL;
 var DEFAULT_CURSOR_MODEL = "composer-2.5";
-var DEFAULT_OPENCODE_MODEL = "z-ai/glm-5.2";
+var DEFAULT_OPENCODE_MODEL = "z-ai/glm-5.3";
 var GLM_5_3_FLASH_MODEL = "z-ai/glm-5.3-flash";
 var OX_ALPHA_MODEL = "stealth/ox-alpha";
 var DEEPSEEK_V4_PRO_MODEL = "deepseek/deepseek-v4-pro-0813";
@@ -164,17 +164,22 @@ var DEFAULT_KIMI_MODEL = "moonshotai/kimi-k2.6";
 var MUSE_SPARK_1_3_MODEL = "muse-spark-1.3";
 var DEFAULT_MUSE_MODEL = "muse-spark-1.2";
 var DEFAULT_PI_MODEL = DEFAULT_OPENCODE_MODEL;
-var OPENROUTER_MODELS = [
+var DEFAULT_OPENROUTER_MODELS = [
   DEFAULT_OPENCODE_MODEL,
+  DEEPSEEK_V4_PRO_MODEL,
+  "moonshotai/kimi-k3",
+  "google/gemini-3.8-flash"
+];
+var OPENROUTER_MODELS = [
+  ...DEFAULT_OPENROUTER_MODELS,
+  "z-ai/glm-5.2",
+  "moonshotai/kimi-k2.6",
   GLM_5_3_FLASH_MODEL,
   OX_ALPHA_MODEL,
-  DEEPSEEK_V4_PRO_MODEL,
   DEEPSEEK_V4_FLASH_MODEL,
   "minimax/minimax-m3",
   "xiaomi/mimo-v2.5-pro",
-  "moonshotai/kimi-k2.6",
-  "meta/muse-spark-1.3",
-  "google/gemini-3.8-flash"
+  "meta/muse-spark-1.3"
 ];
 function prioritizeDeepseekModels(models) {
   return [
@@ -283,12 +288,12 @@ var AGENT_MODELS = {
     CLAUDE_HAIKU_4_5_MODEL,
     "kimi-k2.5"
   ],
-  deepseek: prioritizeDeepseekModels(OPENROUTER_MODELS),
+  deepseek: prioritizeDeepseekModels(DEFAULT_OPENROUTER_MODELS),
   fx: [DEFAULT_FX_MODEL],
   kimi: [DEFAULT_KIMI_MODEL],
   muse: [MUSE_SPARK_1_3_MODEL, DEFAULT_MUSE_MODEL],
-  opencode: [...OPENROUTER_MODELS, ...ASTER_MODELS],
-  pi: [...OPENROUTER_MODELS, ...ASTER_MODELS],
+  opencode: [...DEFAULT_OPENROUTER_MODELS, ...ASTER_MODELS],
+  pi: [...DEFAULT_OPENROUTER_MODELS, ...ASTER_MODELS],
   relay: [CLAUDE_FABLE_5_1_MODEL, CLAUDE_FABLE_5_MODEL, CLAUDE_OPUS_5_MODEL, CLAUDE_OPUS_4_8_MODEL, CLAUDE_SONNET_5_MODEL]
 };
 var DEFAULT_STATIC_AGENT_MODELS = {
@@ -322,7 +327,8 @@ var MODEL_LABELS = {
   [GPT_5_6_TERRA_MODEL]: "GPT-5.6 Terra",
   [GPT_5_6_LUNA_MODEL]: "GPT-5.6 Luna",
   "gpt-5.5": "GPT-5.5",
-  [DEFAULT_OPENCODE_MODEL]: "GLM 5.2 via OpenRouter",
+  [DEFAULT_OPENCODE_MODEL]: "GLM 5.3 via OpenRouter",
+  "z-ai/glm-5.2": "GLM 5.2 via OpenRouter",
   [GLM_5_3_FLASH_MODEL]: "GLM 5.3 Flash via OpenRouter",
   [OX_ALPHA_MODEL]: "Ox Alpha via OpenRouter",
   [DEEPSEEK_V4_PRO_MODEL]: "DeepSeek V4 Pro via OpenRouter",
@@ -330,6 +336,7 @@ var MODEL_LABELS = {
   "minimax/minimax-m3": "MiniMax M3 via OpenRouter",
   "xiaomi/mimo-v2.5-pro": "MiMo V2.5 Pro via OpenRouter",
   "moonshotai/kimi-k2.6": "Kimi K2.6 via OpenRouter",
+  "moonshotai/kimi-k3": "Kimi K3 via OpenRouter",
   [MUSE_SPARK_1_3_MODEL]: "Muse Spark 1.3",
   [DEFAULT_MUSE_MODEL]: "Muse Spark 1.2",
   "meta/muse-spark-1.3": "Muse Spark 1.3 via OpenRouter",
@@ -1499,9 +1506,6 @@ function normalizeBackgroundTaskStatus(status) {
   }
   return "in_progress";
 }
-function isTerminalBackgroundTaskStatus(status) {
-  return normalizeBackgroundTaskStatus(status) !== "in_progress";
-}
 
 // ../shared/src/display-message/constants.ts
 var USER_MESSAGE_MATCH_GRACE_PERIOD_MS = 3e4;
@@ -7703,7 +7707,6 @@ export {
   getChatHistoryPageWindow,
   paginateChatHistory,
   coerceBackgroundTaskPayload,
-  isTerminalBackgroundTaskStatus,
   isGitHubUrl,
   decodePathSegments,
   extractErrorText,

package/dist/src/command-protection-hook.js

@@ -3,12 +3,12 @@ import { createRequire as __createRequire } from 'node:module';
 const require = __createRequire(import.meta.url);
 import {
   evaluateCommandProtection
-} from "./chunk-SAAXKNYR.js";
-import "./chunk-AG2K2YOL.js";
+} from "./chunk-OMD6VAVE.js";
+import "./chunk-TWYPZ3JQ.js";
 import {
   isRecord
 } from "./chunk-UZSNFLDQ.js";
-import "./chunk-4TBKZTNN.js";
+import "./chunk-YTUHYLO6.js";
 import "./chunk-VEQXQN22.js";
 
 // src/command-protection-hook.ts

package/dist/src/deepseek-command-protection-plugin.js

@@ -3,13 +3,13 @@ import { createRequire as __createRequire } from 'node:module';
 const require = __createRequire(import.meta.url);
 import {
   evaluateCommandProtection
-} from "./chunk-SAAXKNYR.js";
+} from "./chunk-OMD6VAVE.js";
 import {
   notifyPostToolUse
-} from "./chunk-FWOLDPOO.js";
-import "./chunk-AG2K2YOL.js";
+} from "./chunk-QLOVT464.js";
+import "./chunk-TWYPZ3JQ.js";
 import "./chunk-UZSNFLDQ.js";
-import "./chunk-4TBKZTNN.js";
+import "./chunk-YTUHYLO6.js";
 import "./chunk-VEQXQN22.js";
 
 // src/deepseek-command-protection-plugin.ts

package/dist/src/headless-agent.js

@@ -8,12 +8,12 @@ import {
 import {
   AppServerProcess,
   buildCodexAgentEnv
-} from "./chunk-4HOBB56C.js";
+} from "./chunk-W3VEIZU4.js";
 import {
   AGENT,
   getMemoryOutputSafetyViolation,
   headlessAgentRequestSchema
-} from "./chunk-4TBKZTNN.js";
+} from "./chunk-YTUHYLO6.js";
 import "./chunk-VEQXQN22.js";
 
 // src/headless-agent.ts

package/dist/src/index.js

@@ -91,7 +91,7 @@ import {
   evaluateCommandProtection,
   extractToolCommand,
   reportCommandProtectionBlock
-} from "./chunk-SAAXKNYR.js";
+} from "./chunk-OMD6VAVE.js";
 import {
   ACCOUNT_RATE_LIMITS_UPDATED_METHOD,
   AGENT_MESSAGE_DELTA_METHOD,
@@ -124,20 +124,20 @@ import {
   recordCredentialFallback,
   recordExhaustedCredential,
   restartCodexAspHost
-} from "./chunk-SXPLAER7.js";
+} from "./chunk-I7R6CFGP.js";
 import {
   ENGINE_ENV,
   IS_WARMING_MODE,
   monolithRequest,
   monolithService,
   setAgentCredentialSnapshot
-} from "./chunk-AG2K2YOL.js";
+} from "./chunk-TWYPZ3JQ.js";
 import {
   AspClient,
   SUBPROCESS_MAX_BUFFER,
   execAsync,
   execFileAsync
-} from "./chunk-4HOBB56C.js";
+} from "./chunk-W3VEIZU4.js";
 import {
   isRecord as isRecord2
 } from "./chunk-UZSNFLDQ.js";
@@ -298,7 +298,6 @@ import {
   isNonEmptyString,
   isRecord,
   isSkillRegistryManifest,
-  isTerminalBackgroundTaskStatus,
   isTokenUsageCounts,
   isTokenUsageUploadRecord,
   isTransientErrorText,
@@ -338,7 +337,7 @@ import {
   spawnRelaySubagentRequestSchema,
   stripAgentDiagnosticErrors,
   withTimeout
-} from "./chunk-4TBKZTNN.js";
+} from "./chunk-YTUHYLO6.js";
 import {
   __commonJS,
   __export,
@@ -12494,16 +12493,65 @@ function updateClaudeSessionActivity(activity, message) {
 function isClaudeSessionActive(activity) {
   return activity.state !== "idle";
 }
-function startClaudeSessionFallbackContinuation(activity) {
-  if (activity.observedAuthoritativeState || activity.state !== "idle") return false;
-  activity.state = "running";
-  return true;
-}
-function expireClaudeSessionFallbackContinuation(activity) {
-  if (activity.observedAuthoritativeState || activity.state === "idle") return false;
-  activity.state = "idle";
-  return true;
-}
+
+// src/managers/claude-background-tasks.ts
+var ClaudeBackgroundTasks = class {
+  active = /* @__PURE__ */ new Map();
+  persistentMonitors = /* @__PURE__ */ new Set();
+  reset() {
+    this.active.clear();
+    this.persistentMonitors.clear();
+  }
+  update(message, now = Date.now()) {
+    if (message.type === "assistant") {
+      for (const block of message.message.content) {
+        if (block.type === "tool_use" && block.name === "Monitor" && typeof block.input === "object" && block.input !== null && "persistent" in block.input && block.input.persistent === true) {
+          this.persistentMonitors.add(block.id);
+        }
+      }
+      return;
+    }
+    if (message.type !== "system") return;
+    if (message.subtype === "background_tasks_changed") {
+      const liveIds = /* @__PURE__ */ new Set();
+      for (const task2 of message.tasks) {
+        if (task2.ambient) continue;
+        liveIds.add(task2.task_id);
+        const existing = this.active.get(task2.task_id);
+        this.active.set(task2.task_id, {
+          ...existing,
+          description: task2.description,
+          startedAt: existing?.startedAt ?? now,
+          persistentMonitor: existing?.persistentMonitor || this.persistentMonitors.has(task2.task_id)
+        });
+      }
+      for (const id of this.active.keys()) {
+        if (!liveIds.has(id)) {
+          this.active.delete(id);
+          this.persistentMonitors.delete(id);
+        }
+      }
+      return;
+    }
+    const payload = coerceBackgroundTaskPayload(message);
+    if (!payload) return;
+    const toolUseId = "tool_use_id" in message ? message.tool_use_id : void 0;
+    if (toolUseId && this.persistentMonitors.has(toolUseId)) {
+      this.persistentMonitors.add(payload.taskId);
+      this.persistentMonitors.delete(toolUseId);
+    }
+    const status = payload.subtype === "task_updated" ? payload.patch?.status : payload.status;
+    const task = this.active.get(payload.taskId);
+    if (!task) return;
+    task.description = payload.description ?? payload.patch?.description ?? task.description;
+    task.persistentMonitor ||= this.persistentMonitors.has(payload.taskId);
+    if (status === "paused") task.pausedAt ??= now;
+    else if (status === "running" && task.pausedAt !== void 0) {
+      task.startedAt += now - task.pausedAt;
+      task.pausedAt = void 0;
+    }
+  }
+};
 
 // src/managers/relay-mcp-config.ts
 import { existsSync as existsSync7 } from "fs";
@@ -12540,7 +12588,6 @@ function relayCodexMcpConfig(parentChatId) {
 }
 
 // src/managers/claude-manager.ts
-var CLAUDE_ACTIVITY_STATUS_EVENT_TYPE = "claude-activity-status";
 var PromptStream = class {
   queue = [];
   closed = false;
@@ -12629,7 +12676,9 @@ var COMMAND_PROTECTION_SAFE_TOOLS = /* @__PURE__ */ new Set([
 var CLAUDE_PARTIAL_MESSAGE_FLUSH_MS = 80;
 var CLAUDE_SLASH_COMMANDS_CACHE_MS = 6e4;
 var CLAUDE_SLASH_COMMANDS_DISCOVERY_TIMEOUT_MS = 3e4;
-var CLAUDE_BACKGROUND_CONTINUATION_GRACE_MS = 5e3;
+var CLAUDE_BACKGROUND_CONTINUATION_GRACE_MS = 1e4;
+var CLAUDE_BACKGROUND_RECOVERY_START_TIMEOUT_MS = 6e4;
+var CLAUDE_BACKGROUND_STOP_TIMEOUT_MS = 5e3;
 function supportsClaudeThinkingDisplay(model) {
   const normalized = (normalizeClaudeModel(model) ?? model).toLowerCase();
   return AGENT_MODELS.claude.includes(normalized) || /^claude-(?:opus|sonnet|haiku)-[4-9]/.test(normalized);
@@ -12784,8 +12833,10 @@ var ClaudeManager = class _ClaudeManager extends CodingAgentManager {
   sessionActivity = createClaudeSessionActivity();
   backgroundContinuationTimer = null;
   pendingInterrupt = false;
-  activeBackgroundTasks = /* @__PURE__ */ new Set();
-  ambientBackgroundTasks = /* @__PURE__ */ new Set();
+  backgroundTasks = new ClaudeBackgroundTasks();
+  backgroundWatchdogTimer = null;
+  backgroundRecoveryAttempted = false;
+  backgroundWatchdogTriggered = false;
   // Set when background tasks outlive a turn; cleared once their completion
   // has been reported through onTurnComplete.
   pendingBackgroundCompletion = false;
@@ -12808,13 +12859,8 @@ var ClaudeManager = class _ClaudeManager extends CodingAgentManager {
   }
   async interruptActiveTurn() {
     this.pendingInterrupt = true;
-    const query2 = this.activeQuery;
-    if (query2) {
-      const taskIds = [...this.activeBackgroundTasks];
-      await Promise.allSettled(taskIds.map((taskId) => query2.stopTask(taskId)));
-      await query2.interrupt();
-    }
     await this.abortAllPendingToolInputs();
+    await this.tearDownSession(true);
   }
   keepSteeredMessageQueued() {
     return true;
@@ -12844,10 +12890,10 @@ var ClaudeManager = class _ClaudeManager extends CodingAgentManager {
     return this.authRetrying;
   }
   isProcessing() {
-    return super.isProcessing() || isClaudeSessionActive(this.sessionActivity) || this.activeBackgroundTasks.size > 0;
+    return super.isProcessing() || isClaudeSessionActive(this.sessionActivity) || this.hasActiveBackgroundTasks();
   }
   hasActiveBackgroundTasks() {
-    return this.activeBackgroundTasks.size > 0 || this.pendingBackgroundCompletion && isClaudeSessionActive(this.sessionActivity) && !this.messageQueue.isProcessing();
+    return this.backgroundTasks.active.size > 0 || this.pendingBackgroundCompletion && (isClaudeSessionActive(this.sessionActivity) || this.backgroundContinuationTimer !== null) && !this.messageQueue.isProcessing();
   }
   async listSlashCommands() {
     await this.initialized;
@@ -13212,8 +13258,10 @@ var ClaudeManager = class _ClaudeManager extends CodingAgentManager {
         });
       }
     }
+    const userMessageUuid = randomUUID5();
     const userMessage = {
       type: "user",
+      uuid: userMessageUuid,
       message: {
         role: "user",
         content
@@ -13224,7 +13272,10 @@ var ClaudeManager = class _ClaudeManager extends CodingAgentManager {
     if (!options.skipUserMessageRecord) {
       await this.recordEvent(userMessage, request.messageId);
     }
-    const combinedInstructions = this.buildCombinedInstructions(customInstructions, true);
+    const combinedInstructions = [
+      this.buildCombinedInstructions(customInstructions, true),
+      "Background tasks must have a concrete completion condition. Use foreground commands for sequential work and managed workspace services for servers. Reserve persistent Monitor tasks for ongoing watches the user requested. You may end a turn while actual background work continues, but do not promise a later update unless a task was successfully launched. Report completion or failure when its notification arrives; do not restart timed-out work automatically."
+    ].filter(Boolean).join("\n\n");
     const resolvedModel = normalizeClaudeModel(model) || DEFAULT_CLAUDE_MODEL;
     const claudeCodeModel = toClaudeCodeModel(resolvedModel);
     const resolvedPermissionMode = planMode ? "plan" : "bypassPermissions";
@@ -13257,7 +13308,7 @@ var ClaudeManager = class _ClaudeManager extends CodingAgentManager {
       return;
     }
     await new Promise((resolve7, reject) => {
-      this.pendingTurn = { resolve: resolve7, reject, sawActivity: false };
+      this.pendingTurn = { resolve: resolve7, reject, sawActivity: false, userMessageUuid };
       promptStream.push(userMessage);
     });
   }
@@ -13403,10 +13454,6 @@ var ClaudeManager = class _ClaudeManager extends CodingAgentManager {
     this.activeSessionModel = claudeCodeModel;
     this.activeSessionPermissionMode = resolvedPermissionMode;
     this.sessionLinearForwarder = new LinearEventForwarder(ENGINE_ENV.REPLICAS_LINEAR_SESSION_ID);
-    this.activeBackgroundTasks.clear();
-    this.ambientBackgroundTasks.clear();
-    this.clearBackgroundContinuationTimer();
-    resetClaudeSessionActivity(this.sessionActivity);
     this.sessionLoop = this.runSessionLoop(response).catch((err) => {
       console.error("[ClaudeManager] Session loop crashed:", err);
     });
@@ -13424,7 +13471,7 @@ var ClaudeManager = class _ClaudeManager extends CodingAgentManager {
     try {
       while (true) {
         const next = await iterator.next();
-        if (next.done) break;
+        if (next.done || this.activeQuery !== response) break;
         const msg = next.value;
         if (!msg) break;
         const authErrorMessage = _ClaudeManager.detectAuthErrorInMessage(msg);
@@ -13465,27 +13512,32 @@ var ClaudeManager = class _ClaudeManager extends CodingAgentManager {
         if (this.pendingTurn && _ClaudeManager.isTurnActivity(msg)) {
           this.pendingTurn.sawActivity = true;
         }
-        if (msg.type === "result" || _ClaudeManager.isTurnActivity(msg) || msg.type === "system" && (msg.subtype === "init" || msg.subtype === "session_state_changed")) {
+        if (msg.type === "result" && (msg.subtype !== "success" || msg.num_turns !== 0 || msg.result !== "") || _ClaudeManager.isTurnActivity(msg)) {
           this.clearBackgroundContinuationTimer();
         }
         updateClaudeSessionActivity(this.sessionActivity, msg);
-        const hadActiveBackgroundTasks = this.activeBackgroundTasks.size > 0;
-        _ClaudeManager.updateBackgroundTaskState(msg, this.activeBackgroundTasks, this.ambientBackgroundTasks);
-        if (hadActiveBackgroundTasks && this.activeBackgroundTasks.size === 0) {
+        const hadActiveBackgroundTasks = this.backgroundTasks.active.size > 0;
+        this.backgroundTasks.update(msg);
+        this.scheduleBackgroundWatchdog();
+        if (hadActiveBackgroundTasks && this.backgroundTasks.active.size === 0) {
           this.startBackgroundContinuationGrace();
         }
-        if (!this.pendingTurn && this.activeBackgroundTasks.size > 0) {
+        if (!this.pendingTurn && this.backgroundTasks.active.size > 0) {
           this.pendingBackgroundCompletion = true;
         }
         await this.handleMessage(msg);
+        if (this.activeQuery !== response) break;
         if (linearSessionId && this.sessionLinearForwarder) {
           this.sessionLinearForwarder.processClaudeEventForPlan(msg);
           this.sessionLinearForwarder.sendEvent(convertClaudeEvent(msg, linearSessionId));
         }
         if (msg.type === "result") {
           await this.recordContextUsage(response);
+          if (this.activeQuery !== response) break;
           this.sessionLinearForwarder?.flushThoughtAsResponse();
-          this.resolvePendingTurn();
+          if (msg.user_message_uuid ? msg.user_message_uuid === this.pendingTurn?.userMessageUuid : !msg.origin || msg.origin.kind === "human") {
+            this.resolvePendingTurn();
+          }
         }
         this.maybeCompleteBackgroundTurn();
       }
@@ -13498,6 +13550,7 @@ var ClaudeManager = class _ClaudeManager extends CodingAgentManager {
         console.error("[ClaudeManager] Session loop crashed:", error);
       }
     } finally {
+      if (this.activeQuery !== response) return;
       const pending = this.pendingTurn;
       const pendingError = loopError ? pending?.sawActivity && _ClaudeManager.isTransientTurnError(loopError) ? new ClaudeTransientTurnError("Claude session ended unexpectedly mid-response", true) : loopError : pending && !pending.sawActivity ? new ClaudeTransientTurnError("Claude session ended unexpectedly before producing a response") : new Error("Claude session ended unexpectedly");
       if (_ClaudeManager.isTransientTurnError(pendingError) || _ClaudeManager.isAuthError(pendingError)) {
@@ -13507,12 +13560,15 @@ var ClaudeManager = class _ClaudeManager extends CodingAgentManager {
         this.sessionLinearForwarder?.flushThoughtAsResponse();
       }
       this.failPendingTurn(pendingError);
-      if (this.activeQuery === response) {
-        const orphanedBackgroundCompletion = this.pendingBackgroundCompletion && !this.messageQueue.isProcessing();
-        this.clearSessionState();
-        if (orphanedBackgroundCompletion) {
-          this.notifyBackgroundTurnComplete();
-        }
+      const orphanedBackgroundCompletion = this.pendingBackgroundCompletion && !this.messageQueue.isProcessing();
+      this.settleBackgroundTasks("Claude session ended before this task completed.");
+      this.clearSessionState();
+      try {
+        response.close();
+      } catch {
+      }
+      if (orphanedBackgroundCompletion) {
+        this.notifyBackgroundTurnComplete();
       }
     }
   }
@@ -13526,8 +13582,10 @@ var ClaudeManager = class _ClaudeManager extends CodingAgentManager {
     this.sessionLoop = null;
     this.clearBackgroundContinuationTimer();
     resetClaudeSessionActivity(this.sessionActivity);
-    this.activeBackgroundTasks.clear();
-    this.ambientBackgroundTasks.clear();
+    this.backgroundTasks.reset();
+    this.clearBackgroundWatchdog();
+    this.backgroundRecoveryAttempted = false;
+    this.backgroundWatchdogTriggered = false;
     this.pendingBackgroundCompletion = false;
     for (const timer of this.partialMessageFlushTimers.values()) {
       clearTimeout(timer);
@@ -13540,12 +13598,14 @@ var ClaudeManager = class _ClaudeManager extends CodingAgentManager {
     if (!pending) return;
     this.pendingTurn = null;
     this.pendingInterrupt = false;
-    this.pendingBackgroundCompletion = this.activeBackgroundTasks.size > 0;
+    this.pendingBackgroundCompletion = this.backgroundTasks.active.size > 0 || this.backgroundContinuationTimer !== null;
+    if (!this.pendingBackgroundCompletion) this.backgroundWatchdogTriggered = false;
     pending.resolve();
   }
   maybeCompleteBackgroundTurn() {
-    if (!this.pendingBackgroundCompletion || this.pendingTurn || this.messageQueue.isProcessing() || this.activeBackgroundTasks.size > 0 || isClaudeSessionActive(this.sessionActivity)) return;
+    if (!this.pendingBackgroundCompletion || this.pendingTurn || this.messageQueue.isProcessing() || this.backgroundTasks.active.size > 0 || this.backgroundContinuationTimer !== null || isClaudeSessionActive(this.sessionActivity)) return;
     this.pendingBackgroundCompletion = false;
+    this.backgroundWatchdogTriggered = false;
     this.notifyBackgroundTurnComplete();
   }
   notifyBackgroundTurnComplete() {
@@ -13562,24 +13622,128 @@ var ClaudeManager = class _ClaudeManager extends CodingAgentManager {
   }
   startBackgroundContinuationGrace() {
     this.clearBackgroundContinuationTimer();
-    if (!startClaudeSessionFallbackContinuation(this.sessionActivity)) return;
-    this.backgroundContinuationTimer = setTimeout(() => {
-      this.backgroundContinuationTimer = null;
-      if (this.activeBackgroundTasks.size > 0 || !expireClaudeSessionFallbackContinuation(this.sessionActivity)) return;
-      this.emitSyntheticEvent(CLAUDE_ACTIVITY_STATUS_EVENT_TYPE, { state: "idle" });
-      this.maybeCompleteBackgroundTurn();
-    }, CLAUDE_BACKGROUND_CONTINUATION_GRACE_MS);
+    const query2 = this.activeQuery;
+    if (!query2 || this.pendingInterrupt) return;
+    this.backgroundRecoveryAttempted = false;
+    this.backgroundContinuationTimer = setTimeout(() => this.recoverBackgroundContinuation(query2), CLAUDE_BACKGROUND_CONTINUATION_GRACE_MS);
+  }
+  recoverBackgroundContinuation(query2) {
+    if (this.activeQuery !== query2) return;
+    this.backgroundContinuationTimer = null;
+    if (!this.pendingBackgroundCompletion || this.pendingInterrupt) return;
+    if (this.backgroundTasks.active.size > 0) return;
+    if (this.sessionActivity.state === "running" && !this.pendingTurn) return;
+    if (this.pendingTurn || this.messageQueue.isProcessing() || this.isAwaitingInput() || this.sessionActivity.state === "requires_action") {
+      this.backgroundContinuationTimer = setTimeout(() => this.recoverBackgroundContinuation(query2), CLAUDE_BACKGROUND_CONTINUATION_GRACE_MS);
+      return;
+    }
+    if (this.backgroundRecoveryAttempted) {
+      void this.failBackgroundSession(query2, "Claude did not resume after its background tasks finished. The session was stopped; send a message to continue.");
+      return;
+    }
+    this.backgroundRecoveryAttempted = true;
+    this.activePromptStream?.push({
+      type: "user",
+      uuid: randomUUID5(),
+      isSynthetic: true,
+      session_id: this.sessionId ?? "",
+      parent_tool_use_id: null,
+      message: {
+        role: "user",
+        content: `${this.backgroundWatchdogTriggered ? "Replicas cancelled background work because it exceeded its time limit; this was a watchdog cancellation, not a user cancellation. " : ""}Your background tasks have finished. Process their completion notifications and report the actual results. Continue only work that remains from the user request; do not repeat completed actions or restart finished tasks.`
+      }
+    });
+    this.backgroundContinuationTimer = setTimeout(() => this.recoverBackgroundContinuation(query2), CLAUDE_BACKGROUND_RECOVERY_START_TIMEOUT_MS);
+  }
+  clearBackgroundWatchdog() {
+    if (this.backgroundWatchdogTimer) clearTimeout(this.backgroundWatchdogTimer);
+    this.backgroundWatchdogTimer = null;
+  }
+  scheduleBackgroundWatchdog() {
+    this.clearBackgroundWatchdog();
+    const query2 = this.activeQuery;
+    if (!query2) return;
+    let deadline = Infinity;
+    for (const task of this.backgroundTasks.active.values()) {
+      if (task.stopRequestedAt !== void 0) {
+        deadline = Math.min(deadline, task.stopRequestedAt + CLAUDE_BACKGROUND_STOP_TIMEOUT_MS);
+      } else if (task.pausedAt === void 0 && !task.persistentMonitor) {
+        deadline = Math.min(deadline, task.startedAt + ENGINE_ENV.REPLICAS_CLAUDE_BACKGROUND_TASK_TIMEOUT_MS);
+      }
+    }
+    if (!Number.isFinite(deadline)) return;
+    this.backgroundWatchdogTimer = setTimeout(() => this.checkBackgroundTasks(query2), Math.max(0, deadline - Date.now()));
+  }
+  checkBackgroundTasks(query2) {
+    if (this.activeQuery !== query2) return;
+    this.backgroundWatchdogTimer = null;
+    const now = Date.now();
+    for (const [id, task] of this.backgroundTasks.active) {
+      if (task.stopRequestedAt !== void 0) {
+        if (now - task.stopRequestedAt >= CLAUDE_BACKGROUND_STOP_TIMEOUT_MS) {
+          void this.failBackgroundSession(query2, "A background task did not stop after reaching its time limit. Claude and its remaining tasks were stopped; send a message to continue.");
+          return;
+        }
+        continue;
+      }
+      if (task.pausedAt !== void 0 || task.persistentMonitor || now - task.startedAt < ENGINE_ENV.REPLICAS_CLAUDE_BACKGROUND_TASK_TIMEOUT_MS) continue;
+      if (this.isAwaitingInput() || this.sessionActivity.state === "requires_action") {
+        task.startedAt = now;
+        continue;
+      }
+      task.stopRequestedAt = now;
+      if (!this.backgroundWatchdogTriggered) {
+        this.backgroundWatchdogTriggered = true;
+        this.activePromptStream?.push({
+          type: "user",
+          uuid: randomUUID5(),
+          isSynthetic: true,
+          shouldQuery: false,
+          session_id: this.sessionId ?? "",
+          parent_tool_use_id: null,
+          message: {
+            role: "user",
+            content: "Replicas is cancelling background work that exceeded its execution time limit. Report its stop notifications as watchdog timeouts, not user cancellations. Do not restart timed-out work unless the user asks."
+          }
+        });
+      }
+      void this.recordEvent({
+        type: "system",
+        subtype: "task_updated",
+        task_id: id,
+        uuid: randomUUID5(),
+        session_id: this.sessionId ?? "",
+        patch: { description: task.description, error: "Background task exceeded its execution time limit. Replicas requested cancellation." }
+      });
+      void query2.stopTask(id).catch((error) => {
+        console.warn("[ClaudeManager] Background task stop failed:", error);
+      });
+    }
+    this.scheduleBackgroundWatchdog();
+  }
+  async failBackgroundSession(query2, message) {
+    if (this.activeQuery !== query2) return;
+    await this.emitTerminalErrorResult(message, [message]);
+    await this.abortAllPendingToolInputs();
+    if (this.activeQuery === query2) await this.tearDownSession();
+  }
+  async dispose() {
+    await this.abortAllPendingToolInputs();
+    await this.tearDownSession();
   }
   clearBackgroundContinuationTimer() {
     if (!this.backgroundContinuationTimer) return;
     clearTimeout(this.backgroundContinuationTimer);
     this.backgroundContinuationTimer = null;
   }
-  async tearDownSession() {
+  async tearDownSession(interrupted = false) {
     const query2 = this.activeQuery;
     const stream = this.activePromptStream;
     const loop = this.sessionLoop;
-    this.failPendingTurn(new Error("Claude session torn down"));
+    const notifyCompletion = this.pendingBackgroundCompletion && !this.messageQueue.isProcessing();
+    this.settleBackgroundTasks();
+    if (interrupted) this.resolvePendingTurn();
+    else this.failPendingTurn(new Error("Claude session torn down"));
     this.clearSessionState();
     if (query2) {
       try {
@@ -13595,34 +13759,18 @@ var ClaudeManager = class _ClaudeManager extends CodingAgentManager {
       } catch {
       }
     }
+    if (notifyCompletion) this.notifyBackgroundTurnComplete();
   }
-  // Ambient tasks are CLI housekeeping (skip_transcript tasks, auto-started
-  // watchers) that the SDK asks hosts to keep out of activity indicators;
-  // counted as active, they would keep the chat processing after its turn.
-  static updateBackgroundTaskState(message, activeTasks, ambientTasks) {
-    if (message.type !== "system") return;
-    if (message.subtype === "session_state_changed" && message.state === "idle") {
-      activeTasks.clear();
-      return;
-    }
-    if (message.subtype === "background_tasks_changed") {
-      activeTasks.clear();
-      for (const task of message.tasks) {
-        if (task.ambient) ambientTasks.add(task.task_id);
-        else ambientTasks.delete(task.task_id);
-        if (!task.ambient) activeTasks.add(task.task_id);
-      }
-      return;
-    }
-    const payload = coerceBackgroundTaskPayload(message);
-    if (!payload) return;
-    if (payload.ambient === true) ambientTasks.add(payload.taskId);
-    else if (payload.ambient === false) ambientTasks.delete(payload.taskId);
-    const status = payload.subtype === "task_updated" ? payload.patch?.status : payload.status;
-    if (isTerminalBackgroundTaskStatus(status) || ambientTasks.has(payload.taskId)) {
-      activeTasks.delete(payload.taskId);
-    } else {
-      activeTasks.add(payload.taskId);
+  settleBackgroundTasks(error) {
+    for (const taskId of this.backgroundTasks.active.keys()) {
+      void this.recordEvent({
+        type: "system",
+        subtype: "task_updated",
+        task_id: taskId,
+        uuid: randomUUID5(),
+        session_id: this.sessionId ?? "",
+        patch: { status: error ? "failed" : "killed", ...error ? { error } : {} }
+      });
     }
   }
   buildContextUsagePayload(usage) {
@@ -13705,7 +13853,7 @@ var ClaudeManager = class _ClaudeManager extends CodingAgentManager {
     return null;
   }
   static isTurnActivity(message) {
-    return message.type === "assistant" || message.type === "stream_event";
+    return (message.type === "assistant" || message.type === "stream_event") && message.parent_tool_use_id === null;
   }
   // Done at the message-stream layer (rather than letting the failure flow
   // downstream as a normal result) so we can suppress emission before the
@@ -62454,7 +62602,7 @@ var ChatService = class {
       }
     }).catch(() => {
     });
-    if (event.type === "replicas-tool-input-request" || event.type === "replicas-tool-input-resolved" || event.type === "compaction-status" || event.type === AUTH_RETRY_STATUS_EVENT_TYPE || event.type === AUTH_FALLBACK_EVENT_TYPE || event.type === CURSOR_CONNECTION_STATUS_EVENT_TYPE || event.type === CHAT_GOAL_EVENT_TYPE || event.type === CLAUDE_ACTIVITY_STATUS_EVENT_TYPE || event.type === "claude-result" || event.type === "claude-system" && (event.payload.subtype === "init" || event.payload.subtype === "session_state_changed" || event.payload.subtype === "background_tasks_changed" || coerceBackgroundTaskPayload(event.payload) !== null)) {
+    if (event.type === "replicas-tool-input-request" || event.type === "replicas-tool-input-resolved" || event.type === "compaction-status" || event.type === AUTH_RETRY_STATUS_EVENT_TYPE || event.type === AUTH_FALLBACK_EVENT_TYPE || event.type === CURSOR_CONNECTION_STATUS_EVENT_TYPE || event.type === CHAT_GOAL_EVENT_TYPE || event.type === "claude-result" || event.type === "claude-system" && (event.payload.subtype === "init" || event.payload.subtype === "session_state_changed" || event.payload.subtype === "background_tasks_changed" || coerceBackgroundTaskPayload(event.payload) !== null)) {
       this.publish({
         type: "chat.updated",
         payload: { chat: this.toSummary(chat) }

package/dist/src/post-tool-pr-hook.js

@@ -3,11 +3,11 @@ import { createRequire as __createRequire } from 'node:module';
 const require = __createRequire(import.meta.url);
 import {
   notifyPostToolUse
-} from "./chunk-FWOLDPOO.js";
+} from "./chunk-QLOVT464.js";
 import {
   isRecord
 } from "./chunk-UZSNFLDQ.js";
-import "./chunk-4TBKZTNN.js";
+import "./chunk-YTUHYLO6.js";
 import "./chunk-VEQXQN22.js";
 
 // src/post-tool-pr-hook.ts

package/dist/src/relay-mcp.js

@@ -4,7 +4,7 @@ const require = __createRequire(import.meta.url);
 import {
   messageRelaySubagentRequestSchema,
   spawnRelaySubagentRequestSchema
-} from "./chunk-4TBKZTNN.js";
+} from "./chunk-YTUHYLO6.js";
 import "./chunk-VEQXQN22.js";
 
 // src/relay-mcp.ts

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "replicas-engine",
-  "version": "0.1.792",
+  "version": "0.1.794",
   "description": "Lightweight API server for Replicas workspaces",
   "type": "module",
   "main": "dist/src/index.js",