@akagilnc/pi-workflow-roles 0.1.5241 → 0.1.5245

package/src/collector-tool-schemas.ts

@@ -2,136 +2,26 @@ import { Type, type Static } from "typebox";
 import { openToolObject } from "./open-tool-schema.ts";
 import { withTerminatingOutputDeclarations } from "./package-contracts/terminating-infrastructure.ts";
 
-// #836 r16 class 3: execute() reads no params for this tool
-// (src/collector-role.ts:431-459) — a closed root only rejects the role for
-// saying more; no reader consumes extra fields.
-export const collectorObserveArgsSchema = Type.Object({}, { additionalProperties: true });
-// #836 r16 class 4: the regex was a real provider shape rejection ahead of the
-// ledger's own identity check — src/collector-ledger.ts:911-972 already trims
-// and enforces non-empty/lookup/marker/attemptKey identity on requestId once
-// the tool receives it, so the duplicate pattern-based rejection is deleted
-// (r15b decision, not reopened here).
-export const collectorRequestArgsSchema = Type.Object({
-  requestId: Type.String({
-    minLength: 1,
-    description: "请求身份（配置 id 或角色判定的稳定 id；首尾无空白）",
-  }),
-  snapshotId: Type.String({ minLength: 1, description: "最新留存观察快照" }),
-  // #836 r16 class 3: body.minLength deleted — manifest-configured requestId
-  // ignores body, and the unknown-requestId non-empty condition is a real
-  // branch in src/collector-ledger.ts:922-951, not a provider shape gate.
-  body: Type.Optional(Type.String({
-    description: "角色判定的请求正文；request-manifest 未收录该 requestId 时必填",
-  })),
-}, { additionalProperties: true });
-/** UTF-8 byte ceiling per handbook body — keeps next activation materials inside context budget. */
-export const COLLECTOR_HANDBOOK_MAX_BYTES = 64 * 1024;
-export const collectorHandbookWriteArgsSchema = Type.Object({
-  scope: Type.Union([
-    Type.Literal("general"),
-    Type.Literal("repo"),
-  ], { description: "general＝通用手册；repo＝当前仓库差异" }),
-  body: Type.String({
-    description: `手册全文（opaque 工作记忆；整份替换；UTF-8 至多 ${COLLECTOR_HANDBOOK_MAX_BYTES} 字节）`,
-  }),
-}, { additionalProperties: true });
-export const collectorReadArgsSchema = Type.Object({
-  evidenceId: Type.String({ minLength: 1, description: "observe 返回的材料证据 id（evidenceId）" }),
-}, { additionalProperties: true });
-export const collectorWaitArgsSchema = Type.Object({
-  durationMs: Type.Integer({
-    minimum: 1,
-    description: "等待毫秒；实际睡眠不超过剩余等待窗（#678；无包内单次任意上限）",
-  }),
-}, { additionalProperties: true });
-
 /**
- * #678 D4: open the wait window at a work step.
- * Omit startedAt for existing-PR trigger-phase end (= now).
- * Pass PR creation success time for new-PR auto-trigger rounds.
- */
-// #836 r16 class 3: startedAt.minLength deleted — an empty string is already
-// handled as omission by src/collector-role.ts:586-597, so the provider
-// nonblank gate is not load-bearing for any branch.
-export const collectorOpenWaitWindowArgsSchema = Type.Object({
-  startedAt: Type.Optional(Type.String({
-    description: "等待窗起点 ISO 时间；新建 PR 用创建成功时刻；省略＝现在（触发阶段结束）",
-  })),
-}, { additionalProperties: true });
-
-/**
- * #676 A: role-decided target bind. The model judges task materials and submits
- * the chosen PR and/or issue identity; runtime only performs online association
- * for the role-chosen ticket — never scrapes task text to lock a target.
- */
-export const collectorBindTargetArgsSchema = Type.Object({
-  prNumber: Type.Optional(Type.Unknown({
-    description: "本仓 PR 号（正整数）。",
-  })),
-  issueNumber: Type.Optional(Type.Unknown({
-    description: "本仓 issue 号（正整数）。",
-  })),
-}, { additionalProperties: true });
-
-/**
- * #641 chain① / #676 C / ADR 0057: nested finding item declarations for model
- * guidance. Host must not pure-shape-reject the envelope (第 0 条). Runtime binds
- * resolvable evidence pointers only; unprojected content stays distinguishable.
- */
-const collectorFindingItemDeclaration = (() => {
-  // Nested declarations for model guidance only — open required so host cannot
-  // pure-shape-reject missing optional fields (第 0 条 / ADR 0057 / #676 C).
-  const item = Type.Object(
-    {
-      evidenceId: Type.Unknown({
-        description: "observe 返回的材料指针（必填语义）",
-      }),
-      category: Type.Unknown({
-        description: "简短归类标签，不是摘要",
-      }),
-      summary: Type.Unknown({
-        description: "哪个 bot、什么问题的摘要；不誊抄正文",
-      }),
-    },
-    {
-      additionalProperties: true,
-      description:
-        "单条 finding 指针：evidenceId，以及可选 category、summary。",
-    },
-  );
-  (item as unknown as { required: string[] }).required = [];
-  return item;
-})();
-
-/**
- * Field declarations + descriptions are guidance for the model — host must not
- * pure-shape-reject the envelope (第 0 条 / ADR 0057).
+ * #1088: LLM gathers evidence via host CLI and submits the receipt.
+ * Field declarations guide the model — host must not pure-shape-reject (第 0 条 / ADR 0057).
+ * Presence of `groups` remains the Collector terminal discriminator for settlement/analyst.
  */
 export const collectorOutputBaseSchema = openToolObject(
   Type.Object({
-    // No root type:array — host must not shape-reject non-array findings (#676 C).
-    // Nested item declarations ride `items` for registration preservation (ADR 0057).
-    findings: Type.Unsafe({
+    groups: Type.Unsafe({
       description:
-        "本次收集到的逐条 findings 指针。",
-      items: collectorFindingItemDeclaration,
+        "按机器身份归组的出席、材料与逐条 findings（LLM 自行从宿主 CLI 取证整理；代码不代收不归并）。",
     }),
     unfinishedReasons: Type.Unknown({
-      description:
-        "未完成原因。",
+      description: "未完成原因；取证受限时如实报告。",
     }),
   }),
 );
 
-/** Runtime owns the observed evidence; the model submits findings and signals sole-final submission. */
+/** Runtime does not enrich findings; the model submits the receipt and signals sole-final. */
 export const collectorOutputArgsSchema = withTerminatingOutputDeclarations(
   collectorOutputBaseSchema,
 );
 
-export type CollectorObserveArgs = Static<typeof collectorObserveArgsSchema>;
-export type CollectorRequestArgs = Static<typeof collectorRequestArgsSchema>;
-export type CollectorReadArgs = Static<typeof collectorReadArgsSchema>;
-export type CollectorWaitArgs = Static<typeof collectorWaitArgsSchema>;
-export type CollectorOpenWaitWindowArgs = Static<typeof collectorOpenWaitWindowArgsSchema>;
-export type CollectorBindTargetArgs = Static<typeof collectorBindTargetArgsSchema>;
 export type CollectorOutputArgs = Static<typeof collectorOutputArgsSchema>;

package/src/gh-api-runner.ts

@@ -0,0 +1,102 @@
+import { spawn } from "node:child_process";
+
+export type GhApiRunOptions = {
+  signal?: AbortSignal;
+};
+
+export type GhApiResponse = {
+  status: number;
+  headers: Record<string, string>;
+  bodyText: string;
+};
+
+export type GhApiRunner = (
+  args: readonly string[],
+  options?: GhApiRunOptions,
+) => Promise<GhApiResponse>;
+
+export function createGhApiRunner(
+  options: {
+    spawnImpl?: typeof spawn;
+    env?: NodeJS.ProcessEnv;
+  } = {},
+): GhApiRunner {
+  const spawnImpl = options.spawnImpl ?? spawn;
+  return async (args, runOptions = {}) => {
+    return await new Promise<GhApiResponse>((resolve, reject) => {
+      const signal = runOptions.signal;
+      if (signal?.aborted) {
+        reject(signal.reason ?? new Error("aborted"));
+        return;
+      }
+      const child = spawnImpl("gh", args, {
+        env: options.env ?? process.env,
+        stdio: ["ignore", "pipe", "pipe"],
+      });
+      let stdout = "";
+      let stderr = "";
+      let settled = false;
+      const settle = (fn: () => void) => {
+        if (settled) return;
+        settled = true;
+        if (signal !== undefined) {
+          signal.removeEventListener("abort", onAbort);
+        }
+        fn();
+      };
+      const onAbort = () => {
+        try {
+          child.kill("SIGTERM");
+        } catch (error) {
+          settle(() => reject(error));
+          return;
+        }
+        settle(() => {
+          reject(signal?.reason ?? new Error("aborted"));
+        });
+      };
+      if (signal !== undefined) {
+        signal.addEventListener("abort", onAbort, { once: true });
+      }
+      child.stdout.setEncoding("utf8").on("data", (chunk) => {
+        stdout += chunk;
+      });
+      child.stderr.setEncoding("utf8").on("data", (chunk) => {
+        stderr += chunk;
+      });
+      child.on("error", (error) => {
+        settle(() => reject(error));
+      });
+      child.on("close", (code, signal) => {
+        settle(() => {
+          // gh api --include prints: HTTP/ headers blank-line body
+          const match = stdout.match(/^HTTP\/[\d.]+\s+(\d+)[^\n]*\r?\n([\s\S]*?)\r?\n\r?\n([\s\S]*)$/);
+          if (match) {
+            const status = Number(match[1]);
+            const headerText = match[2] ?? "";
+            const bodyText = match[3] ?? "";
+            const headers: Record<string, string> = {};
+            for (const line of headerText.split(/\r?\n/)) {
+              const idx = line.indexOf(":");
+              if (idx === -1) continue;
+              const name = line.slice(0, idx).trim().toLowerCase();
+              const value = line.slice(idx + 1).trim();
+              headers[name] = value;
+            }
+            resolve({ status, headers, bodyText });
+            return;
+          }
+          if (code === 0) {
+            resolve({ status: 200, headers: {}, bodyText: stdout });
+            return;
+          }
+          const failure = new Error(
+            `gh api failed without a parseable HTTP response (code=${String(code)}): ${stderr || stdout}`,
+            { cause: { code, signal, stderr, stdout } },
+          );
+          reject(failure);
+        });
+      });
+    });
+  };
+}

package/src/package-contracts/collector-output.ts

@@ -1,188 +1,29 @@
 /** Package-owned Collector receipt leaf — no role registration surface. */
 
 export const COLLECTOR_OUTPUT_TOOL = "ak_collector_output";
-export const COLLECTOR_HOST = "github.com";
 
+/**
+ * One identity group on the LLM-submitted receipt.
+ * #1088: code no longer builds ledger projections; the model submits groups.
+ */
 export type CollectorIdentityGroup = {
   identity: Record<string, unknown> | null;
   displayLogin?: string;
-  attendance: true;
-  materials: Array<Record<string, unknown>>;
-  findings: Array<Record<string, unknown>>;
-};
-
-export type CollectorRequestAttempt = {
-  attemptId: string;
-  requestId: string;
-  observedHead: string;
-  snapshotId: string;
-  marker: string;
-  body: string;
-  startedAt: string;
-  status: "started" | "succeeded" | "rejected" | "ambiguous_loss" | "recovered";
-  responseDiagnostics?: string;
-  commentEvidenceId?: string;
-  recoverySnapshotId?: string;
-};
-
-export type CollectorSnapshot = {
-  snapshotId: string;
-  observedAt: string;
-  completedAt: string;
-  completedMono: number;
-  host: "github.com";
-  repository: string;
-  prNumber: number;
-  prState: string;
-  headOid: string;
-  complete: boolean;
-  evidenceIds: string[];
-  pageDiagnostics: Array<Record<string, unknown>>;
-  normalizedByteLength: number;
+  attendance?: true;
+  materials?: Array<Record<string, unknown>>;
+  findings?: Array<Record<string, unknown>>;
 };
 
 /**
- * #641 chain① receipt evidence record: pointer/integrity facts only. Bodies and
- * raw payloads stay in the volume (observe details + GitHub pointer) and are
- * never transcribed into the receipt.
+ * Collector receipt as submitted. Presence of `groups` is the terminal
+ * discriminator for settlement/analyst (#836: original object is the receipt).
  */
-export type CollectorEvidenceRecord = {
-  evidenceId: string;
-  kind: string;
-  versionId: string;
-  contentDigest: string;
-  firstObservedAt: string;
-  githubId?: number;
-  authorLogin?: string;
-  htmlUrl?: string;
-  authoritativeTime?: string | null;
-};
-
-/**
- * #676 C: sole structured projection-fact type (builder + package leaf).
- * Builder always emits the full object; package leaf keeps it optional so old
- * volumes without the field stay readable — missing is unknown, never defaulted.
- */
-export type CollectorSubmissionProjection = {
-  findingsSource: "absent" | "array" | "unreadable";
-  findingsProjectedCount: number;
-  findingsUnprojected: boolean;
-  unfinishedReasonsSource: "absent" | "array" | "unreadable";
-  unfinishedReasonsProjectedCount: number;
-  unfinishedReasonsUnprojected: boolean;
-};
-
 export type CollectorReceipt = {
-  host: "github.com";
-  repository: string;
-  prNumber: number;
-  /**
-   * Final observed PR state; non-OPEN still delivers materials (#676 D6).
-   * Absent/unreadable on old volumes is unknown — never defaulted to OPEN.
-   */
+  groups: CollectorIdentityGroup[] | ReadonlyArray<Record<string, unknown>>;
+  unfinishedReasons?: unknown;
+  host?: string;
+  repository?: string;
+  prNumber?: number;
   prState?: string;
-  manifestDigest: string;
-  activationTime: string;
-  deadlineTime: string;
-  finalObservationTime: string;
-  finalSnapshotId: string;
-  targetHead: string;
-  groups: CollectorIdentityGroup[];
-  unfinishedReasons?: string[];
-  /**
-   * Distinguishes readable-empty from unprojected original submission content (#676 C).
-   * Package leaf may carry a partial projection when some sibling keys are unreadable —
-   * missing keys stay absent (never defaulted false/0/OPEN).
-   */
-  submissionProjection?: Partial<CollectorSubmissionProjection>;
-  requestAttempts: CollectorRequestAttempt[];
-  snapshots: CollectorSnapshot[];
-  evidenceRecords: CollectorEvidenceRecord[];
+  manifestDigest?: string;
 };
-
-function safeGet(value: unknown, key: string): unknown {
-  if ((typeof value !== "object" && typeof value !== "function") || value === null) return undefined;
-  try { return (value as Record<string, unknown>)[key]; } catch { return undefined; }
-}
-function records(value: unknown): Record<string, unknown>[] {
-  return Array.isArray(value) ? value.filter((item): item is Record<string, unknown> => item !== null && typeof item === "object") : [];
-}
-function strings(value: unknown): string[] {
-  return Array.isArray(value) ? value.filter((item): item is string => typeof item === "string") : [];
-}
-
-/** Settlement projection. Presence of the canonical groups array is the one Collector terminal discriminator. */
-export function validateAcceptedCollectorReceipt(value: unknown): CollectorReceipt {
-  const rawGroups = safeGet(value, "groups");
-  if (!Array.isArray(rawGroups)) throw new Error("Collector receipt has no typed groups terminal discriminator");
-  const groups = records(rawGroups).map((group) => ({
-    identity: (safeGet(group, "identity") ?? null) as Record<string, unknown> | null,
-    ...(typeof safeGet(group, "displayLogin") === "string" ? { displayLogin: safeGet(group, "displayLogin") as string } : {}),
-    attendance: true as const,
-    materials: records(safeGet(group, "materials")),
-    findings: records(safeGet(group, "findings")),
-  }));
-  const unfinishedRaw = safeGet(value, "unfinishedReasons");
-  const unfinishedReasons = strings(unfinishedRaw);
-  // #676 C: project readable submissionProjection fields independently — do not
-  // drop the whole block when one sibling key is the wrong type (left-拾遗1).
-  const submissionProjection = projectSubmissionProjection(safeGet(value, "submissionProjection"));
-  const prStateRaw = safeGet(value, "prState");
-  const prState = typeof prStateRaw === "string" ? prStateRaw : undefined;
-  return {
-    host: safeGet(value, "host") as "github.com",
-    repository: safeGet(value, "repository") as string,
-    prNumber: safeGet(value, "prNumber") as number,
-    ...(prState === undefined ? {} : { prState }),
-    manifestDigest: safeGet(value, "manifestDigest") as string,
-    activationTime: safeGet(value, "activationTime") as string,
-    deadlineTime: safeGet(value, "deadlineTime") as string,
-    finalObservationTime: safeGet(value, "finalObservationTime") as string,
-    finalSnapshotId: safeGet(value, "finalSnapshotId") as string,
-    targetHead: safeGet(value, "targetHead") as string,
-    groups,
-    ...(unfinishedReasons.length > 0 ? { unfinishedReasons } : {}),
-    ...(submissionProjection === undefined ? {} : { submissionProjection }),
-    requestAttempts: records(safeGet(value, "requestAttempts")) as unknown as CollectorRequestAttempt[],
-    snapshots: records(safeGet(value, "snapshots")).map((snapshot) => ({
-      snapshotId: safeGet(snapshot, "snapshotId"), observedAt: safeGet(snapshot, "observedAt"), completedAt: safeGet(snapshot, "completedAt"), completedMono: safeGet(snapshot, "completedMono"), host: safeGet(snapshot, "host"), repository: safeGet(snapshot, "repository"), prNumber: safeGet(snapshot, "prNumber"), prState: safeGet(snapshot, "prState"), headOid: safeGet(snapshot, "headOid"), complete: safeGet(snapshot, "complete"), evidenceIds: strings(safeGet(snapshot, "evidenceIds")), pageDiagnostics: records(safeGet(snapshot, "pageDiagnostics")), normalizedByteLength: safeGet(snapshot, "normalizedByteLength"),
-    } as CollectorSnapshot)),
-    evidenceRecords: records(safeGet(value, "evidenceRecords")).map((record) => ({ evidenceId: safeGet(record, "evidenceId"), kind: safeGet(record, "kind"), versionId: safeGet(record, "versionId"), contentDigest: safeGet(record, "contentDigest"), firstObservedAt: safeGet(record, "firstObservedAt"), githubId: safeGet(record, "githubId"), authorLogin: safeGet(record, "authorLogin"), htmlUrl: safeGet(record, "htmlUrl"), authoritativeTime: safeGet(record, "authoritativeTime") } as CollectorEvidenceRecord)),
-  };
-}
-
-/** Readable projection facts only; omit keys that are the wrong type — never fabricate defaults. */
-function projectSubmissionProjection(
-  raw: unknown,
-): Partial<CollectorSubmissionProjection> | undefined {
-  if (raw === null || typeof raw !== "object" || Array.isArray(raw)) return undefined;
-  const p = raw as Record<string, unknown>;
-  const out: Partial<CollectorSubmissionProjection> = {};
-  if (
-    p["findingsSource"] === "absent" ||
-    p["findingsSource"] === "array" ||
-    p["findingsSource"] === "unreadable"
-  ) {
-    out.findingsSource = p["findingsSource"];
-  }
-  if (typeof p["findingsProjectedCount"] === "number") {
-    out.findingsProjectedCount = p["findingsProjectedCount"];
-  }
-  if (typeof p["findingsUnprojected"] === "boolean") {
-    out.findingsUnprojected = p["findingsUnprojected"];
-  }
-  if (
-    p["unfinishedReasonsSource"] === "absent" ||
-    p["unfinishedReasonsSource"] === "array" ||
-    p["unfinishedReasonsSource"] === "unreadable"
-  ) {
-    out.unfinishedReasonsSource = p["unfinishedReasonsSource"];
-  }
-  if (typeof p["unfinishedReasonsProjectedCount"] === "number") {
-    out.unfinishedReasonsProjectedCount = p["unfinishedReasonsProjectedCount"];
-  }
-  if (typeof p["unfinishedReasonsUnprojected"] === "boolean") {
-    out.unfinishedReasonsUnprojected = p["unfinishedReasonsUnprojected"];
-  }
-  return Object.keys(out).length > 0 ? out : undefined;
-}

package/src/package-contracts/terminating-tools.ts

@@ -5,7 +5,6 @@
 
 import {
   COLLECTOR_OUTPUT_TOOL,
-  validateAcceptedCollectorReceipt,
   type CollectorReceipt,
 } from "./collector-output.ts";
 import {
@@ -44,7 +43,6 @@ export {
   JUDGE_OUTPUT_TOOL_NAME,
   REVIEWER_OUTPUT_TOOL_NAME,
   MERGER_OUTPUT_TOOL_NAME,
-  validateAcceptedCollectorReceipt,
   validateReviewerIntent,
   validateAcceptedWorkerDetails,
   validateDoctorSubmissionShape,

package/src/packaged-role-registry.ts

@@ -1,6 +1,5 @@
 /** Composition-root unique authoritative public-role records (#509 / #524). */
 import { COLLECTOR_OUTPUT_TOOL } from "./package-contracts/collector-output.ts";
-import { COLLECTOR_WAIT_TOOL } from "./collector-ledger.ts";
 import { GATEKEEPER_OUTPUT_TOOL_NAME } from "./package-contracts/gatekeeper-output.ts";
 import { NAVIGATOR_OUTPUT_TOOL_NAME } from "./package-contracts/navigator-output.ts";
 import { JUDGE_OUTPUT_TOOL_NAME } from "./package-contracts/judge-output.ts";
@@ -232,23 +231,18 @@ export const PUBLIC_ROLE_RECORDS = [
     ],
   },
   // ak-collector-repo is GitHub owner/repo identity, not a local material path (#438).
+  // #1088: seat + request-manifest kept; code no longer collects — LLM uses host CLI.
   {
     role: "collector",
     inCallAutoResume: false,
     presentSettled: "always",
     summonResume: false,
     admission: "collect-target",
-    /** Public no_receipt projects a durable bind-target rejection. */
-    projectTargetBindRejection: true,
     sameParent: "none",
     phases: [null],
     bareCommand: false,
     outputTool: COLLECTOR_OUTPUT_TOOL,
-    settlement: "residual",
-    /** #633: a prior wait-tool residual must not mask this attempt. */
-    residualScan: "current-attempt",
-    residualTool: COLLECTOR_WAIT_TOOL,
-    runnerFailure: "collector-known-first",
+    settlement: "sealed",
     artifactFace: {
       evidenceRole: true,
       leaves: [
@@ -264,10 +258,13 @@ export const PUBLIC_ROLE_RECORDS = [
       { field: "repo", from: "repository.display", flag: "ak-collector-repo" },
       { field: "pr", from: "prNumber", text: true, flag: "ak-collector-pr" },
       { field: "requestManifestPath", flag: "ak-collector-request-manifest" },
-      { field: "waitMs", from: "waitWindowMs", text: true, flag: "ak-collector-wait-ms" },
     ],
     activationStage: "load-and-install",
-    sessionMaterials: ["CLAUDE.md", "souls/collector.md"],
+    sessionMaterials: [
+      "CLAUDE.md",
+      "souls/collector.md",
+      "resources/collector-bot-handbook.md",
+    ],
   },
   {
     role: "doctor",

package/src/public-cli/invocation.ts

@@ -69,7 +69,6 @@ import {
   parseCollectorRepository,
   type CollectorRepository,
 } from "../collector-config.ts";
-import { resolveCollectorTarget } from "../collector-target.ts";
 import { ownerRepoFromGitHubRemoteUrl } from "./github-remote.ts";
 import {
   FixerPacketValidationError,
@@ -231,13 +230,11 @@ export type AdmittedFixerInvocation = AdmittedRoleInvocationBase & {
 
 export type AdmittedCollectorInvocation = AdmittedRoleInvocationBase & {
   readonly role: "collector";
-  /** Bound at admission when explicit/--pr or unique head/commit; otherwise role binds. */
+  /** Bound at admission when explicit --pr; otherwise the LLM locates via host CLI. */
   readonly prNumber?: number;
   readonly repository: CollectorRepository;
   readonly requestManifestPath?: string;
   readonly manifestDigest: string;
-  /** Wait-window ms (#678 D4); default applied at role activate when omitted. */
-  readonly waitWindowMs?: number;
 };
 
 export type AdmittedDoctorInvocation = AdmittedRoleInvocationBase & {
@@ -899,7 +896,6 @@ type SeatArgvFields = {
   prNumber?: number;
   repo?: string;
   requestManifestPath?: string;
-  waitWindowMs?: number;
   issueNumber?: number;
   runs?: string;
   sourceRun?: string;
@@ -975,17 +971,6 @@ function assignPublicSeatOption(
     case "request-manifest":
       fields.requestManifestPath = requireOptionPath(taken.def.canonical, value);
       return;
-    case "wait-ms": {
-      if (value === undefined || !/^[1-9]\d*$/.test(value.trim())) {
-        throw new CliUsageError("--wait-ms requires a positive safe-integer millisecond value");
-      }
-      const parsed = Number(value.trim());
-      if (!Number.isSafeInteger(parsed) || parsed < 1) {
-        throw new CliUsageError("--wait-ms requires a positive safe-integer millisecond value");
-      }
-      fields.waitWindowMs = parsed;
-      return;
-    }
     case "issue": {
       if (value === undefined || value.trim() === "") {
         throw new CliUsageError("doctor --issue requires a positive integer");
@@ -1100,7 +1085,6 @@ export function parsePublicSeatArgv(
     ...(fields.prNumber === undefined ? {} : { prNumber: fields.prNumber }),
     ...(fields.repo === undefined ? {} : { repo: fields.repo }),
     ...(fields.requestManifestPath === undefined ? {} : { requestManifestPath: fields.requestManifestPath }),
-    ...(fields.waitWindowMs === undefined ? {} : { waitWindowMs: fields.waitWindowMs }),
     ...(fields.issueNumber === undefined ? {} : { issueNumber: fields.issueNumber }),
     ...(fields.runs === undefined ? {} : { runs: fields.runs }),
     ...(fields.sourceRun === undefined ? {} : { sourceRun: fields.sourceRun }),
@@ -1485,7 +1469,6 @@ export type PublicSeatParse = {
   readonly prNumber?: number;
   readonly repo?: string;
   readonly requestManifestPath?: string;
-  readonly waitWindowMs?: number;
   readonly issueNumber?: number;
   readonly runs?: string;
   readonly sourceRun?: string;
@@ -1676,24 +1659,17 @@ export async function admitPublicRole(
         attachmentPaths,
         ...project,
         placedFields: async (placed) => {
-          // Task materials are frozen before target resolution (#676 A).
-          const target = await resolveCollectorTarget({
-            projectRoot,
-            repository,
-            ...(explicitPrNumber === undefined ? {} : { explicitPrNumber }),
-          });
-          const prNumber = target.kind === "bound" ? target.prNumber : undefined;
+          // #1088: explicit --pr only. Unbound PR is located by the LLM via host CLI.
           let requestManifestPath: string | undefined;
           if (manifestCanonicalJson !== undefined) {
             requestManifestPath = join(placed.runDirectory, "request-manifest.json");
             await writeFile(requestManifestPath, manifestCanonicalJson, "utf8");
           }
           return {
-            ...(prNumber === undefined ? {} : { prNumber }),
+            ...(explicitPrNumber === undefined ? {} : { prNumber: explicitPrNumber }),
             repository: repository.canonical,
             repositoryDisplay: repository.display,
             ...(requestManifestPath === undefined ? {} : { requestManifestPath }),
-            ...(parsed.waitWindowMs === undefined ? {} : { waitWindowMs: parsed.waitWindowMs }),
             manifestDigest,
           };
         },

package/src/public-cli/option-definitions.ts

@@ -524,13 +524,12 @@ const COLLECTOR_OPTIONS = [
     canonical: "--pr",
     aliases: [],
     valueMetavar: "number",
-    // #676 D1: optional when context uniquely determines the PR; ambiguous → require explicit.
     required: false,
     repeatable: false,
     form: "option",
     description: {
-      en: "Positive GitHub pull request number. Optional when unique branch/HEAD association binds the PR, or when the Collector role can decide the target from task materials via bind-target; multi-candidate git context or a role that cannot decide requires an explicit value.",
-      zh: "正整数 GitHub PR 号。分支/HEAD 唯一关联可绑定时可省略；亦可由通进司从任务材料经 bind-target 判定。git 多候选或角色无法判定时必须显式提供。",
+      en: "Positive GitHub pull request number. Optional when the Collector role locates the PR via host CLI from task materials.",
+      zh: "正整数 GitHub PR 号。可选；省略时由通进司经宿主 CLI 从任务材料自行定位。",
     },
   },
   {
@@ -557,22 +556,8 @@ const COLLECTOR_OPTIONS = [
     repeatable: false,
     form: "option",
     description: {
-      en: "Optional request manifest JSON path ({requests:[{id,body}]}). Role may also decide request bodies from handbook/field activity without this file.",
-      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＝十分钟）。改配置即可，无需改代码。",
+      en: "Optional request manifest JSON path ({requests:[{id,body}]}). Parsed for semantics and passed to the Collector as materials — not a machine collection directive.",
+      zh: "可选 request manifest JSON 路径（{requests:[{id,body}]}）。按语义解析后作为材料递给通进司，不是机器代收 finding 的指令。",
     },
   },
 ] as const satisfies readonly PublicOptionDefinition[];