niuma-codex 0.0.1-beta.20 → 0.0.1-beta.21

package/dist/assets/pairing-web/index.html

@@ -13,7 +13,8 @@
 </nav><p class="trust">仅允许你信任的设备连接。</p>
 </aside>
 <div class="content">
-<section id="settings-panel" class="settings-panel" aria-labelledby="settings-title" hidden><header class="page-heading"><h2 id="settings-title">设置</h2><p>管理这台电脑上的 Niuma。</p></header><h3 class="settings-group-title">启动与运行</h3><div id="autostart-controls" class="autostart-row"><div><label id="autostart-label" for="autostart-enabled">登录后自动启动 Niuma</label><p id="autostart-description">登录这台 Mac 后自动启动后台服务。关闭后，当前服务仍会继续运行。</p><p id="autostart-hint" class="settings-hint">首次开启需要下载运行文件。</p></div><input id="autostart-enabled" type="checkbox" role="switch" aria-describedby="autostart-description" disabled></div><p id="autostart-message" role="status" aria-live="polite">正在读取设置…</p><button id="autostart-retry" class="text-button" hidden>重试</button></section>
+<section id="settings-panel" class="settings-panel" aria-labelledby="settings-title" hidden><header class="page-heading"><h2 id="settings-title">设置</h2><p>管理这台电脑上的 Niuma。</p></header><h3 class="settings-group-title">启动与运行</h3><div id="autostart-controls" class="autostart-row"><div><label id="autostart-label" for="autostart-enabled">登录后自动启动 Niuma</label><p id="autostart-description">登录这台 Mac 后自动启动后台服务。关闭后，当前服务仍会继续运行。</p><p id="autostart-hint" class="settings-hint">首次开启需要下载运行文件。</p></div><input id="autostart-enabled" type="checkbox" role="switch" aria-describedby="autostart-description" disabled></div><p id="autostart-message" role="status" aria-live="polite">正在读取设置…</p><button id="autostart-retry" class="text-button" hidden>重试</button>
+<section id="app-about" class="app-about" aria-labelledby="app-about-title" hidden><h3 id="app-about-title" class="settings-group-title">关于 Niuma Lite</h3><dl class="app-version"><dt>版本</dt><dd id="app-version"></dd></dl></section></section>
 <div id="device-workspace">
 <div id="home-intro"></div>
 <div id="flow-intro" hidden><button id="back" class="text-button back"><span class="icon icon-arrow" aria-hidden="true"></span>返回设备列表</button><h1>添加设备</h1><p>使用手机 Niuma 扫码，在此页面确认配对。</p><ol class="steps" aria-label="配对进度"><li id="step-1"><span class="step-number">1</span><span>扫描二维码</span></li><li id="step-2"><span class="step-number">2</span><span>允许配对</span></li><li id="step-3"><span class="step-number">3</span><span>完成连接</span></li></ol></div>

package/dist/assets/pairing-web/settings.js

@@ -2,6 +2,13 @@
 export function mountAutostartSettings(doc,win,request){
  const $=id=>doc.getElementById(id);
  const bridge=win.niumaLoginItem;
+ // 仅 Lite 宿主提供统一版本；静态信息不受登录项读取失败影响。
+ const about=$('app-about');
+ if(about){
+  const version=typeof bridge?.version==='string'?bridge.version:'';
+  about.hidden=!version;
+  $('app-version').textContent=version;
+ }
  // 只有应用 preload 提供登录项能力；普通浏览器继续使用 npm 设置接口。
  if(bridge){
   $('autostart-label').textContent='登录时自动启动 Niuma';
@@ -13,7 +20,7 @@ export function mountAutostartSettings(doc,win,request){
   if(init.method==='POST')await bridge.set(JSON.parse(init.body).enabled);
   const current=await bridge.read();
   // 宿主桥接返回实际登录项状态，映射到页面共用的系统启用字段。
-  return {ok:true,json:async()=>({code:0,data:{supported:current.available,registered:current.enabled,loaded:current.enabled,available:current.available,operation:null,reason:'请安装 Niuma 应用后设置登录自启动'}})};
+  return {ok:true,json:async()=>({code:0,data:{supported:current.available,registered:current.enabled||current.requiresApproval===true,loaded:current.enabled,available:current.available,operation:null,notice:current.message,reason:'请安装 Niuma 应用后设置登录自启动'}})};
  }
  let state=null,inFlight=false,changing=false,generation=0,timer=null;
  const visible=()=>!$('settings-panel').hidden&&!doc.hidden;
@@ -31,8 +38,8 @@ export function mountAutostartSettings(doc,win,request){
   $('autostart-enabled').disabled=!state||!state.supported||systemUnknown()||working||inFlight;
   $('autostart-message').textContent=message||(working?(operation?.target_enabled===false?'正在关闭…':'正在开启…'):
    !state?'正在读取设置…':!state.supported?(state.reason||'当前环境不支持登录自启动'):
-   systemUnknown()?'无法确认系统登录项状态，请刷新重试。':systemUnavailable()?'自启动尚未获系统启用，请检查系统设置中的登录项并允许 Niuma 在后台运行。':
-   state.registered&&!state.available?'已配置，但暂不可用。请重新配置。':state.registered?'已开启':'未开启');
+   state.notice||(systemUnknown()?'无法确认系统登录项状态，请刷新重试。':systemUnavailable()?(bridge?'请在系统设置的登录项中允许 Niuma 登录时打开，然后刷新状态。':'自启动尚未获系统启用，请检查系统设置中的登录项并允许 Niuma 在后台运行。'):
+   state.registered&&!state.available?'已配置，但暂不可用。请重新配置。':state.registered?'已开启':'未开启'));
   $('autostart-retry').hidden=working||(!message&&!(state?.registered&&!state.available));
   $('autostart-retry').textContent=systemUnavailable()?'刷新状态':state?.registered&&!state.available?'重新配置':'重试';
  }

package/dist/assets/pairing-web/style.css

@@ -77,6 +77,11 @@
 .autostart-row label{font-size:18px;font-weight:500}
 .autostart-row p{max-width:60ch}
 #autostart-enabled{margin-top:4px}
+/* 关于区域沿用现有设置分组；版本使用普通文本，长版本号允许换行。 */
+.app-about{margin-top:48px}
+.app-version{display:flex;align-items:baseline;justify-content:space-between;gap:24px;margin:20px 0 0}
+.app-version dt{color:var(--muted)}
+.app-version dd{margin:0;overflow-wrap:anywhere;min-width:0}
 /* 配对进度属于设备工作区，切换设置后仍保留原有流程。 */
 #flow-intro .back{margin:0 0 16px;font-size:14px}
 #flow-intro h1{font-size:28px;letter-spacing:0}

package/dist/cli.js

@@ -393,6 +393,36 @@ import path5 from "node:path";
 import { createHash } from "node:crypto";
 function createLiteLoginRemoval({ home, app, run = runProcess }) {
   const file = path5.join(home, "Library/LaunchAgents", label + ".plist"), program = path5.join(app, "Contents/MacOS/niuma-lite"), service = `gui/${process.getuid?.()}/${label}`;
+  const native = async () => {
+    const marker = path5.join(app, "Contents/Resources/niuma-release.json");
+    let stat4;
+    try {
+      stat4 = await fs5.lstat(marker);
+    } catch (e) {
+      if (e.code === "ENOENT") return null;
+      throw e;
+    }
+    if (!stat4.isFile() || stat4.size > 65536) throw Error("\u5E94\u7528\u53D1\u884C\u6807\u8BB0\u4E0D\u53EF\u4FE1");
+    const release2 = JSON.parse(await fs5.readFile(marker, "utf8"));
+    if (release2.loginService === void 0) return null;
+    if (release2.loginService !== "main-app-v1") throw Error("\u5E94\u7528\u767B\u5F55\u9879\u80FD\u529B\u65E0\u6CD5\u8BC6\u522B\uFF0C\u8BF7\u4F7F\u7528\u5339\u914D\u7248\u672C\u5378\u8F7D");
+    for (const dir of [app, path5.join(app, "Contents"), path5.join(app, "Contents/MacOS"), path5.join(app, "Contents/Resources")]) {
+      const s = await fs5.lstat(dir);
+      if (!s.isDirectory() || s.uid !== process.getuid?.() || s.mode & 18 || await fs5.realpath(dir) !== dir) throw Error("\u5E94\u7528\u767B\u5F55\u9879\u76EE\u5F55\u4E0D\u53EF\u4FE1\u6216\u5305\u542B\u94FE\u63A5");
+    }
+    for (const f of [marker, program, path5.join(app, "Contents/Info.plist")]) {
+      const s = await fs5.lstat(f);
+      if (!s.isFile() || s.uid !== process.getuid?.() || s.mode & 18) throw Error("\u5E94\u7528\u767B\u5F55\u9879\u6587\u4EF6\u4E0D\u53EF\u4FE1\u6216\u5305\u542B\u94FE\u63A5");
+    }
+    if ((await run("/usr/libexec/PlistBuddy", ["-c", "Print :CFBundleIdentifier", path5.join(app, "Contents/Info.plist")])).trim() !== label) throw Error("\u5E94\u7528\u767B\u5F55\u9879\u8EAB\u4EFD\u4E0D\u5339\u914D");
+    await run("/usr/bin/codesign", ["--verify", "--strict", app]);
+    const request2 = async (flag) => {
+      const state = JSON.parse(await run(program, [flag]));
+      if (state.schema !== 1 || state.available !== true || typeof state.registered !== "boolean" || typeof state.enabled !== "boolean" || state.enabled && !state.registered) throw Error("\u539F\u751F\u767B\u5F55\u9879\u72B6\u6001\u65E0\u6CD5\u786E\u8BA4");
+      return state;
+    };
+    return { request: request2, state: await request2("--login-item-status") };
+  };
   const read = async () => {
     let stat4;
     try {
@@ -426,11 +456,17 @@ function createLiteLoginRemoval({ home, app, run = runProcess }) {
     inspect: async () => {
       const registration = await read();
       const loaded = await job();
-      return !!registration || !!loaded;
+      const current2 = await native();
+      return !!registration || !!loaded || current2?.state.registered === true;
     },
     disable: async () => {
       const before = await read();
       await job();
+      const current2 = await native();
+      if (current2?.state.registered) {
+        const result = await current2.request("--login-item-disable");
+        if (result.registered || (await current2.request("--login-item-status")).registered) throw Error("\u539F\u751F\u767B\u5F55\u9879\u6CE8\u9500\u672A\u786E\u8BA4\uFF0C\u4FDD\u7559\u5E94\u7528\u4E0E\u65E7\u6CE8\u518C");
+      }
       if (!before) return;
       const after = await read();
       if (JSON.stringify(before) !== JSON.stringify(after)) throw Error("\u767B\u5F55\u9879\u5DF2\u53D8\u5316\uFF0C\u672A\u5220\u9664");
@@ -9509,7 +9545,7 @@ var init_src = __esm({
 // apps/desktop/src/release-version.ts
 import { readFileSync } from "node:fs";
 function desktopReleaseVersion() {
-  return false ? null : "0.0.1-beta.20";
+  return false ? null : "0.0.1-beta.21";
 }
 function desktopPresenceVersion() {
   return desktopReleaseVersion() ?? sourcePresenceVersion;
@@ -18939,7 +18975,7 @@ async function runLiteInstall() {
   if (process.platform !== "darwin") throw Error("\u8F7B\u91CF\u684C\u9762\u5E94\u7528\u4EC5\u652F\u6301 macOS\uFF0C\u8BF7\u4F7F\u7528 --background");
   const version2 = desktopReleaseVersion();
   if (!version2 || false || false) throw Error("\u6B64\u7248\u672C\u5C1A\u672A\u914D\u7F6E Tauri \u8F7B\u91CF\u53D1\u884C\u8D44\u6E90\uFF0C\u6682\u4E0D\u80FD\u901A\u8FC7 install-app \u5B89\u88C5\uFF1B\u7EAF\u540E\u53F0\u8BF7\u4F7F\u7528 --background");
-  const manifest = validateManifest(JSON.parse('{\n  "schema": 2,\n  "source": "bundled",\n  "mode": "experimental",\n  "combinationId": "0.0.1-beta.20",\n  "cliVersion": "0.0.1-beta.20",\n  "daemonVersion": "0.0.1-beta.20",\n  "nodeRange": ">=18.20.5",\n  "artifacts": {\n    "darwin-arm64": {\n      "app": {\n        "path": "resources/niuma-lite-arm64.dmg",\n        "size": 8094888,\n        "sha256": "ee91d539fd7088464e45b8a767cc35974856b8d0344c4817d57b766a8499766e"\n      },\n      "runtime": {\n        "path": "resources/niuma-daemon-arm64.tgz",\n        "size": 18317933,\n        "sha256": "78aa49a48c9591a28894c27c9968f7d0a7aceabdc7834ee508343d868f049054"\n      }\n    }\n  }\n}\n'), version2, process.arch);
+  const manifest = validateManifest(JSON.parse('{\n  "schema": 2,\n  "source": "bundled",\n  "mode": "experimental",\n  "combinationId": "0.0.1-beta.21",\n  "cliVersion": "0.0.1-beta.21",\n  "daemonVersion": "0.0.1-beta.21",\n  "nodeRange": ">=18.20.5",\n  "artifacts": {\n    "darwin-arm64": {\n      "app": {\n        "path": "resources/niuma-lite-arm64.dmg",\n        "size": 8103038,\n        "sha256": "bf6f04b558f2da3418b66bf88e7a5b35e76d7fa49fe5b2ab01dd022f3b876f19"\n      },\n      "runtime": {\n        "path": "resources/niuma-daemon-arm64.tgz",\n        "size": 18317624,\n        "sha256": "491d7d39d55fc8f0c981798aa4720e2a0c4bfea35c43c897f1d411a3ea29bb30"\n      }\n    }\n  }\n}\n'), version2, process.arch);
   if (manifest.schema === 2) await confirmExperimental(manifest.mode, !!process.stdin.isTTY && !!process.stdout.isTTY, async () => {
     const prompt = createInterface3({ input: process.stdin, output: process.stdout });
     try {

package/dist/managed-tauri.js

@@ -6881,7 +6881,7 @@ var init_src2 = __esm({
 // apps/desktop/src/release-version.ts
 import { readFileSync } from "node:fs";
 function desktopReleaseVersion() {
-  return false ? null : "0.0.1-beta.20";
+  return false ? null : "0.0.1-beta.21";
 }
 function desktopPresenceVersion() {
   return desktopReleaseVersion() ?? sourcePresenceVersion;

package/dist/managed.js

@@ -8487,7 +8487,7 @@ function parseAttachmentTaskV2StatusQuery(value) {
 
 // apps/desktop/src/release-version.ts
 function desktopReleaseVersion() {
-  return false ? null : "0.0.1-beta.20";
+  return false ? null : "0.0.1-beta.21";
 }
 var sourcePresenceVersion = (() => {
   if (true) return null;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "niuma-codex",
-  "version": "0.0.1-beta.20",
+  "version": "0.0.1-beta.21",
   "description": "Niuma Desktop CLI：连接本机 Codex 与远程客户端。",
   "type": "module",
   "license": "Apache-2.0",

package/resources/lite-release.json

@@ -2,21 +2,21 @@
   "schema": 2,
   "source": "bundled",
   "mode": "experimental",
-  "combinationId": "0.0.1-beta.20",
-  "cliVersion": "0.0.1-beta.20",
-  "daemonVersion": "0.0.1-beta.20",
+  "combinationId": "0.0.1-beta.21",
+  "cliVersion": "0.0.1-beta.21",
+  "daemonVersion": "0.0.1-beta.21",
   "nodeRange": ">=18.20.5",
   "artifacts": {
     "darwin-arm64": {
       "app": {
         "path": "resources/niuma-lite-arm64.dmg",
-        "size": 8094888,
-        "sha256": "ee91d539fd7088464e45b8a767cc35974856b8d0344c4817d57b766a8499766e"
+        "size": 8103038,
+        "sha256": "bf6f04b558f2da3418b66bf88e7a5b35e76d7fa49fe5b2ab01dd022f3b876f19"
       },
       "runtime": {
         "path": "resources/niuma-daemon-arm64.tgz",
-        "size": 18317933,
-        "sha256": "78aa49a48c9591a28894c27c9968f7d0a7aceabdc7834ee508343d868f049054"
+        "size": 18317624,
+        "sha256": "491d7d39d55fc8f0c981798aa4720e2a0c4bfea35c43c897f1d411a3ea29bb30"
       }
     }
   }