linkshell-cli 0.8.2 → 0.10.0

package/dist/wire/src/updates.d.ts

@@ -312,7 +312,7 @@ export declare const sessionConfigOptionSchema: z.ZodObject<{
     }[];
     id: string;
     name: string;
-    category: "other" | "model" | "mode" | "effort";
+    category: "mode" | "other" | "model" | "effort";
     current: string;
 }, {
     values: {
@@ -323,7 +323,7 @@ export declare const sessionConfigOptionSchema: z.ZodObject<{
     id: string;
     name: string;
     current: string;
-    category?: "other" | "model" | "mode" | "effort" | undefined;
+    category?: "mode" | "other" | "model" | "effort" | undefined;
 }>;
 export type SessionConfigOption = z.infer<typeof sessionConfigOptionSchema>;
 export declare const sessionUpdateSchema: z.ZodDiscriminatedUnion<"sessionUpdate", [z.ZodObject<{
@@ -795,7 +795,7 @@ export declare const sessionUpdateSchema: z.ZodDiscriminatedUnion<"sessionUpdate
     }>]>>;
 }, "strip", z.ZodTypeAny, {
     status: "failed" | "pending" | "in_progress" | "completed";
-    kind: "read" | "edit" | "delete" | "move" | "search" | "execute" | "think" | "fetch" | "other";
+    kind: "search" | "read" | "edit" | "delete" | "move" | "execute" | "think" | "fetch" | "other";
     title: string;
     toolCallId: string;
     sessionUpdate: "tool_call";
@@ -868,7 +868,7 @@ export declare const sessionUpdateSchema: z.ZodDiscriminatedUnion<"sessionUpdate
     }[] | undefined;
 }, {
     status: "failed" | "pending" | "in_progress" | "completed";
-    kind: "read" | "edit" | "delete" | "move" | "search" | "execute" | "think" | "fetch" | "other";
+    kind: "search" | "read" | "edit" | "delete" | "move" | "execute" | "think" | "fetch" | "other";
     title: string;
     toolCallId: string;
     sessionUpdate: "tool_call";
@@ -1430,7 +1430,7 @@ export declare const sessionUpdateSchema: z.ZodDiscriminatedUnion<"sessionUpdate
         }[];
         id: string;
         name: string;
-        category: "other" | "model" | "mode" | "effort";
+        category: "mode" | "other" | "model" | "effort";
         current: string;
     }, {
         values: {
@@ -1441,7 +1441,7 @@ export declare const sessionUpdateSchema: z.ZodDiscriminatedUnion<"sessionUpdate
         id: string;
         name: string;
         current: string;
-        category?: "other" | "model" | "mode" | "effort" | undefined;
+        category?: "mode" | "other" | "model" | "effort" | undefined;
     }>, "many">;
 }, "strip", z.ZodTypeAny, {
     options: {
@@ -1452,7 +1452,7 @@ export declare const sessionUpdateSchema: z.ZodDiscriminatedUnion<"sessionUpdate
         }[];
         id: string;
         name: string;
-        category: "other" | "model" | "mode" | "effort";
+        category: "mode" | "other" | "model" | "effort";
         current: string;
     }[];
     sessionUpdate: "ls_config";
@@ -1466,7 +1466,7 @@ export declare const sessionUpdateSchema: z.ZodDiscriminatedUnion<"sessionUpdate
         id: string;
         name: string;
         current: string;
-        category?: "other" | "model" | "mode" | "effort" | undefined;
+        category?: "mode" | "other" | "model" | "effort" | undefined;
     }[];
     sessionUpdate: "ls_config";
 }>, z.ZodObject<{
@@ -2174,7 +2174,7 @@ export declare const sessionEventSchema: z.ZodObject<{
         }>]>>;
     }, "strip", z.ZodTypeAny, {
         status: "failed" | "pending" | "in_progress" | "completed";
-        kind: "read" | "edit" | "delete" | "move" | "search" | "execute" | "think" | "fetch" | "other";
+        kind: "search" | "read" | "edit" | "delete" | "move" | "execute" | "think" | "fetch" | "other";
         title: string;
         toolCallId: string;
         sessionUpdate: "tool_call";
@@ -2247,7 +2247,7 @@ export declare const sessionEventSchema: z.ZodObject<{
         }[] | undefined;
     }, {
         status: "failed" | "pending" | "in_progress" | "completed";
-        kind: "read" | "edit" | "delete" | "move" | "search" | "execute" | "think" | "fetch" | "other";
+        kind: "search" | "read" | "edit" | "delete" | "move" | "execute" | "think" | "fetch" | "other";
         title: string;
         toolCallId: string;
         sessionUpdate: "tool_call";
@@ -2809,7 +2809,7 @@ export declare const sessionEventSchema: z.ZodObject<{
             }[];
             id: string;
             name: string;
-            category: "other" | "model" | "mode" | "effort";
+            category: "mode" | "other" | "model" | "effort";
             current: string;
         }, {
             values: {
@@ -2820,7 +2820,7 @@ export declare const sessionEventSchema: z.ZodObject<{
             id: string;
             name: string;
             current: string;
-            category?: "other" | "model" | "mode" | "effort" | undefined;
+            category?: "mode" | "other" | "model" | "effort" | undefined;
         }>, "many">;
     }, "strip", z.ZodTypeAny, {
         options: {
@@ -2831,7 +2831,7 @@ export declare const sessionEventSchema: z.ZodObject<{
             }[];
             id: string;
             name: string;
-            category: "other" | "model" | "mode" | "effort";
+            category: "mode" | "other" | "model" | "effort";
             current: string;
         }[];
         sessionUpdate: "ls_config";
@@ -2845,7 +2845,7 @@ export declare const sessionEventSchema: z.ZodObject<{
             id: string;
             name: string;
             current: string;
-            category?: "other" | "model" | "mode" | "effort" | undefined;
+            category?: "mode" | "other" | "model" | "effort" | undefined;
         }[];
         sessionUpdate: "ls_config";
     }>, z.ZodObject<{
@@ -3133,7 +3133,7 @@ export declare const sessionEventSchema: z.ZodObject<{
         parentToolCallId?: string | undefined;
     } | {
         status: "failed" | "pending" | "in_progress" | "completed";
-        kind: "read" | "edit" | "delete" | "move" | "search" | "execute" | "think" | "fetch" | "other";
+        kind: "search" | "read" | "edit" | "delete" | "move" | "execute" | "think" | "fetch" | "other";
         title: string;
         toolCallId: string;
         sessionUpdate: "tool_call";
@@ -3312,7 +3312,7 @@ export declare const sessionEventSchema: z.ZodObject<{
             }[];
             id: string;
             name: string;
-            category: "other" | "model" | "mode" | "effort";
+            category: "mode" | "other" | "model" | "effort";
             current: string;
         }[];
         sessionUpdate: "ls_config";
@@ -3433,7 +3433,7 @@ export declare const sessionEventSchema: z.ZodObject<{
         parentToolCallId?: string | undefined;
     } | {
         status: "failed" | "pending" | "in_progress" | "completed";
-        kind: "read" | "edit" | "delete" | "move" | "search" | "execute" | "think" | "fetch" | "other";
+        kind: "search" | "read" | "edit" | "delete" | "move" | "execute" | "think" | "fetch" | "other";
         title: string;
         toolCallId: string;
         sessionUpdate: "tool_call";
@@ -3613,7 +3613,7 @@ export declare const sessionEventSchema: z.ZodObject<{
             id: string;
             name: string;
             current: string;
-            category?: "other" | "model" | "mode" | "effort" | undefined;
+            category?: "mode" | "other" | "model" | "effort" | undefined;
         }[];
         sessionUpdate: "ls_config";
     } | {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "linkshell-cli",
-  "version": "0.8.2",
+  "version": "0.10.0",
   "description": "Follow, steer and approve the coding agents on your computer (Claude Code, Codex, Gemini, Copilot and more) from your phone",
   "type": "module",
   "main": "dist/index.js",
@@ -11,7 +11,6 @@
     "dist",
     "src",
     "scripts",
-    "web",
     "README.md",
     "LICENSE"
   ],
@@ -32,21 +31,13 @@
   },
   "dependencies": {
     "commander": "^13.1.0",
-    "node-pty": "^1.0.0",
+    "node-pty": "^1.1.0",
     "qrcode-terminal": "^0.12.0",
-    "ws": "^8.18.1",
-    "zod": "^3.24.3",
-    "@linkshell/gateway": "0.5.3",
-    "@linkshell/protocol": "0.4.10",
-    "@linkshell/wire": "0.2.1",
-    "@linkshell/host": "0.3.2"
-  },
-  "optionalDependencies": {
-    "@anthropic-ai/claude-agent-sdk": "^0.2.128",
-    "werift": "^0.22.9"
+    "@linkshell/gateway": "0.6.0",
+    "@linkshell/host": "0.4.0",
+    "@linkshell/wire": "0.2.1"
   },
   "devDependencies": {
-    "@types/ws": "^8.5.14",
     "tsx": "^4.19.3",
     "vitest": "^3.2.1"
   },
@@ -54,7 +45,7 @@
     "node": ">=22.13"
   },
   "scripts": {
-    "build": "tsc -p tsconfig.json && node scripts/copy-web.mjs",
+    "build": "rm -rf dist *.tsbuildinfo && tsc -p tsconfig.json",
     "postinstall": "node scripts/postinstall.mjs",
     "typecheck": "tsc -p tsconfig.json --noEmit",
     "dev": "tsx src/index.ts",

package/src/commands/gateway.ts

@@ -0,0 +1,31 @@
+import { join } from "node:path";
+import * as daemon from "../utils/daemon.js";
+import { assertHostRuntime, silenceSqliteWarning } from "./host.js";
+
+/** Runs a gateway in this process until SIGINT/SIGTERM. */
+export async function runGatewayForeground(version: string, port: number): Promise<void> {
+  // The relay keeps its pairings in node:sqlite, like the host.
+  assertHostRuntime();
+  silenceSqliteWarning();
+  const { startGateway } = await import("@linkshell/gateway");
+  // Pairings live here; keeping this file keeps phones paired.
+  const databasePath = join(daemon.linkshellDir(), "relay.db");
+  const gateway = await startGateway({ port, databasePath });
+  daemon.savePid("gateway", process.pid);
+
+  process.stderr.write(`\n  LinkShell Gateway ${version}\n`);
+  process.stderr.write(`  Listening on http://0.0.0.0:${gateway.port}\n`);
+  process.stderr.write(`  PID: ${process.pid}\n`);
+  process.stderr.write(`  Pairings: ${databasePath}\n\n`);
+  process.stderr.write(`  Computers:    linkshell host --gateway ws://this-server:${gateway.port}\n`);
+  process.stderr.write(`  Health check: curl http://this-server:${gateway.port}/healthz\n\n`);
+
+  const shutdown = async () => {
+    process.stderr.write("[gateway] shutting down...\n");
+    daemon.removePid("gateway");
+    await gateway.close();
+    process.exit(0);
+  };
+  process.on("SIGINT", shutdown);
+  process.on("SIGTERM", shutdown);
+}

package/src/commands/host.ts

@@ -19,11 +19,19 @@ export function silenceSqliteWarning(): void {
 interface HostConfig {
   /** v2 gateway base URL (ws:// or wss://), or "off". Unset: the official gateway once logged in. */
   gateway?: string;
+  /** Set once `linkshell setup` has run here (by itself on the first start, or by hand). */
+  setup?: "done";
 }
 
 /** LinkShell's own gateway: a Pro account's computers are reachable there. */
 export const OFFICIAL_GATEWAY = "wss://gateway.itool.tech";
 
+/** Whether two gateway addresses name the same one, however they were typed (scheme, trailing slash). */
+export function sameGateway(a: string | undefined, b: string): boolean {
+  const key = (url: string) => url.trim().replace(/^http/i, "ws").replace(/\/+$/, "").toLowerCase();
+  return a !== undefined && key(a) === key(b);
+}
+
 /**
  * Where devices reach this computer from outside the LAN: LINKSHELL_GATEWAY,
  * else the saved choice, else the official gateway when logged in.
@@ -31,7 +39,7 @@ export const OFFICIAL_GATEWAY = "wss://gateway.itool.tech";
 export function resolveGateway(home: string): string | undefined {
   const chosen = process.env.LINKSHELL_GATEWAY || readHostConfig(home).gateway;
   if (chosen === "off") return undefined;
-  // config.json is shared with the v1 bridge, whose gateway URLs end in /ws.
+  // A config.json written by 1.x holds a gateway URL ending in /ws.
   if (chosen) return chosen.replace(/\/ws\/?$/, "");
   return isLoggedIn() ? OFFICIAL_GATEWAY : undefined;
 }
@@ -95,7 +103,12 @@ export async function runHostForeground(version: string): Promise<void> {
     version,
     env,
     log,
-    gateway: { url: () => resolveGateway(home), token: async () => (await getValidToken()) ?? undefined },
+    gateway: {
+      url: () => resolveGateway(home),
+      // The account is LinkShell's, so its token goes to LinkShell's gateway and to no other: a
+      // gateway of one's own has no accounts, and would refuse a computer that offered one.
+      token: async () => (sameGateway(resolveGateway(home), OFFICIAL_GATEWAY) ? ((await getValidToken()) ?? undefined) : undefined),
+    },
     tcpPort: devPort,
     claudeCommand: process.env.LINKSHELL_CLAUDE_COMMAND || undefined,
     claudeAdapter: adapter ? { command: adapter, args: [] } : undefined,

package/src/commands/screen.ts

@@ -7,6 +7,7 @@ import { ensureHostRunning, hostRuntimeOk, withRunningHost } from "./host.js";
 
 export interface ScreenAccess {
   supported: boolean;
+  /** Whether what captures the screen is there: LinkShell.app on a Mac (installed with the CLI), ffmpeg on Linux. */
   ffmpeg: boolean;
   recording: boolean | null;
   control: boolean | null;
@@ -39,8 +40,8 @@ export function screenReady(access: ScreenAccess): boolean {
 export function describeScreen(access: ScreenAccess | "old" | undefined): string | undefined {
   if (!access) return undefined;
   if (access === "old") return "restart the host to check (linkshell host stop && linkshell host --daemon)";
-  if (!access.supported) return "not available on this system";
-  if (!access.ffmpeg) return `needs ffmpeg (${process.platform === "darwin" ? "brew install ffmpeg" : "install it with your package manager"})`;
+  if (!access.supported) return process.platform === "darwin" ? "needs a Mac with Apple silicon" : "not available on this system";
+  if (!access.ffmpeg) return process.platform === "darwin" ? MISSING_APP : "needs ffmpeg (install it with your package manager)";
   if (process.platform !== "darwin") return "can be watched (controlling it needs macOS)";
   if (access.recording === null || access.control === null) return `can't tell${access.problem ? `: ${access.problem}` : ""}`;
   if (access.recording && access.control) return "can be watched and controlled from the phone";
@@ -48,96 +49,101 @@ export function describeScreen(access: ScreenAccess | "old" | undefined): string
   return `${missing} isn't allowed yet — set it up with: linkshell screen`;
 }
 
+/** A Mac without LinkShell.app: the optional package that carries it wasn't installed (npm run with --omit=optional, or a failed download). */
+const MISSING_APP = "LinkShell.app is missing — reinstall with: npm install -g linkshell-cli";
+
 const PERMISSIONS = {
-  recording: {
-    label: "Watching the screen",
-    where: "Screen & System Audio Recording (录屏与系统录音)",
-  },
-  control: {
-    label: "Controlling it",
-    where: "Accessibility (辅助功能)",
-  },
+  recording: "Watching the screen",
+  control: "Controlling it",
 } as const;
 
-export async function runScreenSetup(options: { check?: boolean }): Promise<void> {
-  const out = (line = "") => process.stdout.write(`${line}\n`);
-  const row = (ok: boolean, label: string, detail: string) => out(`  ${ok ? green("✓") : red("✗")} ${label.padEnd(22)} ${detail}`);
-  out("\n  LinkShell screen\n");
-  if (!hostRuntimeOk()) {
-    row(false, "Host", `needs Node.js 22.13 or newer (this is ${process.version})`);
-    process.exitCode = 1;
-    return;
-  }
-  if (!options.check) await ensureHostRunning();
+type Print = (line?: string) => void;
+const row = (out: Print, ok: boolean, label: string, detail: string) => out(`  ${ok ? green("✓") : red("✗")} ${label.padEnd(22)} ${detail}`);
+
+/**
+ * Gets this computer's screen ready for the phone, as far as it can be, saying
+ * what it finds. On a Mac the two permissions are LinkShell.app's: its own
+ * window comes up on this computer, takes the user to each switch and ticks
+ * them off, and this waits beside it. True when everything is in place.
+ */
+export async function setUpScreen(out: Print, interactive: boolean): Promise<boolean> {
   let access = await screenAccess();
   if (!access) {
-    row(false, "Host", "not running — start it with: linkshell host --daemon");
-    process.exitCode = 1;
-    return;
+    row(out, false, "Host", "not running — start it with: linkshell host --daemon");
+    return false;
   }
   if (access === "old") {
-    row(false, "Host", "is older than this CLI — restart it (stops running agent turns):");
-    out("      linkshell host stop && linkshell host --daemon\n");
-    process.exitCode = 1;
-    return;
+    row(out, false, "Host", "is older than this CLI — restart it (stops running agent turns):");
+    out("      linkshell host stop && linkshell host --daemon");
+    return false;
   }
   if (!access.supported) {
-    row(false, "Screen", "not available on this system");
-    process.exitCode = 1;
-    return;
+    row(out, false, "Screen", process.platform === "darwin" ? "needs a Mac with Apple silicon" : "not available on this system");
+    return false;
   }
-  row(access.ffmpeg, "ffmpeg", access.ffmpeg ? "found" : `not installed — ${process.platform === "darwin" ? "brew install ffmpeg" : "install it with your package manager"}, then run this again`);
   if (process.platform !== "darwin") {
-    out(`\n  ${access.ffmpeg ? "The screen can be watched from the phone." : ""} Controlling it needs macOS.\n`);
-    if (!access.ffmpeg) process.exitCode = 1;
-    return;
+    row(out, access.ffmpeg, "ffmpeg", access.ffmpeg ? "found" : "not installed — install it with your package manager, then run this again");
+    if (access.ffmpeg) out(dim("    The screen can be watched from the phone; controlling it needs macOS."));
+    return access.ffmpeg;
+  }
+  if (!access.ffmpeg) {
+    row(out, false, "LinkShell.app", "missing from this installation — reinstall with: npm install -g linkshell-cli");
+    return false;
   }
   if (access.recording === null || access.control === null) {
-    row(false, "Permissions", access.problem ?? "could not be checked");
-    process.exitCode = 1;
-    return;
+    row(out, false, "Permissions", access.problem ?? "could not be checked");
+    return false;
   }
 
-  const app = access.app || "LinkShell";
-  const interactive = !options.check && process.stdin.isTTY === true;
-  for (const kind of ["recording", "control"] as const) {
-    const permission = PERMISSIONS[kind];
-    if (access[kind]) {
-      row(true, permission.label, "allowed");
-      continue;
-    }
-    if (!interactive) {
-      row(false, permission.label, "not allowed yet");
-      continue;
-    }
-    // The system's own question comes up on this computer, and its settings open at the switch.
-    await screenAccess(true);
-    out(`  ${red("✗")} ${permission.label.padEnd(22)} not allowed yet`);
-    out(`      System Settings has opened at Privacy & Security › ${permission.where}.`);
-    out(`      Turn on the switch for "${app}" there.${kind === "recording" ? " If macOS offers to quit and reopen it, later is fine." : ""}`);
-    out(dim("      Waiting for the switch… (Ctrl+C to stop; run this again any time)"));
-    const deadline = Date.now() + 10 * 60_000;
-    let allowed = false;
-    while (!allowed && Date.now() < deadline) {
-      await new Promise((resolve) => setTimeout(resolve, 1500));
-      const now = await screenAccess().catch(() => undefined);
-      if (now && now !== "old") {
-        access = now;
-        allowed = now[kind] === true;
+  const kinds = ["recording", "control"] as const;
+  const said = new Set<string>();
+  const tell = (now: ScreenAccess) => {
+    for (const kind of kinds) {
+      if (now[kind] && !said.has(kind)) {
+        said.add(kind);
+        row(out, true, PERMISSIONS[kind], "allowed");
       }
     }
-    if (!allowed) {
-      out(`\n  Still not allowed. Run ${"`linkshell screen`"} again when you are at the switch.\n`);
-      process.exitCode = 1;
-      return;
-    }
-    row(true, permission.label, "allowed");
+  };
+  tell(access);
+  if (screenReady(access)) return true;
+  if (!interactive) {
+    for (const kind of kinds) if (!access[kind]) row(out, false, PERMISSIONS[kind], "not allowed yet");
+    return false;
+  }
+
+  // The app's own window: it has the system ask, opens the settings at each switch, and shows what is done.
+  await screenAccess(true);
+  const missing = kinds.filter((kind) => !(access as ScreenAccess)[kind]).length;
+  out(`  A LinkShell window has opened on this Mac: turn on the ${missing === 2 ? "two switches" : "switch"} it shows.`);
+  out(dim("  Waiting… (Ctrl+C to stop; `linkshell screen` picks up where this left off)"));
+  const deadline = Date.now() + 10 * 60_000;
+  while (Date.now() < deadline) {
+    await new Promise((resolve) => setTimeout(resolve, 1500));
+    const now = await screenAccess().catch(() => undefined);
+    if (!now || now === "old") continue;
+    access = now;
+    tell(now);
+    if (screenReady(now)) return true;
   }
+  for (const kind of kinds) if (!access[kind]) row(out, false, PERMISSIONS[kind], "still not allowed");
+  return false;
+}
 
-  if (screenReady(access)) {
-    out(`\n  ${green("Ready.")} In the app: 电脑 › 屏幕. To take the pointer and keyboard, pick 触控板 or 点按 in the viewer's toolbar.\n`);
+export async function runScreenSetup(options: { check?: boolean }): Promise<void> {
+  const out: Print = (line = "") => process.stdout.write(`${line}\n`);
+  out("\n  LinkShell screen\n");
+  if (!hostRuntimeOk()) {
+    row(out, false, "Host", `needs Node.js 22.13 or newer (this is ${process.version})`);
+    process.exitCode = 1;
+    return;
+  }
+  if (!options.check) await ensureHostRunning();
+  const interactive = !options.check && process.stdin.isTTY === true;
+  if (await setUpScreen(out, interactive)) {
+    out(process.platform === "darwin" ? `\n  ${green("Ready.")} In the app: 电脑 › 屏幕. To take the pointer and keyboard, pick 触控板 or 点按 in the viewer's toolbar.\n` : "");
   } else {
-    out(`\n  Not ready yet${access.ffmpeg ? "" : ": install ffmpeg"}${interactive ? "" : "; run `linkshell screen` in a terminal to set it up"}.\n`);
+    out(`\n  Not ready yet${interactive ? "" : "; run `linkshell screen` in a terminal to set it up"}.\n`);
     process.exitCode = 1;
   }
 }