oasis_test 0.1.12 → 0.1.13

package/dist/index.js

@@ -618,6 +618,20 @@ function deriveArtifactId(type, workspace, title, usedIds) {
   usedIds.add(id);
   return id;
 }
+function resolveNodeRef(ref, candidates) {
+  const r = ref.trim();
+  if (r.startsWith("artifact:")) {
+    const hit = candidates.find((n) => n.id === r);
+    return hit ? { ok: true, id: hit.id } : { ok: false, reason: "not_found" };
+  }
+  const sep = r.indexOf(":");
+  const type = (sep >= 0 ? r.slice(0, sep) : r).trim().toLowerCase();
+  const title = sep >= 0 ? r.slice(sep + 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 };
+  return { ok: false, reason: "ambiguous", candidates: matches };
+}
 var init_node_identity = __esm({
   "../core/src/node-identity.ts"() {
     "use strict";
@@ -1321,6 +1335,7 @@ var init_kernel = __esm({
     init_src();
     init_read_model();
     init_content_handler();
+    init_node_identity();
     init_governance();
     init_manifest_store();
     init_grounding();
@@ -2060,7 +2075,64 @@ var init_kernel = __esm({
        * 预检（②终态校验 + ③advisory + ④爆炸半径）。preview 白送：
        * structuredClone 读模型、灌假设 op、看终态——derived-not-stored 的红利，无须仿真引擎。
        */
+      /**
+       * 二期 title-identity：把 plan 里的【节点引用】（`type` | `type:title` | `id`）解析成最终 id。
+       * - spawn 省略 id → 据 (type,title) 派生（usedIds 预种工单现有 id + 本批显式 id,不和存量撞）。
+       * - 引用现有/本批节点 → 在 plan.workspace 范围内 {现有 ∪ 本批 spawn} 匹配;撞多个 throw 带候选、无则 throw。
+       * - 批内**先派生所有 spawn 的 id,再解引用**（link 才引得到本批新建的）。
+       * - workspace 缺省 = 只走 id（向后兼容 passthrough）。**幂等**:解析一份已解析的 plan = 原样。
+       * 落 oplog 的是解析后的 id（重放确定）。
+       */
+      resolveInterventionRefs(plan) {
+        const ws = plan.workspace;
+        const existing = ws ? [...this.model.artifacts.values()].filter((a) => a.workspace === ws).map((a) => ({ id: a.id, type: a.type, ...a.title ? { title: a.title } : {} })) : [];
+        const usedIds = new Set(existing.map((n) => n.id));
+        for (const op of plan.ops) if (op.action === "spawn" && op.id) usedIds.add(op.id);
+        const batch = [];
+        const spawnIds = plan.ops.map((op) => {
+          if (op.action !== "spawn") return void 0;
+          if (op.id) {
+            batch.push({ id: op.id, type: op.type, ...op.title ? { title: op.title } : {} });
+            return op.id;
+          }
+          if (!ws) throw new KernelError("spawn \u7701\u7565 id \u9700\u8981 InterventionPlan.workspace + title \u624D\u80FD\u6D3E\u751F");
+          const title = op.title?.trim();
+          if (!title) throw new KernelError("spawn \u7701\u7565 id \u65F6 title \u5FC5\u586B\uFF08\u636E (type,title) \u6D3E\u751F id\uFF09");
+          if ([...existing, ...batch].some((n) => n.type === op.type && (n.title ?? "").toLowerCase() === title.toLowerCase()))
+            throw new KernelError(`\u8282\u70B9 title \u649E\u540D\uFF1A${op.type}\u300C${title}\u300D\u5728\u672C\u5DE5\u5355\u5DF2\u5B58\u5728,\u8BF7\u6362\u4E2A\u533A\u5206\u7684\u540D\u5B57`);
+          const id = deriveArtifactId(op.type, ws, title, usedIds);
+          batch.push({ id, type: op.type, title });
+          return id;
+        });
+        const candidates = [...existing, ...batch];
+        const ref = (r, what) => {
+          if (r === void 0) return void 0;
+          if (!ws) return r;
+          const res = resolveNodeRef(r, candidates);
+          if (res.ok) return res.id;
+          if (res.reason === "ambiguous")
+            throw new KernelError(`${what}\u300C${r}\u300D\u5339\u914D\u5230\u591A\u4E2A\u8282\u70B9,\u8BF7\u6307\u660E\u54EA\u4E2A:
+${res.candidates.map((c) => `  - ${c.type}:${c.title ?? "(\u65E0title)"} \u2192 ${c.id}`).join("\n")}`);
+          throw new KernelError(`${what}\u300C${r}\u300D\u627E\u4E0D\u5230\u5BF9\u5E94\u8282\u70B9\uFF08\u53EF\u7528 type / type:title / id\uFF09`);
+        };
+        const ops = plan.ops.map((op, i) => {
+          switch (op.action) {
+            case "spawn":
+              return { ...op, id: spawnIds[i], ...op.workspace === void 0 && ws ? { workspace: ws } : {}, ...op.inputs ? { inputs: op.inputs.map((e) => ({ to: ref(e.to, "spawn \u4F9D\u8D56"), ...e.required !== void 0 ? { required: e.required } : {} })) } : {} };
+            case "link":
+            case "unlink":
+            case "pin":
+              return { ...op, artifactId: ref(op.artifactId, op.action), to: ref(op.to, `${op.action} \u4E0A\u6E38`) };
+            case "annotate":
+              return { ...op, artifactId: ref(op.artifactId, "annotate"), ...op.raisedFrom ? { raisedFrom: ref(op.raisedFrom, "annotate raisedFrom") } : {} };
+            default:
+              return { ...op, artifactId: ref(op.artifactId, op.action) };
+          }
+        });
+        return { ...plan, ops };
+      }
       async previewIntervention(plan) {
+        plan = this.resolveInterventionRefs(plan);
         const constituents = this.buildConstituents(plan);
         const touched = [...new Set(constituents.map((c) => c.artifactId))];
         const baseSeqs = Object.fromEntries(touched.map((id) => [id, this.model.lastSeq.get(id) ?? 0]));
@@ -2189,6 +2261,7 @@ var init_kernel = __esm({
        * v1 注：inverse 批次未物化（oplog 信息足以推导），可逆性=再发一个 intervention。
        */
       async applyIntervention(plan, baseSeqs, actor) {
+        plan = this.resolveInterventionRefs(plan);
         const { changeClass, nonMonotonicOps } = classifyIntervention(plan);
         if (changeClass === "C" && !isHumanActor(actor)) {
           throw new KernelError(
@@ -2266,25 +2339,27 @@ var init_kernel = __esm({
       buildConstituentsRaw(plan) {
         const order = { spawn: 0, edit: 1, reopen: 2, assign: 3, link: 4, pin: 5, unlink: 6, cancelPart: 7, seal: 8, annotate: 9 };
         const sorted = [...plan.ops].sort((a, b2) => order[a.action] - order[b2.action]);
-        const spawnedHere = new Set(plan.ops.flatMap((op) => op.action === "spawn" ? [op.id] : []));
+        const spawnedHere = new Set(plan.ops.flatMap((op) => op.action === "spawn" && op.id ? [op.id] : []));
         const isPrereqFill = (id) => plan.ops.some((op) => op.action === "link" && op.to === id && !spawnedHere.has(op.artifactId));
         return sorted.map((op) => {
           switch (op.action) {
             case "spawn": {
+              const spawnId = op.id;
+              if (!spawnId) throw new KernelError("internal: spawn id \u672A\u89E3\u6790\uFF08\u5E94\u5148\u8FC7 resolveInterventionRefs\uFF09");
               const typeDef = this.schema.get(op.type);
               if (this.schema.size > 0 && !typeDef) throw new KernelError(`unknown ArtifactType: ${op.type}`);
               const spawnFields = this.schema.size > 0 ? validateArtifactFields(op.fields, typeDef?.fieldDefs, "spawn") : op.fields;
               const owner = op.owner ?? this.resolveOwner(op.type, typeDef);
               return {
-                artifactId: op.id,
+                artifactId: spawnId,
                 kind: "spawn_artifact",
-                target: op.id,
+                target: spawnId,
                 payload: {
                   type: op.type,
                   owner,
                   workspace: op.workspace ?? "ws:default",
                   persistence: "persistent",
-                  createdVia: isPrereqFill(op.id) ? "prereq" : "manual-spawn",
+                  createdVia: isPrereqFill(spawnId) ? "prereq" : "manual-spawn",
                   ...op.title !== void 0 ? { title: op.title } : {},
                   ...op.description !== void 0 ? { description: op.description } : {},
                   ...op.docType !== void 0 ? { docType: op.docType } : {},
@@ -32484,6 +32559,7 @@ After=network.target
 
 [Service]
 ExecStart=$NODE_CMD node --server-ws ${p2.gatewayUrl} --dir $NODE_DIR
+Environment=PATH=$PATH:$HOME/.npm-global/bin:$HOME/.local/bin:/usr/local/bin
 WorkingDirectory=$OASIS_DIR
 Restart=on-failure
 RestartSec=5
@@ -47313,6 +47389,9 @@ async function runCli(argv, println = console.log) {
           "",
           "[Service]",
           `ExecStart=${binPath} ${svcArgs}`,
+          // Carry the install-time PATH so the detached daemon detects CLIs in user dirs
+          // (~/.npm-global/bin, ~/.local/bin) — systemd --user otherwise gives a minimal PATH.
+          `Environment=PATH=${process.env["PATH"] ?? ""}:${path12.join(os7.homedir(), ".npm-global/bin")}:${path12.join(os7.homedir(), ".local/bin")}:/usr/local/bin`,
           "Restart=on-failure",
           "RestartSec=5",
           "StandardOutput=journal",
@@ -48417,6 +48496,13 @@ exec node "${BIN_FILE}" "$@"
 }
 function setupAutostart() {
   const cmd = `${process.execPath} "${BIN_FILE}" --_daemon`;
+  const home = os8.homedir();
+  const extraBins = [
+    path13.join(home, ".npm-global", "bin"),
+    path13.join(home, ".local", "bin"),
+    "/usr/local/bin"
+  ];
+  const daemonPath = [process.env["PATH"] ?? "", ...extraBins].filter(Boolean).join(":");
   if (process.platform === "linux") {
     const unitDir = path13.join(os8.homedir(), ".config", "systemd", "user");
     fs15.mkdirSync(unitDir, { recursive: true });
@@ -48427,6 +48513,7 @@ function setupAutostart() {
       "",
       "[Service]",
       `ExecStart=${cmd}`,
+      `Environment=PATH=${daemonPath}`,
       `StandardOutput=append:${LOG_FILE}`,
       `StandardError=append:${LOG_FILE}`,
       "Restart=on-failure",
@@ -48448,6 +48535,7 @@ function setupAutostart() {
 <plist version="1.0"><dict>
   <key>Label</key><string>com.oasis.node</string>
   <key>ProgramArguments</key><array><string>/bin/sh</string><string>-c</string><string>${cmd}</string></array>
+  <key>EnvironmentVariables</key><dict><key>PATH</key><string>${daemonPath}</string></dict>
   <key>RunAtLoad</key><true/><key>KeepAlive</key><true/>
   <key>StandardOutPath</key><string>${LOG_FILE}</string>
   <key>StandardErrorPath</key><string>${LOG_FILE}</string>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "oasis_test",
-  "version": "0.1.12",
+  "version": "0.1.13",
   "description": "Oasis node daemon + CLI — background daemon, auto-start, full server CLI",
   "bin": {
     "oasis": "./dist/index.js"