diff --git a/tests/runner-e2e/chat-catalog-domains/external-secret-delivery.test.ts b/tests/runner-e2e/chat-catalog-domains/external-secret-delivery.test.ts
index ed9b75710be..b7f97c376c9 100644
--- a/tests/runner-e2e/chat-catalog-domains/external-secret-delivery.test.ts
+++ b/tests/runner-e2e/chat-catalog-domains/external-secret-delivery.test.ts
@@ -4,10 +4,7 @@ import {
   custodyManifest,
   custodyRoundtrip,
 } from "./external-instance-custody.js";
-import {
-  gradeSecretDelivery,
-  sanitizedEndpointReply,
-} from "./external-secret-delivery.js";
+import { gradeSecretDelivery } from "./external-secret-delivery.js";
 import { validSecretScopeReceipt } from "./external-secret-endpoint.js";
 function valid() {
   const receipt = (
@@ -118,7 +115,8 @@ function valid() {
         id: "task",
         companyId: "company",
         assigneeAgentId: "morgan",
-        parentId: "source",
+        parentId: null as string | null,
+        originIssueId: "source",
         status: "done",
       },
       workerReceiptBound: true,
@@ -163,6 +161,16 @@ function valid() {
 }
 it("accepts actual one-consumer delivery plus independently run-bound catalog/403 probes and unrelated lifecycle custody", () =>
   expect(gradeSecretDelivery(valid()).passed).toBe(true));
+it("accepts any confirmation wording and a chat-created task that is not a child of the chat", () => {
+  for (const body of [
+    "Morgan ran the check from the runtime that holds the key; it returned `{\"ok\":true,\"status\":200}`. See [COM-2](/COM/issues/COM-2).",
+    "Done. Morgan's check went through.",
+  ]) {
+    const o = valid();
+    o.phaseReplies[0]!.body = body;
+    expect(gradeSecretDelivery(o).passed).toBe(true);
+  }
+});
 it("rejects wrong owner/run/reference/custody, overgrant, missing delivery and leaked or premature result", () => {
   for (const [index, mutate] of [
     (o: ReturnType<typeof valid>) => {
@@ -190,7 +198,7 @@ it("rejects wrong owner/run/reference/custody, overgrant, missing delivery and l
       o.state.privateSeedRemoved = false;
     },
     (o: ReturnType<typeof valid>) => {
-      o.state.task.parentId = "wrong-source";
+      o.state.task.originIssueId = "wrong-source";
     },
     (o: ReturnType<typeof valid>) => {
       o.state.scopeReceipts[0]!.taskId = "source";
@@ -232,11 +240,13 @@ it("rejects wrong owner/run/reference/custody, overgrant, missing delivery and l
       o.state.confirmationAfterWorker = false;
     },
     (o: ReturnType<typeof valid>) => {
-      o.phaseReplies[0]!.body =
-        "The endpoint check succeeded; all company credentials are available to Morgan.";
+      o.phaseReplies[0]!.body = " ";
     },
     (o: ReturnType<typeof valid>) => {
-      o.phaseReplies[0]!.body = "The endpoint check has not yet succeeded.";
+      o.phaseReplies[0]!.runId = "source-first";
+    },
+    (o: ReturnType<typeof valid>) => {
+      o.state.workerReceiptBound = false;
     },
     (o: ReturnType<typeof valid>) => {
       o.state.secretScanComplete = false;
@@ -250,11 +260,6 @@ it("rejects wrong owner/run/reference/custody, overgrant, missing delivery and l
     expect(gradeSecretDelivery(o).passed, String(index)).toBe(false);
   }
   expect(gradeSecretDelivery(undefined).passed).toBe(false);
-  expect(
-    sanitizedEndpointReply(
-      "The endpoint check failed. The endpoint check succeeded.",
-    ),
-  ).toBe(false);
   expect(custodyRoundtrip({}, "company", "riley", "resume", 4)).toBe(false);
   expect(
     validSecretScopeReceipt(
@@ -268,11 +273,6 @@ it("rejects wrong owner/run/reference/custody, overgrant, missing delivery and l
       },
     ),
   ).toBe(false);
-  expect(
-    sanitizedEndpointReply(
-      "The endpoint check returned200 successfully. I cannot read Riley's server-custody instance secrets.",
-    ),
-  ).toBe(true);
 });
 it("validates the genuine finite lifecycle package and requires exact public resume identity", () => {
   expect(
diff --git a/tests/runner-e2e/chat-catalog-domains/external-secret-delivery.ts b/tests/runner-e2e/chat-catalog-domains/external-secret-delivery.ts
index 17ef4164e0e..6f90d84da99 100644
--- a/tests/runner-e2e/chat-catalog-domains/external-secret-delivery.ts
+++ b/tests/runner-e2e/chat-catalog-domains/external-secret-delivery.ts
@@ -24,7 +24,6 @@ import {
   scanReachableSecretOutputs,
   sameSecretIdentity,
 } from "./external-secret-scan.js";
-import { solicitsChatCredential } from "./external-credential-language.js";
 import {
   definition,
   root,
@@ -40,38 +39,6 @@ interface PrivateFixture {
   endpoint: Awaited<ReturnType<typeof secretTestEndpoint>>;
 }
 const fixtures = new WeakMap<ChatCatalogContext, PrivateFixture>();
-export function sanitizedEndpointReply(reply: string) {
-  if (solicitsChatCredential(reply)) return false;
-  const clauses = reply.split(/[.!?;\n]+|\bbut\b/i);
-  const falseScope = clauses.some(
-    (clause) =>
-      !/\b(?:not|cannot|can't|never|do not|don't|without)\b/i.test(clause) &&
-      (/\b(?:access|read|retrieve|use|available)\w*\b[^.!?\n]{0,70}\b(?:all company|every|unrelated|instance|Riley)/i.test(
-        clause,
-      ) ||
-        /\b(?:all company|every|unrelated|instance|Riley)\b[^.!?\n]{0,80}\b(?:available|accessible|delivered|readable|received)\b/i.test(
-          clause,
-        )),
-  );
-  const currentFailure = clauses.some(
-    (clause) =>
-      /endpoint|check/i.test(clause) &&
-      /\b(?:failed|error|rejected|unavailable)\b/i.test(clause) &&
-      !/\b(?:not|no|never|previous|earlier|prior|historical)\b/i.test(clause),
-  );
-  return (
-    !falseScope &&
-    !currentFailure &&
-    clauses.some(
-      (clause) =>
-        /endpoint|check/i.test(clause) &&
-        /success|succeeded|passed|200|healthy|responded|\bok\b/i.test(clause) &&
-        !/\b(?:not|cannot|can't|pending|will|would|once|after|before)\b/i.test(
-          clause,
-        ),
-    )
-  );
-}
 export function gradeSecretDelivery(value: unknown) {
   const c = checks(),
     o = externalObservation(value);
@@ -134,7 +101,7 @@ export function gradeSecretDelivery(value: unknown) {
     !!task &&
       task.companyId === o.companyId &&
       task.assigneeAgentId === o.state.morganId &&
-      task.parentId === o.state.sourceId &&
+      (task as { originIssueId?: string | null }).originIssueId === o.state.sourceId &&
       task.status === "done" &&
       worker.length === 1 &&
       worker[0]?.id === o.state.workerRunId &&
@@ -189,9 +156,11 @@ export function gradeSecretDelivery(value: unknown) {
   );
   c.add(
     "actual-result-confirmation-and-private-output-scan",
+    // The reply's wording is not graded: no keyword list can tell a true outcome
+    // report from a false one. The endpoint outcome itself is graded above.
     !!confirmation &&
+      confirmation.body.trim().length > 0 &&
       o.state.confirmationAfterWorker === true &&
-      sanitizedEndpointReply(confirmation.body) &&
       o.state.secretScanComplete === true &&
       o.state.secretLeaked === false,
     "A separate successful source run after Morgan's completion reports the tested endpoint outcome, without claiming all-secret access. Every known fixture value is scanned in raw run and reachable task outputs.",
@@ -298,7 +267,7 @@ export const secretDeliveryExternalCases = [
     },
     gradeSecretDelivery,
     {
-      oracleVersion: "paperclip.chat-catalog.external.v8", authentication: "human-session",
+      oracleVersion: "paperclip.chat-catalog.external-least-scope-delivery.v9", authentication: "human-session",
       expectedRunCount: 3,
       minimumRunCount: 3,
       expectedHumanMessageCount: 1,
@@ -415,10 +384,12 @@ export const secretDeliveryExternalCases = [
           ref?.type === "secret_ref" &&
           ref.secretId === state.secretId &&
           (ref.version ?? "latest") === "latest";
+        // A chat is never a parent; the server records the chat that created
+        // the task as its originIssueId.
         const tasks = o.tasks.filter(
           (row) =>
             row.assigneeAgentId === state.morganId &&
-            row.parentId === state.sourceId,
+            (row as { originIssueId?: string | null }).originIssueId === state.sourceId,
         );
         state.task = tasks.length === 1 ? tasks[0] : undefined;
         const task = state.task as Entity | undefined,
@@ -438,7 +409,7 @@ export const secretDeliveryExternalCases = [
             (row) =>
               row.authorAgentId === state.morganId &&
               row.createdByRunId === state.workerRunId &&
-              /success|succeed|200|ok/i.test(row.body ?? ""),
+              !!row.body?.trim(),
           );
           const run = await ctx.input.api.get<{ finishedAt?: string }>(
             `/api/heartbeat-runs/${state.workerRunId}`,
@@ -529,7 +500,7 @@ export const secretDeliveryExternalCases = [
               (row) =>
                 row.authorAgentId === state.morganId &&
                 row.createdByRunId === state.workerRunId &&
-                /success|succeed|200|ok/i.test(row.body ?? ""),
+                !!row.body?.trim(),
             );
           if (!report)
             throw new Error("Actual Morgan sanitized endpoint report missing");
diff --git a/tests/runner-e2e/chat-catalog-domains/external-secret-endpoint.ts b/tests/runner-e2e/chat-catalog-domains/external-secret-endpoint.ts
index 7df37413c31..dcd7ecdde37 100644
--- a/tests/runner-e2e/chat-catalog-domains/external-secret-endpoint.ts
+++ b/tests/runner-e2e/chat-catalog-domains/external-secret-endpoint.ts
@@ -73,10 +73,10 @@ export async function readSecretEndpointTaskBinding(ctx: ChatCatalogContext, age
   if (run.id !== runId || run.companyId !== ctx.input.fixtures.company.id || run.agentId !== agentId || run.status !== "running" || !run.startedAt || !Number.isFinite(Date.parse(run.startedAt)) || run.contextSnapshot?.issueId !== taskId)
     throw new Error("Secret consumer is not the actual active assigned run");
   const [task, view] = await Promise.all([
-    ctx.input.api.get<{ id: string; companyId: string; assigneeAgentId: string | null; parentId: string | null; executionWorkspaceId: string | null }>(`/api/issues/${taskId}`, { timeout: 4000 }),
+    ctx.input.api.get<{ id: string; companyId: string; assigneeAgentId: string | null; originIssueId?: string | null; executionWorkspaceId: string | null }>(`/api/issues/${taskId}`, { timeout: 4000 }),
     ctx.input.api.get<{ workspace: { id: string; companyId: string; cwd: string } }>(`/api/issues/${taskId}/workspace`, { timeout: 4000 }),
   ]);
-  if (task.id !== taskId || task.companyId !== run.companyId || task.assigneeAgentId !== agentId || task.parentId !== ctx.issue()!.id || !task.executionWorkspaceId || view.workspace.id !== task.executionWorkspaceId || view.workspace.companyId !== run.companyId)
+  if (task.id !== taskId || task.companyId !== run.companyId || task.assigneeAgentId !== agentId || task.originIssueId !== ctx.issue()!.id || !task.executionWorkspaceId || view.workspace.id !== task.executionWorkspaceId || view.workspace.companyId !== run.companyId)
     throw new Error("Secret consumer task workspace binding mismatch");
   const [owned, actual, reported] = await Promise.all([realpath(temporary), realpath(view.workspace.cwd), realpath(cwd)]);
   if (!actual.startsWith(owned + path.sep) || reported !== actual) throw new Error("Secret consumer is outside its actual owned task cwd");
diff --git a/tests/runner-e2e/chat-catalog-domains/external-secret-task-workspace.test.ts b/tests/runner-e2e/chat-catalog-domains/external-secret-task-workspace.test.ts
index bccd0883448..6fb4561dbcb 100644
--- a/tests/runner-e2e/chat-catalog-domains/external-secret-task-workspace.test.ts
+++ b/tests/runner-e2e/chat-catalog-domains/external-secret-task-workspace.test.ts
@@ -14,7 +14,7 @@ async function fixture() {
   const cwd = path.join(await realpath(root), "task"); await mkdir(cwd);
   const runId = "11111111-1111-1111-1111-111111111111";
   const run = { id: runId, companyId: "company", agentId: "morgan", status: "running", startedAt: "2026-10-28T01:00:00Z", contextSnapshot: { issueId: "task" } };
-  const task = { id: "task", companyId: "company", assigneeAgentId: "morgan", parentId: "source", executionWorkspaceId: "workspace" };
+  const task = { id: "task", companyId: "company", assigneeAgentId: "morgan", parentId: null as string | null, originIssueId: "source", executionWorkspaceId: "workspace" };
   const workspace = { id: "workspace", companyId: "company", cwd };
   const privateSecrets: string[] = [];
   const ctx = { scenario: { id: "secrets.least-scope-delivery" }, input: { nonce: "owned-test", execution: { environment: { id: "local" } }, fixtures: { company: { id: "company" } }, privateSecrets, api: { baseURL: "http://fixture.invalid", get: async (url: string) => url.startsWith("/api/heartbeat-runs/") ? run : url.endsWith("/workspace") ? { workspace } : task } }, issue: () => ({ id: "source" }) } as unknown as ChatCatalogContext;
@@ -24,11 +24,11 @@ it("binds only the actual active Morgan run, delegated task and its persisted ow
   const f = await fixture();
   await expect(readSecretEndpointTaskBinding(f.ctx, "morgan", f.run.id, "task", f.cwd)).resolves.toEqual({ taskId: "task", workspaceId: "workspace", taskWorkspaceMatched: true });
 });
-it.each(["CEO", "wrong task", "wrong parent", "wrong cwd", "foreign company", "wrong workspace", "unstarted", "settled"])("rejects %s before endpoint success", async invalid => {
+it.each(["CEO", "wrong task", "wrong origin chat", "wrong cwd", "foreign company", "wrong workspace", "unstarted", "settled"])("rejects %s before endpoint success", async invalid => {
   const f = await fixture(); let cwd = f.cwd;
   if (invalid === "CEO") f.run.agentId = "ceo";
   if (invalid === "wrong task") f.run.contextSnapshot.issueId = "other";
-  if (invalid === "wrong parent") f.task.parentId = "other";
+  if (invalid === "wrong origin chat") f.task.originIssueId = "other";
   if (invalid === "wrong cwd") cwd = path.dirname(f.cwd);
   if (invalid === "foreign company") f.workspace.companyId = "foreign";
   if (invalid === "wrong workspace") f.task.executionWorkspaceId = "other";