@super-coding/cli 0.2.4 → 0.2.6

package/dist/daemon/app-config-pull.js

@@ -0,0 +1,174 @@
+import { inspectPingcodeConfig } from "../pingcode/config.js";
+const DEFAULT_FIRST_DELAY_MS = 2_000;
+const DEFAULT_DELAYS_MS = [30_000, 120_000, 300_000];
+const DEFAULT_MAX_ATTEMPTS = 24;
+/**
+ * 是否需要向平台要凭据。
+ *
+ * 刻意用配置文件状态而不是 `bridge.status().reason`：
+ * - `PingcodeBridge.refresh()` 是 private、`status()` 是启动快照，运行期 connect 后会失真；
+ * - `binary_missing` / `skill_missing` 拉凭据也救不了，拉了纯浪费；
+ * - **配置损坏（invalid）必须排除**：remote-config 对坏文件永远 `skipped_invalid` 不覆盖，拉取 100% 空转。
+ */
+function checkCredentials(env) {
+    if (env["SC_PINGCODE"] === "off" || env["SC_PINGCODE_REMOTE_CONFIG"] === "off") {
+        return { pull: false, reason: "disabled" };
+    }
+    // 环境里已有显式令牌：本地就能用，不需要平台下发
+    if ((env["PC_TOKEN"] ?? "").trim())
+        return { pull: false, reason: "ready" };
+    const state = inspectPingcodeConfig().state;
+    if (state === "ok")
+        return { pull: false, reason: "ready" };
+    if (state === "invalid")
+        return { pull: false, reason: "invalid" };
+    return { pull: true };
+}
+/**
+ * 无凭据时的退避拉取器。
+ * 生命周期：`onSessionReady()`（收到 hello 的 resume）→ 首发 → 退避重试；
+ * `onDisconnected()` 停表但保留计数语义（重连会重置）；`stop()` 是进程退出用的硬停。
+ */
+export class AppConfigPuller {
+    opts;
+    env;
+    firstDelayMs;
+    delaysMs;
+    maxAttempts;
+    setTimer;
+    clearTimer;
+    log;
+    timer;
+    connected = false;
+    disposed = false;
+    halted;
+    attempts = 0;
+    /** 「无凭据，开始拉取」只提示一次，避免每次重连都刷日志 */
+    announced = false;
+    constructor(opts) {
+        this.opts = opts;
+        this.env = opts.env ?? process.env;
+        this.firstDelayMs = opts.firstDelayMs ?? DEFAULT_FIRST_DELAY_MS;
+        this.delaysMs = opts.delaysMs ?? DEFAULT_DELAYS_MS;
+        this.maxAttempts = opts.maxAttempts ?? DEFAULT_MAX_ATTEMPTS;
+        this.setTimer = opts.setTimer ?? ((fn, ms) => setTimeout(fn, ms));
+        this.clearTimer = opts.clearTimer ?? ((timer) => clearTimeout(timer));
+        this.log = opts.log ?? ((level, msg) => (level === "warn" ? console.warn(msg) : console.log(msg)));
+    }
+    /** 收到 hello 的 resume（唯一可靠的「已鉴权」信号）：重新评估并安排首次拉取 */
+    onSessionReady() {
+        if (this.disposed)
+            return;
+        this.connected = true;
+        this.attempts = 0;
+        this.halted = undefined;
+        const check = checkCredentials(this.env);
+        if (!check.pull) {
+            this.noteUnavailable(check.reason);
+            return;
+        }
+        this.schedule(this.firstDelayMs);
+    }
+    /** 收到并应用了 app:config：本机配置已可用就立刻停（省掉后续重试） */
+    onAppConfigApplied() {
+        if (this.disposed || this.halted === "ready")
+            return;
+        if (inspectPingcodeConfig().state === "ok")
+            this.halt("ready");
+    }
+    /** 连接断开：停表、不消耗尝试次数（重连后会从首发间隔重来） */
+    onDisconnected() {
+        this.connected = false;
+        this.clearScheduled();
+    }
+    /** 进程退出 / 关闸：硬停，之后不再调度 */
+    stop() {
+        if (this.disposed)
+            return;
+        this.disposed = true;
+        this.connected = false;
+        this.clearScheduled();
+    }
+    state() {
+        return {
+            attempts: this.attempts,
+            scheduled: this.timer !== undefined,
+            ...(this.halted ? { stopReason: this.halted } : {}),
+        };
+    }
+    schedule(ms) {
+        this.clearScheduled();
+        this.timer = this.setTimer(() => {
+            this.timer = undefined;
+            this.attempt();
+        }, ms);
+        this.timer.unref?.();
+    }
+    clearScheduled() {
+        if (this.timer === undefined)
+            return;
+        this.clearTimer(this.timer);
+        this.timer = undefined;
+    }
+    attempt() {
+        if (this.disposed || !this.connected || this.halted)
+            return;
+        // 每次请求前自检：配置可能已被 connect / 平台下发写好了
+        const check = checkCredentials(this.env);
+        if (!check.pull) {
+            this.noteUnavailable(check.reason);
+            return;
+        }
+        if (this.maxAttempts > 0 && this.attempts >= this.maxAttempts) {
+            this.halt("max_attempts");
+            return;
+        }
+        this.opts.send({ type: "app:config:pull", reason: "no_credentials" });
+        this.attempts += 1;
+        if (!this.announced) {
+            this.announced = true;
+            this.log("info", `[daemon] PingCode 无凭据，已向平台请求（退避 ${this.describeDelays()}，最多 ${this.maxAttempts || "不限"} 次）`);
+        }
+        this.schedule(this.delayFor(this.attempts));
+    }
+    delayFor(attempt) {
+        const index = Math.min(attempt - 1, this.delaysMs.length - 1);
+        return this.delaysMs[index] ?? DEFAULT_DELAYS_MS[DEFAULT_DELAYS_MS.length - 1];
+    }
+    describeDelays() {
+        const first = `${Math.round(this.firstDelayMs / 1000)}s`;
+        const rest = this.delaysMs.map((ms) => (ms >= 60_000 ? `${Math.round(ms / 60_000)}m` : `${Math.round(ms / 1000)}s`));
+        return [first, ...rest].join("→");
+    }
+    noteUnavailable(reason) {
+        const target = reason ?? "ready";
+        // 已经因为同一原因停过就不再重复记录
+        if (this.halted === target)
+            return;
+        this.halt(target);
+    }
+    halt(reason) {
+        this.clearScheduled();
+        this.halted = reason;
+        const attempted = this.attempts;
+        if (reason === "ready") {
+            if (attempted > 0)
+                this.log("info", `[daemon] 已取得 PingCode 凭据，停止拉取（已请求 ${attempted} 次）`);
+            return;
+        }
+        if (reason === "disabled") {
+            this.log("info", "[daemon] PingCode 平台拉取已关闭（SC_PINGCODE=off / SC_PINGCODE_REMOTE_CONFIG=off）");
+            return;
+        }
+        if (reason === "invalid") {
+            this.log("warn", "[daemon][warn] 本机 pingcode.json 内容损坏，平台下发不会覆盖，跳过拉取（请运行 scode pingcode connect）");
+            return;
+        }
+        this.log("warn", `[daemon][warn] 已请求 ${attempted} 次仍无 PingCode 凭据，停止拉取；重连后会重试，或运行 scode pingcode status 查看原因`);
+    }
+}
+export const appConfigPullerDefaults = {
+    DEFAULT_FIRST_DELAY_MS,
+    DEFAULT_DELAYS_MS,
+    DEFAULT_MAX_ATTEMPTS,
+};

package/dist/daemon/index.js

@@ -1,6 +1,7 @@
 import { execFile } from "node:child_process";
 import { createRequire } from "node:module";
 import { loadBuiltinAgent } from "./agent/index.js";
+import { AppConfigPuller } from "./app-config-pull.js";
 import { detectRunnerFeatures } from "./adapters/features.js";
 import { adapters, agentBinaries } from "./adapters/registry.js";
 import { loadDaemonConfig, loadDevice, removeDevice, restoreDeviceBackup } from "./device-store.js";
@@ -57,6 +58,7 @@ export async function runDaemon() {
     // 信号处理提前注册：配对/探测/reattach 期间收到 stop 也要优雅收尾（否则默认信号直接杀进程）
     let orchRef;
     let wsClient;
+    let pullerRef;
     let presenceTimer;
     let pidTimer;
     let shuttingDown = false;
@@ -69,6 +71,7 @@ export async function runDaemon() {
             clearInterval(presenceTimer);
         if (pidTimer)
             clearInterval(pidTimer);
+        pullerRef?.stop();
         await orchRef?.shutdown();
         wsClient?.close();
         process.exit(0);
@@ -215,6 +218,11 @@ export async function runDaemon() {
     // 配置可能在运行期才写入（scode pingcode connect），bridge 每轮任务会自行重探。
     const pingcode = await createPingcodeBridge();
     console.log(`[daemon] pingcode: ${describePingcode(pingcode.status())}`);
+    // 平台凭据主动拉取：本机没有凭据时按退避发 app:config:pull（下发原本只在 hello 那一刻，
+    // 已在线却错过那次的机器永远拿不到）。send 经 wsRef 转发，断线时 ws-client 会静默丢弃，
+    // puller 自己也会在 onDisconnected 停表。
+    const appConfigPuller = new AppConfigPuller({ send: (m) => wsRef.send(m), env: process.env });
+    pullerRef = appConfigPuller;
     const orch = new Orchestrator({ send: (m) => wsRef.send(m) }, store, adapters, router, daemonConfig.allowedCwds, (runner) => detectRunnerFeatures(runner, agentBinaries[runner] ?? runner), pingcode);
     orchRef = orch;
     // 4401 双确认：平台瞬时空读也可能让 auth 回源报「查无此设备」——首次只告警并
@@ -249,11 +257,21 @@ export async function runDaemon() {
                 unauth4401Streak = 0;
                 // 必须兜住拒绝：handleMessage 是 async，任一步抛出都会变成 unhandledRejection，
                 // Node 15+ 默认终止进程 → 表现成「daemon 莫名消失」
-                void orch.handleMessage(msg).catch((err) => {
+                const handled = orch.handleMessage(msg);
+                void handled.catch((err) => {
                     console.error(`[daemon] 处理 ${msg.type} 失败: ${err instanceof Error ? err.message : String(err)}`);
                 });
+                // resume（无 sync_id）是「hello 已鉴权」的唯一可靠信号：onOpen 早于鉴权，
+                // 那时发非 hello 消息会被服务端 close(4401)。
+                if (msg.type === "resume" && !msg.sync_id)
+                    appConfigPuller.onSessionReady();
+                if (msg.type === "app:config") {
+                    // 两参数 then：只写 onFulfilled 会在 reject 时产生新的 unhandledRejection
+                    void handled.then(() => appConfigPuller.onAppConfigApplied(), () => undefined);
+                }
             },
             onClose: (code, reason) => {
+                appConfigPuller.onDisconnected();
                 // 确定性解绑（CES 查无此设备 → 4401 unauthorized）：清凭证就地重新配对。
                 // 覆盖离线解绑/反向通知 RPC 未送达的场景（否则旧凭证残留导致永不出配对码）。
                 // 其余 close（如 4402 auth_unavailable）保留凭证，走自动退避重连。

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@super-coding/cli",
-  "version": "0.2.4",
+  "version": "0.2.6",
   "description": "Super Coding CLI：把本机 Claude Code / Cursor 接入远程控制台（scode 命令与后台 daemon）",
   "license": "UNLICENSED",
   "type": "module",
@@ -35,7 +35,7 @@
   "dependencies": {
     "commander": "^14.0.2",
     "ws": "^8.21.3",
-    "@super-coding/protocol": "0.1.1"
+    "@super-coding/protocol": "0.2.1"
   },
   "scripts": {
     "dev": "tsx watch src/cli.ts",