@akagilnc/pi-workflow-roles 0.1.3789 → 0.1.3797

package/dist/public-cli/main.js

@@ -16645,7 +16645,8 @@ function buildActivationFlagArgs(activation) {
         "--ak-collector-repo",
         activation.repo,
         ...activation.pr === void 0 ? [] : ["--ak-collector-pr", activation.pr],
-        ...activation.requestManifestPath === void 0 ? [] : ["--ak-collector-request-manifest", activation.requestManifestPath]
+        ...activation.requestManifestPath === void 0 ? [] : ["--ak-collector-request-manifest", activation.requestManifestPath],
+        ...activation.waitMs === void 0 ? [] : ["--ak-collector-wait-ms", activation.waitMs]
       ];
     case "doctor":
       return ["--ak-role", "doctor", "--ak-doctor-case", activation.casePath];
@@ -18491,6 +18492,7 @@ async function loadResumableRunRecord(home, runId, authority) {
   let repositoryDisplay;
   let requestManifestPath;
   let manifestDigest;
+  let waitWindowMs;
   let issueNumber;
   let caseRunsPath;
   let caseIdentity2;
@@ -18544,6 +18546,9 @@ async function loadResumableRunRecord(home, runId, authority) {
       if (typeof record4.manifestDigest === "string" && record4.manifestDigest.trim() !== "") {
         manifestDigest = record4.manifestDigest;
       }
+      if (typeof record4.waitWindowMs === "number" && Number.isSafeInteger(record4.waitWindowMs) && record4.waitWindowMs >= 1) {
+        waitWindowMs = record4.waitWindowMs;
+      }
       if (typeof record4.issueNumber === "number" && Number.isSafeInteger(record4.issueNumber) && record4.issueNumber >= 1) {
         issueNumber = record4.issueNumber;
       }
@@ -18659,6 +18664,7 @@ async function loadResumableRunRecord(home, runId, authority) {
       ...repositoryDisplay === void 0 ? {} : { repositoryDisplay },
       ...requestManifestPath === void 0 ? {} : { requestManifestPath },
       ...manifestDigest === void 0 ? {} : { manifestDigest },
+      ...waitWindowMs === void 0 ? {} : { waitWindowMs },
       ...issueNumber === void 0 ? {} : { issueNumber },
       ...caseRunsPath === void 0 ? {} : { caseRunsPath },
       ...caseIdentity2 === void 0 ? {} : { caseIdentity: caseIdentity2 },
@@ -18916,6 +18922,7 @@ async function loadResumableCollectorRun(home, runId, authority) {
     ...prNumber === void 0 ? {} : { prNumber },
     repository: parsedRepository,
     ...loaded.admittedFields.requestManifestPath === void 0 ? {} : { requestManifestPath: loaded.admittedFields.requestManifestPath },
+    ...loaded.admittedFields.waitWindowMs === void 0 ? {} : { waitWindowMs: loaded.admittedFields.waitWindowMs },
     manifestDigest
   };
   return seatLoadedResult(loaded, admitted);
@@ -19744,6 +19751,20 @@ var init_option_definitions = __esm({
           en: "Optional request manifest JSON path ({requests:[{id,body}]}). Role may also decide request bodies from handbook/field activity without this file.",
           zh: "\u53EF\u9009 request manifest JSON \u8DEF\u5F84\uFF08{requests:[{id,body}]}\uFF09\u3002\u89D2\u8272\u4EA6\u53EF\u4F9D\u624B\u518C/\u73B0\u573A\u81EA\u884C\u5224\u5B9A\u8BF7\u6C42\u6B63\u6587\uFF0C\u4E0D\u5FC5\u4F9D\u8D56\u672C\u6587\u4EF6\u3002"
         }
+      },
+      {
+        id: "wait-ms",
+        owner: "collector",
+        canonical: "--wait-ms",
+        aliases: [],
+        valueMetavar: "ms",
+        required: false,
+        repeatable: false,
+        form: "option",
+        description: {
+          en: "Wait-window duration in milliseconds after the work step opens (default 600000 = 10 minutes). Does not require a code change to adjust.",
+          zh: "\u5DE5\u4F5C\u6B65\u9AA4\u5F00\u542F\u540E\u7684\u7B49\u5F85\u7A97\u65F6\u957F\uFF08\u6BEB\u79D2\uFF1B\u9ED8\u8BA4 600000\uFF1D\u5341\u5206\u949F\uFF09\u3002\u6539\u914D\u7F6E\u5373\u53EF\uFF0C\u65E0\u9700\u6539\u4EE3\u7801\u3002"
+        }
       }
     ];
     DOCTOR_OPTIONS = [
@@ -21024,6 +21045,7 @@ function parseCollectorArgv(args) {
   let repo;
   let prNumber;
   let requestManifestPath;
+  let waitWindowMs;
   const positional = [];
   const tokens = [...args];
   const definitions = roleOptions("collector");
@@ -21056,6 +21078,17 @@ function parseCollectorArgv(args) {
         requestManifestPath = requireOptionPath(taken.def.canonical, taken.value);
         continue;
       }
+      if (taken.def.id === "wait-ms") {
+        if (taken.value === void 0 || !/^[1-9]\d*$/.test(taken.value.trim())) {
+          throw new CliUsageError("--wait-ms requires a positive safe-integer millisecond value");
+        }
+        const parsed = Number(taken.value.trim());
+        if (!Number.isSafeInteger(parsed) || parsed < 1) {
+          throw new CliUsageError("--wait-ms requires a positive safe-integer millisecond value");
+        }
+        waitWindowMs = parsed;
+        continue;
+      }
       throw new CliUsageError(`unknown collector option: ${taken.def.canonical}`);
     }
     const token = tokens.shift();
@@ -21071,7 +21104,8 @@ function parseCollectorArgv(args) {
     attachmentPaths,
     ...project === void 0 ? {} : { project },
     ...repo === void 0 ? {} : { repo },
-    ...requestManifestPath === void 0 ? {} : { requestManifestPath }
+    ...requestManifestPath === void 0 ? {} : { requestManifestPath },
+    ...waitWindowMs === void 0 ? {} : { waitWindowMs }
   };
 }
 function resolveGitHubRemoteRepository(projectRoot) {
@@ -21196,6 +21230,7 @@ async function admitCollectorInvocation(options) {
     repository: repository.canonical,
     repositoryDisplay: repository.display,
     ...requestManifestPath === void 0 ? {} : { requestManifestPath },
+    ...options.waitWindowMs === void 0 ? {} : { waitWindowMs: options.waitWindowMs },
     manifestDigest,
     attachments: attachments.map((a) => ({
       provenancePath: a.provenancePath,
@@ -21225,6 +21260,7 @@ async function admitCollectorInvocation(options) {
     ...prNumber === void 0 ? {} : { prNumber },
     repository,
     ...requestManifestPath === void 0 ? {} : { requestManifestPath },
+    ...options.waitWindowMs === void 0 ? {} : { waitWindowMs: options.waitWindowMs },
     manifestDigest
   };
 }
@@ -23597,11 +23633,11 @@ var init_reviewer_dispatch_rejection = __esm({
 });
 
 // src/collector-evidence.ts
-var COLLECTOR_ELIGIBILITY_MS;
+var COLLECTOR_DEFAULT_WAIT_WINDOW_MS;
 var init_collector_evidence = __esm({
   "src/collector-evidence.ts"() {
     "use strict";
-    COLLECTOR_ELIGIBILITY_MS = 15 * 60 * 1e3;
+    COLLECTOR_DEFAULT_WAIT_WINDOW_MS = 10 * 60 * 1e3;
   }
 });
 
@@ -27949,7 +27985,8 @@ function buildCollectorTurnRequest(admitted, options) {
         repo: admitted.repository.display,
         // #676 A: omit pr when unbound — role binds via ak_collector_bind_target.
         ...admitted.prNumber === void 0 ? {} : { pr: String(admitted.prNumber) },
-        ...admitted.requestManifestPath === void 0 ? {} : { requestManifestPath: admitted.requestManifestPath }
+        ...admitted.requestManifestPath === void 0 ? {} : { requestManifestPath: admitted.requestManifestPath },
+        ...admitted.waitWindowMs === void 0 ? {} : { waitMs: String(admitted.waitWindowMs) }
       }
     },
     options
@@ -27969,6 +28006,7 @@ async function runPublicCollector(argv, env, io, parseCollectorArgv2) {
       ...parsed.project === void 0 ? {} : { project: parsed.project },
       ...parsed.repo === void 0 ? {} : { repo: parsed.repo },
       ...parsed.requestManifestPath === void 0 ? {} : { requestManifestPath: parsed.requestManifestPath },
+      ...parsed.waitWindowMs === void 0 ? {} : { waitWindowMs: parsed.waitWindowMs },
       ...env.createRunId === void 0 ? {} : { createRunId: env.createRunId },
       ...env.model === void 0 ? {} : { model: env.model }
     });

package/dist/public-cli/option-definitions.js

@@ -487,6 +487,20 @@ const COLLECTOR_OPTIONS = [
             zh: "可选 request manifest JSON 路径（{requests:[{id,body}]}）。角色亦可依手册/现场自行判定请求正文，不必依赖本文件。",
         },
     },
+    {
+        id: "wait-ms",
+        owner: "collector",
+        canonical: "--wait-ms",
+        aliases: [],
+        valueMetavar: "ms",
+        required: false,
+        repeatable: false,
+        form: "option",
+        description: {
+            en: "Wait-window duration in milliseconds after the work step opens (default 600000 = 10 minutes). Does not require a code change to adjust.",
+            zh: "工作步骤开启后的等待窗时长（毫秒；默认 600000＝十分钟）。改配置即可，无需改代码。",
+        },
+    },
 ];
 const DOCTOR_OPTIONS = [
     bindOwner("doctor", SHARED_PROJECT_SEMANTICS),

package/dist/public-cli/run-lifecycle.js

@@ -880,6 +880,7 @@ async function loadResumableRunRecord(home, runId, authority) {
     let repositoryDisplay;
     let requestManifestPath;
     let manifestDigest;
+    let waitWindowMs;
     let issueNumber;
     let caseRunsPath;
     let caseIdentity;
@@ -934,6 +935,9 @@ async function loadResumableRunRecord(home, runId, authority) {
             if (typeof record.manifestDigest === "string" && record.manifestDigest.trim() !== "") {
                 manifestDigest = record.manifestDigest;
             }
+            if (typeof record.waitWindowMs === "number" && Number.isSafeInteger(record.waitWindowMs) && record.waitWindowMs >= 1) {
+                waitWindowMs = record.waitWindowMs;
+            }
             // Doctor — admitted single-case identity (#633 resume).
             if (typeof record.issueNumber === "number" && Number.isSafeInteger(record.issueNumber) && record.issueNumber >= 1) {
                 issueNumber = record.issueNumber;
@@ -1074,6 +1078,7 @@ async function loadResumableRunRecord(home, runId, authority) {
             ...(repositoryDisplay === undefined ? {} : { repositoryDisplay }),
             ...(requestManifestPath === undefined ? {} : { requestManifestPath }),
             ...(manifestDigest === undefined ? {} : { manifestDigest }),
+            ...(waitWindowMs === undefined ? {} : { waitWindowMs }),
             ...(issueNumber === undefined ? {} : { issueNumber }),
             ...(caseRunsPath === undefined ? {} : { caseRunsPath }),
             ...(caseIdentity === undefined ? {} : { caseIdentity }),
@@ -1338,6 +1343,9 @@ export async function loadResumableCollectorRun(home, runId, authority) {
         ...(loaded.admittedFields.requestManifestPath === undefined
             ? {}
             : { requestManifestPath: loaded.admittedFields.requestManifestPath }),
+        ...(loaded.admittedFields.waitWindowMs === undefined
+            ? {}
+            : { waitWindowMs: loaded.admittedFields.waitWindowMs }),
         manifestDigest,
     };
     return seatLoadedResult(loaded, admitted);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@akagilnc/pi-workflow-roles",
-  "version": "0.1.3789",
+  "version": "0.1.3797",
   "description": "Soul-bound workflow roles for Pi",
   "type": "module",
   "license": "Apache-2.0",

package/souls/countersign.md

@@ -8,37 +8,39 @@
 **一、立法。** 先为本票立「适用法」；后面每一步对着它问，未立法不得往下走。适用法三部分：
 1 第一法源立法（最高法）：该票起居录，全局宪法，仓内治理文件；
 
-2 第二发源立法：
+2 第二法源立法：
 适用 ADR——由你自行检索，按票面触及的席位、接缝、术语在 docs/adr 与 CONTEXT.md 查全，票面引没引都算——并逐键列出其决策键；质量法、审刑院法典；
 
-3 第二法源合法性检查：判断第二法源 以及 输入的 prompt等 对比第一法源是否有超出或不足，曲解。如有，除非有陛下原话批准，否则直接封驳 要求改正或陛下批准。
+3 第二法源合法性检查：判断第二法源 以及 输入的 prompt等 对比第一法源是否有超出，不足，曲解。如有，除非有陛下原话批准，否则直接封驳 要求改正或陛下批准。
 
-**二、相抵。** 票面，相关票与在飞分支与法源有无抵触。
+**二、相抵** 票面，相关票与在飞分支与法源有无抵触。
 
-**三、缺失。** 法源要求的，票面有没有漏：适用 ADR 未被引用即缺失，引用须写 `docs/adr/...md` 路径；ADR 每个决策键须有落点或明写「由 #x 承接」；验收面须覆盖票面每条主张；前置产物、决定、答复须在；承重主张的源头不存在、不支持、已过时，同为缺失。
+**三、缺失** 法源要求的，票面有没有漏：适用 ADR 未被引用即缺失，引用须写 `docs/adr/...md` 路径；ADR 每个决策键须有落点或明写「由 #x 承接」；验收面须覆盖票面每条主张；前置产物、决定、答复须在；承重主张的源头不存在、不支持、已过时，同为缺失。缺失列表在能力范围内一次扫完，尽量避免因缺失导致多轮往返。
 
-**四、擅加。** 票面有没有超出法源的机制、约束、验收、术语。
+**四、擅加** 票面有没有超出法源的机制、约束、验收、术语。
+
+**五、符合陛下意图** 先根据起居录对话，判断陛下意图。再证实票面是否是陛下想要的，对于修复票，判断 根因是什么、证据在哪 。对于新功能设计票，判断设计是不是合理，是不是陛下想要的方向。以及 因果链本身站不站得住
 
 各步取证按《审法·取证边界》：读码、开卷、传召皆可；探针只落 worktree 与临时目录，不得删改其外任何路径。交付时候清理回原样
 
 ## 审读五问
 
-四步是审读，五问是裁决口径，对应关系固定，不重做：
+五步是审读，五问是裁决口径，对应关系固定，不重做：
 1. 票面是否符合既定制度——由「相抵」答；
 2. 授权是否真实——由「立法②」答：不认转述与口头；
-3. 文书是否与原意一致——由「缺失」「擅加」答：无过度解释、无夹带、无缺口；
+3. 文书是否与原意一致——由「缺失」「擅加」「符合陛下意图」答：无过度解释、无夹带、无缺口、符合原意；
 4. 是否存在必须退回重议的问题；
 5. 是否已具备正式发布与执行资格。
 
-**每次开庭都是全票审读，复审亦然——四步五问对全票重新过一遍；上轮封驳条目只是必须核销的部分，不划定审读范围。永远全审，没有局部一说。**
+**每次开庭都是全票审读，复审亦然——五步五问对全票重新过一遍；上轮封驳条目只是必须核销的部分，不划定审读范围。永远全审，没有局部一说。**
 
 ## 判词
 
 事实与处方分开对宪：裁决落法度与事实；施工设计与实现细节过早堆上票面即为失职。
 
-- 署（converged）——四步无碍、五问皆有据可答，具备开工资格；
+- 署（converged）——五步无碍、五问皆有据可答，具备开工资格；
 - 封驳（continue）——存在必须退回重议的问题；写明退给谁、缺什么、属哪一步；
-- 上呈（escalate）——无法正常暑/封驳时。上呈求助
+- 上呈（escalate）——无法正常署/封驳时。上呈求助
 
 
 主张必须附证据或法的具体条目。finding 提类别，同类一次说全（审刑院法典·审官纪律）。

package/src/acp-host/role-envelope.ts

@@ -98,6 +98,7 @@ export function projectAcpActivationFlags(request: RoleTurnRequest): Map<string,
     // #676 D1: pr optional at admission; omit flag when role binds from materials.
     if (activation.pr !== undefined) flags.set("ak-collector-pr", activation.pr);
     if (activation.requestManifestPath !== undefined) flags.set("ak-collector-request-manifest", activation.requestManifestPath);
+    if (activation.waitMs !== undefined) flags.set("ak-collector-wait-ms", activation.waitMs);
   }
   return flags;
 }

package/src/collector-evidence.ts

@@ -11,7 +11,8 @@ import type {
   GitHubUser,
 } from "./collector-github.ts";
 
-export const COLLECTOR_ELIGIBILITY_MS = 15 * 60 * 1000;
+/** Default collector wait window (D4): 10 minutes from the work-step open, not from session activation. */
+export const COLLECTOR_DEFAULT_WAIT_WINDOW_MS = 10 * 60 * 1000;
 
 export type WindowRelation = "before" | "within" | "after" | "uncertain";
 export type HeadRelation = "current" | "prior";
@@ -73,6 +74,8 @@ export type CollectorSnapshot = {
   prNumber: number;
   prState: string;
   headOid: string;
+  /** PR create success time when GitHub supplies it (#678 new-PR wait start). */
+  prCreatedAt?: string;
   complete: boolean;
   evidenceIds: string[];
   pageDiagnostics: GitHubPageDiagnostics[];
@@ -177,6 +180,7 @@ export function normalizePullRequestEvidence(
     number: pr.number,
     state: pr.state,
     headOid: pr.headOid,
+    createdAt: pr.createdAt ?? null,
     updatedAt: pr.updatedAt ?? null,
     htmlUrl: pr.url,
   });
@@ -190,6 +194,7 @@ export function normalizePullRequestEvidence(
     state: pr.state,
     commitOid: pr.headOid,
     htmlUrl: pr.url,
+    // Version clock stays updatedAt. Create success for the wait window is snapshot.prCreatedAt only (#678).
     authoritativeTime: pr.updatedAt ?? null,
     firstObservedAt: observedAt,
     raw: pr.raw,

package/src/collector-github.ts

@@ -7,6 +7,8 @@ export type GitHubPullRequest = {
   number: number;
   state: string;
   headOid: string;
+  /** GitHub PR created_at — work-step start for new-PR auto-trigger rounds (#678 D4). */
+  createdAt?: string;
   updatedAt?: string;
   url: string;
   raw: unknown;
@@ -491,6 +493,7 @@ export function normalizePullRequest(raw: unknown): GitHubPullRequest {
     number,
     state,
     headOid: head["sha"],
+    ...(typeof raw["created_at"] === "string" ? { createdAt: raw["created_at"] } : {}),
     ...(typeof raw["updated_at"] === "string" ? { updatedAt: raw["updated_at"] } : {}),
     url: htmlUrl,
     raw,

package/src/collector-identity.ts

@@ -151,6 +151,20 @@ export class CollectorNonOpenRequestError extends CorrectableSubmissionError {
   }
 }
 
+/** #678: wait window not open or already ended — bounce without latching fatal so materials still seal. */
+export class CollectorWaitWindowClosedError extends CorrectableSubmissionError {
+  constructor(action: "request" | "wait" | "wait-before-open") {
+    super(
+      action === "request"
+        ? "通进司请求不在资格截止前"
+        : action === "wait-before-open"
+          ? "通进司等待需要先在工作步骤开启等待窗（新建 PR 用创建成功时刻；已有 PR 在触发阶段结束后开启）"
+          : "通进司等待不在资格截止前",
+    );
+    this.name = "CollectorWaitWindowClosedError";
+  }
+}
+
 function candidateRecord(candidate: unknown): Record<string, unknown> | undefined {
   if (candidate === undefined || candidate === null || typeof candidate !== "object" || Array.isArray(candidate)) {
     return undefined;

package/src/collector-ledger.ts

@@ -2,7 +2,7 @@ import type { CollectorManifest, CollectorRepository } from "./collector-config.
 import {
   applyEvidenceVersionHistory,
   assignWindowRelations,
-  COLLECTOR_ELIGIBILITY_MS,
+  COLLECTOR_DEFAULT_WAIT_WINDOW_MS,
   measureNormalizedBytes,
   normalizeAuthenticatedUserEvidence,
   normalizeIssueCommentEvidence,
@@ -23,13 +23,18 @@ import {
   type GitHubPageDiagnostics,
   type GitHubPullRequest,
 } from "./collector-github.ts";
-import { CollectorNonOpenRequestError } from "./collector-identity.ts";
+import {
+  CollectorNonOpenRequestError,
+  CollectorWaitWindowClosedError,
+} from "./collector-identity.ts";
 import { COLLECTOR_OUTPUT_TOOL } from "./package-contracts/collector-output.ts";
 
 export const COLLECTOR_OBSERVE_TOOL = "ak_collector_observe";
 export const COLLECTOR_READ_TOOL = "ak_collector_read";
 export const COLLECTOR_REQUEST_TOOL = "ak_collector_request";
 export const COLLECTOR_WAIT_TOOL = "ak_collector_wait";
+/** #678 D4: open wait window at a work step — business tool, ledger-booked. */
+export const COLLECTOR_OPEN_WAIT_WINDOW_TOOL = "ak_collector_open_wait_window";
 /** #676 A: role-decided target bind — business tool, ledger-booked. */
 export const COLLECTOR_BIND_TARGET_TOOL = "ak_collector_bind_target";
 /** #677: opaque handbook write — business tool, ledger-booked. */
@@ -41,6 +46,7 @@ export const COLLECTOR_OPERATIONAL_TOOLS = [
   COLLECTOR_OBSERVE_TOOL,
   COLLECTOR_READ_TOOL,
   COLLECTOR_REQUEST_TOOL,
+  COLLECTOR_OPEN_WAIT_WINDOW_TOOL,
   COLLECTOR_WAIT_TOOL,
   COLLECTOR_HANDBOOK_WRITE_TOOL,
 ] as const;
@@ -83,6 +89,8 @@ export type ObserveModelView = {
   completedAt: string;
   prState: string;
   headOid: string;
+  /** PR create success time when known — new-PR wait-window startedAt (#678 D4). */
+  prCreatedAt?: string;
   complete: boolean;
   evidence: ObserveEvidenceEntry[];
   requestAttempts: Array<{
@@ -158,6 +166,15 @@ export type CollectorConfigState = {
   /** Bound PR target; undefined until explicit flag, admission bind, or role bind-target tool. */
   prNumber: number | undefined;
   manifest: CollectorManifest;
+  /**
+   * Wait window duration (#678 D4). Default 10 minutes; caller-configurable without code change.
+   * Window opens at a work step (PR create success / trigger-phase end), not session activation.
+   */
+  waitWindowMs: number;
+};
+
+export type CollectorLedgerConfigInput = Omit<CollectorConfigState, "waitWindowMs"> & {
+  waitWindowMs?: number;
 };
 
 /** Durable session journal sink owned by the shared execution seam. */
@@ -177,8 +194,11 @@ export type CollectorLedger = {
   readonly fatal: boolean;
   readonly fatalReason: string | undefined;
   readonly outputCandidate: boolean;
+  /** Session ready (before_agent_start); not the wait window. */
   readonly activationRecorded: boolean;
+  /** Wait-window start (receipt activationTime); undefined until openWaitWindow. */
   readonly activationTime: Date | undefined;
+  /** Wait-window end; undefined until openWaitWindow. */
   readonly deadlineTime: Date | undefined;
   readonly activationMono: number | undefined;
   readonly deadlineMono: number | undefined;
@@ -192,7 +212,13 @@ export type CollectorLedger = {
 
   latchFatal(reason: string, cause?: unknown): Error;
   assertNotFatal(): void;
+  /** Mark session ready for prep observe/request; does not open the wait window (#678). */
   recordActivation(clock: CollectorClock): void;
+  /**
+   * Open the wait window once at a work step. Optional startedAt covers new-PR create success;
+   * omit for existing-PR trigger-phase end (= now). Second call is a no-op (D6: updates do not reset).
+   */
+  openWaitWindow(clock: CollectorClock, options?: { startedAt?: Date }): void;
   recordOutputCandidate(): void;
   /** #676 A: role-decided unique PR bind (business fact on the ledger). */
   bindTarget(prNumber: number): void;
@@ -237,16 +263,31 @@ function isOperationalTool(name: string): name is CollectorOperationalTool {
   return (COLLECTOR_OPERATIONAL_TOOLS as readonly string[]).includes(name);
 }
 
+function resolveWaitWindowMs(raw: number | undefined): number {
+  if (raw === undefined) return COLLECTOR_DEFAULT_WAIT_WINDOW_MS;
+  if (!Number.isSafeInteger(raw) || raw < 1) {
+    throw new Error("通进司 waitWindowMs 须为正安全整数毫秒");
+  }
+  return raw;
+}
+
 export function createCollectorLedger(
-  config: CollectorConfigState,
+  input: CollectorLedgerConfigInput,
   options?: CollectorLedgerOptions,
 ): CollectorLedger {
+  const config: CollectorConfigState = {
+    repository: input.repository,
+    prNumber: input.prNumber,
+    manifest: input.manifest,
+    waitWindowMs: resolveWaitWindowMs(input.waitWindowMs),
+  };
   const clock = options?.clock;
   const journal = options?.journal;
   let fatal = false;
   let fatalReason: string | undefined;
   let outputCandidate = false;
   let pendingOutputCallId: string | undefined;
+  let sessionReady = false;
   let activationTime: Date | undefined;
   let deadlineTime: Date | undefined;
   let activationMono: number | undefined;
@@ -297,7 +338,7 @@ export function createCollectorLedger(
   };
 
   const remainingMs = (clock: CollectorClock): number => {
-    if (deadlineMono === undefined) return COLLECTOR_ELIGIBILITY_MS;
+    if (deadlineMono === undefined) return config.waitWindowMs;
     return Math.max(0, deadlineMono - monoNowOrThrow(clock));
   };
 
@@ -380,7 +421,9 @@ export function createCollectorLedger(
   };
 
   const commitActivationWindow = (nextActivation: Date, nextDeadline: Date): void => {
+    // D6: once open, PR updates / second open must not reset the window.
     if (activationTime !== undefined) return;
+    sessionReady = true;
     activationTime = nextActivation;
     deadlineTime = nextDeadline;
     bindDeadlineMonoFromWall();
@@ -520,6 +563,8 @@ export function createCollectorLedger(
       if (entry.customType === COLLECTOR_ACTIVATION_ENTRY_TYPE) {
         if (typeof data.activationTime === "string" && typeof data.deadlineTime === "string") {
           commitActivationWindow(new Date(data.activationTime), new Date(data.deadlineTime));
+        } else if (data.sessionReady === true) {
+          sessionReady = true;
         }
         continue;
       }
@@ -581,7 +626,7 @@ export function createCollectorLedger(
       return outputCandidate || pendingOutputCallId !== undefined;
     },
     get activationRecorded() {
-      return activationTime !== undefined;
+      return sessionReady;
     },
     get activationTime() {
       return activationTime;
@@ -620,16 +665,38 @@ export function createCollectorLedger(
     latchFatal,
     assertNotFatal,
 
-    recordActivation(clock) {
+    recordActivation(_clock) {
+      assertNotFatal();
+      if (sessionReady) return;
+      sessionReady = true;
+      // Session ready only — wait window opens later at a work step (#678 D4).
+      appendJournal(COLLECTOR_ACTIVATION_ENTRY_TYPE, {
+        sessionReady: true,
+      });
+    },
+
+    openWaitWindow(clock, options) {
       assertNotFatal();
-      if (activationTime !== undefined) return;
-      activationTime = clock.wallNow();
-      activationMono = clock.monoNow();
-      deadlineTime = new Date(activationTime.getTime() + COLLECTOR_ELIGIBILITY_MS);
-      deadlineMono = activationMono + COLLECTOR_ELIGIBILITY_MS;
+      if (!sessionReady) {
+        throw latchFatal("通进司开启等待窗需要先激活会话");
+      }
+      if (activationTime !== undefined) return; // D6: do not reset
+      const startedAt = options?.startedAt ?? clock.wallNow();
+      if (!(startedAt instanceof Date) || Number.isNaN(startedAt.getTime())) {
+        throw new Error("通进司等待窗 startedAt 须为有效时间");
+      }
+      const nextDeadline = new Date(startedAt.getTime() + config.waitWindowMs);
+      // Bind mono relative to current clock so a past startedAt shortens remaining correctly.
+      activationTime = startedAt;
+      deadlineTime = nextDeadline;
+      const wallNow = clock.wallNow().getTime();
+      const monoNow = clock.monoNow();
+      activationMono = monoNow - (wallNow - startedAt.getTime());
+      deadlineMono = monoNow + (nextDeadline.getTime() - wallNow);
       appendJournal(COLLECTOR_ACTIVATION_ENTRY_TYPE, {
         activationTime: activationTime.toISOString(),
         deadlineTime: deadlineTime.toISOString(),
+        waitWindowMs: config.waitWindowMs,
       });
     },
 
@@ -733,7 +800,7 @@ export function createCollectorLedger(
 
     async observe(transport, clock, signal) {
       assertNotFatal();
-      if (activationTime === undefined) {
+      if (!sessionReady) {
         throw latchFatal("通进司观察需要激活");
       }
       if (signal?.aborted) {
@@ -841,6 +908,7 @@ export function createCollectorLedger(
         prNumber: requireBoundPr(),
         prState: pr.state,
         headOid: pr.headOid,
+        ...(pr.createdAt === undefined ? {} : { prCreatedAt: pr.createdAt }),
         complete: true,
         evidenceIds: storedIds,
         pageDiagnostics,
@@ -877,7 +945,7 @@ export function createCollectorLedger(
 
     async request(input, transport, clock, signal) {
       assertNotFatal();
-      if (activationTime === undefined || deadlineTime === undefined) {
+      if (!sessionReady) {
         throw latchFatal("通进司请求需要激活");
       }
       if (ledger.unresolvedTransportFailure) {
@@ -918,7 +986,8 @@ export function createCollectorLedger(
       }
       if (pastCutoff(clock)) {
         finalObservationRequired = true;
-        throw latchFatal("通进司请求不在资格截止前");
+        // #678: do not latch fatal — materials must still seal after the window ends.
+        throw new CollectorWaitWindowClosedError("request");
       }
 
       // Caller manifest body wins when requestId is configured; otherwise role body.
@@ -1035,23 +1104,23 @@ export function createCollectorLedger(
 
     async wait(input, clock, signal) {
       assertNotFatal();
-      if (activationTime === undefined) {
+      if (!sessionReady) {
         throw latchFatal("通进司等待需要激活");
       }
+      // #678: wait never invents a window start. Work-step open (create-success / trigger-end)
+      // must be explicit — silent "now" would break the new-PR create-success clock.
+      if (activationTime === undefined || deadlineTime === undefined) {
+        throw new CollectorWaitWindowClosedError("wait-before-open");
+      }
       // durationMs shape authority = collectorWaitArgsSchema (host parameters).
       if (pastCutoff(clock)) {
         finalObservationRequired = true;
-        throw latchFatal("通进司等待不在资格截止前");
+        throw new CollectorWaitWindowClosedError("wait");
       }
 
       const remaining = remainingMs(clock);
-      // Single-wait runtime cadence cap (v2 §6 / §9); schema max stays 15m.
-      const COLLECTOR_SINGLE_WAIT_MAX_MS = 300_000;
-      const effectiveMs = Math.min(
-        input.durationMs,
-        remaining,
-        COLLECTOR_SINGLE_WAIT_MAX_MS,
-      );
+      // Cap only by remaining window — no package-local single-wait ceiling (ADR 0035 / #678).
+      const effectiveMs = Math.min(input.durationMs, remaining);
       const startedAt = clock.wallNow().toISOString();
       const waitId = sha256Text(`wait:${startedAt}:${effectiveMs}`).slice(0, 16);
       await clock.sleep(effectiveMs, signal);
@@ -1143,6 +1212,9 @@ function buildObserveModelView(input: {
     completedAt: input.snapshot.completedAt,
     prState: input.snapshot.prState,
     headOid: input.snapshot.headOid,
+    ...(input.snapshot.prCreatedAt === undefined
+      ? {}
+      : { prCreatedAt: input.snapshot.prCreatedAt }),
     complete: input.snapshot.complete,
     evidence: relevant.map((record): ObserveEvidenceEntry => projectEvidenceEntryView(record)),
     requestAttempts: input.attempts.map((attempt) => ({