@sema-agent/client-core 0.11.16 → 0.11.17

package/README.md

@@ -23,7 +23,7 @@ Renamed from **`@sema-agent/wire-cc-adapter`** (0.1.x, deprecated — see *Migra
 
 ## Scope
 
-**Version:** 0.11.16
+**Version:** 0.11.17
 
 - **Today** — the adapter seam, the whole `adapt()` pipeline (all 14 A-layer arms plus the
   B/D/E tool-card layers), the notification/caps/model families, the adapter kernel (stream driver

package/dist/adapt.js

@@ -705,6 +705,11 @@ class WireToCcAdapterImpl {
         // 代价是失去 for-await 的隐式 cleanup ⇒ finally 里手动 return()(T58,少了它 = SSE 不拆)。
         const iterator = frames[Symbol.asyncIterator]();
         let iteratorDone = false;
+        // R1(clay 五报 07-31):retry 覆盖层的四个清除点全在 turn 边界,缺「重试成功→清」的转移 ——
+        // 引擎重试成功那一刻什么都不发(BrainStatusPhase 无恢复终态,候 core [2163]),所以恢复只能由
+        // 「主 lane 又有内容在流」这个事实来证明。挂旗后首个主 lane 内容帧即清,CC 同位 = 重试循环
+        // 退出即 onRetryStatus(null)(pretty220 finally 清)。
+        let retryOverlayActive = false;
         try {
             for (;;) {
                 const nextPromise = iterator.next();
@@ -755,6 +760,19 @@ class WireToCcAdapterImpl {
                 const m = rawFrame;
                 if (m === null || typeof m !== 'object')
                     continue;
+                if (retryOverlayActive &&
+                    (m.type === 'stream_event' ||
+                        m.type === 'assistant' ||
+                        m.type === 'tool_end_result' ||
+                        m.type === 'turn_usage') &&
+                    typeof m.parentToolCallId !== 'string' &&
+                    // stream_event 的子流标记在 event 里(:1230 thinking 臂同款判位),帧顶层没有。
+                    typeof m.event?.parentToolCallId !== 'string') {
+                    // 恢复即清:主 lane 内容帧到达 = 引擎那次重试已成功;子流帧(parentToolCallId)不算证据
+                    // (主 brain 仍可能在退避等待,#47 矩阵 #5 同族判别)。
+                    retryOverlayActive = false;
+                    yield chrome({ kind: 'retry_status', laneProof: MAIN, status: null });
+                }
                 if (m.type === 'stream_event' && !messageStartEmitted) {
                     messageStartEmitted = true;
                     yield chrome({
@@ -1362,6 +1380,7 @@ class WireToCcAdapterImpl {
                                 ...(typeof m.retryInSec === 'number' ? { retryInSec: m.retryInSec } : {}),
                             }, ctx.now()),
                         });
+                        retryOverlayActive = true;
                         break;
                     }
                     default:

package/dist/engineAgentPanelStore.d.ts

@@ -88,6 +88,12 @@ export type EngineAgentPanelEvent = {
      * 修「详情页 Prompt 段恒空」。缺席 ⇒ 维持现状(诚实留白)。
      */
     transcriptId?: string;
+    /**
+     * server 1.250 起行帧带的 launch 真锚(epoch ms)。R4(clay 五报 07-31):此前投影层丢弃它,
+     * 详情页 elapsed 只能锚「壳建行时刻」(createTaskStateBase 的 Date.now())——遗留/重挂行上
+     * 渲出 1h+ 假时长。消费端拿到即覆盖行的 startTime;缺席 ⇒ 老引擎,维持现状。
+     */
+    startedAt?: number;
 } | {
     kind: 'end';
     taskId: string;

package/dist/fleetAgentPanelProjection.d.ts

@@ -17,6 +17,9 @@ export interface FleetAgentRowLike {
         toolName: string;
         target?: string;
     };
+    /** server 1.250 起行带的 launch 真锚(epoch ms)。R4(clay 五报 07-31):此前投影载荷丢弃它,
+     *  详情页 elapsed 只能锚「壳建行时刻」——遗留行上渲出 1h+ 的假时长。缺席=老引擎,消费端保持现状。 */
+    startedAt?: number;
 }
 /** 行从投影集消失多久之后按 completed 兜底 settle(重连空窗 / snapshot 清表远小于此)。 */
 export declare const ABSENT_SETTLE_MS = 30000;

package/dist/fleetAgentPanelProjection.js

@@ -80,6 +80,7 @@ export function projectFleetAgentRows(rows, nowMs = Date.now()) {
         // 🔴 三态直取:`row.toolUses` 缺席就是 undefined,这里**不许**兜 0(见 FleetAgentRowLike 注)。
         const toolUses = typeof row.toolUses === 'number' ? row.toolUses : undefined;
         const transcriptId = row.transcriptId || undefined;
+        const startedAt = typeof row.startedAt === 'number' && row.startedAt > 0 ? row.startedAt : undefined;
         const currentTool = currentToolKeyOf(row.currentTool) !== undefined ? row.currentTool : undefined;
         const currentToolKey = currentToolKeyOf(row.currentTool);
         const prev = seen.get(taskId);
@@ -89,7 +90,8 @@ export function projectFleetAgentRows(rows, nowMs = Date.now()) {
                 // 终态行也把最后一拍的累计工具数/转录锚带上:详情页在行翻终态后仍要显示真计数与
                 // 委派 prompt,而终态帧常常是这一行**唯一**带全 usage 的一帧(bg lane 只在活动边界发行帧)。
                 if ((toolUses !== undefined && prev?.toolUses !== toolUses) ||
-                    (transcriptId !== undefined && prev?.transcriptId !== transcriptId)) {
+                    (transcriptId !== undefined && prev?.transcriptId !== transcriptId) ||
+                    (startedAt !== undefined && prev?.startedAt !== startedAt)) {
                     publishEngineAgentPanelEvent({
                         kind: 'fleet-row',
                         taskId,
@@ -98,6 +100,7 @@ export function projectFleetAgentRows(rows, nowMs = Date.now()) {
                         totalTokens: tokens,
                         ...(toolUses !== undefined ? { toolUses } : {}),
                         ...(transcriptId !== undefined ? { transcriptId } : {}),
+                        ...(startedAt !== undefined ? { startedAt } : {}),
                     });
                 }
                 publishEngineAgentPanelEvent({
@@ -111,6 +114,7 @@ export function projectFleetAgentRows(rows, nowMs = Date.now()) {
                 tokens,
                 toolUses: toolUses !== undefined ? toolUses : prev?.toolUses,
                 transcriptId: transcriptId !== undefined ? transcriptId : prev?.transcriptId,
+                startedAt: startedAt !== undefined ? startedAt : prev?.startedAt,
                 currentToolKey: currentToolKey !== undefined ? currentToolKey : prev?.currentToolKey,
                 lastSeenAt: nowMs,
                 settled: true,
@@ -127,6 +131,7 @@ export function projectFleetAgentRows(rows, nowMs = Date.now()) {
             prev.tokens !== tokens ||
             (toolUses !== undefined && prev.toolUses !== toolUses) ||
             (transcriptId !== undefined && prev.transcriptId !== transcriptId) ||
+            (startedAt !== undefined && prev.startedAt !== startedAt) ||
             (currentToolKey !== undefined && prev.currentToolKey !== currentToolKey)) {
             publishEngineAgentPanelEvent({
                 kind: 'fleet-row',
@@ -137,6 +142,7 @@ export function projectFleetAgentRows(rows, nowMs = Date.now()) {
                 // 🔴 缺席即不落键(消费端据「键在不在」判三态)。
                 ...(toolUses !== undefined ? { toolUses } : {}),
                 ...(transcriptId !== undefined ? { transcriptId } : {}),
+                ...(startedAt !== undefined ? { startedAt } : {}),
                 ...(currentTool !== undefined ? { currentTool } : {}),
             });
         }
@@ -146,6 +152,7 @@ export function projectFleetAgentRows(rows, nowMs = Date.now()) {
             tokens,
             toolUses: toolUses !== undefined ? toolUses : prev?.toolUses,
             transcriptId: transcriptId !== undefined ? transcriptId : prev?.transcriptId,
+            startedAt: startedAt !== undefined ? startedAt : prev?.startedAt,
             currentToolKey: currentToolKey !== undefined ? currentToolKey : prev?.currentToolKey,
             lastSeenAt: nowMs,
             settled: false,

package/dist/hitl/askGateWire.js

@@ -2,7 +2,7 @@ import { HitlBridge } from './hitlBridge.js';
 import { publishQuestionFrame, registerLocalQuestionResponder, hasQuestionOverlay, } from '../liveQuestionStore.js';
 import { hostLog } from '../host.js';
 import { createSessionSlot, DEFAULT_SESSION_KEY } from '../sessionSlot.js';
-import { isFsApprovalGate, toolNameIsFsWrite, surfaceFsApprovalAndDecide, isToolApprovalFrame, isFromSubagent, surfaceToolApprovalFrameAndRespond, } from './toolApprovalWire.js';
+import { isToolApprovalGate, toolNameIsFsWrite, surfaceFsApprovalAndDecide, isToolApprovalFrame, isFromSubagent, surfaceToolApprovalFrameAndRespond, } from './toolApprovalWire.js';
 import { classifierDenyFromToolEnd } from '../classifierVerdictWire.js';
 // W1(design/161):sessionKey → 注册表;零参 API = DEFAULT_SESSION_KEY 兼容层(cli 装配不动)。
 const hostSurfaceByKey = createSessionSlot();
@@ -69,8 +69,9 @@ function isAskGatePark(result) {
         typeof r.taskId === 'string' &&
         r.taskId.length > 0);
 }
-/** done 帧的 fs 写权限 park 形状([816] 放宽腿):status suspended + checkpointGate 指 fs 写工具
- *  (Write/Edit/NotebookEdit)或一等 kind==='tool_approval'。Ask gate 恒先判(问答 overlay 原路)。 */
+/** done 帧的工具审批 park 形状([816] 放宽腿 + [2150] Bash 半场):status suspended +
+ *  checkpointGate 指 fs 写三件 / Bash / 一等 kind==='tool_approval'(超集谓词 isToolApprovalGate,
+ *  decide 腿对两族同构、卡形归壳分发)。Ask gate 恒先判(问答 overlay 原路)。 */
 function isFsApprovalPark(result) {
     const r = result;
     return (!!r &&
@@ -78,7 +79,7 @@ function isFsApprovalPark(result) {
         typeof r.taskId === 'string' &&
         r.taskId.length > 0 &&
         !isAskTool(r.checkpointGate?.toolName) &&
-        isFsApprovalGate(r.checkpointGate));
+        isToolApprovalGate(r.checkpointGate));
 }
 /** 把 wire 答案({answers:[{header,selected,note?}]})折回 CC 卡片的 Record<question,string> 形状
  *  (multiSelect 与对话框同款 ", " lossy join;note → annotations.notes)。 */
@@ -477,7 +478,7 @@ export async function* bridgeAskUserQuestionGates(source, deps, opts) {
                     park = { gate: 'ask' };
                     break;
                 }
-                if (ev.gate && isFsApprovalGate(ev.gate) && realTaskId) {
+                if (ev.gate && isToolApprovalGate(ev.gate) && realTaskId) {
                     park = { gate: 'fs' };
                     break;
                 }

package/dist/hitl/toolApprovalWire.d.ts

@@ -6,6 +6,17 @@ export declare function isFsApprovalGate(gate: {
     toolName?: unknown;
 } | undefined | null): boolean;
 export declare function toolNameIsFsWrite(name: string): boolean;
+/** shell 执行工具判定(Bash)。[2150] S1 半场:引擎对 Bash 发 durable park 时,fs 谓词不认 ⇒
+ *  park 落「其余 gate 透传」= run 留 suspended、session 锁死(r1 E5 fail-stuck 实例)。 */
+export declare function toolNameIsShellExec(name: string): boolean;
+/** 工具审批 gate 判定(durable park 分诊用的**超集**谓词):一等 kind / fs 写三件 / shell 执行。
+ *  decide 腿(approvals.decide)对两族同构;卡形分发归壳 ApprovalCardPort(toolForName 已含
+ *  bash → BashPermissionRequest 映射,sema-cli a35e2b2)。`isFsApprovalGate` 保留原语义不动
+ *  (公开面消费者按 fs 写理解它,把 Bash 塞进去是撒谎)。 */
+export declare function isToolApprovalGate(gate: {
+    kind?: unknown;
+    toolName?: unknown;
+} | undefined | null): boolean;
 export type FsApprovalOutcome = {
     kind: 'decided';
     gatedCallId?: string;

package/dist/hitl/toolApprovalWire.js

@@ -15,6 +15,20 @@ export function toolNameIsFsWrite(name) {
     const n = name.replace(/[\s_-]+/g, '').toLowerCase();
     return (n === 'write' || n === 'filewrite' || n === 'edit' || n === 'fileedit' || n === 'multiedit' || n === 'notebookedit');
 }
+/** shell 执行工具判定(Bash)。[2150] S1 半场:引擎对 Bash 发 durable park 时,fs 谓词不认 ⇒
+ *  park 落「其余 gate 透传」= run 留 suspended、session 锁死(r1 E5 fail-stuck 实例)。 */
+export function toolNameIsShellExec(name) {
+    return name.replace(/[\s_-]+/g, '').toLowerCase() === 'bash';
+}
+/** 工具审批 gate 判定(durable park 分诊用的**超集**谓词):一等 kind / fs 写三件 / shell 执行。
+ *  decide 腿(approvals.decide)对两族同构;卡形分发归壳 ApprovalCardPort(toolForName 已含
+ *  bash → BashPermissionRequest 映射,sema-cli a35e2b2)。`isFsApprovalGate` 保留原语义不动
+ *  (公开面消费者按 fs 写理解它,把 Bash 塞进去是撒谎)。 */
+export function isToolApprovalGate(gate) {
+    if (isFsApprovalGate(gate))
+        return true;
+    return typeof gate?.toolName === 'string' && toolNameIsShellExec(gate.toolName);
+}
 /** 结构等值(键序无关深比较)——updatedInput「真编辑过」判定用。zod parse 会产新引用与重排,
  *  引用比较/JSON.stringify 串比较都会假报「编辑过」。 */
 export function structurallyEqual(a, b) {
@@ -115,7 +129,7 @@ export async function surfaceFsApprovalAndDecide(deps, taskId, argsByCall, signa
     try {
         const rows = (await deps.client.approvals.list(signal ? { signal } : undefined)).pending;
         pending =
-            rows.find(r => r.taskId === taskId && typeof r.toolName === 'string' && toolNameIsFsWrite(r.toolName)) ??
+            rows.find(r => r.taskId === taskId && typeof r.toolName === 'string' && (toolNameIsFsWrite(r.toolName) || toolNameIsShellExec(r.toolName))) ??
                 rows.find(r => r.taskId === taskId);
     }
     catch (e) {

package/dist/notifications.d.ts

@@ -182,9 +182,11 @@ type BgTaskStatusProbe = (taskId: string) => Promise<{
     terminal: boolean;
     status: string;
 } | null>;
+/** 委派 prompt 取件口(行消费端建行/详情页兜底用)。未登记 ⇒ undefined(诚实缺席)。 */
+export declare function outstandingBgTaskPrompt(taskId: string): string | undefined;
 export declare function installBgTaskStatusProbe(probe: BgTaskStatusProbe): void;
 /** bridge 在 Agent async_launched 回执(structured type:'agent')经过时登记。幂等;已通知不再登记。 */
-export declare function registerOutstandingBgTask(taskId: string, description: string): void;
+export declare function registerOutstandingBgTask(taskId: string, description: string, prompt?: string): void;
 export declare function isOwnWorkflowRun(runId: string): boolean;
 /** 本壳亲手启动过的 workflow run 列表(Set 插入序 = 启动序;/workflows 命令的目标 run 选择用,
  *  cmd-workflows.tsx——fleet source 无行可选时的兜底 id 源)。 */

package/dist/notifications.js

@@ -388,12 +388,31 @@ export function installWorkflowStatusProbe(probe) {
 }
 const outstandingBgTasks = new Map();
 let bgStatusProbe = null;
+/**
+ * R4(clay 五报 07-31)委派 prompt 台账:`async_launched` 回执带全 {task_id, description, prompt}
+ * 三件,但此前 prompt 只进消息 payload(ctrl+o expand 那条腿),任务行/详情页(↓ manage)取不到,
+ * 只能绕道等引擎 running 期不发的 transcriptId 去转录读面捞 ⇒ Prompt 节恒空。
+ * 这里按行 id 记一份(与 fleet 行 rowIdTail 同 keyspace),行消费端建行时取用。
+ * 与 outstandingBgTasks 分开存:后者随通知摘除,prompt 在行的整个生命周期都要可取。
+ * process-lifetime 有界:bg 子代数量 = 人手派发量级,不设逐出。
+ */
+const bgTaskPrompts = new Map();
+/** 委派 prompt 取件口(行消费端建行/详情页兜底用)。未登记 ⇒ undefined(诚实缺席)。 */
+export function outstandingBgTaskPrompt(taskId) {
+    return bgTaskPrompts.get(taskId);
+}
 export function installBgTaskStatusProbe(probe) {
     bgStatusProbe = probe;
 }
 /** bridge 在 Agent async_launched 回执(structured type:'agent')经过时登记。幂等;已通知不再登记。 */
-export function registerOutstandingBgTask(taskId, description) {
-    if (!taskId || notifiedRunIds.has(taskId) || outstandingBgTasks.has(taskId))
+export function registerOutstandingBgTask(taskId, description, prompt) {
+    if (!taskId)
+        return;
+    // prompt 台账先记(与 watcher 登记的幂等早退解耦:重复回执/已通知任务的 prompt 仍要可取)。
+    if (typeof prompt === 'string' && prompt.length > 0 && !bgTaskPrompts.has(taskId)) {
+        bgTaskPrompts.set(taskId, prompt);
+    }
+    if (notifiedRunIds.has(taskId) || outstandingBgTasks.has(taskId))
         return;
     outstandingBgTasks.set(taskId, { registeredAt: Date.now(), description });
     ensureWatchTimer();

package/dist/toolResult.js

@@ -75,6 +75,13 @@ export const STRUCTURED_DETAIL_TYPES = new Set([
     'fork',
     'enter-plan-mode',
     'exit-plan-mode',
+    // core 2.7.0 跟车四型(engine-vocab 等值门抓获,[dep-bump-follow-on] 计数钉族):本表只判
+    // 「structured 在场」,switch 认不得的照旧走 text 回落 —— 加型=让正则反解对新卡退位,不加型
+    // =把引擎的结构化当裸对象。
+    'file_unchanged',
+    'worktree',
+    'monitor-start',
+    'path_not_in_root',
 ]);
 /** structured 在场判别:顶层 `type` ∈ 白名单 ⇒ 返回该 type,否则 undefined(= 不在场)。 */
 export function structuredDetailType(structured) {
@@ -610,7 +617,7 @@ modelText) {
             if (agentId === undefined || typeof s.description !== 'string' || typeof s.prompt !== 'string') {
                 return null;
             }
-            registerOutstandingBgTask(agentId, s.description);
+            registerOutstandingBgTask(agentId, s.description, s.prompt);
             return {
                 toolUseResult: {
                     isAsync: true,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sema-agent/client-core",
-  "version": "0.11.16",
+  "version": "0.11.17",
   "description": "Client-side session runtime shared by every sema human client (TUI / web / desktop): sema wire frames (AgentEvent) -> CC session vocabulary (SDKMessage) with dual-plane output (transcript/chrome), deterministic transcript ids, lane discipline as a type, and the notification/dedup ledgers. Every CC-skin shape is collected here so the wire itself stays neutral. Blackboard [1832] design axioms; [1651]/[1652]/[1653] signed seam design. Renamed from @sema-agent/wire-cc-adapter (0.1.x).",
   "license": "MIT",
   "type": "module",