@akagilnc/pi-workflow-roles 0.1.3758 → 0.1.3771

package/dist/acp-host/production-host.js

@@ -13,9 +13,88 @@ var __export = (target, all) => {
     __defProp(target, name, { get: all[name], enumerable: true });
 };
 
+// src/collector-config.ts
+import { createHash } from "node:crypto";
+import { readFile as readFile2 } from "node:fs/promises";
+function fail(message, cause) {
+  throw new Error(message, cause === void 0 ? void 0 : { cause });
+}
+function conservativeAscii(input) {
+  for (let i = 0; i < input.length; i += 1) {
+    const code = input.charCodeAt(i);
+    if (code <= 31 || code === 127 || code > 127) return false;
+  }
+  return true;
+}
+function parseCollectorRepository(raw) {
+  if (typeof raw !== "string" || raw.trim() !== raw || raw.length === 0) fail("Collector repository must be a string owner/repo");
+  if (!conservativeAscii(raw) || raw.includes("://") || /[?#@%\\ ]/.test(raw)) fail("Collector repository rejects URL syntax and non-identity bytes");
+  const parts = raw.split("/");
+  if (parts.length !== 2) fail("Collector repository must contain exactly one '/' separating owner and repo");
+  const [ownerDisplay, repoDisplay] = parts;
+  if (!COLLECTOR_OWNER_PATTERN.test(ownerDisplay) || !COLLECTOR_REPO_PATTERN.test(repoDisplay)) fail("Collector repository does not match the conservative owner/repo grammar");
+  const owner = ownerDisplay.toLowerCase();
+  const repo = repoDisplay.toLowerCase();
+  return { display: raw, canonical: `${owner}/${repo}`, owner, repo };
+}
+function parseCollectorPrNumber(raw) {
+  if (typeof raw === "string" && !/^[1-9][0-9]*$/.test(raw)) fail("Collector pull request number must be a positive safe integer string");
+  if (typeof raw !== "string" && typeof raw !== "number") fail("Collector pull request number is required");
+  const value = Number(raw);
+  if (!Number.isSafeInteger(value) || value < 1) fail("Collector pull request number must be a positive safe integer");
+  return value;
+}
+function record(value) {
+  return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+function canonicalManifest(requests) {
+  return `${JSON.stringify({ requests: requests.map((request) => ({ id: request.id, body: request.requestBody })) })}
+`;
+}
+function emptyCollectorManifest() {
+  const canonicalJson2 = canonicalManifest([]);
+  return { requests: [], canonicalJson: canonicalJson2, digest: createHash("sha256").update(canonicalJson2).digest("hex") };
+}
+async function loadCollectorManifest(path) {
+  let bytes;
+  try {
+    bytes = await readFile2(path);
+  } catch (error) {
+    fail(`Collector request manifest is unreadable at ${path}`, error);
+  }
+  let parsed;
+  try {
+    parsed = JSON.parse(new TextDecoder("utf-8", { fatal: true }).decode(bytes));
+  } catch (error) {
+    fail("Collector request manifest must be UTF-8 JSON", error);
+  }
+  if (!record(parsed)) fail("Collector request manifest must be an object");
+  const rawRequests = parsed.requests ?? [];
+  if (!Array.isArray(rawRequests)) fail("Collector request manifest requests must be an array");
+  const requests = [];
+  const ids = /* @__PURE__ */ new Set();
+  for (const [index, item] of rawRequests.entries()) {
+    if (!record(item) || typeof item.id !== "string" || item.id.length === 0 || typeof item.body !== "string" || item.body.trim() === "") fail(`Collector request manifest requests[${index}] is invalid`);
+    if (ids.has(item.id)) fail(`Collector request manifest has duplicate request id "${item.id}"`);
+    ids.add(item.id);
+    requests.push({ id: item.id, requestBody: item.body });
+  }
+  const canonicalJson2 = canonicalManifest(requests);
+  return { requests, canonicalJson: canonicalJson2, digest: createHash("sha256").update(canonicalJson2).digest("hex"), sourcePath: path };
+}
+var COLLECTOR_HOST, COLLECTOR_OWNER_PATTERN, COLLECTOR_REPO_PATTERN;
+var init_collector_config = __esm({
+  "src/collector-config.ts"() {
+    "use strict";
+    COLLECTOR_HOST = "github.com";
+    COLLECTOR_OWNER_PATTERN = /^[A-Za-z0-9](?:[A-Za-z0-9-]{0,37}[A-Za-z0-9])?$/;
+    COLLECTOR_REPO_PATTERN = /^[A-Za-z0-9](?:[A-Za-z0-9._-]{0,98}[A-Za-z0-9])?$/;
+  }
+});
+
 // src/collector-github.ts
 import { spawn } from "node:child_process";
-import { createHash } from "node:crypto";
+import { createHash as createHash2 } from "node:crypto";
 function isRecord(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
@@ -49,6 +128,178 @@ function parseJson(text, label) {
     throw new Error(`GitHub ${label} returned malformed JSON`, { cause: error });
   }
 }
+function parsePullRequestNumberList(raw, label) {
+  if (!Array.isArray(raw)) {
+    throw new Error(`GitHub ${label} payload is not a list`);
+  }
+  const numbers = [];
+  for (const item of raw) {
+    if (!isRecord(item)) {
+      throw new Error(`GitHub ${label} payload contains a non-object pull request entry`);
+    }
+    try {
+      numbers.push(parseCollectorPrNumber(item["number"]));
+    } catch (error) {
+      throw new Error(`GitHub ${label} payload contains an invalid pull request number`, {
+        cause: error
+      });
+    }
+  }
+  return numbers;
+}
+async function listPullRequestNumbersByHead(runner, input) {
+  const head = `${input.headOwner}:${input.headRef}`;
+  const path = `/repos/${input.owner}/${input.repo}/pulls?head=${encodeURIComponent(head)}&state=all&per_page=100`;
+  const response = await runner(
+    ["api", "--hostname", "github.com", "--include", "-X", "GET", path],
+    input.signal === void 0 ? {} : { signal: input.signal }
+  );
+  if (response.status < 200 || response.status >= 300) {
+    throw new Error(`GitHub ${path} failed with HTTP ${response.status}`, {
+      cause: {
+        endpoint: path,
+        status: response.status,
+        headers: response.headers,
+        body: response.bodyText
+      }
+    });
+  }
+  return parsePullRequestNumberList(parseJson(response.bodyText, path), path);
+}
+async function listPullRequestNumbersByCommit(runner, input) {
+  const path = `/repos/${input.owner}/${input.repo}/commits/${encodeURIComponent(input.commitSha)}/pulls`;
+  const response = await runner(
+    ["api", "--hostname", "github.com", "--include", "-X", "GET", path],
+    input.signal === void 0 ? {} : { signal: input.signal }
+  );
+  if (response.status < 200 || response.status >= 300) {
+    throw new Error(`GitHub ${path} failed with HTTP ${response.status}`, {
+      cause: {
+        endpoint: path,
+        status: response.status,
+        headers: response.headers,
+        body: response.bodyText
+      }
+    });
+  }
+  return parsePullRequestNumberList(parseJson(response.bodyText, path), path);
+}
+async function listPullRequestNumbersByTicket(runner, input) {
+  const issuePath = `/repos/${input.owner}/${input.repo}/issues/${input.ticketNumber}`;
+  const issueResponse = await runner(
+    ["api", "--hostname", "github.com", "--include", "-X", "GET", issuePath],
+    input.signal === void 0 ? {} : { signal: input.signal }
+  );
+  if (issueResponse.status === 404) return [];
+  if (issueResponse.status < 200 || issueResponse.status >= 300) {
+    throw new Error(`GitHub ${issuePath} failed with HTTP ${issueResponse.status}`, {
+      cause: {
+        endpoint: issuePath,
+        status: issueResponse.status,
+        headers: issueResponse.headers,
+        body: issueResponse.bodyText
+      }
+    });
+  }
+  const issueRaw = parseJson(issueResponse.bodyText, issuePath);
+  if (!isRecord(issueRaw)) {
+    throw new Error(`GitHub ${issuePath} payload is not an object`);
+  }
+  if (Object.hasOwn(issueRaw, "pull_request")) {
+    return [parseCollectorPrNumber(issueRaw["number"] ?? input.ticketNumber)];
+  }
+  const query = `query($owner: String!, $repo: String!, $number: Int!) {
+  repository(owner: $owner, name: $repo) {
+    issue(number: $number) {
+      closedByPullRequestsReferences(first: 50) { nodes { number } }
+      timelineItems(first: 100, itemTypes: [CROSS_REFERENCED_EVENT, CONNECTED_EVENT]) {
+        nodes {
+          __typename
+          ... on CrossReferencedEvent {
+            source { ... on PullRequest { number } }
+          }
+          ... on ConnectedEvent {
+            subject { ... on PullRequest { number } }
+          }
+        }
+      }
+    }
+  }
+}`;
+  const args = [
+    "api",
+    "graphql",
+    "--hostname",
+    "github.com",
+    "--include",
+    "-f",
+    `query=${query}`,
+    "-f",
+    `owner=${input.owner}`,
+    "-f",
+    `repo=${input.repo}`,
+    "-F",
+    `number=${input.ticketNumber}`
+  ];
+  const gqlResponse = await runner(
+    args,
+    input.signal === void 0 ? {} : { signal: input.signal }
+  );
+  if (gqlResponse.status < 200 || gqlResponse.status >= 300) {
+    throw new Error(`GitHub GraphQL issue\u2192PR failed with HTTP ${gqlResponse.status}`, {
+      cause: {
+        endpoint: "graphql",
+        status: gqlResponse.status,
+        headers: gqlResponse.headers,
+        body: gqlResponse.bodyText
+      }
+    });
+  }
+  let payload;
+  try {
+    payload = JSON.parse(gqlResponse.bodyText);
+  } catch (error) {
+    throw new Error("GitHub GraphQL issue\u2192PR returned malformed JSON", { cause: error });
+  }
+  if (!isRecord(payload)) {
+    throw new Error("GitHub GraphQL issue\u2192PR payload is not an object");
+  }
+  if (payload.errors !== void 0) {
+    throw new Error(`GitHub GraphQL issue\u2192PR errors: ${JSON.stringify(payload.errors).slice(0, 600)}`, {
+      cause: { body: gqlResponse.bodyText, errors: payload.errors }
+    });
+  }
+  const data = payload.data;
+  if (!isRecord(data)) return [];
+  const repository = data["repository"];
+  if (!isRecord(repository)) return [];
+  const issue = repository["issue"];
+  if (!isRecord(issue)) return [];
+  const numbers = [];
+  const closedBy = issue["closedByPullRequestsReferences"];
+  if (isRecord(closedBy) && Array.isArray(closedBy["nodes"])) {
+    for (const node of closedBy["nodes"]) {
+      if (isRecord(node) && typeof node["number"] === "number") {
+        numbers.push(parseCollectorPrNumber(node["number"]));
+      }
+    }
+  }
+  const timeline = issue["timelineItems"];
+  if (isRecord(timeline) && Array.isArray(timeline["nodes"])) {
+    for (const node of timeline["nodes"]) {
+      if (!isRecord(node)) continue;
+      const source = node["source"];
+      if (isRecord(source) && typeof source["number"] === "number") {
+        numbers.push(parseCollectorPrNumber(source["number"]));
+      }
+      const subject = node["subject"];
+      if (isRecord(subject) && typeof subject["number"] === "number") {
+        numbers.push(parseCollectorPrNumber(subject["number"]));
+      }
+    }
+  }
+  return [...new Set(numbers)];
+}
 function commentFailureCause(error) {
   return {
     name: error instanceof Error ? error.name : typeof error,
@@ -89,11 +340,13 @@ function normalizePullRequest(raw) {
     throw new Error("GitHub pull request payload missing head.sha");
   }
   const number = requireNumber(raw["number"], "number");
-  const state = requireString(raw["state"], "state").toUpperCase();
+  const mergedFlag = raw["merged"] === true || typeof raw["merged_at"] === "string" && raw["merged_at"].length > 0;
+  const rawState = requireString(raw["state"], "state").toUpperCase();
+  const state = mergedFlag ? "MERGED" : rawState;
   const htmlUrl = typeof raw["html_url"] === "string" ? raw["html_url"] : `https://github.com/unknown/unknown/pull/${number}`;
   return {
     number,
-    state: state === "OPEN" || state === "open" ? "OPEN" : state,
+    state,
     headOid: head["sha"],
     ...typeof raw["updated_at"] === "string" ? { updatedAt: raw["updated_at"] } : {},
     url: htmlUrl,
@@ -483,7 +736,7 @@ function createGhCollectorGitHubTransport(runner = createGhApiRunner()) {
 }
 function buildCollectorRequestMarker(input) {
   const prefix = input.manifestDigest.slice(0, 12);
-  const requestMarkerId = createHash("sha256").update(input.requestId).digest("hex");
+  const requestMarkerId = createHash2("sha256").update(input.requestId).digest("hex");
   return `<!-- ak-collector:v1 manifest=${prefix} request=${requestMarkerId} head=${input.headOid} -->`;
 }
 function buildCollectorRequestBody(input) {
@@ -498,6 +751,7 @@ var commentFailureEvidence;
 var init_collector_github = __esm({
   "src/collector-github.ts"() {
     "use strict";
+    init_collector_config();
     commentFailureEvidence = 0;
   }
 });
@@ -1370,7 +1624,7 @@ var init_sitian_contracts = __esm({
 });
 
 // src/sitian-appender.ts
-import { createHash as createHash2, randomUUID } from "node:crypto";
+import { createHash as createHash3, randomUUID } from "node:crypto";
 import {
   appendFileSync,
   existsSync,
@@ -1386,7 +1640,7 @@ function errorCodeOf(error) {
   return error.code;
 }
 function identityClaimPath(recordFile, identity) {
-  const digest = createHash2("sha256").update(identity, "utf8").digest("hex");
+  const digest = createHash3("sha256").update(identity, "utf8").digest("hex");
   return `${recordFile}.id-${digest}`;
 }
 function createExclusiveFile(path, contents) {
@@ -1530,7 +1784,7 @@ function resolveSitianRecordPathInLedger(input, ledgerHome) {
       } else {
         subjectStr = JSON.stringify(input.subject);
       }
-      const digest = createHash2("sha256").update(subjectStr).digest("hex").slice(0, 32);
+      const digest = createHash3("sha256").update(subjectStr).digest("hex").slice(0, 32);
       sessionDir = join6(bookDir, category, digest);
     } else {
       sessionDir = join6(bookDir, category);
@@ -1594,7 +1848,7 @@ var init_sitian_appender = __esm({
 
 // src/sitian-reader.ts
 import { existsSync as existsSync2 } from "node:fs";
-import { readFile as readFile2 } from "node:fs/promises";
+import { readFile as readFile3 } from "node:fs/promises";
 function isRecord4(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
@@ -1602,7 +1856,7 @@ async function readSitianRecords(recordFile) {
   if (!existsSync2(recordFile)) {
     return { records: [], diagnostics: [] };
   }
-  const text = await readFile2(recordFile, "utf8");
+  const text = await readFile3(recordFile, "utf8");
   const lines = text.split("\n");
   const records2 = [];
   const diagnostics = [];
@@ -1666,7 +1920,7 @@ __export(role_turn_host_exports, {
 });
 import { execFile, spawn as spawn3 } from "node:child_process";
 import { constants } from "node:fs";
-import { access, appendFile, readFile as readFile3, realpath as realpath2 } from "node:fs/promises";
+import { access, appendFile, readFile as readFile4, realpath as realpath2 } from "node:fs/promises";
 import { delimiter, isAbsolute as isAbsolute3, join as join7, resolve as resolve6 } from "node:path";
 import { platform } from "node:process";
 import { promisify } from "node:util";
@@ -1727,8 +1981,7 @@ function buildActivationFlagArgs(activation) {
         "collector",
         "--ak-collector-repo",
         activation.repo,
-        "--ak-collector-pr",
-        activation.pr,
+        ...activation.pr === void 0 ? [] : ["--ak-collector-pr", activation.pr],
         ...activation.requestManifestPath === void 0 ? [] : ["--ak-collector-request-manifest", activation.requestManifestPath]
       ];
     case "doctor":
@@ -1975,7 +2228,7 @@ ${paths.join("\n")}`
 }
 async function appendPiSessionCustomEntry(authority, principal, customType, data) {
   const { sessionFile } = authority.decode(principal);
-  const text = await readFile3(sessionFile, "utf8");
+  const text = await readFile4(sessionFile, "utf8");
   let parentId = null;
   for (const line2 of text.trim().split("\n").filter(Boolean)) {
     const entry = JSON.parse(line2);
@@ -2024,7 +2277,7 @@ var init_role_turn_host = __esm({
 });
 
 // src/run-ticket-number.ts
-import { readFile as readFile4 } from "node:fs/promises";
+import { readFile as readFile5 } from "node:fs/promises";
 import { join as join8 } from "node:path";
 function isEnoent(error) {
   return error instanceof Error && "code" in error && error.code === "ENOENT";
@@ -2038,7 +2291,7 @@ function ticketFromRecord(record4) {
 }
 async function readPageTicketNumber(runDirectory, page) {
   try {
-    const raw = JSON.parse(await readFile4(join8(runDirectory, page), "utf8"));
+    const raw = JSON.parse(await readFile5(join8(runDirectory, page), "utf8"));
     if (raw === null || typeof raw !== "object" || Array.isArray(raw)) {
       return void 0;
     }
@@ -2058,9 +2311,9 @@ var init_run_ticket_number = __esm({
 });
 
 // src/sha256.ts
-import { createHash as createHash3 } from "node:crypto";
+import { createHash as createHash4 } from "node:crypto";
 function sha256Hex(bytes) {
-  return createHash3("sha256").update(bytes).digest("hex");
+  return createHash4("sha256").update(bytes).digest("hex");
 }
 var init_sha256 = __esm({
   "src/sha256.ts"() {
@@ -2093,10 +2346,16 @@ function validateAcceptedCollectorReceipt(value) {
     materials: records(safeGet(group, "materials")),
     findings: records(safeGet(group, "findings"))
   }));
+  const unfinishedRaw = safeGet(value, "unfinishedReasons");
+  const unfinishedReasons = strings(unfinishedRaw);
+  const submissionProjection = projectSubmissionProjection(safeGet(value, "submissionProjection"));
+  const prStateRaw = safeGet(value, "prState");
+  const prState = typeof prStateRaw === "string" ? prStateRaw : void 0;
   return {
     host: safeGet(value, "host"),
     repository: safeGet(value, "repository"),
     prNumber: safeGet(value, "prNumber"),
+    ...prState === void 0 ? {} : { prState },
     manifestDigest: safeGet(value, "manifestDigest"),
     activationTime: safeGet(value, "activationTime"),
     deadlineTime: safeGet(value, "deadlineTime"),
@@ -2104,6 +2363,8 @@ function validateAcceptedCollectorReceipt(value) {
     finalSnapshotId: safeGet(value, "finalSnapshotId"),
     targetHead: safeGet(value, "targetHead"),
     groups,
+    ...unfinishedReasons.length > 0 ? { unfinishedReasons } : {},
+    ...submissionProjection === void 0 ? {} : { submissionProjection },
     requestAttempts: records(safeGet(value, "requestAttempts")),
     snapshots: records(safeGet(value, "snapshots")).map((snapshot) => ({
       snapshotId: safeGet(snapshot, "snapshotId"),
@@ -2123,6 +2384,30 @@ function validateAcceptedCollectorReceipt(value) {
     evidenceRecords: records(safeGet(value, "evidenceRecords")).map((record4) => ({ evidenceId: safeGet(record4, "evidenceId"), kind: safeGet(record4, "kind"), versionId: safeGet(record4, "versionId"), contentDigest: safeGet(record4, "contentDigest"), firstObservedAt: safeGet(record4, "firstObservedAt"), githubId: safeGet(record4, "githubId"), authorLogin: safeGet(record4, "authorLogin"), htmlUrl: safeGet(record4, "htmlUrl"), authoritativeTime: safeGet(record4, "authoritativeTime") }))
   };
 }
+function projectSubmissionProjection(raw) {
+  if (raw === null || typeof raw !== "object" || Array.isArray(raw)) return void 0;
+  const p = raw;
+  const out = {};
+  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 : void 0;
+}
 var COLLECTOR_OUTPUT_TOOL, COLLECTOR_ACCEPTED_TEXT;
 var init_collector_output = __esm({
   "src/package-contracts/collector-output.ts"() {
@@ -2431,6 +2716,24 @@ function isCorrectableSubmissionError(error) {
 function isCorrectableExecuteError(error) {
   return isCorrectableSubmissionError(error) || error instanceof GatekeeperDecisionError || error instanceof ParentQueueReaskError || error instanceof WorkerCommitReminderError || error instanceof WorkerPrefixReminderError || error instanceof WorkerUnfinishedReasonReminderError;
 }
+function projectCorrectableExecuteRejection(error) {
+  const diagnostic = error instanceof Error ? error.message : String(error);
+  if (error instanceof GatekeeperDecisionError) {
+    return { diagnostic, details: { ...error.result } };
+  }
+  if (error instanceof WorkerCommitReminderError || error instanceof WorkerPrefixReminderError || error instanceof WorkerUnfinishedReasonReminderError) {
+    return { diagnostic, details: { code: error.code } };
+  }
+  if (typeof error.code === "string") {
+    return { diagnostic, details: { code: error.code } };
+  }
+  return {
+    diagnostic,
+    details: {
+      code: error instanceof Error && error.name ? error.name : "correctable-submission-error"
+    }
+  };
+}
 var correctableSubmissionErrorBrand, CorrectableSubmissionError;
 var init_submission_correctable_error = __esm({
   "src/submission-correctable-error.ts"() {
@@ -2609,26 +2912,27 @@ function failOnInfrastructureFailureDeclaration(parameters, hostActions, ctx, to
     toolCallId
   );
 }
-var INFRASTRUCTURE_FAILURE_DECLARATION_KEY, INFRASTRUCTURE_FAILURE_DIAGNOSTIC_KEY, infrastructureFailureDeclarationSchema;
+var INFRASTRUCTURE_FAILURE_DECLARATION_KEY, INFRASTRUCTURE_FAILURE_DIAGNOSTIC_KEY, infrastructureFailureNested, infrastructureFailureDeclarationSchema;
 var init_terminating_infrastructure = __esm({
   "src/package-contracts/terminating-infrastructure.ts"() {
     "use strict";
     INFRASTRUCTURE_FAILURE_DECLARATION_KEY = "infrastructureFailure";
     INFRASTRUCTURE_FAILURE_DIAGNOSTIC_KEY = "diagnostic";
+    infrastructureFailureNested = Type4.Object(
+      {
+        [INFRASTRUCTURE_FAILURE_DIAGNOSTIC_KEY]: Type4.Unknown({
+          description: "\u975E\u7A7A\u57FA\u7840\u8BBE\u65BD\u5931\u8D25\u8BCA\u65AD\u5B57\u7B26\u4E32\u3002\u65E0\u5931\u8D25\u65F6\u5FC5\u987B\u7701\u7565\u6574\u4E2A infrastructureFailure\u3002\u5F62\u72B6\u6307\u5F15\uFF0C\u975E schema \u95F8\u3002"
+        })
+      },
+      {
+        additionalProperties: true,
+        description: "\u57FA\u7840\u8BBE\u65BD\u771F\u5B9E\u5931\u8D25\u58F0\u660E\uFF08\u5982\u9700\uFF09\u3002\u89C4\u8303\u5F62\uFF1A{ diagnostic: \u975E\u7A7A\u8BCA\u65AD\u5B57\u7B26\u4E32 }\uFF1B\u65E0\u5931\u8D25\u65F6\u5FC5\u987B\u7701\u7565\u3002\u5F62\u72B6\u6307\u5F15\uFF0C\u975E schema \u95F8\u3002"
+      }
+    );
+    infrastructureFailureNested.required = [];
     infrastructureFailureDeclarationSchema = Type4.Object(
       {
-        [INFRASTRUCTURE_FAILURE_DECLARATION_KEY]: Type4.Object(
-          {
-            [INFRASTRUCTURE_FAILURE_DIAGNOSTIC_KEY]: Type4.String({
-              minLength: 1,
-              description: "\u975E\u7A7A\u57FA\u7840\u8BBE\u65BD\u5931\u8D25\u8BCA\u65AD"
-            })
-          },
-          {
-            additionalProperties: true,
-            description: "\u57FA\u7840\u8BBE\u65BD\u5931\u8D25\u58F0\u660E"
-          }
-        )
+        [INFRASTRUCTURE_FAILURE_DECLARATION_KEY]: infrastructureFailureNested
       },
       { additionalProperties: true }
     );
@@ -3011,21 +3315,21 @@ var init_exact_utf8 = __esm({
 
 // src/merger-contracts.ts
 import { Type as Type9 } from "typebox";
-function fail(message = "Merger input violates its exact contract") {
+function fail2(message = "Merger input violates its exact contract") {
   throw new MergerInputContractError(message);
 }
 function canonicalPath(path) {
   return typeof path === "string" && path.length > 0 && !path.startsWith("/") && !path.includes("\0") && path.split("/").every((part) => part !== "" && part !== "." && part !== "..");
 }
 function validatePathSet(value, label) {
-  if (!Array.isArray(value) || value.length === 0 || !value.every(canonicalPath)) fail(`Merger ${label} must be a non-empty canonical path set`);
+  if (!Array.isArray(value) || value.length === 0 || !value.every(canonicalPath)) fail2(`Merger ${label} must be a non-empty canonical path set`);
   return value;
 }
 function validateMaterial(value, label) {
-  if (!record(value) || typeof value.bytesBase64 !== "string" || typeof value.sha256 !== "string") fail(`Merger ${label} material is malformed`);
+  if (!record2(value) || typeof value.bytesBase64 !== "string" || typeof value.sha256 !== "string") fail2(`Merger ${label} material is malformed`);
   const bytes = Buffer.from(value.bytesBase64, "base64");
   exactUtf8(bytes, `Merger ${label} material`);
-  if (sha256Hex(bytes) !== value.sha256) fail(`Merger ${label} material digest mismatch`);
+  if (sha256Hex(bytes) !== value.sha256) fail2(`Merger ${label} material digest mismatch`);
 }
 function deepFreeze(value) {
   if (value && typeof value === "object") {
@@ -3035,26 +3339,26 @@ function deepFreeze(value) {
   return value;
 }
 function validateMergerInput(value) {
-  if (!record(value) || blank(value.attemptId) || !isFullGitObjectId(value.targetObjectId) || !isFullGitObjectId(value.sourceObjectId) || value.targetObjectId.length !== value.sourceObjectId.length) fail("Merger input has invalid identity or object ID");
-  if (!record(value.materials)) fail();
+  if (!record2(value) || blank(value.attemptId) || !isFullGitObjectId(value.targetObjectId) || !isFullGitObjectId(value.sourceObjectId) || value.targetObjectId.length !== value.sourceObjectId.length) fail2("Merger input has invalid identity or object ID");
+  if (!record2(value.materials)) fail2();
   for (const key of ["task", "authority", "targetIntent", "sourceIntent"]) validateMaterial(value.materials[key], key);
   const conflicts = validatePathSet(value.expectedConflictPaths, "expected conflict paths");
   const scope = validatePathSet(value.resolutionScope, "resolution scope");
-  if (!conflicts.every((path) => scope.includes(path))) fail("Merger resolution scope must contain the complete conflict set");
-  if (!Array.isArray(value.authorizedChecks)) fail("Merger authorized checks are malformed");
+  if (!conflicts.every((path) => scope.includes(path))) fail2("Merger resolution scope must contain the complete conflict set");
+  if (!Array.isArray(value.authorizedChecks)) fail2("Merger authorized checks are malformed");
   for (const check of value.authorizedChecks) {
-    if (!record(check) || !Array.isArray(check.argv) || check.argv.length === 0 || check.argv.some(blank)) fail("Merger authorized check is malformed");
+    if (!record2(check) || !Array.isArray(check.argv) || check.argv.length === 0 || check.argv.some(blank)) fail2("Merger authorized check is malformed");
   }
   return deepFreeze(structuredClone(value));
 }
 function validateMergerOutput(value, expectedAttemptId) {
-  if (!record(value) || expectedAttemptId !== void 0 && value.attemptId !== expectedAttemptId) throw new Error("\u5408\u5E76\u56DE\u6267 attempt \u4E0D\u5339\u914D");
+  if (!record2(value) || expectedAttemptId !== void 0 && value.attemptId !== expectedAttemptId) throw new Error("\u5408\u5E76\u56DE\u6267 attempt \u4E0D\u5339\u914D");
   const status = typeof value.status === "string" ? value.status : void 0;
   if (status === "completed" && isFullGitObjectId(value.mergeCommitId)) return structuredClone(value);
   if (status === "escalate") return structuredClone(value);
   throw new Error("\u5408\u5E76\u56DE\u6267\u65E0\u5DF2\u8BC6\u522B\u7684\u6267\u884C\u5224\u522B");
 }
-var oidPattern, materialSchema, checkSchema, mergerInputSchema, mergerOutputVariants, mergerOutputSchema, MERGER_OUTPUT_TOOL_NAME, MERGER_ACCEPTED_TEXT, record, blank, MergerInputContractError;
+var oidPattern, materialSchema, checkSchema, mergerInputSchema, mergerOutputVariants, mergerOutputSchema, MERGER_OUTPUT_TOOL_NAME, MERGER_ACCEPTED_TEXT, record2, blank, MergerInputContractError;
 var init_merger_contracts = __esm({
   "src/merger-contracts.ts"() {
     "use strict";
@@ -3085,7 +3389,7 @@ var init_merger_contracts = __esm({
     );
     MERGER_OUTPUT_TOOL_NAME = "ak_merger_output";
     MERGER_ACCEPTED_TEXT = "\u5408\u5E76\u56DE\u6267\u5DF2\u63A5\u53D7";
-    record = (v) => typeof v === "object" && v !== null && !Array.isArray(v);
+    record2 = (v) => typeof v === "object" && v !== null && !Array.isArray(v);
     blank = (v) => typeof v !== "string" || v.trim().length === 0;
     MergerInputContractError = class extends Error {
       constructor(message = "Merger input violates its exact contract") {
@@ -3309,27 +3613,27 @@ function causeMessage(cause) {
     return String(cause);
   }
 }
-function fail2(cause) {
+function fail3(cause) {
   throw new FixerPacketValidationError(cause);
 }
 function parseFailure(value) {
-  if (!Array.isArray(value)) fail2(new Error("Fixer prerequisites must be a JSON array"));
+  if (!Array.isArray(value)) fail3(new Error("Fixer prerequisites must be a JSON array"));
   for (const entry of value) {
     if (typeof entry !== "object" || entry === null || Array.isArray(entry)) {
-      fail2(new Error("Fixer prerequisite entry must be an object with id and requirement fields"));
+      fail3(new Error("Fixer prerequisite entry must be an object with id and requirement fields"));
     }
     const keys = Object.keys(entry);
     if (keys.length !== 2 || !keys.includes("id") || !keys.includes("requirement")) {
-      fail2(new Error("Fixer prerequisite entry fields must be exactly id and requirement"));
+      fail3(new Error("Fixer prerequisite entry fields must be exactly id and requirement"));
     }
     if (typeof entry.id !== "string" || !new RegExp(FIXER_PREREQUISITE_ID_PATTERN).test(entry.id)) {
-      fail2(new Error(`Fixer prerequisite id violates pattern ${FIXER_PREREQUISITE_ID_PATTERN}`));
+      fail3(new Error(`Fixer prerequisite id violates pattern ${FIXER_PREREQUISITE_ID_PATTERN}`));
     }
     if (typeof entry.requirement !== "string" || !/\S/.test(entry.requirement)) {
-      fail2(new Error("Fixer prerequisite requirement must be nonblank"));
+      fail3(new Error("Fixer prerequisite requirement must be nonblank"));
     }
   }
-  fail2(new Error("Fixer prerequisites violate the attachment schema"));
+  fail3(new Error("Fixer prerequisites violate the attachment schema"));
 }
 function validateFixerPrerequisites(value) {
   if (!Value.Check(fixerPrerequisitesSchema, value)) parseFailure(value);
@@ -3337,7 +3641,7 @@ function validateFixerPrerequisites(value) {
   const ids = /* @__PURE__ */ new Set();
   const prerequisites = entries.map((entry) => {
     if (ids.has(entry.id)) {
-      fail2(new Error(`Fixer prerequisites contain duplicate id: ${entry.id}`));
+      fail3(new Error(`Fixer prerequisites contain duplicate id: ${entry.id}`));
     }
     ids.add(entry.id);
     return Object.freeze({ id: entry.id, requirement: entry.requirement });
@@ -3349,7 +3653,7 @@ function parseFixerPrerequisites(source) {
   try {
     decoded = JSON.parse(source);
   } catch (error) {
-    fail2(error);
+    fail3(error);
   }
   return validateFixerPrerequisites(decoded);
 }
@@ -3634,9 +3938,9 @@ var init_terminating_tools = __esm({
 });
 
 // src/doctor-evidence.ts
-import { readdir, readFile as readFile5, realpath as realpath3, stat } from "node:fs/promises";
+import { readdir, readFile as readFile6, realpath as realpath3, stat } from "node:fs/promises";
 import { dirname as dirname6, relative as relative2, resolve as resolve7, sep as sep2 } from "node:path";
-function record2(value) {
+function record3(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 async function discoverCaseFiles(root) {
@@ -3685,7 +3989,7 @@ function deriveSession(content, id) {
   for (const line2 of content.split("\n")) if (line2.trim()) {
     try {
       const row = JSON.parse(line2);
-      if (!record2(row)) {
+      if (!record3(row)) {
         degradationReasons.push(`non-object session row in ${id}`);
         break;
       }
@@ -3704,16 +4008,16 @@ function deriveSession(content, id) {
   let accepted, observedCommit, turns = 0, calls = 0, tokens = 0;
   const statuses = [], commits = [];
   for (const row of rows) {
-    const message = record2(row.message) ? row.message : void 0;
+    const message = record3(row.message) ? row.message : void 0;
     if (message?.role === "assistant") {
-      for (const part of Array.isArray(message.content) ? message.content : []) if (record2(part) && part.type === "toolCall") calls++;
+      for (const part of Array.isArray(message.content) ? message.content : []) if (record3(part) && part.type === "toolCall") calls++;
       if (typeof message.responseId === "string") {
         turns++;
-        const usage = record2(message.usage) ? message.usage : void 0;
+        const usage = record3(message.usage) ? message.usage : void 0;
         if (usage && typeof usage.output === "number") tokens += usage.output;
       }
     }
-    if (message?.role === "toolResult" && message.isError !== true && typeof message.toolName === "string" && isTerminatingToolName(message.toolName) && record2(message.details)) {
+    if (message?.role === "toolResult" && message.isError !== true && typeof message.toolName === "string" && isTerminatingToolName(message.toolName) && record3(message.details)) {
       let details;
       try {
         details = validateAcceptedDetails(message.toolName, message.details);
@@ -3753,7 +4057,7 @@ async function loadDoctorCase(runsPath) {
   const turns = { count: 0, sources: [] }, calls = { count: 0, sources: [] }, tokens = { count: 0, sources: [] };
   for (const path of await discoverCaseFiles(root)) {
     const id = relative2(root, path).split(sep2).join("/");
-    const bytes = await readFile5(path);
+    const bytes = await readFile6(path);
     const content = bytes.toString("utf8");
     const kind = id.endsWith(".jsonl") ? "session" : "stderr";
     evidence.push({ id, kind, byteLength: bytes.byteLength, contentLength: content.length, sha256: sha256Hex(bytes), content });
@@ -3781,83 +4085,197 @@ var init_doctor_evidence = __esm({
   }
 });
 
-// src/collector-config.ts
-import { createHash as createHash4 } from "node:crypto";
-import { readFile as readFile6 } from "node:fs/promises";
-function fail3(message, cause) {
-  throw new Error(message, cause === void 0 ? void 0 : { cause });
+// src/public-cli/cli-errors.ts
+var CliUsageError;
+var init_cli_errors = __esm({
+  "src/public-cli/cli-errors.ts"() {
+    "use strict";
+    CliUsageError = class extends Error {
+      code = "AK_ROLE_USAGE";
+      constructor(message, options) {
+        super(
+          message,
+          options?.cause === void 0 ? void 0 : { cause: options.cause }
+        );
+        this.name = "CliUsageError";
+      }
+    };
+  }
+});
+
+// src/public-cli/github-remote.ts
+function ownerFromGitHubRemoteUrl(remoteUrl) {
+  const ownerRepo = ownerRepoFromGitHubRemoteUrl(remoteUrl);
+  if (ownerRepo === void 0) return void 0;
+  return ownerRepo.split("/")[0].toLowerCase();
 }
-function conservativeAscii(input) {
-  for (let i = 0; i < input.length; i += 1) {
-    const code = input.charCodeAt(i);
-    if (code <= 31 || code === 127 || code > 127) return false;
+function ownerRepoFromGitHubRemoteUrl(remoteUrl) {
+  const trimmed = remoteUrl.trim();
+  const scp = /^git@github\.com:([^/\s]+)\/([^/\s]+?)(?:\.git)?$/i.exec(trimmed);
+  if (scp) {
+    return `${scp[1]}/${stripGitSuffix(scp[2])}`;
   }
-  return true;
+  const ssh = /^ssh:\/\/git@github\.com\/([^/\s]+)\/([^/\s]+?)(?:\.git)?\/?$/i.exec(
+    trimmed
+  );
+  if (ssh) {
+    return `${ssh[1]}/${stripGitSuffix(ssh[2])}`;
+  }
+  let parsed;
+  try {
+    parsed = new URL(trimmed);
+  } catch {
+    return void 0;
+  }
+  if (!/^github\.com$/i.test(parsed.hostname)) return void 0;
+  if (parsed.search !== "" || parsed.hash !== "") return void 0;
+  const parts = parsed.pathname.split("/").filter((p) => p.length > 0);
+  if (parts.length !== 2) return void 0;
+  return `${parts[0]}/${stripGitSuffix(parts[1])}`;
 }
-function parseCollectorRepository(raw) {
-  if (typeof raw !== "string" || raw.trim() !== raw || raw.length === 0) fail3("Collector repository must be a string owner/repo");
-  if (!conservativeAscii(raw) || raw.includes("://") || /[?#@%\\ ]/.test(raw)) fail3("Collector repository rejects URL syntax and non-identity bytes");
-  const parts = raw.split("/");
-  if (parts.length !== 2) fail3("Collector repository must contain exactly one '/' separating owner and repo");
-  const [ownerDisplay, repoDisplay] = parts;
-  if (!COLLECTOR_OWNER_PATTERN.test(ownerDisplay) || !COLLECTOR_REPO_PATTERN.test(repoDisplay)) fail3("Collector repository does not match the conservative owner/repo grammar");
-  const owner = ownerDisplay.toLowerCase();
-  const repo = repoDisplay.toLowerCase();
-  return { display: raw, canonical: `${owner}/${repo}`, owner, repo };
+function stripGitSuffix(name) {
+  return name.toLowerCase().endsWith(".git") ? name.slice(0, -4) : name;
 }
-function parseCollectorPrNumber(raw) {
-  if (typeof raw === "string" && !/^[1-9][0-9]*$/.test(raw)) fail3("Collector pull request number must be a positive safe integer string");
-  if (typeof raw !== "string" && typeof raw !== "number") fail3("Collector pull request number is required");
-  const value = Number(raw);
-  if (!Number.isSafeInteger(value) || value < 1) fail3("Collector pull request number must be a positive safe integer");
-  return value;
+var init_github_remote = __esm({
+  "src/public-cli/github-remote.ts"() {
+    "use strict";
+  }
+});
+
+// src/collector-target.ts
+import { execFileSync as execFileSync2 } from "node:child_process";
+function ambiguousTarget(detail, cause) {
+  throw new CliUsageError(
+    `collector target is ambiguous: ${detail}; pass an explicit --pr`,
+    cause === void 0 ? void 0 : { cause }
+  );
 }
-function record3(value) {
-  return typeof value === "object" && value !== null && !Array.isArray(value);
+function gitFailure(detail, cause) {
+  throw new Error(`collector git failed: ${detail}`, {
+    cause: cause instanceof Error ? cause : new Error(String(cause))
+  });
 }
-function canonicalManifest(requests) {
-  return `${JSON.stringify({ requests: requests.map((request) => ({ id: request.id, body: request.requestBody })) })}
-`;
+function gitText(projectRoot, args) {
+  return execFileSync2("git", [...args], {
+    cwd: projectRoot,
+    encoding: "utf8",
+    stdio: ["ignore", "pipe", "pipe"]
+  }).trim();
 }
-function emptyCollectorManifest() {
-  const canonicalJson2 = canonicalManifest([]);
-  return { requests: [], canonicalJson: canonicalJson2, digest: createHash4("sha256").update(canonicalJson2).digest("hex") };
+function isGitConfigMissing(error) {
+  if (typeof error !== "object" || error === null) return false;
+  const status = error.status;
+  return status === 1;
 }
-async function loadCollectorManifest(path) {
-  let bytes;
+function readCurrentBranch(projectRoot) {
   try {
-    bytes = await readFile6(path);
+    return gitText(projectRoot, ["rev-parse", "--abbrev-ref", "HEAD"]);
   } catch (error) {
-    fail3(`Collector request manifest is unreadable at ${path}`, error);
+    gitFailure("cannot read current git branch", error);
   }
-  let parsed;
+}
+function readHeadSha(projectRoot) {
   try {
-    parsed = JSON.parse(new TextDecoder("utf-8", { fatal: true }).decode(bytes));
+    return gitText(projectRoot, ["rev-parse", "HEAD"]);
   } catch (error) {
-    fail3("Collector request manifest must be UTF-8 JSON", error);
+    gitFailure("cannot read current HEAD", error);
   }
-  if (!record3(parsed)) fail3("Collector request manifest must be an object");
-  const rawRequests = parsed.requests ?? [];
-  if (!Array.isArray(rawRequests)) fail3("Collector request manifest requests must be an array");
-  const requests = [];
-  const ids = /* @__PURE__ */ new Set();
-  for (const [index, item] of rawRequests.entries()) {
-    if (!record3(item) || typeof item.id !== "string" || item.id.length === 0 || typeof item.body !== "string" || item.body.trim() === "") fail3(`Collector request manifest requests[${index}] is invalid`);
-    if (ids.has(item.id)) fail3(`Collector request manifest has duplicate request id "${item.id}"`);
-    ids.add(item.id);
-    requests.push({ id: item.id, requestBody: item.body });
+}
+function headRefFromMerge(merge) {
+  const trimmed = merge.trim();
+  if (trimmed.length === 0) return void 0;
+  if (trimmed.startsWith("refs/heads/")) {
+    const ref = trimmed.slice("refs/heads/".length);
+    return ref.length > 0 ? ref : void 0;
   }
-  const canonicalJson2 = canonicalManifest(requests);
-  return { requests, canonicalJson: canonicalJson2, digest: createHash4("sha256").update(canonicalJson2).digest("hex"), sourcePath: path };
+  if (trimmed.startsWith("refs/")) return void 0;
+  return trimmed;
 }
-var COLLECTOR_HOST, COLLECTOR_OWNER_PATTERN, COLLECTOR_REPO_PATTERN, COLLECTOR_FIXED_KICKOFF;
-var init_collector_config = __esm({
-  "src/collector-config.ts"() {
+function readUpstreamHeadBinding(projectRoot, branch) {
+  let remote;
+  try {
+    remote = gitText(projectRoot, ["config", "--get", `branch.${branch}.remote`]);
+  } catch (error) {
+    if (isGitConfigMissing(error)) remote = void 0;
+    else gitFailure(`cannot read branch.${branch}.remote`, error);
+  }
+  if (remote === void 0 || remote.length === 0) return void 0;
+  let merge;
+  try {
+    merge = gitText(projectRoot, ["config", "--get", `branch.${branch}.merge`]);
+  } catch (error) {
+    if (isGitConfigMissing(error)) merge = void 0;
+    else gitFailure(`cannot read branch.${branch}.merge`, error);
+  }
+  if (merge === void 0 || merge.length === 0) return void 0;
+  const headRef = headRefFromMerge(merge);
+  if (headRef === void 0) return void 0;
+  let remoteUrl;
+  try {
+    remoteUrl = gitText(projectRoot, ["remote", "get-url", remote]);
+  } catch (error) {
+    gitFailure(`cannot read remote URL for ${remote}`, error);
+  }
+  const headOwner = ownerFromGitHubRemoteUrl(remoteUrl);
+  if (headOwner === void 0) return void 0;
+  return { headOwner, headRef };
+}
+async function resolveCollectorTarget(input) {
+  if (input.explicitPrNumber !== void 0) {
+    return { kind: "bound", prNumber: input.explicitPrNumber };
+  }
+  const branch = readCurrentBranch(input.projectRoot);
+  const detached = branch.length === 0 || branch === "HEAD";
+  const runner = createGhApiRunner();
+  const { owner, repo } = input.repository;
+  const numbers = [];
+  if (!detached) {
+    const headSha = readHeadSha(input.projectRoot);
+    const upstream = readUpstreamHeadBinding(input.projectRoot, branch);
+    if (upstream !== void 0) {
+      numbers.push(
+        ...await listPullRequestNumbersByHead(runner, {
+          owner,
+          repo,
+          headOwner: upstream.headOwner,
+          headRef: upstream.headRef
+        })
+      );
+    }
+    numbers.push(
+      ...await listPullRequestNumbersByCommit(runner, {
+        owner,
+        repo,
+        commitSha: headSha
+      })
+    );
+  } else {
+    const headSha = readHeadSha(input.projectRoot);
+    numbers.push(
+      ...await listPullRequestNumbersByCommit(runner, {
+        owner,
+        repo,
+        commitSha: headSha
+      })
+    );
+  }
+  const unique = [...new Set(numbers)];
+  if (unique.length === 1) {
+    return { kind: "bound", prNumber: unique[0] };
+  }
+  if (unique.length > 1) {
+    ambiguousTarget(
+      `multiple PRs associated with context: ${unique.join(", ")}`
+    );
+  }
+  return { kind: "unbound" };
+}
+var init_collector_target = __esm({
+  "src/collector-target.ts"() {
     "use strict";
-    COLLECTOR_HOST = "github.com";
-    COLLECTOR_OWNER_PATTERN = /^[A-Za-z0-9](?:[A-Za-z0-9-]{0,37}[A-Za-z0-9])?$/;
-    COLLECTOR_REPO_PATTERN = /^[A-Za-z0-9](?:[A-Za-z0-9._-]{0,98}[A-Za-z0-9])?$/;
-    COLLECTOR_FIXED_KICKOFF = "\u91C7\u96C6\u76EE\u6807\u5DF2\u53D7\u7406\uFF0C\u672C\u5C40\u5F00\u59CB\u3002";
+    init_collector_github();
+    init_cli_errors();
+    init_github_remote();
   }
 });
 
@@ -3961,24 +4379,6 @@ var init_uuidv7 = __esm({
   }
 });
 
-// src/public-cli/cli-errors.ts
-var CliUsageError;
-var init_cli_errors = __esm({
-  "src/public-cli/cli-errors.ts"() {
-    "use strict";
-    CliUsageError = class extends Error {
-      code = "AK_ROLE_USAGE";
-      constructor(message, options) {
-        super(
-          message,
-          options?.cause === void 0 ? void 0 : { cause: options.cause }
-        );
-        this.name = "CliUsageError";
-      }
-    };
-  }
-});
-
 // src/typed-provider-http.ts
 import { readFile as readFile7, unlink, writeFile as writeFile2 } from "node:fs/promises";
 import { join as join9 } from "node:path";
@@ -5652,12 +6052,13 @@ var init_option_definitions = __esm({
         canonical: "--pr",
         aliases: [],
         valueMetavar: "number",
-        required: true,
+        // #676 D1: optional when context uniquely determines the PR; ambiguous → require explicit.
+        required: false,
         repeatable: false,
         form: "option",
         description: {
-          en: "Required positive GitHub pull request number.",
-          zh: "\u5FC5\u586B\uFF1B\u6B63\u6574\u6570 GitHub PR \u53F7\u3002"
+          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: "\u6B63\u6574\u6570 GitHub PR \u53F7\u3002\u5206\u652F/HEAD \u552F\u4E00\u5173\u8054\u53EF\u7ED1\u5B9A\u65F6\u53EF\u7701\u7565\uFF1B\u4EA6\u53EF\u7531\u901A\u8FDB\u53F8\u4ECE\u4EFB\u52A1\u6750\u6599\u7ECF bind-target \u5224\u5B9A\u3002git \u591A\u5019\u9009\u6216\u89D2\u8272\u65E0\u6CD5\u5224\u5B9A\u65F6\u5FC5\u987B\u663E\u5F0F\u63D0\u4F9B\u3002"
         }
       },
       {
@@ -5975,9 +6376,10 @@ var init_option_definitions = __esm({
       collector: {
         command: "collector",
         summary: "Collect GitHub PR review evidence.",
-        usage: ["ak-role collector --pr <number> [options] [instruction]"],
+        usage: ["ak-role collector [--pr <number>] [options] [instruction]"],
         examples: [
           "ak-role collector --pr 42 --repo owner/repository",
+          'ak-role collector --repo owner/repository "Collect findings for #42"',
           "ak-role collector --pr 42 --request-manifest ./requests.json"
         ]
       },
@@ -6194,7 +6596,7 @@ __export(invocation_exports, {
   resolveDoctorCaseRunsPath: () => resolveDoctorCaseRunsPath,
   resolveGitHubRemoteRepository: () => resolveGitHubRemoteRepository
 });
-import { execFileSync as execFileSync2 } from "node:child_process";
+import { execFileSync as execFileSync3 } from "node:child_process";
 import { existsSync as existsSync4 } from "node:fs";
 import {
   lstat as lstat3,
@@ -7140,7 +7542,7 @@ function parseCollectorArgv(args) {
   }
   options.assertRequired();
   return {
-    prNumber,
+    ...prNumber === void 0 ? {} : { prNumber },
     instruction: positional.join(" "),
     attachmentPaths,
     ...project === void 0 ? {} : { project },
@@ -7151,16 +7553,21 @@ function parseCollectorArgv(args) {
 function resolveGitHubRemoteRepository(projectRoot) {
   let remoteUrl;
   try {
-    remoteUrl = execFileSync2("git", ["remote", "get-url", "origin"], {
+    remoteUrl = execFileSync3("git", ["remote", "get-url", "origin"], {
       cwd: projectRoot,
       encoding: "utf8",
       stdio: ["ignore", "pipe", "pipe"]
     }).trim();
   } catch (error) {
-    throw new CliUsageError(
-      "collector requires a github.com origin remote or an explicit --repo owner/repo",
-      { cause: error }
-    );
+    if (isGitRemoteMissing(error)) {
+      throw new CliUsageError(
+        "collector requires a github.com origin remote or an explicit --repo owner/repo",
+        { cause: error }
+      );
+    }
+    throw new Error("collector git failed: cannot read origin remote URL", {
+      cause: error instanceof Error ? error : new Error(String(error))
+    });
   }
   if (remoteUrl.length === 0) {
     throw new CliUsageError(
@@ -7180,43 +7587,23 @@ function resolveGitHubRemoteRepository(projectRoot) {
     throw new CliUsageError(detail, { cause: error });
   }
 }
-function ownerRepoFromGitHubRemoteUrl(remoteUrl) {
-  const trimmed = remoteUrl.trim();
-  const scp = /^git@github\.com:([^/\s]+)\/([^/\s]+?)(?:\.git)?$/i.exec(trimmed);
-  if (scp) {
-    return `${scp[1]}/${stripGitSuffix(scp[2])}`;
-  }
-  const ssh = /^ssh:\/\/git@github\.com\/([^/\s]+)\/([^/\s]+?)(?:\.git)?\/?$/i.exec(
-    trimmed
-  );
-  if (ssh) {
-    return `${ssh[1]}/${stripGitSuffix(ssh[2])}`;
-  }
-  let parsed;
-  try {
-    parsed = new URL(trimmed);
-  } catch {
-    return void 0;
-  }
-  if (!/^github\.com$/i.test(parsed.hostname)) return void 0;
-  if (parsed.search !== "" || parsed.hash !== "") return void 0;
-  const parts = parsed.pathname.split("/").filter((p) => p.length > 0);
-  if (parts.length !== 2) return void 0;
-  return `${parts[0]}/${stripGitSuffix(parts[1])}`;
-}
-function stripGitSuffix(name) {
-  return name.toLowerCase().endsWith(".git") ? name.slice(0, -4) : name;
+function isGitRemoteMissing(error) {
+  if (typeof error !== "object" || error === null) return false;
+  const status = error.status;
+  return status === 2;
 }
 async function admitCollectorInvocation(options) {
   if (options.project !== void 0) {
     requireOptionPath("--project", options.project);
   }
-  let prNumber;
-  try {
-    prNumber = parseCollectorPrNumber(options.prNumber);
-  } catch (error) {
-    const detail = error instanceof Error ? error.message : String(error);
-    throw new CliUsageError(detail, { cause: error });
+  let explicitPrNumber;
+  if (options.prNumber !== void 0) {
+    try {
+      explicitPrNumber = parseCollectorPrNumber(options.prNumber);
+    } catch (error) {
+      const detail = error instanceof Error ? error.message : String(error);
+      throw new CliUsageError(detail, { cause: error });
+    }
   }
   const projectRoot = resolve9(options.project ?? options.cwd);
   let repository;
@@ -7259,13 +7646,19 @@ async function admitCollectorInvocation(options) {
   ensureRealDirectoryTree(ledgerHome, sessionDirectory);
   ensureRealDirectoryTree(ledgerHome, attachmentsDirectory);
   const attachments = await freezeAttachments(options.attachmentPaths ?? [], attachmentsDirectory);
+  const instruction = options.instruction ?? "";
+  const instructionEmpty = instruction.trim() === "";
+  const target = await resolveCollectorTarget({
+    projectRoot,
+    repository,
+    ...explicitPrNumber === void 0 ? {} : { explicitPrNumber }
+  });
+  const prNumber = target.kind === "bound" ? target.prNumber : void 0;
   let requestManifestPath;
   if (manifestCanonicalJson !== void 0) {
     requestManifestPath = join13(runDirectory, "request-manifest.json");
     await writeFile4(requestManifestPath, manifestCanonicalJson, "utf8");
   }
-  const instruction = options.instruction ?? "";
-  const instructionEmpty = instruction.trim() === "";
   const admitted = {
     role: "collector",
     runId,
@@ -7275,7 +7668,7 @@ async function admitCollectorInvocation(options) {
     principal,
     instruction,
     instructionEmpty,
-    prNumber,
+    ...prNumber === void 0 ? {} : { prNumber },
     repository: repository.canonical,
     repositoryDisplay: repository.display,
     ...requestManifestPath === void 0 ? {} : { requestManifestPath },
@@ -7305,14 +7698,14 @@ async function admitCollectorInvocation(options) {
     runDirectory,
     principal,
     admittedRequestPath,
-    prNumber,
+    ...prNumber === void 0 ? {} : { prNumber },
     repository,
     ...requestManifestPath === void 0 ? {} : { requestManifestPath },
     manifestDigest
   };
 }
-function buildCollectorTransportPrompt(_admitted, engineMaterial) {
-  return appendEngineSessionMaterial([COLLECTOR_FIXED_KICKOFF], engineMaterial).join("\n");
+function buildCollectorTransportPrompt(admitted, engineMaterial) {
+  return buildInstructionTransportPrompt(admitted, engineMaterial);
 }
 function parseDoctorIssueNumber(raw) {
   const trimmed = raw.trim();
@@ -8332,6 +8725,8 @@ var init_invocation = __esm({
     init_run_ticket_number();
     init_doctor_evidence();
     init_collector_config();
+    init_collector_target();
+    init_github_remote();
     init_fixer_packet();
     init_merger_git_state();
     init_merger_contracts();
@@ -10924,19 +11319,19 @@ function branchNamesAtPinnedHead(pin) {
   }
   return Object.freeze([...names]);
 }
-async function gitText(root, args) {
+async function gitText2(root, args) {
   const { stdout } = await execGit(["-C", root, ...args], { encoding: "utf8" });
   return stdout.trim();
 }
 async function createReviewerPinnedGitReader(root = process.cwd()) {
-  const discoveredRoot = await gitText(root, ["rev-parse", "--show-toplevel"]);
+  const discoveredRoot = await gitText2(root, ["rev-parse", "--show-toplevel"]);
   const repositoryRoot = await realpath6(discoveredRoot);
-  const objectFormat = await gitText(repositoryRoot, ["rev-parse", "--show-object-format"]);
+  const objectFormat = await gitText2(repositoryRoot, ["rev-parse", "--show-object-format"]);
   if (objectFormat !== "sha1" && objectFormat !== "sha256") throw new Error("Unsupported Git object format");
   const oidWidth = objectFormat === "sha1" ? 40 : 64;
-  const targetHead = await gitText(repositoryRoot, ["rev-parse", "HEAD^{commit}"]);
-  const reachableCommitIds = Object.freeze((await gitText(repositoryRoot, ["rev-list", targetHead])).split("\n").filter(Boolean));
-  const refs = parseReviewerRefSnapshot(await gitText(repositoryRoot, reviewerRefSnapshotArgs()));
+  const targetHead = await gitText2(repositoryRoot, ["rev-parse", "HEAD^{commit}"]);
+  const reachableCommitIds = Object.freeze((await gitText2(repositoryRoot, ["rev-list", targetHead])).split("\n").filter(Boolean));
+  const refs = parseReviewerRefSnapshot(await gitText2(repositoryRoot, reviewerRefSnapshotArgs()));
   const pin = immutableReviewerPin({ repositoryRoot, objectFormat, targetHead, refs });
   const invalid = (code, diagnostic, cause) => {
     throw new ReviewerCorrectablePreflightError(code, diagnostic, cause === void 0 ? void 0 : { cause });
@@ -10955,9 +11350,9 @@ async function createReviewerPinnedGitReader(root = process.cwd()) {
   return Object.freeze({
     pin,
     async snapshot() {
-      const liveObjectFormat = await gitText(repositoryRoot, ["rev-parse", "--show-object-format"]);
+      const liveObjectFormat = await gitText2(repositoryRoot, ["rev-parse", "--show-object-format"]);
       if (liveObjectFormat !== "sha1" && liveObjectFormat !== "sha256") throw new Error("Unsupported Git object format");
-      return immutableReviewerPin({ repositoryRoot, objectFormat: liveObjectFormat, targetHead: await gitText(repositoryRoot, ["rev-parse", "HEAD^{commit}"]), refs: parseReviewerRefSnapshot(await gitText(repositoryRoot, reviewerRefSnapshotArgs())) });
+      return immutableReviewerPin({ repositoryRoot, objectFormat: liveObjectFormat, targetHead: await gitText2(repositoryRoot, ["rev-parse", "HEAD^{commit}"]), refs: parseReviewerRefSnapshot(await gitText2(repositoryRoot, reviewerRefSnapshotArgs())) });
     },
     async resolve(base) {
       if (!/^[A-Za-z0-9._/~^+-]+$/.test(base) || base.startsWith("-") || base.includes("..") || base.includes("@{")) {
@@ -10967,7 +11362,7 @@ async function createReviewerPinnedGitReader(root = process.cwd()) {
       const headExpression = /^HEAD((?:~[0-9]+|\^[0-9]+)*)$/.exec(base);
       if (headExpression) {
         try {
-          commit = await gitText(repositoryRoot, ["rev-parse", "--verify", `${targetHead}${headExpression[1]}^{commit}`]);
+          commit = await gitText2(repositoryRoot, ["rev-parse", "--verify", `${targetHead}${headExpression[1]}^{commit}`]);
         } catch (error) {
           if (exitCode(error) === 128) {
             const repository = await repositoryIsAvailable(repositoryRoot);
@@ -10983,7 +11378,7 @@ async function createReviewerPinnedGitReader(root = process.cwd()) {
       } else commit = symbolic(base);
       if (commit === void 0) invalid("base-invalid", "base revision must name an existing pinned ref or reachable commit");
       try {
-        commit = await gitText(repositoryRoot, ["rev-parse", "--verify", `${commit}^{commit}`]);
+        commit = await gitText2(repositoryRoot, ["rev-parse", "--verify", `${commit}^{commit}`]);
       } catch (error) {
         if (exitCode(error) === 128) {
           const repository = await repositoryIsAvailable(repositoryRoot);
@@ -10992,7 +11387,7 @@ async function createReviewerPinnedGitReader(root = process.cwd()) {
         throw error;
       }
       try {
-        await gitText(repositoryRoot, ["merge-base", "--is-ancestor", commit, targetHead]);
+        await gitText2(repositoryRoot, ["merge-base", "--is-ancestor", commit, targetHead]);
       } catch (error) {
         if (exitCode(error) === 1) invalid("base-invalid", "base revision must be an ancestor of the pinned target", error);
         throw error;
@@ -11002,7 +11397,7 @@ async function createReviewerPinnedGitReader(root = process.cwd()) {
     async range(base) {
       let mergeBase;
       try {
-        mergeBase = await gitText(repositoryRoot, ["merge-base", base, targetHead]);
+        mergeBase = await gitText2(repositoryRoot, ["merge-base", base, targetHead]);
       } catch (error) {
         if (exitCode(error) === 1) {
           invalid("range-invalid", "review range requires a common ancestor for base and pinned target", error);
@@ -11013,7 +11408,7 @@ async function createReviewerPinnedGitReader(root = process.cwd()) {
       const diffCommand = `git diff ${mergeBase}...${targetHead}`;
       const [{ stdout: diff }, commitsText] = await Promise.all([
         execGit(["-C", repositoryRoot, "diff", `${mergeBase}...${targetHead}`], { encoding: "buffer", maxBuffer: 64 * 1024 * 1024 }),
-        gitText(repositoryRoot, ["rev-list", "--reverse", `${mergeBase}..${targetHead}`])
+        gitText2(repositoryRoot, ["rev-list", "--reverse", `${mergeBase}..${targetHead}`])
       ]);
       if (diff.length === 0) invalid("range-invalid", "review range must contain a non-empty diff between base and pinned target");
       return Object.freeze({ base: mergeBase, target: targetHead, diffCommand, diffSha256: sha256Hex(Uint8Array.from(diff)), commits: Object.freeze(commitsText ? commitsText.split("\n") : []) });
@@ -11029,7 +11424,7 @@ async function createReviewerPinnedGitReader(root = process.cwd()) {
     },
     async listSpecCandidatePaths() {
       const roots = ["docs", "specs", ".scratch"];
-      const text = await gitText(repositoryRoot, [
+      const text = await gitText2(repositoryRoot, [
         "ls-tree",
         "-r",
         "--name-only",
@@ -11042,7 +11437,7 @@ async function createReviewerPinnedGitReader(root = process.cwd()) {
     async originRepository() {
       let remoteUrl;
       try {
-        remoteUrl = await gitText(repositoryRoot, ["remote", "get-url", "origin"]);
+        remoteUrl = await gitText2(repositoryRoot, ["remote", "get-url", "origin"]);
       } catch (error) {
         if (isConfirmedMissingOriginRemote(error)) return void 0;
         throw error;
@@ -11050,7 +11445,7 @@ async function createReviewerPinnedGitReader(root = process.cwd()) {
       return parseGitHubOriginRemote(remoteUrl);
     },
     async commitMessagesNewestFirst(base) {
-      const text = await gitText(repositoryRoot, [
+      const text = await gitText2(repositoryRoot, [
         "log",
         "--format=%s",
         `${base}..${targetHead}`
@@ -11827,21 +12222,214 @@ function assignWindowRelations(records2, activationTime, deadlineTime) {
     }
   }
 }
-var COLLECTOR_ELIGIBILITY_MS;
-var init_collector_evidence = __esm({
-  "src/collector-evidence.ts"() {
+var COLLECTOR_ELIGIBILITY_MS;
+var init_collector_evidence = __esm({
+  "src/collector-evidence.ts"() {
+    "use strict";
+    COLLECTOR_ELIGIBILITY_MS = 15 * 60 * 1e3;
+  }
+});
+
+// src/collector-identity.ts
+function identityKey(identity) {
+  if (identity === null) return "unassigned";
+  return String(identity.userId);
+}
+function mergeMachineIdentity(current, observed) {
+  if (current === null) return observed;
+  if (observed === null) return current;
+  if (current.appId === void 0 && observed.appId !== void 0) return observed;
+  if (current.appId !== void 0 && observed.appId === void 0) return current;
+  return observed.userType < current.userType ? observed : current;
+}
+function headRelationFor(record4, targetHead) {
+  return record4.commitOid === void 0 || record4.commitOid === null ? "unbound" : record4.commitOid === targetHead ? "current" : "prior";
+}
+function extractCollectorEvidenceIdentityGroups(records2, targetHead) {
+  const groups = /* @__PURE__ */ new Map();
+  for (const record4 of records2) {
+    if (record4.kind !== "review" && record4.kind !== "issue_comment" && record4.kind !== "review_comment" && record4.kind !== "reaction") continue;
+    if (record4.githubId === void 0) continue;
+    const identity = record4.machineIdentity ?? null;
+    const kind = record4.kind;
+    const source = {
+      kind,
+      id: record4.githubId,
+      evidenceId: record4.evidenceId,
+      headRelation: headRelationFor(record4, targetHead)
+    };
+    const key = identityKey(identity);
+    let group = groups.get(key);
+    if (group === void 0) {
+      group = {
+        identity,
+        ...record4.authorLogin === void 0 ? {} : { displayLogin: record4.authorLogin },
+        attendance: true,
+        findings: [],
+        materials: []
+      };
+      groups.set(key, group);
+    } else {
+      group.identity = mergeMachineIdentity(group.identity, identity);
+    }
+    group.materials.push(source);
+  }
+  return [...groups.values()];
+}
+function candidateRecord(candidate) {
+  if (candidate === void 0 || candidate === null || typeof candidate !== "object" || Array.isArray(candidate)) {
+    return void 0;
+  }
+  return candidate;
+}
+function hasNonCanonicalOwnKeys(record4) {
+  for (const key of Object.keys(record4)) {
+    if (!COLLECTOR_OUTPUT_CANONICAL_KEYS.has(key)) return true;
+  }
+  return false;
+}
+function enrichCollectorFindings(input) {
+  if (input.candidate !== void 0 && input.candidate !== null && candidateRecord(input.candidate) === void 0) {
+    return { findingsSource: "unreadable", findingsProjectedCount: 0, findingsUnprojected: true };
+  }
+  const record4 = candidateRecord(input.candidate);
+  if (record4 === void 0) {
+    return { findingsSource: "absent", findingsProjectedCount: 0, findingsUnprojected: false };
+  }
+  if (!Object.hasOwn(record4, "findings")) {
+    if (hasNonCanonicalOwnKeys(record4)) {
+      return { findingsSource: "unreadable", findingsProjectedCount: 0, findingsUnprojected: true };
+    }
+    return { findingsSource: "absent", findingsProjectedCount: 0, findingsUnprojected: false };
+  }
+  const rawFindings = record4["findings"];
+  if (!Array.isArray(rawFindings)) {
+    return { findingsSource: "unreadable", findingsProjectedCount: 0, findingsUnprojected: true };
+  }
+  const byEvidenceId = new Map(input.records.map((evidence) => [evidence.evidenceId, evidence]));
+  let projected = 0;
+  let unprojected = false;
+  for (const raw of rawFindings) {
+    if (raw === null || typeof raw !== "object" || Array.isArray(raw)) {
+      unprojected = true;
+      continue;
+    }
+    const item = raw;
+    const evidenceId = item.evidenceId;
+    if (typeof evidenceId !== "string" || evidenceId.length === 0) {
+      unprojected = true;
+      continue;
+    }
+    const evidence = byEvidenceId.get(evidenceId);
+    if (evidence === void 0) {
+      throw new CollectorUnknownEvidenceError(evidenceId);
+    }
+    if (evidence.kind !== "review" && evidence.kind !== "issue_comment" && evidence.kind !== "review_comment") {
+      throw new CollectorFindingsValidationError(`\u901A\u8FDB\u53F8 finding \u6307\u9488\u6307\u5411\u4E0D\u53EF\u627F finding \u7684\u8BC1\u636E\u79CD\u7C7B ${evidence.kind}`);
+    }
+    if (evidence.githubId === void 0) {
+      throw new CollectorFindingsValidationError(`\u901A\u8FDB\u53F8 finding \u6307\u9488\u8BC1\u636E ${evidenceId} \u7F3A\u5C11 GitHub id`);
+    }
+    const identity = evidence.machineIdentity ?? null;
+    const group = input.groups.find((candidateGroup) => identityKey(candidateGroup.identity) === identityKey(identity));
+    if (group === void 0) {
+      throw new CollectorFindingsValidationError(`\u901A\u8FDB\u53F8 finding \u6307\u9488\u8BC1\u636E ${evidenceId} \u65E0\u5F52\u5C5E\u8EAB\u4EFD\u7EC4`);
+    }
+    const category = item.category;
+    const summary = item.summary;
+    if (Object.hasOwn(item, "category") && typeof category !== "string") unprojected = true;
+    if (Object.hasOwn(item, "summary") && typeof summary !== "string") unprojected = true;
+    group.findings.push({
+      identity,
+      source: {
+        kind: evidence.kind,
+        id: evidence.githubId,
+        evidenceId: evidence.evidenceId,
+        headRelation: headRelationFor(evidence, input.targetHead)
+      },
+      ...typeof category === "string" ? { category } : {},
+      ...typeof summary === "string" ? { summary } : {},
+      pointer: {
+        repository: input.repository,
+        prNumber: input.prNumber,
+        commentId: evidence.githubId,
+        ...evidence.htmlUrl === void 0 ? {} : { htmlUrl: evidence.htmlUrl },
+        ...evidence.authorLogin === void 0 ? {} : { authorLogin: evidence.authorLogin },
+        kind: evidence.kind,
+        authoritativeTime: evidence.authoritativeTime ?? null,
+        ...evidence.commitOid === void 0 ? {} : { commitOid: evidence.commitOid }
+      }
+    });
+    projected += 1;
+  }
+  return {
+    findingsSource: "array",
+    findingsProjectedCount: projected,
+    findingsUnprojected: unprojected
+  };
+}
+function extractCollectorUnfinishedReasons(candidate) {
+  if (candidate !== void 0 && candidate !== null && candidateRecord(candidate) === void 0) {
+    return { reasons: void 0, source: "unreadable", unprojected: true };
+  }
+  const record4 = candidateRecord(candidate);
+  if (record4 === void 0) {
+    return { reasons: void 0, source: "absent", unprojected: false };
+  }
+  if (!Object.hasOwn(record4, "unfinishedReasons")) {
+    return { reasons: void 0, source: "absent", unprojected: false };
+  }
+  const raw = record4["unfinishedReasons"];
+  if (!Array.isArray(raw)) {
+    return { reasons: void 0, source: "unreadable", unprojected: true };
+  }
+  const reasons = raw.filter((item) => typeof item === "string");
+  const unprojected = reasons.length !== raw.length;
+  return {
+    reasons: reasons.length > 0 ? reasons : void 0,
+    source: "array",
+    unprojected
+  };
+}
+var CollectorUnknownEvidenceError, CollectorFindingsValidationError, CollectorNonOpenRequestError, COLLECTOR_OUTPUT_CANONICAL_KEYS;
+var init_collector_identity = __esm({
+  "src/collector-identity.ts"() {
     "use strict";
-    COLLECTOR_ELIGIBILITY_MS = 15 * 60 * 1e3;
+    init_submission_correctable_error();
+    CollectorUnknownEvidenceError = class extends CorrectableSubmissionError {
+      constructor(evidenceId) {
+        super(`\u672A\u5728\u672C\u5C40\u5DF2\u89C2\u6D4B\u6750\u6599\u4E2D\u627E\u5230 evidenceId ${evidenceId}\uFF1B\u8BF7\u7528 observe \u8FD4\u56DE\u7684\u6307\u9488\u91CD\u8BD5\u3002`);
+        this.name = "CollectorUnknownEvidenceError";
+      }
+    };
+    CollectorFindingsValidationError = class extends CorrectableSubmissionError {
+      constructor(message) {
+        super(message);
+        this.name = "CollectorFindingsValidationError";
+      }
+    };
+    CollectorNonOpenRequestError = class extends CorrectableSubmissionError {
+      constructor(prState) {
+        super(`\u901A\u8FDB\u53F8\u8BF7\u6C42\u8981\u6C42 OPEN \u72B6\u6001\u7684 PR \u5FEB\u7167\uFF1B\u5F53\u524D\u4E3A ${prState}\uFF0C\u4E0D\u518D\u89E6\u53D1\u65B0\u8BC4\u5BA1\uFF0C\u8BF7\u76F4\u63A5\u4EA4\u56DE\u5DF2\u6709\u6750\u6599`);
+        this.name = "CollectorNonOpenRequestError";
+      }
+    };
+    COLLECTOR_OUTPUT_CANONICAL_KEYS = /* @__PURE__ */ new Set([
+      "findings",
+      "unfinishedReasons",
+      "infrastructureFailure"
+    ]);
   }
 });
 
 // src/collector-tool-schemas.ts
 import { Type as Type13 } from "typebox";
-var collectorObserveArgsSchema, collectorRequestArgsSchema, collectorReadArgsSchema, collectorWaitArgsSchema, collectorFindingArgsSchema, collectorOutputBaseSchema, collectorOutputArgsSchema;
+var collectorObserveArgsSchema, collectorRequestArgsSchema, collectorReadArgsSchema, collectorWaitArgsSchema, collectorBindTargetArgsSchema, collectorFindingItemDeclaration, collectorOutputBaseSchema, collectorOutputArgsSchema;
 var init_collector_tool_schemas = __esm({
   "src/collector-tool-schemas.ts"() {
     "use strict";
     init_collector_evidence();
+    init_open_tool_schema();
     init_terminating_infrastructure();
     collectorObserveArgsSchema = Type13.Object({}, { additionalProperties: false });
     collectorRequestArgsSchema = Type13.Object({
@@ -11854,19 +12442,51 @@ var init_collector_tool_schemas = __esm({
     collectorWaitArgsSchema = Type13.Object({
       durationMs: Type13.Integer({ minimum: 1, maximum: COLLECTOR_ELIGIBILITY_MS, description: "\u7B49\u5F85\u6BEB\u79D2\uFF1B\u5355\u6B21\u4E0A\u9650\u4E94\u5206\u949F\u4E14\u4E0D\u8D85\u5269\u4F59\u8D44\u683C" })
     }, { additionalProperties: false });
-    collectorFindingArgsSchema = Type13.Object({
-      evidenceId: Type13.String({ minLength: 1, description: "observe \u8FD4\u56DE\u7684\u6750\u6599\u8BC1\u636E id\uFF08evidenceId\uFF09" }),
-      category: Type13.Optional(Type13.String({ minLength: 1, maxLength: 200, description: "\u8BE5 finding \u7684\u7B80\u77ED\u5F52\u7C7B\u6807\u7B7E\uFF1B\u9700\u8981\u5934\u90E8\u4E4B\u5916\u7684\u6B63\u6587\u65F6\u5148\u7528 ak_collector_read \u5F00\u5377\u518D\u5224\u8BFB\uFF0C\u4E0D\u5F97\u8A8A\u5199\u8BC4\u8BBA\u6B63\u6587" }))
-    }, { additionalProperties: false });
-    collectorOutputBaseSchema = Type13.Object({
-      findings: Type13.Optional(Type13.Array(collectorFindingArgsSchema, {
-        description: "\u672C\u6B21\u6536\u96C6\u5230\u7684\u9010\u6761 findings\uFF1B\u96F6 finding \u7684\u6A21\u677F\u901A\u77E5\u4E0D\u5F97\u8FDB\u5165\u3002\u6B63\u5E38\u5B8C\u5DE5\u65E0 finding \u65F6\u7701\u7565\u3002"
+    collectorBindTargetArgsSchema = Type13.Object({
+      prNumber: Type13.Optional(Type13.Unknown({
+        description: "\u89D2\u8272\u5224\u5B9A\u7684\u672C\u4ED3 PR \u53F7\uFF08\u6B63\u6574\u6570\uFF09\u3002\u4E0E issueNumber \u4E8C\u9009\u4E00\u6216\u540C\u6307\u552F\u4E00\u76EE\u6807\u3002\u5F62\u72B6\u6307\u5F15\uFF0C\u975E schema \u95F8\u3002"
+      })),
+      issueNumber: Type13.Optional(Type13.Unknown({
+        description: "\u89D2\u8272\u5224\u5B9A\u7684\u672C\u4ED3 issue \u53F7\uFF08\u6B63\u6574\u6570\uFF09\uFF1Bruntime \u7ECF\u7EBF\u4E0A\u5173\u8054\u89E3\u6790\u552F\u4E00 PR\u3002\u5F62\u72B6\u6307\u5F15\uFF0C\u975E schema \u95F8\u3002"
       }))
-    }, { additionalProperties: true, description: "\u6B63\u5E38\u5B8C\u5DE5\u63D0\u4EA4\u7A7A\u5BF9\u8C61 {}\uFF1B\u4EC5\u5728\u57FA\u7840\u8BBE\u65BD\u771F\u5B9E\u5931\u8D25\u65F6\u624D\u586B\u5199 infrastructureFailure\uFF0C\u65E0\u5931\u8D25\u65F6\u5FC5\u987B\u7701\u7565\u8BE5\u5B57\u6BB5\u3002" });
+    }, { additionalProperties: true });
+    collectorFindingItemDeclaration = (() => {
+      const item = Type13.Object(
+        {
+          evidenceId: Type13.Unknown({
+            description: "observe \u8FD4\u56DE\u7684\u6750\u6599\u6307\u9488\uFF08\u5FC5\u586B\u8BED\u4E49\uFF09"
+          }),
+          category: Type13.Unknown({
+            description: "\u7B80\u77ED\u5F52\u7C7B\u6807\u7B7E\uFF0C\u4E0D\u662F\u6458\u8981"
+          }),
+          summary: Type13.Unknown({
+            description: "\u54EA\u4E2A bot\u3001\u4EC0\u4E48\u95EE\u9898\u7684\u6458\u8981\uFF1B\u4E0D\u8A8A\u6284\u6B63\u6587"
+          })
+        },
+        {
+          additionalProperties: true,
+          description: "\u5355\u6761 finding \u6307\u9488\uFF1AevidenceId + \u53EF\u9009 category/summary\u3002\u5F62\u72B6\u6307\u5F15\uFF0C\u975E schema \u95F8\u3002"
+        }
+      );
+      item.required = [];
+      return item;
+    })();
+    collectorOutputBaseSchema = openToolObject(
+      Type13.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: Type13.Unsafe({
+          description: "\u672C\u6B21\u6536\u96C6\u5230\u7684\u9010\u6761 findings\uFF08\u6307\u9488\u6570\u7EC4\u4E3A\u89C4\u8303\u5F62\uFF09\u3002\u96F6 finding \u7684\u6A21\u677F\u901A\u77E5\u4E0D\u5F97\u8FDB\u5165\uFF1B\u6B63\u5E38\u5B8C\u5DE5\u65E0 finding \u65F6\u7701\u7565\u3002\u5F62\u72B6\u6307\u5F15\uFF0C\u975E schema \u95F8\u3002",
+          items: collectorFindingItemDeclaration
+        }),
+        unfinishedReasons: Type13.Unknown({
+          description: "\u672A\u5B8C\u6210\u539F\u56E0\u5B57\u7B26\u4E32\u6570\u7EC4\uFF08\u989D\u5EA6/\u6545\u969C/\u7B49\u5F85\u5C4A\u6EE1\u7B49\u73B0\u573A\u4F9D\u636E\uFF09\uFF1B\u4E0D\u5F97\u628A\u672A\u5B8C\u6210\u8868\u8FF0\u4E3A\u65E0\u95EE\u9898\u3002\u65E0\u53EF\u62A5\u544A\u65F6\u7701\u7565\u3002\u5F62\u72B6\u6307\u5F15\uFF0C\u975E schema \u95F8\u3002"
+        })
+      })
+    );
     collectorOutputArgsSchema = withInfrastructureFailureDeclaration(
       collectorOutputBaseSchema
     );
-    collectorOutputArgsSchema.required = [];
   }
 });
 
@@ -11942,10 +12562,18 @@ function createCollectorLedger(config, options) {
     return Math.max(0, deadlineMono - monoNowOrThrow(clock2));
   };
   const prIdentity = (pr) => `${pr.state}|${pr.headOid}|${pr.updatedAt ?? ""}`;
+  const requireBoundPr = () => {
+    if (config.prNumber === void 0) {
+      throw new Error(
+        "Collector PR target is unbound; call ak_collector_bind_target with the role-decided issue/PR or pass --pr"
+      );
+    }
+    return config.prNumber;
+  };
   const fetchObserveSurfaces = async (transport, observedAt, signal) => {
     const owner = config.repository.owner;
     const repo = config.repository.repo;
-    const prNumber = config.prNumber;
+    const prNumber = requireBoundPr();
     const signalOpt = signal === void 0 ? {} : { signal };
     const user = await transport.getAuthenticatedUser(signalOpt);
     const prInitial = await transport.getPullRequest({
@@ -12214,6 +12842,25 @@ function createCollectorLedger(config, options) {
       assertNotFatal();
       outputCandidate = true;
     },
+    bindTarget(prNumber) {
+      assertNotFatal();
+      if (outputCandidate || pendingOutputCallId !== void 0) {
+        throw new Error("\u901A\u8FDB\u53F8\u5DF2\u4EA7\u51FA\u8F93\u51FA\u5019\u9009\uFF0C\u672C\u5C40\u4E0D\u518D\u53D7\u7406\u76EE\u6807\u7ED1\u5B9A");
+      }
+      if (!Number.isSafeInteger(prNumber) || prNumber < 1) {
+        throw new Error("Collector bind target requires a positive safe-integer PR number");
+      }
+      if (config.prNumber !== void 0 && config.prNumber !== prNumber) {
+        throw new Error(
+          `Collector target already bound to PR ${config.prNumber}; cannot rebind to ${prNumber}`
+        );
+      }
+      config.prNumber = prNumber;
+      appendJournal("ak-collector-target-bound", {
+        prNumber,
+        repository: config.repository.canonical
+      });
+    },
     beginOperational(toolName, toolCallId) {
       assertNotFatal();
       if (toolName !== COLLECTOR_OUTPUT_TOOL && (outputCandidate || pendingOutputCallId !== void 0)) {
@@ -12360,7 +13007,7 @@ function createCollectorLedger(config, options) {
         completedMono,
         host: "github.com",
         repository: config.repository.canonical,
-        prNumber: config.prNumber,
+        prNumber: requireBoundPr(),
         prState: pr.state,
         headOid: pr.headOid,
         complete: true,
@@ -12399,10 +13046,6 @@ function createCollectorLedger(config, options) {
       if (activationTime === void 0 || deadlineTime === void 0) {
         throw latchFatal("\u901A\u8FDB\u53F8\u8BF7\u6C42\u9700\u8981\u6FC0\u6D3B");
       }
-      if (pastCutoff(clock2)) {
-        finalObservationRequired = true;
-        throw latchFatal("\u901A\u8FDB\u53F8\u8BF7\u6C42\u4E0D\u5728\u8D44\u683C\u622A\u6B62\u524D");
-      }
       if (ledger.unresolvedTransportFailure) {
         throw latchFatal("\u901A\u8FDB\u53F8\u8BF7\u6C42\u65F6\u5B58\u5728\u672A\u6062\u590D\u7684\u4F20\u8F93\u5931\u8D25");
       }
@@ -12418,7 +13061,11 @@ function createCollectorLedger(config, options) {
         throw new Error("\u901A\u8FDB\u53F8\u8BF7\u6C42\u8981\u6C42\u6700\u65B0\u5B8C\u6574\u5FEB\u7167");
       }
       if (snapshot.prState !== "OPEN") {
-        throw latchFatal("\u901A\u8FDB\u53F8\u8BF7\u6C42\u8981\u6C42 OPEN \u72B6\u6001\u7684 PR \u5FEB\u7167");
+        throw new CollectorNonOpenRequestError(snapshot.prState);
+      }
+      if (pastCutoff(clock2)) {
+        finalObservationRequired = true;
+        throw latchFatal("\u901A\u8FDB\u53F8\u8BF7\u6C42\u4E0D\u5728\u8D44\u683C\u622A\u6B62\u524D");
       }
       const { body, marker } = buildCollectorRequestBody({
         configuredBody: request.requestBody,
@@ -12435,9 +13082,10 @@ function createCollectorLedger(config, options) {
           `\u901A\u8FDB\u53F8\u5728\u6B64 HEAD \u5DF2\u6709\u540C marker \u7684\u5DF2\u8BA4\u8BC1\u8BF7\u6C42 "${input.requestId}"`
         );
       }
+      const boundPr = requireBoundPr();
       const attemptKey = [
         config.repository.canonical,
-        String(config.prNumber),
+        String(boundPr),
         snapshot.headOid,
         request.id
       ].join("|");
@@ -12466,7 +13114,7 @@ function createCollectorLedger(config, options) {
       const result = await transport.createIssueComment({
         owner: config.repository.owner,
         repo: config.repository.repo,
-        prNumber: config.prNumber,
+        prNumber: boundPr,
         body,
         ...signal === void 0 ? {} : { signal }
       });
@@ -12632,19 +13280,22 @@ function buildObserveModelView(input) {
     }))
   };
 }
-var COLLECTOR_OBSERVE_TOOL, COLLECTOR_READ_TOOL, COLLECTOR_REQUEST_TOOL, COLLECTOR_WAIT_TOOL, COLLECTOR_OPERATIONAL_TOOLS, COLLECTOR_OBSERVE_BODY_HEAD_BYTES, COLLECTOR_ACTIVATION_ENTRY_TYPE, COLLECTOR_SNAPSHOT_ENTRY_TYPE, COLLECTOR_REQUEST_ENTRY_TYPE, COLLECTOR_WAIT_ENTRY_TYPE;
+var COLLECTOR_OBSERVE_TOOL, COLLECTOR_READ_TOOL, COLLECTOR_REQUEST_TOOL, COLLECTOR_WAIT_TOOL, COLLECTOR_BIND_TARGET_TOOL, COLLECTOR_OPERATIONAL_TOOLS, COLLECTOR_OBSERVE_BODY_HEAD_BYTES, COLLECTOR_ACTIVATION_ENTRY_TYPE, COLLECTOR_SNAPSHOT_ENTRY_TYPE, COLLECTOR_REQUEST_ENTRY_TYPE, COLLECTOR_WAIT_ENTRY_TYPE;
 var init_collector_ledger = __esm({
   "src/collector-ledger.ts"() {
     "use strict";
     init_collector_evidence();
     init_collector_github();
+    init_collector_identity();
     init_collector_tool_schemas();
     init_collector_output();
     COLLECTOR_OBSERVE_TOOL = "ak_collector_observe";
     COLLECTOR_READ_TOOL = "ak_collector_read";
     COLLECTOR_REQUEST_TOOL = "ak_collector_request";
     COLLECTOR_WAIT_TOOL = "ak_collector_wait";
+    COLLECTOR_BIND_TARGET_TOOL = "ak_collector_bind_target";
     COLLECTOR_OPERATIONAL_TOOLS = [
+      COLLECTOR_BIND_TARGET_TOOL,
       COLLECTOR_OBSERVE_TOOL,
       COLLECTOR_READ_TOOL,
       COLLECTOR_REQUEST_TOOL,
@@ -13397,8 +14048,27 @@ function formatFailureStderrDiagnostic(failure2) {
   const oneLine2 = selected.split(/\r?\n/).map((line2) => line2.trim()).find((line2) => line2.length > 0) ?? "failure";
   return formatCliDiagnostic(boundConciseDiagnostic(oneLine2));
 }
+function formatErrorCauseDetail(cause) {
+  if (cause instanceof Error) return cause.message;
+  if (typeof cause === "object" && cause !== null) {
+    try {
+      return JSON.stringify(cause);
+    } catch {
+      return String(cause);
+    }
+  }
+  return String(cause);
+}
 function presentStructuralRejection(error, io) {
-  io.stderr(formatCliDiagnostic(error.message));
+  let message = error.message;
+  const cause = error.cause;
+  if (cause !== void 0) {
+    const detail = formatErrorCauseDetail(cause);
+    if (detail.trim().length > 0) {
+      message = `${message}; cause: ${detail}`;
+    }
+  }
+  io.stderr(formatCliDiagnostic(message));
 }
 async function inspectJudgeSession(sessionFile) {
   try {
@@ -14086,6 +14756,22 @@ function toolResultText(message) {
     return "";
   }).join("").trim();
 }
+function extractCollectorTargetBindRejection(entries) {
+  for (let i = entries.length - 1; i >= 0; i -= 1) {
+    const entry = entries[i];
+    if (entry?.type !== "message") continue;
+    const message = entry.message;
+    if (message?.role !== "toolResult") continue;
+    if (message.toolName !== COLLECTOR_BIND_TARGET_TOOL) continue;
+    if (message.isError !== true) return void 0;
+    const diagnostic = toolResultText(message);
+    if (diagnostic.length === 0) return void 0;
+    const details = message.details;
+    const code = isRecord16(details) && typeof details.code === "string" && details.code.trim() !== "" ? details.code : void 0;
+    return code === void 0 ? { diagnostic } : { diagnostic, code };
+  }
+  return void 0;
+}
 function boundErroredToolCandidate(entries, resultIndex, message, toolName) {
   if (message.toolName !== toolName || message.isError !== true) return void 0;
   const bound = boundRoleToolCallForResult(entries, resultIndex, message, toolName);
@@ -14891,7 +15577,18 @@ async function settleFailureTerminalResult(admitted, failure2, authority, option
         try {
           const facts = parseNoReceiptLifecycleFacts(raw);
           if (facts.runPointer === admitted.runDirectory && facts.attemptPointer === `current:${admitted.runDirectory}`) {
-            const decisiveFacts2 = facts;
+            let decisiveFacts2 = facts;
+            if (admitted.role === "collector") {
+              const bindRejection = extractCollectorTargetBindRejection(entries.slice(attemptStart));
+              if (bindRejection !== void 0) {
+                decisiveFacts2 = {
+                  ...facts,
+                  targetBindRejected: true,
+                  targetBindDiagnostic: bindRejection.diagnostic,
+                  ...bindRejection.code === void 0 ? {} : { targetBindCode: bindRejection.code }
+                };
+              }
+            }
             return withOptionalGateProjection(
               {
                 roleOutcome: { kind: "no_receipt", role: admitted.role, status: "no-accepted-receipt", ...facts, decisiveFacts: decisiveFacts2 },
@@ -14972,6 +15669,14 @@ function presentFailureTerminal(terminal, io) {
       cause: terminal.roleOutcome.cause,
       diagnostic: terminal.roleOutcome.diagnostic
     }));
+    return;
+  }
+  const bindDiagnostic = terminal.roleOutcome.decisiveFacts.targetBindDiagnostic;
+  if (typeof bindDiagnostic === "string" && bindDiagnostic.trim() !== "") {
+    io.stderr(formatFailureStderrDiagnostic({
+      cause: "output",
+      diagnostic: bindDiagnostic
+    }));
   }
 }
 function defaultNavigatorGraceSleep() {
@@ -19432,132 +20137,6 @@ var init_tool_execution_observation = __esm({
   }
 });
 
-// src/collector-identity.ts
-function identityKey(identity) {
-  if (identity === null) return "unassigned";
-  return String(identity.userId);
-}
-function mergeMachineIdentity(current, observed) {
-  if (current === null) return observed;
-  if (observed === null) return current;
-  if (current.appId === void 0 && observed.appId !== void 0) return observed;
-  if (current.appId !== void 0 && observed.appId === void 0) return current;
-  return observed.userType < current.userType ? observed : current;
-}
-function headRelationFor(record4, targetHead) {
-  return record4.commitOid === void 0 || record4.commitOid === null ? "unbound" : record4.commitOid === targetHead ? "current" : "prior";
-}
-function extractCollectorEvidenceIdentityGroups(records2, targetHead) {
-  const groups = /* @__PURE__ */ new Map();
-  for (const record4 of records2) {
-    if (record4.kind !== "review" && record4.kind !== "issue_comment" && record4.kind !== "review_comment" && record4.kind !== "reaction") continue;
-    if (record4.githubId === void 0) continue;
-    const identity = record4.machineIdentity ?? null;
-    const kind = record4.kind;
-    const source = {
-      kind,
-      id: record4.githubId,
-      evidenceId: record4.evidenceId,
-      headRelation: headRelationFor(record4, targetHead)
-    };
-    const key = identityKey(identity);
-    let group = groups.get(key);
-    if (group === void 0) {
-      group = {
-        identity,
-        ...record4.authorLogin === void 0 ? {} : { displayLogin: record4.authorLogin },
-        attendance: true,
-        findings: [],
-        materials: []
-      };
-      groups.set(key, group);
-    } else {
-      group.identity = mergeMachineIdentity(group.identity, identity);
-    }
-    group.materials.push(source);
-  }
-  return [...groups.values()];
-}
-function enrichCollectorFindings(input) {
-  const candidate = input.candidate;
-  if (candidate === void 0 || candidate === null) return;
-  if (typeof candidate !== "object" || Array.isArray(candidate)) {
-    throw new CollectorFindingsValidationError("\u901A\u8FDB\u53F8\u4EA4\u4EF6\u53C2\u6570\u5FC5\u987B\u4E3A\u5BF9\u8C61");
-  }
-  const rawFindings = candidate.findings;
-  if (rawFindings === void 0) return;
-  if (!Array.isArray(rawFindings)) {
-    throw new CollectorFindingsValidationError("\u901A\u8FDB\u53F8 findings \u5FC5\u987B\u4E3A\u6570\u7EC4");
-  }
-  const byEvidenceId = new Map(input.records.map((record4) => [record4.evidenceId, record4]));
-  for (const raw of rawFindings) {
-    if (raw === null || typeof raw !== "object" || Array.isArray(raw)) {
-      throw new CollectorFindingsValidationError("\u901A\u8FDB\u53F8 finding \u5FC5\u987B\u4E3A\u5BF9\u8C61");
-    }
-    const evidenceId = raw.evidenceId;
-    if (typeof evidenceId !== "string" || evidenceId.length === 0) {
-      throw new CollectorFindingsValidationError("\u901A\u8FDB\u53F8 finding \u7F3A\u5C11\u53EF\u89E3\u6790\u7684 evidenceId \u6307\u9488");
-    }
-    const record4 = byEvidenceId.get(evidenceId);
-    if (record4 === void 0) {
-      throw new CollectorUnknownEvidenceError(evidenceId);
-    }
-    if (record4.kind !== "review" && record4.kind !== "issue_comment" && record4.kind !== "review_comment") {
-      throw new CollectorFindingsValidationError(`\u901A\u8FDB\u53F8 finding \u6307\u9488\u6307\u5411\u4E0D\u53EF\u627F finding \u7684\u8BC1\u636E\u79CD\u7C7B ${record4.kind}`);
-    }
-    if (record4.githubId === void 0) {
-      throw new CollectorFindingsValidationError(`\u901A\u8FDB\u53F8 finding \u6307\u9488\u8BC1\u636E ${evidenceId} \u7F3A\u5C11 GitHub id`);
-    }
-    const category = raw.category;
-    if (category !== void 0 && (typeof category !== "string" || category.trim().length === 0)) {
-      throw new CollectorFindingsValidationError("\u901A\u8FDB\u53F8 finding category \u5FC5\u987B\u4E3A\u975E\u7A7A\u5B57\u7B26\u4E32");
-    }
-    const identity = record4.machineIdentity ?? null;
-    const group = input.groups.find((candidateGroup) => identityKey(candidateGroup.identity) === identityKey(identity));
-    if (group === void 0) {
-      throw new CollectorFindingsValidationError(`\u901A\u8FDB\u53F8 finding \u6307\u9488\u8BC1\u636E ${evidenceId} \u65E0\u5F52\u5C5E\u8EAB\u4EFD\u7EC4`);
-    }
-    group.findings.push({
-      identity,
-      source: {
-        kind: record4.kind,
-        id: record4.githubId,
-        evidenceId: record4.evidenceId,
-        headRelation: headRelationFor(record4, input.targetHead)
-      },
-      ...category === void 0 ? {} : { category: category.trim() },
-      pointer: {
-        repository: input.repository,
-        prNumber: input.prNumber,
-        commentId: record4.githubId,
-        ...record4.htmlUrl === void 0 ? {} : { htmlUrl: record4.htmlUrl },
-        ...record4.authorLogin === void 0 ? {} : { authorLogin: record4.authorLogin },
-        kind: record4.kind,
-        authoritativeTime: record4.authoritativeTime ?? null
-      }
-    });
-  }
-}
-var CollectorUnknownEvidenceError, CollectorFindingsValidationError;
-var init_collector_identity = __esm({
-  "src/collector-identity.ts"() {
-    "use strict";
-    init_submission_correctable_error();
-    CollectorUnknownEvidenceError = class extends CorrectableSubmissionError {
-      constructor(evidenceId) {
-        super(`\u672A\u5728\u672C\u5C40\u5DF2\u89C2\u6D4B\u6750\u6599\u4E2D\u627E\u5230 evidenceId ${evidenceId}\uFF1B\u8BF7\u7528 observe \u8FD4\u56DE\u7684\u6307\u9488\u91CD\u8BD5\u3002`);
-        this.name = "CollectorUnknownEvidenceError";
-      }
-    };
-    CollectorFindingsValidationError = class extends CorrectableSubmissionError {
-      constructor(message) {
-        super(message);
-        this.name = "CollectorFindingsValidationError";
-      }
-    };
-  }
-});
-
 // src/collector-receipt.ts
 function fail4(message) {
   throw new Error(message);
@@ -19567,13 +20146,15 @@ function buildCollectorReceipt(ledger, candidateRaw, clock) {
   if (ledger.unresolvedTransportFailure) fail4("Collector cannot output while a transport failure is unrecovered");
   if (ledger.latestCompleteSnapshotId === void 0) fail4("Collector output requires a complete final snapshot");
   if (ledger.activationTime === void 0 || ledger.deadlineTime === void 0) fail4("Collector output requires activation timeline");
+  if (ledger.config.prNumber === void 0) {
+    fail4("Collector output requires a bound PR target; call ak_collector_bind_target first or pass --pr");
+  }
   if (clock !== void 0) ledger.assertOutputObservationLaw(clock);
   else if (ledger.observedGeneration !== ledger.mutationGeneration || ledger.finalObservationRequired && !ledger.finalObservationCompleted) {
     fail4("Collector output requires a complete observe after the latest request/wait mutation");
   }
   const finalSnapshot = ledger.getSnapshot(ledger.latestCompleteSnapshotId);
   if (finalSnapshot === void 0 || !finalSnapshot.complete) fail4("Collector final snapshot is incomplete");
-  if (finalSnapshot.prState !== "OPEN") fail4("Collector final snapshot PR state is not OPEN");
   const evidenceRecords = [...ledger.allEvidence()];
   const snapshots = [...ledger.allSnapshots()];
   const evidenceIndex = new Map(evidenceRecords.map((record4) => [record4.evidenceId, record4]));
@@ -19586,7 +20167,7 @@ function buildCollectorReceipt(ledger, candidateRaw, clock) {
     for (const id of snapshot.evidenceIds) if (!evidenceIndex.has(id)) fail4(`Collector snapshot ref "${id}" does not resolve`);
   }
   const groups = extractCollectorEvidenceIdentityGroups(evidenceRecords, finalSnapshot.headOid);
-  enrichCollectorFindings({
+  const findingsProjection = enrichCollectorFindings({
     candidate: candidateRaw,
     records: evidenceRecords,
     groups,
@@ -19595,7 +20176,6 @@ function buildCollectorReceipt(ledger, candidateRaw, clock) {
     prNumber: ledger.config.prNumber
   });
   for (const group of groups) {
-    if (group.attendance !== true) fail4("Collector group lacks attendance");
     for (const material of group.materials) {
       if (material.evidenceId === void 0 || !evidenceIndex.has(material.evidenceId)) fail4("Collector material lacks a receipt-local evidence ref");
     }
@@ -19603,10 +20183,20 @@ function buildCollectorReceipt(ledger, candidateRaw, clock) {
       if (finding2.source.evidenceId === void 0 || !evidenceIndex.has(finding2.source.evidenceId)) fail4("Collector finding lacks a receipt-local evidence ref");
     }
   }
+  const unfinished = extractCollectorUnfinishedReasons(candidateRaw);
+  const submissionProjection = {
+    findingsSource: findingsProjection.findingsSource,
+    findingsProjectedCount: findingsProjection.findingsProjectedCount,
+    findingsUnprojected: findingsProjection.findingsUnprojected,
+    unfinishedReasonsSource: unfinished.source,
+    unfinishedReasonsProjectedCount: unfinished.reasons?.length ?? 0,
+    unfinishedReasonsUnprojected: unfinished.unprojected
+  };
   return {
     host: COLLECTOR_HOST,
     repository: ledger.config.repository.canonical,
     prNumber: ledger.config.prNumber,
+    prState: finalSnapshot.prState,
     manifestDigest: ledger.config.manifest.digest,
     activationTime: ledger.activationTime.toISOString(),
     deadlineTime: ledger.deadlineTime.toISOString(),
@@ -19614,6 +20204,8 @@ function buildCollectorReceipt(ledger, candidateRaw, clock) {
     finalSnapshotId: finalSnapshot.snapshotId,
     targetHead: finalSnapshot.headOid,
     groups,
+    ...unfinished.reasons === void 0 ? {} : { unfinishedReasons: unfinished.reasons },
+    submissionProjection,
     requestAttempts: [...ledger.requestAttempts()],
     snapshots,
     evidenceRecords: evidenceRecords.map(toReceiptEvidenceRecord)
@@ -19643,120 +20235,76 @@ var init_collector_receipt = __esm({
 
 // src/collector-role.ts
 function buildMethodContext(activation) {
+  const pr = activation.ledger.config.prNumber;
   return [
     "<collector_method>",
     `host: github.com`,
     `repository: ${activation.repository.canonical}`,
-    `prNumber: ${activation.prNumber}`,
+    `prNumber: ${pr === void 0 ? "unbound \u2014 call ak_collector_bind_target with the role-decided issue/PR before observe" : String(pr)}`,
     `requests: ${JSON.stringify(activation.manifest.requests.map((request) => ({ id: request.id })))}`,
     "</collector_method>"
   ].join("\n");
 }
+function parsePositiveTicket(raw, label) {
+  if (raw === void 0 || raw === null) return void 0;
+  if (typeof raw === "number" && Number.isSafeInteger(raw) && raw >= 1) return raw;
+  if (typeof raw === "string" && /^[1-9]\d*$/.test(raw.trim())) return Number(raw.trim());
+  throw new CollectorTargetBindError(`ak_collector_bind_target ${label} must be a positive safe integer`);
+}
 function createCollectorRoleRuntime(pi, dependencies, hostActions) {
-  let activation;
-  let inputCount = 0;
-  let lifecycleRegistered = false;
   let toolsRegistered = false;
-  let firstDispatchDone = false;
-  pi.registerFlag("ak-collector-repo", {
-    description: "GitHub owner/repo target for Collector (github.com only; conservative ASCII grammar). Collector forbids every Skill, including command-only Skills.",
-    type: "string"
-  });
-  pi.registerFlag("ak-collector-pr", {
-    description: "Positive safe-integer pull request number for Collector. Supported profile: --no-skills, --no-extensions with only the explicit Collector package extension, no prompt templates/context files, one print/JSON prompt",
-    type: "string"
-  });
-  pi.registerFlag("ak-collector-request-manifest", {
-    description: "Path to the Collector v1 request manifest JSON file. In Pi latest, late hostile sibling-extension Skill injection is unsupported and fail-closed when detected; drift prevention only, not a security boundary or provider-zero guarantee",
-    type: "string"
-  });
-  const ensureLifecycle = () => {
-    if (lifecycleRegistered) return;
-    lifecycleRegistered = true;
-    pi.on("input", (event, ctx) => {
-      if (activation === void 0) {
-        return { action: "continue" };
-      }
-      if (inputCount >= 1) {
-        activation.ledger.latchFatal("\u901A\u8FDB\u53F8\u5DF2\u62D2\u7EDD\u540E\u7EED\u8F93\u5165");
-        if (process.exitCode === void 0 || process.exitCode === 0) {
-          process.exitCode = 1;
-        }
-        console.error("Collector rejected later input");
-        return { action: "handled" };
-      }
-      inputCount += 1;
-      return {
-        action: "transform",
-        text: COLLECTOR_FIXED_KICKOFF,
-        images: []
-      };
-    });
-    pi.on("before_agent_start", (event, ctx) => {
-      if (activation === void 0) return;
-      const options = event.systemPromptOptions;
-      if (options.skills && options.skills.length > 0) {
-        hostActions.failInfrastructure(
-          activation.ledger.latchFatal(
-            "\u901A\u8FDB\u53F8\u68C0\u6D4B\u5230\u7CFB\u7EDF\u63D0\u793A\u4E2D\u7684\u73AF\u5883 skills"
-          ),
-          ctx
-        );
-      }
-      if (options.contextFiles && options.contextFiles.length > 0) {
-        hostActions.failInfrastructure(
-          activation.ledger.latchFatal(
-            "\u901A\u8FDB\u53F8\u68C0\u6D4B\u5230\u7CFB\u7EDF\u63D0\u793A\u4E2D\u7684\u73AF\u5883 context files"
-          ),
-          ctx
-        );
-      }
-      if (typeof options.appendSystemPrompt === "string" && options.appendSystemPrompt.trim().length > 0) {
-        hostActions.failInfrastructure(
-          activation.ledger.latchFatal(
-            "\u901A\u8FDB\u53F8\u68C0\u6D4B\u5230 appendSystemPrompt \u6F02\u79FB"
-          ),
-          ctx
-        );
-      }
-      if (event.prompt !== COLLECTOR_FIXED_KICKOFF) {
-        hostActions.failInfrastructure(
-          activation.ledger.latchFatal(
-            "\u901A\u8FDB\u53F8\u9996\u6761\u63D0\u793A\u4E0D\u662F\u56FA\u5B9A\u5F00\u573A\u4EE4"
-          ),
-          ctx
-        );
+  return {
+    async activate(ctx) {
+      const soul = (await dependencies.loadSoul()).trim();
+      if (soul.length === 0) throw new Error("Collector soul is empty");
+      const repoFlag = pi.getFlag("ak-collector-repo");
+      const prFlag = pi.getFlag("ak-collector-pr");
+      const requestManifestFlag = pi.getFlag("ak-collector-request-manifest");
+      if (typeof repoFlag !== "string" || repoFlag.trim().length === 0) {
+        throw new Error("Collector requires --ak-collector-repo");
       }
-      if (!firstDispatchDone) {
-        firstDispatchDone = true;
-        activation.ledger.recordActivation(activation.clock);
+      const repository = parseCollectorRepository(repoFlag);
+      let prNumber;
+      if (typeof prFlag === "string" && prFlag.trim().length > 0) {
+        prNumber = parseCollectorPrNumber(prFlag);
+      } else if (typeof prFlag === "number") {
+        prNumber = parseCollectorPrNumber(prFlag);
       }
+      const manifest = typeof requestManifestFlag === "string" && requestManifestFlag.trim().length > 0 ? await loadCollectorManifest(requestManifestFlag) : emptyCollectorManifest();
+      const clock = dependencies.createClock?.() ?? createSystemCollectorClock();
+      const transport = dependencies.createTransport();
+      const ledger = dependencies.createLedger(
+        { repository, prNumber, manifest },
+        clock,
+        ctx
+      );
       return {
-        systemPrompt: [
-          event.systemPrompt,
-          "",
-          "<collector_soul>",
-          activation.soul,
-          "</collector_soul>",
-          "",
-          buildMethodContext(activation)
-        ].join("\n")
+        soul,
+        repository,
+        manifest,
+        ledger,
+        transport,
+        clock
       };
-    });
-    pi.on("tool_call", (event) => {
-      if (activation === void 0) return;
+    },
+    assembleMaterials(activation, baseSystemPrompt) {
+      return [
+        baseSystemPrompt,
+        "",
+        "<collector_soul>",
+        activation.soul,
+        "</collector_soul>",
+        "",
+        buildMethodContext(activation)
+      ].join("\n");
+    },
+    onToolCall(activation, event) {
       if (activation.ledger.fatal) {
         return {
           block: true,
           reason: activation.ledger.fatalReason ?? "\u901A\u8FDB\u53F8\u81F4\u547D\u72B6\u6001"
         };
       }
-      if (!COLLECTOR_REQUIRED_TOOLS.includes(event.toolName)) {
-        return {
-          block: true,
-          reason: `\u901A\u8FDB\u53F8\u7981\u7528\u5DE5\u5177 ${event.toolName}`
-        };
-      }
       if (event.toolName === COLLECTOR_OUTPUT_TOOL) {
         activation.ledger.beginOperational(COLLECTOR_OUTPUT_TOOL, event.toolCallId);
       }
@@ -19767,304 +20315,255 @@ function createCollectorRoleRuntime(pi, dependencies, hostActions) {
         };
       }
       return void 0;
-    });
-    pi.on("tool_result", (event) => {
-      if (activation === void 0) return;
+    },
+    onToolResult(activation, event) {
       activation.ledger.completeOperational(event.toolCallId);
-    });
-    pi.on("session_shutdown", () => {
-      if (activation === void 0) return;
-      if (activation.ledger.fatal) {
-        if (process.exitCode === void 0 || process.exitCode === 0) {
-          process.exitCode = 1;
-        }
-      }
-    });
-  };
-  const registerTools = () => {
-    if (toolsRegistered) return;
-    toolsRegistered = true;
-    pi.registerTool({
-      name: COLLECTOR_OBSERVE_TOOL,
-      label: "\u901A\u8FDB\u53F8\u89C2\u5BDF",
-      description: "\u6293\u53D6\u914D\u7F6E\u76EE\u6807\u7684\u5B8C\u6574 GitHub PR \u8BC1\u636E\uFF0C\u5B58\u4E0D\u53EF\u53D8\u5FEB\u7167\u5165\u5377\u3002\u6B63\u6587\u5728\u4E0A\u4E0B\u6587\u4E2D\u53EA\u7ED9\u5934\u90E8\u6458\u5F55\u52A0\u6307\u9488\uFF1B\u9700\u8981\u5934\u90E8\u4E4B\u5916\u7684\u6B63\u6587\u65F6\uFF0C\u7528 ak_collector_read \u6309 evidenceId \u5F00\u5377\uFF1Bfindings \u7684\u62C6\u5206\u4E0E\u5F52\u7C7B\u7531\u4F60\u5728\u4EA4\u4EF6\u65F6\u5B8C\u6210\u3002",
-      promptSnippet: "\u6293\u53D6\u914D\u7F6E\u76EE\u6807 PR \u8BC1\u636E",
-      parameters: observeSchema,
-      async execute(toolCallId, _params, signal, _onUpdate, ctx) {
-        if (activation === void 0) {
-          throw new Error("\u901A\u8FDB\u53F8\u672A\u6FC0\u6D3B");
-        }
-        try {
-          activation.ledger.beginOperational(COLLECTOR_OBSERVE_TOOL, toolCallId);
-          const { snapshot, contextView } = await activation.ledger.observe(
-            activation.transport,
-            activation.clock,
-            signal
-          );
-          activation.ledger.completeOperational(toolCallId);
-          if (snapshot.prState !== "OPEN") {
+    },
+    registerBusinessTools(getActivation) {
+      if (toolsRegistered) return;
+      toolsRegistered = true;
+      pi.registerTool({
+        name: COLLECTOR_BIND_TARGET_TOOL,
+        label: "\u901A\u8FDB\u53F8\u8BA4\u7968\u7ED1\u5B9A",
+        description: "\u89D2\u8272\u5224\u5B9A\u4EFB\u52A1\u6750\u6599\u540E\u7ED1\u5B9A\u672C\u4ED3\u552F\u4E00 PR \u76EE\u6807\u3002\u53EF\u63D0\u4EA4 prNumber \u6216 issueNumber\uFF08\u7EBF\u4E0A\u5173\u8054\u552F\u4E00 PR\uFF09\uFF1B\u663E\u5F0F --pr \u5DF2\u7ED1\u5B9A\u65F6\u65E0\u9700\u518D\u8C03\u3002\u591A\u4E49\u6216\u65E0\u6CD5\u786E\u5B9A\u65F6\u4F1A\u6B63\u786E\u9A73\u56DE\uFF0C\u8981\u6C42\u8C03\u7528\u65B9\u660E\u786E --pr\u3002",
+        promptSnippet: "\u7ED1\u5B9A\u89D2\u8272\u5224\u5B9A\u7684 issue/PR \u76EE\u6807",
+        parameters: bindSchema,
+        async execute(toolCallId, params, _signal, _onUpdate, ctx) {
+          const activation = getActivation();
+          if (activation === void 0) throw new Error("\u901A\u8FDB\u53F8\u672A\u6FC0\u6D3B");
+          try {
+            activation.ledger.beginOperational(COLLECTOR_BIND_TARGET_TOOL, toolCallId);
+            const prNumber = parsePositiveTicket(params.prNumber, "prNumber");
+            const issueNumber = parsePositiveTicket(params.issueNumber, "issueNumber");
+            if (prNumber === void 0 && issueNumber === void 0) {
+              throw new CollectorTargetBindError(
+                "ak_collector_bind_target requires role-decided prNumber and/or issueNumber"
+              );
+            }
+            let bound = prNumber;
+            if (issueNumber !== void 0) {
+              const associated = await listPullRequestNumbersByTicket(createGhApiRunner(), {
+                owner: activation.repository.owner,
+                repo: activation.repository.repo,
+                ticketNumber: issueNumber
+              });
+              if (associated.length === 0) {
+                throw new CollectorTargetBindError(
+                  `no PR associated with issue #${issueNumber} in ${activation.repository.canonical}; pass an explicit --pr or a different issueNumber`
+                );
+              }
+              if (associated.length > 1) {
+                throw new CollectorTargetBindError(
+                  `multiple PRs associated with issue #${issueNumber}: ${associated.join(", ")}; pass an explicit prNumber or --pr`
+                );
+              }
+              const fromIssue = associated[0];
+              if (prNumber !== void 0 && prNumber !== fromIssue) {
+                throw new CollectorTargetBindError(
+                  `prNumber ${prNumber} conflicts with issue #${issueNumber} association PR ${fromIssue}`
+                );
+              }
+              bound = fromIssue;
+            }
+            activation.ledger.bindTarget(bound);
+            activation.ledger.completeOperational(toolCallId);
+            return {
+              content: [{
+                type: "text",
+                text: `\u76EE\u6807\u5DF2\u7ED1\u5B9A\uFF1A${activation.repository.canonical}#${bound}`
+              }],
+              details: {
+                repository: activation.repository.canonical,
+                prNumber: bound,
+                ...issueNumber === void 0 ? {} : { issueNumber }
+              }
+            };
+          } catch (error) {
+            if (isCorrectableExecuteError(error)) throw error;
+            hostActions.failInfrastructure(error, ctx, toolCallId);
+          } finally {
+            try {
+              activation.ledger.completeOperational(toolCallId);
+            } catch {
+            }
           }
-          return {
-            content: [{
-              type: "text",
-              // #641 chain①: model context carries bounded body heads + pointers only.
-              text: JSON.stringify(contextView)
-            }],
-            // #641 the bounded projection is the only provider-visible face on every host
-            // (Grok/ACP relays tool details as MCP structuredContent); full bodies stay
-            // in the ledger volume and enter context only by explicit ak_collector_read.
-            details: contextView
-          };
-        } catch (error) {
-          hostActions.failInfrastructure(error, ctx, toolCallId);
         }
-      }
-    });
-    pi.registerTool({
-      name: COLLECTOR_READ_TOOL,
-      label: "\u901A\u8FDB\u53F8\u5F00\u5377",
-      description: "\u6309 evidenceId \u5F00\u5377\u8BFB\u53D6\u4E00\u6761\u5DF2\u89C2\u6D4B\u6750\u6599\u7684\u5168\u91CF\u6B63\u6587\u4E0E\u6307\u9488\uFF1B\u53EA\u5728\u89C2\u5BDF\u5934\u90E8\u6458\u5F55\u4E0D\u8DB3\u4EE5\u5224\u8BFB\u65F6\u8C03\u7528\u3002",
-      promptSnippet: "\u6309\u6307\u9488\u5F00\u5377\u8BFB\u6750\u6599",
-      parameters: readSchema,
-      async execute(toolCallId, params, _signal, _onUpdate, ctx) {
-        if (activation === void 0) {
-          throw new Error("\u901A\u8FDB\u53F8\u672A\u6FC0\u6D3B");
-        }
-        try {
-          activation.ledger.beginOperational(COLLECTOR_READ_TOOL, toolCallId);
-          const record4 = activation.ledger.getEvidence(params.evidenceId);
-          if (record4 === void 0 || record4.kind !== "review" && record4.kind !== "issue_comment" && record4.kind !== "review_comment" && record4.kind !== "reaction" || typeof record4.body !== "string") {
-            throw new CollectorUnknownEvidenceError(params.evidenceId);
+      });
+      pi.registerTool({
+        name: COLLECTOR_OBSERVE_TOOL,
+        label: "\u901A\u8FDB\u53F8\u89C2\u5BDF",
+        description: "\u6293\u53D6\u914D\u7F6E\u76EE\u6807\u7684\u5B8C\u6574 GitHub PR \u8BC1\u636E\uFF0C\u5B58\u4E0D\u53EF\u53D8\u5FEB\u7167\u5165\u5377\u3002\u6B63\u6587\u5728\u4E0A\u4E0B\u6587\u4E2D\u53EA\u7ED9\u5934\u90E8\u6458\u5F55\u52A0\u6307\u9488\uFF1B\u9700\u8981\u5934\u90E8\u4E4B\u5916\u7684\u6B63\u6587\u65F6\uFF0C\u7528 ak_collector_read \u6309 evidenceId \u5F00\u5377\uFF1Bfindings \u7684\u62C6\u5206\u4E0E\u5F52\u7C7B\u7531\u4F60\u5728\u4EA4\u4EF6\u65F6\u5B8C\u6210\u3002\u76EE\u6807\u672A\u7ED1\u5B9A\u524D\u987B\u5148 ak_collector_bind_target\u3002",
+        promptSnippet: "\u6293\u53D6\u914D\u7F6E\u76EE\u6807 PR \u8BC1\u636E",
+        parameters: observeSchema,
+        async execute(toolCallId, _params, signal, _onUpdate, ctx) {
+          const activation = getActivation();
+          if (activation === void 0) throw new Error("\u901A\u8FDB\u53F8\u672A\u6FC0\u6D3B");
+          try {
+            activation.ledger.beginOperational(COLLECTOR_OBSERVE_TOOL, toolCallId);
+            const { snapshot, contextView } = await activation.ledger.observe(
+              activation.transport,
+              activation.clock,
+              signal
+            );
+            activation.ledger.completeOperational(toolCallId);
+            return {
+              content: [{
+                type: "text",
+                text: JSON.stringify(contextView)
+              }],
+              details: contextView
+            };
+          } catch (error) {
+            if (isCorrectableExecuteError(error)) throw error;
+            hostActions.failInfrastructure(error, ctx, toolCallId);
           }
-          const material = projectEvidenceEntryView(record4);
-          activation.ledger.completeOperational(toolCallId);
-          return {
-            content: [{
-              type: "text",
-              // #641 chain①: full bodies enter provider context only by explicit pointer.
-              text: JSON.stringify(material)
-            }],
-            details: material
-          };
-        } catch (error) {
-          if (isCorrectableExecuteError(error)) throw error;
-          hostActions.failInfrastructure(error, ctx, toolCallId);
-        }
-      }
-    });
-    pi.registerTool({
-      name: COLLECTOR_REQUEST_TOOL,
-      label: "\u901A\u8FDB\u53F8\u8BF7\u6C42",
-      description: "\u6309\u914D\u7F6E\u8BF7\u6C42\u4F53\u4E0E\u5173\u8054\u6807\u8BB0\uFF0C\u5728\u6240\u5F15\u6700\u65B0\u5FEB\u7167 HEAD \u53D1\u4E00\u6B21\u8BF7\u6C42\u3002",
-      promptSnippet: "\u6309\u914D\u7F6E\u53D1\u4E00\u6B21\u8BF7\u6C42",
-      parameters: requestSchema,
-      async execute(toolCallId, params, signal, _onUpdate, ctx) {
-        if (activation === void 0) {
-          throw new Error("\u901A\u8FDB\u53F8\u672A\u6FC0\u6D3B");
-        }
-        try {
-          activation.ledger.beginOperational(COLLECTOR_REQUEST_TOOL, toolCallId);
-          const details = await activation.ledger.request(
-            params,
-            activation.transport,
-            activation.clock,
-            signal
-          );
-          activation.ledger.completeOperational(toolCallId);
-          return {
-            content: [{
-              type: "text",
-              text: `\u8BF7\u6C42\u5C1D\u8BD5\u5DF2\u8BB0\u5F55\uFF1Arequest ${params.requestId}`
-            }],
-            details
-          };
-        } catch (error) {
-          hostActions.failInfrastructure(error, ctx, toolCallId);
-        }
-      }
-    });
-    pi.registerTool({
-      name: COLLECTOR_WAIT_TOOL,
-      label: "\u901A\u8FDB\u53F8\u7B49\u5F85",
-      description: "\u518D\u89C2\u5BDF\u524D\u7B49\u5F85\uFF1B\u5355\u6B21\u4E0A\u9650\u4E94\u5206\u949F\u4E14\u4E0D\u8D85\u5269\u4F59\u8D44\u683C\u3002",
-      promptSnippet: "\u8D44\u683C\u622A\u6B62\u524D\u7B49\u5F85",
-      parameters: waitSchema,
-      async execute(toolCallId, params, signal, _onUpdate, ctx) {
-        if (activation === void 0) {
-          throw new Error("\u901A\u8FDB\u53F8\u672A\u6FC0\u6D3B");
-        }
-        try {
-          activation.ledger.beginOperational(COLLECTOR_WAIT_TOOL, toolCallId);
-          const details = await activation.ledger.wait(
-            params,
-            activation.clock,
-            signal
-          );
-          activation.ledger.completeOperational(toolCallId);
-          return {
-            content: [{
-              type: "text",
-              text: `\u5DF2\u7B49\u5F85 ${String(details.effectiveMs)}ms`
-            }],
-            details
-          };
-        } catch (error) {
-          hostActions.failInfrastructure(error, ctx, toolCallId);
-        }
-      }
-    });
-    pi.registerTool({
-      name: COLLECTOR_OUTPUT_TOOL,
-      label: "\u901A\u8FDB\u53F8\u8F93\u51FA",
-      description: "\u89C2\u5BDF\u5B8C\u6210\u540E\u63D0\u4EA4\uFF1B\u56DE\u6267\u7531 runtime \u7EC4\u88C5\u3002\u6B63\u5E38\u5B8C\u5DE5\u63D0\u4EA4\u7A7A\u5BF9\u8C61 {}\uFF08\u5982\u9700\u62A5 finding\uFF0C\u586B findings \u6307\u9488\u6570\u7EC4\uFF09\uFF1B\u4EC5\u5728\u57FA\u7840\u8BBE\u65BD\u771F\u5B9E\u5931\u8D25\u65F6\u624D\u53EF\u586B infrastructureFailure\uFF0C\u65E0\u5931\u8D25\u65F6\u5FC5\u987B\u7701\u7565\u8BE5\u5B57\u6BB5\u3002",
-      promptSnippet: "\u63D0\u4EA4\u901A\u8FDB\u53F8\u56DE\u6267",
-      // #641 chain②: the seat owns the normal-completion decision. The probe
-      // runs the exact receipt assembly (validation only, no accept side
-      // effects); success ⇒ machine-verified normal completion ⇒ bounce.
-      bounceInfrastructureDeclaration(params) {
-        if (activation === void 0) return void 0;
-        try {
-          buildCollectorReceipt(activation.ledger, params, activation.clock);
-        } catch {
-          return void 0;
-        }
-        return new CollectorNormalCompletionDeclarationError();
-      },
-      parameters: outputSchema,
-      async execute(toolCallId, params, _signal, _onUpdate, ctx) {
-        if (activation === void 0) {
-          throw new Error("\u901A\u8FDB\u53F8\u672A\u6FC0\u6D3B");
         }
-        try {
-          activation.ledger.beginOperational(COLLECTOR_OUTPUT_TOOL, toolCallId);
-          const receipt = buildCollectorReceipt(
-            activation.ledger,
-            params,
-            activation.clock
-          );
-          activation.ledger.recordOutputCandidate();
-          const acceptedDetails = receipt;
-          return {
-            content: [{
-              type: "text",
-              text: COLLECTOR_ACCEPTED_TEXT
-            }],
-            details: acceptedDetails,
-            terminate: true
-          };
-        } catch (error) {
-          if (error instanceof Error && error.collectorFatal === true) {
+      });
+      pi.registerTool({
+        name: COLLECTOR_READ_TOOL,
+        label: "\u901A\u8FDB\u53F8\u5F00\u5377",
+        description: "\u6309 evidenceId \u5F00\u5377\u8BFB\u53D6\u4E00\u6761\u5DF2\u89C2\u6D4B\u6750\u6599\u7684\u5168\u91CF\u6B63\u6587\u4E0E\u6307\u9488\uFF1B\u53EA\u5728\u89C2\u5BDF\u5934\u90E8\u6458\u5F55\u4E0D\u8DB3\u4EE5\u5224\u8BFB\u65F6\u8C03\u7528\u3002",
+        promptSnippet: "\u6309\u6307\u9488\u5F00\u5377\u8BFB\u6750\u6599",
+        parameters: readSchema,
+        async execute(toolCallId, params, _signal, _onUpdate, ctx) {
+          const activation = getActivation();
+          if (activation === void 0) throw new Error("\u901A\u8FDB\u53F8\u672A\u6FC0\u6D3B");
+          try {
+            activation.ledger.beginOperational(COLLECTOR_READ_TOOL, toolCallId);
+            const record4 = activation.ledger.getEvidence(params.evidenceId);
+            if (record4 === void 0 || record4.kind !== "review" && record4.kind !== "issue_comment" && record4.kind !== "review_comment" && record4.kind !== "reaction" || typeof record4.body !== "string") {
+              throw new CollectorUnknownEvidenceError(params.evidenceId);
+            }
+            const material = projectEvidenceEntryView(record4);
+            activation.ledger.completeOperational(toolCallId);
+            return {
+              content: [{
+                type: "text",
+                text: JSON.stringify(material)
+              }],
+              details: material
+            };
+          } catch (error) {
+            if (isCorrectableExecuteError(error)) throw error;
             hostActions.failInfrastructure(error, ctx, toolCallId);
           }
-          throw error;
-        } finally {
-          activation.ledger.completeOperational(toolCallId);
         }
-      }
-    });
-  };
-  return {
-    async activate(ctx, event) {
-      activation = void 0;
-      ensureLifecycle();
-      if (ctx.mode !== "print" && ctx.mode !== "json") {
-        throw new Error(
-          `Collector supports only print or json mode (got ${ctx.mode})`
-        );
-      }
-      if (event.reason === "fork" || event.reason === "reload") {
-        throw new Error(
-          `Collector does not support session_start reason ${event.reason}`
-        );
-      }
-      const soul = (await dependencies.loadSoul()).trim();
-      if (soul.length === 0) throw new Error("Collector soul is empty");
-      const repoFlag = pi.getFlag("ak-collector-repo");
-      const prFlag = pi.getFlag("ak-collector-pr");
-      const requestManifestFlag = pi.getFlag("ak-collector-request-manifest");
-      if (typeof repoFlag !== "string" || repoFlag.trim().length === 0) {
-        throw new Error("Collector requires --ak-collector-repo");
-      }
-      if (typeof prFlag !== "string" && typeof prFlag !== "number") {
-        throw new Error("Collector requires --ak-collector-pr");
-      }
-      const repository = parseCollectorRepository(repoFlag);
-      const prNumber = parseCollectorPrNumber(prFlag);
-      const manifest = typeof requestManifestFlag === "string" && requestManifestFlag.trim().length > 0 ? await loadCollectorManifest(requestManifestFlag) : emptyCollectorManifest();
-      const commands = pi.getCommands?.() ?? [];
-      const ambientCommands = commands.filter((command) => {
-        const name = command.name.toLowerCase();
-        return name.includes("skill") || name.includes("prompt") || name.startsWith("template");
       });
-      if (ambientCommands.length > 0) {
-        throw new Error(
-          `Collector detected ambient instruction commands: ${ambientCommands.map((c) => c.name).join(", ")}`
-        );
-      }
-      const preExisting = pi.getAllTools();
-      for (const required of COLLECTOR_REQUIRED_TOOLS) {
-        const prior = preExisting.filter((tool) => tool.name === required);
-        if (prior.length > 0) {
-          throw new Error(`Collector required tool name collision: ${required}`);
-        }
-      }
-      registerTools();
-      const allTools = pi.getAllTools();
-      for (const required of COLLECTOR_REQUIRED_TOOLS) {
-        const matches = allTools.filter((tool2) => tool2.name === required);
-        if (matches.length === 0) {
-          throw new Error(`Collector required tool missing: ${required}`);
-        }
-        if (matches.length > 1) {
-          throw new Error(`Collector required tool name collision: ${required}`);
-        }
-        const tool = matches[0];
-        if (dependencies.packageExtensionPath !== void 0 && tool.sourceInfo?.path !== void 0 && tool.sourceInfo.path !== dependencies.packageExtensionPath && !tool.sourceInfo.path.includes("role-runtime")) {
-          throw new Error(
-            `Collector required tool ${required} is overridden by ${tool.sourceInfo.path}`
-          );
+      pi.registerTool({
+        name: COLLECTOR_REQUEST_TOOL,
+        label: "\u901A\u8FDB\u53F8\u8BF7\u6C42",
+        description: "\u6309\u914D\u7F6E\u8BF7\u6C42\u4F53\u4E0E\u5173\u8054\u6807\u8BB0\uFF0C\u5728\u6240\u5F15\u6700\u65B0\u5FEB\u7167 HEAD \u53D1\u4E00\u6B21\u8BF7\u6C42\u3002",
+        promptSnippet: "\u6309\u914D\u7F6E\u53D1\u4E00\u6B21\u8BF7\u6C42",
+        parameters: requestSchema,
+        async execute(toolCallId, params, signal, _onUpdate, ctx) {
+          const activation = getActivation();
+          if (activation === void 0) throw new Error("\u901A\u8FDB\u53F8\u672A\u6FC0\u6D3B");
+          try {
+            activation.ledger.beginOperational(COLLECTOR_REQUEST_TOOL, toolCallId);
+            const details = await activation.ledger.request(
+              params,
+              activation.transport,
+              activation.clock,
+              signal
+            );
+            activation.ledger.completeOperational(toolCallId);
+            return {
+              content: [{
+                type: "text",
+                text: `\u8BF7\u6C42\u5C1D\u8BD5\u5DF2\u8BB0\u5F55\uFF1Arequest ${params.requestId}`
+              }],
+              details
+            };
+          } catch (error) {
+            if (isCorrectableExecuteError(error)) throw error;
+            hostActions.failInfrastructure(error, ctx, toolCallId);
+          }
         }
-      }
-      pi.setActiveTools([...COLLECTOR_REQUIRED_TOOLS]);
-      const active = new Set(pi.getActiveTools());
-      for (const required of COLLECTOR_REQUIRED_TOOLS) {
-        if (!active.has(required)) {
-          throw new Error(`Collector failed to activate required tool ${required}`);
+      });
+      pi.registerTool({
+        name: COLLECTOR_WAIT_TOOL,
+        label: "\u901A\u8FDB\u53F8\u7B49\u5F85",
+        description: "\u518D\u89C2\u5BDF\u524D\u7B49\u5F85\uFF1B\u5355\u6B21\u4E0A\u9650\u4E94\u5206\u949F\u4E14\u4E0D\u8D85\u5269\u4F59\u8D44\u683C\u3002",
+        promptSnippet: "\u8D44\u683C\u622A\u6B62\u524D\u7B49\u5F85",
+        parameters: waitSchema,
+        async execute(toolCallId, params, signal, _onUpdate, ctx) {
+          const activation = getActivation();
+          if (activation === void 0) throw new Error("\u901A\u8FDB\u53F8\u672A\u6FC0\u6D3B");
+          try {
+            activation.ledger.beginOperational(COLLECTOR_WAIT_TOOL, toolCallId);
+            const details = await activation.ledger.wait(
+              params,
+              activation.clock,
+              signal
+            );
+            activation.ledger.completeOperational(toolCallId);
+            return {
+              content: [{
+                type: "text",
+                text: `\u5DF2\u7B49\u5F85 ${String(details.effectiveMs)}ms`
+              }],
+              details
+            };
+          } catch (error) {
+            hostActions.failInfrastructure(error, ctx, toolCallId);
+          }
         }
-      }
-      for (const name of active) {
-        if (!COLLECTOR_REQUIRED_TOOLS.includes(name)) {
-          throw new Error(`Collector active tool surface includes unexpected ${name}`);
+      });
+      pi.registerTool({
+        name: COLLECTOR_OUTPUT_TOOL,
+        label: "\u901A\u8FDB\u53F8\u8F93\u51FA",
+        description: "\u89C2\u5BDF\u5B8C\u6210\u540E\u63D0\u4EA4\uFF1B\u56DE\u6267\u7531 runtime \u7EC4\u88C5\u3002\u6B63\u5E38\u5B8C\u5DE5\u63D0\u4EA4\u7A7A\u5BF9\u8C61 {}\uFF08\u5982\u9700\u62A5 finding\uFF0C\u586B findings \u6307\u9488\u6570\u7EC4\uFF09\uFF1B\u4EC5\u5728\u57FA\u7840\u8BBE\u65BD\u771F\u5B9E\u5931\u8D25\u65F6\u624D\u53EF\u586B infrastructureFailure\uFF0C\u65E0\u5931\u8D25\u65F6\u5FC5\u987B\u7701\u7565\u8BE5\u5B57\u6BB5\u3002",
+        promptSnippet: "\u63D0\u4EA4\u901A\u8FDB\u53F8\u56DE\u6267",
+        bounceInfrastructureDeclaration(params) {
+          const activation = getActivation();
+          if (activation === void 0) return void 0;
+          try {
+            buildCollectorReceipt(activation.ledger, params, activation.clock);
+          } catch {
+            return void 0;
+          }
+          return new CollectorNormalCompletionDeclarationError();
+        },
+        parameters: outputSchema,
+        async execute(toolCallId, params, _signal, _onUpdate, ctx) {
+          const activation = getActivation();
+          if (activation === void 0) throw new Error("\u901A\u8FDB\u53F8\u672A\u6FC0\u6D3B");
+          try {
+            activation.ledger.beginOperational(COLLECTOR_OUTPUT_TOOL, toolCallId);
+            const receipt = buildCollectorReceipt(
+              activation.ledger,
+              params,
+              activation.clock
+            );
+            activation.ledger.recordOutputCandidate();
+            return {
+              content: [{
+                type: "text",
+                text: COLLECTOR_ACCEPTED_TEXT
+              }],
+              details: receipt,
+              terminate: true
+            };
+          } catch (error) {
+            if (error instanceof Error && error.collectorFatal === true) {
+              hostActions.failInfrastructure(error, ctx, toolCallId);
+            }
+            throw error;
+          } finally {
+            activation.ledger.completeOperational(toolCallId);
+          }
         }
-      }
-      const clock = dependencies.createClock?.() ?? createSystemCollectorClock();
-      const transport = dependencies.createTransport();
-      const ledger = dependencies.createLedger(
-        { repository, prNumber, manifest },
-        clock,
-        ctx
-      );
-      if (ledger.activationRecorded) {
-        firstDispatchDone = true;
-      }
-      activation = {
-        soul,
-        repository,
-        prNumber,
-        manifest,
-        ledger,
-        transport,
-        clock
-      };
+      });
     }
   };
 }
-var CollectorNormalCompletionDeclarationError, COLLECTOR_REQUIRED_TOOLS, observeSchema, readSchema, requestSchema, waitSchema, outputSchema;
+var CollectorNormalCompletionDeclarationError, CollectorTargetBindError, COLLECTOR_REQUIRED_TOOLS, COLLECTOR_TRANSPORT_FLAGS, observeSchema, readSchema, requestSchema, waitSchema, bindSchema, outputSchema;
 var init_collector_role = __esm({
   "src/collector-role.ts"() {
     "use strict";
     init_collector_config();
     init_collector_evidence();
+    init_collector_github();
     init_collector_ledger();
     init_collector_receipt();
     init_collector_tool_schemas();
@@ -20072,24 +20571,54 @@ var init_collector_role = __esm({
     init_submission_correctable_error();
     init_collector_identity();
     init_collector_identity();
-    init_collector_config();
     CollectorNormalCompletionDeclarationError = class extends CorrectableSubmissionError {
       constructor() {
         super("runtime \u5DF2\u6309\u673A\u5668\u72B6\u6001\u6838\u9A8C\u672C\u5C40\u4E3A\u6B63\u5E38\u5B8C\u5DE5\uFF08\u56DE\u6267\u53EF\u5408\u6CD5\u7EC4\u88C5\uFF09\uFF1A\u6B63\u5E38\u5B8C\u5DE5\u7684\u4EA4\u4EF6\u4E0D\u5F97\u586B infrastructureFailure\uFF0C\u8BF7\u7701\u7565\u8BE5\u5B57\u6BB5\u540E\u91CD\u65B0\u63D0\u4EA4\u3002");
         this.name = "CollectorNormalCompletionDeclarationError";
       }
     };
+    CollectorTargetBindError = class extends CorrectableSubmissionError {
+      constructor(message) {
+        super(message);
+        this.name = "CollectorTargetBindError";
+      }
+    };
     COLLECTOR_REQUIRED_TOOLS = [
+      COLLECTOR_BIND_TARGET_TOOL,
       COLLECTOR_OBSERVE_TOOL,
       COLLECTOR_READ_TOOL,
       COLLECTOR_REQUEST_TOOL,
       COLLECTOR_WAIT_TOOL,
       COLLECTOR_OUTPUT_TOOL
     ];
+    COLLECTOR_TRANSPORT_FLAGS = Object.freeze([
+      Object.freeze({
+        name: "ak-collector-repo",
+        definition: Object.freeze({
+          description: "GitHub owner/repo target for Collector (github.com only; conservative ASCII grammar).",
+          type: "string"
+        })
+      }),
+      Object.freeze({
+        name: "ak-collector-pr",
+        definition: Object.freeze({
+          description: "Optional positive safe-integer pull request number for Collector. Omit when the role will bind from task materials.",
+          type: "string"
+        })
+      }),
+      Object.freeze({
+        name: "ak-collector-request-manifest",
+        definition: Object.freeze({
+          description: "Path to the Collector v1 request manifest JSON file.",
+          type: "string"
+        })
+      })
+    ]);
     observeSchema = collectorObserveArgsSchema;
     readSchema = collectorReadArgsSchema;
     requestSchema = collectorRequestArgsSchema;
     waitSchema = collectorWaitArgsSchema;
+    bindSchema = collectorBindTargetArgsSchema;
     outputSchema = collectorOutputArgsSchema;
   }
 });
@@ -21070,11 +21599,11 @@ var init_reviewer_role = __esm({
 });
 
 // src/worker-submission-gates.ts
-import { execFileSync as execFileSync3 } from "node:child_process";
+import { execFileSync as execFileSync4 } from "node:child_process";
 import { existsSync as existsSync10, lstatSync as lstatSync3, readdirSync as readdirSync2, readFileSync as readFileSync4, rmdirSync, rmSync } from "node:fs";
 import { resolve as resolve18 } from "node:path";
 function git2(cwd, args) {
-  return execFileSync3("git", args, {
+  return execFileSync4("git", args, {
     cwd,
     encoding: "utf8",
     stdio: ["ignore", "pipe", "pipe"],
@@ -21082,7 +21611,7 @@ function git2(cwd, args) {
   }).trim();
 }
 function gitFile(file, args) {
-  return execFileSync3("git", ["config", "--file", file, ...args], {
+  return execFileSync4("git", ["config", "--file", file, ...args], {
     encoding: "utf8",
     stdio: ["ignore", "pipe", "pipe"],
     env: { ...process.env, GIT_DIR: void 0, GIT_WORK_TREE: void 0, GIT_COMMON_DIR: void 0 }
@@ -22310,6 +22839,9 @@ function createRoleRuntimeExtension(dependencies) {
     for (const flag of GLEANER_LEFT_TRANSPORT_FLAGS) {
       roleHost.registerFlag(flag.name, flag.definition);
     }
+    for (const flag of COLLECTOR_TRANSPORT_FLAGS) {
+      roleHost.registerFlag(flag.name, flag.definition);
+    }
     let admitted = false;
     let selectedRole;
     let activeReviewerParent;
@@ -22440,10 +22972,41 @@ function createRoleRuntimeExtension(dependencies) {
           })
         };
       }
+      if (role === "collector" && activeCollector !== void 0) {
+        const options = event.systemPromptOptions;
+        if (options.skills && options.skills.length > 0) {
+          failInfrastructure(
+            activeCollector.ledger.latchFatal("\u901A\u8FDB\u53F8\u68C0\u6D4B\u5230\u7CFB\u7EDF\u63D0\u793A\u4E2D\u7684\u73AF\u5883 skills"),
+            ctx
+          );
+        }
+        if (options.contextFiles && options.contextFiles.length > 0) {
+          failInfrastructure(
+            activeCollector.ledger.latchFatal("\u901A\u8FDB\u53F8\u68C0\u6D4B\u5230\u7CFB\u7EDF\u63D0\u793A\u4E2D\u7684\u73AF\u5883 context files"),
+            ctx
+          );
+        }
+        if (typeof options.appendSystemPrompt === "string" && options.appendSystemPrompt.trim().length > 0) {
+          failInfrastructure(
+            activeCollector.ledger.latchFatal("\u901A\u8FDB\u53F8\u68C0\u6D4B\u5230 appendSystemPrompt \u6F02\u79FB"),
+            ctx
+          );
+        }
+        if (!collectorFirstDispatchDone) {
+          collectorFirstDispatchDone = true;
+          activeCollector.ledger.recordActivation(activeCollector.clock);
+        }
+        return {
+          systemPrompt: collectorBusiness.assembleMaterials(activeCollector, event.systemPrompt)
+        };
+      }
     });
     roleHost.on("tool_result", async (event) => {
       const role = selectedRole;
       if (role === void 0) return;
+      if (role === "collector" && activeCollector !== void 0) {
+        collectorBusiness.onToolResult(activeCollector, event);
+      }
       const pendingInfra = pendingInfrastructureFailures.get(event.toolCallId);
       const isRoleInfrastructureFailure = pendingInfra !== void 0;
       if (pendingInfra !== void 0) pendingInfrastructureFailures.delete(event.toolCallId);
@@ -22541,6 +23104,11 @@ function createRoleRuntimeExtension(dependencies) {
         priorFetch = void 0;
         fetchWrapped = false;
       }
+      if (selectedRole === "collector" && activeCollector !== void 0 && activeCollector.ledger.fatal) {
+        if (process.exitCode === void 0 || process.exitCode === 0) {
+          process.exitCode = 1;
+        }
+      }
       const presentation = pendingNavigatorPresentation;
       pendingNavigatorPresentation = void 0;
       if (presentation !== void 0) {
@@ -22742,7 +23310,9 @@ function createRoleRuntimeExtension(dependencies) {
         }
       }
     }, hostActions);
-    const collector = createCollectorRoleRuntime(
+    let activeCollector;
+    let collectorFirstDispatchDone = false;
+    const collectorBusiness = createCollectorRoleRuntime(
       roleHost,
       {
         async loadSoul() {
@@ -22771,13 +23341,90 @@ function createRoleRuntimeExtension(dependencies) {
             dossierEntries: context.sessionManager?.getEntries?.() ?? []
           });
         },
-        ...dependencies.createCollectorClock === void 0 ? {} : { createClock: dependencies.createCollectorClock },
-        ...dependencies.collectorPackageExtensionPath === void 0 ? {} : {
-          packageExtensionPath: dependencies.collectorPackageExtensionPath
-        }
+        ...dependencies.createCollectorClock === void 0 ? {} : { createClock: dependencies.createCollectorClock }
       },
       hostActions
     );
+    let collectorToolCallRegistered = false;
+    const collector = {
+      async activate(context, event) {
+        activeCollector = void 0;
+        collectorFirstDispatchDone = false;
+        if (context.mode !== "print" && context.mode !== "json") {
+          throw new Error(
+            `Collector supports only print or json mode (got ${context.mode})`
+          );
+        }
+        if (event.reason === "fork" || event.reason === "reload") {
+          throw new Error(
+            `Collector does not support session_start reason ${event.reason}`
+          );
+        }
+        const commands = roleHost.getCommands?.() ?? [];
+        const ambientCommands = commands.filter((command) => {
+          const name = command.name.toLowerCase();
+          return name.includes("skill") || name.includes("prompt") || name.startsWith("template");
+        });
+        if (ambientCommands.length > 0) {
+          throw new Error(
+            `Collector detected ambient instruction commands: ${ambientCommands.map((c) => c.name).join(", ")}`
+          );
+        }
+        const preExisting = roleHost.getAllTools();
+        const alreadyRegistered = COLLECTOR_REQUIRED_TOOLS.every(
+          (required) => preExisting.some((tool) => tool.name === required)
+        );
+        if (!alreadyRegistered) {
+          for (const required of COLLECTOR_REQUIRED_TOOLS) {
+            const prior = preExisting.filter((tool) => tool.name === required);
+            if (prior.length > 0) {
+              throw new Error(`Collector required tool name collision: ${required}`);
+            }
+          }
+        }
+        collectorBusiness.registerBusinessTools(() => activeCollector);
+        const allTools = roleHost.getAllTools();
+        for (const required of COLLECTOR_REQUIRED_TOOLS) {
+          const matches = allTools.filter((tool) => tool.name === required);
+          if (matches.length === 0) {
+            throw new Error(`Collector required tool missing: ${required}`);
+          }
+          if (matches.length > 1) {
+            throw new Error(`Collector required tool name collision: ${required}`);
+          }
+        }
+        roleHost.setActiveTools([...COLLECTOR_REQUIRED_TOOLS]);
+        const active = new Set(roleHost.getActiveTools());
+        for (const required of COLLECTOR_REQUIRED_TOOLS) {
+          if (!active.has(required)) {
+            throw new Error(`Collector failed to activate required tool ${required}`);
+          }
+        }
+        for (const name of active) {
+          if (!COLLECTOR_REQUIRED_TOOLS.includes(name)) {
+            throw new Error(`Collector active tool surface includes unexpected ${name}`);
+          }
+        }
+        if (!collectorToolCallRegistered) {
+          collectorToolCallRegistered = true;
+          roleHost.on("tool_call", (toolEvent) => {
+            if (activeCollector === void 0 || selectedRole !== "collector") return;
+            if (!COLLECTOR_REQUIRED_TOOLS.includes(toolEvent.toolName)) {
+              return {
+                block: true,
+                reason: `\u901A\u8FDB\u53F8\u7981\u7528\u5DE5\u5177 ${toolEvent.toolName}`
+              };
+            }
+            return collectorBusiness.onToolCall(activeCollector, toolEvent);
+          });
+        }
+        const activation = await collectorBusiness.activate(context);
+        if (activation.ledger.activationRecorded) {
+          collectorFirstDispatchDone = true;
+        }
+        activeCollector = activation;
+      }
+    };
     const clock = dependencies.activationClock ?? (() => (/* @__PURE__ */ new Date()).toISOString());
     const writeTrace = dependencies.activationTraceWriter ?? writeActivationTraceRecord;
     const observationFace = createToolExecutionObservationFace({
@@ -25050,7 +25697,6 @@ ${priorNativePaths.join("\n")}` : prepared.prompt;
 }
 
 // src/acp-host/role-envelope.ts
-init_submission_errors();
 init_submission_correctable_error();
 init_navigator_invocation_identity();
 function parseCanonicalSkillInvocation(prompt) {
@@ -25096,7 +25742,7 @@ function projectAcpActivationFlags(request) {
   }
   if (activation.role === "collector") {
     flags.set("ak-collector-repo", activation.repo);
-    flags.set("ak-collector-pr", activation.pr);
+    if (activation.pr !== void 0) flags.set("ak-collector-pr", activation.pr);
     if (activation.requestManifestPath !== void 0) flags.set("ak-collector-request-manifest", activation.requestManifestPath);
   }
   return flags;
@@ -25438,17 +26084,9 @@ async function prepareAcpRoleEnvelope(options) {
               let content;
               let details;
               if (isCorrectableExecuteError(error)) {
-                const diagnostic = error instanceof Error ? error.message : String(error);
-                content = [{ type: "text", text: diagnostic }];
-                if (error instanceof GatekeeperDecisionError) {
-                  details = { ...error.result };
-                } else if (error instanceof WorkerCommitReminderError || error instanceof WorkerPrefixReminderError || error instanceof WorkerUnfinishedReasonReminderError) {
-                  details = { code: error.code };
-                } else if (typeof error.code === "string") {
-                  details = { code: error.code };
-                } else {
-                  details = { code: error instanceof Error && error.name ? error.name : "correctable-submission-error" };
-                }
+                const projected2 = projectCorrectableExecuteRejection(error);
+                content = [{ type: "text", text: projected2.diagnostic }];
+                details = projected2.details;
               } else {
                 ({ content, details } = declareRoundInfrastructureFailure(error));
               }