@tunnelbox/dsh-tunnelbox 0.1.29 → 0.1.32

package/README.md

@@ -98,7 +98,7 @@ Each instance appears separately on the phone by `type=dsh` + its own agentID.
 
 ## Multilingual
 
-User-visible output supports 8 languages (`zh-CN` / `zh-TW` / `en-US` / `ja-JP` / `ko-KR` / `fr-FR` / `de-DE` / `es-ES`). Resolution order: `TUNNELBOX_LANG` > saved `remote-state.dsh.json.lang` > system locale > `en-US`.
+User-visible output supports 8 languages (`zh-CN` / `zh-TW` / `en-US` / `ja-JP` / `ko-KR` / `fr-FR` / `de-DE` / `es-ES`). Resolution order: `TUNNELBOX_LANG` > system locale > `en-US`.
 
 ## Troubleshooting
 
@@ -111,8 +111,7 @@ User-visible output supports 8 languages (`zh-CN` / `zh-TW` / `en-US` / `ja-JP`
 
 ## State files
 
-- `~/.tunnelbox/remote-state.dsh.json` — agentID / relay / bound state / language
-- `~/.tunnelbox/remote-pairing.json` — latest pairing info
+- `~/.tunnelbox/remote-state.dsh.json` — agentID (+ language)
 - `~/.tunnelbox/tunnelbox.log` — plugin log
 
 ## Uninstall

package/README.zh-CN.md

@@ -111,8 +111,7 @@ DSH_HOME=~/.dsh-b DSH_PERMISSION_MODE=danger-full-access dsh --profile tunnelbox
 
 ## 状态文件
 
-- `~/.tunnelbox/remote-state.dsh.json` — agentID / 中继地址 / 绑定状态 / 语言
-- `~/.tunnelbox/remote-pairing.json` — 最新配对信息
+- `~/.tunnelbox/remote-state.dsh.json` — agentID（+ 语言）
 - `~/.tunnelbox/tunnelbox.log` — 插件日志
 
 ## 卸载

package/dist/index.mjs

@@ -208,7 +208,6 @@ var zh_CN_default = {
   "perm.promptResource": "opencode \u8BF7\u6C42\u8BBF\u95EE\u8D44\u6E90\uFF1A{list}",
   "perm.promptTool": "opencode \u8BF7\u6C42\u6267\u884C {tool}",
   "qr.codeLabel": "\u914D\u5BF9\u7801",
-  "qr.fileWritten": "\u914D\u5BF9\u4FE1\u606F\u5DF2\u5199\u5165: {path}",
   "qr.openHint": "\u6253\u5F00 tunnelbox App\uFF0C\u7528\u300C\u626B\u4E00\u626B\u914D\u5BF9\u300D\u626B\u63CF\u4E0A\u65B9\u4E8C\u7EF4\u7801\uFF0C\u6216\u624B\u52A8\u8F93\u5165\u914D\u5BF9\u7801\u3002",
   "qr.titleNoType": "tunnelbox \u624B\u673A\u914D\u5BF9",
   "qr.titleWithType": "tunnelbox {type} \u624B\u673A\u914D\u5BF9",
@@ -618,7 +617,6 @@ var zh_TW_default = {
   "perm.promptResource": "opencode \u8ACB\u6C42\u5B58\u53D6\u8CC7\u6E90\uFF1A{list}",
   "perm.promptTool": "opencode \u8ACB\u6C42\u57F7\u884C {tool}",
   "qr.codeLabel": "\u914D\u5C0D\u78BC",
-  "qr.fileWritten": "\u914D\u5C0D\u8CC7\u8A0A\u5DF2\u5BEB\u5165: {path}",
   "qr.openHint": "\u958B\u555F tunnelbox App\uFF0C\u7528\u300C\u6383\u63CF\u914D\u5C0D\u300D\u6383\u63CF\u4E0A\u65B9 QR Code\uFF0C\u6216\u624B\u52D5\u8F38\u5165\u914D\u5C0D\u78BC\u3002",
   "qr.titleNoType": "tunnelbox \u624B\u6A5F\u914D\u5C0D",
   "qr.titleWithType": "tunnelbox {type} \u624B\u6A5F\u914D\u5C0D",
@@ -1028,7 +1026,6 @@ var en_US_default = {
   "perm.promptResource": "opencode requests access to resources: {list}",
   "perm.promptTool": "opencode requests to run {tool}",
   "qr.codeLabel": "Pairing code",
-  "qr.fileWritten": "Pairing info written to: {path}",
   "qr.openHint": "Open the tunnelbox app on your phone and scan the QR code above, or enter the pairing code manually in the app.",
   "qr.titleNoType": "tunnelbox phone pairing",
   "qr.titleWithType": "tunnelbox {type} phone pairing",
@@ -1438,7 +1435,6 @@ var ja_JP_default = {
   "perm.promptResource": "opencode \u304C\u30EA\u30BD\u30FC\u30B9\u3078\u306E\u30A2\u30AF\u30BB\u30B9\u3092\u8981\u6C42: {list}",
   "perm.promptTool": "opencode \u304C {tool} \u306E\u5B9F\u884C\u3092\u8981\u6C42",
   "qr.codeLabel": "\u30DA\u30A2\u30EA\u30F3\u30B0\u30B3\u30FC\u30C9",
-  "qr.fileWritten": "\u30DA\u30A2\u30EA\u30F3\u30B0\u60C5\u5831\u3092\u66F8\u304D\u8FBC\u307F\u307E\u3057\u305F: {path}",
   "qr.openHint": "tunnelbox App \u3092\u958B\u304D\u3001\u4E0A\u306E QR \u30B3\u30FC\u30C9\u3092\u30B9\u30AD\u30E3\u30F3\u3059\u308B\u304B\u3001App \u3067\u30DA\u30A2\u30EA\u30F3\u30B0\u30B3\u30FC\u30C9\u3092\u624B\u52D5\u5165\u529B\u3057\u3066\u304F\u3060\u3055\u3044\u3002",
   "qr.titleNoType": "tunnelbox \u30B9\u30DE\u30DB\u30DA\u30A2\u30EA\u30F3\u30B0",
   "qr.titleWithType": "tunnelbox {type} \u30B9\u30DE\u30DB\u30DA\u30A2\u30EA\u30F3\u30B0",
@@ -1848,7 +1844,6 @@ var ko_KR_default = {
   "perm.promptResource": "opencode\uAC00 \uB9AC\uC18C\uC2A4 \uC811\uADFC\uC744 \uC694\uCCAD: {list}",
   "perm.promptTool": "opencode\uAC00 {tool} \uC2E4\uD589\uC744 \uC694\uCCAD",
   "qr.codeLabel": "\uD398\uC5B4\uB9C1 \uCF54\uB4DC",
-  "qr.fileWritten": "\uD398\uC5B4\uB9C1 \uC815\uBCF4\uAC00 \uAE30\uB85D\uB428: {path}",
   "qr.openHint": "tunnelbox \uC571\uC744 \uC5F4\uACE0 \uC704 QR \uCF54\uB4DC\uB97C \uC2A4\uCE94\uD558\uAC70\uB098, \uC571\uC5D0\uC11C \uD398\uC5B4\uB9C1 \uCF54\uB4DC\uB97C \uC9C1\uC811 \uC785\uB825\uD558\uC138\uC694.",
   "qr.titleNoType": "tunnelbox \uD734\uB300\uD3F0 \uD398\uC5B4\uB9C1",
   "qr.titleWithType": "tunnelbox {type} \uD734\uB300\uD3F0 \uD398\uC5B4\uB9C1",
@@ -2258,7 +2253,6 @@ var fr_FR_default = {
   "perm.promptResource": "opencode demande l'acc\xE8s aux ressources : {list}",
   "perm.promptTool": "opencode demande d'ex\xE9cuter {tool}",
   "qr.codeLabel": "Code d'appairage",
-  "qr.fileWritten": "Informations d'appairage \xE9crites dans : {path}",
   "qr.openHint": "Ouvrez l'application tunnelbox sur votre t\xE9l\xE9phone et scannez le QR ci-dessus, ou saisissez le code d'appairage manuellement dans l'application.",
   "qr.titleNoType": "appairage t\xE9l\xE9phone tunnelbox",
   "qr.titleWithType": "appairage t\xE9l\xE9phone tunnelbox {type}",
@@ -2668,7 +2662,6 @@ var de_DE_default = {
   "perm.promptResource": "opencode fordert Zugriff auf Ressourcen: {list}",
   "perm.promptTool": "opencode fordert die Ausf\xFChrung von {tool} an",
   "qr.codeLabel": "Pairing-Code",
-  "qr.fileWritten": "Pairing-Informationen geschrieben in: {path}",
   "qr.openHint": "\xD6ffnen Sie die tunnelbox-App auf dem Telefon und scannen Sie den QR-Code oben, oder geben Sie den Pairing-Code manuell in der App ein.",
   "qr.titleNoType": "tunnelbox Telefon-Pairing",
   "qr.titleWithType": "tunnelbox {type} Telefon-Pairing",
@@ -3078,7 +3071,6 @@ var es_ES_default = {
   "perm.promptResource": "opencode solicita acceso a los recursos: {list}",
   "perm.promptTool": "opencode solicita ejecutar {tool}",
   "qr.codeLabel": "C\xF3digo de emparejamiento",
-  "qr.fileWritten": "Informaci\xF3n de emparejamiento escrita en: {path}",
   "qr.openHint": "Abra la aplicaci\xF3n tunnelbox en el tel\xE9fono y escanee el c\xF3digo QR superior, o introduzca el c\xF3digo de emparejamiento manualmente en la aplicaci\xF3n.",
   "qr.titleNoType": "emparejamiento de tel\xE9fono tunnelbox",
   "qr.titleWithType": "emparejamiento de tel\xE9fono tunnelbox {type}",
@@ -3523,8 +3515,6 @@ function loadState(type) {
     if (parsed.agentId && parsed.agentId.length >= 16) {
       return {
         agentId: parsed.agentId,
-        relayUrl: parsed.relayUrl || "",
-        claimed: parsed.claimed === true,
         lang: parsed.lang ? normalizeLang(parsed.lang) : void 0
       };
     }
@@ -3535,26 +3525,6 @@ function loadState(type) {
     return fallback;
   }
 }
-function writePairingFile(code, type, lang) {
-  const p = join(baseName(), `remote-pairing${suffix(type)}.txt`);
-  try {
-    mkdirSync(dirname(p), { recursive: true });
-    const label = t(lang ?? resolveLang(), "qr.codeLabel");
-    writeFileSync(p, `${label}: ${code}
-`, "utf8");
-  } catch {
-  }
-  return p;
-}
-function writePairingJson(info, type) {
-  const p = join(baseName(), `remote-pairing${suffix(type)}.json`);
-  try {
-    mkdirSync(dirname(p), { recursive: true });
-    writeFileSync(p, JSON.stringify(info, null, 2), "utf8");
-  } catch {
-  }
-  return p;
-}
 function injectedRelayUrl() {
   return "wss://relay.tunnelbox.top" ? "wss://relay.tunnelbox.top".replace(/\/+$/, "") : "";
 }
@@ -3604,7 +3574,6 @@ function padVisual(s, width, align = "left") {
 }
 async function printPairing(code, type, name2, lang) {
   const resolved = lang ? normalizeLang(lang) : resolveLang();
-  const file = writePairingFile(code, type, resolved);
   const tt = (key, vars) => t(resolved, key, vars);
   const title = type ? tt("qr.titleWithType", { type }) : tt("qr.titleNoType");
   const codeLine = `${tt("qr.codeLabel")}: ${code}`;
@@ -3632,7 +3601,6 @@ async function printPairing(code, type, name2, lang) {
   } catch {
     console.log("  " + tt("qr.unavailable"));
   }
-  console.log("  " + tt("qr.fileWritten", { path: file }));
   console.log("");
 }
 var DEFAULT_PAGE_SIZE = 20;
@@ -3986,8 +3954,19 @@ import { join as join2 } from "node:path";
 function dshHome() {
   return process.env.DSH_HOME || join2(homedir2(), ".dsh");
 }
-function release(prep) {
-  const p = prep;
+function headerOf(s) {
+  if (s.header && typeof s.header.id === "string") return s.header;
+  return { id: s.id ?? "", createdAt: s.createdAt ?? 0, cwd: s.cwd };
+}
+async function release(h) {
+  const p = h;
+  if (typeof p?.close === "function") {
+    try {
+      await p.close();
+    } catch {
+    }
+    return;
+  }
   const d = typeof p?.dispose === "function" ? p.dispose : typeof p?.[Symbol.dispose] === "function" ? p[Symbol.dispose] : void 0;
   if (typeof d === "function") {
     try {
@@ -4008,20 +3987,36 @@ function titleOf(events) {
   return sessionTitle(msgs) || "";
 }
 async function readSessionEvents(sp, sessionId) {
+  if (typeof sp.open === "function") {
+    const handle = await sp.open(sessionId, "read");
+    try {
+      const result = await handle.read();
+      return [...result.events];
+    } finally {
+      await release(handle);
+    }
+  }
   if (typeof sp.inspect === "function") {
     const view = await sp.inspect(sessionId);
     return [...view.events ?? []];
   }
-  const prep = await sp.prepare(sessionId);
-  try {
-    return [...prep.session.events];
-  } finally {
-    release(prep);
+  if (typeof sp.prepare === "function") {
+    const prep = await sp.prepare(sessionId);
+    try {
+      return [...prep.session.events];
+    } finally {
+      await release(prep);
+    }
   }
+  return [];
 }
 async function sessionExists(sp, sessionId) {
+  if (typeof sp.stat === "function") {
+    const snap = await sp.stat(sessionId).catch(() => void 0);
+    return !!snap;
+  }
   const headers = await sp.list().catch(() => []);
-  return headers.some((h) => h.id === sessionId);
+  return headers.some((h) => headerOf(h).id === sessionId);
 }
 async function sessionInfo(sp, h, t2) {
   let events = [];
@@ -4044,7 +4039,9 @@ async function sessionInfo(sp, h, t2) {
 async function listSessions(sp, workspace, t2) {
   const headers = await sp.list().catch(() => []);
   const out = [];
-  for (const h of headers) {
+  for (const raw of headers) {
+    const h = headerOf(raw);
+    if (!h.id) continue;
     if (workspace && h.cwd !== workspace) continue;
     const s = await sessionInfo(sp, h, t2);
     if (s) out.push(s);
@@ -4054,7 +4051,8 @@ async function listSessions(sp, workspace, t2) {
 async function listWorkspaces(sp, current) {
   const headers = await sp.list().catch(() => []);
   const byPath = /* @__PURE__ */ new Map();
-  for (const h of headers) {
+  for (const raw of headers) {
+    const h = headerOf(raw);
     const p = h.cwd;
     if (!p) continue;
     const e = byPath.get(p) ?? { count: 0, updated: 0 };
@@ -4104,7 +4102,7 @@ function findDir(dir, name2) {
 }
 
 // src/bridge.ts
-var VERSION = true ? "0.1.29" : "0.0.0-dev";
+var VERSION = true ? "0.1.32" : "0.0.0-dev";
 var AGENT_TYPE = "dsh";
 var APPROVAL_TIMEOUT_MS = 12e4;
 var ADAPTER_COMMANDS = [
@@ -4122,7 +4120,7 @@ var TunnelboxBridge = class {
   }
   ws = new RelayClient();
   state = loadState(AGENT_TYPE);
-  claimed = !!this.state.claimed;
+  paired = false;
   everConnected = false;
   relayBase = "";
   /** sessionID → 活动 AgentHandle（本进程生命周期）。 */
@@ -4240,7 +4238,6 @@ ${err.stack}` : ""));
       timezone: localTimezone()
     };
     this.send(envelope("agent.info", info));
-    if (!this.claimed) this.send(envelope("pair.create", {}));
   }
   getSessionPersistence() {
     return this.ctx.get("sessionPersistence");
@@ -4250,17 +4247,17 @@ ${err.stack}` : ""));
       switch (env.type) {
         case "pair.created": {
           const code = env.payload.code;
-          writePairingJson({ code, relayUrl: this.relayBase, at: Date.now() }, AGENT_TYPE);
           this.log(this.t("adapter.logPairCode", { code }));
           void printPairing(code, AGENT_TYPE, hostname(), this.lang);
           return;
         }
-        case "agent.claimed":
-          this.claimed = true;
-          this.state.claimed = true;
-          saveState(this.state, AGENT_TYPE);
-          this.log(this.t("adapter.logClaimed"));
+        case "agent.status": {
+          const status = env.payload;
+          this.paired = status?.claimed === true;
+          if (this.paired) this.log(this.t("adapter.logClaimed"));
+          else this.send(envelope("pair.create", {}));
           return;
+        }
         case "agent.revoked":
           this.resetIdentity();
           return;
@@ -4947,9 +4944,8 @@ ${err.stack}` : ""));
   }
   resetIdentity() {
     this.log(this.t("adapter.logResetIdentity"));
-    this.claimed = false;
+    this.paired = false;
     this.state.agentId = randomBytes2(16).toString("hex");
-    this.state.claimed = false;
     saveState(this.state, AGENT_TYPE);
     this.ws.close();
     this.connect(this.relayBase);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tunnelbox/dsh-tunnelbox",
-  "version": "0.1.29",
+  "version": "0.1.32",
   "description": "tunnelbox 的 dsh 原生 Cordis 插件：手机远程驱动 DeepSeek Harness（agent/session/tools/审批/中止）",
   "type": "module",
   "main": "./dist/index.mjs",
@@ -36,7 +36,7 @@
     "@deepseek-ai/schemastery": "^3.18.1"
   },
   "devDependencies": {
-    "@tunnelbox/core": "0.1.29",
+    "@tunnelbox/core": "0.1.32",
     "@types/node": "^22.0.0",
     "esbuild": "^0.24.0",
     "typescript": "^5.4.5"