oasis_test_v2 2.2.58 → 2.2.59

package/dist/index.js

@@ -226703,6 +226703,37 @@ var init_service5 = __esm({
         await this.opts.store.removeBinding(actorId);
         await this.audit({ kind: "binding_change", actorId, by, at: this.now(), detail: { removed: true } });
       }
+      /**
+       * 运行时被删除时，把指向它的绑定一并撤掉（与 {@link dropRuntimeBindingOfDeletedAgent} 对称的另一头）。
+       *
+       * 为什么撤绑而不是把绑定留着标成失效（缺陷 0124，2026-09-21 R05 第 4 步实测）：
+       * 管理员删掉 `node-abe354908271` 上的 codex 后，绑在它上面的两个 Agent 的绑定行仍是
+       * `codex / active`，指着一条已经不存在的运行时——运行时页要靠「这行还在不在」去过滤它，
+       * 派单要靠 resolveBinding 去挡它，组织页要自己推「绑的那个还在不在」，**每个读者各挡一遍，
+       * 漏一处就复发**。绑定表是「此刻该派到哪」的唯一事实源，不是历史账本：历史在 agent_runs /
+       * traces / 审计里，撤绑一条都不动，所以 R05 要的「已有运行记录仍查得到」不受影响。
+       * `BindingStatus` 只有 `active | paused` 两个值，拿 `paused`（人工暂停、可恢复）表示
+       * 「目标没了」会让后来的读者误判，而加新值是 `packages/contract` 变更（红线 4）。
+       *
+       * 幂等：没有绑定就是空数组；`removeBinding` 对不存在的 actor 是 no-op。
+       * @returns 被撤绑的 actorId 列表（调用方用来回给界面：删完影响了谁）。
+       */
+      async releaseBindingsOnRuntime(target, by) {
+        const affected = (await this.opts.store.listBindings()).filter(
+          (b2) => b2.nodeId === target.nodeId && b2.runtimeKind === target.runtimeKind
+        );
+        for (const b2 of affected) {
+          await this.opts.store.removeBinding(b2.actorId);
+          await this.audit({
+            kind: "binding_change",
+            actorId: b2.actorId,
+            by,
+            at: this.now(),
+            detail: { removed: true, reason: "runtime_deleted", nodeId: b2.nodeId, runtimeKind: b2.runtimeKind }
+          });
+        }
+        return affected.map((b2) => b2.actorId);
+      }
       listBindings() {
         return this.opts.store.listBindings();
       }
@@ -241008,8 +241039,9 @@ function nodesDomain(deps) {
       const runtime = (await deps.nodeStore.listRuntimes()).find((r) => r.id === runtimeId);
       const { nodeDeleted } = await deps.nodeStore.deleteRuntime(runtimeId);
       if (nodeDeleted && runtime) revokeNodeAccess(runtime.nodeId);
+      const releasedActorIds = runtime ? await deps.releaseBindingsOnRuntime?.(req.auth.companyId, { nodeId: runtime.nodeId, runtimeKind: runtime.kind }, req.auth.actor) ?? [] : [];
       deps.onStatusChange?.();
-      return { status: 200, body: { ok: true } };
+      return { status: 200, body: { ok: true, releasedActorIds } };
     });
     router.get("/api/runtimes/:runtimeId/models", async (req) => {
       const runtimeId = req.params["runtimeId"];
@@ -276843,6 +276875,12 @@ async function startServe(opts) {
           const [roster, bindings] = await Promise.all([service.listActors({ kind: "agent" }), service.listBindings()]);
           return { actors: roster, bindings };
         },
+        // 缺陷 0124：删掉运行时后，绑在它上面的 Agent 不该继续挂在一条已经不存在的运行时上。
+        // 与 actorBindings 同一条解析路径（按请求公司拿这家的员工域），写侧落审计。
+        releaseBindingsOnRuntime: async (companyId, target, by) => {
+          const { service } = await actors.resolveCtx(companyId ?? defaultCompanyId);
+          return service.releaseBindingsOnRuntime(target, by);
+        },
         nodeTokens,
         enrollTokens,
         nodeStore,
@@ -285224,8 +285262,9 @@ function safeFileName(raw, fallback) {
   const cleaned = displayName2(raw).replace(/[\\/:*?"<>|-]+/g, "_").replace(/\s+/g, "_").replace(/^\.+/, "").replace(/_+/g, "_").replace(/^_|_$/g, "");
   return cleaned || fallback;
 }
-function resolveProjectFileOutPath(rawOut, fileName) {
-  const fallback = `${PROJECT_FILES_DIR}/${safeFileName(fileName, "file")}`;
+function resolveProjectFileOutPath(rawOut, fileName, contentType) {
+  const ext = sourceExtension(fileName, contentType);
+  const fallback = keepExtension(`${PROJECT_FILES_DIR}/${safeFileName(fileName, "file")}`, ext);
   if (rawOut === void 0 || rawOut.trim() === "") return fallback;
   const raw = rawOut.trim();
   if (path35.isAbsolute(raw) || /^[a-zA-Z]:[\\/]/.test(raw)) {
@@ -285244,7 +285283,38 @@ function resolveProjectFileOutPath(rawOut, fileName) {
   if (segments.length < 2 || segments[0] !== PROJECT_FILES_DIR) {
     throw new Error(`--out \u5FC5\u987B\u843D\u5728 ${PROJECT_FILES_DIR}/ \u4E0B\uFF08\u4F8B\uFF1A--out ${PROJECT_FILES_DIR}/${safeFileName(fileName, "file")}\uFF09`);
   }
-  return segments.join("/");
+  return keepExtension(segments.join("/"), ext);
+}
+var EXT_BY_MIME = {
+  "text/markdown": ".md",
+  "text/x-markdown": ".md",
+  "text/plain": ".txt",
+  "text/html": ".html",
+  "text/csv": ".csv",
+  "application/json": ".json",
+  "application/pdf": ".pdf",
+  "image/png": ".png",
+  "image/jpeg": ".jpg",
+  "image/gif": ".gif",
+  "image/webp": ".webp",
+  "image/svg+xml": ".svg",
+  "application/zip": ".zip"
+};
+function realExtension(name) {
+  const ext = path35.posix.extname(name);
+  return /^\.[A-Za-z0-9]{1,8}$/.test(ext) ? ext : "";
+}
+function sourceExtension(fileName, contentType) {
+  const own3 = realExtension(displayName2(fileName));
+  if (own3) return own3;
+  const mime = (contentType ?? "").split(";")[0].trim().toLowerCase();
+  return EXT_BY_MIME[mime] ?? "";
+}
+function keepExtension(rel, ext) {
+  if (!ext) return rel;
+  const current = realExtension(rel);
+  if (current.toLowerCase() === ext.toLowerCase()) return rel;
+  return `${current ? rel.slice(0, rel.length - current.length) : rel}${ext}`;
 }
 function isTextLike(name, contentType) {
   if (contentType) {
@@ -285532,7 +285602,7 @@ async function waitForCommandAuthorization(base, headers, draftId, fallback) {
     }
   }
 }
-var CLI_VERSION = "2.2.58" ? "2.2.58" : "dev";
+var CLI_VERSION = "2.2.59" ? "2.2.59" : "dev";
 function apiHeaders(token, company) {
   const headers = {
     authorization: `Bearer ${token}`,
@@ -286953,7 +287023,7 @@ ${t.ref}  ${t.name}  [\u5267\u672C=${t.playbookRef}]`);
         );
         const row = findByBlobRef(view.items ?? [], ref2);
         const name = displayName2(row.name);
-        const rel = resolveProjectFileOutPath(flags.get("out"), name);
+        const rel = resolveProjectFileOutPath(flags.get("out"), name, row.content_type);
         const bytes2 = await api.bytes(`/api/blobs/${encodeURIComponent((row.blob_ref ?? "").replace(/^blob:/, ""))}`);
         const abs = path36.resolve(process.cwd(), rel);
         fs41.mkdirSync(path36.dirname(abs), { recursive: true });
@@ -289223,7 +289293,7 @@ function shimScript() {
 }
 
 // src/index.ts
-var PKG_VERSION = true ? "2.2.58" : "dev";
+var PKG_VERSION = true ? "2.2.59" : "dev";
 var LOCAL_BIN = localBin();
 var NPM_PREFIX = npmPrefix();
 var INSTANCE = DEFAULT_INSTANCE;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "oasis_test_v2",
-  "version": "2.2.58",
+  "version": "2.2.59",
   "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": "cdfbae7cb82edf949c9985a7cddd3aee06ca1017"
+    "sourceHead": "4292e61fee71d87d1776f8fa63d4015adc9c544c"
   }
 }