oasis_test 0.1.115 → 0.1.117

package/dist/index.js

@@ -1933,9 +1933,9 @@ function resolveNodeRef(ref2, candidates) {
     const hit = candidates.find((n) => n.id === r);
     return hit ? { ok: true, id: hit.id } : { ok: false, reason: "not_found" };
   }
-  const sep4 = r.indexOf(":");
-  const type = (sep4 >= 0 ? r.slice(0, sep4) : r).trim().toLowerCase();
-  const title = sep4 >= 0 ? r.slice(sep4 + 1).trim().toLowerCase() : null;
+  const sep5 = r.indexOf(":");
+  const type = (sep5 >= 0 ? r.slice(0, sep5) : r).trim().toLowerCase();
+  const title = sep5 >= 0 ? r.slice(sep5 + 1).trim().toLowerCase() : null;
   const matches = candidates.filter((n) => n.type.toLowerCase() === type && (title === null || (n.title ?? "").toLowerCase() === title));
   if (matches.length === 0) return { ok: false, reason: "not_found" };
   if (matches.length === 1) return { ok: true, id: matches[0].id };
@@ -5726,8 +5726,8 @@ var init_dispatcher = __esm({
       /** 从 produce jobKey 解析 artifactId：`produce::<artifactId>` 或 `produce::<artifactId>::<part>`。 */
       artifactIdFromJobKey(jobKey) {
         const rest = jobKey.slice(jobKey.indexOf("::") + 2);
-        const sep4 = rest.indexOf("::");
-        return sep4 >= 0 ? rest.slice(0, sep4) : rest;
+        const sep5 = rest.indexOf("::");
+        return sep5 >= 0 ? rest.slice(0, sep5) : rest;
       }
       /**
        * 某节点的派发器运行时信号（stuckDiagnosis 的非 oplog 那半；proposal 协调者阻塞诊断 D1）。
@@ -40107,7 +40107,7 @@ var require_websocket = __commonJS({
     var http2 = require("http");
     var net = require("net");
     var tls = require("tls");
-    var { randomBytes: randomBytes7, createHash: createHash18 } = require("crypto");
+    var { randomBytes: randomBytes7, createHash: createHash19 } = require("crypto");
     var { Duplex, Readable } = require("stream");
     var { URL: URL2 } = require("url");
     var PerMessageDeflate2 = require_permessage_deflate();
@@ -40775,7 +40775,7 @@ var require_websocket = __commonJS({
           abortHandshake(websocket, socket, "Invalid Upgrade header");
           return;
         }
-        const digest = createHash18("sha1").update(key + GUID).digest("base64");
+        const digest = createHash19("sha1").update(key + GUID).digest("base64");
         if (res.headers["sec-websocket-accept"] !== digest) {
           abortHandshake(websocket, socket, "Invalid Sec-WebSocket-Accept header");
           return;
@@ -41144,7 +41144,7 @@ var require_websocket_server = __commonJS({
     var EventEmitter = require("events");
     var http2 = require("http");
     var { Duplex } = require("stream");
-    var { createHash: createHash18 } = require("crypto");
+    var { createHash: createHash19 } = require("crypto");
     var extension2 = require_extension();
     var PerMessageDeflate2 = require_permessage_deflate();
     var subprotocol2 = require_subprotocol();
@@ -41451,7 +41451,7 @@ var require_websocket_server = __commonJS({
           );
         }
         if (this._state > RUNNING) return abortHandshake(socket, 503);
-        const digest = createHash18("sha1").update(key + GUID).digest("base64");
+        const digest = createHash19("sha1").update(key + GUID).digest("base64");
         const headers = [
           "HTTP/1.1 101 Switching Protocols",
           "Upgrade: websocket",
@@ -150077,9 +150077,9 @@ function agentEdgesFor(dependsOn, nodes, briefId, issues) {
       edges.add(briefId);
       continue;
     }
-    const sep4 = d.indexOf(":");
-    const depType = (sep4 >= 0 ? d.slice(0, sep4) : d).trim().toLowerCase();
-    const depTitle = sep4 >= 0 ? d.slice(sep4 + 1).trim().toLowerCase() : null;
+    const sep5 = d.indexOf(":");
+    const depType = (sep5 >= 0 ? d.slice(0, sep5) : d).trim().toLowerCase();
+    const depTitle = sep5 >= 0 ? d.slice(sep5 + 1).trim().toLowerCase() : null;
     const match = nodes.find((n) => n.type === depType && (depTitle === null || (n.title ?? "").toLowerCase() === depTitle));
     if (match) edges.add(match.id);
     else issues.push({ code: "planner_invalid", severity: "warning", message: `\u8282\u70B9\u4F9D\u8D56\u300C${dep}\u300D\u627E\u4E0D\u5230\u5BF9\u5E94\u4E0A\u6E38\uFF08\u6309 type:title \u5339\u914D\uFF09\uFF0C\u5DF2\u5FFD\u7565\u8FD9\u6761\u8FB9\u3002` });
@@ -153848,17 +153848,17 @@ function stageConnectorWrapper(connector) {
   const cacheKey = `${commandName} ${scriptPath}`;
   const cached3 = stagedBinDirs.get(cacheKey);
   if (cached3 && (0, import_node_fs4.existsSync)((0, import_node_path4.join)(cached3, commandName))) return (0, import_node_path4.join)(cached3, commandName);
-  const binDir2 = (0, import_node_fs4.mkdtempSync)((0, import_node_path4.join)((0, import_node_os.tmpdir)(), `oasis-conn-${connector.config.slug}-`));
-  const link = (0, import_node_path4.join)(binDir2, commandName);
+  const binDir = (0, import_node_fs4.mkdtempSync)((0, import_node_path4.join)((0, import_node_os.tmpdir)(), `oasis-conn-${connector.config.slug}-`));
+  const link = (0, import_node_path4.join)(binDir, commandName);
   (0, import_node_fs4.symlinkSync)(scriptPath, link);
   if (!(0, import_node_fs4.existsSync)(link)) {
     try {
-      (0, import_node_fs4.rmSync)(binDir2, { recursive: true, force: true });
+      (0, import_node_fs4.rmSync)(binDir, { recursive: true, force: true });
     } catch {
     }
     throw new Error(`connector ${connector.config.slug}: \u8F6F\u94FE\u5EFA\u5B8C\u4ECD\u4E0D\u53EF\u89E3\u6790\uFF08${link} \u2192 ${scriptPath}\uFF09`);
   }
-  stagedBinDirs.set(cacheKey, binDir2);
+  stagedBinDirs.set(cacheKey, binDir);
   return link;
 }
 function isStagedWrapperUsable(link) {
@@ -166463,10 +166463,10 @@ function createTokenIssuer(opts = {}) {
     if (revoked.has(token)) return null;
     if (!token.startsWith(SESSION_TOKEN_PREFIX)) return null;
     const encoded = token.slice(SESSION_TOKEN_PREFIX.length);
-    const sep4 = encoded.indexOf(".");
-    if (sep4 <= 0) return null;
-    const payload = encoded.slice(0, sep4);
-    const actualSig = encoded.slice(sep4 + 1);
+    const sep5 = encoded.indexOf(".");
+    if (sep5 <= 0) return null;
+    const payload = encoded.slice(0, sep5);
+    const actualSig = encoded.slice(sep5 + 1);
     const expectedSig = sign(secret, payload);
     if (!signatureMatches(actualSig, expectedSig)) return null;
     let claims;
@@ -197452,8 +197452,8 @@ exec ${JSON.stringify(tsx)} ${JSON.stringify(main)} "$@"
   return wrapper;
 }
 function splitIdentityFiles3(prompt) {
-  const sep4 = /<!-- FILE: (.+?) -->\n?/g;
-  const parts = prompt.split(sep4);
+  const sep5 = /<!-- FILE: (.+?) -->\n?/g;
+  const parts = prompt.split(sep5);
   if (parts.length === 1) return { "identity/AGENTS.md": prompt };
   const out = {};
   for (let i = 1; i < parts.length; i += 2) {
@@ -206558,8 +206558,8 @@ function sanitizeDaemonPath(rawPath) {
     return !SESSION_SCOPED_PREFIXES.some((p2) => base.startsWith(p2));
   }).join(":");
 }
-function installRuntimeAssets(srcRoot, binDir2) {
-  if (path29.resolve(srcRoot) === path29.resolve(binDir2)) return 0;
+function installRuntimeAssets(srcRoot, binDir) {
+  if (path29.resolve(srcRoot) === path29.resolve(binDir)) return 0;
   let copied = 0;
   let entries;
   try {
@@ -206577,7 +206577,7 @@ function installRuntimeAssets(srcRoot, binDir2) {
       continue;
     }
     if (files.length === 0) continue;
-    const destDir = path29.join(binDir2, entry.name);
+    const destDir = path29.join(binDir, entry.name);
     fs35.mkdirSync(destDir, { recursive: true });
     for (const f2 of files) {
       const dest = path29.join(destDir, f2);
@@ -206588,10 +206588,10 @@ function installRuntimeAssets(srcRoot, binDir2) {
   }
   return copied;
 }
-function syncRuntimeAssets(candidateRoots, binDir2) {
-  fs35.mkdirSync(binDir2, { recursive: true });
+function syncRuntimeAssets(candidateRoots, binDir) {
+  fs35.mkdirSync(binDir, { recursive: true });
   for (const root of candidateRoots) {
-    const copied = installRuntimeAssets(root, binDir2);
+    const copied = installRuntimeAssets(root, binDir);
     if (copied > 0) return { from: root, copied };
   }
   return null;
@@ -206604,12 +206604,9 @@ var path30 = __toESM(require("node:path"));
 var DEFAULT_INSTANCE = "default";
 var home = () => os12.homedir();
 var oasisDir = () => path30.join(home(), ".oasis");
-var binDir = () => path30.join(oasisDir(), "bin");
-var binFile = () => path30.join(binDir(), "oasis.js");
-var npmPrefix = () => path30.join(oasisDir(), "npm-global");
 var versionsDir = () => path30.join(oasisDir(), "versions");
-var versionDir = (v2) => path30.join(versionsDir(), v2);
-var currentLink = () => path30.join(oasisDir(), "current");
+var versionDir = (label) => path30.join(versionsDir(), label);
+var npmPrefix = () => path30.join(oasisDir(), "npm-global");
 var localBin = () => path30.join(home(), ".local", "bin", "oasis");
 var instancesRoot = () => path30.join(oasisDir(), "instances");
 function isValidInstanceName(name) {
@@ -206625,7 +206622,11 @@ function instancePaths(name) {
     dir,
     configFile: path30.join(dir, "node-config.json"),
     pidFile: path30.join(dir, "node.pid"),
-    logFile: path30.join(dir, "node.log")
+    logFile: path30.join(dir, "node.log"),
+    binDir: path30.join(dir, "bin"),
+    binFile: path30.join(dir, "bin", "oasis.js"),
+    currentLink: path30.join(dir, "current"),
+    sessionsDir: path30.join(dir, "sessions")
   };
 }
 function listInstances() {
@@ -206644,6 +206645,16 @@ function listInstances() {
   }
   return found;
 }
+function referencedVersionLabels() {
+  const labels = /* @__PURE__ */ new Set();
+  for (const name of listInstances()) {
+    try {
+      labels.add(path30.basename(fs36.realpathSync(instancePaths(name).currentLink)));
+    } catch {
+    }
+  }
+  return [...labels];
+}
 function normalizeServerUrl(raw) {
   try {
     const u = new URL(raw);
@@ -206656,24 +206667,26 @@ function normalizeServerUrl(raw) {
     return raw.trim().replace(/\/+$/, "").toLowerCase();
   }
 }
-function hostSlug(raw) {
-  let host;
-  try {
-    host = new URL(raw).hostname;
-  } catch {
-    host = raw.replace(/^[a-z]+:\/\//i, "").split("/")[0] ?? raw;
-  }
-  const slug6 = host.toLowerCase().replace(/[^a-z0-9]+/g, "-").replace(/^-+|-+$/g, "");
-  return slug6 || "node";
-}
 var systemdUnitName = (name) => `oasis-node@${name}.service`;
 var launchdLabel = (name) => name === DEFAULT_INSTANCE ? "com.oasis.node" : `com.oasis.node.${name}`;
 var LEGACY_SYSTEMD_UNIT = "oasis-node.service";
 var LEGACY_LAUNCHD_LABEL = "com.oasis.node";
 
 // src/install.ts
+var import_node_crypto50 = require("node:crypto");
 var fs37 = __toESM(require("node:fs"));
 var path31 = __toESM(require("node:path"));
+function versionLabel(sourceFile, pkgVersion, npmPrefixDir) {
+  if (isFromNpmPrefix(sourceFile, npmPrefixDir)) return pkgVersion;
+  const digest = (0, import_node_crypto50.createHash)("sha256").update(fs37.readFileSync(sourceFile)).digest("hex").slice(0, 8);
+  return `${pkgVersion}+local.${digest}`;
+}
+function isFromNpmPrefix(sourceFile, npmPrefixDir) {
+  const src = realpathOrSelf(sourceFile);
+  const root = realpathOrSelf(path31.join(npmPrefixDir, "lib", "node_modules"));
+  return src.startsWith(root + path31.sep);
+}
+var isLocalLabel = (label) => label.includes("+local.");
 function installBinaryAtomic(sourceFile, targetPath) {
   if (realpathOrSelf(sourceFile) === realpathOrSelf(targetPath)) return;
   fs37.mkdirSync(path31.dirname(targetPath), { recursive: true });
@@ -206715,8 +206728,9 @@ function pointCurrentAt(linkPath, targetDir) {
   }
 }
 function gcVersions(versionsDirPath, opts) {
-  const keepRecent = opts.keepRecent ?? 2;
-  const minAgeMs = opts.minAgeMs ?? 24 * 60 * 60 * 1e3;
+  const keep = new Set(opts.keep);
+  const keepSpare = opts.keepSpare ?? 1;
+  const minAgeMs = opts.minAgeMs ?? 60 * 60 * 1e3;
   const now = opts.now ?? Date.now();
   let entries;
   try {
@@ -206724,7 +206738,7 @@ function gcVersions(versionsDirPath, opts) {
   } catch {
     return [];
   }
-  const candidates = entries.filter((name) => name !== opts.keep && !name.includes(".tmp.")).map((name) => {
+  const candidates = entries.filter((name) => !keep.has(name) && !name.includes(".tmp.")).map((name) => {
     const full = path31.join(versionsDirPath, name);
     try {
       const st = fs37.statSync(full);
@@ -206734,7 +206748,7 @@ function gcVersions(versionsDirPath, opts) {
     }
   }).filter((x2) => x2 !== null).sort((a, b2) => b2.mtime - a.mtime);
   const deleted = [];
-  for (const c of candidates.slice(keepRecent)) {
+  for (const c of candidates.slice(keepSpare)) {
     if (now - c.mtime < minAgeMs) continue;
     try {
       fs37.rmSync(c.full, { recursive: true, force: true });
@@ -206756,9 +206770,7 @@ function shimScript() {
 }
 
 // src/index.ts
-var PKG_VERSION = true ? "0.1.115" : "dev";
-var BIN_DIR = binDir();
-var BIN_FILE = binFile();
+var PKG_VERSION = true ? "0.1.117" : "dev";
 var LOCAL_BIN = localBin();
 var NPM_PREFIX = npmPrefix();
 var INSTANCE = DEFAULT_INSTANCE;
@@ -206766,19 +206778,28 @@ var INST = instancePaths(DEFAULT_INSTANCE);
 var CONFIG_FILE = INST.configFile;
 var PID_FILE = INST.pidFile;
 var LOG_FILE = INST.logFile;
+var BIN_DIR = INST.binDir;
+var BIN_FILE = INST.binFile;
 function useInstance(name) {
   INSTANCE = name;
   INST = instancePaths(name);
   CONFIG_FILE = INST.configFile;
   PID_FILE = INST.pidFile;
   LOG_FILE = INST.logFile;
+  BIN_DIR = INST.binDir;
+  BIN_FILE = INST.binFile;
 }
 var PKG_NAME = "oasis_test";
 var parseFlags = (argv) => {
   const flags = /* @__PURE__ */ new Map();
   for (let i = 0; i < argv.length; i++) {
     const a = argv[i];
-    if (a.startsWith("--")) flags.set(a.slice(2), argv[++i] ?? "");
+    if (!a.startsWith("--")) continue;
+    const next = argv[i + 1];
+    if (next !== void 0 && !next.startsWith("--")) {
+      flags.set(a.slice(2), next);
+      i++;
+    } else flags.set(a.slice(2), "");
   }
   return flags;
 };
@@ -206833,20 +206854,23 @@ function ensureRuntimeAssets(targetDir = BIN_DIR) {
 }
 function installSoftware() {
   const src = process.argv[1];
-  const vDir = versionDir(PKG_VERSION);
+  const label = versionLabel(src, PKG_VERSION, NPM_PREFIX);
+  const vDir = versionDir(label);
   installBinaryAtomic(src, path32.join(vDir, "oasis.js"));
   ensureRuntimeAssets(vDir);
-  pointCurrentAt(currentLink(), vDir);
   installBinaryAtomic(src, BIN_FILE);
   ensureRuntimeAssets(BIN_DIR);
+  pointCurrentAt(INST.currentLink, vDir);
   fs38.mkdirSync(path32.dirname(LOCAL_BIN), { recursive: true });
   fs38.writeFileSync(LOCAL_BIN, shimScript(), { mode: 493 });
-  const removed = gcVersions(versionsDir(), { keep: PKG_VERSION });
-  if (removed.length) console.error(`[oasis] \u7248\u672C GC\uFF1A\u5220\u9664 ${removed.join(", ")}\uFF08\u4FDD\u7559 ${PKG_VERSION} + \u6700\u8FD1 2 \u7248\uFF09`);
+  const keep = [.../* @__PURE__ */ new Set([label, ...referencedVersionLabels()])];
+  const removed = gcVersions(versionsDir(), { keep });
+  if (removed.length) console.error(`[oasis] \u7248\u672C GC\uFF1A\u5220\u9664 ${removed.join(", ")}\uFF08\u5728\u7528\uFF1A${keep.join(", ")}\uFF09`);
+  return label;
 }
 function setupAutostart(name) {
   const inst = instancePaths(name);
-  const cmd = `${process.execPath} "${BIN_FILE}" --_daemon --instance ${name}`;
+  const cmd = `${process.execPath} "${inst.binFile}" --_daemon --instance ${name}`;
   const home2 = os13.homedir();
   const pnpmHome = process.env["PNPM_HOME"] || path32.join(home2, ".local", "share", "pnpm");
   const extraBins = [
@@ -206866,9 +206890,13 @@ function setupAutostart(name) {
       `Description=Oasis Node Daemon (${name})`,
       "After=network.target",
       "",
+      // OASIS_CLI_HOME 由 daemon 继承给它 spawn 的 agent 会话——非 default 实例的会话因此
+      // 用的是**本实例**的 CLI 版本，而不是 PATH 上那个默认指向 default 的 shim。
+      // （台阶 3 的 D4 后半截会把它细到「每个会话钉 spawn 那一刻的版本」，这里先钉到实例。）
       "[Service]",
       `ExecStart=${cmd}`,
       `Environment=PATH=${daemonPath}`,
+      `Environment=OASIS_CLI_HOME=${inst.currentLink}`,
       `StandardOutput=append:${inst.logFile}`,
       `StandardError=append:${inst.logFile}`,
       "Restart=on-failure",
@@ -206916,9 +206944,12 @@ function setupAutostart(name) {
 function spawnDaemon() {
   fs38.mkdirSync(path32.dirname(LOG_FILE), { recursive: true });
   const log3 = fs38.openSync(LOG_FILE, "a");
-  const child = (0, import_node_child_process19.spawn)(process.execPath, [BIN_FILE, "--_daemon", "--instance", INSTANCE], {
+  const child = (0, import_node_child_process19.spawn)(process.execPath, [INST.binFile, "--_daemon", "--instance", INSTANCE], {
     detached: true,
-    stdio: ["ignore", log3, log3]
+    stdio: ["ignore", log3, log3],
+    // 与 systemd unit 里那条 Environment 等价——detached 兜底路径不能少，否则同一实例在两条
+    // 启动路径下 spawn 出的会话会用不同版本的 CLI。
+    env: { ...process.env, OASIS_CLI_HOME: INST.currentLink }
   });
   child.unref();
   return child.pid ?? 0;
@@ -206961,9 +206992,17 @@ function stopDaemon(name) {
     }
   }
 }
-function selfUpdate() {
+function selfUpdate(opts = {}) {
   const cfg = readConfig();
   if (!cfg?.serverUrl) throw new Error("no config \u2014 run `oasis daemon start` first");
+  if (cfg.pinnedVersion && !opts.force) {
+    console.error(`[oasis] \u5B9E\u4F8B ${INSTANCE} \u5DF2\u9489\u5728 ${cfg.pinnedVersion}\uFF0C\u8DF3\u8FC7\u81EA\u66F4\u65B0\uFF08\u8981\u89E3\u9664\uFF1Aoasis daemon update --instance ${INSTANCE} --force\uFF09`);
+    return false;
+  }
+  if (cfg.pinnedVersion && opts.force) {
+    saveConfig({ ...cfg, pinnedVersion: void 0 });
+    console.error(`[oasis] --force\uFF1A\u5DF2\u89E3\u9664 ${INSTANCE} \u7684\u7248\u672C\u9489\u6B7B\uFF08\u539F ${cfg.pinnedVersion}\uFF09`);
+  }
   const nameArg = cfg.name ? ` --name '${cfg.name.replace(/'/g, "'\\''")}'` : "";
   const oasisBin = path32.join(NPM_PREFIX, "bin", "oasis");
   const startCmd = `"${oasisBin}" daemon start --instance ${INSTANCE} --server-ws '${cfg.serverUrl}'${nameArg}`;
@@ -206991,37 +207030,15 @@ function selfUpdate() {
     const child = (0, import_node_child_process19.spawn)("sh", ["-c", inner], { detached: true, stdio: ["ignore", log3, log3] });
     child.unref();
   }
+  return true;
 }
-function resolveInstance(explicit, serverUrl, forStart) {
-  if (explicit) {
-    if (!isValidInstanceName(explicit)) {
-      console.error(`[oasis] \u975E\u6CD5\u5B9E\u4F8B\u540D "${explicit}"\uFF1A\u53EA\u5141\u8BB8\u5C0F\u5199\u5B57\u6BCD/\u6570\u5B57/.-_\uFF0C\u4E14\u4EE5\u5B57\u6BCD\u6570\u5B57\u5F00\u5934`);
-      process.exit(1);
-    }
-    return explicit;
-  }
-  const existing = listInstances();
-  if (existing.length === 0) return DEFAULT_INSTANCE;
-  if (existing.length === 1) return existing[0];
-  const demand = (why) => {
-    console.error(`[oasis] \u672C\u673A\u6709 ${existing.length} \u4E2A daemon \u5B9E\u4F8B\uFF08${existing.join(", ")}\uFF09\uFF1A${why}`);
-    console.error(`         \u8BF7\u7528 --instance <name> \u663E\u5F0F\u6307\u5B9A\u3002`);
+function resolveInstance(explicit) {
+  if (!explicit) return DEFAULT_INSTANCE;
+  if (!isValidInstanceName(explicit)) {
+    console.error(`[oasis] \u975E\u6CD5\u5B9E\u4F8B\u540D "${explicit}"\uFF1A\u53EA\u5141\u8BB8\u5C0F\u5199\u5B57\u6BCD/\u6570\u5B57/.-_\uFF0C\u4E14\u4EE5\u5B57\u6BCD\u6570\u5B57\u5F00\u5934`);
     process.exit(1);
-  };
-  if (!serverUrl) return demand("\u6CA1\u7ED9 --server-ws\uFF0C\u65E0\u4ECE\u5224\u65AD\u4F60\u8981\u54EA\u4E00\u4E2A");
-  const want = normalizeServerUrl(serverUrl);
-  const hit = existing.filter((n) => {
-    const c = readConfigAt(instancePaths(n).configFile);
-    return !!c?.serverUrl && normalizeServerUrl(c.serverUrl) === want;
-  });
-  if (hit.length === 1) return hit[0];
-  if (hit.length > 1) return demand(`${hit.join(", ")} \u90FD\u8FDE\u7740 ${want}`);
-  if (!forStart) return demand(`\u6CA1\u6709\u5B9E\u4F8B\u8FDE\u7740 ${want}`);
-  const slug6 = hostSlug(serverUrl);
-  if (existing.includes(slug6)) {
-    return demand(`\u81EA\u52A8\u5B9E\u4F8B\u540D "${slug6}" \u5DF2\u88AB\u5360\u7528\uFF0C\u800C\u5B83\u8FDE\u7684\u4E0D\u662F ${want}`);
   }
-  return slug6;
+  return explicit;
 }
 function derivedNodeIdFor(name) {
   if (name === DEFAULT_INSTANCE) return resolveNodeId();
@@ -207047,7 +207064,7 @@ void (async () => {
   }
   const flags = parseFlags(dargs);
   if (cmd === "--_daemon") {
-    useInstance(resolveInstance(flags.get("instance"), void 0, false));
+    useInstance(resolveInstance(flags.get("instance")));
     const cfg = readConfig();
     if (!cfg) {
       console.error("[oasis] no config \u2014 run `oasis daemon start` first");
@@ -207128,13 +207145,18 @@ void (async () => {
   }
   if (dsub === "start") {
     const serverUrlFlag = flags.get("server-ws") ?? process.env["OASIS_SERVER_WS"];
-    useInstance(resolveInstance(flags.get("instance"), serverUrlFlag, true));
+    useInstance(resolveInstance(flags.get("instance")));
     const prev = readConfig();
     const serverUrl = serverUrlFlag ?? prev?.serverUrl;
     if (!serverUrl) {
       console.error("Usage: oasis daemon start --server-ws <wss://...> (--enroll-token <ent_...> | --token <ont_...>) [--name <name>] [--instance <name>]");
       process.exit(1);
     }
+    if (!flags.get("instance") && prev?.serverUrl && normalizeServerUrl(prev.serverUrl) !== normalizeServerUrl(serverUrl)) {
+      console.error(`[oasis] \u26A0 \u5B9E\u4F8B "${INSTANCE}" \u539F\u672C\u8FDE ${prev.serverUrl}\uFF0C\u672C\u6B21\u5C06\u6539\u8FDE ${serverUrl}\u2014\u2014\u8FD9\u662F**\u8FC1\u79FB**\u4E0D\u662F\u65B0\u589E\u3002`);
+      console.error(`[oasis]   \u60F3\u8BA9\u4E24\u4E2A\u63A7\u5236\u9762\u5E76\u5B58\uFF0C\u8BF7\u4E2D\u6B62\uFF08Ctrl-C\uFF09\u5E76\u6539\u7528\uFF1A`);
+      console.error(`[oasis]   oasis daemon start --instance <\u65B0\u540D\u5B57> --server-ws ${serverUrl} --enroll-token <ent_...>`);
+    }
     const serverChanged = !!prev?.serverUrl && prev.serverUrl !== serverUrl;
     let nodeId = serverChanged ? void 0 : prev?.nodeId;
     let token = serverChanged ? flags.get("token") ?? process.env["OASIS_NODE_TOKEN"] : flags.get("token") ?? process.env["OASIS_NODE_TOKEN"] ?? prev?.token;
@@ -207161,7 +207183,11 @@ void (async () => {
     const name = flags.get("name") ?? prev?.name;
     const nameChanged = prev?.name !== void 0 && name !== prev.name;
     saveConfig({ serverUrl, token, nodeId, ...name ? { name } : {}, reportRuntimesOnNextStart: true });
-    installSoftware();
+    const installedLabel = installSoftware();
+    if (isLocalLabel(installedLabel)) {
+      saveConfig({ ...readConfig(), pinnedVersion: installedLabel });
+      console.log(`  \u672C\u5730\u6784\u5EFA \u2192 \u5DF2\u9489\u7248\u672C ${installedLabel}\uFF08\u81EA\u66F4\u65B0\u5BF9\u672C\u5B9E\u4F8B\u5931\u6548\uFF1B\u89E3\u9664\uFF1Aoasis daemon update --instance ${INSTANCE} --force\uFF09`);
+    }
     stopDaemon(INSTANCE);
     const tookOver = setupAutostart(INSTANCE);
     const suffix = `${nameChanged ? `  [name updated: ${prev.name} \u2192 ${name}]` : ""}`;
@@ -207178,13 +207204,13 @@ void (async () => {
     return;
   }
   if (dsub === "stop") {
-    useInstance(resolveInstance(flags.get("instance"), flags.get("server-ws"), false));
+    useInstance(resolveInstance(flags.get("instance")));
     stopDaemon(INSTANCE);
     console.log(`\u2713 stopped (instance ${INSTANCE})`);
     return;
   }
   if (dsub === "restart") {
-    useInstance(resolveInstance(flags.get("instance"), flags.get("server-ws"), false));
+    useInstance(resolveInstance(flags.get("instance")));
     stopDaemon(INSTANCE);
     if (!readConfig()) {
       console.error("no config \u2014 run `oasis daemon start` first");
@@ -207195,14 +207221,18 @@ void (async () => {
     return;
   }
   if (dsub === "update") {
-    useInstance(resolveInstance(flags.get("instance"), flags.get("server-ws"), false));
+    useInstance(resolveInstance(flags.get("instance")));
     if (!readConfig()?.serverUrl) {
       console.error("no config \u2014 run `oasis daemon start` first");
       process.exit(1);
     }
-    console.log(`\u2192 \u66F4\u65B0 ${PKG_NAME} \u5230\u6700\u65B0\u7248\u672C\u5E76\u91CD\u542F\u8282\u70B9\u2026`);
-    selfUpdate();
-    console.log(`\u2713 \u66F4\u65B0\u5DF2\u89E6\u53D1\uFF08\u540E\u53F0\u62C9\u53D6 ${PKG_NAME}@latest \u5E76\u91CD\u542F\uFF09\uFF1B\u67E5\u770B\u65E5\u5FD7\uFF1Atail -f ${LOG_FILE}`);
+    const forced = flags.has("force") || dargs.includes("--force");
+    console.log(`\u2192 \u66F4\u65B0 ${PKG_NAME} \u5230\u6700\u65B0\u7248\u672C\u5E76\u91CD\u542F\u8282\u70B9\u2026${forced ? "\uFF08--force\uFF1A\u5FFD\u7565\u5E76\u89E3\u9664\u7248\u672C\u9489\u6B7B\uFF09" : ""}`);
+    if (selfUpdate({ force: forced })) {
+      console.log(`\u2713 \u66F4\u65B0\u5DF2\u89E6\u53D1\uFF08\u540E\u53F0\u62C9\u53D6 ${PKG_NAME}@latest \u5E76\u91CD\u542F\uFF09\uFF1B\u67E5\u770B\u65E5\u5FD7\uFF1Atail -f ${LOG_FILE}`);
+    } else {
+      console.log(`\uFF08\u672A\u89E6\u53D1\u66F4\u65B0\u2014\u2014\u672C\u5B9E\u4F8B\u5DF2\u9489\u7248\u672C\uFF09`);
+    }
     return;
   }
   if (dsub === "status") {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "oasis_test",
-  "version": "0.1.115",
+  "version": "0.1.117",
   "description": "Oasis node daemon + CLI — background daemon, auto-start, full server CLI",
   "bin": {
     "oasis": "./dist/index.js"
@@ -26,6 +26,6 @@
     "node": ">=20"
   },
   "oasisRelease": {
-    "sourceHead": "dab28ef58182b7f3744481d124d14f54459588ae"
+    "sourceHead": "e184c6203a01203cf15f702f0bd0f744584dccd4"
   }
 }