@skylandnpm/octopus-proxy 0.1.42 → 0.1.44

package/README.md

@@ -98,9 +98,9 @@ octopus-proxy onboard --tool pi
 octopus-proxy update
 ```
 
-命令通过 `npm view @skylandnpm/octopus-proxy@latest version` 查询最新版本。存在新版本时，输入 `y` 或 `yes` 确认覆盖安装；直接回车或输入其他内容会取消。确认后依次停止已安装的服务、使用 npm 全局安装查到的版本、重启服务，并校验安装版本和运行状态后反馈结果。配置、主机身份和已有服务定义会保留；未安装服务时仅更新 npm 包。
+命令通过 `npm view @skylandnpm/octopus-proxy@latest version` 查询最新版本。存在新版本时，输入 `y` 或 `yes` 确认覆盖安装；直接回车或输入其他内容会取消。确认后使用 npm 全局安装查到的版本，校验安装版本成功后才重启已安装的服务，并检查运行状态后反馈结果。安装期间不会主动停止服务。配置、主机身份和已有服务定义会保留；未安装服务时仅更新 npm 包。
 
-更新失败时会尝试恢复原先运行的服务，并报告安装及恢复结果；包安装失败不保证旧版本文件完整保留。已安装新版本但重启失败时会单独提示，可运行 `octopus-proxy doctor` 和 `octopus-proxy logs` 排查。此命令用于 npm 全局安装，停止服务前会检查 npm 安装目录是否与当前命令一致；源码、本地安装或 Node.js 环境不一致时会中止并给出提示。
+安装或版本校验失败时不会触发服务重启；包安装失败不保证旧版本文件完整保留。已安装新版本但重启失败时会单独提示，可运行 `octopus-proxy doctor` 和 `octopus-proxy logs` 排查。此命令用于 npm 全局安装，覆盖安装前会检查 npm 安装目录是否与当前命令一致；源码、本地安装或 Node.js 环境不一致时会中止并给出提示。
 
 ## 发布
 

package/dist/{chunk-HB3ETNMW.js → chunk-HDXWS2VW.js}

@@ -14897,7 +14897,7 @@ var OpenCodeAdapter = class {
     this.subscribe(project);
     const op = command.operation, p = command.payload, id = command.sessionId;
     if (op.startsWith("auth.")) return this.authentication(project, op, p);
-    const needsSession = op.startsWith("sessions.") && !["sessions.list", "sessions.create", "sessions.status"].includes(op);
+    const needsSession = op.startsWith("sessions.") && !["sessions.list", "sessions.create"].includes(op);
     if (needsSession) {
       if (!id) throw new Error("Session required");
       await this.session(project, id);
@@ -14949,7 +14949,10 @@ var OpenCodeAdapter = class {
     if (!route) throw new Error(`Unsupported OpenCode operation: ${op}`);
     const result = await this.data(project, route[0], route[1], route[2]);
     if (op === "sessions.list") return (Array.isArray(result) ? result : []).map(normalizeSession);
-    if (op === "sessions.status") return Object.fromEntries(Object.entries(result ?? {}).map(([key, value]) => [key, { type: value?.type === "running" ? "busy" : value?.type ?? "idle" }]));
+    if (op === "sessions.status") {
+      const value = result?.[id];
+      return { [id]: { type: value?.type === "running" ? "busy" : value?.type ?? "idle" } };
+    }
     if (op === "sessions.messages") return this.media.messages(project, id, (Array.isArray(result) ? result : []).map(normalizeMessage));
     if (["configuration.get", "configuration.providers"].includes(op)) return redact(result);
     if (op.startsWith("sessions.")) return this.media.normalize(project, normalizeSession(result));
@@ -16148,6 +16151,34 @@ var CodexAdapter = class {
     }
     return [...turns.values()];
   }
+  async threadWithTurns(rpc, threadId) {
+    const { thread } = await rpc.request("thread/read", { threadId });
+    const turns = [];
+    const seenCursors = /* @__PURE__ */ new Set();
+    let cursor = null;
+    try {
+      do {
+        const page = await rpc.request("thread/turns/list", {
+          threadId,
+          limit: 100,
+          sortDirection: "asc",
+          itemsView: "full",
+          ...cursor ? { cursor } : {}
+        });
+        turns.push(...page.data);
+        cursor = page.nextCursor ?? null;
+        if (cursor && seenCursors.has(cursor)) break;
+        if (cursor) seenCursors.add(cursor);
+      } while (cursor);
+      return { ...thread, turns };
+    } catch (error) {
+      const message = error instanceof Error ? error.message.toLowerCase() : String(error).toLowerCase();
+      if (message.includes("not materialized")) return { ...thread, turns: [] };
+      const unsupported = message.includes("method not found") || message.includes("unknown method") || message.includes("unsupported") && message.includes("thread/turns/list");
+      if (!unsupported) throw error;
+      return (await rpc.request("thread/read", { threadId, includeTurns: true })).thread;
+    }
+  }
   itemToPart(item) {
     const base = { id: item.id };
     const status = item.status === "completed" ? "completed" : ["failed", "declined"].includes(item.status ?? "") ? "failed" : "running";
@@ -16316,10 +16347,10 @@ var CodexAdapter = class {
     }
     if (op === "sessions.status") {
       if (!id) throw new Error("Session required");
-      const thread = await rpc.request("thread/read", { threadId: id, includeTurns: true });
+      const thread = await this.threadWithTurns(rpc, id);
       const expected = await this.workspace.root(project);
-      if (thread.thread.cwd !== expected && !await this.index(project).then((index) => index.threadIds.includes(id))) throw new Error("Session belongs to another project");
-      const turns = this.mergedTurns(project, id, thread.thread.turns ?? []);
+      if (thread.cwd !== expected && !await this.index(project).then((index) => index.threadIds.includes(id))) throw new Error("Session belongs to another project");
+      const turns = this.mergedTurns(project, id, thread.turns ?? []);
       const status = turns.at(-1)?.status;
       const busy = typeof status === "string" && !["completed", "failed", "interrupted", "cancelled", "canceled"].includes(status.toLowerCase());
       const last = turns.at(-1);
@@ -16327,10 +16358,10 @@ var CodexAdapter = class {
     }
     if (op === "sessions.messages") {
       if (!id) throw new Error("Session required");
-      const thread = await rpc.request("thread/read", { threadId: id, includeTurns: true });
+      const thread = await this.threadWithTurns(rpc, id);
       const expected = await this.workspace.root(project);
-      if (thread.thread.cwd !== expected && !await this.index(project).then((index) => index.threadIds.includes(id))) throw new Error("Session belongs to another project");
-      return this.media.messages(project, id, this.turnsToMessages(this.mergedTurns(project, id, thread.thread.turns ?? [])));
+      if (thread.cwd !== expected && !await this.index(project).then((index) => index.threadIds.includes(id))) throw new Error("Session belongs to another project");
+      return this.media.messages(project, id, this.turnsToMessages(this.mergedTurns(project, id, thread.turns ?? [])));
     }
     if (op === "sessions.prompt") {
       if (!id) throw new Error("Session required");
@@ -16357,7 +16388,7 @@ var CodexAdapter = class {
       await this.session(project, id);
       let turnId = this.activeTurns.get(id);
       if (!turnId) {
-        const { thread } = await rpc.request("thread/read", { threadId: id, includeTurns: true });
+        const thread = await this.threadWithTurns(rpc, id);
         turnId = thread.turns?.slice().reverse().find((turn) => turn.status === "inProgress")?.id;
       }
       if (!turnId) return {};

package/dist/cli.js

@@ -32,7 +32,7 @@ import {
   supportedPlatform,
   systemdUnitPath,
   toolSearchDirs
-} from "./chunk-HB3ETNMW.js";
+} from "./chunk-HDXWS2VW.js";
 
 // src/cli.ts
 import { spawn as spawn2 } from "node:child_process";
@@ -721,7 +721,7 @@ async function confirmUpdate(latest) {
   if (!stdin2.isTTY) throw new Error("\u66F4\u65B0\u9700\u8981\u5728\u4EA4\u4E92\u5F0F\u7EC8\u7AEF\u4E2D\u786E\u8BA4\uFF1B\u8BF7\u5728\u7EC8\u7AEF\u8FD0\u884C octopus-proxy update");
   const rl = createInterface2({ input: stdin2, output: stdout2 });
   try {
-    return /^(y|yes|是|确认)$/i.test((await rl.question(`\u662F\u5426\u8986\u76D6\u5B89\u88C5 ${proxyVersion} \u2192 ${latest}\uFF1F\u66F4\u65B0\u4F1A\u505C\u6B62\u5E76\u91CD\u542F\u670D\u52A1 [y/N]: `)).trim());
+    return /^(y|yes|是|确认)$/i.test((await rl.question(`\u662F\u5426\u8986\u76D6\u5B89\u88C5 ${proxyVersion} \u2192 ${latest}\uFF1F\u5B89\u88C5\u5E76\u6821\u9A8C\u6210\u529F\u540E\u4F1A\u91CD\u542F\u670D\u52A1 [y/N]: `)).trim());
   } finally {
     rl.close();
   }
@@ -768,27 +768,12 @@ async function runUpdate() {
   }
   const state = await serviceStatus();
   try {
-    if (state.installed) {
-      console.log("\u6B63\u5728\u505C\u6B62\u670D\u52A1\u2026");
-      await controlService("stop");
-      if ((await serviceStatus()).active) throw new Error("\u670D\u52A1\u4ECD\u5728\u8FD0\u884C\uFF0C\u5DF2\u4E2D\u6B62\u8986\u76D6\u5B89\u88C5");
-    }
     console.log(`\u6B63\u5728\u5B89\u88C5 ${PACKAGE}@${latest}\u2026`);
     await installVersion(latest, prefix);
     const installed = JSON.parse(await readFile3(join3(target, "package.json"), "utf8"));
     if (installed.version !== latest) throw new Error(`\u5B89\u88C5\u7248\u672C\u6821\u9A8C\u5931\u8D25\uFF1A\u671F\u671B ${latest}\uFF0C\u5B9E\u9645 ${installed.version ?? "\u672A\u77E5"}`);
   } catch (error) {
-    let recovery = "";
-    if (state.active) {
-      console.log("\u66F4\u65B0\u5931\u8D25\uFF0C\u6B63\u5728\u5C1D\u8BD5\u6062\u590D\u670D\u52A1\u2026");
-      try {
-        await restartAndVerify();
-        recovery = "\uFF1B\u670D\u52A1\u5DF2\u6062\u590D\u8FD0\u884C";
-      } catch (restartError) {
-        recovery = `\uFF1B\u670D\u52A1\u6062\u590D\u5931\u8D25\uFF1A${message(restartError)}`;
-      }
-    }
-    throw new Error(`\u66F4\u65B0\u5931\u8D25\uFF1A${message(error)}${recovery}`);
+    throw new Error(`\u66F4\u65B0\u5931\u8D25\uFF1A${message(error)}`);
   }
   if (state.installed) {
     console.log("\u5B89\u88C5\u5B8C\u6210\uFF0C\u6B63\u5728\u91CD\u542F\u670D\u52A1\u2026");
@@ -811,7 +796,7 @@ var USAGE = `octopus-proxy \u2014 Octopus \u4E3B\u673A\u4EE3\u7406
   projects    \u5217\u51FA\u6388\u6743\u9879\u76EE\uFF1B\u53EF\u6309\u5E8F\u53F7\u5220\u9664\u9519\u8BEF\u914D\u7F6E\u9879
   install     \u6821\u9A8C\u914D\u7F6E\u540E\u5B89\u88C5/\u66F4\u65B0\u7CFB\u7EDF\u670D\u52A1\uFF08\u5E42\u7B49\uFF0C\u81EA\u52A8\u542F\u52A8\uFF09
   uninstall   \u505C\u6B62\u5E76\u79FB\u9664\u7CFB\u7EDF\u670D\u52A1\uFF08\u4FDD\u7559\u914D\u7F6E\u4E0E\u72B6\u6001\u6570\u636E\uFF09
-  update      \u68C0\u67E5 npm \u6700\u65B0\u7248\u672C\uFF0C\u786E\u8BA4\u540E\u505C\u6B62\u670D\u52A1\u3001\u8986\u76D6\u5B89\u88C5\u5E76\u91CD\u542F
+  update      \u68C0\u67E5 npm \u6700\u65B0\u7248\u672C\uFF0C\u786E\u8BA4\u540E\u8986\u76D6\u5B89\u88C5\uFF0C\u6821\u9A8C\u6210\u529F\u540E\u91CD\u542F
   start       \u542F\u52A8\u670D\u52A1
   stop        \u505C\u6B62\u670D\u52A1
   restart     \u91CD\u542F\u670D\u52A1

package/dist/main.js

@@ -2,7 +2,7 @@
 import {
   ConfigError,
   runDaemon
-} from "./chunk-HB3ETNMW.js";
+} from "./chunk-HDXWS2VW.js";
 
 // src/main.ts
 runDaemon(process.env.OCTOPUS_PROXY_CONFIG ?? "proxy.json").catch((error) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@skylandnpm/octopus-proxy",
-  "version": "0.1.42",
+  "version": "0.1.44",
   "type": "module",
   "description": "Octopus host proxy: OpenCode, Codex, ZCode and Pi adapters with service installer CLI",
   "bin": {