linkshell-cli 0.2.125 → 0.3.0

package/src/providers.ts

@@ -1,8 +1,7 @@
 import { accessSync, constants, existsSync } from "node:fs";
-import { delimiter, join } from "node:path";
-import type { TerminalProvider } from "@linkshell/protocol";
+import { basename, delimiter, join } from "node:path";
 
-export type ProviderName = TerminalProvider;
+export type ProviderName = "shell";
 
 export interface ProviderConfig {
   provider: ProviderName;
@@ -11,6 +10,8 @@ export interface ProviderConfig {
   env: NodeJS.ProcessEnv;
 }
 
+export type ShellConfig = ProviderConfig;
+
 function stripOuterQuotes(value: string): string {
   const trimmed = value.trim();
   if (
@@ -65,125 +66,42 @@ function which(bin: string): string | undefined {
   return undefined;
 }
 
-function resolveClaudeProvider(input: {
-  command?: string;
-  args: string[];
-}): ProviderConfig {
-  const command = input.command ?? "claude";
-  const resolved = which(command);
-  if (!resolved) {
-    throw new Error(
-      `Claude CLI not found ("${command}"). Install it with: npm install -g @anthropic-ai/claude-code`,
-    );
-  }
-
-  // Claude starts an interactive REPL by default — that's exactly what we want in the PTY.
-  // Pass through any extra args the user provided.
-  return {
-    provider: "claude",
-    command: resolved,
-    args: input.args,
-    env: { ...process.env },
-  };
+function shellSupportsLoginArg(command: string): boolean {
+  const name = basename(command).toLowerCase();
+  return ["bash", "zsh", "sh", "fish"].includes(name);
 }
 
-function resolveCodexProvider(input: {
+export function resolveShellConfig(input: {
   command?: string;
-  args: string[];
-}): ProviderConfig {
-  const command = input.command ?? "codex";
-  const resolved = which(command);
-  if (!resolved) {
-    throw new Error(
-      `Codex CLI not found ("${command}"). Install it with: npm install -g @openai/codex`,
-    );
-  }
-
-  if (!process.env.OPENAI_API_KEY) {
-    process.stderr.write(
-      "[warn] OPENAI_API_KEY not set — Codex may fail to authenticate\n",
-    );
-  }
+  args?: string[];
+} = {}): ShellConfig {
+  const configuredShell = input.command ?? process.env.SHELL ?? (process.platform === "darwin" ? "/bin/zsh" : undefined);
+  const command = configuredShell ?? (process.platform === "win32" ? "cmd.exe" : "sh");
+  const resolved = which(command) ?? command;
+  const passthrough = input.args ?? [];
+  const args = passthrough.length > 0
+    ? passthrough
+    : shellSupportsLoginArg(resolved)
+      ? ["-l"]
+      : [];
 
   return {
-    provider: "codex",
+    provider: "shell",
     command: resolved,
-    args: input.args,
+    args,
     env: { ...process.env },
   };
 }
 
-function resolveGeminiProvider(input: {
+export function resolveProviderConfig(input: {
+  provider?: string;
   command?: string;
   args: string[];
 }): ProviderConfig {
-  const command = input.command ?? "gemini";
-  const resolved = which(command);
-  if (!resolved) {
-    throw new Error(
-      `Gemini CLI not found ("${command}"). Install it with: npm install -g @anthropic-ai/gemini-cli or check https://github.com/anthropics/gemini-cli`,
-    );
-  }
-
-  if (!process.env.GOOGLE_API_KEY && !process.env.GEMINI_API_KEY) {
+  if (input.provider && input.provider !== "shell") {
     process.stderr.write(
-      "[warn] GOOGLE_API_KEY / GEMINI_API_KEY not set — Gemini may fail to authenticate\n",
+      `[warn] terminal provider "${input.provider}" is ignored in protocol v2; starting the system shell instead\n`,
     );
   }
-
-  return {
-    provider: "gemini",
-    command: resolved,
-    args: input.args,
-    env: { ...process.env },
-  };
-}
-
-function resolveCopilotProvider(input: {
-  command?: string;
-  args: string[];
-}): ProviderConfig {
-  const command = input.command ?? "github-copilot";
-  const resolved = which(command);
-  if (!resolved) {
-    throw new Error(
-      `GitHub Copilot CLI not found ("${command}").`,
-    );
-  }
-
-  return {
-    provider: "copilot",
-    command: resolved,
-    args: input.args,
-    env: { ...process.env },
-  };
-}
-
-export function resolveProviderConfig(input: {
-  provider: ProviderName;
-  command?: string;
-  args: string[];
-}): ProviderConfig {
-  switch (input.provider) {
-    case "claude":
-      return resolveClaudeProvider(input);
-    case "codex":
-      return resolveCodexProvider(input);
-    case "gemini":
-      return resolveGeminiProvider(input);
-    case "copilot":
-      return resolveCopilotProvider(input);
-    case "custom": {
-      if (!input.command) {
-        throw new Error("custom provider requires --command");
-      }
-      const resolved = which(input.command);
-      return {
-        provider: "custom",
-        command: resolved ?? input.command,
-        args: input.args,
-        env: { ...process.env },
-      };
-    }
-  }
+  return resolveShellConfig({ command: input.command, args: input.args });
 }

package/src/runtime/acp/agent-workspace.ts

@@ -764,8 +764,6 @@ interface ProviderRuntimeCapabilities {
 }
 
 const ALL_REASONING_EFFORTS = ["none", "minimal", "low", "medium", "high", "xhigh"] as const;
-const ALL_PERMISSION_MODES = ["read_only", "workspace_write", "full_access"] as const;
-const CODEX_COMMAND_NAMES = ["plan", "exit-plan", "compact", "clear", "status", "review", "subagents"] as const;
 const CLAUDE_REMOTE_HIDDEN_COMMANDS = new Set([
   "add-dir",
   "agents",
@@ -1039,56 +1037,16 @@ function customClaudeCommands(cwd: string): AgentCommandDescriptor[] {
 function defaultProviderCommands(provider: AgentProvider, cwd: string, enabled: boolean): AgentCommandDescriptor[] {
   const disabledReason = enabled ? undefined : `${providerLabel(provider)} 未安装或启动失败`;
   if (provider === "codex") {
-    return CODEX_COMMAND_NAMES.map((name) => makeCommand({
-      provider,
-      name,
-      source: "linkshell",
-      category: name === "plan" || name === "exit-plan" ? "Modes" : "Codex",
-      description: {
-        "plan": "Enter Codex plan mode",
-        "exit-plan": "Exit Codex plan mode",
-        compact: "Compact the current thread",
-        clear: "Start a fresh Codex thread",
-        status: "Show LinkShell agent status",
-        review: "Ask Codex to review local changes",
-        subagents: "Insert a delegation prompt",
-      }[name],
-      argsMode: name === "review" || name === "subagents" ? "optional" : "none",
-      destructive: name === "clear",
-      disabledReason,
-      executionKind: name === "review" || name === "subagents" ? "prompt" : "native",
-    }));
+    return [];
   }
   if (provider === "claude") {
-    const builtIns = CLAUDE_BUILT_IN_COMMANDS
-      .filter((entry) => isClaudeRemoteFriendlyCommand(entry.name))
-      .map((entry) => makeCommand({
-        provider,
-        name: entry.name,
-        description: entry.description,
-        argsMode: entry.argsMode,
-        destructive: entry.destructive,
-        disabledReason,
-        executionKind: "prompt",
-      }));
     const custom = customClaudeCommands(cwd).map((command) => ({
       ...command,
       disabledReason: command.disabledReason ?? disabledReason,
     }));
-    return [...builtIns, ...custom];
+    return custom;
   }
-  return [
-    makeCommand({
-      provider,
-      name: "status",
-      source: "linkshell",
-      category: "LinkShell",
-      description: "Show LinkShell agent status",
-      argsMode: "none",
-      disabledReason,
-      executionKind: "native",
-    }),
-  ];
+  return [];
 }
 
 function mergeCommands(...groups: Array<AgentCommandDescriptor[] | undefined>): AgentCommandDescriptor[] {
@@ -1265,7 +1223,7 @@ export class AgentWorkspaceProxy {
 
   constructor(
     private readonly input: {
-      sessionId: string;
+      hostDeviceId: string;
       cwd: string;
       availableProviders: AgentProvider[];
       command?: string;
@@ -1293,7 +1251,7 @@ export class AgentWorkspaceProxy {
         );
         this.input.send(createEnvelope({
           type: "agent.v2.conversation.list.result",
-          sessionId: this.input.sessionId,
+          hostDeviceId: this.input.hostDeviceId,
           payload: { conversations },
         }));
         break;
@@ -1541,17 +1499,14 @@ export class AgentWorkspaceProxy {
         supportsPermission,
         supportsPlan: enabled,
         supportsCancel: enabled,
-        models: runtimeCapabilities?.models ?? [{ id: "default", label: "默认模型" }],
-        defaultModel: runtimeCapabilities?.defaultModel ?? "default",
+        models: runtimeCapabilities?.models,
+        defaultModel: runtimeCapabilities?.defaultModel,
         reasoningEfforts: supportsReasoningEffort
-          ? runtimeCapabilities?.reasoningEfforts ?? [...ALL_REASONING_EFFORTS]
+          ? runtimeCapabilities?.reasoningEfforts ?? []
           : [],
-        permissionModes: supportsPermission ? [...ALL_PERMISSION_MODES] : [],
+        permissionModes: [],
         commands,
-        modes: runtimeCapabilities?.modes ?? (provider === "codex" ? [
-          { id: "default", title: "Default", description: "Run normal implementation turns" },
-          { id: "plan", title: "Plan", description: "Discuss and produce an implementation plan first" },
-        ] : []),
+        modes: runtimeCapabilities?.modes ?? [],
         currentMode,
         features: {
           images: supportsImages,
@@ -1567,7 +1522,7 @@ export class AgentWorkspaceProxy {
     const anyPermission = providers.some((p) => p.supportsPermission);
     this.input.send(createEnvelope({
       type: "agent.v2.capabilities",
-      sessionId: this.input.sessionId,
+      hostDeviceId: this.input.hostDeviceId,
       payload: {
         enabled: anyEnabled,
         provider: this.input.availableProviders[0] ?? "codex",
@@ -1629,7 +1584,7 @@ export class AgentWorkspaceProxy {
       this.activeConversationId = existingConversation.id;
       this.input.send(createEnvelope({
         type: "agent.v2.conversation.opened",
-        sessionId: this.input.sessionId,
+        hostDeviceId: this.input.hostDeviceId,
         payload: {
           conversation: existingConversation,
           snapshot: this.timelines.get(existingConversation.id) ?? [],
@@ -1668,7 +1623,7 @@ export class AgentWorkspaceProxy {
       this.timelines.set(conversation.id, this.timelines.get(conversation.id) ?? []);
       this.input.send(createEnvelope({
         type: "agent.v2.conversation.opened",
-        sessionId: this.input.sessionId,
+        hostDeviceId: this.input.hostDeviceId,
         payload: { conversation, snapshot: this.timelines.get(conversation.id) ?? [] },
       }));
       return conversation;
@@ -1720,7 +1675,7 @@ export class AgentWorkspaceProxy {
     });
     this.input.send(createEnvelope({
       type: "agent.v2.conversation.opened",
-      sessionId: this.input.sessionId,
+      hostDeviceId: this.input.hostDeviceId,
       payload: { conversation, snapshot: this.timelines.get(conversation.id) ?? [] },
     }));
     return conversation;
@@ -2678,7 +2633,7 @@ export class AgentWorkspaceProxy {
     this.upsertItem(conversationId, item);
     this.input.send(createEnvelope({
       type: "agent.v2.permission.request",
-      sessionId: this.input.sessionId,
+      hostDeviceId: this.input.hostDeviceId,
       payload: { conversationId, ...permission, item },
     }));
 
@@ -2956,7 +2911,7 @@ export class AgentWorkspaceProxy {
     const conversation = this.conversations.get(conversationId);
     this.input.send(createEnvelope({
       type: "agent.v2.event",
-      sessionId: this.input.sessionId,
+      hostDeviceId: this.input.hostDeviceId,
       payload: { conversationId, conversation, item },
     }));
   }
@@ -2964,7 +2919,7 @@ export class AgentWorkspaceProxy {
   private emitConversation(conversation: AgentConversation): void {
     this.input.send(createEnvelope({
       type: "agent.v2.event",
-      sessionId: this.input.sessionId,
+      hostDeviceId: this.input.hostDeviceId,
       payload: { conversationId: conversation.id, conversation },
     }));
   }
@@ -3013,7 +2968,7 @@ export class AgentWorkspaceProxy {
       : [...this.timelines.values()].flat();
     this.input.send(createEnvelope({
       type: "agent.v2.snapshot",
-      sessionId: this.input.sessionId,
+      hostDeviceId: this.input.hostDeviceId,
       payload: {
         conversations,
         activeConversationId: this.activeConversationId,