oasis_test 0.1.78 → 0.1.80

package/dist/index.js

@@ -1087,9 +1087,10 @@ function owesReplyOn(model, a, recipient, owner) {
   if (model.disabledActors.has(recipient)) return false;
   const rootSeq = model.annotationSeq.get(a.id) ?? 0;
   const lastSelf = lastPostSeqOf(model, a, recipient);
+  const cutoff = Math.max(lastSelf, a.resolvedAtSeq ?? Number.NEGATIVE_INFINITY);
   const isDefault = defaultRecipientOf(model, a, owner) === recipient;
   const owed = (author, mentions, seq) => {
-    if (author === recipient || seq <= lastSelf) return false;
+    if (author === recipient || seq <= cutoff) return false;
     if (mentions.length === 0) return isDefault;
     return mentions.includes(recipient) || recipient === owner && mentions.some((m2) => model.disabledActors.has(m2));
   };
@@ -1103,11 +1104,11 @@ function openMailOf(model, id) {
   const cu = model.convergenceUnified;
   return annotationsOf(model, id).filter((a) => {
     if (!(a.mail || cu)) return false;
-    if (!(a.state === "open" || isReactivatedLetter(a, cu))) return false;
     if (isRoundLimitParked(a)) return false;
     if (a.raisedFrom == null && !isHumanChangeRequest(a)) {
       return owesReplyOn(model, a, owner, owner);
     }
+    if (!(a.state === "open" || isReactivatedLetter(a, cu))) return false;
     return a.author !== owner && !pending.has(a.id) && (a.mentions.length === 0 || owner !== void 0 && a.mentions.includes(owner));
   });
 }
@@ -1122,7 +1123,10 @@ function openLetterBlockersOf(model, id, anns) {
     a.author !== owner && // 非 owner 自留言
     !isHumanChangeRequest(a) && // 人工 change-request 整条移出 letter 轴（R12 方向 b，委给 open-human-change-request）
     !isRoundLimitParked(a) && // 停牌信全轴统一豁免（park=完整人工接管，R4/§4.5.6/§7 A9）
-    (a.state === "open" || isReactivatedLetter(a, cu)) && // 复活信（关后作者又追问、未答）算未答，与 openMailOf 同
+    owesReplyOn(model, a, owner, owner) && // 外层 state 门换成 owesReplyOn（含 L5 cutoff），与 openMailOf 纯来信支同源：
+    //   闭信只认关闭后的新帖（红线 5）、追评/未回帖照挡收口。其余四条（raisedFrom==null / author!==owner /
+    //   !isHumanChangeRequest / mentions 路由）作防御性冗余保留——owesReplyOn 内部已含前三者等价语义，
+    //   但按内部自洽飞检（mem:39e05e78）不去重，防将来 owesReplyOn 语义漂移再分叉。
     (a.mentions.length === 0 || owner !== void 0 && a.mentions.includes(owner))
     // @ 路由收敛到 owner
   );
@@ -4988,11 +4992,11 @@ async function assembleContext(args) {
   const declaredPending = declaredByQueuedRevision(model, artifactId);
   const ownerId = artifact.owner;
   const openAnnosHere = annotationsOf(model, artifactId).filter((a) => {
-    if (!(a.state === "open" || isReactivatedLetter(a, model.convergenceUnified))) return false;
-    if (a.raisedFrom !== null || a.author.startsWith("actor:human:") && a.kind === "change-request") {
-      return !declaredPending.has(a.id);
+    if (a.raisedFrom == null && !(a.author.startsWith("actor:human:") && a.kind === "change-request")) {
+      return owesReplyOn(model, a, ownerId, ownerId);
     }
-    return owesReplyOn(model, a, ownerId, ownerId);
+    if (!(a.state === "open" || isReactivatedLetter(a, model.convergenceUnified))) return false;
+    return !declaredPending.has(a.id);
   });
   const pendingRaisedIds = new Set(pendingBackpressureResponsesOf(model, artifactId).map((a) => a.id));
   const raisedAnnos = [...model.annotations.values()].filter(
@@ -139667,9 +139671,9 @@ function requiresMeReasonOf(model, artifact, viewer, facts) {
   const pending = f2.queuedResolvesFor(artifact.id);
   for (const a of f2.annotationsFor(artifact.id)) {
     if (!a.mail && !model.convergenceUnified) continue;
-    if (!(a.state === "open" || isReactivatedLetter(a, model.convergenceUnified))) continue;
     if (isRoundLimitParked(a)) continue;
     const plainComment = a.raisedFrom == null && !isHumanChangeRequest(a);
+    if (!plainComment && !(a.state === "open" || isReactivatedLetter(a, model.convergenceUnified))) continue;
     if (pending.has(a.id) && !(plainComment && (owesReplyOn(model, a, viewer, artifact.owner) || hasUnansweredMention(model, a, viewer)))) continue;
     if (hasUnansweredMention(model, a, viewer)) consider("mention");
     if (artifact.owner === viewer) {
@@ -153991,6 +153995,13 @@ function retryBackoffMs(attempt, baseMs) {
   const jitter = Math.floor(Math.random() * baseMs);
   return Math.min(exp + jitter, 15e3);
 }
+function errText(err) {
+  if (err instanceof Error) {
+    const code = err.code;
+    return `${code ? `[${code}] ` : ""}${err.message}`.slice(0, 8e3);
+  }
+  return String(err).slice(0, 8e3);
+}
 function withResilience(inner, cfg = {}) {
   const idleTimeoutMs = cfg.idleTimeoutMs ?? numEnv("OASIS_RUNTIME_IDLE_TIMEOUT_MS", 0);
   const maxRetries = cfg.maxRetries ?? numEnv("OASIS_RUNTIME_MAX_RETRIES", 2);
@@ -154080,8 +154091,8 @@ function withResilience(inner, cfg = {}) {
           let handle;
           try {
             handle = await inner.spawn(job);
-          } catch {
-            finish({ code: null, reason: "error" });
+          } catch (err) {
+            finish({ code: null, reason: "error", errorMessage: errText(err) });
             return;
           }
           const { info, produced } = await runOnce(handle);
@@ -154096,7 +154107,7 @@ function withResilience(inner, cfg = {}) {
           await sleep(retryBackoffMs(attempt, retryBaseMs));
         }
         finish(lastInfo);
-      })().catch(() => finish({ code: null, reason: "error" }));
+      })().catch((err) => finish({ code: null, reason: "error", errorMessage: errText(err) }));
       await ready;
       return {
         id: outerId ?? `resilient-${job.artifactId.replace(/[^a-zA-Z0-9_-]+/g, "_").slice(0, 32)}`,
@@ -155008,7 +155019,7 @@ function normalizeCodexConsoleLine(line, state = createCodexNormalizeState()) {
   tool.output.push(line);
   return [];
 }
-var import_node_child_process11, import_node_crypto19, fs15, os4, path14, readline2, CodexAdapter;
+var import_node_child_process11, import_node_crypto19, fs15, os4, path14, readline2, CODEX_ARGV_PROMPT_MAX_BYTES, CodexAdapter;
 var init_codex = __esm({
   "../adapters/src/codex/index.ts"() {
     "use strict";
@@ -155024,6 +155035,7 @@ var init_codex = __esm({
     init_session_paths();
     init_claude_code();
     init_transcript();
+    CODEX_ARGV_PROMPT_MAX_BYTES = 1e5;
     CodexAdapter = class {
       constructor(opts = {}) {
         this.opts = opts;
@@ -155074,6 +155086,7 @@ var init_codex = __esm({
         const task2 = materializeBundle(dir, job.bundle);
         const prompt = job.systemPrompt ? ["# System Prompt", job.systemPrompt, "", "# Task", task2].join("\n") : task2;
         const isResume = Boolean(job.resumeRuntimeSession && job.runtimeSessionId);
+        const promptViaStdin = Buffer.byteLength(prompt, "utf8") > CODEX_ARGV_PROMPT_MAX_BYTES;
         const args = [
           "exec",
           "-C",
@@ -155087,7 +155100,7 @@ var init_codex = __esm({
           ...this.opts.reasoningSummary !== "none" ? ["-c", `model_reasoning_summary=${this.opts.reasoningSummary ?? "auto"}`] : [],
           ...this.opts.reasoningEffort ? ["-c", `model_reasoning_effort=${this.opts.reasoningEffort}`] : [],
           ...this.opts.extraArgs ?? [],
-          prompt
+          promptViaStdin ? "-" : prompt
         ];
         const child = (0, import_node_child_process11.spawn)(this.opts.codexBin ?? "codex", args, {
           cwd: dir,
@@ -155099,8 +155112,18 @@ var init_codex = __esm({
             OASIS_SERVER: job.server.url,
             OASIS_TOKEN: job.actorToken
           },
-          stdio: ["ignore", "pipe", "pipe"]
-        });
+          // stdin 只在走 stdin 时开管道。**不能图省事恒开 pipe**（claude 那边可以）：codex 的
+          // `--help` 明载「stdin is piped and a prompt is also provided → stdin 作为 `<stdin>` 块
+          // 追加」，恒开会给每一次普通派发都塞一个空 `<stdin>` 块，白白改了小 prompt 的行为。
+          // 代价是 stdio 不再是全 pipe 字面量，spawn 的返回类型退化成流可空的 ChildProcess——
+          // stdout/stderr 这里恒为 "pipe"，读取处按此断言（stdin 才是真可空的那个，见下方判空）。
+          stdio: [promptViaStdin ? "pipe" : "ignore", "pipe", "pipe"]
+        });
+        if (promptViaStdin && child.stdin) {
+          child.stdin.on("error", () => {
+          });
+          child.stdin.end(prompt);
+        }
         if (child.pid !== void 0 && job.workdirKey) lockWorkdir(dir, child.pid, "session", job.workdirKey);
         let transcriptRef = path14.join(dir, "transcript.txt");
         const out = openTranscript(transcriptRef);
@@ -155207,7 +155230,7 @@ var init_codex = __esm({
           const model = telemetry.model ?? job.model ?? this.opts.model;
           const runtimeSessionId = telemetry.sessionId ?? resumeSessionId;
           const sawStreamError = streamErrorMessages.length > 0;
-          const isError = !killReason && (typeof code === "number" && code !== 0 || sawStreamError);
+          const isError = !killReason && (code !== 0 || sawStreamError);
           const errorMessage = isError ? [...streamErrorMessages, ...stdoutErrorLines, ...stderrTail].join("\n").trim().slice(-4e3) || void 0 : void 0;
           const sessionNotFound = !killReason && isResume && isSessionNotFoundError([...streamErrorMessages, ...stdoutErrorLines, ...stderrTail].join("\n"));
           const reason = killReason ? killReason : sessionNotFound ? "session-not-found" : sawStreamError ? "error" : code === 0 ? "clean" : "error";
@@ -192600,7 +192623,7 @@ ${res.warning}`);
 init_src6();
 
 // src/index.ts
-var PKG_VERSION = true ? "0.1.78" : "dev";
+var PKG_VERSION = true ? "0.1.80" : "dev";
 var OASIS_DIR = path28.join(os9.homedir(), ".oasis");
 var CONFIG_FILE = path28.join(OASIS_DIR, "node-config.json");
 var PID_FILE = path28.join(OASIS_DIR, "node.pid");
@@ -192743,7 +192766,11 @@ function selfUpdate() {
   const nameArg = cfg.name ? ` --name '${cfg.name.replace(/'/g, "'\\''")}'` : "";
   const oasisBin = path28.join(NPM_PREFIX, "bin", "oasis");
   const startCmd = `"${oasisBin}" daemon start --server-ws '${cfg.serverUrl}'${nameArg}`;
-  const inner = `{ echo "[oasis] self-update \u2192 npm install --prefix ${NPM_PREFIX} ${PKG_NAME}@latest"; sleep 2; npm install -g --prefer-online --prefix '${NPM_PREFIX}' '${PKG_NAME}@latest' && ${startCmd}; } >> '${LOG_FILE}' 2>&1`;
+  const OFFICIAL = "https://registry.npmjs.org/";
+  const installOfficial = `npm install -g --prefer-online --registry '${OFFICIAL}' --prefix '${NPM_PREFIX}' '${PKG_NAME}@latest'`;
+  const installFallback = `npm install -g --prefer-online --prefix '${NPM_PREFIX}' '${PKG_NAME}@latest'`;
+  const printVersion = `node -p "'[oasis] self-update installed ' + require('${NPM_PREFIX}/lib/node_modules/${PKG_NAME}/package.json').version" || true`;
+  const inner = `{ echo "[oasis] self-update \u2192 ${PKG_NAME}@latest (registry ${OFFICIAL}, \u5931\u8D25\u56DE\u843D\u9ED8\u8BA4\u6E90)"; sleep 2; { ${installOfficial} || ${installFallback}; } && ${printVersion} && ${startCmd}; } >> '${LOG_FILE}' 2>&1`;
   const hasSystemd = process.platform === "linux" && (() => {
     try {
       (0, import_node_child_process17.execSync)("command -v systemd-run", { stdio: "ignore" });

package/package.json

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