linkshell-cli 0.2.120 → 0.2.122

package/src/runtime/acp/claude-stream-json-client.ts

@@ -222,10 +222,21 @@ export class ClaudeStreamJsonClient {
       let currentToolId: string | undefined;
       let currentToolName: string | undefined;
       let currentMessageId: string | undefined;
+      const progressItemId = `claude-progress:${input.clientMessageId}`;
       // Map tool_use_id → tool_name so tool_result can look up the correct name
       // even when multiple tools are in flight
       const toolNames = new Map<string, string>();
 
+      this.input.onNotification("item/started", {
+        sessionId: input.sessionId ?? this.claudeSessionId,
+        item: {
+          id: progressItemId,
+          type: "thinking",
+          text: "Claude 正在处理请求",
+          status: "running",
+        },
+      });
+
       rl.on("line", (line: string) => {
         if (this.pendingCancel) {
           child.kill("SIGTERM");
@@ -375,6 +386,16 @@ export class ClaudeStreamJsonClient {
           }
 
           case "result": {
+            const isError = event.subtype === "error" || event.is_error === true;
+            this.input.onNotification("item/completed", {
+              sessionId: this.claudeSessionId ?? input.sessionId,
+              item: {
+                id: progressItemId,
+                type: "thinking",
+                text: isError ? "Claude 运行出错" : "Claude 已完成",
+                status: isError ? "failed" : "completed",
+              },
+            });
             // Mark the last agent message as complete so isStreaming flips to false
             if (currentMessageId) {
               this.input.onNotification("item/completed", {
@@ -387,7 +408,6 @@ export class ClaudeStreamJsonClient {
               });
             }
             // Turn complete
-            const isError = event.subtype === "error" || event.is_error === true;
             this.input.onNotification("turn/completed", {
               sessionId: this.claudeSessionId,
               stopReason: event.stop_reason ?? (isError ? "error" : "end_turn"),
@@ -408,11 +428,29 @@ export class ClaudeStreamJsonClient {
       });
 
       child.on("error", (err) => {
+        this.input.onNotification("item/completed", {
+          sessionId: this.claudeSessionId ?? input.sessionId,
+          item: {
+            id: progressItemId,
+            type: "thinking",
+            text: "Claude 运行出错",
+            status: "failed",
+          },
+        });
         finish(err, undefined);
       });
 
       child.on("exit", (code, signal) => {
         if (!settled) {
+          this.input.onNotification("item/completed", {
+            sessionId: this.claudeSessionId ?? input.sessionId,
+            item: {
+              id: progressItemId,
+              type: "thinking",
+              text: this.pendingCancel ? "Claude 已停止" : "Claude 意外退出",
+              status: "failed",
+            },
+          });
           finish(
             new Error(`Claude exited unexpectedly (code=${code ?? "null"}, signal=${signal ?? "null"})`),
             undefined,

package/src/runtime/bridge-session.ts

@@ -1138,7 +1138,7 @@ export class BridgeSession {
       hookPort = result.port;
       hookConfigPaths.push(result.configPath);
       // Also set up hooks for other providers (curlCmd already has marker from setupHookServer)
-      const curlCmd = `curl -s -X POST "http://127.0.0.1:${result.port}/hook?m=${hookMarker}&lid=$LINKSHELL_ID" -H 'Content-Type: application/json' --data-binary @-`;
+      const curlCmd = `curl -s --connect-timeout 1 --max-time ${Math.ceil((PERMISSION_REQUEST_TIMEOUT_MS + 30_000) / 1000)} -X POST "http://127.0.0.1:${result.port}/hook?m=${hookMarker}&lid=$LINKSHELL_ID" -H 'Content-Type: application/json' --data-binary @- || true`;
       hookConfigPaths.push(this.setupCodexHooks(terminalId, curlCmd, hookMarker));
       hookConfigPaths.push(this.setupGeminiHooks(terminalId, curlCmd, hookMarker));
       hookConfigPaths.push(this.setupCopilotHooks(terminalId, curlCmd, hookMarker));
@@ -1317,7 +1317,7 @@ export class BridgeSession {
     });
     this.log(`hook server for ${terminalId} (${provider}) listening on port ${port}, marker=${marker}`);
 
-    const curlCmd = `curl -s -X POST "http://127.0.0.1:${port}/hook?m=${marker}&lid=$LINKSHELL_ID" -H 'Content-Type: application/json' --data-binary @-`;
+    const curlCmd = `curl -s --connect-timeout 1 --max-time ${Math.ceil((PERMISSION_REQUEST_TIMEOUT_MS + 30_000) / 1000)} -X POST "http://127.0.0.1:${port}/hook?m=${marker}&lid=$LINKSHELL_ID" -H 'Content-Type: application/json' --data-binary @- || true`;
     let configPath: string;
 
     if (provider === "codex") {
@@ -1338,7 +1338,7 @@ export class BridgeSession {
     const term = this.terminals.get(DEFAULT_TERMINAL_ID);
     if (!term?.hookPort) return;
     const marker = term.hookMarker;
-    const curlCmd = `curl -s -X POST "http://127.0.0.1:${term.hookPort}/hook?m=${marker}&lid=$LINKSHELL_ID" -H 'Content-Type: application/json' --data-binary @-`;
+    const curlCmd = `curl -s --connect-timeout 1 --max-time ${Math.ceil((PERMISSION_REQUEST_TIMEOUT_MS + 30_000) / 1000)} -X POST "http://127.0.0.1:${term.hookPort}/hook?m=${marker}&lid=$LINKSHELL_ID" -H 'Content-Type: application/json' --data-binary @- || true`;
     const providers = this.options.agentProvider
       ? [normalizeAgentProvider(this.options.agentProvider)]
       : detectAvailableProviders();