@@ -13,6 +13,7 @@ import {
   type OrchestrationV2ExecutionNode,
   type OrchestrationV2Run,
   type OrchestrationV2RunStatus,
+  type OrchestrationV2TurnItem,
 } from "@t3tools/contracts";
 import * as DateTime from "effect/DateTime";
 import { usageLimitBlockedRun } from "@t3tools/shared/orchestrationV2ThreadError";
@@ -592,6 +593,7 @@ describe("usage-limit notice rows", () => {
   });
   const notice = (id: string, ordinal: number, nativeId: string) => ({
     ...base,
+    nodeId: limited.rootNodeId,
     id: TurnItemId.make(id),
     ordinal,
     nativeItemRef: {
@@ -613,9 +615,9 @@ describe("usage-limit notice rows", () => {
     assistant("cli-notice", 5, "You've hit your 5-hour limit · resets 7:10am (Asia/Kolkata)"),
     error("limit-error", 6),
   ];
-  const swap = (index: number, item: (typeof turnItems)[number]) =>
+  const swap = (index: number, item: OrchestrationV2TurnItem) =>
     turnItems.map((current, position) => (position === index ? item : current));
-  const rows = (items: ReadonlyArray<(typeof turnItems)[number]>) =>
+  const rows = (items: ReadonlyArray<OrchestrationV2TurnItem>) =>
     items.map((item, position) => ({
       position,
       visibility: "local" as const,
@@ -628,7 +630,10 @@ describe("usage-limit notice rows", () => {
       projection.visibleTurnItems,
       deriveUsageLimitNoticeRows(projection),
     ).map((row) => row.item.id);
-  const projection = (runs: ReadonlyArray<OrchestrationV2Run>, items = turnItems) => ({
+  const projection = (
+    runs: ReadonlyArray<OrchestrationV2Run>,
+    items: ReadonlyArray<OrchestrationV2TurnItem> = turnItems,
+  ) => ({
     ...v2Projection,
     runs,
     turnItems: items,
@@ -638,6 +643,16 @@ describe("usage-limit notice rows", () => {
   it("leaves the recovery notice as the only account of a usage-limit pause", () => {
     const kept = ["useful", "unrelated-notice", "child-error"];
     expect(visibleIds(projection([limited]))).toEqual(kept);
+    for (const text of [
+      "You've hit your session limit",
+      "You've hit your session limit · resets 11:10am (Australia/Sydney)",
+      "You're out of extra usage",
+      "Claude AI usage limit reached.",
+    ]) {
+      expect(visibleIds(projection([limited], swap(4, assistant("cli-notice", 5, text))))).toEqual(
+        kept,
+      );
+    }
     // Follow-ups that never started do not end the pause.
     expect(visibleIds(projection([limited, run("queued", 2, "queued")]))).toEqual(kept);
     expect(
@@ -654,14 +669,37 @@ describe("usage-limit notice rows", () => {
   });
 
   it("keeps the agent's own words in the limited turn", () => {
-    const reply = assistant(
-      "cli-notice",
-      5,
+    for (const text of [
       "I've hit your limit on retries, so here is the plan.",
-    );
-    expect(visibleIds(projection([limited], swap(4, reply)))).toContain("cli-notice");
+      "You've hit your configured retry limit; reduce maxRetries and rerun the build.",
+      "Claude AI usage limit reached, but the changes are saved in src/parser.ts.",
+      "You've hit your 5-hour limit · resets 7:10am. The changes are saved.",
+    ]) {
+      expect(
+        visibleIds(projection([limited], swap(4, assistant("cli-notice", 5, text)))),
+      ).toContain("cli-notice");
+    }
     const earlierTurn = { ...turnItems[4]!, providerTurnId: ProviderTurnId.make("earlier-turn") };
     expect(visibleIds(projection([limited], swap(4, earlierTurn)))).toContain("cli-notice");
+    const pause = turnItems[1]!;
+    for (const item of [
+      { ...pause, nodeId: NodeId.make("child") },
+      { ...pause, providerTurnId: ProviderTurnId.make("earlier-turn") },
+      { ...pause, providerTurnId: null },
+      {
+        ...pause,
+        nativeItemRef: { ...pause.nativeItemRef!, driver: ProviderDriverKind.make("codex") },
+      },
+      {
+        ...pause,
+        nativeItemRef: {
+          ...pause.nativeItemRef!,
+          nativeId: "usage-limit:earlier-turn:five_hour:1",
+        },
+      },
+    ]) {
+      expect(visibleIds(projection([limited], swap(1, item)))).toContain("pause");
+    }
   });
 
   it("returns the rows to history once another run executes or the failure is not a usage limit", () => {
 
@@ -299,7 +299,7 @@ export interface UsageLimitNoticeRows {
 
 // Claude Code's own limit messages, such as "You've hit your 5-hour limit · resets 7:10am".
 const PROVIDER_LIMIT_NOTICE =
-  /^(?:You[’']ve hit your [^\n]*\blimit\b|You[’']re out of extra usage\b|Claude AI usage limit reached\b)[^\n]*$/i;
+  /^(?:You[’']ve hit your (?:(?:5-hour|session|weekly|usage) )?limit|You[’']re out of extra usage|Claude AI usage limit reached)(?: · resets (?:[1-9]|1[0-2])(?::[0-5]\d)?(?:am|pm)(?: \([A-Za-z_+-]+(?:\/[A-Za-z_+-]+)+\))?)?\.?$/i;
 
 /**
  * The timeline rows that repeat a usage-limit pause while its recovery notice shows: the run's
@@ -327,20 +327,23 @@ export function deriveUsageLimitNoticeRows(
     ) {
       itemIds.add(item.id);
       if (item.failure === failure) failedProviderTurnId = item.providerTurnId;
-    } else if (
-      item.type === "system_notice" &&
-      item.nativeItemRef?.nativeId?.startsWith("usage-limit:") === true
-    ) {
-      itemIds.add(item.id);
     }
   }
   let providerNotice: ThreadStructureTurnItem | null = null;
   if (failedProviderTurnId !== null) {
     for (const item of projection.turnItems) {
+      if (item.runId !== run.id || item.providerTurnId !== failedProviderTurnId) continue;
+      if (
+        item.type === "system_notice" &&
+        item.nodeId === run.rootNodeId &&
+        item.parentItemId === null &&
+        item.nativeItemRef?.driver === "claudeAgent" &&
+        item.nativeItemRef.nativeId?.startsWith(`usage-limit:${failedProviderTurnId}:`) === true
+      ) {
+        itemIds.add(item.id);
+      }
       if (
         item.type === "assistant_message" &&
-        item.runId === run.id &&
-        item.providerTurnId === failedProviderTurnId &&
         item.parentItemId === null &&
         (providerNotice === null || item.ordinal > providerNotice.ordinal)
       ) {