chatroom-cli 1.53.2 → 1.53.4

package/dist/index.js

@@ -26655,7 +26655,7 @@ function resolveCursorCliModel(model) {
   const prefix = `${CURSOR_PROVIDER}/`;
   return model.startsWith(prefix) ? model.slice(prefix.length) : model;
 }
-var CURSOR_COMMAND = "agent", CURSOR_PROVIDER = "cursor", CURSOR_MODELS, CursorAgentService;
+var CURSOR_COMMAND = "agent", CURSOR_PROVIDER = "cursor", NO_SUBAGENT_DIRECTIVE = "NEVER spawn subagents. Follow the chatroom instructions strictly.", CURSOR_MODELS, CursorAgentService;
 var init_cursor_agent_service = __esm(() => {
   init_base_cli_agent_service();
   init_cursor_stream_reader();
@@ -26736,9 +26736,12 @@ var init_cursor_agent_service = __esm(() => {
       if (options.model) {
         args2.push("--model", resolveCursorCliModel(options.model));
       }
-      const fullPrompt = options.systemPrompt ? `${options.systemPrompt}
+      const systemPrompt = options.systemPrompt ? `${NO_SUBAGENT_DIRECTIVE}
 
-${options.prompt}` : options.prompt;
+${options.systemPrompt}` : NO_SUBAGENT_DIRECTIVE;
+      const fullPrompt = `${systemPrompt}
+
+${options.prompt}`;
       const childProcess = this.deps.spawn(CURSOR_COMMAND, args2, {
         cwd: options.workingDir,
         stdio: ["pipe", "pipe", "pipe"],
@@ -27512,65 +27515,7 @@ function resolveCursorSdkModel(model) {
   const prefix = `${CURSOR_PROVIDER2}/`;
   return model.startsWith(prefix) ? model.slice(prefix.length) : model;
 }
-var CURSOR_SDK_FALLBACK_MODELS, CURSOR_PROVIDER2 = "cursor";
-var init_cursor_models = __esm(() => {
-  CURSOR_SDK_FALLBACK_MODELS = [
-    "claude-4.6-opus-high",
-    "claude-4.6-opus-high-thinking",
-    "claude-4.6-opus-max",
-    "claude-4.6-opus-max-thinking",
-    "claude-4.5-opus-high",
-    "claude-4.5-opus-high-thinking",
-    "claude-4.6-sonnet-medium",
-    "claude-4.6-sonnet-medium-thinking",
-    "claude-4.5-sonnet",
-    "claude-4.5-sonnet-thinking",
-    "claude-4-sonnet",
-    "claude-4-sonnet-thinking",
-    "claude-4-sonnet-1m",
-    "claude-4-sonnet-1m-thinking",
-    "gpt-5.4-low",
-    "gpt-5.4-medium",
-    "gpt-5.4-medium-fast",
-    "gpt-5.4-high",
-    "gpt-5.4-high-fast",
-    "gpt-5.4-xhigh",
-    "gpt-5.4-xhigh-fast",
-    "gpt-5.3-codex-low",
-    "gpt-5.3-codex-low-fast",
-    "gpt-5.3-codex",
-    "gpt-5.3-codex-fast",
-    "gpt-5.3-codex-high",
-    "gpt-5.3-codex-high-fast",
-    "gpt-5.3-codex-xhigh",
-    "gpt-5.3-codex-xhigh-fast",
-    "gpt-5.3-codex-spark-preview",
-    "gpt-5.2",
-    "gpt-5.2-high",
-    "gpt-5.2-codex-low",
-    "gpt-5.2-codex-low-fast",
-    "gpt-5.2-codex",
-    "gpt-5.2-codex-fast",
-    "gpt-5.2-codex-high",
-    "gpt-5.2-codex-high-fast",
-    "gpt-5.2-codex-xhigh",
-    "gpt-5.2-codex-xhigh-fast",
-    "gpt-5.1-high",
-    "gpt-5.1-codex-max",
-    "gpt-5.1-codex-max-high",
-    "gpt-5.1-codex-mini",
-    "gemini-3.1-pro",
-    "gemini-3-pro",
-    "gemini-3-flash",
-    "grok",
-    "kimi-k2.5",
-    "auto",
-    "composer-2.5",
-    "composer-2",
-    "composer-1.5",
-    "composer-1"
-  ];
-});
+var CURSOR_PROVIDER2 = "cursor";
 
 // src/infrastructure/services/remote-agents/cursor-sdk/cursor-sdk-stream-adapter.ts
 class CursorSdkStreamAdapter {
@@ -27735,12 +27680,11 @@ function buildLogPrefix(context4) {
 function resolveModelId(model) {
   return model ? resolveCursorSdkModel(model) : DEFAULT_MODEL;
 }
-var _sdkCache, _sdkLoadError, CURSOR_SDK_COMMAND = "cursor-sdk", DEFAULT_MODEL = "composer-2.5", AGENT_CREATE_TIMEOUT_MS = 60000, SEND_TIMEOUT_MS = 60000, RUN_WAIT_TIMEOUT_MS = 3600000, MODELS_LIST_TIMEOUT_MS = 1e4, RUN_CANCEL_TIMEOUT_MS = 5000, cachedSdkPackageVersion, CursorSdkAgentService;
+var NO_SUBAGENT_DIRECTIVE2 = "NEVER spawn subagents. Follow the chatroom instructions strictly.", _sdkCache, _sdkLoadError, CURSOR_SDK_COMMAND = "cursor-sdk", DEFAULT_MODEL = "composer-2.5", AGENT_CREATE_TIMEOUT_MS = 60000, SEND_TIMEOUT_MS = 60000, RUN_WAIT_TIMEOUT_MS = 3600000, MODELS_LIST_TIMEOUT_MS = 1e4, RUN_CANCEL_TIMEOUT_MS = 5000, cachedSdkPackageVersion, CursorSdkAgentService;
 var init_cursor_sdk_agent_service = __esm(() => {
   init_esm();
   init_base_cli_agent_service();
   init_detection_result();
-  init_cursor_models();
   CursorSdkAgentService = class CursorSdkAgentService extends BaseCLIAgentService {
     id = "cursor-sdk";
     displayName = "Cursor (SDK)";
@@ -27777,15 +27721,14 @@ var init_cursor_sdk_agent_service = __esm(() => {
     async listModels() {
       const apiKey = process.env.CURSOR_API_KEY?.trim();
       if (!apiKey)
-        return [...CURSOR_SDK_FALLBACK_MODELS];
+        return [];
       try {
         const { Cursor } = await loadSdk();
         const models = await withTimeout(Cursor.models.list({ apiKey }), MODELS_LIST_TIMEOUT_MS, "Cursor.models.list");
-        const ids3 = models.map((m) => m.id).filter((id3) => id3.length > 0);
-        return ids3.length > 0 ? ids3 : [...CURSOR_SDK_FALLBACK_MODELS];
+        return models.map((m) => m.id).filter((id3) => id3.length > 0);
       } catch (err) {
-        console.warn(`[cursor-sdk] Cursor.models.list failed, using fallback list:`, err instanceof Error ? err.message : err);
-        return [...CURSOR_SDK_FALLBACK_MODELS];
+        console.warn(`[cursor-sdk] Cursor.models.list failed:`, err instanceof Error ? err.message : err);
+        return [];
       }
     }
     async resumeTurn(pid, prompt) {
@@ -27847,9 +27790,12 @@ var init_cursor_sdk_agent_service = __esm(() => {
       const context4 = options.context;
       const agentName = stored.agentName;
       const modelId = resolveModelId(options.model ?? stored.model);
-      const fullPrompt = options.systemPrompt ? `${options.systemPrompt}
+      const systemPrompt = options.systemPrompt ? `${NO_SUBAGENT_DIRECTIVE2}
 
-${options.prompt}` : options.prompt;
+${options.systemPrompt}` : NO_SUBAGENT_DIRECTIVE2;
+      const fullPrompt = `${systemPrompt}
+
+${options.prompt}`;
       let agent;
       try {
         const { Agent } = await loadSdk();
@@ -27889,7 +27835,17 @@ ${options.prompt}` : options.prompt;
       return keeper;
     }
     startRunningSession(args2) {
-      const { pid, keeper, agent, context: context4, agentName, model, workingDir, initialPrompt, forceFirstTurn } = args2;
+      const {
+        pid,
+        keeper,
+        agent,
+        context: context4,
+        agentName,
+        model,
+        workingDir,
+        initialPrompt,
+        forceFirstTurn
+      } = args2;
       const entry = this.registerProcess(pid, context4);
       const logPrefix = buildLogPrefix(context4);
       const session = {
@@ -28015,7 +27971,7 @@ ${options.prompt}` : options.prompt;
           process.stderr.write(`${logPrefix} spawn-error] ${reason}
 `);
         } finally {
-          if (!session.agentClosed && !session.preserveForResume) {
+          if (!session.agentClosed && session.aborted && !session.preserveForResume) {
             try {
               agent.close();
               session.agentClosed = true;
@@ -28038,16 +27994,19 @@ ${options.prompt}` : options.prompt;
       const context4 = options.context;
       const agentName = buildAgentName(context4);
       const modelId = resolveModelId(options.model);
-      const fullPrompt = options.systemPrompt ? `${options.systemPrompt}
+      const systemPrompt = options.systemPrompt ? `${NO_SUBAGENT_DIRECTIVE2}
 
-${options.prompt}` : options.prompt;
+${options.systemPrompt}` : NO_SUBAGENT_DIRECTIVE2;
+      const fullPrompt = `${systemPrompt}
+
+${options.prompt}`;
       let agent;
       try {
         const { Agent } = await loadSdk();
         agent = await withTimeout(Agent.create({
           apiKey,
           name: agentName,
-          model: { id: modelId },
+          model: { id: modelId, params: [{ id: "fast", value: "false" }] },
           local: { cwd: options.workingDir, settingSources: [] }
         }), AGENT_CREATE_TIMEOUT_MS, "Agent.create");
       } catch (err) {
@@ -83819,7 +83778,7 @@ function isProcessAlive(kill, pid) {
   }
 }
 
-// src/infrastructure/machine/stop-reason.ts
+// src/domain/agent-lifecycle/entities/stop-reason.ts
 function resolveStopReason(code2, signal) {
   if (signal !== null)
     return "agent_process.signal";
@@ -83828,11 +83787,59 @@ function resolveStopReason(code2, signal) {
   return "agent_process.crashed";
 }
 
+// src/domain/agent-lifecycle/policies/preserve-session.ts
+function shouldRetainHarnessSessionForReconnect(reason) {
+  switch (reason) {
+    case "user.stop":
+    case "agent_process.exited_clean":
+    case "agent_process.signal":
+    case "agent_process.crashed":
+      return true;
+    default:
+      return false;
+  }
+}
+function shouldPreserveHarnessTeardown(reason, supportsSessionResume, hasHarnessSessionId) {
+  return hasHarnessSessionId && supportsSessionResume && shouldRetainHarnessSessionForReconnect(reason);
+}
+
+// src/domain/agent-lifecycle/policies/decide-resume-path.ts
+function decideResumePathOnRestart(input) {
+  if (!input.supportsSessionResume) {
+    return "cold";
+  }
+  if (input.wantResume && input.hasStoredSnapshot) {
+    return "daemon_memory";
+  }
+  return "cold";
+}
+function shouldAutoRestartAfterProcessExit(stopReason) {
+  switch (stopReason) {
+    case "user.stop":
+    case "platform.team_switch":
+    case "daemon.shutdown":
+    case "daemon.respawn":
+      return false;
+    default:
+      return true;
+  }
+}
+
+// src/domain/agent-lifecycle/index.ts
+var init_agent_lifecycle = () => {};
+
 // ../../services/backend/src/domain/entities/harness/claude.config.ts
 var claudeCapabilities;
 var init_claude_config = __esm(() => {
   claudeCapabilities = {
-    supportsSessionResume: false
+    runtimeKind: "cli",
+    supportsSessionResume: false,
+    lifecycle: {
+      turnCompleted: false,
+      outputActivity: true,
+      processExited: true
+    },
+    wireEvents: []
   };
 });
 
@@ -83840,7 +83847,14 @@ var init_claude_config = __esm(() => {
 var commandcodeCapabilities;
 var init_commandcode_config = __esm(() => {
   commandcodeCapabilities = {
-    supportsSessionResume: false
+    runtimeKind: "cli",
+    supportsSessionResume: false,
+    lifecycle: {
+      turnCompleted: true,
+      outputActivity: true,
+      processExited: true
+    },
+    wireEvents: ["wire.log.agent_end"]
   };
 });
 
@@ -83848,7 +83862,14 @@ var init_commandcode_config = __esm(() => {
 var copilotCapabilities;
 var init_copilot_config = __esm(() => {
   copilotCapabilities = {
-    supportsSessionResume: false
+    runtimeKind: "cli",
+    supportsSessionResume: false,
+    lifecycle: {
+      turnCompleted: true,
+      outputActivity: true,
+      processExited: true
+    },
+    wireEvents: ["wire.log.agent_end"]
   };
 });
 
@@ -83856,7 +83877,14 @@ var init_copilot_config = __esm(() => {
 var cursorCapabilities;
 var init_cursor_config = __esm(() => {
   cursorCapabilities = {
-    supportsSessionResume: false
+    runtimeKind: "cli",
+    supportsSessionResume: false,
+    lifecycle: {
+      turnCompleted: true,
+      outputActivity: true,
+      processExited: true
+    },
+    wireEvents: ["wire.log.agent_end"]
   };
 });
 
@@ -83864,7 +83892,14 @@ var init_cursor_config = __esm(() => {
 var cursorSdkCapabilities;
 var init_cursor_sdk_config = __esm(() => {
   cursorSdkCapabilities = {
-    supportsSessionResume: true
+    runtimeKind: "sdk",
+    supportsSessionResume: true,
+    lifecycle: {
+      turnCompleted: true,
+      outputActivity: true,
+      processExited: true
+    },
+    wireEvents: ["sdk.cursor.message", "sdk.cursor.run.completed", "wire.log.agent_end"]
   };
 });
 
@@ -83872,7 +83907,14 @@ var init_cursor_sdk_config = __esm(() => {
 var opencodeCapabilities;
 var init_opencode_config = __esm(() => {
   opencodeCapabilities = {
-    supportsSessionResume: false
+    runtimeKind: "cli",
+    supportsSessionResume: false,
+    lifecycle: {
+      turnCompleted: false,
+      outputActivity: true,
+      processExited: true
+    },
+    wireEvents: []
   };
 });
 
@@ -83880,7 +83922,14 @@ var init_opencode_config = __esm(() => {
 var opencodeSdkCapabilities;
 var init_opencode_sdk_config = __esm(() => {
   opencodeSdkCapabilities = {
-    supportsSessionResume: true
+    runtimeKind: "sdk",
+    supportsSessionResume: true,
+    lifecycle: {
+      turnCompleted: true,
+      outputActivity: true,
+      processExited: true
+    },
+    wireEvents: ["sdk.opencode.session.idle", "sdk.opencode.session.event"]
   };
 });
 
@@ -83888,7 +83937,22 @@ var init_opencode_sdk_config = __esm(() => {
 var piCapabilities;
 var init_pi_config = __esm(() => {
   piCapabilities = {
-    supportsSessionResume: true
+    runtimeKind: "cli",
+    supportsSessionResume: true,
+    lifecycle: {
+      turnCompleted: true,
+      outputActivity: true,
+      processExited: true
+    },
+    wireEvents: [
+      "wire.ndjson.agent_start",
+      "wire.ndjson.agent_end",
+      "wire.ndjson.message_update",
+      "wire.ndjson.tool_execution_start",
+      "wire.ndjson.tool_execution_end",
+      "wire.ndjson.get_state",
+      "wire.log.agent_end"
+    ]
   };
 });
 
@@ -84010,11 +84074,11 @@ class AgentProcessManager {
     const key = agentKey2(opts.chatroomId, opts.role);
     const slot = this.slots.get(key);
     if (slot?.resumeInFlight) {
-      console.log(`[AgentProcessManager] agent_end: skipping duplicate resume for ${opts.role} (resume already in flight)`);
+      console.log(`[AgentProcessManager] lifecycle.turn.completed: skipping duplicate resume for ${opts.role} (resume already in flight)`);
       return;
     }
     const capabilities = getHarnessCapabilities(opts.harness);
-    console.log(`[AgentProcessManager] agent_end: role=${opts.role} pid=${opts.pid} harness=${opts.harness} supportsResume=${capabilities.supportsSessionResume}`);
+    console.log(`[AgentProcessManager] lifecycle.turn.completed: role=${opts.role} pid=${opts.pid} harness=${opts.harness} supportsResume=${capabilities.supportsSessionResume}`);
     if (capabilities.supportsSessionResume) {
       const service = this.deps.agentServices.get(opts.harness);
       if (service?.resumeTurn) {
@@ -84082,6 +84146,18 @@ class AgentProcessManager {
     const harness = slot.harness;
     const model = slot.model;
     const workingDir = slot.workingDir;
+    const harnessSessionId = slot.harnessSessionId;
+    if (harness && harnessSessionId && getHarnessCapabilities(harness).supportsSessionResume && shouldRetainHarnessSessionForReconnect(stopReason)) {
+      const service = this.deps.agentServices.get(harness);
+      const harnessMeta = service ? this.readHarnessReconnectMetadata(service, opts.pid) : undefined;
+      this.recordLastHarnessSession(key, {
+        harnessSessionId,
+        harness,
+        agentName: harnessMeta?.agentName ?? "",
+        workingDir: workingDir ?? "",
+        model: model ?? harnessMeta?.model
+      });
+    }
     slot.state = "idle";
     slot.pid = undefined;
     slot.startedAt = undefined;
@@ -84108,13 +84184,10 @@ class AgentProcessManager {
     for (const service of this.deps.agentServices.values()) {
       service.untrack(opts.pid);
     }
-    const isIntentionalStop = stopReason === "user.stop" || stopReason === "platform.team_switch" || stopReason === "daemon.shutdown";
-    const isDaemonRespawn = stopReason === "daemon.respawn";
-    if (isIntentionalStop) {
-      this.deps.crashLoop.clear(opts.chatroomId, opts.role);
-      return;
-    }
-    if (isDaemonRespawn) {
+    if (!shouldAutoRestartAfterProcessExit(stopReason)) {
+      if (stopReason === "user.stop" || stopReason === "platform.team_switch" || stopReason === "daemon.shutdown") {
+        this.deps.crashLoop.clear(opts.chatroomId, opts.role);
+      }
       return;
     }
     if (!harness || !workingDir) {
@@ -84473,7 +84546,12 @@ class AgentProcessManager {
         return { success: false, error: `Unknown agent harness: ${opts.agentHarness}` };
       }
       let spawnResult;
-      if (wantResume) {
+      const resumePath = decideResumePathOnRestart({
+        supportsSessionResume: getHarnessCapabilities(opts.agentHarness).supportsSessionResume,
+        wantResume,
+        hasStoredSnapshot: this.lastHarnessSessions.has(key)
+      });
+      if (resumePath === "daemon_memory") {
         spawnResult = await this.tryDaemonMemoryResume({
           key,
           chatroomId: opts.chatroomId,
@@ -84590,7 +84668,8 @@ class AgentProcessManager {
     try {
       const harness = slot.harness;
       const service = harness ? this.deps.agentServices.get(harness) : undefined;
-      const preserveForResume = opts.reason === "user.stop" && Boolean(slot.harnessSessionId);
+      const supportsResume = harness ? getHarnessCapabilities(harness).supportsSessionResume : false;
+      const preserveForResume = shouldPreserveHarnessTeardown(opts.reason, supportsResume, Boolean(slot.harnessSessionId));
       if (harness && slot.harnessSessionId) {
         if (preserveForResume) {
           const harnessMeta = service ? this.readHarnessReconnectMetadata(service, pid) : undefined;
@@ -84668,6 +84747,7 @@ var AGENT_EXIT_RETRY_INTERVAL_MS = 1e4;
 var init_agent_process_manager = __esm(() => {
   init_orphan_tracker();
   init_api3();
+  init_agent_lifecycle();
   init_types();
   init_generator();
 });
@@ -87367,4 +87447,4 @@ program2.hook("preAction", async (_thisCommand, actionCommand) => {
 });
 program2.parse();
 
-//# debugId=C18F126578765BC664756E2164756E21
+//# debugId=9CE84CC04C561C2A64756E2164756E21