npm - oasis_test_v2 - Versions diffs - 2.2.1 → 2.2.2 - Mend

oasis_test_v2 2.2.1 → 2.2.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (2) hide show

package/dist/index.js +664 -195
package/package.json +2 -2

package/dist/index.js CHANGED Viewed

@@ -11107,13 +11107,22 @@ var init_store_postgres = __esm({
       async close() {
         await this.pool.end();
       }
+      /**
+       * ★ 与 {@link tx} 同一条纪律：schema 名进的是**标识符位**，必须 {@link quoteIdent}。
+       *
+       * 这两个直连 pool 的方法（本方法与 {@link listNeverStartedWorks}）是上一轮修连字符 schema 时
+       * 漏掉的两处——`tx()` 那条路已经引号化了，它们没有。表现不是「一读就 500」而是**两口钟在带
+       * 连字符的公司上永远转不动**：2026-09-09 v2 生产日志里 `[deadline-clock] [company:test-ryzs]`
+       * 与 `[dispatch-drop]` 每 5 秒 / 每分钟各报一次 `syntax error at or near "-"`，
+       * 一分钟约 50 行；也就是说这些公司的 deadline 最迟触发保证与丢单补派**从来没生效过**。
+       */
       async listOpenWorkDeadlines(opts) {
         const res = await this.pool.query(
           `SELECT workorder_id AS "workorderId",
               id AS "workId",
               assignee_actor_id AS "assigneeActorId",
               COALESCE(last_activity_at, started_at, created_at) AS "deadlineFrom"
-         FROM ${this.schema}.works
+         FROM ${quoteIdent(this.schema)}.works
         WHERE ended_at IS NULL AND dead_at IS NULL AND cancelled_at IS NULL
           AND ($1::text IS NULL OR id > $1)
         ORDER BY id
@@ -11134,7 +11143,7 @@ var init_store_postgres = __esm({
               node_id AS "nodeId",
               assignee_actor_id AS "assigneeActorId",
               created_at AS "createdAt"
-         FROM ${this.schema}.works
+         FROM ${quoteIdent(this.schema)}.works
         WHERE ended_at IS NULL AND dead_at IS NULL AND cancelled_at IS NULL
           AND started_at IS NULL AND session_ref IS NULL
           AND created_at < $1::timestamptz
@@ -11865,6 +11874,7 @@ function markNodeForRetry(state, nodeId, at) {
     state.updateWork(lw.id, { retryAt: at, status: "retry" });
   }
   if (lw && !lw.deadAt && workState(lw, hasOutput(lw, state.artifactsOf(lw.id).length)) === "success") {
+    if (lw.acceptanceState === "rejected") state.updateWork(lw.id, { retryAt: at });
     for (const req of state.requirementsOf(node2.id)) {
       if (!req.latestReviewId) continue;
       const r = state.review(req.latestReviewId);
@@ -28028,6 +28038,15 @@ var init_chat_item_ledger = __esm({
         this.messageId = deps.messageId ?? null;
         this.telemetryTextInContent = deps.telemetryTextInContent === true;
         this.persistEnabled = Boolean(deps.items) && chatItemsDoubleWriteEnabled();
+        this.clock = Math.max(0, deps.versionSeed ?? 0);
+        if (deps.versionSeed === void 0 && deps.items) {
+          void deps.items.sessionVersionCursor(deps.sessionId).then(
+            (seed) => {
+              if (seed > this.clock) this.clock = seed;
+            },
+            () => void 0
+          );
+        }
       }
       /** 账本轮次 id（`chat_session_turns.id`；未接账本时是 {@link fallbackTurnId}）。v3 wire 上 item 帧的 turnId 用它（ADR-0510 D1）。 */
       get turnId() {
@@ -28043,6 +28062,11 @@ var init_chat_item_ledger = __esm({
       /** 内存账本：itemId → 行。插入顺序即 seq 顺序。 */
       rows = /* @__PURE__ */ new Map();
       seqCounter = 0;
+      /**
+       * 会话逻辑时钟（ADR-0510 附录 A）。**一次写走一格**——不描述某条 item 改了第几次，描述
+       * 「这条会话被写了第几次」。于是「一次建行要发两帧」这个死结不存在：想发几帧就取几个号。
+       */
+      clock;
       segment = 0;
       messageId;
       /** 已排队但还没执行的那一次 `append_text`——排队期间到的片段合并进它（见 queueAppend）。 */
@@ -28055,6 +28079,18 @@ var init_chat_item_ledger = __esm({
       finished = false;
       /** 上一次见到的归一层 turnId——变了就清映射（provider 开了新 turn）。 */
       lastTurnId = null;
+      /** 会话逻辑时钟走一格。**唯一发号点**（ADR-0510 附录 A.4）——别在别处自己数。 */
+      tick() {
+        return ++this.clock;
+      }
+      /**
+       * 该 item 的服务端展示序；INSERT 还没返回（或没开双写）时是 undefined。
+       * 调用方（`emitV3`）拿不到就不在帧上带号——**不许自己编一个**。
+       */
+      ordFor(itemId) {
+        const ord = this.rows.get(itemId)?.ord;
+        return ord === null ? void 0 : ord;
+      }
       get failures() {
         return this.failureCount;
       }
@@ -28091,20 +28127,17 @@ var init_chat_item_ledger = __esm({
         if (event.type === "turn") {
           this.itemKeyMap.clear();
           this.lastTurnId = null;
-          return;
+          return null;
         }
         if (this.lastTurnId !== null && this.lastTurnId !== event.turnId) {
           this.itemKeyMap.clear();
         }
         this.lastTurnId = event.turnId;
         const existingId = this.itemKeyMap.get(event.providerItemKey);
-        if (existingId === void 0) {
-          this.createFrom(event);
-          return;
-        }
+        if (existingId === void 0) return this.createFrom(event);
         const row = this.rows.get(existingId);
-        if (!row) return;
-        this.applyOpTo(row, event);
+        if (!row) return null;
+        return this.applyOpTo(row, event);
       }
       // ── 非 provider 来源（服务端自己产的行）────────────────────────────────────
       /**
@@ -28299,34 +28332,49 @@ var init_chat_item_ledger = __esm({
           metadata: { [CHAT_ITEM_META_LEGACY_CONTENT]: inContent }
         });
         this.itemKeyMap.set(event.providerItemKey, id);
-        if (event.opShape.op === "set_status") this.applyOpTo(this.rows.get(id), event);
+        const row = this.rows.get(id);
+        const outcome = {
+          itemId: id,
+          version: row.wireVersion,
+          startedVersion: row.startedVersion,
+          ord: row.ord
+        };
+        if (event.opShape.op === "set_status") {
+          const followUp = this.applyOpTo(row, event);
+          if (followUp) outcome.version = followUp.version;
+        }
+        return outcome;
       }
       applyOpTo(row, event) {
         const op = event.opShape;
         if (event.attrs) row.attrs = { ...row.attrs, ...event.attrs };
         switch (op.op) {
           case "append_text":
-            if (op.text === "") return;
+            if (op.text === "") return null;
             row.text += op.text;
             this.queueAppend(row, op.text);
-            return;
+            return this.outcomeOf(row);
           case "set_text":
-            if (row.text === op.text) return;
+            if (row.text === op.text) return null;
             row.text = op.text;
             this.sealPendingAppend();
             this.persist(row, row.kind === "text" || row.kind === "thinking" ? { op: "set_text", text: op.text } : { op: "set_payload", payload: this.payloadOf(row) }, "set_text");
-            return;
+            return this.outcomeOf(row);
           case "patch_input":
             row.attrs = { ...row.attrs, input: op.input };
             this.persist(row, { op: "patch_input", input: op.input }, "patch_input");
-            return;
+            return this.outcomeOf(row);
           case "set_status":
-            if (row.status === op.status) return;
+            if (row.status === op.status) return null;
             row.status = op.status;
             this.persist(row, { op: "set_status", status: op.status }, "set_status");
-            return;
+            return this.outcomeOf(row);
         }
       }
+      /** 这一次写的回执。`persist` 已经在里面走过钟了，这里只是把读数带出去给 wire。 */
+      outcomeOf(row) {
+        return { itemId: row.id, version: row.wireVersion, ord: row.ord };
+      }
       /** 关掉所有还 streaming 的行（收尾/切段）。 */
       closeStreamingRows(status) {
         this.sealPendingAppend();
@@ -28361,9 +28409,14 @@ var init_chat_item_ledger = __esm({
       }
       insert(input) {
         const id = input.deterministicId ?? this.newId();
+        const startedVersion = this.tick();
+        const writeVersion = this.tick();
         const row = {
           id,
           seq: ++this.seqCounter,
+          ord: null,
+          wireVersion: writeVersion,
+          startedVersion,
           kind: input.kind,
           role: input.role,
           status: input.status,
@@ -28383,7 +28436,7 @@ var init_chat_item_ledger = __esm({
         const payload = input.payload ?? this.payloadOf(row);
         const metadata = input.metadata ?? { [CHAT_ITEM_META_LEGACY_CONTENT]: input.inContent };
         this.enqueue(async () => {
-          await this.deps.items.createItem({
+          const created = await this.deps.items.createItem({
             id,
             sessionId: this.deps.sessionId,
             messageId,
@@ -28395,8 +28448,10 @@ var init_chat_item_ledger = __esm({
             payload,
             metadata,
             providerItemKey: input.providerItemKey ?? null,
-            createdAt
+            createdAt,
+            version: writeVersion
           });
+          row.ord = created.ord;
         }, `create:${input.kind}`);
         return id;
       }
@@ -28405,6 +28460,7 @@ var init_chat_item_ledger = __esm({
        * 语义没变（`version` 数的是落库次数），投影是拼接，合不合并结果逐字相同。
        */
       queueAppend(row, text5) {
+        row.wireVersion = this.tick();
         if (!row.persist || !this.persistEnabled) return;
         const pending = this.pendingAppend;
         if (pending && pending.id === row.id) {
@@ -28418,7 +28474,11 @@ var init_chat_item_ledger = __esm({
           next.text = "";
           if (this.pendingAppend === next) this.pendingAppend = null;
           if (!merged) return;
-          const applied = await this.deps.items.applyOp(row.id, { op: "append_text", text: merged }, { at: this.now() });
+          const applied = await this.deps.items.applyOp(
+            row.id,
+            { op: "append_text", text: merged },
+            { at: this.now(), version: row.wireVersion }
+          );
           if (!applied) throw new Error(`item ${row.id} \u4E0D\u5B58\u5728\uFF08append_text \u843D\u7A7A\uFF09`);
         }, "append_text");
       }
@@ -28427,9 +28487,11 @@ var init_chat_item_ledger = __esm({
         this.pendingAppend = null;
       }
       persist(row, op, what) {
+        const version2 = this.tick();
+        row.wireVersion = version2;
         if (!row.persist || !this.persistEnabled) return;
         this.enqueue(async () => {
-          await this.deps.items.applyOp(row.id, op, { at: this.now() });
+          await this.deps.items.applyOp(row.id, op, { at: this.now(), version: version2 });
         }, what);
       }
       /** 串行链 + 失败吞掉计数。**串行是必须的**：append_text 依赖建行已经落地。 */
@@ -159267,13 +159329,15 @@ var init_live_chat = __esm({
        * 账本坏掉不影响对话；v3 emit 抛异常也不影响 v2 通路与账本落盘——两条独立通路。
        */
       applyNormalizedEvent(turn, event) {
+        let outcome = null;
         try {
-          turn.items?.apply(event);
+          outcome = turn.items?.apply(event) ?? null;
         } catch {
         }
         if (event.type === "turn") return;
+        if (!outcome) return;
         try {
-          this.emitV3(turn, event);
+          this.emitV3(turn, event, outcome);
         } catch {
         }
       }
@@ -159293,18 +159357,17 @@ var init_live_chat = __esm({
       wireTurnId(turn) {
         return turn.items?.turnId ?? turn.liveTurnId;
       }
-      emitV3(turn, event) {
+      emitV3(turn, event, outcome) {
         if (!turn.items) return;
-        const itemId = turn.items.itemIdForKey(event.providerItemKey);
-        if (!itemId) return;
+        const itemId = outcome.itemId;
         const itemType = normalizedKindToItemType(event.kind);
         const operation = normalizedOpToV3Op(event.opShape.op, event.kind);
         if (!operation) return;
-        const perItem = turn.v3Items.get(itemId) ?? { version: 0, textOffset: 0, started: false };
+        const perItem = turn.v3Items.get(itemId) ?? { textOffset: 0, started: false };
         const isTextual2 = event.kind === "text" || event.kind === "thinking";
         const opShape = event.opShape;
-        if (!perItem.started) {
-          perItem.version += 1;
+        const ord = turn.items.ordFor(itemId) ?? outcome.ord ?? void 0;
+        if (!perItem.started && outcome.startedVersion !== void 0) {
           const startedFrame = {
             protocolVersion: 3,
             streamId: turn.liveStreamId,
@@ -159312,7 +159375,8 @@ var init_live_chat = __esm({
             itemId,
             itemType,
             operation: "started",
-            itemVersion: perItem.version,
+            itemVersion: outcome.startedVersion,
+            ...ord !== void 0 ? { ord } : {},
             offset: 0,
             payload: v3StartedPayload(event.role, event.attrs, itemType, event.kind)
           };
@@ -159334,7 +159398,6 @@ var init_live_chat = __esm({
         } else if (opShape.op === "set_status") {
           if (opShape.status === "streaming") return;
         }
-        perItem.version += 1;
         turn.v3Items.set(itemId, perItem);
         const frame = {
           protocolVersion: 3,
@@ -159343,7 +159406,9 @@ var init_live_chat = __esm({
           itemId,
           itemType,
           operation,
-          itemVersion: perItem.version,
+          // 账本这一次写用掉的那一格钟——**库里那一行的 version 就是它**，快照与增量流同一套版本空间。
+          itemVersion: outcome.version,
+          ...ord !== void 0 ? { ord } : {},
           ...offset !== void 0 ? { offset } : {},
           ...payload !== void 0 ? { payload } : {}
         };
@@ -159369,6 +159434,7 @@ var init_live_chat = __esm({
           const payload = pending.frame.payload;
           pending.frame.payload = { ...payload, text: String(payload.text ?? "") + text5 };
           pending.frame.itemVersion = frame.itemVersion;
+          if (frame.ord !== void 0) pending.frame.ord = frame.ord;
           pending.chunks += 1;
           pending.chars += text5.length;
           return;
@@ -160175,7 +160241,7 @@ var init_workorder_drafts = __esm({
       }
     };
     ident = (s2) => {
-      if (!/^[a-z_][a-z0-9_]*$/.test(s2)) throw new Error(`invalid schema name: ${s2}`);
+      if (!/^[A-Za-z0-9_][A-Za-z0-9_.-]*$/.test(s2)) throw new Error(`invalid schema name: ${s2}`);
       return s2;
     };
     seqNoOf = (id, fallback) => {
@@ -160433,7 +160499,7 @@ var init_workorder_draft_planner_issues = __esm({
       }
     };
     ident2 = (s2) => {
-      if (!/^[a-z_][a-z0-9_]*$/.test(s2)) throw new Error(`invalid schema name: ${s2}`);
+      if (!/^[A-Za-z0-9_][A-Za-z0-9_.-]*$/.test(s2)) throw new Error(`invalid schema name: ${s2}`);
       return s2;
     };
     PostgresWorkorderDraftPlannerIssuesStore = class _PostgresWorkorderDraftPlannerIssuesStore extends MemoryWorkorderDraftPlannerIssuesStore {
@@ -201362,14 +201428,15 @@ async function runCommand(kernel, blobs, oplog, engineStore, actor, command, arg
       }
       const projectId2 = optStr(args, "project_id") ?? optStr(args, "projectId");
       const schemaForSeed = (createdViaArg ?? "manual-spawn") === "seed" ? ctx.schema : void 0;
+      const bindingState = ctx.workspaceBindingState ?? ctx.artifactState;
       if (projectId2 !== void 0) {
-        if (!ctx.projectState || !ctx.artifactState) {
+        if (!ctx.projectState || !bindingState) {
           throw new Error("spawn \u5E26 project_id \u9700\u8981\u670D\u52A1\u7AEF\u6CE8\u5165\u9879\u76EE\u5B58\u50A8\u4E0E\u5DE5\u5355\u7ED1\u5B9A\u5B58\u50A8");
         }
         const project = await ctx.projectState.getProject(projectId2);
         if (!project) throw new Error(`project not found: ${projectId2}`);
-        await ctx.artifactState.upsertWorkspaceBinding({ workOrderId: workspace, projectId: projectId2 });
-      } else if (createdViaArg === "seed" && ctx.projectState && ctx.artifactState) {
+        await bindingState.upsertWorkspaceBinding({ workOrderId: workspace, projectId: projectId2 });
+      } else if (createdViaArg === "seed" && ctx.projectState && bindingState) {
         await ensureWorkorderProject({
           workOrderId: workspace,
           ...optStr(args, "title") ? { title: optStr(args, "title") } : {},
@@ -201380,7 +201447,7 @@ async function runCommand(kernel, blobs, oplog, engineStore, actor, command, arg
           // 由读侧从工单 brief.owner 派生（service.resolveProjectCreator）。
           ...ctx.workorderInitiator?.humanActorId ? { createdBy: ctx.workorderInitiator.humanActorId } : !isAgent(actor) ? { createdBy: actor } : {},
           createProject: makeEnsureProjectFromStore(ctx.projectState),
-          upsertBinding: (b2) => ctx.artifactState.upsertWorkspaceBinding(b2),
+          upsertBinding: (b2) => bindingState.upsertWorkspaceBinding(b2),
           onWarn: (m2) => console.warn(m2)
         });
       }
@@ -203175,6 +203242,7 @@ async function startOasisServer(opts) {
           }
         };
         const artifactStateNow = async () => opts.artifactStateFor ? await opts.artifactStateFor(currentCompanyId) : opts.artifactState;
+        const projectStateNow = async () => opts.projectStateFor ? await opts.projectStateFor(currentCompanyId) : opts.projectState;
         if (url.pathname.startsWith("/api/channels")) {
           const json = (status, body2) => {
             res.writeHead(status, { "content-type": "application/json" }).end(JSON.stringify(body2));
@@ -203273,6 +203341,10 @@ async function startOasisServer(opts) {
               }
             }
             const chatAnchorMessageId = await anchorMessageIdFor(chatOrigin, chatStoreNowOrNull);
+            const spawnArgs = body2.args;
+            const needsProject = body2.command === "spawn" && (spawnArgs?.["createdVia"] === "seed" || spawnArgs?.["project_id"] !== void 0 || spawnArgs?.["projectId"] !== void 0);
+            const commandProjects = needsProject ? await projectStateNow() : opts.projectState;
+            const commandBindings = needsProject && commandProjects ? await artifactStateNow() : void 0;
             const result = await runCommand(
               engine.kernel,
               engine.blobs,
@@ -203291,13 +203363,14 @@ async function startOasisServer(opts) {
                 ...chatOrigin !== void 0 ? { chatOrigin } : {},
                 ...chatAnchorMessageId !== void 0 ? { chatAnchorMessageId } : {},
                 ...sessionEscalationId !== void 0 ? { sessionEscalationId } : {},
-                ...opts.projectState ? { projectState: opts.projectState } : {},
+                ...commandProjects ? { projectState: commandProjects } : {},
+                ...commandBindings ? { workspaceBindingState: commandBindings } : {},
                 ...opts.artifactState ? { artifactState: opts.artifactState } : {},
                 ...opts.schema ? { schema: opts.schema } : {},
                 ...engine.registry ? { registry: engine.registry } : {},
                 ...opts.resolveAssignableRoles ? { resolveAssignableRoles: opts.resolveAssignableRoles } : {},
                 ...opts.planWorkorderWithAgent ? { planWorkorderWithAgent: opts.planWorkorderWithAgent } : {},
-                ...opts.resolveCodeRepo ? { resolveCodeRepo: opts.resolveCodeRepo } : {},
+                ...opts.resolveCodeRepo ? { resolveCodeRepo: (ws) => opts.resolveCodeRepo(ws, currentCompanyId) } : {},
                 ...opts.dispatchProduce ? { dispatchProduce: opts.dispatchProduce } : {},
                 ...wodrafts ? { workorderDrafts: wodrafts } : {},
                 workorderDraftPlannerIssues: wodraftPlannerIssues,
@@ -203585,6 +203658,7 @@ async function startOasisServer(opts) {
             }
             const resuming = resumeState.hasNodes;
             let sessionProjectId;
+            let sessionBindingState;
             if (body2.chatSessionId && opts.chatSession) {
               const applyChatStore = await chatStoreNow();
               const session = await applyChatStore.getSession(body2.chatSessionId);
@@ -203593,10 +203667,12 @@ async function startOasisServer(opts) {
               }
               sessionProjectId = session.projectId ?? void 0;
               if (sessionProjectId) {
-                if (!opts.projectState || !opts.artifactState) {
+                const projects = await projectStateNow();
+                sessionBindingState = await artifactStateNow();
+                if (!projects || !sessionBindingState) {
                   throw new Error("chat session \u5E26 projectId \u65F6\u9700\u8981\u670D\u52A1\u7AEF\u6CE8\u5165\u9879\u76EE\u5B58\u50A8\u4E0E\u5DE5\u5355\u7ED1\u5B9A\u5B58\u50A8");
                 }
-                const project = await opts.projectState.getProject(sessionProjectId);
+                const project = await projects.getProject(sessionProjectId);
                 if (!project) throw new Error(`project not found: ${sessionProjectId}`);
               }
             }
@@ -203646,7 +203722,7 @@ async function startOasisServer(opts) {
               return;
             }
             if (targetWs && sessionProjectId) {
-              await opts.artifactState.upsertWorkspaceBinding({ workOrderId: targetWs, projectId: sessionProjectId });
+              await sessionBindingState.upsertWorkspaceBinding({ workOrderId: targetWs, projectId: sessionProjectId });
             }
             const result = resuming ? { interventionId: "", applied: 0, resumed: true } : await engine.kernel.applyIntervention(body2.plan, body2.baseSeqs, actor);
             if (resuming) {
@@ -204829,8 +204905,10 @@ ${composed}`;
                 });
               }
               const itemStore = persistTarget ? opts.resolveChatItems ? await opts.resolveChatItems(currentCompanyId).catch(() => void 0) : opts.chatItems : void 0;
+              const versionSeed = itemStore ? await itemStore.sessionVersionCursor(persistTarget?.id ?? session.id).catch(() => 0) : 0;
               const itemLedger = new ChatItemLedger({
                 ...itemStore ? { items: itemStore } : {},
+                versionSeed,
                 sessionId: persistTarget?.id ?? session.id,
                 // 优先账本 id（`chat_session_turns.id`，跨进程唯一、重启不失忆）；账本没接入才兜底。
                 turnId: heldTurn?.id ?? fallbackTurnId(session.runId),
@@ -206762,7 +206840,12 @@ var init_memory_registry_store = __esm({
       async putVariable(v2) {
         const mk = this._varKey(v2.key, v2.actorId, v2.projectId);
         const ex = this.variables.get(mk);
-        this.variables.set(mk, { ...v2, ...ex?.lastUsedAt !== void 0 ? { lastUsedAt: ex.lastUsedAt } : {} });
+        const keptName = v2.name ?? ex?.name;
+        this.variables.set(mk, {
+          ...v2,
+          ...ex?.lastUsedAt !== void 0 ? { lastUsedAt: ex.lastUsedAt } : {},
+          ...keptName ? { name: keptName } : {}
+        });
       }
       async touchVariableUsage(key, actorId, projectId2, when) {
         const mk = this._varKey(key, actorId, projectId2);
@@ -209263,6 +209346,9 @@ function foldSingleNodeTasks(items) {
   }
   return folded;
 }
+function engineContentKind(k2) {
+  return k2 === "manifest" ? "manifest" : k2 === "external" ? "external-pin" : "inline-blob";
+}
 function namedError(name, message) {
   const err = new Error(message);
   err.name = name;
@@ -209484,6 +209570,13 @@ var init_service4 = __esm({
       async listProjects() {
         return [...this.projects.values()].map((project) => ({ ...project }));
       }
+      /** 与 Postgres 同语义：主记录 + 成员 + 上传文件 + 内容位置一并清掉；不存在的 id 幂等返回。 */
+      async deleteProject(id) {
+        this.projects.delete(id);
+        this.members.delete(id);
+        for (const [fileId, f2] of this.files) if (f2.projectId === id) this.files.delete(fileId);
+        for (const [locId, l] of this.contentLocations) if (l.projectId === id) this.contentLocations.delete(locId);
+      }
       async replaceProjectMembers(projectId2, members) {
         this.members.set(projectId2, new Map(members.map((member) => [member.actorId, cloneProjectMember(member)])));
       }
@@ -209629,6 +209722,7 @@ var init_service4 = __esm({
       }
       projectCreatedHandler;
       onProjectNameChanged;
+      onProjectDeleted;
       /**
        * Cross-domain follow-up for project-scoped resources. Project persistence stays authoritative:
        * a failed follow-up is reported but never turns an already-created project into a false 500.
@@ -209643,6 +209737,10 @@ var init_service4 = __esm({
       setOnProjectNameChanged(handler) {
         this.onProjectNameChanged = handler;
       }
+      /** 删项目后的跨域清理钩子（会话解绑 + 项目变量清理）。装配层注入；缺省 = 无副作用。 */
+      setOnProjectDeleted(handler) {
+        this.onProjectDeleted = handler;
+      }
       /** 工单→项目绑定查询（content-location add 的项目匹配守卫用）。 */
       async getWorkspaceBinding(workOrderId) {
         return this.artifacts.getWorkspaceBinding(workOrderId);
@@ -210031,6 +210129,60 @@ var init_service4 = __esm({
         await this.artifacts.upsertWorkspaceBinding(binding);
         return binding;
       }
+      /**
+       * 删除项目（帧 `444:1792` 三点菜单第二项，口径由发起人 2026-09-09 拍板）。
+       *
+       * **只删项目这个壳**——项目主记录 + 成员名单 + 上传文件记录 + 内容位置。任务和会话一条都不删：
+       *
+       * 1. 绑到本项目的工单**不管在跑还是没在跑**，一律 `unlinkWorkorder` 回落到自己的
+       *    `proj_tmp_<slug>`，也就是读侧的「无分类项目」。发起人明确不要「有任务在跑就不让删」
+       *    这道闸，所以这里没有任何在跑判断。
+       * 2. 搬工单的同时**把本项目的 git 类内容位置复制一份到每个工单的临时项目上**。
+       *    这条不是可选的：`git/resolve.ts` 的 `resolveCodeRepo` 是**派发时**沿
+       *    `binding → project → listContentLocations` 实时解的，不带过去的话，正在跑的任务
+       *    下一个节点就取不到代码仓——正是 `ephemeral-project.ts` 顶部那条五环事故链。
+       * 3. 会话的 `project_id` 置空、项目作用域的变量/密钥清理，走 {@link OnProjectDeleted} 钩子
+       *    （本 service 对会话域与凭据域零耦合，同 `onProjectNameChanged` 的注入模式）。
+       *
+       * 拒绝两类 id：`proj:uncategorized`（读侧虚拟卡，存储里没有真行）与 `proj_tmp_*`
+       * （工单的兜底归属，删掉等于把工单变成无绑定态——契约里 `Workspace.projectId` 必填）。
+       */
+      async deleteProject(id) {
+        const projectId2 = id?.trim();
+        if (!projectId2) throw new Error("project id is required");
+        if (isUncategorizedProjectId(projectId2)) throw new Error(`project not deletable: ${projectId2}`);
+        if (isEphemeralProject(projectId2)) throw new Error(`project not deletable: ${projectId2}`);
+        const project = await this.projects.getProject(projectId2);
+        if (!project) throw new Error(`project not found: ${projectId2}`);
+        const gitLocations = (await this.projects.listContentLocations(projectId2)).filter((loc) => loc.kind === "external-home" && loc.externalHome?.system === "git");
+        const now = (/* @__PURE__ */ new Date()).toISOString();
+        const bindings = await this.artifacts.listWorkspaceBindings();
+        const movedWorkOrderIds = [];
+        for (const binding of bindings) {
+          if (binding.projectId !== projectId2) continue;
+          const moved = await this.unlinkWorkorder(binding.workOrderId);
+          movedWorkOrderIds.push(binding.workOrderId);
+          for (const loc of gitLocations) {
+            await this.projects.addContentLocation({
+              ...loc,
+              projectId: moved.projectId,
+              // 派生 id：同一条位置搬到同一个临时项目永远算出同一个 id（addContentLocation 是
+              // upsert），重跑不会堆出重复的仓库行。
+              locationId: `pcl-${moved.projectId}-carried-${loc.locationId}`,
+              updatedAt: now
+            });
+          }
+        }
+        await this.projects.deleteProject(projectId2);
+        if (this.onProjectDeleted) {
+          try {
+            await this.onProjectDeleted({ projectId: projectId2, projectName: project.name });
+          } catch (error2) {
+            console.warn(`[projects] project-deleted follow-up failed for ${projectId2}: ${error2 instanceof Error ? error2.message : String(error2)}`);
+          }
+        }
+        return { projectId: projectId2, movedWorkOrderIds, carriedGitLocationCount: gitLocations.length };
+      }
       /**
        * 项目关联工单（帧 `1355:4918`）：把内部私有的 `listProjectWorkorders` 暴露给路由层。
        * `projectId="proj:uncategorized"` 时聚合所有 `proj_tmp_*` 绑定的工单。
@@ -210140,6 +210292,9 @@ var init_service4 = __esm({
               size: file?.size ?? null,
               taskId,
               taskTitle,
+              // 内容形态/引用只挂在**整份产物**那一行；装箱单摊出来的成员行有自己的后缀，
+              // 按后缀走图标即可，挂上 manifest 反而会把 `Dockerfile` 这种无后缀成员画成压缩包。
+              ...file ? {} : { contentKind: revision.contentKind, contentRef: revision.contentRef },
               creatorKind: creatorId ? creatorId.startsWith("actor:human:") ? "human" : "agent" : null,
               creatorId,
               creatorName: creatorId ? this.resolveActorName(creatorId) : null,
@@ -210294,6 +210449,8 @@ var init_service4 = __esm({
                 depth: 2,
                 type: artifactType || "",
                 size: null,
+                contentKind: engineContentKind(a.contentKind),
+                ...a.contentRef ? { contentRef: a.contentRef } : {},
                 taskId: workOrderId,
                 taskTitle,
                 creatorKind,
@@ -210645,7 +210802,6 @@ var init_service4 = __esm({
         const worksById = new Map(snap.works.map((w2) => [w2.id, w2]));
         const binding = this.artifacts.getWorkspaceBinding ? await this.artifacts.getWorkspaceBinding(workOrderId).catch(() => null) : null;
         const projectId2 = binding?.projectId ?? ephemeralProjectIdFor(workOrderId);
-        const mapContentKind = (k2) => k2 === "manifest" ? "manifest" : k2 === "external" ? "external-pin" : "inline-blob";
         const out = [];
         for (const node2 of snap.nodes) {
           if (!node2.latestAcceptId) continue;
@@ -210665,7 +210821,7 @@ var init_service4 = __esm({
             contentRef: a.contentRef,
             title: node2.title || a.name,
             // 节点标题优先；否则用 engine artifact 的 "output" 兜底
-            contentKind: mapContentKind(a.contentKind)
+            contentKind: engineContentKind(a.contentKind)
           }));
           out.push({
             outputId: `engine:${acceptedId}`,
@@ -217718,6 +217874,8 @@ ${input.description}
         }
         await this.opts.store.putVariable({
           key: v2.key,
+          // 展示名（子 PRD《密钥管理》§2）。没传就不传下去——存储层按「不动」处理，不抹既有名字。
+          ...v2.name !== void 0 && v2.name !== "" ? { name: v2.name } : {},
           scope: v2.scope,
           ...v2.actorId !== void 0 ? { actorId: v2.actorId } : {},
           ...v2.projectId !== void 0 ? { projectId: v2.projectId } : {},
@@ -217786,6 +217944,7 @@ ${input.description}
           const isPlain = r.valueEncrypted.startsWith("plain:");
           return {
             key: r.key,
+            ...r.name !== void 0 ? { name: r.name } : {},
             scope: r.scope,
             ...r.actorId !== void 0 ? { actorId: r.actorId } : {},
             ...r.projectId !== void 0 ? { projectId: r.projectId } : {},
@@ -219613,6 +219772,8 @@ function actorsDomain(opts) {
         key: b2.key,
         value: b2.value,
         scope,
+        // 展示名（子 PRD《密钥管理》§2「名称」）；不传 = 不改既有名字。
+        ...typeof b2.name === "string" && b2.name.trim() ? { name: b2.name.trim() } : {},
         ...scope === "project" ? { projectId: b2.projectId } : {},
         ...b2.deliveryMode !== void 0 ? { deliveryMode: b2.deliveryMode } : {},
         ...b2.connectorId !== void 0 ? { connectorId: b2.connectorId } : {},
@@ -219684,6 +219845,8 @@ function actorsDomain(opts) {
         value: b2.value,
         actorId,
         scope: "personal",
+        // 展示名（同上）。组织页「添加密钥 → 新建」走的就是这条端点。
+        ...typeof b2.name === "string" && b2.name.trim() ? { name: b2.name.trim() } : {},
         ...b2.deliveryMode !== void 0 ? { deliveryMode: b2.deliveryMode } : {},
         ...b2.connectorId !== void 0 ? { connectorId: b2.connectorId } : {},
         ...b2.overrides !== void 0 ? { overrides: b2.overrides } : {},
@@ -220740,6 +220903,22 @@ function projectsDomain(opts) {
         throw mapProjectError(err);
       }
     });
+    router.delete("/api/projects/:id", async (req) => {
+      try {
+        const result = await (await svc(req)).deleteProject(req.params.id);
+        return {
+          status: 200,
+          body: {
+            ok: true,
+            project_id: result.projectId,
+            moved_work_order_ids: result.movedWorkOrderIds,
+            carried_git_location_count: result.carriedGitLocationCount
+          }
+        };
+      } catch (err) {
+        throw mapProjectError(err);
+      }
+    });
     router.get("/api/projects/:id/members", async (req) => {
       try {
         const members = await (await svc(req)).listProjectMembers(req.params.id);
@@ -221162,6 +221341,9 @@ function mapProjectError(err) {
   if (err instanceof Error && err.message.startsWith("project not found:")) {
     return new ApiError(404, "NOT_FOUND", err.message);
   }
+  if (err instanceof Error && err.message.startsWith("project not deletable:")) {
+    return new ApiError(400, "PROJECT_NOT_DELETABLE", err.message);
+  }
   if (err instanceof Error && err.message.startsWith("missing artifact revision registration:")) {
     return new ApiError(400, "MISSING_ARTIFACT_REVISION", err.message);
   }
@@ -221469,6 +221651,10 @@ function toApiProjectFilesView(view) {
       file_path: item.filePath ?? null,
       depth: item.depth,
       type: item.type,
+      // 内容形态 + 内容引用：前端名称列给**没有后缀**的行选图标用（正文→文本、git 提交→代码、
+      // 其它外部引用→链接）。交付物整份产物行才有，上传文件与文件夹为 null。
+      content_kind: item.contentKind ?? null,
+      content_ref: item.contentRef ?? null,
       size: item.size,
       task_id: item.taskId,
       task_title: item.taskTitle,
@@ -221524,6 +221710,10 @@ function createProjectsDomain(opts) {
       const handler = opts.onProjectNameChangedFor(companyId);
       if (handler) svc.setOnProjectNameChanged(handler);
     }
+    if (opts.onProjectDeletedFor) {
+      const handler = opts.onProjectDeletedFor(companyId);
+      if (handler) svc.setOnProjectDeleted(handler);
+    }
     return svc;
   };
   const service = build(void 0, void 0);
@@ -222349,8 +222539,8 @@ var init_offboarding = __esm({
         return { ownedAgents, inFlight };
       }
       /**
-       * 现在**能不能直接删**这个成员。DELETE 路由先问它：非空即 409 HANDOFF_REQUIRED。
-       * 这是「阻断直接移除」的唯一判据，DELETE 与 commit 共用它，不会两处各判一套。
+       * 现在**能不能直接删**这个成员。DELETE 与 commit 共用它，不会两处各判一套。
+       * 交接删掉之后这里只剩两条：不是成员（NOT_FOUND）、公司最后一位 owner（LAST_OWNER）。
        */
       async blockersForRemoval(companyId, accountId) {
         const blockers = [];
@@ -222533,6 +222723,15 @@ function companiesDomain(opts) {
     if (!agentCredentials) throw new ApiError(501, "NOT_IMPLEMENTED", "\u672C\u90E8\u7F72\u672A\u63A5\u5165 agent \u51ED\u8BC1");
     return agentCredentials;
   };
+  const syncActorNameToDisplayName = async (member, by) => {
+    if (!resolveActorsCtx) return;
+    const name = member.displayName?.trim();
+    if (!name) return;
+    const { service: actorsSvc } = await resolveActorsCtx(member.companyId);
+    const existing = await actorsSvc.getActor(member.actorId);
+    if (!existing || existing.name === name) return;
+    await actorsSvc.upsertActor({ ...existing, name }, by);
+  };
   const requireIfMatch = (req) => {
     const raw = req.raw.headers["if-match"];
     const text5 = (typeof raw === "string" ? raw : Array.isArray(raw) ? raw[0] : void 0)?.replace(/^"|"$/g, "");
@@ -222648,6 +222847,7 @@ function companiesDomain(opts) {
           throw new ApiError(400, "BAD_REQUEST", "displayName \u987B\u4E3A\u975E\u7A7A\u5B57\u7B26\u4E32");
         }
         member = await service.setMemberDisplayName(cid, aid, b2.displayName).catch(mapErr);
+        await syncActorNameToDisplayName(member, req.auth.actor);
       }
       return { status: 200, body: member };
     });
@@ -224698,6 +224898,8 @@ function buildWorkorderActivity(input) {
   const groupKey = (nodeId) => `${nodeId}#${groupIndexOf.get(nodeId) ?? 0}`;
   const reviewCards = /* @__PURE__ */ new Map();
   const issueCards = /* @__PURE__ */ new Map();
+  const workOfIssue = /* @__PURE__ */ new Map();
+  const plainCommentIssueIds = /* @__PURE__ */ new Set();
   const acceptCards = /* @__PURE__ */ new Map();
   const standalone = [];
   const touch = (d, rec) => {
@@ -224755,10 +224957,22 @@ function buildWorkorderActivity(input) {
         const executorId = w2?.assigneeActorId ?? rec.actorId;
         if (isPendingActor(executorId)) break;
         const status = reasonKinds.has("rework") ? ACTIVITY_COPY.reworking(nodeName(nodeId)) : reasonKinds.has("resumed") ? ACTIVITY_COPY.resumed(nameOf(executorId), nodeName(nodeId)) : reasonKinds.has("spec_changed") ? ACTIVITY_COPY.specChanged(nodeName(nodeId)) : reasonKinds.has("issue") ? ACTIVITY_COPY.issueDriven(nodeName(nodeId)) : ACTIVITY_COPY.working(nodeName(nodeId));
+        const drivingIssueId = str4(reasons.find((r) => r.kind === "issue")?.issueId);
+        if (drivingIssueId) {
+          workOfIssue.set(drivingIssueId, workId);
+          const ic = plainCommentIssueIds.has(drivingIssueId) ? issueCards.get(drivingIssueId) : void 0;
+          const commentAuthor = issueById.get(drivingIssueId)?.authorActorId;
+          if (ic && commentAuthor) {
+            touch(ic, rec);
+            ic.executorId = executorId;
+            ic.status = ACTIVITY_COPY.commentHandling(nameOf(executorId), nameOf(commentAuthor));
+          }
+        }
         const reworkReason = str4(reasons.find((r) => r.kind === "rework")?.reason);
         const key = groupKey(nodeId);
         const existingGroup = groupCards.get(key);
         if (existingGroup) {
+          if (!existingGroup.traceWorkIds.includes(workId)) existingGroup.traceWorkIds.push(workId);
           touch(existingGroup, rec);
           existingGroup.executorId = executorId;
           existingGroup.phase = "running";
@@ -224771,6 +224985,7 @@ function buildWorkorderActivity(input) {
         }
         const fresh = {
           id: `work:${workId}`,
+          traceWorkIds: [workId],
           seq: rec.seq,
           at: rec.createdAt,
           updatedAt: rec.createdAt,
@@ -224813,8 +225028,9 @@ function buildWorkorderActivity(input) {
           }
           break;
         }
+        const engineVerdict = workById.get(workId)?.status;
         touch(d, rec);
-        if (ev.outcome === "failed") {
+        if (ev.outcome === "failed" && engineVerdict !== "success") {
           d.phase = "stuck";
           d.stuckReason = "failed";
           d.status = ACTIVITY_COPY.failed(nameOf(d.executorId));
@@ -225046,6 +225262,7 @@ function buildWorkorderActivity(input) {
           });
           break;
         }
+        if (!isGap && !isEscalation && !isBackpressure) plainCommentIssueIds.add(issueId);
         const nodeAssignee = nodeId ? nodeById.get(nodeId)?.assigneeActorId : void 0;
         const commentCounterpart = nodeAssignee ?? ownerId;
         const commentTargetId = commentCounterpart && commentCounterpart !== authorId ? commentCounterpart : void 0;
@@ -225134,7 +225351,10 @@ function buildWorkorderActivity(input) {
         d.phase = "done";
         d.actions = [];
         d.executorId = resolverId;
-        d.status = ACTIVITY_COPY.commentResolved(nameOf(resolverId), nodeName(d.nodeId));
+        const drivenWorkId = workOfIssue.get(issueId);
+        const producedNewVersion = !!(drivenWorkId && workById.get(drivenWorkId)?.conclusion);
+        const commentAuthorId = issue2?.authorActorId;
+        d.status = producedNewVersion && commentAuthorId ? ACTIVITY_COPY.commentAddressed(nameOf(resolverId), nameOf(commentAuthorId), nodeName(d.nodeId)) : ACTIVITY_COPY.commentResolved(nameOf(resolverId), nodeName(d.nodeId));
         break;
       }
       case "plan.node_retry": {
@@ -225189,12 +225409,37 @@ function buildWorkorderActivity(input) {
     ...issueCards.values(),
     ...acceptCards.values()
   ].sort((a, b2) => a.updatedAt.localeCompare(b2.updatedAt) || a.seq - b2.seq || a.id.localeCompare(b2.id));
-  const runIdByTarget = input.runIdByTarget;
-  const runIdOfCard = (cardId) => {
-    if (!runIdByTarget) return void 0;
-    if (cardId.startsWith("work:")) return runIdByTarget.get(`work:${cardId.slice("work:".length)}`);
-    if (cardId.startsWith("review:")) return runIdByTarget.get(`review:${cardId.slice("review:".length)}`);
-    return void 0;
+  const issueWorks = /* @__PURE__ */ new Map();
+  const reasonIds = /* @__PURE__ */ new Map();
+  for (const rec of input.events) {
+    const ev = rec.event;
+    if (ev.kind === "work.create") reasonIds.set(
+      ev.workId,
+      ev.reasons.filter((r) => r.kind === "issue").map((r) => r.issueId)
+    );
+  }
+  for (const w2 of [...snap?.works ?? []].sort((a, b2) => a.createdAt.localeCompare(b2.createdAt) || a.id.localeCompare(b2.id))) {
+    const replyIssueId = replyIssueIdOf(w2);
+    for (const id of new Set(w2.frozenIssueIds ?? reasonIds.get(w2.id) ?? (replyIssueId ? [replyIssueId] : []))) {
+      const issue2 = issueById.get(id);
+      if (issue2?.kind !== "comment" && issue2?.kind !== "change_request") continue;
+      const ids2 = issueWorks.get(id) ?? [];
+      ids2.push(w2.id);
+      issueWorks.set(id, ids2);
+    }
+  }
+  for (const d of drafts) {
+    if (d.id.startsWith("issue:")) d.traceWorkIds = issueWorks.get(d.id.slice("issue:".length));
+  }
+  const runIdOfCard = (d) => {
+    const map = input.runIdByTarget;
+    if (d.traceWorkIds?.length) {
+      for (const id of [...d.traceWorkIds].reverse()) {
+        const run = map?.get(`work:${id}`);
+        if (run) return run;
+      }
+    }
+    return d.id.startsWith("review:") ? map?.get(d.id) : void 0;
   };
   const cards = drafts.map((d) => ({
     id: d.id,
@@ -225209,7 +225454,8 @@ function buildWorkorderActivity(input) {
     ...d.detail ? { detail: d.detail } : {},
     artifacts: d.artifacts,
     actions: d.actions,
-    .../* @__PURE__ */ ((r) => r ? { runId: r } : {})(runIdOfCard(d.id))
+    ...d.traceWorkIds?.length ? { traceWorkIds: d.traceWorkIds, traceAvailable: true } : {},
+    .../* @__PURE__ */ ((r) => r ? { runId: r, traceAvailable: true } : {})(runIdOfCard(d))
   }));
   return { workorderId, cards, truncated };
 }
@@ -225218,6 +225464,7 @@ var init_activity2 = __esm({
   "../server/src/domains/collab/activity.ts"() {
     "use strict";
     init_src();
+    init_src4();
     init_workorder_manager();
     ACTIVITY_EVENT_KINDS = [
       "plan.changed",
@@ -225347,6 +225594,14 @@ var init_activity2 = __esm({
        * 留言 / 回压收口——**同样一句索引**。收口 note 与开口正文同源、同样能长到几千字：
        * 全库实测 `ws:wo-56bba3c1` 那条收口后小状态仍是 **8096 字**。全文去留言线看。
        */
+      /** 有人接手这条留言、开工了——由 `work.create` 的 `reasons` 引用该 issueId 判定。 */
+      commentHandling: (executor, author) => `${executor} \u6B63\u5728\u5904\u7406\u6765\u81EA ${author} \u7684\u7559\u8A00\u3002`,
+      /**
+       * 处理完**并且真出了新一版**。
+       * ⚠ 只在那一轮真有 conclusion 时才说「更新了一版」——resolve 也可能是「看了但不改」，
+       * 那种情况说出了新版就是一句卡面兑现不了的断言（同「未经 X 确认」那一族）。
+       */
+      commentAddressed: (executor, author, node2) => `${executor} \u5DF2\u57FA\u4E8E ${author} \u7684\u7559\u8A00\u66F4\u65B0\u4E86\u4E00\u7248\u300A${node2}\u300B\u3002`,
       commentResolved: (by, node2) => `${by} \u5DF2\u5904\u7406\u300A${node2}\u300B\u7684\u7559\u8A00\u3002`,
       issueResolved: (note) => note
     };
@@ -225370,6 +225625,125 @@ function targetOf(cardId) {
   return null;
 }
 function buildWorkorderActivityTrace(input) {
+  const { workorderId, cardId, snap } = input;
+  const ref2 = input.ref ?? ((id) => ({ id }));
+  const empty2 = { workorderId, cardId, attempts: [] };
+  if (!snap) return empty2;
+  const card2 = input.events ? buildWorkorderActivity({
+    workorderId,
+    snap,
+    events: input.events,
+    ref: ref2
+  }).cards.find((c) => c.id === cardId) : void 0;
+  const workIds = card2?.traceWorkIds ?? (cardId.startsWith("work:") ? [cardId.slice(5)] : []);
+  if (workIds.length > 0) {
+    let firstBriefing;
+    const works = [];
+    for (const workId of workIds) {
+      const work = snap.works.find((w2) => w2.id === workId);
+      if (!work) continue;
+      const single = buildSingleTrace({ ...input, cardId: `work:${workId}` });
+      const briefing = single.briefing;
+      if (!briefing) continue;
+      firstBriefing ??= briefing;
+      const sources = sourcesOfWork(work, input, briefing);
+      const artifacts = single.attempts.at(-1)?.artifacts ?? artifactsOfWork(work, input);
+      works.push({
+        workId,
+        at: work.createdAt,
+        nodeTitle: briefing.nodeTitle,
+        ...briefing.spec ? { spec: briefing.spec } : {},
+        sources,
+        attempts: single.attempts,
+        ...work.conclusion?.trim() ? { conclusion: work.conclusion.trim() } : {},
+        artifacts,
+        ...single.attempts.length ? {} : { emptyReason: input.dispatches === void 0 ? "records_unavailable" : work.startedAt || work.endedAt || work.deadAt || work.cancelledAt || work.conclusion || work.status && work.status !== "running" ? "records_missing" : "not_dispatched" }
+      });
+    }
+    if (works.length) {
+      return {
+        workorderId,
+        cardId,
+        briefing: firstBriefing,
+        works,
+        attempts: works.flatMap((w2) => w2.attempts).sort((a, b2) => a.at.localeCompare(b2.at) || a.runId.localeCompare(b2.runId))
+      };
+    }
+  }
+  return buildSingleTrace(input);
+}
+function sourcesOfWork(work, input, briefing) {
+  const snap = input.snap;
+  const ref2 = input.ref ?? ((id) => ({ id }));
+  const created = input.events?.find((r) => r.event.kind === "work.create" && r.event.workId === work.id);
+  const event = created?.event;
+  const replyIssueId = replyIssueIdOf(work);
+  const ids2 = work.frozenIssueIds ?? (event?.kind === "work.create" ? event.reasons.filter((r) => r.kind === "issue").map((r) => r.issueId) : replyIssueId ? [replyIssueId] : void 0);
+  if (!ids2) return [{ kind: "unavailable", at: work.createdAt }];
+  const sources = [];
+  for (const issueId of new Set(ids2)) {
+    const issue2 = snap.issues.find((i) => i.id === issueId);
+    if (!issue2 || issue2.createdAt > work.createdAt) {
+      sources.push({ kind: "unavailable", at: work.createdAt, issueId });
+      continue;
+    }
+    if (issue2.kind !== "comment" && issue2.kind !== "change_request") continue;
+    const replySeq = (id) => input.events?.find((e) => e.event.kind === "issue.reply" && e.event.replyId === id)?.seq;
+    if (snap.issueReplies.some((r) => r.issueId === issueId && r.createdAt === work.createdAt && (!created || replySeq(r.id) === void 0))) {
+      sources.push({ kind: "unavailable", at: work.createdAt, issueId });
+      continue;
+    }
+    const replies = snap.issueReplies.filter((r) => {
+      if (r.issueId !== issueId || r.createdAt > work.createdAt) return false;
+      const seq = replySeq(r.id);
+      return created && seq !== void 0 ? seq < created.seq : r.createdAt < work.createdAt;
+    }).sort((a, b2) => a.createdAt.localeCompare(b2.createdAt) || (replySeq(a.id) ?? 0) - (replySeq(b2.id) ?? 0) || a.id.localeCompare(b2.id));
+    const reply = replies.at(-1);
+    if (reply?.viaWorkId && snap.works.some((w2) => w2.id === reply.viaWorkId && w2.nodeId === work.nodeId)) {
+      sources.push({ kind: "unavailable", at: work.createdAt, issueId });
+      continue;
+    }
+    sources.push({
+      kind: issueId.startsWith("ann:rework:") ? "gap_resume" : "comment",
+      actor: ref2(reply?.authorActorId ?? issue2.authorActorId),
+      at: reply?.createdAt ?? issue2.createdAt,
+      content: reply?.body ?? issue2.body,
+      issueId,
+      ...reply ? { replyId: reply.id } : {}
+    });
+  }
+  return sources.length ? sources : [{
+    kind: "assignment",
+    actor: briefing.actor,
+    at: work.createdAt,
+    ...briefing.spec ? { content: briefing.spec } : {}
+  }];
+}
+function artifactsOfWork(work, input) {
+  const snap = input.snap;
+  const workId = work.id;
+  const nodeId = work.nodeId;
+  const node2 = snap.nodes.find((n) => n.id === nodeId);
+  const nodesWithInEdges = new Set(snap.edges.map((e) => e.toNodeId));
+  const isRootBrief = node2?.type === "brief" && !nodesWithInEdges.has(nodeId);
+  const list2 = [];
+  for (const a of snap.artifacts) {
+    if (a.workId !== workId) continue;
+    const artifactNodeId = a.nodeId;
+    const files = a.contentKind === "manifest" ? input.manifestFiles?.get(a.contentRef) : void 0;
+    if (files && files.length > 0) {
+      for (const path41 of files) {
+        list2.push({ id: a.id, name: path41.split("/").pop() || path41, path: path41, nodeId: artifactNodeId });
+      }
+    } else if (isRootBrief) {
+      list2.push({ id: a.id, name: "\u4EFB\u52A1\u76EE\u6807", path: "\u4EFB\u52A1\u76EE\u6807.md", nodeId: artifactNodeId });
+    } else {
+      list2.push({ id: a.id, name: a.name, nodeId: artifactNodeId });
+    }
+  }
+  return list2;
+}
+function buildSingleTrace(input) {
   const { workorderId, cardId, snap } = input;
   const ref2 = input.ref ?? ((id) => ({ id }));
   const empty2 = { workorderId, cardId, attempts: [] };
@@ -225382,26 +225756,6 @@ function buildWorkorderActivityTrace(input) {
   const nodeId = work?.nodeId ?? review?.nodeId;
   if (!nodeId) return empty2;
   const node2 = nodeById.get(nodeId);
-  const nodesWithInEdges = new Set(snap.edges.map((e) => e.toNodeId));
-  const isRootBrief = node2?.type === "brief" && !nodesWithInEdges.has(nodeId);
-  const artifactsOfWork = (workId) => {
-    const list2 = [];
-    for (const a of snap.artifacts) {
-      if (a.workId !== workId) continue;
-      const artifactNodeId = a.nodeId;
-      const files = a.contentKind === "manifest" ? input.manifestFiles?.get(a.contentRef) : void 0;
-      if (files && files.length > 0) {
-        for (const path41 of files) {
-          list2.push({ id: a.id, name: path41.split("/").pop() || path41, path: path41, nodeId: artifactNodeId });
-        }
-      } else if (isRootBrief) {
-        list2.push({ id: a.id, name: "\u4EFB\u52A1\u76EE\u6807", path: "\u4EFB\u52A1\u76EE\u6807.md", nodeId: artifactNodeId });
-      } else {
-        list2.push({ id: a.id, name: a.name, nodeId: artifactNodeId });
-      }
-    }
-    return list2;
-  };
   const managerId = resolveWorkorderManager(snap) ?? snap.workorder.ownerActorId;
   const startedAt = work?.createdAt ?? review?.createdAt;
   const spec = node2?.spec?.trim();
@@ -225411,18 +225765,18 @@ function buildWorkorderActivityTrace(input) {
     nodeTitle: node2?.title || nodeId.split(":").slice(2).join(":") || nodeId,
     ...spec ? { spec } : {}
   };
-  const rows = (input.dispatches ?? []).filter((d) => d.targetKind === target.kind && d.targetId === target.id).slice().sort((a, b2) => a.createdAt.localeCompare(b2.createdAt));
+  const rows = (input.dispatches ?? []).filter((d) => d.targetKind === target.kind && d.targetId === target.id).slice().sort((a, b2) => a.createdAt.localeCompare(b2.createdAt) || a.id.localeCompare(b2.id));
   const executorId = work?.assigneeActorId ?? review?.reviewerActorId;
   const conclusion = work?.conclusion?.trim() || review?.note?.trim() || void 0;
   const attempts = rows.map((d, i) => {
     const isLast = i === rows.length - 1;
-    const actorId = executorId ?? d.actorId;
+    const actorId = d.actorId ?? executorId;
     return {
       runId: d.id,
       at: d.createdAt,
       actor: ref2(actorId),
       ...isLast && conclusion ? { conclusion } : {},
-      artifacts: isLast && work ? artifactsOfWork(work.id) : []
+      artifacts: isLast && work ? artifactsOfWork(work, input) : []
     };
   });
   return { workorderId, cardId, briefing, attempts };
@@ -225430,6 +225784,8 @@ function buildWorkorderActivityTrace(input) {
 var init_activity_trace = __esm({
   "../server/src/domains/collab/activity-trace.ts"() {
     "use strict";
+    init_src4();
+    init_activity2();
     init_workorder_manager();
   }
 });
@@ -227283,10 +227639,7 @@ function collabDomain(opts) {
     const hit = cache.get(companyId);
     if (hit) return hit;
     const e = await opts.resolveEngine(companyId);
-    if (e.kernel === opts.kernel) {
-      cache.set(companyId, defaultCtx);
-      return defaultCtx;
-    }
+    const artifacts = opts.resolveArtifacts ? await opts.resolveArtifacts(companyId) : e.kernel === opts.kernel ? opts.artifacts : void 0;
     const ctx = {
       kernel: e.kernel,
       oplog: e.oplog,
@@ -227296,7 +227649,7 @@ function collabDomain(opts) {
       // ★ 产物旁存也要按公司取（见 resolveArtifacts 的注释）：漏了这一行，非默认公司的
       //   `/api/workorders/:id/files` 与 node_output 清单恒空——写侧写对了、读侧根本没接线。
       //   抛出来就抛出来：宁可 500 说"这家公司的数据面解析不了"，也不能回落默认公司的库。
-      ...opts.resolveArtifacts ? { artifacts: await opts.resolveArtifacts(companyId) } : {}
+      ...artifacts ? { artifacts } : {}
     };
     cache.set(companyId, ctx);
     return ctx;
@@ -227550,7 +227903,10 @@ function collabDomain(opts) {
           ...extra?.avatar ? { avatar: extra.avatar } : {}
         };
       };
-      const snap = engineStore ? await engineStore.transaction((tx) => tx.loadWorkorder(workorderId)) : null;
+      const [snap, events] = engineStore ? await engineStore.transaction(async (tx) => [
+        await tx.loadWorkorder(workorderId),
+        await tx.listEvents(workorderId, 0, ACTIVITY_EVENT_LIMIT, ACTIVITY_EVENT_KINDS)
+      ]) : [null, []];
       const manifestFiles = snap ? await resolveActivityManifestFiles(snap.artifacts, blobs) : void 0;
       const dispatches = await listDispatchRows(workorderId, opts.dispatchesOfWorkorder);
       return {
@@ -227559,6 +227915,7 @@ function collabDomain(opts) {
           workorderId,
           cardId,
           snap,
+          events,
           ref: ref2,
           ...dispatches ? { dispatches } : {},
           ...manifestFiles ? { manifestFiles } : {}
@@ -231108,42 +231465,17 @@ function mapChatItemToSnapshotEntry(row) {
     itemType,
     role,
     status,
-    itemVersion: row.turnVersion,
+    // ADR-0510 附录 A：版本轴 = 会话逻辑时钟（`chat_items.version`）。
+    // 此前这里填的是 `turnVersion`（轮级 resync 游标），而增量流填的是进程内每 item 计数——
+    // 两套编号空间，一轮中途拉快照就把随后每一帧判 stale，进 resync 死循环。
+    itemVersion: row.version,
     seq: row.seq,
+    ord: row.ord,
     messageId: row.messageId,
     updatedAt: row.updatedAt,
     payload: row.payload
   };
 }
-function synthesizeMessageItem(msg, seq) {
-  const attachments = Array.isArray(msg.attachments) ? msg.attachments.map((a) => ({
-    name: a.name,
-    ...a.blobRef !== void 0 ? { blobRef: a.blobRef } : {},
-    ...a.contentType !== void 0 ? { contentType: a.contentType } : {}
-  })) : void 0;
-  const clientSubmitId = msg.role === "user" ? msg.clientSubmitId ?? clientSubmitIdFromMessageKey(msg.messageKey) : void 0;
-  const role = msg.role === "user" || msg.role === "system" ? msg.role : "assistant";
-  const status = msg.status === "running" ? "streaming" : msg.status === "error" ? "failed" : "completed";
-  return {
-    // ADR-0510 D1：有 csid 就用**与账本 user item、前端乐观桶位同名**的身份；没有（历史行 / 老客户端）
-    // 才退回合成 id。三方同名，桶按 itemId 合并才闭环——否则同一条 user 消息画两个气泡。
-    itemId: clientSubmitId ? optimisticUserItemId(clientSubmitId) : `chat-message:${msg.id}`,
-    turnId: msg.runId ?? `chat-message-turn:${msg.id}`,
-    itemType: "message",
-    role,
-    status,
-    itemVersion: 0,
-    seq,
-    messageId: msg.id,
-    updatedAt: msg.completedAt ?? msg.createdAt,
-    payload: {
-      role,
-      text: msg.content ?? "",
-      ...attachments?.length ? { attachments } : {},
-      ...clientSubmitId ? { clientSubmitId } : {}
-    }
-  };
-}
 function throwWorkdirError(code2) {
   switch (code2) {
     case "PATH_ESCAPE":
@@ -231505,57 +231837,50 @@ function createChatSessionsDomain(opts) {
       if (!session || session.humanActorId !== req.auth.actor) throw new ApiError(404, "NOT_FOUND", "session not found");
       const chatSessionId = req.params.id;
       const sinceVersion = Math.max(0, Number(req.query?.get("sinceVersion") ?? "0") || 0);
+      const beforeOrdRaw = Number(req.query?.get("beforeOrd") ?? "0") || 0;
+      const beforeOrd = beforeOrdRaw > 0 ? beforeOrdRaw : void 0;
+      const limitRaw = Number(req.query?.get("limit") ?? "0") || 0;
+      const limit = limitRaw > 0 ? Math.min(limitRaw, MAX_SNAPSHOT_ITEMS) : DEFAULT_SNAPSHOT_ITEMS;
       const cursor = opts.liveChat?.cursorFor(chatSessionId) ?? null;
       let turnId = cursor?.turnId ?? null;
-      let inflightRunId = opts.liveChat?.runFor(chatSessionId) ?? null;
       if (!turnId) {
         const turns = await turnsFor(req);
         const active = turns ? await turns.activeTurn(chatSessionId).catch(() => null) : null;
         turnId = active?.id ?? null;
-        inflightRunId ??= active?.assistantRunId ?? null;
       }
       const snapshotEntries = [];
       let nextSinceVersion = sinceVersion;
-      if (turnId) {
-        const rows = await items.listItemsByTurn(chatSessionId, turnId, { sinceTurnVersion: sinceVersion }).catch(() => []);
+      let hasMoreBefore = false;
+      if (sinceVersion > 0) {
+        if (turnId) {
+          const rows = await items.listItemsByTurn(chatSessionId, turnId, { sinceTurnVersion: sinceVersion }).catch(() => []);
+          for (const row of rows) {
+            snapshotEntries.push(mapChatItemToSnapshotEntry(row));
+            if (row.turnVersion > nextSinceVersion) nextSinceVersion = row.turnVersion;
+          }
+        }
+      } else {
+        const rows = await items.listSessionItems(chatSessionId, {
+          limit,
+          ...beforeOrd !== void 0 ? { beforeOrd } : {}
+        }).catch(() => []);
+        hasMoreBefore = rows.length >= limit;
         for (const row of rows) {
           snapshotEntries.push(mapChatItemToSnapshotEntry(row));
           if (row.turnVersion > nextSinceVersion) nextSinceVersion = row.turnVersion;
         }
       }
-      const activeTurnItemIds = new Set(snapshotEntries.map((e) => e.itemId));
-      const HISTORY_TURNS = 12;
-      const historicalEntries = [];
-      if (sinceVersion === 0) {
-        const listRecentTurns2 = store2.listRecentTurns;
-        const messages = listRecentTurns2 ? (await listRecentTurns2.call(store2, chatSessionId, HISTORY_TURNS).catch(() => ({ messages: [], hasMoreBefore: false }))).messages : windowMessagesByTurns(await store2.listMessages(chatSessionId).catch(() => []), HISTORY_TURNS).messages;
-        let historySeq = 0;
-        for (const msg of messages) {
-          if (!msg.id) continue;
-          const rows = await items.listItemsByMessage(msg.id).catch(() => []);
-          const historical = turnId ? rows.filter((row) => row.turnId !== turnId) : rows;
-          if (rows.length > 0) {
-            for (const row of [...historical].sort((a, b2) => a.seq - b2.seq)) {
-              historySeq += 1;
-              historicalEntries.push({ ...mapChatItemToSnapshotEntry(row), seq: historySeq });
-            }
-            continue;
-          }
-          if (msg.role === "assistant" && msg.status === "running" && inflightRunId && msg.runId === inflightRunId) continue;
-          const synthesized = synthesizeMessageItem(msg, historySeq + 1);
-          if (activeTurnItemIds.has(synthesized.itemId)) continue;
-          historySeq += 1;
-          historicalEntries.push(synthesized);
-        }
-      }
+      const oldestOrd = snapshotEntries.find((e) => e.ord !== null)?.ord ?? null;
       const body2 = {
         chatSessionId,
         turnId,
-        // 历史合成条在前，active turn 的 chat_items 在后——顺序即桶排序，桶按 seq 单调排列。
-        items: [...historicalEntries, ...snapshotEntries],
+        // 已按 ord 升序——服务端给什么顺序，客户端就按 ord 排出什么顺序，两边同一把尺子。
+        items: snapshotEntries,
         nextSinceVersion,
         frameCursor: cursor ? { epoch: cursor.epoch, seq: cursor.seq } : { epoch: 0, seq: 0 },
-        canAppend: cursor?.canAppend ?? false
+        canAppend: cursor?.canAppend ?? false,
+        oldestOrd,
+        hasMoreBefore
       };
       return { status: 200, body: body2 };
     });
@@ -231908,7 +232233,7 @@ function createChatSessionsDomain(opts) {
     });
   };
 }
-var import_node_crypto59, WORKDIR_READ_MAX_BYTES;
+var import_node_crypto59, DEFAULT_SNAPSHOT_ITEMS, MAX_SNAPSHOT_ITEMS, WORKDIR_READ_MAX_BYTES;
 var init_chat_sessions = __esm({
   "../server/src/domains/chat-sessions/index.ts"() {
     "use strict";
@@ -231929,6 +232254,8 @@ var init_chat_sessions = __esm({
     init_workorder_terminal();
     init_session_workdir();
     init_project_bundle();
+    DEFAULT_SNAPSHOT_ITEMS = 400;
+    MAX_SNAPSHOT_ITEMS = 1e3;
     WORKDIR_READ_MAX_BYTES = 2 * 1024 * 1024;
   }
 });
@@ -236591,6 +236918,9 @@ function makeStoreCodeRepoResolver(deps) {
     }
   };
 }
+function makeCompanyCodeRepoResolver(storesFor) {
+  return async (ws, companyId) => makeStoreCodeRepoResolver(await storesFor(companyId)).resolveCodeRepo(ws);
+}
 var init_resolve = __esm({
   "../server/src/git/resolve.ts"() {
     "use strict";
@@ -237541,16 +237871,28 @@ var init_fused_signal_router = __esm({
   }
 });
+// ../storage/src/pg-ident.ts
+function quoteIdent2(name) {
+  if (!/^[A-Za-z0-9_][A-Za-z0-9_.-]*$/.test(name)) throw new Error(`invalid schema name: ${name}`);
+  return `"${name}"`;
+}
+var init_pg_ident = __esm({
+  "../storage/src/pg-ident.ts"() {
+    "use strict";
+  }
+});
 // ../storage/src/postgres.ts
 var import_node_crypto67, ident3, isUniqueViolation, PostgresOplogStore, PostgresBlobStore;
 var init_postgres = __esm({
   "../storage/src/postgres.ts"() {
     "use strict";
     import_node_crypto67 = require("node:crypto");
+    init_pg_ident();
     init_esm();
     init_src();
     ident3 = (s2) => {
-      if (!/^[a-z_][a-z0-9_]*$/.test(s2)) throw new Error(`invalid schema identifier: ${s2}`);
+      quoteIdent2(s2);
       return s2;
     };
     isUniqueViolation = (err) => typeof err === "object" && err !== null && err.code === "23505";
@@ -237772,7 +238114,9 @@ function rowToVariable(row) {
     updatedAt: new Date(row.updated_at).toISOString(),
     // ADR 凭据保险库补章 §D2.1：到期/取用时间戳（text 列存 ISO 字符串，原样带出；null/空 = undefined）。
     ...row.expires_at ? { expiresAt: row.expires_at } : {},
-    ...row.last_used_at ? { lastUsedAt: row.last_used_at } : {}
+    ...row.last_used_at ? { lastUsedAt: row.last_used_at } : {},
+    // 展示名（存量行没有 → 不带这一格，展示侧回落成 key）。
+    ...row.name ? { name: row.name } : {}
   };
 }
 var ident4, PostgresRegistryStore, rowToActor, rowToConfig, rowToAgentPrefs;
@@ -237780,9 +238124,10 @@ var init_postgres_registry = __esm({
   "../storage/src/postgres-registry.ts"() {
     "use strict";
     init_esm();
+    init_pg_ident();
     init_src();
     ident4 = (s2) => {
-      if (!/^[a-z_][a-z0-9_]*$/.test(s2)) throw new Error(`invalid schema name: ${s2}`);
+      quoteIdent2(s2);
       return s2;
     };
     PostgresRegistryStore = class _PostgresRegistryStore {
@@ -237938,6 +238283,7 @@ var init_postgres_registry = __esm({
         await pool.query(`ALTER TABLE IF EXISTS "${s2}".variables ADD COLUMN IF NOT EXISTS project_id text`);
         await pool.query(`ALTER TABLE IF EXISTS "${s2}".variables ADD COLUMN IF NOT EXISTS environment text`);
         await pool.query(`ALTER TABLE IF EXISTS "${s2}".variables ADD COLUMN IF NOT EXISTS delivery_mode text`);
+        await pool.query(`ALTER TABLE IF EXISTS "${s2}".variables ADD COLUMN IF NOT EXISTS name text`);
         await pool.query(`ALTER TABLE IF EXISTS "${s2}".variables ADD COLUMN IF NOT EXISTS expires_at text`);
         await pool.query(`ALTER TABLE IF EXISTS "${s2}".variables ADD COLUMN IF NOT EXISTS last_used_at text`);
         await pool.query(`DROP INDEX IF EXISTS "${s2}"."${s2}_variables_key_actor_uq"`);
@@ -238436,10 +238782,13 @@ var init_postgres_registry = __esm({
       /* ---------- 变量 ---------- */
       async putVariable(v2) {
         await this.pool.query(
-          `INSERT INTO ${this.s}.variables (key, scope, actor_id, project_id, connector_id, overrides, delivery_mode, value_encrypted, updated_at, expires_at)
-       VALUES ($1,$2,$3,$4,$5,$6,$7,$8,$9,$10)
+          /* `name` 走 COALESCE：**没传 = 不动**。连接器授权流程写变量时手上没有「名称」，
+             普通赋值会把人在密钥表单里填的名字抹掉——同 connectors.connected_by 那条。 */
+          `INSERT INTO ${this.s}.variables (key, scope, actor_id, project_id, connector_id, overrides, delivery_mode, value_encrypted, updated_at, expires_at, name)
+       VALUES ($1,$2,$3,$4,$5,$6,$7,$8,$9,$10,$11)
        ON CONFLICT (key, COALESCE(actor_id, ''), COALESCE(project_id, '')) DO UPDATE
-         SET scope=$2, actor_id=$3, project_id=$4, connector_id=$5, overrides=$6, delivery_mode=$7, value_encrypted=$8, updated_at=$9, expires_at=$10`,
+         SET scope=$2, actor_id=$3, project_id=$4, connector_id=$5, overrides=$6, delivery_mode=$7, value_encrypted=$8, updated_at=$9, expires_at=$10,
+             name=COALESCE($11, ${this.s}.variables.name)`,
           [
             v2.key,
             v2.scope,
@@ -238450,7 +238799,8 @@ var init_postgres_registry = __esm({
             v2.deliveryMode ?? null,
             v2.valueEncrypted,
             v2.updatedAt,
-            v2.expiresAt ?? null
+            v2.expiresAt ?? null,
+            v2.name ?? null
           ]
         );
       }
@@ -238546,17 +238896,6 @@ var init_postgres_registry = __esm({
   }
 });
-// ../storage/src/pg-ident.ts
-function quoteIdent2(name) {
-  if (!/^[A-Za-z0-9_][A-Za-z0-9_.-]*$/.test(name)) throw new Error(`invalid schema name: ${name}`);
-  return `"${name}"`;
-}
-var init_pg_ident = __esm({
-  "../storage/src/pg-ident.ts"() {
-    "use strict";
-  }
-});
 // ../storage/src/postgres-assistant-store.ts
 var ASSISTANT_LOCK_NAMESPACE, rowToBinding, rowToHistory, PostgresAssistantBindStore, PostgresHumanPrefsStore;
 var init_postgres_assistant_store = __esm({
@@ -238865,8 +239204,9 @@ var init_postgres_channels = __esm({
   "../storage/src/postgres-channels.ts"() {
     "use strict";
     init_esm();
+    init_pg_ident();
     ident5 = (s2) => {
-      if (!/^[a-z_][a-z0-9_]*$/.test(s2)) throw new Error(`invalid schema name: ${s2}`);
+      quoteIdent2(s2);
       return s2;
     };
     PostgresChannelStore = class _PostgresChannelStore {
@@ -239140,6 +239480,24 @@ var init_postgres_projects = __esm({
         const r = await this.pool.query(`SELECT * FROM ${this.s}.projects ORDER BY created_at`);
         return r.rows.map(rowToProject);
       }
+      /** 主行 + 三张子表一并删，一个事务里做完——四张表之间没有外键，分开删失败一半就留孤儿行。 */
+      async deleteProject(id) {
+        const client = await this.pool.connect();
+        try {
+          await client.query("BEGIN");
+          await client.query(`DELETE FROM ${this.s}.project_members WHERE project_id = $1`, [id]);
+          await client.query(`DELETE FROM ${this.s}.project_files WHERE project_id = $1`, [id]);
+          await client.query(`DELETE FROM ${this.s}.project_content_locations WHERE project_id = $1`, [id]);
+          await client.query(`DELETE FROM ${this.s}.projects WHERE id = $1`, [id]);
+          await client.query("COMMIT");
+        } catch (e) {
+          await client.query("ROLLBACK").catch(() => {
+          });
+          throw e;
+        } finally {
+          client.release();
+        }
+      }
       async replaceProjectMembers(projectId2, members) {
         const client = await this.pool.connect();
         try {
@@ -239934,8 +240292,9 @@ var init_postgres_control_plane = __esm({
   "../storage/src/postgres-control-plane.ts"() {
     "use strict";
     init_esm();
+    init_pg_ident();
     ident7 = (s2) => {
-      if (!/^[a-z_][a-z0-9_]*$/.test(s2)) throw new Error(`invalid schema name: ${s2}`);
+      quoteIdent2(s2);
       return s2;
     };
     PostgresControlPlaneStore = class _PostgresControlPlaneStore {
@@ -240860,11 +241219,12 @@ var ident8, mergeContinuityRefs3, PostgresTraceStore, rowToRun, terminalHandoffO
 var init_postgres_trace = __esm({
   "../storage/src/postgres-trace.ts"() {
     "use strict";
+    init_pg_ident();
     init_esm();
     init_src();
     init_pg_sanitize();
     ident8 = (s2) => {
-      if (!/^[a-z_][a-z0-9_]*$/.test(s2)) throw new Error(`invalid schema name: ${s2}`);
+      quoteIdent2(s2);
       return s2;
     };
     mergeContinuityRefs3 = (...lists) => {
@@ -242849,10 +243209,11 @@ var init_postgres_automations = __esm({
   "../storage/src/postgres-automations.ts"() {
     "use strict";
     init_esm();
+    init_pg_ident();
     init_postgres_chat_turns();
     init_src();
     ident10 = (s2) => {
-      if (!/^[a-z_][a-z0-9_]*$/.test(s2)) throw new Error(`invalid schema name: ${s2}`);
+      quoteIdent2(s2);
       return s2;
     };
     genId = (prefix) => `${prefix}_${Math.random().toString(36).slice(2, 12)}`;
@@ -244091,6 +244452,15 @@ var init_postgres_chat_sessions = __esm({
           args
         );
       }
+      /** 删项目时把本公司里绑到它的会话回落成「不指定项目」。会话一条都不删，只清 project_id。 */
+      async clearProjectBinding(projectId2) {
+        if (!projectId2) return 0;
+        const r = await this.pool.query(
+          `UPDATE ${this.s}.chat_sessions SET project_id = NULL WHERE project_id = $1 AND company_id = $2`,
+          [projectId2, this.companyId]
+        );
+        return r.rowCount ?? 0;
+      }
       async deleteSession(id) {
         if (!await this.scopedSessionExists(id)) return;
         await this.pool.query(`DELETE FROM ${this.s}.chat_messages WHERE session_id = $1`, [id]);
@@ -244914,12 +245284,15 @@ var init_postgres_chat_items = __esm({
             const r = await this.pool.query(
               `INSERT INTO ${this.s}.chat_items
              (id, session_id, message_id, turn_id, run_id, seq, kind, role, status,
-              version, turn_version, provider_item_key, payload, metadata, created_at, updated_at, completed_at)
+              version, turn_version, provider_item_key, payload, metadata, created_at, updated_at, ord, completed_at)
            SELECT $1, $2, $3, $4, $5,
                   COALESCE(MAX(c.seq), 0) + 1,
-                  $6, $7, $8::text, 0,
+                  $6, $7, $8::text, COALESCE($13::bigint, 0),
                   COALESCE(MAX(c.turn_version), 0) + 1,
                   $9, $10::jsonb, $11::jsonb, $12::timestamptz, $12::timestamptz,
+                  -- ord\uFF1A\u8D26\u672C\u9884\u6D3E\u4E86\u5C31\u7528\u5B83\uFF08\u5EFA\u884C\u5373\u6709\u53F7\u3001\u7B2C\u4E00\u5E27\u5C31\u80FD\u5E26\u4E0A wire\uFF09\uFF1B\u6CA1\u7ED9\u624D\u8D70\u5217 DEFAULT
+                  -- \u7684 nextval\u2014\u2014\u4E24\u6761\u8DEF\u53D6\u7684\u662F\u540C\u4E00\u6761\u8868\u7EA7\u5E8F\u5217\uFF0C\u8BED\u4E49\u76F8\u540C\uFF0C\u53EA\u5DEE\u62FF\u53F7\u53D1\u751F\u5728\u54EA\u4E00\u4FA7\u3002
+                  COALESCE($14::bigint, nextval('${this.s}.chat_items_ord_seq'::regclass)),
                   -- $12/$8 \u4E09\u5904\u90FD\u663E\u5F0F\u8F6C\u578B\uFF1A\u4E0D\u8F6C\u7684\u8BDD PG \u4F1A\u5728\u540C\u4E00\u6761\u8BED\u53E5\u91CC\u7ED9\u540C\u4E00\u4E2A\u53C2\u6570\u63A8\u51FA\u4E0D\u540C\u7C7B\u578B
                   -- \uFF08\u5217\u4F4D\u662F timestamptz/text\u3001CASE \u91CC\u662F unknown\uFF09\uFF0C\u76F4\u63A5\u62A5
                   -- inconsistent types deduced for parameter $12\u3002
@@ -244939,7 +245312,9 @@ var init_postgres_chat_items = __esm({
                 scrubPgString(input.providerItemKey ?? null),
                 payload,
                 metadata,
-                at
+                at,
+                input.version ?? null,
+                input.ord ?? null
               ]
             );
             return rowToItem(r.rows[0]);
@@ -244977,10 +245352,13 @@ var init_postgres_chat_items = __esm({
             setExpr = `status = $3::text, completed_at = CASE WHEN $3 IN ('completed','failed','interrupted') THEN $2::timestamptz ELSE c.completed_at END`;
             break;
         }
+        const versionParamIndex = args.length + 1;
+        args.push(opts?.version ?? null);
         const r = await this.pool.query(
           `UPDATE ${this.s}.chat_items c
           SET ${setExpr},
-              version = c.version + 1,
+              version = CASE WHEN $${versionParamIndex}::bigint IS NULL THEN c.version + 1
+                             ELSE GREATEST(c.version, $${versionParamIndex}::bigint) END,
               turn_version = ${bumpTurnVersion},
               updated_at = $2
         WHERE c.id = $1
@@ -245028,6 +245406,49 @@ var init_postgres_chat_items = __esm({
         );
         return r.rows.map((row) => rowToItem(row));
       }
+      /**
+       * 一条会话的 item，按展示序升序（ADR-0510 D3：历史的唯一出口）。
+       *
+       * 排序键 `(ord IS NULL) DESC, ord DESC` 的意思是「取最新的一段」：带号的行按号从大到小、
+       * 没号的存量行排在最后（= 最老）。截断之后再翻回升序返回。
+       * 走索引 `chat_items_session_ord_idx (session_id, ord)`。
+       */
+      async listSessionItems(sessionId, opts) {
+        const limit = Math.max(1, Math.min(opts?.limit ?? 500, 2e3));
+        const before = opts?.beforeOrd;
+        const r = before === void 0 ? await this.pool.query(
+          `SELECT * FROM ${this.s}.chat_items WHERE session_id = $1
+          ORDER BY (ord IS NULL) ASC, ord DESC, seq DESC LIMIT $2`,
+          [sessionId, limit]
+        ) : await this.pool.query(
+          `SELECT * FROM ${this.s}.chat_items WHERE session_id = $1 AND ord IS NOT NULL AND ord < $2
+          ORDER BY ord DESC LIMIT $3`,
+          [sessionId, before, limit]
+        );
+        const rows = r.rows.map((row) => rowToItem(row));
+        rows.reverse();
+        return rows.sort((a, b2) => {
+          if (a.ord === null && b2.ord === null) return a.seq - b2.seq;
+          if (a.ord === null) return -1;
+          if (b2.ord === null) return 1;
+          return a.ord - b2.ord;
+        });
+      }
+      async sessionVersionCursor(sessionId) {
+        const r = await this.pool.query(
+          `SELECT COALESCE(MAX(version), 0) AS v FROM ${this.s}.chat_items WHERE session_id = $1`,
+          [sessionId]
+        );
+        return Number(r.rows[0]?.v ?? 0);
+      }
+      async reserveOrds(count2) {
+        const n = Math.max(1, Math.min(Math.floor(count2), 1e3));
+        const r = await this.pool.query(
+          `SELECT nextval('${this.s}.chat_items_ord_seq'::regclass) AS ord FROM generate_series(1, $1)`,
+          [n]
+        );
+        return r.rows.map((row) => Number(row.ord));
+      }
       async turnCursor(sessionId, turnId) {
         const r = await this.pool.query(
           `SELECT COALESCE(MAX(seq), 0) + 1 AS next_seq, COALESCE(MAX(turn_version), 0) + 1 AS next_turn_version
@@ -245364,8 +245785,14 @@ function planSessionOrd(sessionId, messages, items, turns, opts) {
 }
 async function listChatItemsSchemas(pool) {
   const r = await pool.query(
-    `SELECT n.nspname AS s FROM pg_class c JOIN pg_namespace n ON n.oid = c.relnamespace
-      WHERE c.relname = 'chat_items' AND c.relkind = 'r' ORDER BY 1`
+    `SELECT n.nspname AS s
+       FROM pg_class c
+       JOIN pg_namespace n ON n.oid = c.relnamespace
+      WHERE c.relname = 'chat_items' AND c.relkind = 'r'
+        AND (SELECT count(*) FROM information_schema.columns col
+              WHERE col.table_schema = n.nspname AND col.table_name = 'chat_items'
+                AND col.column_name IN ('session_id', 'turn_id', 'seq', 'kind', 'payload')) = 5
+      ORDER BY 1`
   );
   return r.rows.map((x2) => x2.s);
 }
@@ -245959,9 +246386,10 @@ var init_postgres_nodes = __esm({
   "../storage/src/postgres-nodes.ts"() {
     "use strict";
     import_node_crypto68 = require("node:crypto");
+    init_pg_ident();
     init_esm();
     ident12 = (s2) => {
-      if (!/^[a-z_][a-z0-9_]*$/.test(s2)) throw new Error(`invalid schema name: ${s2}`);
+      quoteIdent2(s2);
       return s2;
     };
     PostgresNodeStore = class _PostgresNodeStore {
@@ -246226,8 +246654,9 @@ var init_postgres_model_prices = __esm({
   "../storage/src/postgres-model-prices.ts"() {
     "use strict";
     init_esm();
+    init_pg_ident();
     ident13 = (s2) => {
-      if (!/^[a-z_][a-z0-9_]*$/.test(s2)) throw new Error(`invalid schema name: ${s2}`);
+      quoteIdent2(s2);
       return s2;
     };
     PostgresModelPriceStore = class _PostgresModelPriceStore {
@@ -246437,10 +246866,11 @@ var init_postgres_actor_memory = __esm({
   "../storage/src/postgres-actor-memory.ts"() {
     "use strict";
     import_node_crypto69 = require("node:crypto");
+    init_pg_ident();
     init_src();
     matchClause = (q2) => q2.requireMatch && q2.keywords.length > 0 ? " WHERE m > 0" : "";
     ident14 = (s2) => {
-      if (!/^[a-z_][a-z0-9_]*$/.test(s2)) throw new Error(`invalid schema name: ${s2}`);
+      quoteIdent2(s2);
       return s2;
     };
     PostgresActorMemoryStore = class _PostgresActorMemoryStore {
@@ -246746,9 +247176,10 @@ var init_postgres_inbox_read = __esm({
   "../storage/src/postgres-inbox-read.ts"() {
     "use strict";
     init_esm();
+    init_pg_ident();
     SEED_MARKER_ACTOR = "actor:system";
     ident15 = (s2) => {
-      if (!/^[a-z_][a-z0-9_]*$/.test(s2)) throw new Error(`invalid schema name: ${s2}`);
+      quoteIdent2(s2);
       return s2;
     };
     PostgresReadMarkerStore = class _PostgresReadMarkerStore {
@@ -252000,10 +252431,11 @@ var init_postgres_knowledge = __esm({
   "../storage/src/postgres-knowledge.ts"() {
     "use strict";
     init_esm();
+    init_pg_ident();
     init_pg_sanitize();
     init_knowledge_snapshot_crypto();
     ident17 = (value2) => {
-      if (!/^[a-z_][a-z0-9_]*$/.test(value2)) throw new Error(`invalid schema name: ${value2}`);
+      quoteIdent2(value2);
       return value2;
     };
     TABLES = [
@@ -255625,6 +256057,36 @@ async function startServe(opts) {
         projectId2,
         afterName
       );
+    },
+    /**
+     * 删项目后的跨域清理（发起人 2026-09-09 拍板的口径里，projects 域自己管不到的那两件）：
+     *   ① 绑到该项目的会话 `project_id` 置空 —— 会话一条都不删，回到「不指定项目」。不清的话
+     *      项目 chip 会按既定口径显示一串裸项目 id（`pages/chat/FRAME-DATA-MAP.md`）。
+     *   ② 该项目作用域下的变量/密钥删掉 —— 项目没了，`resolveProjectVariables` 再也解析不到它们，
+     *      留着只是一堆谁也读不到的明文凭据。
+     * 与改名钩子同款：`chatStoreFor` / `engineRouter` 的 const 都在本域构造之后，所以只能在
+     * handler 体内（删除发生时）解析，不能在工厂里提前引用——那会撞 TDZ。
+     */
+    onProjectDeletedFor: (companyId) => async ({ projectId: projectId2 }) => {
+      const failures = [];
+      try {
+        const sessions = await chatStoreFor(companyId);
+        if (sessions.clearProjectBinding) await sessions.clearProjectBinding(projectId2);
+        else failures.push("\u4F1A\u8BDD store \u4E0D\u652F\u6301 clearProjectBinding\uFF0C\u4F1A\u8BDD\u7684\u9879\u76EE\u7ED1\u5B9A\u672A\u6E05");
+      } catch (e) {
+        failures.push(`\u6E05\u4F1A\u8BDD\u9879\u76EE\u7ED1\u5B9A\u5931\u8D25\uFF1A${e instanceof Error ? e.message : String(e)}`);
+      }
+      try {
+        const registry2 = companyId && pgPool ? (await engineRouter.getEngine(companyId)).registry : registryStore;
+        if (registry2.resolveProjectVariables) {
+          for (const row of await registry2.resolveProjectVariables(projectId2)) {
+            await registry2.deleteVariable(row.key, void 0, { projectId: projectId2 });
+          }
+        }
+      } catch (e) {
+        failures.push(`\u6E05\u9879\u76EE\u53D8\u91CF\u5931\u8D25\uFF1A${e instanceof Error ? e.message : String(e)}`);
+      }
+      if (failures.length) throw new Error(failures.join("\uFF1B"));
     }
   });
   const currentArtifactProjection = async () => {
@@ -256611,6 +257073,16 @@ async function startServe(opts) {
     if (!stores.artifacts) throw new Error(`[work-order-files] \u516C\u53F8 ${companyId} \u6CA1\u6709 artifacts store\uFF0C\u62D2\u7EDD\u56DE\u843D\u9ED8\u8BA4\u516C\u53F8`);
     return stores.artifacts;
   };
+  const projectStateFor = async (companyId) => {
+    if (!chatStoreRouter) return projectStateStore;
+    const stores = await chatStoreRouter.open(companyId, "work-order-projects");
+    if (!stores.projects) throw new Error(`[work-order-projects] \u516C\u53F8 ${companyId} \u6CA1\u6709 projects store\uFF0C\u62D2\u7EDD\u56DE\u843D\u9ED8\u8BA4\u516C\u53F8`);
+    return stores.projects;
+  };
+  const resolveCompanyCodeRepo = makeCompanyCodeRepoResolver(async (companyId) => ({
+    projects: await projectStateFor(companyId),
+    bindings: await artifactStateFor(companyId)
+  }));
   if (pgDsn && pgPool && chatStoreRouter) {
     const router = chatStoreRouter;
     void (async () => {
@@ -256799,7 +257271,6 @@ async function startServe(opts) {
     }
     return token;
   };
-  let resolveCodeRepoRef;
   let coordinatorRef = null;
   let coordinatorSpawnProbe = null;
   const dispatchTimers = /* @__PURE__ */ new Set();
@@ -256959,9 +257430,9 @@ async function startServe(opts) {
     port: opts.port ?? 7320,
     projectState: projectStateStore,
     artifactState: artifactStateStore,
-    // 建单交接的 `work_order_files` 按**当前公司**落库；与 collab 读侧 `resolveArtifacts` 同一个闭包。
+    // 建单的项目校验、绑定与输入文件按当前公司落库；与项目/任务读侧使用同一个 router。
     // 装了路由（有 PG）才给——dev 文件模式没有 schema 概念，沿用上面那个单实例。
-    ...chatStoreRouter ? { artifactStateFor } : {},
+    ...chatStoreRouter ? { artifactStateFor, projectStateFor } : {},
     schema,
     registry: registryStore,
     // 会话级模型覆盖的候选清单：与 `GET /api/runtimes/:id/models` **同一份**实现
@@ -257031,7 +257502,7 @@ async function startServe(opts) {
       });
       return { plannerActor: planner.id, text: chunks.join("") };
     },
-    resolveCodeRepo: (ws) => resolveCodeRepoRef?.(ws) ?? null,
+    resolveCodeRepo: resolveCompanyCodeRepo,
     // propose sha 校验兼镜像根：verifyExternalPinSha 在 ls-remote 未命中（祖先提交）时 `git fetch <remote> <sha>`
     // 进此目录留档（校验即留档，见 git/collect.ts）。目录按需 `init --bare`。（历史：曾是合并器/CI 闸的 git-mirrors 根，已删。）
     gitMirrorRoot: path29.join(opts.dir, "propose-mirrors"),
@@ -257108,8 +257579,8 @@ async function startServe(opts) {
       collabDomain({
         kernel: defaultCompanyKernel,
         oplog,
-        blobs,
-        // 诊断 3e3219e4-22bb19e4 §②：详情页取 seed brief head 正文作页头真源 + overview 写入口
+        blobs: engine.blobs,
+        // 页头正文读写与内容接口同源：默认公司的事实柜。
         // 资产柜：POST /api/workorders/:id/files 上传字节落这里（与 uploadChatAttachment 同一柜），
         // 再让 artifacts.addWorkOrderFile 写行——手动上传不进 oplog / events，删了不伤重放。
         assets,
@@ -259128,11 +259599,10 @@ async function startServe(opts) {
   for (const w2 of projectsCfg?.workspaces ?? []) {
     await artifactStateStore.upsertWorkspaceBinding({ workOrderId: w2.id, projectId: w2.projectId });
   }
-  const { resolveCodeRepo, resolveProject } = makeStoreCodeRepoResolver({
+  const { resolveProject } = makeStoreCodeRepoResolver({
     projects: projectStateStore,
     bindings: artifactStateStore
   });
-  resolveCodeRepoRef = resolveCodeRepo;
   if (opts.dispatch) {
     const startDispatcher = (companyId, companyEngine) => {
       if (dispatchers.has(companyId)) return;
@@ -259408,8 +259878,7 @@ async function startServe(opts) {
         } : {},
         schema: liveSchemaMap,
         // 活视图：类型目录变更后由 rebuildLiveSchema 原地重填（Dispatcher 每轮现读 opts.schema）
-        resolveCodeRepo,
-        // §4/C：异步从权威源（store）解析；dispatcher 装配前 await
+        resolveCodeRepo: (ws) => resolveCompanyCodeRepo(ws, companyId),
         // #2 派单开关：工单"待派发"（控制面旁存标 held）时不派其活。held 集通常空、表极小，每次查可接受。
         resolveDispatchHold: async (ws) => (await artifactStateStore.listWorkspaceDispatchHeld()).includes(ws),
         // §D3 评审人连续性：锁定审核人不可用（熔断/离岗）→ 系统身份幂等升级，交管理者改派（不静默换人）。
@@ -260631,7 +261100,7 @@ ${nodeFault}` : "");
       log: (m2) => console.log(m2),
       batchLimit: envNum("OASIS_AUTOMATION_EVENT_BATCH", 200),
       // 工单→项目绑定是合法薄旁存（B5），不是内核事实——列项目下的工单只认它。
-      listProjectWorkspaces: async ({ projectId: projectId2 }) => (await artifactStateStore.listWorkspaceBindings()).filter((b2) => b2.projectId === projectId2).map((b2) => b2.workOrderId),
+      listProjectWorkspaces: async ({ companyId, projectId: projectId2 }) => (await (await artifactStateFor(companyId)).listWorkspaceBindings()).filter((b2) => b2.projectId === projectId2).map((b2) => b2.workOrderId),
       // 完成判据必须复用 D3 resolver（不复制 deriveStage），且与成员快照同一次读取。
       // ensureTracked：内核跟踪集只在启动时装载一次、此后只随本进程写入增长——多实例部署下，
       // 另一实例建出来的工单在这里会被读成 unknown（既不触发也不留痕，QA OBS-1 实测）。
@@ -260642,7 +261111,7 @@ ${nodeFault}` : "");
         return makeAutomationWorkorderSnapshotResolver(engine2.kernel)(workspace);
       },
       // 触发时复查归因主体的项目读取权（与配置期同一口径）。
-      projectReadable: async ({ projectId: projectId2 }) => await projectStateStore.getProject(projectId2) !== null
+      projectReadable: async ({ companyId, projectId: projectId2 }) => await (await projectStateFor(companyId)).getProject(projectId2) !== null
     });
     automationEventTimer = setInterval(() => {
       void eventPoller.tick().catch((err) => console.error(`[project-event-poller] tick \u5931\u8D25: ${String(err)}`));
@@ -267871,7 +268340,7 @@ function shimScript() {
 }
 // src/index.ts
-var PKG_VERSION = true ? "2.2.1" : "dev";
+var PKG_VERSION = true ? "2.2.2" : "dev";
 var LOCAL_BIN = localBin();
 var NPM_PREFIX = npmPrefix();
 var INSTANCE = DEFAULT_INSTANCE;