linkshell-cli 0.6.2 → 0.6.3

package/README.md

@@ -1,165 +1,80 @@
 # linkshell-cli
 
-在手机上远程查看和控制本地 Claude Code / Codex / Gemini / Copilot 终端会话，并提供 Agent Workspace 结构化对话界面。
+Follow, steer and approve the coding agents running on your computer — from your phone. This is the computer side of [LinkShell](https://github.com/LiuTianjie/LinkShell): it runs Claude Code, Codex and other agents you already have installed, and keeps them reachable from the LinkShell app ([iPhone](https://apps.apple.com/cn/app/linkshell/id6761547516) · [Android](https://github.com/LiuTianjie/LinkShell/releases/latest)) over an end-to-end encrypted channel.
 
-## 安装
+[Website](https://liutianjie.github.io/LinkShell/) · [Docs](https://liutianjie.github.io/LinkShell/docs/) · [简体中文](https://github.com/LiuTianjie/LinkShell/blob/main/README_CN.md)
 
-```bash
-npm install -g linkshell-cli
-```
+## Install
 
-## 一条命令开始
+macOS or Linux, **Node.js 22.13 or newer**.
 
 ```bash
-linkshell start --daemon --provider claude
+npm i -g linkshell-cli
+linkshell host --daemon
 ```
 
-CLI 会在后台：
-1. 启动内置 Gateway（端口 8787）
-2. 检测局域网 IP
-3. 创建配对并打印 QR 码
-4. 手机扫码即连
+Then connect your phone one of two ways:
 
-App 断开不影响后台进程，重新扫码即可恢复。
+- **Pro — the official gateway.** `linkshell login`, then sign in to the app with the same account. The computer shows up by itself.
+- **Your own gateway.** Run one (below), then:
 
-## 命令一览
+  ```bash
+  linkshell host --gateway wss://gw.example.com --daemon
+  linkshell pair    # scan the QR code in the app
+  ```
 
-| 命令 | 说明 |
-|------|------|
-| `linkshell start` | 启动桥接会话（支持 `--daemon` 后台运行） |
-| `linkshell stop` | 停止所有后台进程 |
-| `linkshell status` | 查看运行状态 |
-| `linkshell gateway` | 启动独立 Gateway（支持 `--daemon`） |
-| `linkshell gateway stop` | 停止后台 Gateway |
-| `linkshell gateway status` | 查看 Gateway 状态 |
-| `linkshell setup` | 交互式配置向导 |
-| `linkshell doctor` | 环境检查和连通性诊断 |
-
-## 使用示例
+Start sessions from the phone, or launch agents from your terminal so they can be handed over at any time:
 
 ```bash
-# 后台启动（推荐）
-linkshell start --daemon --provider claude
-
-# 启用远程桌面查看
-linkshell start --daemon --provider claude --screen
-
-# 前台启动
-linkshell start --provider claude
-
-# 桥接 Codex
-linkshell start --daemon --provider codex
-
-# 桥接 Gemini / GitHub Copilot
-linkshell start --daemon --provider gemini
-linkshell start --daemon --provider copilot
-
-# Agent Workspace（自动检测 Claude Code / Codex）
-linkshell start --daemon --agent-ui
-
-# 桥接任意命令
-linkshell start --daemon --provider custom --command bash
-
-# 指定端口
-linkshell start --daemon --provider claude --port 9000
-
-# 连接远程 Gateway（不启动内置 Gateway）
-linkshell start --daemon --gateway wss://your-server.com:8787/ws --provider claude
-
-# 查看状态和日志
-linkshell status
-tail -f ~/.linkshell/bridge.log
-
-# 停止
-linkshell stop
+linkshell claude    # Claude Code; a message from the phone takes over, any key here takes it back
+linkshell codex     # Codex; the terminal and the phone are live at the same time
 ```
 
-## 服务器部署 Gateway
-
-```bash
-# 后台启动独立 Gateway
-linkshell gateway --daemon --port 8787
+## Commands
 
-# 查看状态
-linkshell gateway status
+| | |
+| --- | --- |
+| `linkshell host --daemon` | Start LinkShell in the background |
+| `linkshell status` | The host, its agents, sessions and gateway connection |
+| `linkshell host stop` | Stop the host (`linkshell stop` stops everything LinkShell runs here) |
+| `linkshell host --gateway <url>` | Choose the gateway (`off` to disconnect, `default` for the official one); applies to a running host |
+| `linkshell pair` | Pair a phone through your own gateway |
+| `linkshell devices` | Paired phones; `linkshell devices remove <name>` unpairs one |
+| `linkshell login` / `logout` | Pro account: join or leave the official gateway, without restarting the host |
+| `linkshell claude` / `linkshell codex` | The agent's own UI, shareable with the phone (arguments pass through) |
+| `linkshell gateway [--port 8787] [--daemon]` | Run a gateway |
+| `linkshell doctor` | Check Node, agents, the host and its gateway |
+| `linkshell upgrade` | Upgrade the CLI (restart the host afterwards to run the new version) |
 
-# 查看日志
-tail -f ~/.linkshell/gateway.log
+## Run your own gateway
 
-# 停止
-linkshell gateway stop
-```
-
-## start 选项
-
-```
---gateway <url>           远程 Gateway 地址（省略则启动内置 Gateway）
---port <port>             内置 Gateway 端口（默认 8787）
---pairing-gateway <url>   QR 码中给手机使用的地址
---provider <name>         claude | codex | gemini | copilot | custom（默认 claude）
---command <cmd>           自定义命令（custom provider 必填）
---daemon                  后台运行
---session-id <id>         手动指定 session ID
---client-name <name>      显示名称（默认 local-cli）
---cols <n>                终端列数（默认 120）
---rows <n>                终端行数（默认 36）
---screen                  启用远程桌面共享
---no-keep-awake           macOS 上允许闲置睡眠
---agent-ui / --no-agent-ui 启用或关闭 Agent Workspace channel
---agent-provider <name>   Agent provider：codex | claude | custom
---agent-command <cmd>     自定义 ACP/Agent 命令
---verbose                 详细日志
-```
-
-## Agent Workspace
-
-`--agent-ui` 默认开启，CLI 会检测本机是否安装了 Claude Code 与 Codex CLI，并把可用 provider、模型、权限模式、推理强度和功能能力同步给 App。手机端可以在 Agent 标签里选择 provider 和项目目录，继续历史对话，查看 tool call、命令执行、文件变更、计划、权限请求、结构化补充输入和子 Agent 活动。
-
-- Codex：默认命令为 `codex app-server --listen stdio://`
-- Claude：优先使用 `@anthropic-ai/claude-agent-sdk`，否则回退到 `claude --print --output-format stream-json --input-format stream-json`
-- Custom：需要传入 `--agent-provider custom --agent-command "<command>"`
-
-如果 Agent provider 不可用，终端桥接仍会正常运行。
-
-## 配置持久化
+A gateway only relays encrypted frames and brokers pairing.
 
 ```bash
-linkshell setup
+linkshell gateway --port 8787 --daemon
 ```
 
-配置保存在 `~/.linkshell/config.json`。
+or with Docker: `nickname4th/linkshell-gateway` (see the [self-hosting guide](https://github.com/LiuTianjie/LinkShell/blob/main/docs/deploy.md)). Put it behind HTTPS and point hosts at `wss://your-domain`.
 
-## doctor 检查项
-
-```bash
-linkshell doctor
-```
-
-- Node.js 版本 >= 18
-- node-pty 原生模块
-- Claude / Codex / Gemini / Copilot CLI 是否安装
-- 配置文件状态
-- Gateway 连通性和延迟
-
-## 文件位置
+## Files
 
 ```
 ~/.linkshell/
-├── config.json      # 配置文件
-├── bridge.pid       # 桥接进程 PID
-├── bridge.log       # 桥接进程日志
-├── gateway.pid      # Gateway 进程 PID
-└── gateway.log      # Gateway 进程日志
+├── state.db              sessions and their history
+├── identity.json         this computer's keys
+├── paired-devices.json   phones paired with it
+├── auth.json             the Pro login, if any
+├── config.json           the chosen gateway
+├── host.log              the host's log
+├── worktrees/            git worktrees made for sessions started (or forked) into one
+└── relay.db              pairings, when this computer runs a gateway
 ```
 
-## 代码入口
+`LINKSHELL_HOME` moves this directory. LinkShell never handles your agents' accounts or API keys: agents run as you, with your login shell's environment.
+
+## Coming from 1.x
 
-1. src/index.ts — CLI 命令定义
-2. src/providers.ts — 终端 Provider 适配
-3. src/runtime/bridge-session.ts — 核心会话
-4. src/runtime/acp/agent-workspace.ts — Agent Workspace v2
-5. src/runtime/acp/provider-resolver.ts — Agent provider 自动检测
-6. src/utils/daemon.ts — 后台进程管理
+2.0 changes both the app and the computer side: upgrade both and connect again. `linkshell start`, `setup` and `list` still serve the 1.x app.
 
 ## License
 

package/dist/cli/src/auth.js

@@ -1,7 +1,7 @@
 import { readFileSync, writeFileSync, mkdirSync, existsSync } from "node:fs";
 import { join } from "node:path";
 import { homedir } from "node:os";
-const AUTH_DIR = join(homedir(), ".linkshell");
+const AUTH_DIR = process.env.LINKSHELL_HOME || join(homedir(), ".linkshell");
 const AUTH_FILE = join(AUTH_DIR, "auth.json");
 export function loadAuth() {
     try {

package/dist/cli/src/auth.js.map

@@ -1 +1 @@
-{"version":3,"file":"auth.js","sourceRoot":"","sources":["../../../src/auth.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"auth.js","sourceRoot":"","sources":["../../../src/auth.ts"],"names":[],"mappings":"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"}

package/dist/cli/src/commands/doctor.d.ts

@@ -1 +1 @@
-export declare function runDoctor(gatewayUrl?: string): Promise<void>;
+export declare function runDoctor(version: string, gatewayUrl?: string): Promise<void>;

package/dist/cli/src/commands/doctor.js

@@ -1,6 +1,7 @@
 import { execSync } from "node:child_process";
 import { createRequire } from "node:module";
-import { loadConfig, getConfigPath } from "../config.js";
+import { loadAuth } from "../auth.js";
+import { hostRuntimeOk, resolveGateway, withRunningHost } from "./host.js";
 const requireFromCli = createRequire(import.meta.url);
 function check(name, fn) {
     try {
@@ -18,31 +19,31 @@ function which(bin) {
         return undefined;
     }
 }
-async function checkGateway(url) {
+async function checkGateway(name, url) {
     try {
-        const httpUrl = url.replace(/\/ws\/?$/, "").replace(/^wss:/, "https:").replace(/^ws:/, "http:");
+        const httpUrl = url.replace(/\/(ws|v2\/connect)\/?$/, "").replace(/\/$/, "").replace(/^wss:/, "https:").replace(/^ws:/, "http:");
         const start = Date.now();
         const res = await fetch(`${httpUrl}/healthz`, { signal: AbortSignal.timeout(5000) });
         const latency = Date.now() - start;
         if (!res.ok)
-            return { name: "Gateway", ok: false, detail: `HTTP ${res.status}` };
-        return { name: "Gateway", ok: true, detail: `reachable (${latency}ms)` };
+            return { name, ok: false, detail: `${url}: HTTP ${res.status}` };
+        return { name, ok: true, detail: `${url} answers (${latency}ms)` };
     }
     catch (e) {
-        return { name: "Gateway", ok: false, detail: e instanceof Error ? e.message : "unreachable" };
+        return { name, ok: false, detail: `${url}: ${e instanceof Error ? e.message : "unreachable"}` };
     }
 }
-export async function runDoctor(gatewayUrl) {
-    const config = loadConfig();
-    const gateway = gatewayUrl ?? config.gateway;
+const AGENT_INSTALL = {
+    claude: "npm i -g @anthropic-ai/claude-code",
+    codex: "npm i -g @openai/codex",
+};
+export async function runDoctor(version, gatewayUrl) {
     process.stdout.write("\n  LinkShell Doctor\n\n");
     const results = [];
     results.push(check("Node.js", () => {
-        const ver = process.versions.node;
-        const major = Number(ver.split(".")[0]);
-        if (major < 18)
-            throw new Error(`v${ver} (need >= 18)`);
-        return `v${ver}`;
+        if (!hostRuntimeOk())
+            throw new Error(`v${process.versions.node} (the host needs 22.13 or newer)`);
+        return `v${process.versions.node}`;
     }));
     results.push(check("node-pty", () => {
         try {
@@ -57,33 +58,72 @@ export async function runDoctor(gatewayUrl) {
                 "For a pnpm source checkout, approve node-pty build scripts and reinstall.");
         }
     }));
-    // Optional CLI hints — not required, since LinkShell now bridges a plain shell.
-    for (const [label, bin, hint] of [
-        ["Claude CLI (optional)", "claude", "npm i -g @anthropic-ai/claude-code"],
-        ["Codex CLI (optional)", "codex", "npm i -g @openai/codex"],
-    ]) {
-        const path = which(bin);
-        if (path) {
-            results.push({ name: label, ok: true, detail: `found (${path})` });
+    const host = await withRunningHost(async (client) => ({
+        info: await client.call("machine.info", {}),
+        gateway: await client.call("gateway.status", {}),
+    })).catch(() => undefined);
+    if (!host) {
+        results.push({ name: "Host", ok: false, detail: "not running — start it with: linkshell host --daemon" });
+        // Without the host, at least say whether the two main agents are on the PATH.
+        for (const [bin, hint] of Object.entries(AGENT_INSTALL)) {
+            const path = which(bin);
+            results.push({ name: `${bin} (optional)`, ok: true, detail: path ? `found (${path})` : `not installed — ${hint}` });
         }
-        else {
-            results.push({ name: label, ok: true, detail: `not installed — ${hint}` });
+    }
+    else {
+        results.push(host.info.hostVersion === version
+            ? { name: "Host", ok: true, detail: `running, ${version}` }
+            : {
+                name: "Host",
+                ok: false,
+                detail: `running ${host.info.hostVersion}, but this CLI is ${version} — update it with: linkshell host stop && linkshell host --daemon`,
+            });
+        // Agents as the host sees them: what the phone can actually start.
+        for (const agent of host.info.agents) {
+            if (!agent.installed) {
+                const hint = AGENT_INSTALL[agent.id];
+                if (hint)
+                    results.push({ name: `${agent.label} (optional)`, ok: true, detail: `not installed — ${hint}` });
+                continue;
+            }
+            const signedOut = agent.auth?.state === "missing";
+            const problem = agent.problem ?? (signedOut ? (agent.auth?.hint ?? "not logged in") : undefined);
+            results.push({ name: agent.label, ok: !problem, detail: `v${agent.version ?? "?"}${problem ? ` — ${problem}` : ""}` });
         }
     }
-    results.push(check("Config", () => {
-        const path = getConfigPath();
-        const cfg = loadConfig();
-        const keys = Object.keys(cfg).filter((k) => cfg[k] !== undefined);
-        if (keys.length === 0)
-            return `${path} (empty — run: linkshell setup)`;
-        return `${path} (${keys.join(", ")})`;
-    }));
-    if (gateway) {
-        results.push(await checkGateway(gateway));
+    const auth = loadAuth();
+    results.push({
+        name: "Account",
+        ok: true,
+        detail: auth?.accessToken ? `logged in as ${auth.email || auth.userId}` : "not logged in (only the official gateway needs it: linkshell login)",
+    });
+    if (host) {
+        const gateway = host.gateway;
+        if (gateway.status === "online") {
+            const account = gateway.account ? `, account ${gateway.account.email ?? gateway.account.userId}` : "";
+            const paired = gateway.devices.length ? `, ${gateway.devices.length} paired device(s)` : "";
+            results.push({ name: "Gateway", ok: true, detail: `online ${gateway.url}${account}${paired}` });
+        }
+        else if (gateway.status === "off") {
+            results.push({
+                name: "Gateway",
+                ok: false,
+                detail: "off, so a phone can't reach this computer — linkshell login (official gateway), or linkshell host --gateway <url>",
+            });
+        }
+        else {
+            results.push({ name: "Gateway", ok: false, detail: `${gateway.status} ${gateway.url}${gateway.error ? ` — ${gateway.error.message}` : ""}` });
+        }
     }
-    else {
-        results.push({ name: "Gateway", ok: false, detail: "no gateway configured — run: linkshell setup" });
+    else if (!gatewayUrl && hostRuntimeOk()) {
+        const { defaultHome } = await import("@linkshell/host");
+        const chosen = resolveGateway(defaultHome());
+        results.push(chosen
+            ? await checkGateway("Gateway", chosen)
+            : { name: "Gateway", ok: false, detail: "none chosen — linkshell login (official gateway), or linkshell host --gateway <url>" });
     }
+    if (gatewayUrl)
+        results.push(await checkGateway(host ? "Gateway (--gateway)" : "Gateway", gatewayUrl));
     for (const r of results) {
         const icon = r.ok ? "\x1b[32m✓\x1b[0m" : "\x1b[31m✗\x1b[0m";
         process.stdout.write(`  ${icon} ${r.name}: ${r.detail}\n`);

package/dist/cli/src/commands/doctor.js.map

@@ -1 +1 @@
-{"version":3,"file":"doctor.js","sourceRoot":"","sources":["../../../../src/commands/doctor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAC9C,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAC5C,OAAO,EAAE,UAAU,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAEzD,MAAM,cAAc,GAAG,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AAQtD,SAAS,KAAK,CAAC,IAAY,EAAE,EAAgB;IAC3C,IAAI,CAAC;QACH,OAAO,EAAE,IAAI,EAAE,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE,CAAC;IAC1C,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,OAAO,EAAE,IAAI,EAAE,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,YAAY,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC;IACjF,CAAC;AACH,CAAC;AAED,SAAS,KAAK,CAAC,GAAW;IACxB,IAAI,CAAC;QACH,OAAO,QAAQ,CAAC,SAAS,GAAG,EAAE,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,IAAI,SAAS,CAAC;IAC3F,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,SAAS,CAAC;IACnB,CAAC;AACH,CAAC;AAED,KAAK,UAAU,YAAY,CAAC,GAAW;IACrC,IAAI,CAAC;QACH,MAAM,OAAO,GAAG,GAAG,CAAC,OAAO,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;QAChG,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QACzB,MAAM,GAAG,GAAG,MAAM,KAAK,CAAC,GAAG,OAAO,UAAU,EAAE,EAAE,MAAM,EAAE,WAAW,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QACrF,MAAM,OAAO,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,KAAK,CAAC;QACnC,IAAI,CAAC,GAAG,CAAC,EAAE;YAAE,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,QAAQ,GAAG,CAAC,MAAM,EAAE,EAAE,CAAC;QACjF,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,cAAc,OAAO,KAAK,EAAE,CAAC;IAC3E,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,YAAY,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,aAAa,EAAE,CAAC;IAChG,CAAC;AACH,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,SAAS,CAAC,UAAmB;IACjD,MAAM,MAAM,GAAG,UAAU,EAAE,CAAC;IAC5B,MAAM,OAAO,GAAG,UAAU,IAAI,MAAM,CAAC,OAAO,CAAC;IAE7C,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,0BAA0B,CAAC,CAAC;IAEjD,MAAM,OAAO,GAAkB,EAAE,CAAC;IAElC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,SAAS,EAAE,GAAG,EAAE;QACjC,MAAM,GAAG,GAAG,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC;QAClC,MAAM,KAAK,GAAG,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QACxC,IAAI,KAAK,GAAG,EAAE;YAAE,MAAM,IAAI,KAAK,CAAC,IAAI,GAAG,eAAe,CAAC,CAAC;QACxD,OAAO,IAAI,GAAG,EAAE,CAAC;IACnB,CAAC,CAAC,CAAC,CAAC;IAEJ,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,UAAU,EAAE,GAAG,EAAE;QAClC,IAAI,CAAC;YACH,qEAAqE;YACrE,cAAc,CAAC,UAAU,CAAC,CAAC;YAC3B,OAAO,QAAQ,CAAC;QAClB,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,MAAM,GAAG,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;YACtE,MAAM,IAAI,KAAK,CACb,6DAA6D,MAAM,IAAI;gBACvE,2EAA2E;gBAC3E,2EAA2E,CAC5E,CAAC;QACJ,CAAC;IACH,CAAC,CAAC,CAAC,CAAC;IAEJ,gFAAgF;IAChF,KAAK,MAAM,CAAC,KAAK,EAAE,GAAG,EAAE,IAAI,CAAC,IAAI;QAC/B,CAAC,uBAAuB,EAAE,QAAQ,EAAE,oCAAoC,CAAC;QACzE,CAAC,sBAAsB,EAAE,OAAO,EAAE,wBAAwB,CAAC;KACnD,EAAE,CAAC;QACX,MAAM,IAAI,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC;QACxB,IAAI,IAAI,EAAE,CAAC;YACT,OAAO,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,UAAU,IAAI,GAAG,EAAE,CAAC,CAAC;QACrE,CAAC;aAAM,CAAC;YACN,OAAO,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,mBAAmB,IAAI,EAAE,EAAE,CAAC,CAAC;QAC7E,CAAC;IACH,CAAC;IAED,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAE,GAAG,EAAE;QAChC,MAAM,IAAI,GAAG,aAAa,EAAE,CAAC;QAC7B,MAAM,GAAG,GAAG,UAAU,EAAE,CAAC;QACzB,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,CAAqB,CAAC,KAAK,SAAS,CAAC,CAAC;QACtF,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO,GAAG,IAAI,iCAAiC,CAAC;QACvE,OAAO,GAAG,IAAI,KAAK,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC;IACxC,CAAC,CAAC,CAAC,CAAC;IAEJ,IAAI,OAAO,EAAE,CAAC;QACZ,OAAO,CAAC,IAAI,CAAC,MAAM,YAAY,CAAC,OAAO,CAAC,CAAC,CAAC;IAC5C,CAAC;SAAM,CAAC;QACN,OAAO,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,8CAA8C,EAAE,CAAC,CAAC;IACvG,CAAC;IAED,KAAK,MAAM,CAAC,IAAI,OAAO,EAAE,CAAC;QACxB,MAAM,IAAI,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,kBAAkB,CAAC,CAAC,CAAC,kBAAkB,CAAC;QAC5D,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,IAAI,IAAI,CAAC,CAAC,IAAI,KAAK,CAAC,CAAC,MAAM,IAAI,CAAC,CAAC;IAC7D,CAAC;IAED,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;IAC5C,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAC3B,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACxB,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,yCAAyC,CAAC,CAAC;IAClE,CAAC;SAAM,CAAC;QACN,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,aAAa,MAAM,CAAC,MAAM,6BAA6B,CAAC,CAAC;IAChF,CAAC;AACH,CAAC"}
+{"version":3,"file":"doctor.js","sourceRoot":"","sources":["../../../../src/commands/doctor.ts"],"names":[],"mappings":"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"}

package/dist/cli/src/commands/host.d.ts

@@ -1,3 +1,4 @@
+import type { GatewayStatus } from "@linkshell/wire";
 export declare function silenceSqliteWarning(): void;
 interface HostConfig {
     /** v2 gateway base URL (ws:// or wss://), or "off". Unset: the official gateway once logged in. */
@@ -13,11 +14,24 @@ export declare function resolveGateway(home: string): string | undefined;
 export declare function readHostConfig(home: string): HostConfig;
 export declare function writeHostConfig(home: string, config: HostConfig): void;
 /** The host keeps its state in node:sqlite, unflagged from Node 22.13. */
+export declare function hostRuntimeOk(): boolean;
 export declare function assertHostRuntime(): void;
+declare function loadHost(): Promise<typeof import("@linkshell/host")>;
 /** Runs the host in this process until SIGINT/SIGTERM. */
 export declare function runHostForeground(version: string): Promise<void>;
 /** Starts the host in the background unless one already answers. */
 export declare function ensureHostRunning(): Promise<string>;
+type HostClient = Awaited<ReturnType<Awaited<ReturnType<typeof loadHost>>["connectHost"]>>;
+/** Runs `use` against the running host; undefined when there is none. */
+export declare function withRunningHost<T>(use: (client: HostClient) => Promise<T>): Promise<T | undefined>;
+/**
+ * Has the running host apply the current gateway choice and account, then
+ * waits (up to `waitMs`) for it to come online or be refused.
+ */
+export declare function refreshGateway(waitMs: number): Promise<GatewayStatus | undefined>;
+export declare function describeGateway(gateway: GatewayStatus): string;
+/** After `linkshell login`: this computer joins the gateway its account is for. */
+export declare function joinGatewayAfterLogin(plan: "pro" | "free"): Promise<void>;
 export declare function printHostStatus(): Promise<void>;
 /**
  * `linkshell <agent> [args…]`: starts the agent's native UI attached to the

package/dist/cli/src/commands/host.js

@@ -24,8 +24,9 @@ export function resolveGateway(home) {
     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.
     if (chosen)
-        return chosen;
+        return chosen.replace(/\/ws\/?$/, "");
     return isLoggedIn() ? OFFICIAL_GATEWAY : undefined;
 }
 function configPath(home) {
@@ -44,9 +45,12 @@ export function writeHostConfig(home, config) {
     writeFileSync(configPath(home), `${JSON.stringify(config, null, 2)}\n`, { mode: 0o600 });
 }
 /** The host keeps its state in node:sqlite, unflagged from Node 22.13. */
-export function assertHostRuntime() {
+export function hostRuntimeOk() {
     const [major = 0, minor = 0] = process.versions.node.split(".").map(Number);
-    if (major > 22 || (major === 22 && minor >= 13))
+    return major > 22 || (major === 22 && minor >= 13);
+}
+export function assertHostRuntime() {
+    if (hostRuntimeOk())
         return;
     process.stderr.write(`\n  LinkShell's host needs Node.js 22.13 or newer (this is ${process.version}).\n` +
         "  Upgrade Node (for example: nvm install 22, or brew upgrade node), then try again.\n\n");
@@ -70,12 +74,13 @@ export async function runHostForeground(version) {
     const devPort = process.env.LINKSHELL_DEV_PORT ? Number(process.env.LINKSHELL_DEV_PORT) : undefined;
     // Where devices reach this machine from outside the LAN. The account from
     // `linkshell login`, if any, lets that account's devices in without pairing.
-    const gatewayUrl = resolveGateway(host.defaultHome());
+    // Asked again on `gateway.refresh`, so login, logout and `--gateway` apply to a running host.
+    const home = host.defaultHome();
     const running = await host.startHost({
         version,
         env,
         log,
-        gateway: gatewayUrl ? { url: gatewayUrl, token: async () => (await getValidToken()) ?? undefined } : undefined,
+        gateway: { url: () => resolveGateway(home), token: async () => (await getValidToken()) ?? undefined },
         tcpPort: devPort,
         claudeCommand: process.env.LINKSHELL_CLAUDE_COMMAND || undefined,
         claudeAdapter: adapter ? { command: adapter, args: [] } : undefined,
@@ -113,6 +118,87 @@ export async function ensureHostRunning() {
     }
     throw new Error(`LinkShell host did not start; see ${daemon.getLogFile("host")}`);
 }
+/** Runs `use` against the running host; undefined when there is none. */
+export async function withRunningHost(use) {
+    if (!hostRuntimeOk())
+        return undefined;
+    const host = await loadHost();
+    const { hostSocket } = host.hostPaths();
+    if (!(await host.isHostRunning(hostSocket)))
+        return undefined;
+    const client = await host.connectHost(hostSocket);
+    try {
+        return await use(client);
+    }
+    finally {
+        client.close();
+    }
+}
+/**
+ * Has the running host apply the current gateway choice and account, then
+ * waits (up to `waitMs`) for it to come online or be refused.
+ */
+export async function refreshGateway(waitMs) {
+    return withRunningHost(async (client) => {
+        let status;
+        try {
+            status = await client.call("gateway.refresh", {});
+        }
+        catch {
+            // A host from before 0.6.3 (still running after an upgrade) only reads its gateway at start.
+            process.stderr.write("  The running host is older than this CLI. Restart it to apply this (stops running agent turns):\n");
+            process.stderr.write("    linkshell host stop && linkshell host --daemon\n");
+            return client.call("gateway.status", {});
+        }
+        const deadline = Date.now() + waitMs;
+        while (status.status === "connecting" && Date.now() < deadline) {
+            await new Promise((resolve) => setTimeout(resolve, 200));
+            status = await client.call("gateway.status", {});
+        }
+        return status;
+    });
+}
+export function describeGateway(gateway) {
+    if (gateway.status === "off")
+        return "off (linkshell login for the official one, or linkshell host --gateway <url>)";
+    const account = gateway.account ? `, account ${gateway.account.email ?? gateway.account.userId}` : "";
+    const problem = gateway.error ? `  ⚠ ${gateway.error.message}` : "";
+    return `${gateway.status} ${gateway.url}${account}${problem}`;
+}
+/** After `linkshell login`: this computer joins the gateway its account is for. */
+export async function joinGatewayAfterLogin(plan) {
+    const out = (line) => process.stderr.write(`  ${line}\n`);
+    if (!hostRuntimeOk()) {
+        out(`The LinkShell host needs Node.js 22.13 or newer (this is ${process.version}); upgrade Node, then: linkshell host --daemon\n`);
+        return;
+    }
+    const host = await loadHost();
+    const chosen = process.env.LINKSHELL_GATEWAY || readHostConfig(host.defaultHome()).gateway;
+    if (chosen === "off") {
+        out("The gateway is turned off on this computer. To use the official one: linkshell host --gateway default\n");
+        return;
+    }
+    if (!chosen && plan !== "pro") {
+        // A running host now gets the gateway's own answer, instead of an old login's.
+        await refreshGateway(0);
+        out("The official gateway needs a Pro subscription: https://itool.tech");
+        out("Or use your own gateway: linkshell host --gateway <url>, then linkshell pair\n");
+        return;
+    }
+    await ensureHostRunning();
+    const gateway = await refreshGateway(15_000);
+    const where = chosen ? (gateway?.url ?? chosen) : "the official gateway";
+    if (gateway?.status === "online") {
+        out(`\x1b[32m✓\x1b[0m This computer is online on ${where}.`);
+        out(gateway.account
+            ? "  Open LinkShell on your phone and sign in with the same account: it shows up there, no pairing needed.\n"
+            : "  Pair your phone with: linkshell pair\n");
+    }
+    else {
+        out(`\x1b[31m✗\x1b[0m Not connected to ${where}${gateway?.error ? `: ${gateway.error.message}` : " yet"}`);
+        out("  Check again with: linkshell host status\n");
+    }
+}
 export async function printHostStatus() {
     const host = await loadHost();
     const { hostSocket } = host.hostPaths();
@@ -138,16 +224,9 @@ export async function printHostStatus() {
         const active = sessions.filter((s) => s.state === "running" || s.state === "waiting");
         process.stdout.write(`  Sessions: ${sessions.length} known, ${active.length} active\n`);
         const gateway = await client.call("gateway.status", {});
-        if (gateway.status === "off") {
-            process.stdout.write("  Gateway:  off (linkshell login for the official one, or linkshell host --gateway <url>)\n");
-        }
-        else {
-            const account = gateway.account ? `, account ${gateway.account.email ?? gateway.account.userId}` : "";
-            const problem = gateway.error ? `  ⚠ ${gateway.error.message}` : "";
-            process.stdout.write(`  Gateway:  ${gateway.status} ${gateway.url}${account}${problem}\n`);
-            for (const device of gateway.devices) {
-                process.stdout.write(`    ${device.online ? "●" : "○"} ${device.name}  paired ${new Date(device.pairedAt).toLocaleDateString()}\n`);
-            }
+        process.stdout.write(`  Gateway:  ${describeGateway(gateway)}\n`);
+        for (const device of gateway.devices) {
+            process.stdout.write(`    ${device.online ? "●" : "○"} ${device.name}  paired ${new Date(device.pairedAt).toLocaleDateString()}\n`);
         }
     }
     finally {