oasis_test_v2 2.2.29 → 2.2.31

package/dist/index.js

@@ -23350,7 +23350,7 @@ function accumulateClaudeUsage(acc, p2) {
       acc.saw = true;
     }
   } else if (type === "result") {
-    acc.finalUsage = mergeFinalUsage(parseResultUsage(p2["usage"]), parseModelUsage(p2["modelUsage"]));
+    acc.finalUsage = mergeFinalUsage(parseModelUsage(p2["modelUsage"]), parseResultUsage(p2["usage"]));
     const c = p2["total_cost_usd"];
     if (typeof c === "number" && Number.isFinite(c)) {
       acc.costUsd = c;
@@ -25935,11 +25935,19 @@ var init_codex = __esm({
             active: false,
             pendingInputs: /* @__PURE__ */ new Set(),
             codex: createCodexNormalizeState(),
-            // 本次 run 的用量：逐轮累加 `thread/tokenUsage/updated` 的 `last`（见该解析函数注释）。
-            usage: { input: 0, cacheRead: 0, cacheWrite: 0, output: 0 },
-            sawUsage: false,
-            // `thread/started` 会直接给出本会话 rollout 的绝对路径——取实际模型时不必再满盘搜。
-            rolloutPath: void 0
+            // 本次 run 的用量：`thread/tokenUsage/updated` 的 `last`（见该解析函数注释）按轮次记下，
+            // 结算时只加**本次 run 发起的轮次**（runTurnIds）。原因：`thread/resume` 之后 codex 会把线程
+            // **上一轮**的用量通知重放一遍（本机 codex 0.154.0 实测，turnId 是上一轮的），照单全收的话
+            // 每次续接都把上一轮的 token 再记一遍。没带 turnId 的通知（老版本）照旧直接计入。
+            usageByTurn: [],
+            runTurnIds: /* @__PURE__ */ new Set(),
+            // 已经发出本次 run 的 `turn/start`：在这之前出现的 `turn/started` 不是本次的轮次。
+            turnRequested: false,
+            // 会话 rollout 的绝对路径：新开线程时 `thread/started` 通知会给；**续接（thread/resume）不发这条通知**，
+            // 只能从 resume 的响应里取（同上实测）。取不到它就读不到实际模型。
+            rolloutPath: void 0,
+            // thread/start / thread/resume 响应里 codex 报的线程模型：rollout 读不到时的兜底。
+            threadModel: void 0
           }),
           initialCommand: () => ({
             jsonrpc: "2.0",
@@ -25956,12 +25964,16 @@ var init_codex = __esm({
             const threadId = thread.thread?.id ?? thread.id;
             if (typeof threadId !== "string" || !threadId) throw new Error("codex app-server returned no thread id");
             state.threadId = threadId;
+            if (typeof thread.thread?.path === "string" && thread.thread.path) state.rolloutPath ??= thread.thread.path;
+            const responseModel = typeof thread.model === "string" && thread.model ? thread.model : typeof thread.thread?.model === "string" && thread.thread.model ? thread.thread.model : void 0;
+            if (responseModel) state.threadModel = responseModel;
             const text5 = currentJob.systemPrompt ? `${currentJob.systemPrompt}
 
 ---
 
 ${task}` : task;
             state.active = true;
+            state.turnRequested = true;
             const turn = await send({
               jsonrpc: "2.0",
               method: "turn/start",
@@ -25974,7 +25986,10 @@ ${task}` : task;
               }
             });
             const turnId = turn.turn?.id ?? turn.id;
-            if (typeof turnId === "string" && turnId) state.turnId = turnId;
+            if (typeof turnId === "string" && turnId) {
+              state.turnId = turnId;
+              state.runTurnIds.add(turnId);
+            }
             if (!state.turnId) throw new Error("codex app-server returned no turn id");
           },
           liveEvents(message, state) {
@@ -26015,16 +26030,14 @@ ${task}` : task;
             }
             if (method === "thread/tokenUsage/updated") {
               const turn = parseCodexAppServerTurnUsage(params);
-              if (turn) {
-                addCodexBuckets(state.usage, turn);
-                state.sawUsage = true;
-              }
+              if (turn) state.usageByTurn.push({ turnId: typeof params?.turnId === "string" ? params.turnId : void 0, buckets: turn });
             }
             if (method === "turn/started") {
               const turn = params?.turn;
               if (typeof turn?.id === "string") {
                 state.turnId = turn.id;
                 state.active = true;
+                if (state.turnRequested) state.runTurnIds.add(turn.id);
               }
             }
             if (method === "item/agentMessage/delta" || method === "item/reasoning/textDelta") {
@@ -26056,9 +26069,16 @@ ${task}` : task;
               } catch {
               }
             }
-            model ??= resolvedModel2;
+            model ??= state.threadModel ?? resolvedModel2;
+            const usage = { input: 0, cacheRead: 0, cacheWrite: 0, output: 0 };
+            let sawUsage = false;
+            for (const entry of state.usageByTurn) {
+              if (entry.turnId !== void 0 && !state.runTurnIds.has(entry.turnId)) continue;
+              addCodexBuckets(usage, entry.buckets);
+              sawUsage = true;
+            }
             return {
-              ...state.sawUsage ? { usage: codexUsageFromBuckets(state.usage) } : {},
+              ...sawUsage ? { usage: codexUsageFromBuckets(usage) } : {},
               ...model ? { model } : {}
             };
           },
@@ -26068,7 +26088,10 @@ ${task}` : task;
               await send({ jsonrpc: "2.0", method: "turn/interrupt", params: { threadId: state.threadId, turnId: state.turnId } });
               const next = await send({ jsonrpc: "2.0", method: "turn/start", params: { threadId: state.threadId, input: [{ type: "text", text: input.text }] } });
               const nextId = next.turn?.id;
-              if (typeof nextId === "string") state.turnId = nextId;
+              if (typeof nextId === "string") {
+                state.turnId = nextId;
+                state.runTurnIds.add(nextId);
+              }
               state.active = true;
               return { accepted: true, interrupt: "unknown" };
             }
@@ -160494,6 +160517,35 @@ var init_infra_error = __esm({
   }
 });
 
+// ../server/src/keyed-mutex.ts
+function createKeyedMutex() {
+  const tails = /* @__PURE__ */ new Map();
+  return {
+    async acquire(key) {
+      const previous3 = tails.get(key) ?? Promise.resolve();
+      let release;
+      const mine = new Promise((resolve10) => {
+        release = resolve10;
+      });
+      const tail = previous3.then(() => mine);
+      tails.set(key, tail);
+      await previous3;
+      let released = false;
+      return () => {
+        if (released) return;
+        released = true;
+        release();
+        if (tails.get(key) === tail) tails.delete(key);
+      };
+    }
+  };
+}
+var init_keyed_mutex = __esm({
+  "../server/src/keyed-mutex.ts"() {
+    "use strict";
+  }
+});
+
 // ../server/src/live-chat.ts
 function normalizedKindToItemType(kind) {
   if (kind === "text") return "message";
@@ -203090,6 +203142,15 @@ function toApiError(err) {
   if (isInfrastructureError(err)) return new ApiError(INFRA_ERROR_STATUS, INFRA_ERROR_CODE, message);
   return new ApiError(400, "BAD_REQUEST", message);
 }
+function workorderApplyTarget(rawBody) {
+  try {
+    const body2 = JSON.parse(rawBody);
+    const briefSpawn = body2.plan?.ops?.find((op) => op.action === "spawn" && op.id === body2.briefArtifactId && op.workspace);
+    return briefSpawn?.workspace ?? body2.plan?.workspace ?? "";
+  } catch {
+    return "";
+  }
+}
 async function loadWorkorderSnapshot(kernel, workorderId) {
   if (!workorderId) return null;
   const store = kernel.getStore?.();
@@ -204593,6 +204654,7 @@ async function startOasisServer(opts) {
   const stagingWorkspace = /* @__PURE__ */ new Map();
   const discussSessions = opts.discussSessions ?? /* @__PURE__ */ new Map();
   const openingDiscussions = /* @__PURE__ */ new Map();
+  const workorderApplyLocks = createKeyedMutex();
   const reviewWaiters = /* @__PURE__ */ new Map();
   const leftWaiterIds = /* @__PURE__ */ new Map();
   const LEFT_WAITER_IDS_MAX_DRAFTS = 512;
@@ -205885,6 +205947,7 @@ async function startOasisServer(opts) {
           }
         }
         if (url.pathname === "/api/workorder/apply" && req.method === "POST") {
+          const releaseApplyLock = await workorderApplyLocks.acquire(`${currentCompanyId ?? ""}\0${workorderApplyTarget(rawBody)}`);
           try {
             const body2 = JSON.parse(rawBody);
             let targetWs = body2.plan.workspace;
@@ -206043,6 +206106,8 @@ async function startOasisServer(opts) {
             res.writeHead(status, { "content-type": "application/json" }).end(
               JSON.stringify({ error: code2, message: err instanceof Error ? err.message : String(err) })
             );
+          } finally {
+            releaseApplyLock();
           }
           return;
         }
@@ -208764,6 +208829,7 @@ var init_server3 = __esm({
     init_company_data_store_router();
     init_router();
     init_infra_error();
+    init_keyed_mutex();
     init_live_chat();
     init_chat_turn_wait();
     init_append_now();
@@ -212381,6 +212447,66 @@ function foldSingleNodeTasks(items) {
   }
   return folded;
 }
+function basenameOfPath(name) {
+  const i = name.lastIndexOf("/");
+  return i >= 0 ? name.slice(i + 1) : name;
+}
+function creatorKindOf(actorId) {
+  if (!actorId) return null;
+  return actorId.startsWith("actor:human:") ? "human" : "agent";
+}
+function emitChatFolders(items, chatFiles, resolveName) {
+  const groups = /* @__PURE__ */ new Map();
+  for (const file of chatFiles) {
+    const list2 = groups.get(file.chatSessionId) ?? [];
+    list2.push(file);
+    groups.set(file.chatSessionId, list2);
+  }
+  for (const [sessionId, group] of groups) {
+    const head = group[0];
+    const folderPath = `chat:${sessionId}`;
+    const latest = group.reduce((acc, file) => file.uploadedAt > acc ? file.uploadedAt : acc, group[0].uploadedAt);
+    items.push({
+      kind: "folder",
+      id: `folder:${folderPath}`,
+      name: head.chatTitle,
+      path: folderPath,
+      filePath: null,
+      depth: 0,
+      type: "folder",
+      size: null,
+      taskId: null,
+      taskTitle: CHAT_FOLDER_TASK_LABEL,
+      creatorKind: creatorKindOf(head.chatOwnerId),
+      creatorId: head.chatOwnerId,
+      creatorName: resolveName(head.chatOwnerId),
+      updatedAt: latest,
+      folderKind: "chat",
+      chatSessionId: sessionId
+    });
+    for (const file of group) {
+      items.push({
+        kind: "file",
+        id: file.fileId,
+        name: file.name,
+        path: `${folderPath}/${file.name}`,
+        filePath: null,
+        depth: 1,
+        type: file.contentType ?? inferTypeFromName(basenameOfPath(file.name)),
+        blobRef: file.blobId,
+        contentType: file.contentType ?? null,
+        size: file.size,
+        taskId: null,
+        taskTitle: CHAT_FOLDER_TASK_LABEL,
+        creatorKind: creatorKindOf(file.uploadedBy),
+        creatorId: file.uploadedBy ?? null,
+        creatorName: file.uploadedBy ? resolveName(file.uploadedBy) : null,
+        updatedAt: file.uploadedAt,
+        chatSessionId: sessionId
+      });
+    }
+  }
+}
 function fillFolderSizes(items) {
   const folders = items.filter((i) => i.kind === "folder" && i.path);
   if (folders.length === 0) return;
@@ -212600,7 +212726,7 @@ function laterOf(a, b2) {
   if (!b2) return a;
   return b2 > a ? b2 : a;
 }
-var DEFAULT_AGENT_ACTOR, MemoryProjectStateStore, MemoryArtifactStateStore, ProjectsService;
+var DEFAULT_AGENT_ACTOR, CHAT_FOLDER_TASK_LABEL, MemoryProjectStateStore, MemoryArtifactStateStore, ProjectsService;
 var init_service4 = __esm({
   "../server/src/domains/projects/service.ts"() {
     "use strict";
@@ -212612,6 +212738,7 @@ var init_service4 = __esm({
     init_stats();
     init_node_state();
     DEFAULT_AGENT_ACTOR = "actor:agent:system";
+    CHAT_FOLDER_TASK_LABEL = "\u5BF9\u8BDD";
     MemoryProjectStateStore = class {
       projects = /* @__PURE__ */ new Map();
       members = /* @__PURE__ */ new Map();
@@ -213387,12 +213514,12 @@ var init_service4 = __esm({
           ...items.filter((item) => item.blobRef).map((item) => `${item.name}\0${item.blobRef}`),
           ...files.map((file) => `${file.name}\0${file.blobId}`)
         ]);
-        if (this.listChatFiles && !isUncategorizedProjectId(projectId2)) {
+        const chatFiles = [];
+        if (this.listChatFiles) {
           for (const file of await this.listChatFiles(projectId2)) {
-            const key = `${file.name}\0${file.blobId}`;
+            const key = `${basenameOfPath(file.name)}\0${file.blobId}`;
             if (existingFiles.has(key)) continue;
-            existingFiles.add(key);
-            files.push(file);
+            chatFiles.push(file);
           }
         }
         for (const file of files) {
@@ -213418,8 +213545,18 @@ var init_service4 = __esm({
             updatedAt: file.uploadedAt
           });
         }
+        emitChatFolders(items, chatFiles, (actorId) => this.resolveActorName(actorId));
         fillFolderSizes(items);
+        const chatFolderTime = new Map(items.filter((item) => item.folderKind === "chat" && item.chatSessionId).map((item) => [item.chatSessionId, item.updatedAt]));
         items.sort((a, b2) => {
+          const chatA = a.chatSessionId ? 1 : 0;
+          const chatB = b2.chatSessionId ? 1 : 0;
+          if (chatA !== chatB) return chatA - chatB;
+          if (a.chatSessionId && b2.chatSessionId && a.chatSessionId !== b2.chatSessionId) {
+            const timeA = chatFolderTime.get(a.chatSessionId) ?? "";
+            const timeB = chatFolderTime.get(b2.chatSessionId) ?? "";
+            return timeB.localeCompare(timeA) || a.chatSessionId.localeCompare(b2.chatSessionId);
+          }
           const pathA = a.path ?? "";
           const pathB = b2.path ?? "";
           if (pathA !== pathB) return pathA.localeCompare(pathB);
@@ -214744,6 +214881,8 @@ var init_dev_store = __esm({
       sessionWorkOrderKinds = /* @__PURE__ */ new Map();
       /** ADR-0166 D6 待发队列（每会话一条，按 seq 升序 = 入队序）。 */
       pending = /* @__PURE__ */ new Map();
+      /** `outputs/` 产出文件的服务端副本表（2026-09-14）：sessionId → 路径 → 副本。 */
+      outputCopies = /* @__PURE__ */ new Map();
       pendingSeq = 0;
       async claimPendingInsert(m2) {
         const list2 = this.pending.get(m2.chatSessionId) ?? [];
@@ -214927,6 +215066,7 @@ var init_dev_store = __esm({
         this.messages.delete(id);
         this.sessionWorkOrders.delete(id);
         this.sessionWorkOrderKinds.delete(id);
+        this.outputCopies.delete(id);
       }
       async appendMessage(m2) {
         return (await this.appendMessageOnce(m2)).message;
@@ -215055,6 +215195,27 @@ var init_dev_store = __esm({
         }
         return rows.sort((left, right) => left.createdAt.localeCompare(right.createdAt) || left.messageId.localeCompare(right.messageId));
       }
+      async readOutputCopies(sessionId) {
+        const hit = this.outputCopies.get(sessionId);
+        return hit ? { ...hit } : null;
+      }
+      async mergeOutputCopies(sessionId, copies) {
+        if (copies.length === 0 || !this.sessions.has(sessionId)) return;
+        const next = { ...this.outputCopies.get(sessionId) ?? {} };
+        for (const copy of copies) next[copy.path] = { ...copy };
+        this.outputCopies.set(sessionId, next);
+      }
+      async listOutputCopies(projectId2) {
+        const rows = [];
+        for (const session of this.sessions.values()) {
+          if (session.visibility === "internal") continue;
+          if ((session.projectId ?? null) !== projectId2) continue;
+          const copies = this.outputCopies.get(session.id);
+          if (!copies || Object.keys(copies).length === 0) continue;
+          rows.push({ sessionId: session.id, ...session.projectId ? { projectId: session.projectId } : {}, copies: { ...copies } });
+        }
+        return rows.sort((left, right) => left.sessionId.localeCompare(right.sessionId));
+      }
       async listRunningAssistantMessages() {
         const out = [];
         for (const list2 of this.messages.values()) {
@@ -216080,6 +216241,148 @@ var init_outputs_scan = __esm({
   }
 });
 
+// ../server/src/domains/chat-sessions/outputs-copy.ts
+function isOutputPath(path41) {
+  return path41.startsWith(`${SESSION_OUTPUTS_DIR}/`);
+}
+function basenameOf2(path41) {
+  const i = path41.lastIndexOf("/");
+  return i >= 0 ? path41.slice(i + 1) : path41;
+}
+function planOutputCopies(fingerprints, copies, limits = OUTPUT_COPY_LIMITS) {
+  const have = copies ?? {};
+  const plan = { toCopy: [], skipped: [] };
+  let totalBytes = 0;
+  for (const path41 of Object.keys(fingerprints).sort((a, b2) => a.localeCompare(b2))) {
+    if (!isOutputPath(path41)) continue;
+    const fp = fingerprints[path41];
+    if (typeof fp.size !== "number" || !Number.isFinite(fp.size) || typeof fp.mtime !== "string" || fp.mtime === "") continue;
+    const copy = have[path41];
+    if (copy && copy.size === fp.size && copy.mtime === fp.mtime) continue;
+    if (fp.size > limits.maxFileBytes) {
+      plan.skipped.push({ path: path41, code: "TOO_LARGE" });
+      continue;
+    }
+    if (plan.toCopy.length >= limits.maxFiles || totalBytes + fp.size > limits.maxTotalBytes) {
+      plan.skipped.push({ path: path41, code: "BUDGET" });
+      continue;
+    }
+    totalBytes += fp.size;
+    plan.toCopy.push({ path: path41, size: fp.size, mtime: fp.mtime });
+  }
+  return plan;
+}
+async function copySessionOutputs(deps) {
+  const now = deps.now ?? (() => (/* @__PURE__ */ new Date()).toISOString());
+  const limits = deps.limits ?? OUTPUT_COPY_LIMITS;
+  const result = { copied: [], skipped: [] };
+  let existing;
+  try {
+    existing = await deps.readCopies(deps.sessionId);
+  } catch {
+    return result;
+  }
+  const plan = planOutputCopies(deps.fingerprints, existing, limits);
+  result.skipped.push(...plan.skipped);
+  for (const file of plan.toCopy) {
+    let read;
+    try {
+      read = await deps.bridge.read(
+        deps.loc.nodeId,
+        { workdirKey: deps.loc.workdirKey, runtimeKind: deps.loc.runtimeKind, rtId: deps.loc.rtId, path: file.path },
+        limits.maxFileBytes
+      );
+    } catch {
+      result.skipped.push({ path: file.path, code: "READ_FAILED" });
+      continue;
+    }
+    if (!read.ok) {
+      result.skipped.push({ path: file.path, code: read.code === "TOO_LARGE" ? "TOO_LARGE" : "READ_FAILED" });
+      continue;
+    }
+    const bytes2 = Buffer.from(read.contentBase64, "base64");
+    let blobRef;
+    try {
+      blobRef = await deps.putBlob(new Uint8Array(bytes2));
+    } catch {
+      result.skipped.push({ path: file.path, code: "STORE_FAILED" });
+      continue;
+    }
+    result.copied.push({
+      path: file.path,
+      name: basenameOf2(file.path),
+      blobRef,
+      contentType: read.contentType ? read.contentType : null,
+      size: bytes2.length,
+      // 记**扫描时**的 mtime（不是读的那一刻）：下一轮拿同一把节点时钟的指纹来比，相等才算复制过。
+      mtime: file.mtime,
+      copiedAt: now()
+    });
+  }
+  if (result.copied.length > 0) {
+    try {
+      await deps.mergeCopies(deps.sessionId, result.copied);
+    } catch {
+      result.skipped.push(...result.copied.map((copy) => ({ path: copy.path, code: "STORE_FAILED" })));
+      result.copied = [];
+    }
+  }
+  return result;
+}
+function createOutputCopyScheduler(deps) {
+  const inFlight = /* @__PURE__ */ new Set();
+  return {
+    schedule(args) {
+      const { store, chatSessionId, companyId } = args;
+      const readCopies = store.readOutputCopies?.bind(store);
+      const mergeCopies = store.mergeOutputCopies?.bind(store);
+      if (!readCopies || !mergeCopies) return Promise.resolve(null);
+      const key = `${companyId ?? ""}|${chatSessionId}`;
+      if (inFlight.has(key)) return Promise.resolve(null);
+      inFlight.add(key);
+      return (async () => {
+        try {
+          const session = await store.getSession(chatSessionId);
+          if (!session || session.visibility === "internal" || session.analyzedRunId) return null;
+          if (deps.isDelegationChild && await deps.isDelegationChild(companyId, chatSessionId).catch(() => false)) return null;
+          const result = await copySessionOutputs({
+            bridge: args.bridge,
+            loc: args.loc,
+            sessionId: chatSessionId,
+            fingerprints: args.fingerprints,
+            readCopies,
+            mergeCopies,
+            putBlob: deps.putBlob,
+            ...deps.limits ? { limits: deps.limits } : {}
+          });
+          if (result.skipped.length > 0) {
+            const head = result.skipped.slice(0, 5).map((s2) => `${s2.path}:${s2.code}`).join(", ");
+            deps.log?.(`[outputs-copy] ${chatSessionId}: \u590D\u5236 ${result.copied.length} \u4E2A\uFF0C\u8DF3\u8FC7 ${result.skipped.length} \u4E2A\uFF08${head}${result.skipped.length > 5 ? " \u2026" : ""}\uFF09`);
+          }
+          return result;
+        } catch (err) {
+          deps.log?.(`[outputs-copy] ${chatSessionId}: ${err instanceof Error ? err.message : String(err)}`);
+          return null;
+        } finally {
+          inFlight.delete(key);
+        }
+      })();
+    }
+  };
+}
+var OUTPUT_COPY_LIMITS;
+var init_outputs_copy = __esm({
+  "../server/src/domains/chat-sessions/outputs-copy.ts"() {
+    "use strict";
+    init_src();
+    OUTPUT_COPY_LIMITS = {
+      maxFileBytes: 2 * 1024 * 1024,
+      maxFiles: 50,
+      maxTotalBytes: 50 * 1024 * 1024
+    };
+  }
+});
+
 // ../server/src/org-model-backfill.ts
 function resolveDisplayName(existing, humanActor, accountName) {
   const pick3 = existing?.trim() || humanActor?.name?.trim() || accountName?.trim();
@@ -225116,7 +225419,11 @@ function toApiProjectFilesView(view) {
       creator_kind: item.creatorKind,
       creator_id: item.creatorId,
       creator_name: item.creatorName,
-      updated_at: item.updatedAt
+      updated_at: item.updatedAt,
+      // 对话文件夹（`"chat"`）：前端据此换带对话气泡的文件夹图标。其余文件夹与文件行为 null。
+      folder_kind: item.folderKind ?? null,
+      // 对话文件夹及其子文件所属的对话；前端「所属任务」列的「对话」筛选档靠它。其余行为 null。
+      chat_session_id: item.chatSessionId ?? null
     }))
   };
 }
@@ -229566,37 +229873,93 @@ var init_files_view = __esm({
 });
 
 // ../server/src/domains/projects/chat-files.ts
-async function collectProjectChatFiles(chat, projectId2, meta) {
-  if (!chat.listAttachmentMessages) return [];
-  const messages = await chat.listAttachmentMessages(projectId2);
-  const sessions = new Map(await Promise.all([...new Set(messages.map((m2) => m2.sessionId))].map(async (id) => [id, await chat.getSession(id)])));
-  const visible = messages.filter((m2) => {
-    const session = sessions.get(m2.sessionId);
-    return session?.projectId === projectId2 && session.visibility !== "internal" && !session.analyzedRunId;
-  });
-  const byMessage = new Map(visible.map((m2) => [m2.messageId, m2]));
-  const rows = await collectMessageFiles(visible.map((m2) => ({ ...m2, id: m2.messageId })), {
-    meta
-  });
-  return mergeChatSessionFiles(rows, []).filter((row) => row.blob_ref !== null).map((row) => {
-    const message = byMessage.get(row.message_id);
-    const session = sessions.get(message.sessionId);
-    return {
-      projectId: projectId2,
-      fileId: `chat:${message.sessionId}:${row.id}`,
-      name: row.name,
-      blobId: row.blob_ref,
-      contentType: row.content_type ?? void 0,
-      size: row.size,
-      uploadedBy: session.humanActorId,
-      uploadedAt: row.updated_at
-    };
+function chatFolderTitle(session) {
+  const title = session.title?.trim();
+  return title ? title : "\u672A\u547D\u540D\u5BF9\u8BDD";
+}
+function outputDisplayName(path41) {
+  return path41.startsWith("outputs/") ? path41.slice("outputs/".length) : path41;
+}
+async function collectProjectChatFiles(chat, projectId2, meta, options = {}) {
+  const scope = isUncategorizedProjectId(projectId2) ? null : projectId2;
+  const [attachmentMessages, outputSessions] = await Promise.all([
+    chat.listAttachmentMessages ? chat.listAttachmentMessages(scope) : Promise.resolve([]),
+    chat.listOutputCopies ? chat.listOutputCopies(scope) : Promise.resolve([])
+  ]);
+  const sessionIds = [.../* @__PURE__ */ new Set([
+    ...attachmentMessages.map((m2) => m2.sessionId),
+    ...outputSessions.map((s2) => s2.sessionId)
+  ])];
+  const sessions = /* @__PURE__ */ new Map();
+  await Promise.all(sessionIds.map(async (id) => {
+    const session = await chat.getSession(id);
+    if (!session) return;
+    if ((session.projectId ?? null) !== scope) return;
+    if (session.visibility === "internal" || session.analyzedRunId) return;
+    if (options.isDelegationChild && await options.isDelegationChild(id).catch(() => false)) return;
+    sessions.set(id, session);
+  }));
+  const out = [];
+  const base = (session) => ({
+    projectId: projectId2,
+    chatSessionId: session.id,
+    chatTitle: chatFolderTitle(session),
+    chatOwnerId: session.humanActorId
   });
+  const bySession = /* @__PURE__ */ new Map();
+  for (const message of attachmentMessages) {
+    if (!sessions.has(message.sessionId)) continue;
+    const list2 = bySession.get(message.sessionId) ?? [];
+    list2.push(message);
+    bySession.set(message.sessionId, list2);
+  }
+  for (const [sessionId, messages] of bySession) {
+    const session = sessions.get(sessionId);
+    const rows = await collectMessageFiles(messages.map((m2) => ({ ...m2, id: m2.messageId })), { meta });
+    for (const row of mergeChatSessionFiles(rows, [])) {
+      if (row.blob_ref === null) continue;
+      out.push({
+        ...base(session),
+        fileId: `chat:${sessionId}:${row.id}`,
+        name: row.name,
+        blobId: row.blob_ref,
+        ...row.content_type ? { contentType: row.content_type } : {},
+        size: row.size,
+        uploadedBy: session.humanActorId,
+        uploadedAt: row.updated_at,
+        chatSource: "attachment"
+      });
+    }
+  }
+  for (const record8 of outputSessions) {
+    const session = sessions.get(record8.sessionId);
+    if (!session) continue;
+    const seen = new Set(out.filter((file) => file.chatSessionId === session.id).map((file) => `${file.name}\0${file.blobId}`));
+    const copies = record8.copies ?? {};
+    for (const path41 of Object.keys(copies).sort((a, b2) => a.localeCompare(b2))) {
+      const copy = copies[path41];
+      if (!copy?.blobRef) continue;
+      if (seen.has(`${copy.name}\0${copy.blobRef}`)) continue;
+      out.push({
+        ...base(session),
+        fileId: `chat:${session.id}:out:${copy.path}`,
+        name: outputDisplayName(copy.path),
+        blobId: copy.blobRef,
+        ...copy.contentType ? { contentType: copy.contentType } : {},
+        size: copy.size,
+        uploadedBy: session.aiActorId,
+        uploadedAt: Number.isNaN(Date.parse(copy.mtime)) ? copy.copiedAt : new Date(copy.mtime).toISOString(),
+        chatSource: "output"
+      });
+    }
+  }
+  return out;
 }
 var init_chat_files2 = __esm({
   "../server/src/domains/projects/chat-files.ts"() {
     "use strict";
     init_files_view();
+    init_uncategorized_project();
   }
 });
 
@@ -248794,6 +249157,7 @@ var init_postgres_chat_sessions = __esm({
         await pool.query(`ALTER TABLE ${q2}.chat_sessions ADD COLUMN IF NOT EXISTS model text`);
         await pool.query(`ALTER TABLE ${q2}.chat_sessions ADD COLUMN IF NOT EXISTS visibility text`);
         await pool.query(`ALTER TABLE ${q2}.chat_sessions ADD COLUMN IF NOT EXISTS outputs_fingerprints jsonb`);
+        await pool.query(`ALTER TABLE ${q2}.chat_sessions ADD COLUMN IF NOT EXISTS outputs_copies jsonb`);
         await pool.query(`
       WITH ranked AS (
         SELECT id, row_number() OVER (PARTITION BY session_id ORDER BY seq, created_at, id) AS rn
@@ -249041,6 +249405,53 @@ var init_postgres_chat_sessions = __esm({
           [JSON.stringify(fingerprints), sessionId, this.companyId]
         );
       }
+      /**
+       * `outputs/` 产出文件的服务端副本表（2026-09-14）。读：没有副本 → null。
+       */
+      async readOutputCopies(sessionId) {
+        const r = await this.pool.query(
+          `SELECT outputs_copies FROM ${this.s}.chat_sessions WHERE id = $1 AND company_id = $2`,
+          [sessionId, this.companyId]
+        );
+        return r.rows[0]?.outputs_copies ?? null;
+      }
+      /**
+       * 按路径**合并**写入：同一路径新副本覆盖旧副本，其余路径保留。合并在一条 UPDATE 里用 jsonb `||` 完成，
+       * 不是读出来改完再整份写回——两次收尾的复制前后脚落库时，后写的不会把先写的吞掉。
+       */
+      async mergeOutputCopies(sessionId, copies) {
+        if (copies.length === 0) return;
+        const patch = {};
+        for (const copy of copies) patch[copy.path] = copy;
+        await this.pool.query(
+          `UPDATE ${this.s}.chat_sessions
+          SET outputs_copies = COALESCE(outputs_copies, '{}'::jsonb) || $1::jsonb
+        WHERE id = $2 AND company_id = $3`,
+          [JSON.stringify(patch), sessionId, this.companyId]
+        );
+      }
+      /**
+       * 某个范围内有副本的会话。口径同 {@link listAttachmentMessages}：排除内部会话、按公司收口、
+       * `project_id IS NOT DISTINCT FROM $1`（null = 没绑项目的会话）。只取三列，不碰会话其余字段。
+       */
+      async listOutputCopies(projectId2) {
+        const r = await this.pool.query(
+          `SELECT id, project_id, outputs_copies
+         FROM ${this.s}.chat_sessions
+        WHERE outputs_copies IS NOT NULL
+          AND outputs_copies <> '{}'::jsonb
+          AND visibility IS DISTINCT FROM 'internal'
+          AND project_id IS NOT DISTINCT FROM $1
+          AND company_id = $2
+        ORDER BY id`,
+          [projectId2, this.companyId]
+        );
+        return r.rows.map((row) => ({
+          sessionId: row.id,
+          ...row.project_id ? { projectId: row.project_id } : {},
+          copies: row.outputs_copies ?? {}
+        }));
+      }
       /** 删项目时把本公司里绑到它的会话回落成「不指定项目」。会话一条都不删，只清 project_id。 */
       async clearProjectBinding(projectId2) {
         if (!projectId2) return 0;
@@ -259219,6 +259630,7 @@ var init_src11 = __esm({
     init_company_scoped_registry();
     init_session_workdir();
     init_outputs_scan();
+    init_outputs_copy();
     init_org_model_backfill();
     init_types_admin();
     init_roles_admin();
@@ -261027,6 +261439,13 @@ async function startServe(opts) {
           }
         }
         return null;
+      }, {
+        // 委派子会话不进项目（ADR 0555：它的 outputs/ 是交给协调者的）。闭包在请求时才读
+        // `delegationStoreFor`，避开它在下方声明的 TDZ。
+        isDelegationChild: async (sessionId) => {
+          const ledger = await delegationStoreFor(companyId).catch(() => null);
+          return Boolean(ledger && await ledger.getByChildSession(sessionId).catch(() => null));
+        }
       });
     },
     projects: projectStateStore,
@@ -262189,6 +262608,14 @@ async function startServe(opts) {
     delegationStores.set(id, store);
     return store;
   };
+  const outputCopyScheduler = createOutputCopyScheduler({
+    putBlob: (bytes2) => assets.put(bytes2),
+    isDelegationChild: async (companyId, sessionId) => {
+      const ledger = await delegationStoreFor(companyId).catch(() => null);
+      return Boolean(ledger && await ledger.getByChildSession(sessionId).catch(() => null));
+    },
+    log: (message) => console.warn(message)
+  });
   const chatBroadcastMarkers = /* @__PURE__ */ new Map([
     [defaultCompanyId, chatBroadcastMarker]
   ]);
@@ -262920,6 +263347,7 @@ async function startServe(opts) {
         readFingerprints: read,
         writeFingerprints: write
       }).catch(() => null);
+      if (diff && store) void outputCopyScheduler.schedule({ store, bridge, loc: located.loc, chatSessionId, companyId, fingerprints: diff.fingerprints });
       return diff?.changed ?? null;
     },
     delegationWorkdir: createDelegationWorkdirPort({
@@ -273755,7 +274183,7 @@ function shimScript() {
 }
 
 // src/index.ts
-var PKG_VERSION = true ? "2.2.29" : "dev";
+var PKG_VERSION = true ? "2.2.31" : "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.29",
+  "version": "2.2.31",
   "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": "68eff586a82e2fd668f109ffbdd672ebf77844ac"
+    "sourceHead": "bbc56bf65b7e0c10506c3919f42c9c7d8b7c7342"
   }
 }