@skylandnpm/octopus-proxy 0.1.64 → 0.1.66

package/README.md

@@ -60,7 +60,7 @@ octopus-proxy restart
 
 Claw 完成主机信任和账号认证后，通过端到端会话向 Proxy 发送只读 `runtime.snapshot` 命令。响应包含当前运行状态、Hub 和工具设置、授权项目路径，以及工具可提供的模型信息；机器人 Secret、工具密码和提供商凭据不会返回。工作区的“Proxy 信息”按钮可查看这些内容。
 
-Codex 和 ZCode 由 Proxy 按授权项目启动各自的 app-server，默认随 Proxy 自动启动；服务未就绪时也可在 Claw 点击“启动服务”。若命令不可执行或某个项目启动失败，工作区会显示失败项目及原因。修改命令路径或授权项目后，运行 `octopus-proxy restart` 使配置生效。
+Codex 和 ZCode 由 Proxy 按授权项目启动各自的 app-server，默认随 Proxy 自动启动；服务未就绪时也可在 Claw 点击“启动服务”。若命令不可执行或某个项目启动失败，工作区会显示失败项目及原因。通过 `onboard` 或配置文件修改授权项目后，Claw 打开、切换或刷新工作区项目时会读取最新项目配置；目录变化会释放该项目的旧运行资源和终端，并刷新文件面板。Proxy 不轮询配置文件，也不因主机配置变化主动推送刷新通知。Claw 也可在授权项目菜单中点击“修改项目”，修改“Proxy 主机上的目录”并保存；Proxy 校验目录存在且未重复授权后写入主机配置，Claw 随即刷新工作区，无需重启 Proxy。修改工具命令、机器人凭据等其他设置后，仍需运行 `octopus-proxy restart`。
 
 ## Claw 设备配对与撤销
 
@@ -123,6 +123,30 @@ octopus-proxy update
 
 安装或版本校验失败时不会触发服务重启；包安装失败不保证旧版本文件完整保留。已安装新版本但重启失败时会单独提示，可运行 `octopus-proxy doctor` 和 `octopus-proxy logs` 排查。此命令用于 npm 全局安装，覆盖安装前会检查 npm 安装目录是否与当前命令一致；源码、本地安装或 Node.js 环境不一致时会中止并给出提示。
 
+## Linux 服务在线，但终端显示“未运行、未启用”
+
+后台服务创建的终端可能没有登录会话中的 `XDG_RUNTIME_DIR`。此时 `systemctl --user` 会报 `Failed to connect to bus: No medium found`，不能据此判断服务已停止。CLI 会在未显式配置用户会话环境时，检查 `/run/user/<当前 UID>` 是否存在且属于当前用户，并用于服务查询和控制；查询失败会报告错误。此检查也支持只有 `systemd/private`、没有会话 `bus` socket 的环境。
+
+旧版可先验证：
+
+```sh
+XDG_RUNTIME_DIR=/run/user/$(id -u) octopus-proxy status
+```
+
+如果显示正常，可在该服务账号的 `~/.bashrc` 中补上以下设置，使 Claw 新建的 Bash 终端也能查询用户服务：
+
+```sh
+if [ -z "${XDG_RUNTIME_DIR:-}" ] && [ -z "${DBUS_SESSION_BUS_ADDRESS:-}" ]; then
+    octopus_runtime_dir="/run/user/$(id -u)"
+    if [ -d "$octopus_runtime_dir" ] && [ -O "$octopus_runtime_dir" ]; then
+        export XDG_RUNTIME_DIR="$octopus_runtime_dir"
+    fi
+    unset octopus_runtime_dir
+fi
+```
+
+重新打开终端或运行 `source ~/.bashrc` 后验证 `octopus-proxy status`。如果对应用户运行目录或用户服务管理器不存在，仍需检查主机的登录会话和 linger 配置。
+
 ## 服务启动时报 `Unexpected token '??='`
 
 这通常表示服务实际使用了旧版 Node.js。错误栈中 `.nvm/versions/node/v22.../lib/node_modules` 是包的安装位置，不能说明运行它的 Node.js 版本。安装器只会选择 Node.js 22 或更高版本；旧版安装器可能优先选中能执行 `--version` 的旧系统 Node。

package/dist/{chunk-J3ZMMSW2.js → chunk-IV5ZGRAM.js}

@@ -12,7 +12,7 @@ import {
   probeRemote,
   remoteSessionBudget,
   z
-} from "./chunk-GS3Q6EU5.js";
+} from "./chunk-UFLXQ4HQ.js";
 
 // ../../node_modules/.pnpm/ajv@8.17.1/node_modules/ajv/dist/compile/codegen/code.js
 var require_code = __commonJS({
@@ -11616,7 +11616,13 @@ function standaloneZcodeSource(source) {
     throw new Error("Unsupported ZCode account bootstrap; native compatibility check failed");
   }
   body = body.replace(registryCall, `${registry}($1,{standalone:{}})`).replace(nativePorts, "$&providerRuntimeHeadersPort:$1.providerRuntimeHeadersPort,");
-  return source.slice(0, start) + body + source.slice(end);
+  source = source.slice(0, start) + body + source.slice(end);
+  const close = /\br\(([$\w]+),"closeSession"\)/.exec(source)?.[1];
+  if (!close) throw new Error("Unsupported ZCode bundle: session close is unavailable");
+  const escapedClose = close.replace(/[$]/g, "\\$&");
+  const closeBody = new RegExp(`async function ${escapedClose}\\(([$\\w]+),([$\\w]+)\\)\\{[^}]*?await ([$\\w]+)\\.eventStore\\.deleteSession\\(([$\\w]+)\\.sessionId\\),\\{closed:!0\\}`, "g");
+  if ([...source.matchAll(closeBody)].length !== 1) throw new Error("Unsupported ZCode session close; native compatibility check failed");
+  return source.replace(closeBody, (match, context, _params, record2, parsed) => match.replace(",{closed:!0}", `,${record2}.persistence!=="deferred"&&await ${context}.deps.sessionStore.updateSession({id:${parsed}.sessionId,timeArchived:Date.now()}),{closed:!0}`));
 }
 function zcodeServerLaunch(command, args) {
   if (basename4(command) !== "zcode.cjs") return { command, args: [...args] };
@@ -13613,6 +13619,7 @@ function createAdapter(runtime, workspace, uploads, emit) {
 // src/project-registry.ts
 import { realpath as realpath6, readFile as readFile9, stat as stat7 } from "node:fs/promises";
 import { isAbsolute as isAbsolute4 } from "node:path";
+import { isDeepStrictEqual } from "node:util";
 var ProjectMutationSchema = ProjectSchema.extend({
   name: ProjectSchema.shape.name.trim().max(120),
   specDirectories: ProjectSchema.shape.specDirectories.removeDefault().element.min(1).array().max(20).default(["specs", "docs"])
@@ -13628,13 +13635,21 @@ function rawProjectId(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value) && typeof value.id === "string" ? value.id : void 0;
 }
 var ProjectRegistry = class {
-  constructor(configPath, config, runtime, adapter) {
+  constructor(configPath, config, runtime, adapter, onChanged = () => {
+  }) {
     this.configPath = configPath;
     this.config = config;
     this.runtime = runtime;
     this.adapter = adapter;
+    this.onChanged = onChanged;
   }
   pending = Promise.resolve();
+  // The daemon runs this under the same lock as tool selection and project mutations.
+  reload() {
+    return this.serial(async () => {
+      await this.readCurrent();
+    });
+  }
   add(payload) {
     return this.serial(() => this.addUnlocked(payload));
   }
@@ -13658,17 +13673,36 @@ var ProjectRegistry = class {
   }
   async readCurrent() {
     const current = rawConfig(JSON.parse(await readFile9(this.configPath, "utf8")));
-    const diskProjects = current.projects.map((value) => {
-      const project = ProjectSchema.parse(value);
-      return { ...project, directory: expandHome(project.directory) };
-    });
-    if (JSON.stringify(diskProjects) !== JSON.stringify(this.config.projects)) {
-      throw new Error("Proxy \u914D\u7F6E\u5DF2\u5728\u4E3B\u673A\u4E0A\u88AB\u4FEE\u6539\uFF1B\u8BF7\u91CD\u542F Proxy \u540E\u518D\u7BA1\u7406\u9879\u76EE");
-    }
+    const diskProjects = ConfigSchema.shape.projects.parse(current.projects).map((project) => ({ ...project, directory: expandHome(project.directory) }));
+    if (new Set(diskProjects.map((project) => project.id)).size !== diskProjects.length) throw new Error("\u9879\u76EE ID \u91CD\u590D");
+    if (diskProjects.some((project) => !isAbsolute4(project.directory))) throw new Error("\u9879\u76EE\u76EE\u5F55\u5FC5\u987B\u662F Proxy \u4E3B\u673A\u4E0A\u7684\u7EDD\u5BF9\u8DEF\u5F84");
+    await this.applyProjects(diskProjects);
     return current;
   }
+  async persist(expected, projects) {
+    const latest = rawConfig(JSON.parse(await readFile9(this.configPath, "utf8")));
+    if (!isDeepStrictEqual(latest.projects, expected.projects)) {
+      throw new Error("\u4E3B\u673A\u4E0A\u7684\u9879\u76EE\u914D\u7F6E\u5728\u4FDD\u5B58\u671F\u95F4\u53D1\u751F\u53D8\u5316\uFF0C\u8BF7\u5237\u65B0\u540E\u91CD\u8BD5");
+    }
+    await atomicJson(this.configPath, { ...latest, projects });
+  }
+  async applyProjects(projects) {
+    if (isDeepStrictEqual(projects, this.config.projects)) return;
+    const reset = this.config.projects.filter((previous) => !projects.some((project) => project.id === previous.id && project.directory === previous.directory));
+    const added = projects.filter((project) => !this.config.projects.some((previous) => previous.id === project.id && previous.directory === project.directory));
+    for (const project of reset) {
+      await Promise.all([
+        this.bestEffort(() => this.adapter.removeProject?.(project.id)),
+        this.bestEffort(() => this.runtime.removeProject?.(project.id))
+      ]);
+    }
+    this.config.projects.splice(0, this.config.projects.length, ...projects);
+    for (const project of added) await this.bestEffort(() => this.runtime.addProject?.(project.id));
+    this.onChanged(reset.map((project) => project.id));
+  }
   async addUnlocked(payload) {
     const parsed = ProjectMutationSchema.parse(payload);
+    const raw = await this.readCurrent();
     const directory = expandHome(parsed.directory);
     if (!isAbsolute4(directory)) throw new Error("\u9879\u76EE\u76EE\u5F55\u5FC5\u987B\u662F Proxy \u4E3B\u673A\u4E0A\u7684\u7EDD\u5BF9\u8DEF\u5F84");
     const info = await stat7(directory).catch(() => void 0);
@@ -13679,14 +13713,13 @@ var ProjectRegistry = class {
       if (await realpath6(project2.directory).catch(() => project2.directory) === canonical) throw new Error("\u8BE5\u76EE\u5F55\u5DF2\u7ECF\u662F\u6388\u6743\u9879\u76EE");
     }
     const project = { ...parsed, directory: canonical };
-    const raw = await this.readCurrent();
-    await atomicJson(this.configPath, { ...raw, projects: [...raw.projects, project] });
-    this.config.projects.push(project);
-    await this.bestEffort(() => this.runtime.addProject?.(project.id));
+    await this.persist(raw, [...raw.projects, project]);
+    await this.applyProjects([...this.config.projects, project]);
     return publicProjects(this.config);
   }
   async updateUnlocked(payload) {
     const parsed = ProjectUpdateSchema.parse(payload);
+    const raw = await this.readCurrent();
     const index = this.config.projects.findIndex((project) => project.id === parsed.id);
     if (index < 0) throw new Error(`\u672A\u77E5\u6388\u6743\u9879\u76EE\uFF1A${parsed.id}`);
     const directory = expandHome(parsed.directory);
@@ -13700,21 +13733,8 @@ var ProjectRegistry = class {
       }
     }
     const current = this.config.projects[index];
-    const oldDirectory = await realpath6(current.directory).catch(() => current.directory);
-    const directoryChanged = oldDirectory !== canonical;
-    const raw = await this.readCurrent();
-    await atomicJson(this.configPath, {
-      ...raw,
-      projects: raw.projects.map((project) => rawProjectId(project) === parsed.id ? { ...project, name: parsed.name, directory: canonical } : project)
-    });
-    if (directoryChanged) {
-      await Promise.all([
-        this.bestEffort(() => this.adapter.removeProject?.(parsed.id)),
-        this.bestEffort(() => this.runtime.removeProject?.(parsed.id))
-      ]);
-    }
-    this.config.projects[index] = { ...current, name: parsed.name, directory: canonical };
-    if (directoryChanged) await this.bestEffort(() => this.runtime.addProject?.(parsed.id));
+    await this.persist(raw, raw.projects.map((project) => rawProjectId(project) === parsed.id ? { ...project, name: parsed.name, directory: canonical } : project));
+    await this.applyProjects(this.config.projects.map((project) => project.id === parsed.id ? { ...current, name: parsed.name, directory: canonical } : project));
     return publicProjects(this.config);
   }
   async removeUnlocked(payload) {
@@ -13723,16 +13743,12 @@ var ProjectRegistry = class {
       throw new Error("\u5220\u9664\u9879\u76EE\u9700\u8981\u5408\u6CD5\u7684\u9879\u76EE ID");
     }
     const id = payload.id;
+    const raw = await this.readCurrent();
     if (this.config.projects.length === 1) throw new Error("\u81F3\u5C11\u9700\u8981\u4FDD\u7559\u4E00\u4E2A\u6388\u6743\u9879\u76EE");
     const index = this.config.projects.findIndex((project) => project.id === id);
     if (index < 0) throw new Error(`\u672A\u77E5\u6388\u6743\u9879\u76EE\uFF1A${id}`);
-    const raw = await this.readCurrent();
-    await atomicJson(this.configPath, { ...raw, projects: raw.projects.filter((project) => rawProjectId(project) !== id) });
-    await Promise.all([
-      this.bestEffort(() => this.adapter.removeProject?.(id)),
-      this.bestEffort(() => this.runtime.removeProject?.(id))
-    ]);
-    this.config.projects.splice(index, 1);
+    await this.persist(raw, raw.projects.filter((project) => rawProjectId(project) !== id));
+    await this.applyProjects(this.config.projects.filter((project) => project.id !== id));
     return publicProjects(this.config);
   }
 };
@@ -13889,6 +13905,13 @@ var TerminalManager = class {
       terminal.process.kill();
     }
   }
+  closeProject(project) {
+    for (const terminal of this.terminals.values()) if (terminal.project === project) {
+      this.terminals.delete(terminal.id);
+      terminal.process.kill();
+      this.emit(terminal.owner, project, "terminal.closed", { id: terminal.id });
+    }
+  }
   close() {
     for (const owner of new Set([...this.terminals.values()].map((t) => t.owner))) this.closeOwned(owner);
   }
@@ -13898,17 +13921,30 @@ var TerminalManager = class {
 import { execFile as execFile6 } from "node:child_process";
 import { promisify as promisify6 } from "node:util";
 import { userInfo as userInfo4 } from "node:os";
+import { lstat as lstat3 } from "node:fs/promises";
 var exec = promisify6(execFile6);
 var PlatformDesktopSession = class {
-  constructor(system = process.platform, environment = process.env, execute3 = async (args) => (await exec("loginctl", ["--no-ask-password", ...args], { timeout: 5e3, maxBuffer: 16384 })).stdout, account = userInfo4()) {
+  constructor(x11Session = "logind", system = process.platform, environment = process.env, execute3 = async (args) => (await exec("loginctl", ["--no-ask-password", ...args], { timeout: 5e3, maxBuffer: 16384 })).stdout, account = userInfo4(), inspectSocket = lstat3) {
+    this.x11Session = x11Session;
     this.system = system;
     this.environment = environment;
     this.execute = execute3;
     this.account = account;
+    this.inspectSocket = inspectSocket;
   }
   async sessionIdentity() {
     if (this.system === "darwin") return String(this.account.uid);
     if (this.system !== "linux") throw new Error("\u6B64\u5E73\u53F0\u4E0D\u652F\u6301\u8FDC\u7A0B\u684C\u9762\u4F1A\u8BDD");
+    if (this.x11Session === "standalone") {
+      const display = /^(?:unix)?:([0-9]+)(?:\.([0-9]+))?$/.exec(this.environment.DISPLAY ?? "");
+      if (!display || this.account.uid === 0 || this.environment.WAYLAND_DISPLAY || this.environment.XDG_SESSION_TYPE === "wayland") throw new Error("\u72EC\u7ACB X11 \u8FDC\u63A7\u9700\u8981\u975E root \u7528\u6237\u548C\u672C\u5730 DISPLAY\uFF08\u5982 :99\uFF09\uFF0C\u4E0D\u652F\u6301 Wayland \u6216\u8FDC\u7A0B X11");
+      const path = `/tmp/.X11-unix/X${Number(display[1])}`;
+      const socket = await this.inspectSocket(path).catch(() => {
+        throw new Error(`\u72EC\u7ACB X11 socket \u4E0D\u53EF\u7528\uFF1A${path}\uFF1B\u8BF7\u5148\u542F\u52A8 Xvfb/\u684C\u9762\u670D\u52A1`);
+      });
+      if (!socket.isSocket()) throw new Error(`\u72EC\u7ACB X11 \u8DEF\u5F84\u4E0D\u662F socket\uFF1A${path}`);
+      return `x11:${this.account.uid}:${Number(display[1])}.${Number(display[2] ?? 0)}:${socket.dev}:${socket.ino}:${socket.ctimeMs}`;
+    }
     const ids = this.environment.XDG_SESSION_ID ? [this.environment.XDG_SESSION_ID] : (await this.execute(["list-sessions", "--no-legend"])).trim().split("\n").map((line) => line.trim().split(/\s+/)[0]).filter(Boolean);
     const sessions = [];
     for (const id of ids) {
@@ -14021,6 +14057,7 @@ var RemoteManager = class {
       const permissions = await this.probe(this.host.stateDirectory, this.config);
       const lockUnsupported = permissions.locked === true && permissions.lockCapture === false;
       const available = permissions.session && permissions.capture && permissions.input && !lockUnsupported;
+      if (available) await this.desktopSession.sessionIdentity();
       return { ...base, available, permissions, ...!available ? { message: lockUnsupported ? "\u9501\u5C4F\u8FDC\u63A7\u9700\u8981 macOS 14 \u53CA\u4EE5\u4E0A\u53CA\u65B0\u7248 Xcode Command Line Tools\uFF1B\u5F53\u524D\u4E3B\u673A\u8BF7\u5148\u672C\u5730\u89E3\u9501" : "\u8BF7\u68C0\u67E5\u4E3B\u673A\u56FE\u5F62\u4F1A\u8BDD\uFF0C\u5E76\u4E3A\u5B9E\u9645\u8FD0\u884C Proxy \u7684\u7A0B\u5E8F\u6388\u6743\u5C4F\u5E55\u5F55\u5236\u548C\u8F85\u52A9\u529F\u80FD" } : {} };
     } catch (error) {
       return { ...base, available: false, message: error instanceof Error ? error.message : "\u8FDC\u63A7\u4F9D\u8D56\u4E0D\u53EF\u7528" };
@@ -14139,7 +14176,7 @@ var RemoteManager = class {
 import { randomBytes as randomBytes3, randomUUID as randomUUID19 } from "node:crypto";
 import { access as access3, constants as constants6, readFile as readFile10 } from "node:fs/promises";
 import { platform as platform5 } from "node:os";
-import { isDeepStrictEqual } from "node:util";
+import { isDeepStrictEqual as isDeepStrictEqual2 } from "node:util";
 
 // src/node-resolution.ts
 import { realpath as realpath7, stat as stat10 } from "node:fs/promises";
@@ -14319,7 +14356,7 @@ var ToolSelection = class {
   }
   async readCurrent() {
     const disk = await loadConfig(this.configPath);
-    if (!isDeepStrictEqual(JSON.parse(JSON.stringify(disk.tool)), JSON.parse(JSON.stringify(this.config.tool))) || !isDeepStrictEqual(disk.projects, this.config.projects) || disk.botId !== this.config.botId || disk.secretKey !== this.config.secretKey) {
+    if (!isDeepStrictEqual2(JSON.parse(JSON.stringify(disk.tool)), JSON.parse(JSON.stringify(this.config.tool))) || !isDeepStrictEqual2(disk.projects, this.config.projects) || disk.botId !== this.config.botId || disk.secretKey !== this.config.secretKey) {
       throw new Error("Proxy \u914D\u7F6E\u5DF2\u5728\u4E3B\u673A\u4E0A\u88AB\u4FEE\u6539\uFF1B\u8BF7\u91CD\u542F Proxy \u540E\u518D\u5207\u6362\u667A\u80FD\u4F53");
     }
     return JSON.parse(await readFile10(this.configPath, "utf8"));
@@ -14346,7 +14383,7 @@ async function runDaemon(configPath, authenticate = verifyHostPassword) {
     secureChat?.publish(projectId, event, data);
   }
   const terminals = new TerminalManager(workspace, (owner, project, event, data) => secureChat?.sendTo(owner, project, event, data));
-  const desktopBackend = new PlatformDesktop(config.stateDirectory), desktopSession = new PlatformDesktopSession();
+  const desktopBackend = new PlatformDesktop(config.stateDirectory), desktopSession = new PlatformDesktopSession(config.desktopRemote?.x11Session);
   const desktop = new DesktopManager(desktopBackend);
   const remote = new RemoteManager(
     config,
@@ -14363,7 +14400,12 @@ async function runDaemon(configPath, authenticate = verifyHostPassword) {
     return { runtime, adapter };
   });
   const artifacts = new Artifacts(workspace, join15(config.stateDirectory, "artifacts"), emit);
+  const projectRegistry = () => new ProjectRegistry(configPath, config, tools.current.runtime, tools.current.adapter, (resetProjects) => {
+    for (const id of resetProjects) terminals.closeProject(id);
+  });
+  const reloadProjects = () => tools.exclusive(() => projectRegistry().reload());
   async function dispatch(c, secureSessionId) {
+    if (["runtime.snapshot", "workspace.projects", "runtime.models", "runtime.switchTool"].includes(c.operation)) await reloadProjects();
     if (c.operation.startsWith("desktop.remote.")) return remote.dispatch(c, secureSessionId);
     if (c.operation.startsWith("desktop.")) return desktop.dispatch(c, secureSessionId);
     if (c.operation.startsWith("terminal.")) return terminals.dispatch(c, secureSessionId);
@@ -14383,17 +14425,17 @@ async function runDaemon(configPath, authenticate = verifyHostPassword) {
     if (c.operation === "runtime.restart") return runtime.restart();
     if (c.operation === "workspace.projects") return publicProjects(config);
     if (c.operation === "workspace.projects.add") {
-      const result2 = await tools.exclusive(() => new ProjectRegistry(configPath, config, tools.current.runtime, tools.current.adapter).add(p));
+      const result2 = await tools.exclusive(() => projectRegistry().add(p));
       emit(String(p.id), "octopus.resync", {});
       return result2;
     }
     if (c.operation === "workspace.projects.update") {
-      const result2 = await tools.exclusive(() => new ProjectRegistry(configPath, config, tools.current.runtime, tools.current.adapter).update(p));
+      const result2 = await tools.exclusive(() => projectRegistry().update(p));
       emit(String(p.id), "octopus.resync", {});
       return result2;
     }
     if (c.operation === "workspace.projects.remove") {
-      const result2 = await tools.exclusive(() => new ProjectRegistry(configPath, config, tools.current.runtime, tools.current.adapter).remove(p));
+      const result2 = await tools.exclusive(() => projectRegistry().remove(p));
       emit(String(p.id), "octopus.resync", {});
       return result2;
     }

package/dist/{chunk-GS3Q6EU5.js → chunk-UFLXQ4HQ.js}

@@ -4104,7 +4104,8 @@ var RemoteConfigSchema = z.object({
   stunUrls: z.array(stunUrl).min(1).max(4).optional(),
   totalBitrate: z.number().int().min(1e5).max(REMOTE_DEFAULTS.totalBitrate).default(REMOTE_DEFAULTS.totalBitrate),
   videoMaxBitrate: z.number().int().min(5e4).max(REMOTE_DEFAULTS.videoMaxBitrate).default(REMOTE_DEFAULTS.videoMaxBitrate),
-  ffmpeg: z.string().min(1).default("ffmpeg")
+  ffmpeg: z.string().min(1).default("ffmpeg"),
+  x11Session: z.enum(["logind", "standalone"]).default("logind")
 }).strict().refine((c) => c.videoMaxBitrate <= c.totalBitrate * 0.8, "\u89C6\u9891\u989D\u5EA6\u4E0D\u5F97\u8D85\u8FC7\u603B\u9884\u7B97\u7684 80%");
 function remoteSessionBudget(config, quality, legacy = false) {
   const profile = legacy ? REMOTE_LEGACY_PROFILE : REMOTE_QUALITY_PROFILES[quality];
@@ -4456,8 +4457,12 @@ import { join as join2 } from "node:path";
 import { fileURLToPath as fileURLToPath2 } from "node:url";
 import { createHash as createHash2, randomUUID as randomUUID2 } from "node:crypto";
 var exec = promisify2(execFile2);
-function supportedRemotePlatform(system = process.platform, arch = process.arch, env = process.env) {
-  return system === "darwin" && ["arm64", "x64"].includes(arch) || system === "linux" && arch === "x64" && !!env.DISPLAY && !env.WAYLAND_DISPLAY && env.XDG_SESSION_TYPE !== "wayland";
+function remotePlatformError(system = process.platform, arch = process.arch, env = process.env) {
+  if (!["darwin", "linux"].includes(system) || !["arm64", "x64"].includes(arch)) return `\u8FDC\u63A7\u4E0D\u652F\u6301\u5F53\u524D\u5E73\u53F0 ${system}/${arch}\uFF1B\u9700\u8981 macOS 12.3+ \u6216 Linux X11\uFF08x64/ARM64\uFF09`;
+  if (system === "linux") {
+    if (env.WAYLAND_DISPLAY || env.XDG_SESSION_TYPE === "wayland") return "\u8FDC\u63A7\u6682\u4E0D\u652F\u6301 Wayland\uFF0C\u8BF7\u4F7F\u7528 X11 \u684C\u9762\u4F1A\u8BDD";
+    if (!env.DISPLAY) return "Proxy \u672A\u8FDE\u63A5 X11 \u56FE\u5F62\u4F1A\u8BDD\uFF1B\u8BF7\u4E3A\u5B9E\u9645\u8FD0\u884C Proxy \u7684\u670D\u52A1\u8BBE\u7F6E\u684C\u9762\u7528\u6237\u7684 DISPLAY \u548C XAUTHORITY\uFF0C\u5BB9\u5668\u4E2D\u8BF7\u5148\u542F\u52A8 Xvfb/\u684C\u9762\u670D\u52A1";
+  }
 }
 async function ensureRemoteHelper(stateDirectory) {
   await mkdir2(stateDirectory, { recursive: true, mode: 448 });
@@ -4485,7 +4490,8 @@ async function ensureRemoteHelper(stateDirectory) {
   }
 }
 async function probeRemote(stateDirectory, config) {
-  if (!supportedRemotePlatform()) throw new Error("\u8FDC\u63A7\u9996\u7248\u652F\u6301 macOS 12.3+ \u4E0E Linux X11 x64\uFF1BWayland\u3001\u65E0\u56FE\u5F62\u4F1A\u8BDD\u6682\u4E0D\u652F\u6301");
+  const platformError = remotePlatformError();
+  if (platformError) throw new Error(platformError);
   await import("@roamhq/wrtc").catch(() => {
     throw new Error("WebRTC \u539F\u751F\u4F9D\u8D56\u4E0D\u53EF\u7528\uFF0C\u8BF7\u91CD\u65B0\u5B89\u88C5\u65B0\u7248 Proxy");
   });

package/dist/cli.js

@@ -35,20 +35,20 @@ import {
   supportedPlatform,
   systemdUnitPath,
   toolSearchDirs
-} from "./chunk-J3ZMMSW2.js";
+} from "./chunk-IV5ZGRAM.js";
 import {
   DESKTOP_PERMISSION_GUIDANCE,
   PlatformDesktop,
   checkDesktop,
   requestDesktopPermission
-} from "./chunk-GS3Q6EU5.js";
+} from "./chunk-UFLXQ4HQ.js";
 
 // src/cli.ts
 import { spawn as spawn2 } from "node:child_process";
 import { access as access4 } from "node:fs/promises";
 
 // src/doctor.ts
-import { access as access2, chmod, constants, mkdir as mkdir3, stat } from "node:fs/promises";
+import { access as access2, chmod, constants, mkdir as mkdir3, stat as stat2 } from "node:fs/promises";
 import { isAbsolute as isAbsolute3, join } from "node:path";
 import { execFile as execFile3 } from "node:child_process";
 import { promisify as promisify3 } from "node:util";
@@ -130,8 +130,9 @@ async function launchdStatus() {
 }
 
 // src/systemd.ts
-import { mkdir as mkdir2, rm as rm2, writeFile as writeFile2 } from "node:fs/promises";
+import { mkdir as mkdir2, rm as rm2, stat, writeFile as writeFile2 } from "node:fs/promises";
 import { dirname as dirname2 } from "node:path";
+import { userInfo as userInfo2 } from "node:os";
 import { execFile as execFile2 } from "node:child_process";
 import { promisify as promisify2 } from "node:util";
 var run2 = promisify2(execFile2);
@@ -170,8 +171,15 @@ async function writeUnitFile(text) {
   return path;
 }
 async function systemctl(args) {
+  const env = { ...process.env };
+  if (!env.XDG_RUNTIME_DIR && !env.DBUS_SESSION_BUS_ADDRESS) {
+    const uid = userInfo2().uid;
+    const runtimeDirectory = `/run/user/${uid}`;
+    const info = await stat(runtimeDirectory).catch(() => void 0);
+    if (info?.isDirectory() && info.uid === uid) env.XDG_RUNTIME_DIR = runtimeDirectory;
+  }
   try {
-    const { stdout: stdout3 } = await run2("systemctl", ["--user", ...args]);
+    const { stdout: stdout3 } = await run2("systemctl", ["--user", ...args], { env });
     return stdout3;
   } catch (error) {
     const stderr = error instanceof Error ? error.stderr ?? error.message : String(error);
@@ -214,9 +222,9 @@ async function systemdUninstall() {
   await systemdReload();
 }
 async function systemdStatus() {
-  const active = await ignoreFailure(() => systemctl(["is-active", SYSTEMD_UNIT]));
-  const enabled = await ignoreFailure(() => systemctl(["is-enabled", SYSTEMD_UNIT]));
-  return { active: active?.trim() === "active", enabled: enabled?.trim() === "enabled" };
+  const output = await systemctl(["show", SYSTEMD_UNIT, "--property=ActiveState", "--property=UnitFileState"]);
+  const properties = Object.fromEntries(output.trim().split("\n").map((line) => line.split("=")));
+  return { active: properties.ActiveState === "active", enabled: properties.UnitFileState === "enabled" };
 }
 
 // src/service.ts
@@ -339,7 +347,7 @@ async function runDoctor(opts) {
   results.push(await checkTerminalSupport(opts.fix));
   let config;
   try {
-    const info = await stat(opts.configPath).catch((error) => {
+    const info = await stat2(opts.configPath).catch((error) => {
       if (error.code === "ENOENT") throw new Error(`\u914D\u7F6E\u6587\u4EF6\u4E0D\u5B58\u5728\uFF1A${opts.configPath}\uFF1B\u5148\u8FD0\u884C octopus-proxy onboard`);
       throw error;
     });
@@ -356,7 +364,7 @@ async function runDoctor(opts) {
   }
   if (config) {
     results.push(...await checkDesktop(config.stateDirectory));
-    const remote = new RemoteManager(config, new PlatformDesktop(config.stateDirectory), new PlatformDesktopSession(), () => {
+    const remote = new RemoteManager(config, new PlatformDesktop(config.stateDirectory), new PlatformDesktopSession(config.desktopRemote?.x11Session), () => {
     }, () => false);
     try {
       const status = await remote.status();
@@ -457,7 +465,7 @@ async function runDoctor(opts) {
 import { createInterface } from "node:readline/promises";
 import { randomBytes } from "node:crypto";
 import { stdin, stdout } from "node:process";
-import { access as access3, constants as constants2, mkdir as mkdir4, stat as stat2 } from "node:fs/promises";
+import { access as access3, constants as constants2, mkdir as mkdir4, stat as stat3 } from "node:fs/promises";
 import { execFile as execFile4 } from "node:child_process";
 import { platform } from "node:os";
 import { isAbsolute as isAbsolute4, join as join2 } from "node:path";
@@ -501,7 +509,7 @@ async function validateToolCommand(value, kind) {
   const command2 = expandHome(value);
   if (!isAbsolute4(command2)) return "\u670D\u52A1\u73AF\u5883\u9700\u8981\u7EDD\u5BF9\u8DEF\u5F84";
   try {
-    if (!(await stat2(command2)).isFile()) return "\u547D\u4EE4\u8DEF\u5F84\u5FC5\u987B\u6307\u5411\u53EF\u6267\u884C\u6587\u4EF6";
+    if (!(await stat3(command2)).isFile()) return "\u547D\u4EE4\u8DEF\u5F84\u5FC5\u987B\u6307\u5411\u53EF\u6267\u884C\u6587\u4EF6";
     await access3(command2, constants2.X_OK);
   } catch {
     return `\u547D\u4EE4\u4E0D\u5B58\u5728\u6216\u4E0D\u53EF\u6267\u884C\uFF1A${command2}`;
@@ -514,7 +522,7 @@ async function validateToolCommand(value, kind) {
   return void 0;
 }
 async function runOnboard(opts) {
-  const configExists = await stat2(opts.configPath).then(() => true, (error) => {
+  const configExists = await stat3(opts.configPath).then(() => true, (error) => {
     if (error.code === "ENOENT") return false;
     throw error;
   });
@@ -564,7 +572,7 @@ async function runOnboard(opts) {
           console.log("  \u5FC5\u987B\u662F\u7EDD\u5BF9\u8DEF\u5F84");
           continue;
         }
-        if (!await stat2(project.directory).then(() => true, () => false)) {
+        if (!await stat3(project.directory).then(() => true, () => false)) {
           console.log("  \u76EE\u5F55\u4E0D\u5B58\u5728");
           continue;
         }
@@ -593,7 +601,7 @@ async function runOnboard(opts) {
           console.log("  \u5FC5\u987B\u662F\u7EDD\u5BF9\u8DEF\u5F84");
           continue;
         }
-        if (!await stat2(directory).then(() => true, () => false)) {
+        if (!await stat3(directory).then(() => true, () => false)) {
           console.log("  \u76EE\u5F55\u4E0D\u5B58\u5728");
           continue;
         }

package/dist/main.js

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

package/dist/remote-worker.js

@@ -14,7 +14,7 @@ import {
   remoteResolutionTiers,
   remoteSessionBudget,
   terminateNative
-} from "./chunk-GS3Q6EU5.js";
+} from "./chunk-UFLXQ4HQ.js";
 
 // src/remote-worker.ts
 import rtc from "@roamhq/wrtc";

package/package.json

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