Commit a7223f3969428170cc13bd7859aa59098b2f94b1 | the-knife

author	Julius Marminge <julius0216@outlook.com> 2026-10-09 23:09:20-07:00
committer	GitHub <noreply@github.com> 2026-10-09 23:09:20-07:00
log	a7223f3969428170cc13bd7859aa59098b2f94b1
tree	4f8ceeb3626f25899c0ee918e037d6a6237ccfcb
parent	9cc57680cb5f762f553acd1fa5f3efcf17d8fc67
signature	Signed by PGP key B5690EEEBB952194

fix(clients): restart continuations show as a T3 Code notice, not another agent's message (#17723)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>

12 files changed, 171 insertions(+), 32 deletions(-)

apps
- mobile
  - src
    features
    threads
    ThreadFeed.tsx
    lib
    threadActivity.test.ts
    threadActivity.ts
- server
  - src
    orchestration-v2
    Orchestrator.ts
    RestartContinuation.test.ts
    RestartContinuation.ts
    runtimeLayer.test.ts
- web
  - src
    components
    chat
    MessagesTimeline.tsx
packages
- client-runtime
  - src
    state
    threadExecution.ts
    userMessage.test.ts
    userMessage.ts
- contracts
  - src
    orchestrationV2.ts

apps/mobile/src/features/threads/ThreadFeed.tsx+6-2

 @@ -1719,11 +1719,15 @@ function renderFeedEntry(
           className="mb-5 items-end"
           {...(enterAnimated ? { entering: FadeInUp.duration(220) } : {})}
         >
-          {presentation.isAutomation ? (
+          {presentation.attribution === "automation" ? (
             <Text className="mb-1 pr-1 font-t3-medium text-2xs text-foreground-muted opacity-60">
               Sent by automation
             </Text>
-          ) : message.createdBy === "agent" ? (
+          ) : presentation.attribution === "t3code" ? (
+            <Text className="mb-1 pr-1 font-t3-medium text-2xs text-foreground-muted opacity-60">
+              Sent by T3 Code
+            </Text>
+          ) : presentation.attribution === "agent" ? (
             <AgentMessageAttribution
               environmentId={props.environmentId}
               senderThreadId={message.senderThreadId}

apps/mobile/src/lib/threadActivity.test.ts+19-1

...	@@ -85,6 +85,24 @@ it("shows only the structured path in expanded mobile read details", () => {	...	@@ -85,6 +85,24 @@ it("shows only the structured path in expanded mobile read details", () => {
85	expect(withoutPath?.canExpand).toBe(false);	85	expect(withoutPath?.canExpand).toBe(false);
86	});	86	});
87		87
		88	it("expands a T3 Code notice to the prompt the agent got", () => {
		89	const item = {
		90	...base("restart-notice", "2026-06-20T00:00:03.000Z", 2),
		91	type: "notification",
		92	source: { kind: "system" },
		93	outcome: "updated",
		94	summary: "T3 Code restarted and resumed this turn",
		95	detail: "Continue where you left off.",
		96	} as OrchestrationV2TurnItem;
		97	const [activity] = buildThreadFeed([projected(item, 0)]).flatMap((entry) =>
		98	entry.type === "activity-group" ? entry.activities : [],
		99	);
		100
		101	expect(activity?.summary).toBe("T3 Code restarted and resumed this turn");
		102	expect(activity?.canExpand).toBe(true);
		103	expect(activity?.getFullDetail()).toBe("Continue where you left off.");
		104	});
		105
88	it("labels file searches with the adapter title and its search target", () => {	106	it("labels file searches with the adapter title and its search target", () => {
89	const item: OrchestrationV2TurnItem = {	107	const item: OrchestrationV2TurnItem = {
90	...base("file-search", "2026-06-20T00:00:03.000Z", 2),	108	...base("file-search", "2026-06-20T00:00:03.000Z", 2),
...	@@ -317,7 +335,7 @@ describe("buildThreadFeed", () => {	...	@@ -317,7 +335,7 @@ describe("buildThreadFeed", () => {
317	expect(messageEntry).toBeDefined();	335	expect(messageEntry).toBeDefined();
318	expect(resolveUserMessagePresentation(messageEntry!.message)).toMatchObject({	336	expect(resolveUserMessagePresentation(messageEntry!.message)).toMatchObject({
319	text: "Run checks",	337	text: "Run checks",
320	isAutomation: true,	338	attribution: "automation",
321	});	339	});
322	});	340	});
323		341

apps/mobile/src/lib/threadActivity.ts+6-1

 @@ -521,6 +521,7 @@ function itemIcon(item: OrchestrationV2TurnItem): ThreadFeedActivity["icon"] {
       case "monitor":
         return "eye";
       case "background_task":
+      case "system":
         return "zap";
       default:
         source satisfies never;
 @@ -814,7 +815,11 @@ function toFeedActivity(
       ? collectToolFilePaths(item)
       : null;
   const getFullDetail = memoizeValue(() =>
-    readPaths ? readPaths.join("\n") || null : formatItemFullDetail(row, item),
+    readPaths
+      ? readPaths.join("\n") || null
+      : item.type === "notification"
+        ? item.detail?.trim() || null
+        : formatItemFullDetail(row, item),
   );
   const getCopyText = memoizeValue(() =>
     [summary, detail, getFullDetail()]

apps/server/src/orchestration-v2/Orchestrator.ts+7-1

 @@ -4674,11 +4674,17 @@ const makeOrchestrator = Effect.fn("orchestrationV2.Orchestrator.layer")(functio
           dispatchMode = { type: "start_immediately" };
         }
       }
+      // A restart continuation resumes the interrupted turn, so it starts
+      // immediately rather than queueing like other wakes.
       if (
         command.notification !== undefined &&
         (command.createdBy !== "agent" ||
           (command.creationSource !== "server" && command.creationSource !== "provider") ||
-          dispatchMode.type !== "queue_after_active")
+          (dispatchMode.type !== "queue_after_active" &&
+            !(
+              command.restartContinuationOfRunId !== undefined &&
+              dispatchMode.type === "start_immediately"
+            )))
       ) {
         return yield* new OrchestratorDispatchError({
           commandId: command.commandId,

apps/server/src/orchestration-v2/RestartContinuation.test.ts+22-4

 @@ -10,6 +10,7 @@ import {
   RunAttemptId,
   RunId,
   ThreadId,
+  type OrchestrationV2Command,
   type OrchestrationV2ThreadProjection,
 } from "@t3tools/contracts";
 import * as DateTime from "effect/DateTime";
 @@ -606,9 +607,9 @@ it.effect("does not cancel or resume a run that completes while shutdown intent
   }),
 );
-const continuationTexts = (projection: OrchestrationV2ThreadProjection) =>
+const continuationDispatches = (projection: OrchestrationV2ThreadProjection) =>
   Effect.gen(function* () {
-    const texts: Array<string> = [];
+    const dispatches: Array<Extract<OrchestrationV2Command, { type: "message.dispatch" }>> = [];
     yield* continueRestartedRun({ threadId, sourceRunId: runId }).pipe(
       Effect.provide(
         Layer.merge(
 @@ -616,7 +617,7 @@ const continuationTexts = (projection: OrchestrationV2ThreadProjection) =>
             getThreadRecords: () => Effect.succeed(projection),
             recoverDelegatedTask: () => Effect.void,
             dispatch: (command) => {
-              if (command.type === "message.dispatch") texts.push(command.text);
+              if (command.type === "message.dispatch") dispatches.push(command);
               return Effect.succeed({} as never);
             },
           }),
 @@ -624,9 +625,14 @@ const continuationTexts = (projection: OrchestrationV2ThreadProjection) =>
         ),
       ),
     );
-    return texts;
+    return dispatches;
   });
+const continuationTexts = (projection: OrchestrationV2ThreadProjection) =>
+  continuationDispatches(projection).pipe(
+    Effect.map((dispatches) => dispatches.map((command) => command.text)),
+  );
 const cutMidTurn = (extra: Record<string, unknown> = {}) => {
   const base = makeProjection();
   return {
 @@ -740,6 +746,18 @@ it.effect("tells a turn cut mid-way about the background work it lost", () =>
   }),
 );
+it.effect("shows a continuation as a T3 Code notice whose detail is the prompt", () =>
+  Effect.gen(function* () {
+    const [resumed] = yield* continuationDispatches(cutMidTurn());
+    assert.deepEqual(resumed?.notification, {
+      source: { kind: "system" },
+      outcome: "updated",
+      summary: "T3 Code restarted and resumed this turn",
+      detail: "Continue where you left off.",
+    });
+  }),
+);
 it.effect(
   "carries the note forward when its continuation was cut before reaching the provider",
   () =>

apps/server/src/orchestration-v2/RestartContinuation.ts+16-6

 @@ -153,17 +153,27 @@ export const continueRestartedRun = Effect.fn("RestartContinuation.continueResta
     );
     const noteText =
       note.work.length === 0 ? undefined : restartCancelledBackgroundWorkNote(note.work);
+    const text =
+      noteText === undefined
+        ? CONTINUE_PROMPT
+        : note.settled
+          ? noteText
+          : `${noteText}\n\n${CONTINUE_PROMPT}`;
     yield* threads.dispatch({
       type: "message.dispatch",
       commandId: CommandId.make(`command:restart-continuation:${input.sourceRunId}`),
       threadId: input.threadId,
       messageId,
-      text:
+      text,
-        noteText === undefined
+      // Shown as a work log row; the prompt the agent got is its detail.
-          ? CONTINUE_PROMPT
+      notification: {
-          : note.settled
+        source: { kind: "system" },
-            ? noteText
+        outcome: "updated",
-            : `${noteText}\n\n${CONTINUE_PROMPT}`,
+        summary: note.settled
+          ? "T3 Code restarted and stopped background work"
+          : "T3 Code restarted and resumed this turn",
+        detail: text,
+      },
       attachments: [],
       modelSelection: source.modelSelection,
       dispatchMode: { type: "start_immediately" },

apps/server/src/orchestration-v2/runtimeLayer.test.ts+17

...	@@ -3211,6 +3211,12 @@ it.layer(layerTest)("OrchestrationV2LayerLive lifecycle", (it) => {	...	@@ -3211,6 +3211,12 @@ it.layer(layerTest)("OrchestrationV2LayerLive lifecycle", (it) => {
3211	threadId,	3211	threadId,
3212	messageId: MessageId.make("restart-automatic-message"),	3212	messageId: MessageId.make("restart-automatic-message"),
3213	text: "Continue where you left off.",	3213	text: "Continue where you left off.",
		3214	notification: {
		3215	source: { kind: "system" as const },
		3216	outcome: "updated" as const,
		3217	summary: "T3 Code restarted and resumed this turn",
		3218	detail: "Continue where you left off.",
		3219	},
3214	attachments: [],	3220	attachments: [],
3215	modelSelection,	3221	modelSelection,
3216	dispatchMode: { type: "start_immediately" as const },	3222	dispatchMode: { type: "start_immediately" as const },
...	@@ -3221,6 +3227,17 @@ it.layer(layerTest)("OrchestrationV2LayerLive lifecycle", (it) => {	...	@@ -3221,6 +3227,17 @@ it.layer(layerTest)("OrchestrationV2LayerLive lifecycle", (it) => {
3221	const admitted = yield* orchestrator.getThreadProjection(threadId);	3227	const admitted = yield* orchestrator.getThreadProjection(threadId);
3222	assert.lengthOf(admitted.runs, 2);	3228	assert.lengthOf(admitted.runs, 2);
3223	assert.equal(admitted.runs[1]?.restartContinuationOfRunId, original.id);	3229	assert.equal(admitted.runs[1]?.restartContinuationOfRunId, original.id);
		3230	// The timeline shows a work log row; the prompt stays in its detail.
		3231	const continuationItems = admitted.turnItems.filter(
		3232	(item) => item.runId === admitted.runs[1]?.id,
		3233	);
		3234	assert.isFalse(continuationItems.some((item) => item.type === "user_message"));
		3235	assert.deepInclude(
		3236	continuationItems.flatMap((item) =>
		3237	item.type === "notification" ? [[item.summary, item.detail]] : [],
		3238	),
		3239	["T3 Code restarted and resumed this turn", "Continue where you left off."],
		3240	);
3224	// A differently identified stale delivery still must not create another run.	3241	// A differently identified stale delivery still must not create another run.
3225	yield* orchestrator.dispatch({	3242	yield* orchestrator.dispatch({
3226	...command,	3243	...command,

apps/web/src/components/chat/MessagesTimeline.tsx+11-2

 @@ -2357,7 +2357,7 @@ function UserTimelineRow({ row }: { row: Extract<TimelineRow, { kind: "message"
   return (
     <div className="group flex flex-col items-end gap-1">
-      {userMessage.isAutomation ? (
+      {userMessage.attribution === "automation" ? (
         <p
           className="me-1 text-2xs text-muted-foreground/70"
           data-user-message-attribution="automation"
 @@ -2377,7 +2377,14 @@ function UserTimelineRow({ row }: { row: Extract<TimelineRow, { kind: "message"
             "Sent by automation"
           )}
         </p>
-      ) : row.message.createdBy === "agent" ? (
+      ) : userMessage.attribution === "t3code" ? (
+        <p
+          className="me-1 text-2xs text-muted-foreground/70"
+          data-user-message-attribution="t3code"
+        >
+          Sent by T3 Code
+        </p>
+      ) : userMessage.attribution === "agent" ? (
         <p className="me-1 text-2xs text-muted-foreground/70" data-user-message-attribution="agent">
           {senderThreadId ? (
             <InlineButton
 @@ -5276,6 +5283,8 @@ function workEntryIconName(workEntry: TimelineWorkEntry): WorkEntryIconName {
         return "eye";
       case "background_task":
         return "zap";
+      case "system":
+        return "t3-code";
       default:
         source satisfies never;
         return "zap";

packages/client-runtime/src/state/threadExecution.ts+1

...	@@ -444,6 +444,7 @@ export function notificationChildThreadId(	...	@@ -444,6 +444,7 @@ export function notificationChildThreadId(
444	case "command":	444	case "command":
445	case "monitor":	445	case "monitor":
446	case "background_task":	446	case "background_task":
		447	case "system":
447	return undefined;	448	return undefined;
448	default:	449	default:
449	source satisfies never;	450	source satisfies never;

packages/client-runtime/src/userMessage.test.ts+26-5

 @@ -9,7 +9,11 @@ describe("resolveUserMessagePresentation", () => {
   it("removes attribution from legacy scheduled prompts", () => {
     expect(
       resolveUserMessagePresentation({ role: "user", createdBy: "agent", text: legacyText }),
-    ).toEqual({ text: "Check for crashes.\n", isAutomation: true, scheduledTaskId: undefined });
+    ).toEqual({
+      text: "Check for crashes.\n",
+      attribution: "automation",
+      scheduledTaskId: undefined,
+    });
   });
   it("uses task metadata without changing the prompt", () => {
 @@ -20,7 +24,7 @@ describe("resolveUserMessagePresentation", () => {
         scheduledTaskId: ScheduledTaskId.make("task-1"),
         text: legacyText,
       }),
-    ).toEqual({ text: legacyText, isAutomation: true, scheduledTaskId: "task-1" });
+    ).toEqual({ text: legacyText, attribution: "automation", scheduledTaskId: "task-1" });
   });
   it("preserves user-written and assistant-quoted schedule headers", () => {
 @@ -31,7 +35,7 @@ describe("resolveUserMessagePresentation", () => {
     ]) {
       expect(resolveUserMessagePresentation({ ...message, text: legacyText })).toEqual({
         text: legacyText,
-        isAutomation: false,
+        attribution: null,
         scheduledTaskId: undefined,
       });
     }
 @@ -45,12 +49,29 @@ describe("resolveUserMessagePresentation", () => {
     ]) {
       expect(resolveUserMessagePresentation({ role: "user", createdBy: "agent", text })).toEqual({
         text,
-        isAutomation: false,
+        attribution: "agent",
         scheduledTaskId: undefined,
       });
     }
   });
+  it("attributes older server-sent restart continuations to T3 Code, not another agent", () => {
+    const text = "Note: the T3 server restarted.";
+    expect(
+      resolveUserMessagePresentation({
+        role: "user",
+        createdBy: "agent",
+        creationSource: "server",
+        text,
+      }),
+    ).toMatchObject({ attribution: "t3code" });
+    for (const creationSource of ["mcp", "provider"] as const) {
+      expect(
+        resolveUserMessagePresentation({ role: "user", createdBy: "agent", creationSource, text }),
+      ).toMatchObject({ attribution: "agent" });
+    }
+  });
   it("recovers the triggering automation from older scheduler message ids", () => {
     for (const trigger of ["scheduled", "manual"]) {
       expect(
 @@ -62,7 +83,7 @@ describe("resolveUserMessagePresentation", () => {
         }),
       ).toEqual({
         text: "Check for crashes.\n",
-        isAutomation: true,
+        attribution: "automation",
         scheduledTaskId: "task:daily-audit",
       });
     }

packages/client-runtime/src/userMessage.ts+38-10

 @@ -1,31 +1,59 @@
-import { type OrchestrationV2Actor, ScheduledTaskId } from "@t3tools/contracts";
+import {
+  type OrchestrationV2Actor,
+  type OrchestrationV2CreationSource,
+  ScheduledTaskId,
+} from "@t3tools/contracts";
 const LEGACY_AUTOMATION_PREFIX = /^\[Triggered by schedule task: [^\r\n]+\]\r?\n\r?\n/;
 const LEGACY_AUTOMATION_MESSAGE_ID = /^scheduled-task-message:(.+):\d+:(?:scheduled|manual)$/;
-/** Older scheduled messages stored their attribution in the prompt itself. */
+/**
+ * Text and sender label for a user-role message. Older scheduled messages
+ * stored their attribution in the prompt itself.
+ */
 export function resolveUserMessagePresentation(message: {
   readonly id?: string;
   readonly role: string;
   readonly text: string;
   readonly createdBy?: OrchestrationV2Actor;
+  readonly creationSource?: OrchestrationV2CreationSource;
   readonly scheduledTaskId?: ScheduledTaskId;
-}) {
+}): {
+  readonly text: string;
+  /** Who sent a user-role message the user did not type. */
+  readonly attribution: "automation" | "agent" | "t3code" | null;
+  readonly scheduledTaskId: ScheduledTaskId | undefined;
+} {
   if (message.role !== "user") {
-    return { text: message.text, isAutomation: false, scheduledTaskId: undefined };
+    return { text: message.text, attribution: null, scheduledTaskId: undefined };
   }
   if (message.scheduledTaskId !== undefined) {
-    return { text: message.text, isAutomation: true, scheduledTaskId: message.scheduledTaskId };
+    return {
+      text: message.text,
+      attribution: "automation",
+      scheduledTaskId: message.scheduledTaskId,
+    };
   }
   const legacyPrefix = LEGACY_AUTOMATION_PREFIX.exec(message.text);
   const legacyTaskId = legacyPrefix
     ? LEGACY_AUTOMATION_MESSAGE_ID.exec(message.id ?? "")?.[1]
     : undefined;
-  const isAutomation =
+  if (legacyPrefix !== null && (legacyTaskId !== undefined || message.createdBy === "agent")) {
-    legacyPrefix !== null && (legacyTaskId !== undefined || message.createdBy === "agent");
+    return {
+      text: message.text.slice(legacyPrefix[0].length),
+      attribution: "automation",
+      scheduledTaskId: legacyTaskId === undefined ? undefined : ScheduledTaskId.make(legacyTaskId),
+    };
+  }
   return {
-    text: isAutomation ? message.text.slice(legacyPrefix[0].length) : message.text,
+    text: message.text,
-    isAutomation,
+    // Restart continuations were sent as the agent before they became notices.
-    scheduledTaskId: legacyTaskId === undefined ? undefined : ScheduledTaskId.make(legacyTaskId),
+    attribution:
+      message.createdBy !== "agent"
+        ? null
+        : message.creationSource === "server"
+          ? "t3code"
+          : "agent",
+    scheduledTaskId: undefined,
   };
 }

packages/contracts/src/orchestrationV2.ts+2

...	@@ -1097,6 +1097,8 @@ export const OrchestrationV2NotificationSource = kindUnionWithFallback(	...	@@ -1097,6 +1097,8 @@ export const OrchestrationV2NotificationSource = kindUnionWithFallback(
1097	CommandNotificationSource,	1097	CommandNotificationSource,
1098	Schema.Struct({ kind: Schema.Literal("monitor") }),	1098	Schema.Struct({ kind: Schema.Literal("monitor") }),
1099	Schema.Struct({ kind: Schema.Literal("background_task") }),	1099	Schema.Struct({ kind: Schema.Literal("background_task") }),
		1100	/** T3 Code itself, such as a restart continuing an interrupted turn. */
		1101	Schema.Struct({ kind: Schema.Literal("system") }),
1100	],	1102	],
1101	(kind) => Schema.Struct({ kind }),	1103	(kind) => Schema.Struct({ kind }),
1102	() => ({ kind: "background_task" }),	1104	() => ({ kind: "background_task" }),