oasis_test_v2 2.2.9 → 2.2.10

package/dist/index.js

@@ -665,7 +665,20 @@ function isAgentAvatarPresetRef(ref2) {
   const id = ref2.slice(AGENT_AVATAR_PRESET_PREFIX.length);
   return AGENT_AVATAR_PRESET_IDS.includes(id);
 }
-var AGENT_AVATAR_PRESET_PREFIX, AGENT_AVATAR_LEGACY_PRESET_IDS, AGENT_AVATAR_V2_PRESET_IDS, AGENT_AVATAR_PRESET_IDS, SYSTEM_AVATAR_REF;
+function humanAvatarToneOf(seed) {
+  let hash2 = 2166136261;
+  for (const ch of seed.trim()) {
+    hash2 = Math.imul(hash2 ^ (ch.codePointAt(0) ?? 0), 16777619) >>> 0;
+  }
+  return hash2 % HUMAN_AVATAR_TONE_COUNT;
+}
+function humanAvatarPresetRef(tone) {
+  return `${HUMAN_AVATAR_PRESET_PREFIX}${tone}`;
+}
+function defaultHumanAvatarRef(actorId) {
+  return humanAvatarPresetRef(humanAvatarToneOf(actorId));
+}
+var AGENT_AVATAR_PRESET_PREFIX, AGENT_AVATAR_LEGACY_PRESET_IDS, AGENT_AVATAR_V2_PRESET_IDS, AGENT_AVATAR_PRESET_IDS, SYSTEM_AVATAR_REF, HUMAN_AVATAR_PRESET_PREFIX, HUMAN_AVATAR_TONE_COUNT;
 var init_avatar = __esm({
   "../contract/src/avatar.ts"() {
     "use strict";
@@ -696,6 +709,8 @@ var init_avatar = __esm({
       ...AGENT_AVATAR_V2_PRESET_IDS
     ];
     SYSTEM_AVATAR_REF = "preset:system";
+    HUMAN_AVATAR_PRESET_PREFIX = "preset:human:";
+    HUMAN_AVATAR_TONE_COUNT = 8;
   }
 });
 
@@ -905,7 +920,17 @@ var init_link_windows = __esm({
       /** orphan-sweep 判「账上在跑、四张认领表都不认」为孤儿的宽限（`serve.ts`）。 */
       orphanGraceMs: 12e4,
       /** orphan-sweep 在 serve 冷启动后推迟判孤儿的窗口（`serve.ts`）。 */
-      orphanColdStartGraceMs: 18e4
+      orphanColdStartGraceMs: 18e4,
+      /**
+       * `/items` 读时把「账上还 running、本进程 live 注册表里却没有」的一轮**显示**成 `interrupted`
+       * 的宽限（ADR-0510 D6 表格第二行）。
+       *
+       * 取值必须 **≥ {@link LINK_WINDOWS.orphanGraceMs}**：这条判定只写 wire、不写账本，它的作用是
+       * 让页面别在权威扫描还没开始看的时候就一直转圈；但它也**不该比权威更早下结论**——早于
+       * `orphanGraceMs` 就等于拿时间当判据抢在核实前面说话（ADR-0166）。两个数写在同一处，
+       * 谁单边调参 `tests/adr-0300-link-windows.test.ts` 当场变红。
+       */
+      chatTurnPhaseStaleAfterMs: 12e4
     };
   }
 });
@@ -914,12 +939,16 @@ var init_link_windows = __esm({
 function isSystemActorId(id) {
   return typeof id === "string" && id.startsWith(SYSTEM_ACTOR_ID_PREFIX);
 }
-var SYSTEM_ACTOR_ID_PREFIX, SYSTEM_ACTOR_DISPLAY_NAME, AGENT_PREFS_DEFAULTS, SkillOwnedByAnotherCompanyError;
+function isHumanActorId(id) {
+  return typeof id === "string" && id.startsWith(HUMAN_ACTOR_ID_PREFIX);
+}
+var SYSTEM_ACTOR_ID_PREFIX, SYSTEM_ACTOR_DISPLAY_NAME, HUMAN_ACTOR_ID_PREFIX, AGENT_PREFS_DEFAULTS, SkillOwnedByAnotherCompanyError;
 var init_registry = __esm({
   "../contract/src/registry.ts"() {
     "use strict";
     SYSTEM_ACTOR_ID_PREFIX = "actor:system";
     SYSTEM_ACTOR_DISPLAY_NAME = "\u7CFB\u7EDF";
+    HUMAN_ACTOR_ID_PREFIX = "actor:human:";
     AGENT_PREFS_DEFAULTS = { memoryEnabled: true };
     SkillOwnedByAnotherCompanyError = class extends Error {
       constructor(skillId, companyId) {
@@ -5560,6 +5589,7 @@ CREATE TABLE IF NOT EXISTS ${q2}.work_artifacts (
   content_kind text NOT NULL CHECK (content_kind IN ('inline','external','manifest')),
   ordinal      integer,
   created_at   timestamptz NOT NULL,
+  content_edited_at timestamptz,
   UNIQUE (work_id, logical_path)
 );
 CREATE INDEX IF NOT EXISTS work_artifacts_node_idx ON ${q2}.work_artifacts (node_id);
@@ -5725,6 +5755,9 @@ ALTER TABLE ${q2}.works   ADD COLUMN IF NOT EXISTS proposal_reason text;
 -- \u2605 \u8FD0\u884C\u6D3B\u8DC3\u5FC3\u8DF3\uFF1Av2 submit_output / work.conclude \u5199\u5165\uFF1Bscan \u8D85\u65F6\u4EE5\u5B83\u8D77\u7B97\uFF08work \u751F\u547D\u5468\u671F\u5EF6\u957F\u540E
 --   30min \u949F\u4E0D\u80FD\u518D\u7F69\u6B7B\u6574\u4E2A\u4F1A\u8BDD\uFF09\u3002\u5B58\u91CF\u4E3A NULL \u2192 \u56DE\u9000 started_at/created_at\uFF0C\u884C\u4E3A\u4E0D\u53D8\u3002
 ALTER TABLE ${q2}.works   ADD COLUMN IF NOT EXISTS last_activity_at timestamptz;
+-- \u4EA7\u7269\u6B63\u6587\u5C31\u5730\u6539\u5199\uFF08work.content_edited\uFF09\u7684\u65F6\u523B\u3002\u5C31\u5730\u6539\u5199\u4E0D\u65B0\u5F00 work\u3001\u4E0D\u94F8\u65B0\u7248\uFF0C
+-- \u6CA1\u6709\u8FD9\u4E00\u5217\uFF0C\u300C\u76F8\u5173\u6587\u4EF6\u300D\u8868\u7684\u65F6\u95F4\u5217\u5C31\u53EA\u80FD\u505C\u5728\u9A8C\u6536\u65F6\u523B\u3002\u5B58\u91CF\u884C\u4E3A NULL = \u4ECE\u672A\u88AB\u6539\u5199\u8FC7\u3002
+ALTER TABLE ${q2}.work_artifacts ADD COLUMN IF NOT EXISTS content_edited_at timestamptz;
 -- \u2605 \u51BB\u7ED3\u6765\u4FE1\u96C6\u5408\uFF08\u8BA1\u5212 \xA76.5\uFF0C\u9636\u6BB5 E\uFF09\uFF1Awork.create \u6309 reasons \u7684 issue \u9879\u51BB\u7ED3\u7684 issue id \u6279\u6B21\uFF08jsonb \u6570\u7EC4\uFF09\u3002
 --   reply \u5F52\u5C5E/\u9500\u8D26/\u5BA1\u8BA1\u53EA\u8BA4\u5B83\uFF0C\u4E0D\u9760\u65F6\u95F4\u7A97\u731C\u6D4B\u3002\u5B58\u91CF\u4E3A NULL\uFF08\u65E0\u6279\u6B21\u8BED\u4E49\uFF09\u3002
 ALTER TABLE ${q2}.works   ADD COLUMN IF NOT EXISTS frozen_issue_ids jsonb;
@@ -11388,7 +11421,11 @@ var init_store_postgres = __esm({
             contentRef: a.content_ref,
             contentKind: a.content_kind,
             ordinal: a.ordinal,
-            createdAt: iso(a.created_at)
+            createdAt: iso(a.created_at),
+            // 只在真被改写过时才带这个键：从未改写的行在内存态里是**没有这个字段**的，
+            // PG 回读时补一个 `null` 会让「事件重放出来的态」和「从库里读出来的态」深比不相等
+            // （packages/engine/tests/store-conformance.postgres.test.ts 就是钉这条一致性的）。
+            ...iso(a.content_edited_at) ? { contentEditedAt: iso(a.content_edited_at) } : {}
           })),
           workInputs: inputs.rows.map((i) => ({
             workId: i.work_id,
@@ -11623,9 +11660,9 @@ var init_store_postgres = __esm({
               for (const a of m2.rows) {
                 await this.c.query(
                   `INSERT INTO ${this.s}.work_artifacts
-               (id,work_id,node_id,type,name,logical_path,content_ref,content_kind,ordinal,created_at)
-               VALUES ($1,$2,$3,$4,$5,$6,$7,$8,$9,$10) ON CONFLICT (id) DO NOTHING`,
-                  [a.id, a.workId, a.nodeId, a.type, a.name, a.logicalPath, a.contentRef, a.contentKind, a.ordinal, a.createdAt]
+               (id,work_id,node_id,type,name,logical_path,content_ref,content_kind,ordinal,created_at,content_edited_at)
+               VALUES ($1,$2,$3,$4,$5,$6,$7,$8,$9,$10,$11) ON CONFLICT (id) DO NOTHING`,
+                  [a.id, a.workId, a.nodeId, a.type, a.name, a.logicalPath, a.contentRef, a.contentKind, a.ordinal, a.createdAt, a.contentEditedAt ?? null]
                 );
               }
               break;
@@ -12626,7 +12663,7 @@ var init_work = __esm({
     workContentEdited = {
       name: "work/content-edited",
       kind: "work.content_edited",
-      apply(e, state) {
+      apply(e, state, ctx) {
         const work = state.work(e.workId);
         if (!work) return;
         const node2 = state.node(work.nodeId);
@@ -12634,7 +12671,7 @@ var init_work = __esm({
         const artifacts = state.artifactsOf(e.workId);
         const target = artifacts.find((a) => a.id === e.artifactId);
         if (!target || target.contentRef !== e.previousRef || target.contentKind === "external") return;
-        state.replaceArtifacts(e.workId, artifacts.map((a) => a.id === target.id ? { ...a, contentRef: e.contentRef } : a));
+        state.replaceArtifacts(e.workId, artifacts.map((a) => a.id === target.id ? { ...a, contentRef: e.contentRef, contentEditedAt: ctx.at } : a));
       }
     };
     workConclude = {
@@ -28739,9 +28776,22 @@ var init_chat_item_ledger = __esm({
           ...deterministicId ? { deterministicId } : {}
         });
       }
-      /** 服务端合成的错误帧（session.done 抛 / exit 判失败）。不入正文，归 control。 */
+      /**
+       * 服务端合成的错误帧（session.done 抛 / exit 判失败）。不入正文，归 control。
+       *
+       * **返回 outcome 是为了让调用方把它推上 v3 流**（ADR-0510 D5/D6，2026-09-10 修）。
+       * 在此之前这条行只落库、不发帧：客户端在这一轮里唯一收到的终态信号是 `emitV3TurnTerminal`
+       * 发的 `turn_failed`，而那一帧不带任何正文、客户端的 `applyFrame` 又明说「不建 item、
+       * 仅推进 frameSeq」——于是失败原因整条飞不到还开着的页面上，只有下一次 `/items` 快照
+       * 才补得上。生产现场（v2.openfriday.ai，2026-09-10 05:39 那一轮）：runtime 报
+       * 「401 Authentication Fails」，库里三处都记着，页面上从头到尾是空的。
+       *
+       * 号取的是**建行时那两格钟**（`startedVersion` 给 wire 的 `started` 帧、`version` 给这一行
+       * 本身的写），与 provider item 走 {@link ChatItemLedger.apply} 那条路逐字同构——
+       * 快照与增量流因此还是同一套版本空间。
+       */
       recordError(text5, extra) {
-        this.insert({
+        const id = this.insert({
           kind: "control",
           role: "assistant",
           status: "failed",
@@ -28757,6 +28807,8 @@ var init_chat_item_ledger = __esm({
             ...extra?.detail ? { detail: extra.detail } : {}
           }
         });
+        const row = this.rows.get(id);
+        return { itemId: id, version: row.wireVersion, startedVersion: row.startedVersion, ord: row.ord };
       }
       /**
        * 回灌重启前已经落库的那段正文（`chat-recovery` 重挂 / 迟到对账用）。
@@ -159835,6 +159887,7 @@ var init_live_chat = __esm({
           },
           emitLive: (event) => this.emitLive(turn, event),
           applyNormalizedEvent: (event) => this.applyNormalizedEvent(turn, event),
+          publishServerItem: (item) => this.publishServerItem(turn, item),
           subscribe: (sub) => {
             turn.subscribers.add(sub);
             return () => {
@@ -159981,6 +160034,45 @@ var init_live_chat = __esm({
         };
         this.publishV3Coalesced(turn, frame);
       }
+      /**
+       * 服务端合成 item → 两帧（`started` + 终态），与 {@link emitV3} 给 provider item 发的那两帧
+       * **逐字同构**：先用建行预留的那一格发 `started`（客户端以它为该 item 首次亮相、payload 首次成形），
+       * 再用这一行本身的写号发 `completed` / `failed`。
+       *
+       * 为什么不学 {@link publishUserItem} 用一帧 `set_text`：那条路是给「一次性成形的**正文**」用的，
+       * 落在客户端桶里 `status` 恒为 `streaming`——用户那条消息无所谓，失败收尾的 control 行却必须是
+       * 终态，否则这一轮在客户端看来永远没关。
+       */
+      publishServerItem(turn, item) {
+        if (turn.status !== "running") return;
+        const perItem = turn.v3Items.get(item.itemId) ?? { textOffset: 0, started: false };
+        const ord = turn.items?.ordFor(item.itemId) ?? item.ord ?? void 0;
+        const base = {
+          protocolVersion: 3,
+          streamId: turn.liveStreamId,
+          turnId: this.wireTurnId(turn),
+          itemId: item.itemId,
+          itemType: item.itemType,
+          ...ord !== void 0 ? { ord } : {},
+          offset: 0
+        };
+        if (!perItem.started && item.startedVersion !== void 0) {
+          this.publishV3Coalesced(turn, {
+            ...base,
+            operation: "started",
+            itemVersion: item.startedVersion,
+            payload: item.payload
+          });
+          perItem.started = true;
+        }
+        turn.v3Items.set(item.itemId, perItem);
+        this.publishV3Coalesced(turn, {
+          ...base,
+          operation: item.status === "failed" ? "failed" : "completed",
+          itemVersion: item.version,
+          payload: item.payload
+        });
+      }
       assignV3Seq(turn, frame) {
         return { ...frame, epoch: turn.liveEpoch, seq: ++turn.v3Seq };
       }
@@ -160118,11 +160210,17 @@ var init_live_chat = __esm({
         const frame = {
           protocolVersion: 3,
           streamId: turn.liveStreamId,
-          turnId: turn.liveTurnId,
+          // 账本轮次 id，与 item 帧同一套（#1249 把 emitV3 改成了 wireTurnId，收尾帧当时漏了）。
+          // 客户端此前把收尾帧整条丢弃（`applyFrame`：「不建 item，仅推进 frameSeq」），所以这个
+          // 号是对是错都看不出来；相位一挂上去它就得对——否则相位会记到一个桶里根本不存在的 turnId 上。
+          turnId: this.wireTurnId(turn),
           itemId: `oasis-turn:${turn.liveEpoch}:${status}`,
           itemType: "control",
           operation,
           itemVersion: 0,
+          // 相位被携带，不被推导（ADR-0510 D6）：这一轮到底是成了还是败了，服务端此刻知道，
+          // 客户端替换即可，不用再去把一轮里每条 item 的 status 取或来猜。
+          phase: status === "done" ? "succeeded" : "failed",
           epoch: turn.liveEpoch,
           seq: ++turn.v3Seq
         };
@@ -162356,14 +162454,25 @@ var init_planner = __esm({
 function systemActorFallback(id) {
   return isSystemActorId(id) ? { name: SYSTEM_ACTOR_DISPLAY_NAME, avatar: SYSTEM_AVATAR_REF } : void 0;
 }
+function defaultAvatarRefOf(id, kind) {
+  if (kind === "system" || isSystemActorId(id)) return SYSTEM_AVATAR_REF;
+  if (kind === "human" || isHumanActorId(id)) return defaultHumanAvatarRef(id);
+  return void 0;
+}
 function actorRefFieldsOf(a) {
-  const avatar = a.avatar ?? (a.kind === "system" ? SYSTEM_AVATAR_REF : void 0);
+  const avatar = a.avatar ?? defaultAvatarRefOf(a.id, a.kind);
   return {
     name: a.name,
     ...a.roles[0] ? { role: a.roles[0] } : {},
     ...avatar ? { avatar } : {}
   };
 }
+function actorRefFallbackOf(id) {
+  const system = systemActorFallback(id);
+  if (system) return system;
+  const avatar = defaultAvatarRefOf(id);
+  return avatar ? { avatar } : void 0;
+}
 function overviewRootIdOf(arts) {
   const roots = arts.filter((a) => a.inputs.length === 0);
   if (roots.length <= 1) return roots[0]?.id;
@@ -198960,8 +199069,11 @@ var init_github = __esm({
         sessionEnv.set("GH_CONFIG_DIR", configDir);
         const appSlug = credentials["app_slug"];
         if (appSlug) sessionEnv.set("GH_APP_SLUG", appSlug);
-        const botEmail = credentials["app_bot_email"] ?? "";
-        const botName = credentials["app_bot_name"] ?? "";
+        const rawBotEmail = credentials["app_bot_email"] ?? "";
+        const rawBotName = credentials["app_bot_name"] ?? "";
+        const staleBot = Boolean(appSlug && rawBotEmail && !rawBotEmail.includes(`+${appSlug}[bot]@`));
+        const botEmail = staleBot ? "" : rawBotEmail;
+        const botName = staleBot ? appSlug ? `${appSlug}[bot]` : "" : rawBotName;
         const signName = botName || name;
         sessionEnv.set("GIT_AUTHOR_NAME", signName);
         sessionEnv.set("GIT_AUTHOR_EMAIL", botEmail);
@@ -201251,10 +201363,8 @@ async function adoptGithubApp(store, args, deps = {}) {
   await put3("GITHUB_APP_TOKEN_EXPIRES_AT", String(minted.expiresAtMs), false);
   if (args.slug) {
     const bot = await fetchAppBotIdentity(args.slug, { token: minted.token }, deps);
-    if (bot) {
-      await put3("GITHUB_APP_BOT_EMAIL", bot.email, false);
-      await put3("GITHUB_APP_BOT_NAME", bot.login, false);
-    }
+    await put3("GITHUB_APP_BOT_EMAIL", bot?.email ?? "", false);
+    await put3("GITHUB_APP_BOT_NAME", bot?.login ?? `${args.slug}[bot]`, false);
   }
   return {
     account: args.slug ? `${args.slug}[bot]` : args.appId,
@@ -201922,7 +202032,7 @@ async function draftActorResolver(registry2) {
   const byId = new Map(actors.map((a) => [a.id, a]));
   return (id) => {
     const a = byId.get(id);
-    return a ? actorRefFieldsOf(a) : systemActorFallback(id);
+    return a ? actorRefFieldsOf(a) : actorRefFallbackOf(id);
   };
 }
 async function draftRoleStaffingResolver(registry2) {
@@ -203154,18 +203264,27 @@ async function runView(kernel, oplog, engineStore, blobs, name, artifactId, para
       );
       const pendingGate = pendingConcludeAttempt(model, id);
       const rejectionByRevision = /* @__PURE__ */ new Map();
+      const contentEditedByRevision = /* @__PURE__ */ new Map();
       if (engineStore) {
         const snap = await engineStore.transaction((tx) => tx.loadWorkorder(artifact.workspace));
         for (const w2 of snap?.works ?? []) {
           if (w2.rejectedReason) rejectionByRevision.set(w2.id, w2.rejectedReason);
         }
+        for (const a of snap?.artifacts ?? []) {
+          const at = a.contentEditedAt;
+          if (!at) continue;
+          const workId = a.workId;
+          const prev = contentEditedByRevision.get(workId);
+          if (!prev || at > prev) contentEditedByRevision.set(workId, at);
+        }
       }
       const revisionViews = revisions.map((rev) => ({
         ...rev,
         stage: revisionStage(artifact, rev),
         approvals: (model.reviews.get(rev.id) ?? []).filter((v2) => v2.verdict === "approve").length,
         required: pendingGate?.head === rev.id ? pendingGate.gate?.quorum ?? 0 : 0,
-        ...rejectionByRevision.has(rev.id) ? { rejection: { reason: rejectionByRevision.get(rev.id) } } : {}
+        ...rejectionByRevision.has(rev.id) ? { rejection: { reason: rejectionByRevision.get(rev.id) } } : {},
+        ...contentEditedByRevision.has(rev.id) ? { contentEditedAt: contentEditedByRevision.get(rev.id) } : {}
       }));
       return {
         artifact,
@@ -206250,10 +206369,26 @@ ${composed}`;
                     ...chatExit?.reason ? { reason: chatExit.reason } : {},
                     ...chatExit?.detail ? { detail: chatExit.detail } : {}
                   });
-                  itemLedger.recordError(errText2, {
+                  const errorOutcome = itemLedger.recordError(errText2, {
                     ...chatExit?.reason ? { reason: chatExit.reason } : {},
                     ...chatExit?.detail ? { detail: chatExit.detail } : {}
                   });
+                  if (live) {
+                    live.publishServerItem({
+                      itemId: errorOutcome.itemId,
+                      itemType: "control",
+                      startedVersion: errorOutcome.startedVersion,
+                      version: errorOutcome.version,
+                      ord: errorOutcome.ord,
+                      status: "failed",
+                      payload: {
+                        code: "error",
+                        note: errText2,
+                        ...chatExit?.reason ? { reason: chatExit.reason } : {},
+                        ...chatExit?.detail ? { detail: chatExit.detail } : {}
+                      }
+                    });
+                  }
                 }
                 finished = true;
                 clearInterval(ckptTimer);
@@ -206866,7 +207001,19 @@ ${composed}`;
               fromInstallation: Boolean(installationId),
               /** App 申请了、但这次安装还没被授予——多半是权限升级还等着组织 owner 批准。 */
               awaitingApproval: missingAppPermissions(effective).filter((m2) => meta.permissions[m2.key]).map((m2) => m2.key),
-              granted: GITHUB_APP_PERMISSION_LABELS.filter((r) => effective[r.key]),
+              /**
+               * 这次安装**真正被授予**的全部权限，一律用 GitHub 的英文原名 + 级别
+               * （2026-09-10 发起人：「所有权限都用英文原文，不区分是不是八项权限」）。
+               *
+               * 此前这里是 `GITHUB_APP_PERMISSION_LABELS.filter(...)` —— 那张表只有本仓必需的
+               * 八项中文标签，于是这一格实际上是「必备清单打勾」，人在 GitHub 上另外勾的一个都不显示，
+               * 看上去像没生效。中间还试过「八项中文 + 额外项英文」两段式，也被否了：
+               * 同一个列表两套命名，反而要人先分辨「这条为什么是中文那条为什么是英文」。
+               *
+               * **不编中文名**：GitHub 的权限键是开放集合且还在增，写死对照表迟早漏；
+               * 而英文原名与 GitHub 设置页上的字**逐字一致**，对着改权限时不用做心理翻译。
+               */
+              granted: Object.entries(effective).filter(([, level]) => Boolean(level)).map(([key, level]) => ({ key, level: String(level) })).sort((a, b2) => a.key.localeCompare(b2.key)),
               missing,
               settingsUrl: meta.slug ? appPermissionSettingsUrl(meta) : null
             }));
@@ -206942,7 +207089,8 @@ ${composed}`;
             const perms = pending.permissions ?? {};
             const missing = missingAppPermissions(perms);
             return {
-              granted: GITHUB_APP_PERMISSION_LABELS.filter((r) => perms[r.key]),
+              // 与 app/permissions 那一处同口径：英文原名 + 级别，不分是不是本仓必需的八项。
+              granted: Object.entries(perms).filter(([, level]) => Boolean(level)).map(([key, level]) => ({ key, level: String(level) })).sort((a, b2) => a.key.localeCompare(b2.key)),
               missing,
               ...pending.slug ? { settingsUrl: appPermissionSettingsUrl({
                 slug: pending.slug,
@@ -206985,10 +207133,8 @@ ${composed}`;
             }
             if (pending.slug) {
               const bot = await fetchAppBotIdentity(pending.slug, { token: minted.token });
-              if (bot) {
-                await put3("GITHUB_APP_BOT_EMAIL", bot.email, false);
-                await put3("GITHUB_APP_BOT_NAME", bot.login, false);
-              }
+              await put3("GITHUB_APP_BOT_EMAIL", bot?.email ?? "", false);
+              await put3("GITHUB_APP_BOT_NAME", bot?.login ?? `${pending.slug}[bot]`, false);
             }
             pending.done = true;
             delete pending.privateKeyPem;
@@ -210642,6 +210788,10 @@ function buildRevisionDag(revisions) {
     }))
   };
 }
+function laterOf(a, b2) {
+  if (!b2) return a;
+  return b2 > a ? b2 : a;
+}
 var DEFAULT_AGENT_ACTOR, MemoryProjectStateStore, MemoryArtifactStateStore, ProjectsService;
 var init_service4 = __esm({
   "../server/src/domains/projects/service.ts"() {
@@ -211498,7 +211648,11 @@ var init_service4 = __esm({
             if (arts.length === 0) continue;
             const work = worksById.get(acceptedId);
             const folderPath = `wo:${workOrderId}/node:${node2.id}`;
-            const folderUpdatedAt = work?.acceptedAt ?? work?.endedAt ?? work?.lastActivityAt ?? work?.createdAt ?? node2.updatedAt;
+            const workUpdatedAt = work?.acceptedAt ?? work?.endedAt ?? work?.lastActivityAt ?? work?.createdAt ?? node2.updatedAt;
+            const folderUpdatedAt = arts.reduce(
+              (acc, a) => laterOf(acc, a.contentEditedAt),
+              workUpdatedAt
+            );
             const creatorId = work?.assigneeActorId ?? null;
             const creatorKind = creatorId ? creatorId.startsWith("actor:human:") ? "human" : "agent" : null;
             const creatorName = creatorId ? this.resolveActorName(creatorId) : null;
@@ -211522,7 +211676,7 @@ var init_service4 = __esm({
             for (const a of sortedArts) {
               const artifactId = node2.id;
               const artifactType = a.type ?? node2.type;
-              const rowUpdatedAt = folderUpdatedAt;
+              const rowUpdatedAt = laterOf(workUpdatedAt, a.contentEditedAt);
               if (a.contentKind === "manifest" && a.contentRef?.trim()) {
                 const content3 = await this.readContentRefText(a.contentRef);
                 const files = content3 !== null ? tryParseManifestFiles(content3) : void 0;
@@ -211918,6 +212072,7 @@ var init_service4 = __esm({
           const arts = snap.artifacts.filter((a) => a.workId === acceptedId);
           if (arts.length === 0) continue;
           const work = worksById.get(acceptedId);
+          const workUpdatedAt = work?.acceptedAt ?? work?.endedAt ?? work?.lastActivityAt ?? work?.createdAt ?? node2.updatedAt;
           const documents = arts.slice().sort((a, b2) => a.ordinal - b2.ordinal).map((a) => ({
             // collab 层 artifactId === engine nodeId（见 bridge-readmodel.ts:215）——预览端读的
             // useArtifactView 也走这个 id。
@@ -211929,7 +212084,9 @@ var init_service4 = __esm({
             contentRef: a.contentRef,
             title: node2.title || a.name,
             // 节点标题优先；否则用 engine artifact 的 "output" 兜底
-            contentKind: engineContentKind(a.contentKind)
+            contentKind: engineContentKind(a.contentKind),
+            // 文档级时间：被人在预览里就地改写过就跳到改写时刻，否则就是这轮执行的时刻。
+            updatedAt: laterOf(workUpdatedAt, a.contentEditedAt)
           }));
           out.push({
             outputId: `engine:${acceptedId}`,
@@ -211940,7 +212097,9 @@ var init_service4 = __esm({
             documents,
             payload: {},
             createdAt: work?.createdAt ?? node2.createdAt,
-            updatedAt: work?.acceptedAt ?? work?.endedAt ?? work?.lastActivityAt ?? work?.createdAt ?? node2.updatedAt
+            // 节点（= 文件夹行）的时间取「这轮执行的时刻」与「其下任一文档最后被就地改写的时刻」里更晚的那个：
+            // 改过某个文件之后，文件夹不能还显示比自己的孩子更早的时间。
+            updatedAt: documents.reduce((acc, d) => laterOf(acc, d.updatedAt), workUpdatedAt)
           });
         }
         return out;
@@ -223012,7 +223171,8 @@ function toApiNodeOutputDocument(doc) {
     summary: doc.summary,
     ...doc.contentKind !== void 0 ? { content_kind: doc.contentKind } : {},
     ...doc.size !== void 0 ? { size: doc.size } : {},
-    ...doc.files !== void 0 ? { files: doc.files.map((f2) => ({ path: f2.path, ...f2.size !== void 0 ? { size: f2.size } : {} })) } : {}
+    ...doc.files !== void 0 ? { files: doc.files.map((f2) => ({ path: f2.path, ...f2.size !== void 0 ? { size: f2.size } : {} })) } : {},
+    ...doc.updatedAt !== void 0 ? { updated_at: doc.updatedAt } : {}
   };
 }
 function toApiNodeOutputValidation(validation) {
@@ -229369,7 +229529,7 @@ async function buildResolver(registry2) {
   const byId = new Map(actors.map((a) => [a.id, a]));
   return (id) => {
     const a = byId.get(id);
-    return a ? actorRefFieldsOf(a) : systemActorFallback(id);
+    return a ? actorRefFieldsOf(a) : actorRefFallbackOf(id);
   };
 }
 async function buildProjectResolver(artifacts) {
@@ -233772,12 +233932,20 @@ function createChatSessionsDomain(opts) {
       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;
-      if (!turnId) {
-        const turns = await turnsFor(req);
-        const active = turns ? await turns.activeTurn(chatSessionId).catch(() => null) : null;
-        turnId = active?.id ?? null;
-      }
+      const turns = await turnsFor(req);
+      const activeTurnRow = turns ? await turns.activeTurn(chatSessionId).catch(() => null) : null;
+      const turnId = cursor?.turnId ?? activeTurnRow?.id ?? null;
+      const activeTurn = (() => {
+        if (!activeTurnRow) return null;
+        const settled = activeTurnRow.status !== "reserved" && activeTurnRow.status !== "running";
+        if (settled) return { turnId: activeTurnRow.id, phase: activeTurnRow.status };
+        if (opts.liveChat?.isRunning(chatSessionId)) {
+          return { turnId: activeTurnRow.id, phase: "running" };
+        }
+        const startedAt = Date.parse(activeTurnRow.startedAt ?? activeTurnRow.reservedAt);
+        const stale = Number.isFinite(startedAt) && Date.now() - startedAt >= LINK_WINDOWS.chatTurnPhaseStaleAfterMs;
+        return { turnId: activeTurnRow.id, phase: stale ? "interrupted" : "running" };
+      })();
       const snapshotEntries = [];
       let nextSinceVersion = sinceVersion;
       let hasMoreBefore = false;
@@ -233809,6 +233977,7 @@ function createChatSessionsDomain(opts) {
         nextSinceVersion,
         frameCursor: cursor ? { epoch: cursor.epoch, seq: cursor.seq } : { epoch: 0, seq: 0 },
         canAppend: cursor?.canAppend ?? false,
+        activeTurn,
         oldestOrd,
         hasMoreBefore
       };
@@ -270671,7 +270840,7 @@ function shimScript() {
 }
 
 // src/index.ts
-var PKG_VERSION = true ? "2.2.9" : "dev";
+var PKG_VERSION = true ? "2.2.10" : "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.9",
+  "version": "2.2.10",
   "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": "c340be41660585edc13bbb809b8585d4b6b4e95a"
+    "sourceHead": "3eac5f26307c5d0cf750e4a7edc6a5f60bdbe63d"
   }
 }