oasis_test 0.1.113 → 0.1.114

package/dist/index.js

@@ -82,7 +82,12 @@ var init_src = __esm({
     DECLARED_LETTER_UNRESOLVED_EFFECTS = effects(WAKE, NEUTRAL, VETO, WAKE);
     OPEN_BACKPRESSURE_EFFECTS = effects(WAKE, NEUTRAL, VETO, WAKE);
     OPEN_HUMAN_CHANGE_REQUEST_EFFECTS = effects(WAKE, NEUTRAL, VETO, WAKE);
-    OPEN_SELF_ANNOTATION_EFFECTS = effects(NEUTRAL, VETO, VETO, WAKE);
+    OPEN_SELF_ANNOTATION_EFFECTS = effects(
+      { kind: "veto", exemptedBy: ["open-letter", "declared-letter-unresolved"] },
+      VETO,
+      VETO,
+      WAKE
+    );
     UNPRODUCED_PARTS_OWNER_EFFECTS = effects(WAKE, VETO, VETO, WAKE);
     UNPRODUCED_PARTS_SYSTEM_EFFECTS = effects(NEUTRAL, VETO, VETO, WAKE);
     HEAD_REJECTED_EFFECTS = effects(WAKE, VETO, VETO, WAKE);
@@ -1350,8 +1355,16 @@ function convergenceState(model, id) {
     blockers.push({
       kind: "open-self-annotation",
       action: "wait_upstream",
-      // §3.7。dispatch=neutral（owner 在等某上游 artifact）。conclude=veto（§4-C 阶段④：自提回压未答就收口=装作没提过，与 auto 对齐）；auto=veto、stall=wake（actor=null 呈现 waiting_upstream）。
-      effects: { dispatch: NEUTRAL2, conclude: VETO2, autoConclude: VETO2, stall: WAKE2 },
+      // §3.7。dispatch=**veto**（ADR 0161，恢复 0144 前的「回压即阻塞提出方」：提出方的活建在它自己声称
+      // 有问题的上游产物上，上游未答复前不再派它——与引擎 scan 的 OPEN_SELF_ANNOTATION_EFFECTS 同步，
+      // 豁免「未回的信」两类不吞信）。conclude=veto（§4-C 阶段④：自提回压未答就收口=装作没提过，与 auto
+      // 对齐）；auto=veto、stall=wake（actor=null 呈现 waiting_upstream）。
+      effects: {
+        dispatch: { kind: "veto", exemptedBy: ["open-letter", "declared-letter-unresolved"] },
+        conclude: VETO2,
+        autoConclude: VETO2,
+        stall: WAKE2
+      },
       actor: null,
       ref: a.id,
       detail: `\u4F60\u5BF9\u4E0A\u6E38\u63D0\u7684\u56DE\u538B\u8FD8\u6CA1\u88AB\u7B54\u590D\uFF08${a.body}\uFF09\u2014\u2014\u7B49\u4E0A\u6E38\u56DE\u5E94\u540E\u7EED\u5B8C\u8FD9\u6761\u518D\u6536\u53E3`
@@ -7299,7 +7312,9 @@ function scan(state, ctx) {
       continue;
     }
     const blockers = scanBlockersForNode(state, node, lw);
-    const selfStop = blockers.some((b2) => b2.kind === "open-gap" || b2.kind === "escalation");
+    const selfStop = blockers.some(
+      (b2) => b2.kind === "open-gap" || b2.kind === "escalation" || b2.kind === "open-self-annotation"
+    );
     if (selfStop && !passDispatch(blockers, node.assigneeActorId)) {
       continue;
     }
@@ -7451,6 +7466,16 @@ function scanBlockersForNode(state, node, latest) {
         effects: OPEN_HUMAN_CHANGE_REQUEST_EFFECTS
       });
     }
+    if ((i.kind === "comment" || i.kind === "change_request") && i.resolvedAt === null && i.raisedByNodeId === node.id) {
+      blockers.push({
+        kind: "open-self-annotation",
+        action: "wait_upstream",
+        actor: null,
+        ref: i.id,
+        detail: `\u4F60\u5BF9\u4E0A\u6E38\u63D0\u7684\u56DE\u538B\u8FD8\u6CA1\u88AB\u7B54\u590D\uFF08${i.body}\uFF09\u2014\u2014\u7B49\u4E0A\u6E38 resolve \u540E\u518D\u7EE7\u7EED`,
+        effects: OPEN_SELF_ANNOTATION_EFFECTS
+      });
+    }
   }
   blockers.push(...openCommentBlockers(state, node));
   if (latest && node.latestAcceptId === latest.id && findResolvedGapAfterHead(node.id, latest, state.allIssues())) {
@@ -157449,6 +157474,7 @@ var init_sync_skills = __esm({
       "claude-code",
       "codex",
       "hermes",
+      "oasis-agent",
       "cursor"
     ]);
   }
@@ -159159,6 +159185,8 @@ async function listModels(runtime, executablePath) {
       return cachedDiscovery(runtime, () => discoverAntigravityModels(executablePath));
     case "hermes":
       return cachedDiscovery(runtime, async () => await discoverACPModels(executablePath ?? "hermes", "hermes", ["acp"]) ?? []);
+    case "oasis-agent":
+      return cachedDiscovery(runtime, async () => await discoverACPModels(executablePath ?? "oasis-agent", "oasis-agent", ["acp"], 3e4) ?? []);
     case "kimi":
       return cachedDiscovery(runtime, async () => await discoverACPModels(executablePath ?? "kimi", "kimi", ["acp"]) ?? []);
     case "kiro":
@@ -159336,7 +159364,7 @@ async function runCapture(bin, args, timeoutMs = 15e3) {
     child.on("close", (code) => done(code === 0 ? out : void 0));
   });
 }
-async function discoverACPModels(bin, provider, args = ["acp"]) {
+async function discoverACPModels(bin, provider, args = ["acp"], timeoutMs = 12e3) {
   const child = (() => {
     try {
       return (0, import_node_child_process8.spawn)(bin, args, { stdio: ["pipe", "pipe", "ignore"], env: { ...process.env } });
@@ -159365,7 +159393,7 @@ async function discoverACPModels(bin, provider, args = ["acp"]) {
       }
     }
   };
-  const watchdog = setTimeout(cleanup, 12e3);
+  const watchdog = setTimeout(cleanup, timeoutMs);
   return new Promise((resolve10) => {
     const fail = () => {
       cleanup();
@@ -161264,6 +161292,49 @@ var init_hermes = __esm({
   }
 });
 
+// ../adapters/src/oasis-agent/index.ts
+var OasisAgentAdapter;
+var init_oasis_agent = __esm({
+  "../adapters/src/oasis-agent/index.ts"() {
+    "use strict";
+    init_acp();
+    OasisAgentAdapter = class {
+      constructor(opts = {}) {
+        this.opts = opts;
+      }
+      /** ADR-0093：ACP 引擎原生支持对话追加（同 session 二次 session/prompt）。 */
+      capabilities = { appendInput: true };
+      spawn(job) {
+        return runACPSession(job, {
+          bin: this.opts.oasisAgentBin ?? "oasis-agent",
+          args: ["acp"],
+          yoloEnv: { HERMES_YOLO_MODE: "1" },
+          model: this.opts.model,
+          // 与 hermes 同源：PromptResponse.usage.inputTokens 是 prompt_tokens（已含缓存命中的读），
+          // 归一到 Oasis 的「input / cacheRead 互斥」口径要先减一次。
+          inputTokensIncludeCacheRead: true,
+          // 同上：PromptResponse 上的用量是本轮完整快照，优先于中途的 usage_update 采样。
+          finalUsageIsAuthoritative: true,
+          workRoot: this.opts.workRoot,
+          cleanupWorkdir: this.opts.cleanupWorkdir,
+          env: {
+            ...this.opts.provider ? { HERMES_PROVIDER: this.opts.provider } : {},
+            ...this.opts.env
+          },
+          extraArgs: this.opts.extraArgs,
+          runtimeKind: "oasis-agent",
+          // 与 hermes 同源：不扫 cwd 技能目录，只认 `$HERMES_HOME/skills` + config `skills.external_dirs`。
+          // 用**自己的** env 名（不复用 OASIS_HERMES_SKILLS_DIR）——两个 runtime 各有各的 config.yaml，
+          // 名字分开才能在同机共存时一眼看出哪份 config 是给谁的。node enroll 会把该字面量写进
+          // `~/.oasis-agent/home/config.yaml` 的 skills.external_dirs（见 connect-script.ts）。
+          injectSkillsDirEnv: "OASIS_AGENT_SKILLS_DIR",
+          ...this.opts.syncSkills ? { syncSkills: this.opts.syncSkills } : {}
+        });
+      }
+    };
+  }
+});
+
 // ../adapters/src/kimi/index.ts
 var KimiAdapter;
 var init_kimi = __esm({
@@ -162490,6 +162561,7 @@ var init_src7 = __esm({
     init_container_runtime();
     init_codex();
     init_hermes();
+    init_oasis_agent();
     init_kimi();
     init_kiro();
     init_reasonix();
@@ -179859,31 +179931,19 @@ else
   echo '\u2192 \u4F9D\u8D56\u5DF2\u5B58\u5728\uFF0C\u8DF3\u8FC7\u5B89\u88C5'
 fi
 
-# ACP \u53EF\u9009\u4F9D\u8D56\uFF1A\u82E5\u672C\u673A\u5B89\u88C5\u4E86 hermes\uFF0C\u786E\u4FDD\u5176 ACP extra \u5DF2\u88C5\uFF08\u8BFB shebang \u5B9A\u4F4D\u5176 pip\uFF09
-if command -v hermes &>/dev/null; then
-  HERMES_PY=$(head -1 "$(which hermes)" | sed 's/^#!//')
-  HERMES_PIP="$(dirname "$HERMES_PY")/pip"
-  if [ -x "$HERMES_PIP" ] && ! "$HERMES_PIP" show agent-client-protocol &>/dev/null 2>&1; then
-    echo '\u2192 \u5B89\u88C5 hermes ACP \u4F9D\u8D56...'
-    HERMES_AGENT="$(dirname "$(dirname "$(dirname "$HERMES_PY")")")"
-    if [ -f "$HERMES_AGENT/pyproject.toml" ]; then
-      "$HERMES_PIP" install -e "$HERMES_AGENT[acp]"
-    else
-      "$HERMES_PIP" install 'agent-client-protocol>=0.9.0,<1.0'
-    fi
-  fi
-  # Oasis \u6BCF\u4F1A\u8BDD\u6280\u80FD\uFF1Ahermes \u4E0D\u626B cwd\uFF0C\u53EA\u8BA4 $HERMES_HOME/skills + config skills.external_dirs\u3002
-  # \u5E42\u7B49\u5730\u628A config.yaml \u7684 external_dirs \u914D\u6210\u5B57\u9762\u91CF $OASIS_HERMES_SKILLS_DIR\uFF08\u7531 hermes \u8FD0\u884C\u65F6
-  # \u6309 env \u5C55\u5F00\uFF1Badapter \u6BCF\u4F1A\u8BDD\u628A\u8BE5 env \u6307\u5411\u672C workdir \u7684\u6280\u80FD\u76EE\u5F55 \u2192 \u6BCF session \u5404\u81EA\u53D1\u73B0\uFF0C\u8BFB\u4FA7\u9694\u79BB\uFF09\u3002
-  HERMES_HOME_DIR="$HERMES_HOME"
-  if [ -z "$HERMES_HOME_DIR" ]; then HERMES_HOME_DIR="$HOME/.hermes"; fi
-  "$HERMES_PY" - "$HERMES_HOME_DIR/config.yaml" <<'PYEOF' || true
+# hermes \u7CFB runtime\uFF08hermes / oasis-agent\uFF09\u7684\u6280\u80FD\u5916\u6302\u76EE\u5F55\uFF1A\u4E24\u8005\u90FD**\u4E0D\u626B cwd**\uFF0C\u53EA\u8BA4
+# $HERMES_HOME/skills + config skills.external_dirs\u3002\u8FD9\u91CC\u5E42\u7B49\u5730\u628A external_dirs \u914D\u6210\u4E00\u4E2A
+# **\u5B57\u9762\u91CF env \u540D**\uFF08\u7531\u8FD0\u884C\u65F6\u6309 env \u5C55\u5F00\uFF1Badapter \u6BCF\u4F1A\u8BDD\u628A\u8BE5 env \u6307\u5411\u672C workdir \u7684\u6280\u80FD\u76EE\u5F55
+# \u2192 \u6BCF session \u5404\u81EA\u53D1\u73B0\uFF0C\u8BFB\u4FA7\u9694\u79BB\uFF09\u3002\u5199\u56DE\u4ECD\u843D\u5168\u5C40 $HERMES_HOME/skills\u3002
+oasis_patch_hermes_skills_dir() {
+  PY="$1"; CFG="$2"; TOKEN="$3"
+  "$PY" - "$CFG" "$TOKEN" <<'PYEOF' || true
 import sys, os
 try:
     import yaml
 except Exception:
     sys.exit(0)
-p = sys.argv[1]
+p, token = sys.argv[1], sys.argv[2]
 data = {}
 if os.path.exists(p):
     try:
@@ -179901,7 +179961,6 @@ ext = skills.get("external_dirs")
 if not isinstance(ext, list):
     ext = [] if not ext else [ext]
     skills["external_dirs"] = ext
-token = "$OASIS_HERMES_SKILLS_DIR"
 if token not in ext:
     ext.append(token)
     os.makedirs(os.path.dirname(p), exist_ok=True)
@@ -179909,8 +179968,46 @@ if token not in ext:
     with open(tmp, "w") as f:
         yaml.safe_dump(data, f, sort_keys=False, allow_unicode=True)
     os.replace(tmp, p)
-    print("-> hermes config.yaml: skills.external_dirs += $OASIS_HERMES_SKILLS_DIR")
+    print("-> %s: skills.external_dirs += %s" % (p, token))
 PYEOF
+}
+
+# ACP \u53EF\u9009\u4F9D\u8D56\uFF1A\u82E5\u672C\u673A\u5B89\u88C5\u4E86 hermes\uFF0C\u786E\u4FDD\u5176 ACP extra \u5DF2\u88C5\uFF08\u8BFB shebang \u5B9A\u4F4D\u5176 pip\uFF09
+if command -v hermes &>/dev/null; then
+  HERMES_PY=$(head -1 "$(which hermes)" | sed 's/^#!//')
+  HERMES_PIP="$(dirname "$HERMES_PY")/pip"
+  if [ -x "$HERMES_PIP" ] && ! "$HERMES_PIP" show agent-client-protocol &>/dev/null 2>&1; then
+    echo '\u2192 \u5B89\u88C5 hermes ACP \u4F9D\u8D56...'
+    HERMES_AGENT="$(dirname "$(dirname "$(dirname "$HERMES_PY")")")"
+    if [ -f "$HERMES_AGENT/pyproject.toml" ]; then
+      "$HERMES_PIP" install -e "$HERMES_AGENT[acp]"
+    else
+      "$HERMES_PIP" install 'agent-client-protocol>=0.9.0,<1.0'
+    fi
+  fi
+  HERMES_HOME_DIR="$HERMES_HOME"
+  if [ -z "$HERMES_HOME_DIR" ]; then HERMES_HOME_DIR="$HOME/.hermes"; fi
+  oasis_patch_hermes_skills_dir "$HERMES_PY" "$HERMES_HOME_DIR/config.yaml" '$OASIS_HERMES_SKILLS_DIR'
+fi
+
+# oasis-agent\uFF08hermes-agent \u5206\u53C9\uFF0C\u89C1 docs/oasis-agent-runtime.md\uFF09\u3002\u5B83\u7684 PATH \u5165\u53E3\u662F\u4E00\u5C42 bash
+# wrapper\uFF0C\u4E0D\u662F python \u811A\u672C\uFF0C\u6240\u4EE5**\u4E0D\u80FD\u8BFB shebang** \u5B9A\u4F4D\u89E3\u91CA\u5668\u2014\u2014\u6309\u5B89\u88C5\u7EA6\u5B9A\u8D70 venv \u8DEF\u5F84\u3002
+# \u4E0E hermes \u5404\u7528\u5404\u7684 HERMES_HOME \u4E0E\u5404\u81EA\u7684 config.yaml\uFF0C\u540C\u673A\u53EF\u5171\u5B58\u3002
+if command -v oasis-agent &>/dev/null; then
+  OA_ROOT="$OASIS_AGENT_ROOT"
+  if [ -z "$OA_ROOT" ]; then OA_ROOT="$HOME/.oasis-agent"; fi
+  OA_PY="$OA_ROOT/venv/bin/python"
+  OA_HOME="$OASIS_AGENT_HOME"
+  if [ -z "$OA_HOME" ]; then OA_HOME="$OA_ROOT/home"; fi
+  if [ -x "$OA_PY" ]; then
+    if ! "$OA_PY" -c 'import acp' &>/dev/null; then
+      echo '\u2192 \u5B89\u88C5 oasis-agent ACP \u4F9D\u8D56...'
+      "$OA_PY" -m pip install 'agent-client-protocol>=0.9.0,<1.0' || true
+    fi
+    oasis_patch_hermes_skills_dir "$OA_PY" "$OA_HOME/config.yaml" '$OASIS_AGENT_SKILLS_DIR'
+  else
+    echo "\u26A0 oasis-agent \u5728 PATH \u4E0A\u4F46\u6CA1\u627E\u5230 $OA_PY\u2014\u2014\u6280\u80FD\u5916\u6302\u76EE\u5F55\u672A\u914D\u7F6E\uFF0C\u8BF7\u6838\u5BF9\u5B89\u88C5\u4F4D\u7F6E"
+  fi
 fi
 
 OASIS_DIR="$(pwd)"
@@ -188847,17 +188944,7 @@ var init_daemon_adapter = __esm({
         if (job.binding?.nodeId) return this.opts.remote.spawn(job);
         const msg = `\u62D2\u7EDD\u6D3E\u53D1\uFF1A${job.actor} \u65E0 active runtime \u7ED1\u5B9A\u2014\u2014\u4E0D\u56DE\u843D\u672C\u5730\uFF08\u5148\u5728\u5E73\u53F0\u4E3A\u8BE5\u5458\u5DE5\u914D\u7F6E runtime\uFF09`;
         console.warn(`[dispatch] ${msg}\uFF08artifact=${job.artifactId}\uFF09`);
-        return {
-          id: `refused-${job.artifactId.replace(/[^a-zA-Z0-9_-]+/g, "_").slice(0, 40)}`,
-          kill: async () => {
-          },
-          onOutput: () => {
-          },
-          onTelemetry: () => {
-          },
-          onExit: (cb) => cb({ code: null, reason: "error" })
-          // 立败 → strike/退避/熔断 → 表面化给人
-        };
+        throw new Error(msg);
       }
     };
     WorkdirBridge = class {
@@ -197513,6 +197600,7 @@ function traceRuntimeKind(runtimeKind) {
   if (runtimeKind === "claude" || runtimeKind === "claude-code") return "claude-code";
   if (runtimeKind === "codex") return "codex";
   if (runtimeKind === "hermes") return "hermes";
+  if (runtimeKind === "oasis-agent") return "oasis-agent";
   return "custom";
 }
 function reworkWavefrontFromEnv(raw) {
@@ -199583,6 +199671,12 @@ async function startServe(opts) {
           console.log(`[new-engine] dispatchWork ${workId} \u2192 ${rev.artifactId} / ${rev.author}${replyIssueId ? `\uFF08\u56DE\u4FE1 ${replyIssueId}\uFF09` : ""}`);
           const art = kernelModel.artifacts.get(rev.artifactId);
           const wid = art?.workspace ?? "";
+          const actorRecord = await registryStore.getActor(rev.author).catch(() => null);
+          const actorKind = actorRecord?.kind ?? (rev.author.startsWith("actor:human:") ? "human" : rev.author.startsWith("actor:agent:") ? "agent" : void 0);
+          if (actorKind === "human") {
+            console.log(`[new-engine] dispatchWork ${workId} \u662F human work\u2014\u2014\u4E0D\u6D3E runtime\uFF0C\u7B49\u5F85\u4EBA\u5DE5\u5904\u7406`);
+            return;
+          }
           const ledgerId = `dispatch:${(0, import_node_crypto45.randomUUID)()}`;
           try {
             await dispatchLedger.insertOpen({
@@ -200886,6 +200980,7 @@ var KNOWN2 = [
   { adapter: "gemini", binary: "gemini" },
   { adapter: "opencode", binary: "opencode" },
   { adapter: "hermes", binary: "hermes" },
+  { adapter: "oasis-agent", binary: "oasis-agent" },
   { adapter: "copilot", binary: "copilot" },
   { adapter: "kimi", binary: "kimi" },
   { adapter: "kiro", binary: "kiro-cli" },
@@ -200895,7 +200990,7 @@ var KNOWN2 = [
   { adapter: "codebuddy", binary: "codebuddy" },
   { adapter: "antigravity", binary: "agy" }
 ];
-var NATIVE_APPEND_RUNTIMES = /* @__PURE__ */ new Set(["hermes", "gemini", "kimi", "kiro", "reasonix"]);
+var NATIVE_APPEND_RUNTIMES = /* @__PURE__ */ new Set(["hermes", "oasis-agent", "gemini", "kimi", "kiro", "reasonix"]);
 function resolveOnPath(binary) {
   try {
     const cmd = process.platform === "win32" ? "where" : "which";
@@ -201699,6 +201794,7 @@ async function startNode(opts) {
     claude,
     codex: new CodexAdapter({ syncSkills: syncSkillsHook }),
     hermes: new HermesAdapter({ syncSkills: syncSkillsHook }),
+    "oasis-agent": new OasisAgentAdapter({ syncSkills: syncSkillsHook }),
     cursor: new CursorAdapter({ syncSkills: syncSkillsHook }),
     gemini: new GeminiAdapter(),
     opencode: new OpenCodeAdapter(),
@@ -206502,7 +206598,7 @@ function syncRuntimeAssets(candidateRoots, binDir) {
 }
 
 // src/index.ts
-var PKG_VERSION = true ? "0.1.113" : "dev";
+var PKG_VERSION = true ? "0.1.114" : "dev";
 var OASIS_DIR = path30.join(os12.homedir(), ".oasis");
 var CONFIG_FILE = path30.join(OASIS_DIR, "node-config.json");
 var PID_FILE = path30.join(OASIS_DIR, "node.pid");

package/package.json

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