linkshell-cli 0.2.32 → 0.2.34

package/src/runtime/bridge-session.ts

@@ -15,6 +15,7 @@ import {
 import type { Envelope } from "@linkshell/protocol";
 import type { ProviderConfig } from "../providers.js";
 import { ScrollbackBuffer } from "./scrollback.js";
+import { AcpRelay } from "./acp-relay.js";
 import { ScreenFallback } from "./screen-fallback.js";
 import { ScreenShare } from "./screen-share.js";
 import { getLanIp } from "../utils/lan-ip.js";
@@ -41,7 +42,9 @@ const DEFAULT_TERMINAL_ID = "default";
 
 interface TerminalInstance {
   id: string;
-  pty: pty.IPty;
+  pty: pty.IPty | null;
+  acpRelay: AcpRelay | null;
+  mode: "pty" | "acp";
   cwd: string;
   projectName: string;
   provider: string;
@@ -281,21 +284,29 @@ export class BridgeSession {
       case "terminal.input": {
         const p = parseTypedPayload("terminal.input", envelope.payload);
         const term = this.terminals.get(tid);
-        if (term && term.status === "running") term.pty.write(p.data);
+        if (term && term.status === "running" && term.pty) term.pty.write(p.data);
         break;
       }
       case "terminal.resize": {
         const p = parseTypedPayload("terminal.resize", envelope.payload);
         const term = this.terminals.get(tid);
-        if (term && term.status === "running") term.pty.resize(p.cols, p.rows);
+        if (term && term.status === "running" && term.pty) term.pty.resize(p.cols, p.rows);
+        break;
+      }
+      case "acp.rpc": {
+        const term = this.terminals.get(tid);
+        if (term && term.status === "running" && term.acpRelay) {
+          term.acpRelay.write(envelope.payload);
+        }
         break;
       }
       case "terminal.spawn": {
         const p = parseTypedPayload("terminal.spawn", envelope.payload);
         const normalizedCwd = resolve(p.cwd);
-        // Dedup: if a running terminal already exists for this cwd, return it
+        const mode = p.mode ?? "pty";
+        // Dedup: if a running terminal already exists for this cwd and mode, return it
         const existing = [...this.terminals.values()].find(
-          (t) => t.status === "running" && resolve(t.cwd) === normalizedCwd,
+          (t) => t.status === "running" && resolve(t.cwd) === normalizedCwd && t.mode === mode,
         );
         if (existing) {
           this.send(createEnvelope({
@@ -307,7 +318,7 @@ export class BridgeSession {
         } else {
           const newId = `term-${Date.now()}-${Math.random().toString(36).slice(2, 6)}`;
           try {
-            await this.spawnTerminal(newId, normalizedCwd, p.provider);
+            await this.spawnTerminal(newId, normalizedCwd, p.provider, mode);
             this.send(createEnvelope({
               type: "terminal.spawned",
               sessionId: this.sessionId,
@@ -331,7 +342,8 @@ export class BridgeSession {
         const p = parseTypedPayload("terminal.kill", envelope.payload);
         const term = this.terminals.get(p.terminalId);
         if (term && term.status === "running") {
-          term.pty.kill();
+          if (term.pty) term.pty.kill();
+          if (term.acpRelay) term.acpRelay.kill();
         }
         break;
       }
@@ -413,7 +425,7 @@ export class BridgeSession {
         writeFileSync(tempPath, Buffer.from(p.data, "base64"));
         this.log(`image saved to ${tempPath}`);
         const term = this.terminals.get(tid);
-        if (term && term.status === "running") {
+        if (term && term.status === "running" && term.pty) {
           term.pty.write(`\x1b[200~${tempPath}\x1b[201~`);
         }
         break;
@@ -430,6 +442,7 @@ export class BridgeSession {
       projectName: t.projectName,
       provider: t.provider,
       status: t.status,
+      mode: t.mode,
     }));
     this.send(createEnvelope({
       type: "terminal.list",
@@ -460,7 +473,7 @@ export class BridgeSession {
     }
   }
 
-  private async spawnTerminal(terminalId: string, cwd: string, providerOverride?: string): Promise<void> {
+  private async spawnTerminal(terminalId: string, cwd: string, providerOverride?: string, mode: "pty" | "acp" = "pty"): Promise<void> {
     const cleanEnv: Record<string, string> = {};
     for (const [k, v] of Object.entries(this.options.providerConfig.env)) {
       if (v !== undefined) cleanEnv[k] = v;
@@ -469,6 +482,58 @@ export class BridgeSession {
     const provider = providerOverride ?? this.options.providerConfig.provider;
     const args = [...this.options.providerConfig.args];
 
+    // ACP mode: spawn as child process with JSON-RPC over stdio
+    if (mode === "acp") {
+      const term: TerminalInstance = {
+        id: terminalId,
+        pty: null,
+        acpRelay: new AcpRelay({
+          command: this.options.providerConfig.command,
+          args,
+          cwd,
+          env: cleanEnv,
+          sessionId: this.sessionId,
+          terminalId,
+          send: (envelope) => this.send(envelope),
+          log: (msg) => this.log(msg),
+        }),
+        mode: "acp",
+        cwd,
+        projectName: basename(cwd),
+        provider,
+        scrollback: new ScrollbackBuffer(1000),
+        outputSeq: 0,
+        statusSeq: 0,
+        status: "running",
+      };
+
+      term.acpRelay!.onExit((exitCode, signal) => {
+        term.status = "exited";
+        this.send(createEnvelope({
+          type: "terminal.exit",
+          sessionId: this.sessionId,
+          terminalId,
+          payload: { exitCode, signal: signal ? parseInt(signal, 10) || 0 : 0 },
+        }));
+        this.sendTerminalList();
+
+        const allExited = [...this.terminals.values()].every((t) => t.status === "exited");
+        if (allExited) {
+          this.exited = true;
+          setTimeout(() => {
+            this.stopHeartbeat();
+            this.socket?.close();
+          }, 500);
+          process.exitCode = exitCode ?? 0;
+        }
+      });
+
+      this.terminals.set(terminalId, term);
+      this.log(`spawned ACP terminal ${terminalId} in ${cwd}`);
+      return;
+    }
+
+    // PTY mode: existing behavior
     // Set up hook server for structured status (all supported providers)
     // For "custom" shell, set up hooks for all providers since user may launch any of them
     let hookServer: http.Server | undefined;
@@ -505,6 +570,8 @@ export class BridgeSession {
           env: cleanEnv,
         },
       ),
+      acpRelay: null,
+      mode: "pty",
       cwd,
       projectName: basename(cwd),
       provider,
@@ -517,7 +584,7 @@ export class BridgeSession {
       hookConfigPath,
     };
 
-    term.pty.onData((data) => {
+    term.pty!.onData((data) => {
       const seq = term.outputSeq++;
       const envelope = createEnvelope({
         type: "terminal.output",
@@ -536,7 +603,7 @@ export class BridgeSession {
       this.send(envelope);
     });
 
-    term.pty.onExit(({ exitCode, signal }) => {
+    term.pty!.onExit(({ exitCode, signal }) => {
       term.status = "exited";
       this.cleanupHookServer(term);
       this.send(createEnvelope({
@@ -776,8 +843,15 @@ export class BridgeSession {
       if (detectedProvider !== "custom") {
         hookTerm.provider = detectedProvider;
         this.log(`detected provider for ${terminalId}: ${detectedProvider}`);
+        this.permissionStacks.delete(terminalId);
         this.sendTerminalList();
       }
+    } else if (hookTerm && hookTerm.provider !== "custom" && detectedProvider !== hookTerm.provider) {
+      // Provider switched mid-session (e.g., user exited claude and started codex)
+      hookTerm.provider = detectedProvider;
+      this.log(`provider switched for ${terminalId}: ${detectedProvider}`);
+      this.permissionStacks.delete(terminalId);
+      this.sendTerminalList();
     }
 
     // Normalize hook event names from different providers to unified names
@@ -1117,7 +1191,10 @@ export class BridgeSession {
     this.socket = undefined;
     for (const term of this.terminals.values()) {
       this.cleanupHookServer(term);
-      if (term.status === "running") term.pty.kill();
+      if (term.status === "running") {
+        if (term.pty) term.pty.kill();
+        if (term.acpRelay) term.acpRelay.kill();
+      }
     }
     this.terminals.clear();
     process.exitCode = exitCode;