@mickorz/opencode-agentic-workflow 0.4.0 → 0.5.1

package/dist/scheduler/types.d.ts

@@ -0,0 +1,53 @@
+/**
+ * Schedule 领域类型（P2-7）
+ *
+ * 对象关系（对齐 v1 的职责分离）：
+ *   Schedule   = 用户配置（schedulesDir/<id>.json，工具管理，纯配置）
+ *   .cursor    = 触发游标（schedulesDir/.cursor.json：id -> 已消费的 slot epoch ms）
+ *   ScheduleRun = 一次触发的记录（schedulesDir/runs/<id>.json，上限保留 50 条）
+ *
+ * 纪律：Core 侧模块，禁止 import OpenCode API（架构不变量）。
+ */
+/** 定时任务配置（纯配置；enabled/args 可由工具改写） */
+export interface Schedule {
+    /** kebab-case；工具操作与记录文件的寻址键 */
+    id: string;
+    /** 展示名；缺省用 flow */
+    name?: string;
+    /** workflow id（内置或 workflow_define 定义的自定义流程） */
+    flow: string;
+    /** 四模式 cron 子集（本地时区；见 cron.ts） */
+    cron: string;
+    enabled: boolean;
+    /** 透传给 workflow 的 args（含 topic） */
+    args?: Record<string, unknown>;
+    createdAt: string;
+    updatedAt: string;
+}
+/** 一次触发的记录（scheduled 到点 / manual 手动 runNow） */
+export type ScheduleRunStatus = "running" | "success" | "failed" | "aborted" | "skipped";
+export interface ScheduleRun {
+    scheduleId: string;
+    flow: string;
+    /** workflow runId（journal 对齐；skipped 时无） */
+    workflowRunId?: string;
+    /** 触发来源：scheduled（到点）/ manual（runNow） */
+    trigger: "scheduled" | "manual";
+    /** 触发的时间槽 ISO（manual = 实际触发时刻） */
+    slot: string;
+    /** slot epoch 毫秒（排序/去重键） */
+    slotEpoch: number;
+    status: ScheduleRunStatus;
+    startedAt: string;
+    finishedAt?: string;
+    /** skipped 原因 / failed 错误摘要 */
+    note?: string;
+}
+/** list/get 聚合视图 */
+export interface ScheduleView extends Schedule {
+    /** 最近一次记录（各状态含 skipped） */
+    lastRunAt?: string;
+    lastRunStatus?: ScheduleRunStatus;
+    /** 下一个未来 slot（本地时区 ISO；disabled 不算） */
+    nextRunAt?: string;
+}

package/dist/scheduler/types.js

@@ -0,0 +1,12 @@
+/**
+ * Schedule 领域类型（P2-7）
+ *
+ * 对象关系（对齐 v1 的职责分离）：
+ *   Schedule   = 用户配置（schedulesDir/<id>.json，工具管理，纯配置）
+ *   .cursor    = 触发游标（schedulesDir/.cursor.json：id -> 已消费的 slot epoch ms）
+ *   ScheduleRun = 一次触发的记录（schedulesDir/runs/<id>.json，上限保留 50 条）
+ *
+ * 纪律：Core 侧模块，禁止 import OpenCode API（架构不变量）。
+ */
+export {};
+//# sourceMappingURL=types.js.map

package/dist/scheduler/types.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/scheduler/types.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG"}

package/dist/state/journal.d.ts

@@ -23,6 +23,12 @@ export interface StepErrorRecord {
     name: string;
     message: string;
 }
+/** 步骤内 agent 调用的 token 用量累计（P2-8b；agent.completed 事件聚合） */
+export interface StepUsage {
+    input: number;
+    output: number;
+    reasoning: number;
+}
 /** workflow 版本身份：resume 必须经 registry 解析到精确版本，绝不隐式取最新 */
 export interface WorkflowIdentity {
     id: string;
@@ -41,6 +47,12 @@ export interface StepRecord {
     output?: unknown;
     /** 失败信息 */
     error?: StepErrorRecord;
+    /** 步骤内 agent 调用 token 累计（P2-8b 元数据；多 agent 步求和） */
+    usage?: StepUsage;
+    /** 步骤内最后一次 agent 调用的模型（P2-8b 元数据） */
+    model?: string;
+    /** 步骤内各 agent 调用的宿主会话 ID（Open Session 回放；pipeline 步多个） */
+    sessionIDs?: string[];
     startedAt?: number;
     completedAt?: number;
 }
@@ -63,6 +75,13 @@ export interface WorkflowRun {
      * 清理完成后置 undefined（见 RunJournal.clearWorkspace）。
      */
     workspace?: WorkspaceIdentity;
+    /**
+     * 父 run 的 runId（P2-9 subflow lineage）：subflow 子 run 指回发起它的
+     * 父 run；顶层 run 无此字段。跨 run 关系查询/进度树分组依据。
+     */
+    parentRunId?: string;
+    /** P2-9 嵌套深度：顶层 0，subflow 子 run = 父 + 1（展示缩进用） */
+    depth?: number;
     /** 失败/中断原因（run 级别） */
     failure?: StepErrorRecord;
     steps: StepRecord[];
@@ -80,4 +99,8 @@ export declare function createRun(input: {
     args?: unknown;
     stepNames?: string[];
     stepCount: number;
+    /** 父 run（P2-9 subflow lineage；顶层 run 省略） */
+    parentRunId?: string;
+    /** 嵌套深度（P2-9；顶层 0） */
+    depth?: number;
 }): WorkflowRun;

package/dist/state/journal.js

@@ -49,6 +49,8 @@ export function createRun(input) {
         currentStep: -1,
         startedAt: Date.now(),
         args: input.args,
+        ...(input.parentRunId !== undefined ? { parentRunId: input.parentRunId } : {}),
+        ...(input.depth !== undefined ? { depth: input.depth } : {}),
         steps: Array.from({ length: input.stepCount }, (_, index) => ({
             index,
             name: input.stepNames?.[index],

package/dist/state/journal.js.map

@@ -1 +1 @@
-{"version":3,"file":"journal.js","sourceRoot":"","sources":["../../src/state/journal.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AA2DH,8CAA8C;AAC9C,MAAM,UAAU,aAAa;IAC3B,MAAM,IAAI,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,CAAA;IACpD,OAAO,OAAO,IAAI,CAAC,GAAG,EAAE,IAAI,IAAI,EAAE,CAAA;AACpC,CAAC;AAED,iCAAiC;AACjC,MAAM,UAAU,YAAY,CAAC,KAAa;IACxC,OAAO,oCAAoC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;AACzD,CAAC;AAED,+BAA+B;AAC/B,MAAM,UAAU,aAAa,CAAC,KAAc;IAC1C,IAAI,KAAK,YAAY,KAAK,EAAE,CAAC;QAC3B,OAAO,EAAE,IAAI,EAAE,KAAK,CAAC,IAAI,EAAE,OAAO,EAAE,KAAK,CAAC,OAAO,EAAE,CAAA;IACrD,CAAC;IACD,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,CAAC,KAAK,CAAC,EAAE,CAAA;AAClD,CAAC;AAED,6BAA6B;AAC7B,MAAM,UAAU,SAAS,CAAC,KAMzB;IACC,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC,SAAS,CAAC,IAAI,KAAK,CAAC,SAAS,GAAG,CAAC,EAAE,CAAC;QAC9D,MAAM,IAAI,KAAK,CAAC,iDAAiD,KAAK,CAAC,SAAS,EAAE,CAAC,CAAA;IACrF,CAAC;IACD,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,EAAE,IAAI,OAAO,KAAK,CAAC,QAAQ,CAAC,EAAE,KAAK,QAAQ,EAAE,CAAC;QAChE,MAAM,IAAI,KAAK,CAAC,wCAAwC,CAAC,CAAA;IAC3D,CAAC;IACD,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,OAAO,IAAI,OAAO,KAAK,CAAC,QAAQ,CAAC,OAAO,KAAK,QAAQ,EAAE,CAAC;QAC1E,MAAM,IAAI,KAAK,CAAC,6CAA6C,CAAC,CAAA;IAChE,CAAC;IACD,OAAO;QACL,KAAK,EAAE,KAAK,CAAC,KAAK,IAAI,aAAa,EAAE;QACrC,QAAQ,EAAE,KAAK,CAAC,QAAQ;QACxB,MAAM,EAAE,SAAS;QACjB,WAAW,EAAE,CAAC,CAAC;QACf,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE;QACrB,IAAI,EAAE,KAAK,CAAC,IAAI;QAChB,KAAK,EAAE,KAAK,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,KAAK,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE,CAAC,CAAC;YAC5D,KAAK;YACL,IAAI,EAAE,KAAK,CAAC,SAAS,EAAE,CAAC,KAAK,CAAC;YAC9B,MAAM,EAAE,SAAkB;SAC3B,CAAC,CAAC;KACJ,CAAA;AACH,CAAC"}
+{"version":3,"file":"journal.js","sourceRoot":"","sources":["../../src/state/journal.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AA+EH,8CAA8C;AAC9C,MAAM,UAAU,aAAa;IAC3B,MAAM,IAAI,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,CAAA;IACpD,OAAO,OAAO,IAAI,CAAC,GAAG,EAAE,IAAI,IAAI,EAAE,CAAA;AACpC,CAAC;AAED,iCAAiC;AACjC,MAAM,UAAU,YAAY,CAAC,KAAa;IACxC,OAAO,oCAAoC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;AACzD,CAAC;AAED,+BAA+B;AAC/B,MAAM,UAAU,aAAa,CAAC,KAAc;IAC1C,IAAI,KAAK,YAAY,KAAK,EAAE,CAAC;QAC3B,OAAO,EAAE,IAAI,EAAE,KAAK,CAAC,IAAI,EAAE,OAAO,EAAE,KAAK,CAAC,OAAO,EAAE,CAAA;IACrD,CAAC;IACD,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,CAAC,KAAK,CAAC,EAAE,CAAA;AAClD,CAAC;AAED,6BAA6B;AAC7B,MAAM,UAAU,SAAS,CAAC,KAUzB;IACC,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC,SAAS,CAAC,IAAI,KAAK,CAAC,SAAS,GAAG,CAAC,EAAE,CAAC;QAC9D,MAAM,IAAI,KAAK,CAAC,iDAAiD,KAAK,CAAC,SAAS,EAAE,CAAC,CAAA;IACrF,CAAC;IACD,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,EAAE,IAAI,OAAO,KAAK,CAAC,QAAQ,CAAC,EAAE,KAAK,QAAQ,EAAE,CAAC;QAChE,MAAM,IAAI,KAAK,CAAC,wCAAwC,CAAC,CAAA;IAC3D,CAAC;IACD,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,OAAO,IAAI,OAAO,KAAK,CAAC,QAAQ,CAAC,OAAO,KAAK,QAAQ,EAAE,CAAC;QAC1E,MAAM,IAAI,KAAK,CAAC,6CAA6C,CAAC,CAAA;IAChE,CAAC;IACD,OAAO;QACL,KAAK,EAAE,KAAK,CAAC,KAAK,IAAI,aAAa,EAAE;QACrC,QAAQ,EAAE,KAAK,CAAC,QAAQ;QACxB,MAAM,EAAE,SAAS;QACjB,WAAW,EAAE,CAAC,CAAC;QACf,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE;QACrB,IAAI,EAAE,KAAK,CAAC,IAAI;QAChB,GAAG,CAAC,KAAK,CAAC,WAAW,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,KAAK,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAC9E,GAAG,CAAC,KAAK,CAAC,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,KAAK,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAC5D,KAAK,EAAE,KAAK,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,KAAK,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE,CAAC,CAAC;YAC5D,KAAK;YACL,IAAI,EAAE,KAAK,CAAC,SAAS,EAAE,CAAC,KAAK,CAAC;YAC9B,MAAM,EAAE,SAAkB;SAC3B,CAAC,CAAC;KACJ,CAAA;AACH,CAAC"}

package/dist/state/recorder.d.ts

@@ -16,6 +16,7 @@
 import { type WorkflowIdentity, type WorkflowRun } from "./journal.js";
 import type { ExecutionStore } from "./store.js";
 import type { WorkspaceIdentity } from "../workspace/provider.js";
+import { type RunProgressSnapshot } from "../observability/events.js";
 export interface JournalStartInput {
     workflow: WorkflowIdentity;
     /** 执行参数（重建执行所需的最小上下文） */
@@ -25,17 +26,76 @@ export interface JournalStartInput {
     stepCount: number;
     /** 显式 runId（缺省自动生成） */
     runId?: string;
+    /** 父 run（P2-9 subflow lineage；顶层 run 省略） */
+    parentRunId?: string;
+    /** 嵌套深度（P2-9；顶层 0） */
+    depth?: number;
 }
+/** run -> 进度快照（P2-8 数据源；不含步骤 output，失败摘要截断 200 字符） */
+export declare function toProgressSnapshot(run: WorkflowRun): RunProgressSnapshot;
+/** 步骤详情（journal 全量记录的 RPC 投影：输出/错误/耗时/token/模型预览） */
+export interface RunStepDetail {
+    index: number;
+    name?: string;
+    status: string;
+    startedAt?: number;
+    completedAt?: number;
+    /** 步骤输入预览（≤200 字符） */
+    input?: string;
+    /** 步骤输出预览（≤500 字符） */
+    output?: string;
+    /** 失败摘要 "Name: message"（≤300 字符） */
+    error?: string;
+    /** 步骤内 agent 调用 token 累计（P2-8b 元数据） */
+    usage?: {
+        input: number;
+        output: number;
+        reasoning: number;
+    };
+    /** 步骤内最后一次 agent 调用的模型（P2-8b 元数据） */
+    model?: string;
+    /** 步骤内各 agent 调用的宿主会话 ID（Open Session 回放；面板据此拉取对话） */
+    sessionIDs?: string[];
+}
+/** run 详情（P2-8b 节点详情 RPC 载荷：journal 单读，含预览化的步骤载荷） */
+export interface RunDetail {
+    runId: string;
+    workflow: {
+        id: string;
+        version: string;
+    };
+    status: string;
+    startedAt: number;
+    completedAt?: number;
+    /** run 级失败摘要（≤300 字符） */
+    failure?: string;
+    parentRunId?: string;
+    depth?: number;
+    /** args 预览（≤200 字符；重建执行的最小上下文） */
+    args?: string;
+    steps: RunStepDetail[];
+}
+/** run -> 详情（journal 事实源；载荷只做预览化，绝不放大体输出） */
+export declare function toRunDetail(run: WorkflowRun): RunDetail;
 export declare class RunJournal {
     private readonly store;
     readonly run: WorkflowRun;
     private constructor();
+    /**
+     * P2-8b 步骤元数据：订阅 agent.completed（runId 过滤）聚合 token/模型
+     * 到 currentStep。事件同步 fan-out，先于 stepCompleted 落盘——无需
+     * 额外持久化钩子。终态退订防泄漏；reopen 重新订阅。
+     */
+    private offUsageMeta;
+    private subscribeUsageMeta;
     /** 创建新 run 并持久化初始状态 */
     static start(store: ExecutionStore, input: JournalStartInput): Promise<RunJournal>;
     /** 附加到已有 run（resume 场景：读取历史 journal 继续记录）；不存在返回 undefined */
     static attach(store: ExecutionStore, runId: string): Promise<RunJournal | undefined>;
     private assertOpen;
     private step;
+    /** P2-8：状态转换后派发进度快照（同步 fan-out，handler 抛错被 bus 隔离） */
+    private emitProgress;
     stepStarted(index: number, input?: unknown): Promise<void>;
     stepCompleted(index: number, output?: unknown): Promise<void>;
     stepFailed(index: number, error: unknown): Promise<void>;
@@ -43,6 +103,13 @@ export declare class RunJournal {
     complete(): Promise<void>;
     /** run 失败收口：仍为 pending 的步骤标记 skipped（fail-fast 下它们不会被执行） */
     fail(error: unknown): Promise<void>;
+    /**
+     * run 中止收口（P1-3 run 控制）：协作式 stop 到达步骤边界 / 孤儿 run 被
+     * workflow_control stop 收口。与 fail 同构，状态用 aborted——与失败可区分
+     * （用户主动停 ≠ 出错）。非 completed/failed 步骤一律标 skipped
+     * （含仍处 running 的被中断步骤：穿透式 abort 不经 stepFailed）。
+     */
+    abort(reason?: unknown): Promise<void>;
     /**
      * 记录 workspace 身份（P2.7 隔离启用时，resume attach 的依据）。
      * 仅限 run 进行中（收口后不可再写）。

package/dist/state/recorder.js

@@ -14,6 +14,76 @@
  * status=aborted 预留给中断场景（交互拒绝/人工打断，P2.3+）。
  */
 import { createRun, toErrorRecord, } from "./journal.js";
+import { emitEvent, getEventBus, } from "../observability/events.js";
+/** run -> 进度快照（P2-8 数据源；不含步骤 output，失败摘要截断 200 字符） */
+export function toProgressSnapshot(run) {
+    return {
+        runId: run.runId,
+        workflow: { id: run.workflow.id, version: run.workflow.version },
+        status: run.status,
+        startedAt: run.startedAt,
+        ...(run.completedAt !== undefined ? { completedAt: run.completedAt } : {}),
+        ...(run.failure !== undefined
+            ? { failure: run.failure.message.slice(0, 200) }
+            : {}),
+        ...(run.parentRunId !== undefined ? { parentRunId: run.parentRunId } : {}),
+        ...(run.depth !== undefined ? { depth: run.depth } : {}),
+        steps: run.steps.map((step) => ({
+            index: step.index,
+            ...(step.name !== undefined ? { name: step.name } : {}),
+            status: step.status,
+            ...(step.startedAt !== undefined ? { startedAt: step.startedAt } : {}),
+            ...(step.completedAt !== undefined ? { completedAt: step.completedAt } : {}),
+        })),
+    };
+}
+/** 值 -> 单行预览（字符串直用，其余 JSON 化；超长截断加 …） */
+function previewValue(value, max) {
+    if (value === undefined)
+        return "";
+    const text = typeof value === "string" ? value : JSON.stringify(value) ?? String(value);
+    const collapsed = text.replace(/\s+/g, " ").trim();
+    return collapsed.length <= max ? collapsed : `${collapsed.slice(0, max)}…`;
+}
+/** run -> 详情（journal 事实源；载荷只做预览化，绝不放大体输出） */
+export function toRunDetail(run) {
+    return {
+        runId: run.runId,
+        workflow: { id: run.workflow.id, version: run.workflow.version },
+        status: run.status,
+        startedAt: run.startedAt,
+        ...(run.completedAt !== undefined ? { completedAt: run.completedAt } : {}),
+        ...(run.failure !== undefined
+            ? {
+                failure: previewValue(`${run.failure.name}: ${run.failure.message}`, 300),
+            }
+            : {}),
+        ...(run.parentRunId !== undefined ? { parentRunId: run.parentRunId } : {}),
+        ...(run.depth !== undefined ? { depth: run.depth } : {}),
+        ...(run.args !== undefined ? { args: previewValue(run.args, 200) } : {}),
+        steps: run.steps.map((step) => ({
+            index: step.index,
+            ...(step.name !== undefined ? { name: step.name } : {}),
+            status: step.status,
+            ...(step.startedAt !== undefined ? { startedAt: step.startedAt } : {}),
+            ...(step.completedAt !== undefined ? { completedAt: step.completedAt } : {}),
+            ...(step.input !== undefined && previewValue(step.input, 200) !== ""
+                ? { input: previewValue(step.input, 200) }
+                : {}),
+            ...(step.output !== undefined && previewValue(step.output, 500) !== ""
+                ? { output: previewValue(step.output, 500) }
+                : {}),
+            ...(step.error !== undefined
+                ? {
+                    error: previewValue(`${step.error.name}: ${step.error.message}`, 300),
+                }
+                : {}),
+            ...(step.usage !== undefined ? { usage: step.usage } : {}),
+            ...(step.model !== undefined ? { model: step.model } : {}),
+            ...(step.sessionIDs !== undefined && step.sessionIDs.length > 0 ? { sessionIDs: step.sessionIDs } : {}),
+        })),
+    };
+}
 export class RunJournal {
     store;
     run;
@@ -21,16 +91,54 @@ export class RunJournal {
         this.store = store;
         this.run = run;
     }
+    /**
+     * P2-8b 步骤元数据：订阅 agent.completed（runId 过滤）聚合 token/模型
+     * 到 currentStep。事件同步 fan-out，先于 stepCompleted 落盘——无需
+     * 额外持久化钩子。终态退订防泄漏；reopen 重新订阅。
+     */
+    offUsageMeta;
+    subscribeUsageMeta() {
+        this.offUsageMeta?.();
+        this.offUsageMeta = getEventBus().subscribe((event) => {
+            if (event.type !== "agent.completed")
+                return;
+            if (event.runId !== this.run.runId)
+                return;
+            const step = this.run.steps[this.run.currentStep];
+            if (!step || step.status !== "running")
+                return;
+            if (event.usage) {
+                step.usage = {
+                    input: (step.usage?.input ?? 0) + (event.usage.input ?? 0),
+                    output: (step.usage?.output ?? 0) + (event.usage.output ?? 0),
+                    reasoning: (step.usage?.reasoning ?? 0) + (event.usage.reasoning ?? 0),
+                };
+            }
+            if (event.model)
+                step.model = event.model;
+            // Open Session 回放：会话 ID 按发生顺序累积（pipeline 步 = 多条目多会话）
+            if (event.sessionID) {
+                step.sessionIDs = [...(step.sessionIDs ?? []), event.sessionID];
+            }
+        });
+    }
     /** 创建新 run 并持久化初始状态 */
     static async start(store, input) {
         const run = createRun(input);
         await store.createRun(run);
-        return new RunJournal(store, run);
+        emitEvent({ type: "run.progress", run: toProgressSnapshot(run) });
+        const journal = new RunJournal(store, run);
+        journal.subscribeUsageMeta();
+        return journal;
     }
     /** 附加到已有 run（resume 场景：读取历史 journal 继续记录）；不存在返回 undefined */
     static async attach(store, runId) {
         const run = await store.getRun(runId);
-        return run ? new RunJournal(store, run) : undefined;
+        if (!run)
+            return undefined;
+        const journal = new RunJournal(store, run);
+        journal.subscribeUsageMeta();
+        return journal;
     }
     assertOpen() {
         if (this.run.status !== "running") {
@@ -44,6 +152,10 @@ export class RunJournal {
         }
         return step;
     }
+    /** P2-8：状态转换后派发进度快照（同步 fan-out，handler 抛错被 bus 隔离） */
+    emitProgress() {
+        emitEvent({ type: "run.progress", run: toProgressSnapshot(this.run) });
+    }
     async stepStarted(index, input) {
         this.assertOpen();
         const step = this.step(index);
@@ -52,6 +164,7 @@ export class RunJournal {
         step.startedAt = Date.now();
         this.run.currentStep = index;
         await this.store.saveRun(this.run);
+        this.emitProgress();
     }
     async stepCompleted(index, output) {
         this.assertOpen();
@@ -60,6 +173,7 @@ export class RunJournal {
         step.output = output;
         step.completedAt = Date.now();
         await this.store.saveRun(this.run);
+        this.emitProgress();
     }
     async stepFailed(index, error) {
         this.assertOpen();
@@ -68,6 +182,7 @@ export class RunJournal {
         step.error = toErrorRecord(error);
         step.completedAt = Date.now();
         await this.store.saveRun(this.run);
+        this.emitProgress();
     }
     /** run 成功收口 */
     async complete() {
@@ -75,6 +190,9 @@ export class RunJournal {
         this.run.status = "completed";
         this.run.completedAt = Date.now();
         await this.store.saveRun(this.run);
+        this.offUsageMeta?.();
+        this.offUsageMeta = undefined;
+        this.emitProgress();
     }
     /** run 失败收口：仍为 pending 的步骤标记 skipped（fail-fast 下它们不会被执行） */
     async fail(error) {
@@ -87,6 +205,29 @@ export class RunJournal {
                 step.status = "skipped";
         }
         await this.store.saveRun(this.run);
+        this.offUsageMeta?.();
+        this.offUsageMeta = undefined;
+        this.emitProgress();
+    }
+    /**
+     * run 中止收口（P1-3 run 控制）：协作式 stop 到达步骤边界 / 孤儿 run 被
+     * workflow_control stop 收口。与 fail 同构，状态用 aborted——与失败可区分
+     * （用户主动停 ≠ 出错）。非 completed/failed 步骤一律标 skipped
+     * （含仍处 running 的被中断步骤：穿透式 abort 不经 stepFailed）。
+     */
+    async abort(reason) {
+        this.assertOpen();
+        this.run.status = "aborted";
+        this.run.completedAt = Date.now();
+        this.run.failure = reason === undefined ? undefined : toErrorRecord(reason);
+        for (const step of this.run.steps) {
+            if (step.status !== "completed" && step.status !== "failed")
+                step.status = "skipped";
+        }
+        await this.store.saveRun(this.run);
+        this.offUsageMeta?.();
+        this.offUsageMeta = undefined;
+        this.emitProgress();
     }
     /**
      * 记录 workspace 身份（P2.7 隔离启用时，resume attach 的依据）。
@@ -128,11 +269,16 @@ export class RunJournal {
                 step.error = undefined;
                 step.input = undefined;
                 step.output = undefined;
+                step.usage = undefined;
+                step.model = undefined;
+                step.sessionIDs = undefined;
                 step.startedAt = undefined;
                 step.completedAt = undefined;
             }
         }
         await this.store.saveRun(this.run);
+        this.subscribeUsageMeta();
+        this.emitProgress();
     }
 }
 //# sourceMappingURL=recorder.js.map

package/dist/state/recorder.js.map

@@ -1 +1 @@
-{"version":3,"file":"recorder.js","sourceRoot":"","sources":["../../src/state/recorder.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"recorder.js","sourceRoot":"","sources":["../../src/state/recorder.ts"],"names":[],"mappings":"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"}

package/dist/workflow/agent.d.ts

@@ -3,6 +3,47 @@
  *
  * 不感知 ctx / OpenCode：只经由 requireExecutor() 拿到当前绑定的
  * AgentExecutor 并执行。P2.4 起派发 agent.started / completed / failed 事件。
+ *
+ * P1-4 调用级选项（v1 parity）：
+ *   - model：覆盖本次调用的子会话模型（"providerID/modelId" 或对象），
+ *     经 AgentTask.model 透传，executor 以 task.model 优先于构造期默认
+ *   - timeoutMs：单次尝试超时（Promise.race，超时抛 AgentTimeoutError）；
+ *     超时不会中断底层会话（无 AbortSignal 注入点），只是不再等待——
+ *     与 run 控制的协作式停止同一诚实语义
+ *   - retries / retryDelayMs：失败重试（对超时同样生效——每次尝试独立计时）
+ *
+ * 纪律：事件保持调用级一对 started/completed|failed（不按尝试拆分）。
  */
 import type { AgentResult } from "../runtime/executor.js";
-export declare function agent(prompt: string): Promise<AgentResult>;
+import { type ArgsSchema } from "../registry/schema.js";
+export interface AgentCallOptions {
+    /** 覆盖本次调用的模型："providerID/modelId"（或对象形式，含 variant） */
+    model?: string | {
+        providerID: string;
+        id: string;
+        variant?: string;
+    };
+    /** 单次尝试超时（ms）；超时抛 AgentTimeoutError */
+    timeoutMs?: number;
+    /** 失败重试次数（0 = 不重试；对超时同样生效） */
+    retries?: number;
+    /** 重试间隔 ms（默认 0） */
+    retryDelayMs?: number;
+    /**
+     * P1-6 结构化输出 shim：要求子 agent 按 JSON Schema 返回 JSON 值，
+     * 输出经解析 + validateArgs 校验后挂到 result.structured。
+     * 注意：OpenCode v2 会话 API 无原生结构化输出（PromptInput.Prompt 2.0.22
+     * 仅 text/files/agents/skills，无 v1 的 format 字段）——本 shim 靠
+     * prompt 指令 + 校验 + 失败可重试（retries）保证可靠性，非宿主级约束。
+     */
+    schema?: ArgsSchema;
+}
+/** 结构化输出解析/校验失败（配合 retries 可重试） */
+export declare class AgentSchemaError extends Error {
+    constructor(message: string);
+}
+/** 单次尝试超时（步骤级失败、journal 可见；底层会话不被硬杀） */
+export declare class AgentTimeoutError extends Error {
+    constructor(timeoutMs: number);
+}
+export declare function agent(prompt: string, options?: AgentCallOptions): Promise<AgentResult>;