oasis_test 0.1.32 → 0.1.34

package/dist/index.js

@@ -387,6 +387,8 @@ function fold(model, op) {
         head: artifact.currentRev,
         at: op.timestamp,
         seq: op.seq,
+        by: op.actor,
+        note: p2.note,
         gate: p2.gate ? { quorum: p2.gate.quorum, eligible: [...p2.gate.eligible] } : null
       });
       break;
@@ -404,6 +406,7 @@ function fold(model, op) {
         head: artifact.currentRev,
         at: op.timestamp,
         seq: op.seq,
+        by: op.actor,
         gate: null,
         forced: { by: op.actor, reason: p2.reason }
       });
@@ -3795,6 +3798,7 @@ function computeProduceJobs(model) {
       out.push({ artifactId: artifact.id });
       continue;
     }
+    if (partHasOpenBackpressure(model, artifact.id, null)) continue;
     for (const part of parts) {
       if (gaps.some((g2) => g2.part === part.name) || partHasOpenBackpressure(model, artifact.id, part.name)) continue;
       if (partProduced(model, artifact.id, part.name) && !partReworkNeeded(model, artifact.id, part.name)) continue;
@@ -23535,9 +23539,20 @@ async function resolveContent(blobs, args) {
   throw new Error("propose \u9700\u8981 content\uFF08\u5355\u6587\u4EF6\uFF09/ files\uFF08\u591A\u6587\u4EF6\uFF09/ externalPin\uFF08\u5916\u90E8\u5927\u4EF6\uFF09\u4E4B\u4E00");
 }
 async function resolveProposeContent(kernel, blobs, args, artifactId, ctx) {
-  const explicit = typeof args["content"] === "string" || Array.isArray(args["files"]) || optStr(args, "externalPin") !== void 0;
-  if (!explicit && ctx.resolveCodeRepo) {
-    const ws = kernel.model.artifacts.get(artifactId)?.workspace;
+  const hasInline = typeof args["content"] === "string" || Array.isArray(args["files"]);
+  const pin = optStr(args, "externalPin");
+  const art = kernel.model.artifacts.get(artifactId);
+  const typeDef = art ? ctx.schema?.find((t) => t.name === art.type) : void 0;
+  const isCode = typeDef?.contentType === "code";
+  const knownNonCode = typeDef !== void 0 && !isCode;
+  if (isCode && hasInline) {
+    throw new Error(
+      "\u4EE3\u7801\u8282\u70B9\u7684\u5185\u5BB9\u5728 git\uFF0C\u4E0D\u63A5\u53D7 --file/--from-dir \u5185\u8054\u5185\u5BB9\u3002\u8BF7\u5728\u4F60\u6539\u8FC7\u7684\u4ED3\u5E93 commit \u5E76 `git push` \u5230\u5DE5\u5355 feat \u5206\u652F\u540E\uFF0C\u76F4\u63A5 `oasis propose <id> --reason`\uFF08\u7CFB\u7EDF\u81EA\u52A8\u4ECE git \u6536\u96C6\uFF09\uFF0C\u6216\u7528 `oasis propose <id> --git-commit <sha>` \u624B\u52A8\u6307\u5B9A\u90A3\u6B21\u63D0\u4EA4\u3002"
+    );
+  }
+  if (pin !== void 0) return { contentRef: pin, contentKind: "external-pin" };
+  if (!hasInline && !knownNonCode && ctx.resolveCodeRepo) {
+    const ws = art?.workspace;
     const repos = ws ? (await ctx.resolveCodeRepo(ws))?.repos : void 0;
     if (repos?.length) {
       const slug6 = (id) => id.replace(/[^a-zA-Z0-9_-]+/g, "_");
@@ -23549,6 +23564,14 @@ async function resolveProposeContent(kernel, blobs, args, artifactId, ctx) {
       }
       return { contentRef: JSON.stringify(commits), contentKind: "external-pin" };
     }
+    if (isCode) {
+      throw new Error(
+        '\u4EE3\u7801\u8282\u70B9\u4F46\u672C\u5DE5\u5355\u672A\u914D\u7F6E\u4EE3\u7801\u4ED3\u5E93\uFF0C\u6536\u96C6\u4E0D\u5230 git \u5185\u5BB9\u3002\u8BF7\u7528 `oasis gap <id> --desc "\u7F3A\u4EE3\u7801\u4ED3\u5E93\u914D\u7F6E"` \u4E0A\u62A5\uFF0C\u522B\u7528 --file \u515C\u5E95\u3002'
+      );
+    }
+  }
+  if (!hasInline && knownNonCode) {
+    throw new Error("\u9700\u8981\u5185\u5BB9\uFF1A`--file <\u6587\u4EF6>`\uFF08\u5355\u6587\u4EF6\uFF09\u6216 `--from-dir <\u76EE\u5F55>`\uFF08\u591A\u6587\u4EF6\uFF09\u3002");
   }
   return resolveContent(blobs, args);
 }
@@ -24975,7 +24998,9 @@ async function startOasisServer(opts) {
                   ...streamedParts.length ? { parts: streamedParts } : {}
                 }).catch(() => void 0);
                 await chatStore.updateSession(persistTarget.id, {
-                  runtimeSessionId: session.id,
+                  // 优先落 runtime-native id（codex rollout / ACP session/new 返回），让下一轮 resume
+                  // 能命中 runtime 认可的 id；claude-code 等接受任意外部 id 的仍回退 session.id 兼容原行为。
+                  runtimeSessionId: session.nativeSessionId ?? session.id,
                   touchedAt: (/* @__PURE__ */ new Date()).toISOString()
                 }).catch(() => void 0);
               };
@@ -34164,6 +34189,94 @@ var init_image_upload = __esm({
   }
 });
 
+// ../server/src/domains/actors/skill-materializer.ts
+async function listSkillMetadataForActor(args) {
+  const skills = await args.service.listInstalledSkillsForActor(args.actorId);
+  if (skills.length === 0) return [];
+  const listMeta = args.service.listSkillFilesMeta;
+  if (!listMeta) {
+    throw new Error("SkillFileSource.listSkillFilesMeta \u672A\u5B9E\u73B0\u2014\u2014\u6280\u80FD\u589E\u91CF\u7F13\u5B58\u9700\u8981\u5B83");
+  }
+  const out = [];
+  const usedDirs = /* @__PURE__ */ new Set();
+  for (const skill of skills) {
+    const metas = await listMeta.call(args.service, skill.id);
+    if (metas.length === 0) continue;
+    let dir = sanitizeSkillDir(skill.name);
+    if (usedDirs.has(dir)) {
+      let n = 2;
+      while (usedDirs.has(`${dir}-${n}`)) n++;
+      dir = `${dir}-${n}`;
+    }
+    usedDirs.add(dir);
+    const sorted = [...metas].sort((a, b2) => a.path.localeCompare(b2.path));
+    let latest = "1970-01-01T00:00:00.000Z";
+    const hasher = (0, import_node_crypto7.createHash)("sha256");
+    for (const m2 of sorted) {
+      if (m2.updatedAt > latest) latest = m2.updatedAt;
+      hasher.update(m2.path);
+      hasher.update("\0");
+      hasher.update(m2.blobHash);
+      hasher.update("\0");
+    }
+    out.push({
+      id: skill.id,
+      name: skill.name,
+      dir,
+      updatedAt: latest,
+      contentHash: `sha256:${hasher.digest("hex")}`,
+      fileList: sorted.map((m2) => m2.path)
+    });
+  }
+  return out;
+}
+function skillsDirForRuntime(runtimeKind) {
+  switch (runtimeKind) {
+    case "claude":
+    case "claude-code":
+      return ".claude/skills";
+    default:
+      return ".agent_context/skills";
+  }
+}
+function sanitizeSkillDir(name) {
+  const s2 = name.toLowerCase().trim().replace(/[^a-z0-9]+/g, "-").replace(/^-+|-+$/g, "");
+  return s2 || "skill";
+}
+async function materializeSkillFiles(args) {
+  const skills = await args.service.listInstalledSkillsForActor(args.actorId);
+  if (skills.length === 0) return {};
+  const prefix = skillsDirForRuntime(args.runtimeKind);
+  const out = {};
+  const usedDirs = /* @__PURE__ */ new Set();
+  for (const skill of skills) {
+    const files = await args.service.listSkillFiles(skill.id);
+    if (files.length === 0) continue;
+    let dir = sanitizeSkillDir(skill.name);
+    if (usedDirs.has(dir)) {
+      let n = 2;
+      while (usedDirs.has(`${dir}-${n}`)) n++;
+      dir = `${dir}-${n}`;
+    }
+    usedDirs.add(dir);
+    for (const f2 of files) {
+      if (!f2.content) {
+        console.warn(`[skill-materializer] skip ${skill.id}/${f2.path}\uFF1Acontent \u4E3A\u7A7A\uFF08\u672A\u56DE\u586B\uFF1F\uFF09\uFF0C\u4E0D\u5199\u7A7A\u6280\u80FD\u6587\u4EF6`);
+        continue;
+      }
+      out[`${prefix}/${dir}/${f2.path}`] = f2.content;
+    }
+  }
+  return out;
+}
+var import_node_crypto7;
+var init_skill_materializer = __esm({
+  "../server/src/domains/actors/skill-materializer.ts"() {
+    "use strict";
+    import_node_crypto7 = require("node:crypto");
+  }
+});
+
 // ../server/src/domains/actors/routes.ts
 function positionsFromPayload(body) {
   if (!body) return void 0;
@@ -34554,6 +34667,16 @@ function actorsDomain(opts) {
       await service.deleteSkillFile(req.params.id, req.params["*"] ?? "");
       return { status: 200, body: { ok: true } };
     });
+    router.get("/api/skill-cache/manifest", async (req) => {
+      const { service } = await resolveCtx(req.auth.companyId);
+      const items = await listSkillMetadataForActor({ service, actorId: req.auth.actor });
+      return { status: 200, body: { items } };
+    });
+    router.get("/api/skill-cache/files/:skillId", async (req) => {
+      const { service } = await resolveCtx(req.auth.companyId);
+      const files = await service.listSkillFiles(req.params.skillId);
+      return { status: 200, body: { files } };
+    });
   };
 }
 var init_routes = __esm({
@@ -34564,94 +34687,7 @@ var init_routes = __esm({
     init_stats();
     init_activity();
     init_image_upload();
-  }
-});
-
-// ../server/src/domains/actors/skill-materializer.ts
-async function listSkillMetadataForActor(args) {
-  const skills = await args.service.listInstalledSkillsForActor(args.actorId);
-  if (skills.length === 0) return [];
-  const listMeta = args.service.listSkillFilesMeta;
-  if (!listMeta) {
-    throw new Error("SkillFileSource.listSkillFilesMeta \u672A\u5B9E\u73B0\u2014\u2014\u6280\u80FD\u589E\u91CF\u7F13\u5B58\u9700\u8981\u5B83");
-  }
-  const out = [];
-  const usedDirs = /* @__PURE__ */ new Set();
-  for (const skill of skills) {
-    const metas = await listMeta.call(args.service, skill.id);
-    if (metas.length === 0) continue;
-    let dir = sanitizeSkillDir(skill.name);
-    if (usedDirs.has(dir)) {
-      let n = 2;
-      while (usedDirs.has(`${dir}-${n}`)) n++;
-      dir = `${dir}-${n}`;
-    }
-    usedDirs.add(dir);
-    const sorted = [...metas].sort((a, b2) => a.path.localeCompare(b2.path));
-    let latest = "1970-01-01T00:00:00.000Z";
-    const hasher = (0, import_node_crypto7.createHash)("sha256");
-    for (const m2 of sorted) {
-      if (m2.updatedAt > latest) latest = m2.updatedAt;
-      hasher.update(m2.path);
-      hasher.update("\0");
-      hasher.update(m2.blobHash);
-      hasher.update("\0");
-    }
-    out.push({
-      id: skill.id,
-      name: skill.name,
-      dir,
-      updatedAt: latest,
-      contentHash: `sha256:${hasher.digest("hex")}`,
-      fileList: sorted.map((m2) => m2.path)
-    });
-  }
-  return out;
-}
-function skillsDirForRuntime(runtimeKind) {
-  switch (runtimeKind) {
-    case "claude":
-    case "claude-code":
-      return ".claude/skills";
-    default:
-      return ".agent_context/skills";
-  }
-}
-function sanitizeSkillDir(name) {
-  const s2 = name.toLowerCase().trim().replace(/[^a-z0-9]+/g, "-").replace(/^-+|-+$/g, "");
-  return s2 || "skill";
-}
-async function materializeSkillFiles(args) {
-  const skills = await args.service.listInstalledSkillsForActor(args.actorId);
-  if (skills.length === 0) return {};
-  const prefix = skillsDirForRuntime(args.runtimeKind);
-  const out = {};
-  const usedDirs = /* @__PURE__ */ new Set();
-  for (const skill of skills) {
-    const files = await args.service.listSkillFiles(skill.id);
-    if (files.length === 0) continue;
-    let dir = sanitizeSkillDir(skill.name);
-    if (usedDirs.has(dir)) {
-      let n = 2;
-      while (usedDirs.has(`${dir}-${n}`)) n++;
-      dir = `${dir}-${n}`;
-    }
-    usedDirs.add(dir);
-    for (const f2 of files) {
-      if (!f2.content) {
-        console.warn(`[skill-materializer] skip ${skill.id}/${f2.path}\uFF1Acontent \u4E3A\u7A7A\uFF08\u672A\u56DE\u586B\uFF1F\uFF09\uFF0C\u4E0D\u5199\u7A7A\u6280\u80FD\u6587\u4EF6`);
-        continue;
-      }
-      out[`${prefix}/${dir}/${f2.path}`] = f2.content;
-    }
-  }
-  return out;
-}
-var import_node_crypto7;
-var init_skill_materializer = __esm({
-  "../server/src/domains/actors/skill-materializer.ts"() {
-    "use strict";
-    import_node_crypto7 = require("node:crypto");
+    init_skill_materializer();
   }
 });
 
@@ -36739,7 +36775,13 @@ var init_claude_code = __esm({
         fs7.mkdirSync(dir, { recursive: true });
         if (this.opts.syncSkills) {
           try {
-            await this.opts.syncSkills({ actorId: job.actor, runtimeKind: "claude", sessionDir: dir });
+            await this.opts.syncSkills({
+              actorId: job.actor,
+              actorToken: job.actorToken,
+              serverUrl: job.server.url,
+              runtimeKind: "claude",
+              sessionDir: dir
+            });
           } catch (err) {
             console.warn(`[claude-code] syncSkills \u5931\u8D25\uFF1A${err instanceof Error ? err.message : String(err)}`);
           }
@@ -37300,6 +37342,49 @@ var init_skill_cache = __esm({
   }
 });
 
+// ../adapters/src/_core/skill-cache-http.ts
+function makeHttpSkillMetadataSource(opts) {
+  const doFetch = opts.fetchImpl ?? fetch;
+  const timeout = opts.timeoutMs ?? 1e4;
+  const base = opts.serverUrl.replace(/\/+$/, "");
+  const headers = {
+    "authorization": `Bearer ${opts.actorToken}`,
+    "accept": "application/json"
+  };
+  const withDeadline = async (fn) => {
+    const ctrl = new AbortController();
+    const timer = setTimeout(() => ctrl.abort(), timeout);
+    try {
+      return await fn(ctrl.signal);
+    } finally {
+      clearTimeout(timer);
+    }
+  };
+  return {
+    listSkillMetadata: async (_actorId) => {
+      return withDeadline(async (signal) => {
+        const res = await doFetch(`${base}/api/skill-cache/manifest`, { headers, signal });
+        if (!res.ok) throw new Error(`skill-cache manifest \u62C9\u53D6\u5931\u8D25\uFF1AHTTP ${res.status} ${res.statusText}`);
+        const body = await res.json();
+        return body.items ?? [];
+      });
+    },
+    fetchSkillFiles: async (skillId) => {
+      return withDeadline(async (signal) => {
+        const res = await doFetch(`${base}/api/skill-cache/files/${encodeURIComponent(skillId)}`, { headers, signal });
+        if (!res.ok) throw new Error(`skill-cache files \u62C9\u53D6\u5931\u8D25\uFF08${skillId}\uFF09\uFF1AHTTP ${res.status} ${res.statusText}`);
+        const body = await res.json();
+        return body.files ?? [];
+      });
+    }
+  };
+}
+var init_skill_cache_http = __esm({
+  "../adapters/src/_core/skill-cache-http.ts"() {
+    "use strict";
+  }
+});
+
 // ../adapters/src/_core/models.ts
 async function listModels(runtime, executablePath) {
   switch (runtime) {
@@ -37556,6 +37641,19 @@ var init_models = __esm({
 function codexNum(v2) {
   return typeof v2 === "number" && Number.isFinite(v2) ? v2 : 0;
 }
+function parseCodexSessionId(lines) {
+  const first = lines[0];
+  if (!first) return void 0;
+  let o;
+  try {
+    o = JSON.parse(first);
+  } catch {
+    return void 0;
+  }
+  if (o?.type !== "session_meta") return void 0;
+  const id = o.payload?.id;
+  return typeof id === "string" && id ? id : void 0;
+}
 function parseCodexTokenUsage(lines) {
   let last;
   for (const line of lines) {
@@ -37660,7 +37758,12 @@ function scanCodexTelemetry(workdir, sinceMs, sessionsRoot = codexSessionsRoot()
       if (meta?.type === "session_meta" && meta.payload?.cwd === workdir) {
         const usage = parseCodexTokenUsage(lines);
         const model = parseCodexModel(lines);
-        return { ...usage ? { usage } : {}, ...model ? { model } : {} };
+        const sessionId = parseCodexSessionId(lines);
+        return {
+          ...usage ? { usage } : {},
+          ...model ? { model } : {},
+          ...sessionId ? { sessionId } : {}
+        };
       }
     }
   } catch {
@@ -37861,8 +37964,9 @@ var init_codex = __esm({
         const task = job.bundle.files["TASK.md"];
         if (!task) throw new Error("bundle \u7F3A TASK.md\uFF08\u88C5\u914D\u5668\u5951\u7EA6\uFF09");
         const prompt = job.systemPrompt ? ["# System Prompt", job.systemPrompt, "", "# Task", task].join("\n") : task;
+        const resumeArgs = job.resumeRuntimeSession && job.runtimeSessionId ? ["exec", "resume", job.runtimeSessionId] : ["exec"];
         const args = [
-          "exec",
+          ...resumeArgs,
           "--json",
           "--dangerously-bypass-approvals-and-sandbox",
           "--skip-git-repo-check",
@@ -37949,12 +38053,14 @@ var init_codex = __esm({
           clearTimeout(timer);
           const telemetry = scanCodexTelemetry(dir, startedAtMs);
           const model = telemetry.model ?? job.model ?? this.opts.model;
+          const runtimeSessionId = telemetry.sessionId ?? (job.resumeRuntimeSession ? job.runtimeSessionId : void 0);
           finish({
             code: killedByUs ? null : code,
             reason: killedByUs ? "timeout" : code === 0 ? "clean" : "error",
             transcriptRef,
             ...telemetry.usage ? { usage: telemetry.usage } : {},
-            ...model ? { model } : {}
+            ...model ? { model } : {},
+            ...runtimeSessionId ? { runtimeSessionId } : {}
           });
         });
         return {
@@ -38406,9 +38512,11 @@ async function runACPSession(job, cfg) {
   let exited;
   let killedByUs = false;
   let actualModel;
+  let capturedSessionId;
   const finish = (info) => {
     if (exited) return;
     if (actualModel && !info.model) info = { ...info, model: actualModel };
+    if (capturedSessionId && !info.runtimeSessionId) info = { ...info, runtimeSessionId: capturedSessionId };
     if (cfg.cleanupWorkdir) {
       try {
         const keepDir = path9.join(cfg.workRoot ?? os5.tmpdir(), "oasis-transcripts");
@@ -38481,13 +38589,31 @@ async function runACPSession(job, cfg) {
         clientCapabilities: {}
       });
       const resolvedModel = job.model ?? cfg.model;
-      const sessionRes = await client.request("session/new", {
-        cwd: dir,
-        mcpServers: [],
-        ...resolvedModel ? { model: resolvedModel } : {}
-      });
-      const sessionId = extractSessionID(sessionRes);
-      if (!sessionId) throw new Error("session/new returned no sessionId");
+      let sessionId = "";
+      if (job.resumeRuntimeSession && job.runtimeSessionId) {
+        const method = cfg.resumeMethod ?? "session/load";
+        try {
+          const resumeRes = await client.request(method, {
+            cwd: dir,
+            sessionId: job.runtimeSessionId,
+            mcpServers: [],
+            ...resolvedModel ? { model: resolvedModel } : {}
+          });
+          sessionId = extractSessionID(resumeRes) || job.runtimeSessionId;
+        } catch {
+          sessionId = "";
+        }
+      }
+      if (!sessionId) {
+        const sessionRes = await client.request("session/new", {
+          cwd: dir,
+          mcpServers: [],
+          ...resolvedModel ? { model: resolvedModel } : {}
+        });
+        sessionId = extractSessionID(sessionRes);
+        if (!sessionId) throw new Error("session/new returned no sessionId");
+      }
+      capturedSessionId = sessionId;
       if (resolvedModel) {
         await client.request("session/set_model", { sessionId, modelId: resolvedModel });
         actualModel = resolvedModel;
@@ -39496,6 +39622,7 @@ var init_src4 = __esm({
     init_claude_code();
     init_resilient();
     init_skill_cache();
+    init_skill_cache_http();
     init_models();
     init_codex();
     init_hermes();
@@ -54904,12 +55031,14 @@ async function startServe(opts) {
         for (const cb of telemetryCbs) cb(event);
         enqueueTrace(() => traceStore.appendEvents(traceRunId, [trajectoryEventToRunEvent(event, ++traceSeq)]).then(() => void 0));
       });
+      let capturedNativeSessionId;
       const done = new Promise((resolve4, reject) => {
         handle.onExit((info) => {
           chatLiveSessions.delete(chatJobKey);
           void provision.cleanup();
           const endedAt = (/* @__PURE__ */ new Date()).toISOString();
           const durationMs = Date.parse(endedAt) - Date.parse(traceStartedAt);
+          if (info.runtimeSessionId) capturedNativeSessionId = info.runtimeSessionId;
           enqueueTrace(async () => {
             await traceStore.appendEvents(traceRunId, [{
               seq: ++traceSeq,
@@ -54954,7 +55083,10 @@ async function startServe(opts) {
           telemetryCbs.push(cb);
         },
         done,
-        kill: () => handle.kill()
+        kill: () => handle.kill(),
+        get nativeSessionId() {
+          return capturedNativeSessionId;
+        }
       };
     },
     trajectoryFeed: {
@@ -55868,7 +56000,27 @@ async function startNode(opts) {
   } else {
     console.log(`[oasis node] \u5DF2\u627E\u5230: ${adapters.join(", ")}`);
   }
-  const claude = new ClaudeCodeAdapter({ streamJson: true });
+  const skillCacheRoot = process.env["OASIS_SKILL_CACHE_ROOT"]?.trim();
+  const skillCacheEnabled = process.env["OASIS_SKILL_CACHE"] === "1" || !!skillCacheRoot;
+  if (skillCacheEnabled) {
+    console.log(`[oasis node] skill-cache \u5F00\u542F\uFF0Croot=${skillCacheRoot ?? "~/.oasis/skill-cache"}`);
+  }
+  const claudeSyncSkills = skillCacheEnabled ? async (args) => {
+    const source = makeHttpSkillMetadataSource({ serverUrl: args.serverUrl, actorToken: args.actorToken });
+    await syncActorSkills({
+      actorId: args.actorId,
+      runtimeKind: args.runtimeKind,
+      sessionDir: args.sessionDir,
+      source,
+      ...skillCacheRoot ? { cacheRoot: skillCacheRoot } : {},
+      logger: (level, msg, err) => {
+        const prefix = `[skill-cache:node] ${msg}`;
+        if (level === "warn") console.warn(prefix, err ?? "");
+        else console.log(prefix);
+      }
+    });
+  } : void 0;
+  const claude = new ClaudeCodeAdapter({ streamJson: true, ...claudeSyncSkills ? { syncSkills: claudeSyncSkills } : {} });
   const rawAdapters = {
     "claude-code": claude,
     claude,
@@ -56009,15 +56161,16 @@ var USAGE = `oasis \u2014\u2014 artifact-centric \u534F\u4F5C\u5185\u6838 CLI\uF
   spawn     <artifactId> --type <t> [--title <\u77ED\u540D>] [--brief <\u89C4\u683C>] [--input <\u4E0A\u6E38id>[,<id>\u2026]] [--owner <actorId>] [--workspace ws] [--persistence temp|persistent] [--parts-file <json>] [--<\u5B57\u6BB5> <\u503C>] [--set-json <json>]
             # --parts-file\uFF1Aconvergent \u5E76\u884C\u5206\u89E3\u7684\u90E8\u4EF6\u6E05\u5355 JSON [{name, spec?, deps?}]\uFF08Stage 3\uFF0C\u7CFB\u7EDF\u6309\u90E8\u4EF6\u6D3E N \u8DEF\uFF09
             # --<\u5B57\u6BB5> <\u503C>\uFF1A\u8BE5\u7C7B\u578B\u3010\u52A8\u6001\u58F0\u660E\u3011\u7684\u81EA\u5B9A\u4E49\u5B57\u6BB5\uFF08\u4E0D\u662F\u56FA\u5B9A\u6E05\u5355\uFF09\u2014\u2014\u7528 "oasis artifact-types show <type>" \u770B\u53EF\u586B\u5B57\u6BB5\uFF1Bstring[]/\u6279\u91CF\u7528 --set-json\uFF1B\u7F3A\u5FC5\u586B\u4F1A\u62A5\u9519\u5217\u51FA
-  propose   <artifactId> (--file <path> | --from-dir <path> | --git-commit <sha>) --reason <text> [--base <revisionId|none>] [--part <name>] [--rebase-of <revisionId>] [--checkpoint --continue]
+  propose   <artifactId> [--file <path> | --from-dir <path> | --git-commit <sha>] --reason <text> [--base <revisionId|none>] [--part <name>] [--rebase-of <revisionId>] [--checkpoint --continue]
             # --file \u5355\u6587\u4EF6\uFF1B--from-dir \u9012\u5F52\u6574\u76EE\u5F55\u4E3A\u591A\u6587\u4EF6 revision\uFF08\u88C5\u7BB1\u5355\uFF0C\u8DE8\u7248\u672C\u53BB\u91CD\uFF0CF1\uFF09\u3002
-            # --git-commit\uFF1AModel Y \u4EE3\u7801-git project\u2014\u2014\u5185\u5BB9\u6D3B\u5728 git\uFF0C\u53EA external-pin \u90A3\u4E2A commit sha\uFF08\u5148 push \u4F60\u7684 feat \u5206\u652F\uFF09\u3002
+            # \u4EE3\u7801\u8282\u70B9\u53EF\u3010\u7701\u7565\u5168\u90E8\u5185\u5BB9\u53C2\u6570\u3011\uFF0C\u4EC5 --reason\uFF1A\u5148\u628A\u6539\u52A8 push \u5230\u5DE5\u5355 feat \u5206\u652F\uFF0C\u7CFB\u7EDF\u81EA\u52A8\u4ECE git \u6536\u96C6\uFF08\u672C\u4F53\u5728 git\uFF09\u3002
+            # --git-commit\uFF1A\u624B\u52A8 external-pin \u90A3\u4E2A commit sha\uFF08\u7B49\u4EF7\u4E8E\u7CFB\u7EDF\u6536\u96C6\uFF0C\u7528\u4E8E\u7CBE\u786E\u6307\u5B9A\uFF09\u3002
             # --part\uFF1A\u672C revision \u4EA7 convergent \u5206\u89E3\u91CC\u7684\u54EA\u4E2A\u90E8\u4EF6\uFF08\u89C1 spawn --parts-file\uFF09
             # \u6CE8\u610F --from-dir \u662F"\u5185\u5BB9\u6E90\u76EE\u5F55"\uFF0C\u4E0E\u5168\u5C40 --dir\uFF08\u6570\u636E\u76EE\u5F55/operator-token \u6240\u5728\uFF09\u662F\u4E24\u56DE\u4E8B
   queue     <artifactId>
   merge     <artifactId> [revisionId]
   advance   <artifactId>
-  integrate <artifactId> (--file <path> | --from-dir <path>) --reason <text>
+  integrate <artifactId> [--file <path> | --from-dir <path> | --git-commit <sha>] --reason <text>   # \u4EE3\u7801\u8282\u70B9\u53EF\u7701\u7565\u5185\u5BB9\u53C2\u6570\uFF1A\u7CFB\u7EDF\u4ECE\u5DE5\u5355 feat \u5206\u652F\u6536\u96C6\u6574\u5408\u7248
   reject    <artifactId> <revisionId> --reason <text>
   conclude  <artifactId> [--note <text>]    # \u673A\u68B0 grounding \u786C\u62E6\uFF1B\u6709 gate \u5219\u8FDB\u5165\u5F85\u5BA1
   review    <artifactId> --verdict approve|request_changes [--note <t>]
@@ -56891,12 +57044,15 @@ ${res.warning}`);
       const baseFlag = flags.get("base");
       const dirFlag = flags.get("from-dir");
       const gitCommit = flags.get("git-commit");
+      const fileFlag = flags.get("file");
       const checkpoint = flags.get("checkpoint") === "true";
       const continueDispatch = flags.get("continue") === "true";
       if (checkpoint !== continueDispatch) throw new Error("--checkpoint \u4E0E --continue \u5FC5\u987B\u540C\u65F6\u4F7F\u7528");
       const { message } = await api.cmd("propose", {
         artifactId,
-        ...gitCommit !== void 0 ? { externalPin: gitCommit } : dirFlag !== void 0 ? { files: readDirFiles(dirFlag) } : { content: readFileArg(need(flags, "file")) },
+        // 内容四选一——【全缺则不带内容字段】，交服务端按节点类型定夺（code：从 git 收集；text：精确报错）。
+        // 这是 HANDOFF 止血：从前 CLI 本地就 need(--file) 抛错，逼 agent 兜底成 --file HANDOFF.md 落 inline 假货。
+        ...gitCommit !== void 0 ? { externalPin: gitCommit } : dirFlag !== void 0 ? { files: readDirFiles(dirFlag) } : fileFlag !== void 0 ? { content: readFileArg(fileFlag) } : {},
         reason: need(flags, "reason"),
         ...baseFlag !== void 0 ? { base: baseFlag === "none" ? null : baseFlag } : {},
         ...flags.get("part") !== void 0 ? { part: flags.get("part") } : {},
@@ -56924,11 +57080,14 @@ ${res.warning}`);
       break;
     }
     case "integrate": {
-      const artifactId = needPos(positional, 0, "oasis integrate <artifactId> (--file f | --from-dir d) --reason r");
+      const artifactId = needPos(positional, 0, "oasis integrate <artifactId> [--file f | --from-dir d | --git-commit sha] --reason r");
       const dirFlag = flags.get("from-dir");
+      const fileFlag = flags.get("file");
+      const gitCommit = flags.get("git-commit");
       const { message } = await api.cmd("integrate", {
         artifactId,
-        ...dirFlag !== void 0 ? { files: readDirFiles(dirFlag) } : { content: readFileArg(need(flags, "file")) },
+        // 内容全缺则不带内容字段，交服务端定夺（code：从工单 feat 分支收集整合版；text：精确报错）。HANDOFF 止血。
+        ...gitCommit !== void 0 ? { externalPin: gitCommit } : dirFlag !== void 0 ? { files: readDirFiles(dirFlag) } : fileFlag !== void 0 ? { content: readFileArg(fileFlag) } : {},
         reason: need(flags, "reason")
       });
       println(message);
@@ -56961,11 +57120,12 @@ ${res.warning}`);
       break;
     }
     case "annotate": {
+      const raisedFromPart = flags.get("part") ?? process.env["OASIS_PART"];
       const { message } = await api.cmd("annotate", {
         artifactId: needPos(positional, 0, "oasis annotate <artifactId> --body t [--from d] [--part p]"),
         body: need(flags, "body"),
         raisedFrom: flags.get("from"),
-        ...flags.get("part") !== void 0 ? { raisedFromPart: flags.get("part") } : {},
+        ...raisedFromPart !== void 0 ? { raisedFromPart } : {},
         // @（信箱 ④）：--at a,b —— @ 权只属于人（agent 用会被服务端拒）；@agent=召它回话，@人=进其收件箱
         ...flags.get("at") !== void 0 ? { mentions: flags.get("at").split(",").map((x2) => x2.trim()).filter(Boolean) } : {},
         blocks: flags.get("blocks") === "true"
@@ -57472,7 +57632,7 @@ ${res.warning}`);
 }
 
 // src/index.ts
-var PKG_VERSION = true ? "0.1.32" : "dev";
+var PKG_VERSION = true ? "0.1.34" : "dev";
 var OASIS_DIR = path18.join(os10.homedir(), ".oasis");
 var CONFIG_FILE = path18.join(OASIS_DIR, "node-config.json");
 var PID_FILE = path18.join(OASIS_DIR, "node.pid");
@@ -57613,7 +57773,7 @@ function selfUpdate() {
   if (!cfg?.serverUrl) throw new Error("no config \u2014 run `oasis start` first");
   const nameArg = cfg.name ? ` --name '${cfg.name.replace(/'/g, "'\\''")}'` : "";
   const startCmd = `"$(npm prefix -g)/bin/oasis" start --server-ws '${cfg.serverUrl}'${nameArg}`;
-  const inner = `sleep 2; npm install -g --prefer-online '${PKG_NAME}@latest' && ${startCmd} >> '${LOG_FILE}' 2>&1`;
+  const inner = `{ echo "[oasis] self-update \u2192 npm install -g ${PKG_NAME}@latest (then restart)"; sleep 2; npm install -g --prefer-online '${PKG_NAME}@latest' && ${startCmd}; } >> '${LOG_FILE}' 2>&1`;
   const hasSystemd = process.platform === "linux" && (() => {
     try {
       (0, import_node_child_process15.execSync)("command -v systemd-run", { stdio: "ignore" });
@@ -57622,14 +57782,14 @@ function selfUpdate() {
       return false;
     }
   })();
+  const log3 = fs19.openSync(LOG_FILE, "a");
   if (hasSystemd) {
     const child = (0, import_node_child_process15.spawn)("systemd-run", ["--user", "--scope", "--quiet", "sh", "-c", inner], {
       detached: true,
-      stdio: "ignore"
+      stdio: ["ignore", log3, log3]
     });
     child.unref();
   } else {
-    const log3 = fs19.openSync(LOG_FILE, "a");
     const child = (0, import_node_child_process15.spawn)("sh", ["-c", inner], { detached: true, stdio: ["ignore", log3, log3] });
     child.unref();
   }

package/package.json

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