@promptbook/cli 0.114.0-3 → 0.114.0-30

package/apps/agents-server/src/utils/localChatRunner/persistLocalTeamConversations.ts

@@ -0,0 +1,71 @@
+import type { ChatMessage, ToolCall } from '@promptbook-local/types';
+import { persistFrozenUserChat } from '../userChat/persistFrozenUserChat';
+import { attachTeamMemberUserChatContext } from '../userChat/teamMemberUserChatContext';
+import { USER_CHAT_SOURCES } from '../userChat/UserChatSource';
+import type { UserChatJobRecord } from '../userChat/UserChatJobRecord';
+import type { ParsedLocalTeamConversation } from './parseLocalTeamConversations';
+
+/**
+ * Persists teammate transcripts as frozen chats and returns their chip-ready tool calls.
+ */
+export async function persistLocalTeamConversations(options: {
+    readonly job: Pick<UserChatJobRecord, 'id' | 'userId' | 'agentPermanentId' | 'chatId' | 'queuedAt'>;
+    readonly conversations: ReadonlyArray<ParsedLocalTeamConversation>;
+}): Promise<ReadonlyArray<ToolCall>> {
+    for (const conversation of options.conversations) {
+        await persistFrozenUserChat({
+            userId: options.job.userId,
+            agentPermanentId: conversation.teammate.permanentId,
+            source: USER_CHAT_SOURCES.TEAM_MEMBER,
+            chatId: createLocalTeamMemberChatId(options.job.id, conversation.transcriptFileName),
+            messages: createFrozenTeamConversationMessages(options.job, conversation),
+        });
+    }
+
+    return options.conversations.map((conversation) => conversation.toolCall);
+}
+
+/**
+ * Creates the frozen teammate-chat transcript and its primary-chat relation.
+ */
+function createFrozenTeamConversationMessages(
+    job: Pick<UserChatJobRecord, 'id' | 'agentPermanentId' | 'chatId' | 'queuedAt'>,
+    conversation: ParsedLocalTeamConversation,
+): Array<ChatMessage> {
+    const queuedAt = Date.parse(job.queuedAt);
+    const baseTimestamp = Number.isFinite(queuedAt) ? queuedAt : Date.now();
+    const transcriptIdentifier = normalizeTranscriptIdentifier(conversation.transcriptFileName);
+    const messages = conversation.conversation.map((message, index) => ({
+        id: `team-${job.id}-${transcriptIdentifier}-${index + 1}`,
+        sender: message.sender === 'AGENT' ? 'USER' : 'AGENT',
+        content: message.content,
+        isComplete: true,
+        createdAt: new Date(baseTimestamp + index * 1_000).toISOString() as NonNullable<ChatMessage['createdAt']>,
+    }));
+
+    return attachTeamMemberUserChatContext(messages, {
+        version: 1,
+        primaryAgentPermanentId: job.agentPermanentId,
+        primaryAgentName: conversation.conversation[0]?.name || 'Agent',
+        primaryChatId: job.chatId,
+    });
+}
+
+/**
+ * Creates a stable frozen-chat id so repeated synchronization refreshes the same transcript.
+ */
+function createLocalTeamMemberChatId(jobId: string, transcriptFileName: string): string {
+    return `team-${jobId}-${normalizeTranscriptIdentifier(transcriptFileName)}`;
+}
+
+/**
+ * Converts a direct transcript filename into a conservative id-safe segment.
+ */
+function normalizeTranscriptIdentifier(transcriptFileName: string): string {
+    return (
+        transcriptFileName
+            .replace(/\.book$/iu, '')
+            .replace(/[^A-Za-z0-9._-]+/gu, '-')
+            .replace(/^[._-]+|[._-]+$/gu, '') || 'conversation'
+    );
+}

package/apps/agents-server/src/utils/localChatRunner/prepareLocalAgentPlannedMessagesSidecar.ts

@@ -0,0 +1,74 @@
+import { mkdir, writeFile } from 'fs/promises';
+import { dirname, join } from 'path';
+import {
+    createAgentPlannedMessagesSidecarContent,
+    createAgentPlannedMessagesSidecarPath,
+    type AgentPlannedMessageSnapshot,
+    type AgentPlannedMessagesSidecar,
+} from '../../../../../src/book-3.0/AgentPlannedMessagesSidecar';
+import {
+    AGENT_GOAL_CHAT_PLANNED_MESSAGE_ACTIONS,
+    type AgentGoalChatPlannedMessageItem,
+} from '../agentGoalChat/agentGoalChatPlannedMessageActions';
+import type { UserChatJobRecord } from '../userChat/UserChatJobRecord';
+import type { LocalAgentFolder } from './ensureLocalAgentFolder';
+import type { LocalUserChatJobMetadata } from './LocalUserChatJobMetadata';
+
+/**
+ * Writes the planned-message sidecar a coding harness uses to see and change its future wake-ups.
+ *
+ * The sidecar is the only planning channel of a locally executed turn: the harness never has to reach
+ * the Agents Server over the network, and a wake-up exists only when it was actually requested here.
+ * Planned messages repeat on their own, so an empty `commands` array keeps the current plan intact.
+ *
+ * @param options - Answered job, its agent folder, and the local runner metadata of the queued message.
+ */
+export async function prepareLocalAgentPlannedMessagesSidecar(options: {
+    readonly job: Pick<UserChatJobRecord, 'agentPermanentId'>;
+    readonly agentFolder: LocalAgentFolder;
+    readonly metadata: LocalUserChatJobMetadata;
+}): Promise<void> {
+    const sidecarPath = join(
+        options.agentFolder.directoryPath,
+        createAgentPlannedMessagesSidecarPath(options.metadata.fileName),
+    );
+    const plannedMessages = await AGENT_GOAL_CHAT_PLANNED_MESSAGE_ACTIONS.list({
+        agentPermanentId: options.job.agentPermanentId,
+    });
+    const sidecar: AgentPlannedMessagesSidecar = {
+        version: 1,
+        agentPermanentId: options.job.agentPermanentId,
+        currentPlannedMessages: plannedMessages.items.map(createLocalAgentPlannedMessageSnapshot),
+        commands: [],
+    };
+
+    await mkdir(dirname(sidecarPath), { recursive: true });
+    await writeFile(sidecarPath, createAgentPlannedMessagesSidecarContent(sidecar), 'utf-8');
+}
+
+/**
+ * Reduces one stored planned message to the fields a coding harness needs.
+ *
+ * The whole schedule travels into the sidecar, so the harness can compare a plan with its goal instead
+ * of only seeing when the next wake-up happens.
+ *
+ * @param plannedMessage - Planned message returned by the shared planned-message actions.
+ * @returns Snapshot written into the sidecar.
+ *
+ * @private function of `prepareLocalAgentPlannedMessagesSidecar`
+ */
+function createLocalAgentPlannedMessageSnapshot(
+    plannedMessage: AgentGoalChatPlannedMessageItem,
+): AgentPlannedMessageSnapshot {
+    return {
+        timeoutId: plannedMessage.timeoutId,
+        dueAt: plannedMessage.dueAt,
+        message: plannedMessage.message,
+        intervalMs: plannedMessage.intervalMs,
+        cronExpression: plannedMessage.cronExpression,
+        startsAt: plannedMessage.startsAt,
+        endsAt: plannedMessage.endsAt,
+        maxRunCount: plannedMessage.maxRunCount,
+        runCount: plannedMessage.runCount,
+    };
+}

package/apps/agents-server/src/utils/localChatRunner/prepareLocalTeamConversationWorkspace.ts

@@ -0,0 +1,233 @@
+import { $provideAgentCollectionForServer } from '@/src/tools/$provideAgentCollectionForServer';
+import { mkdir, rm, stat, writeFile } from 'fs/promises';
+import { join } from 'path';
+import type { string_agent_url } from '../../../../../src/types/typeAliases';
+import {
+    AGENT_TEAM_CONVERSATION_MANIFEST_FILE_NAME,
+    AGENT_TEAMMATE_SOURCES_DIRECTORY_NAME,
+    createAgentTeamConversationWorkspacePath,
+    createAgentTeamTeammateSourceFileName,
+    type AgentTeamConversationTeammate,
+    type AgentTeamConversationWorkspaceManifest,
+} from '../../../../../src/book-3.0/AgentTeamConversationWorkspace';
+import {
+    resolveCachedServerAgentContext,
+    resolveCachedServerAgentModelRequirements,
+} from '../cachedServerAgentRuntime';
+import { createServerAgentReferenceResolver } from '../agentReferenceResolver/createServerAgentReferenceResolver';
+import { normalizeLocalServerUrls, resolveLocalAgentRouteReference } from '../localAgentRouteReferences';
+import { resolveCurrentOrInternalServerOrigin } from '../resolveCurrentOrInternalServerOrigin';
+import type { UserChatJobRecord } from '../userChat/UserChatJobRecord';
+import type { LocalAgentFolder } from './ensureLocalAgentFolder';
+import type { LocalUserChatJobMetadata } from './LocalUserChatJobMetadata';
+
+/**
+ * Resolves local TEAM members and snapshots their sources for one local coding-harness job.
+ */
+export async function prepareLocalTeamConversationWorkspace(options: {
+    readonly job: Pick<UserChatJobRecord, 'agentPermanentId'>;
+    readonly agentFolder: LocalAgentFolder;
+    readonly metadata: LocalUserChatJobMetadata;
+    readonly primaryAgentName: string;
+}): Promise<void> {
+    const workspacePath = join(
+        options.agentFolder.directoryPath,
+        createAgentTeamConversationWorkspacePath(options.metadata.fileName),
+    );
+    const manifestPath = join(workspacePath, AGENT_TEAM_CONVERSATION_MANIFEST_FILE_NAME);
+
+    if (await isExistingPath(manifestPath)) {
+        return;
+    }
+
+    const localServerUrl = await resolveCurrentOrInternalServerOrigin();
+    const collection = await $provideAgentCollectionForServer();
+    const agentReferenceResolver = await createServerAgentReferenceResolver({
+        agentCollection: collection,
+        localServerUrl,
+    });
+    const primaryAgentContext = await resolveCachedServerAgentContext({
+        collection,
+        agentIdentifier: options.job.agentPermanentId,
+        localServerUrl,
+        fallbackResolver: agentReferenceResolver,
+    });
+    const preparedRequirements = await resolveCachedServerAgentModelRequirements({
+        resolvedAgentContext: primaryAgentContext,
+        localServerUrl,
+        fallbackResolver: agentReferenceResolver,
+    });
+    const teammates = await resolveLocalTeamConversationTeammates({
+        teammates: getPreparedTeamMetadata(preparedRequirements.modelRequirements._metadata?.teammates),
+        collection,
+        localServerUrl,
+        primaryAgentPermanentId: options.job.agentPermanentId,
+        agentReferenceResolver,
+    });
+
+    if (teammates.length === 0) {
+        return;
+    }
+
+    const manifest: AgentTeamConversationWorkspaceManifest = {
+        version: 1,
+        primaryAgent: {
+            permanentId: options.job.agentPermanentId,
+            agentName: options.primaryAgentName,
+        },
+        teammates: teammates.map(({ teammate }) => teammate),
+    };
+
+    // Note: The path is deterministically derived from this one queued message, so clearing a stale
+    //       incomplete workspace cannot affect another user turn.
+    await rm(workspacePath, { recursive: true, force: true });
+    await mkdir(join(workspacePath, AGENT_TEAMMATE_SOURCES_DIRECTORY_NAME), { recursive: true });
+    await Promise.all([
+        writeFile(manifestPath, `${JSON.stringify(manifest, null, 2)}\n`, 'utf-8'),
+        ...teammates.map(({ teammate, source }) =>
+            writeFile(
+                join(workspacePath, AGENT_TEAMMATE_SOURCES_DIRECTORY_NAME, teammate.sourceFileName),
+                ensureTrailingNewline(source),
+                'utf-8',
+            ),
+        ),
+    ]);
+}
+
+/**
+ * TEAM metadata retained by the TEAM commitment while building model requirements.
+ */
+type PreparedTeamMetadata = {
+    readonly url: string;
+    readonly label?: string;
+    readonly instructions?: string;
+};
+
+/**
+ * One workspace teammate paired with its resolved read-only source.
+ */
+type LocalTeamConversationTeammate = {
+    readonly teammate: AgentTeamConversationTeammate;
+    readonly source: string;
+};
+
+/**
+ * Extracts valid TEAM metadata from untyped commitment metadata.
+ */
+function getPreparedTeamMetadata(value: unknown): Array<PreparedTeamMetadata> {
+    if (!Array.isArray(value)) {
+        return [];
+    }
+
+    return value.filter(isPreparedTeamMetadata);
+}
+
+/**
+ * Checks one TEAM metadata item from `AgentModelRequirements._metadata`.
+ */
+function isPreparedTeamMetadata(value: unknown): value is PreparedTeamMetadata {
+    return Boolean(value && typeof value === 'object' && typeof (value as PreparedTeamMetadata).url === 'string');
+}
+
+/**
+ * Resolves only teammates hosted by this Agents Server, because only their durable histories can be persisted here.
+ */
+async function resolveLocalTeamConversationTeammates(options: {
+    readonly teammates: ReadonlyArray<PreparedTeamMetadata>;
+    readonly collection: Awaited<ReturnType<typeof $provideAgentCollectionForServer>>;
+    readonly localServerUrl: string;
+    readonly primaryAgentPermanentId: string;
+    readonly agentReferenceResolver: Awaited<ReturnType<typeof createServerAgentReferenceResolver>>;
+}): Promise<Array<LocalTeamConversationTeammate>> {
+    const localServerUrls = normalizeLocalServerUrls([options.localServerUrl]);
+    const seenPermanentIds = new Set<string>();
+    const resolvedTeammates: Array<LocalTeamConversationTeammate> = [];
+
+    for (const preparedTeammate of options.teammates) {
+        const routeReference = resolveLocalAgentRouteReference(
+            preparedTeammate.url as string_agent_url,
+            localServerUrls,
+            [],
+        );
+        if (!routeReference) {
+            continue;
+        }
+
+        const basicInformation = await options.collection.findAgentBasicInformation(routeReference.agentIdentifier);
+        const teammatePermanentId = basicInformation?.permanentId;
+        if (
+            !teammatePermanentId ||
+            isSamePermanentId(teammatePermanentId, options.primaryAgentPermanentId) ||
+            seenPermanentIds.has(teammatePermanentId)
+        ) {
+            continue;
+        }
+
+        const teammateContext = await resolveCachedServerAgentContext({
+            collection: options.collection,
+            agentIdentifier: teammatePermanentId,
+            localServerUrl: options.localServerUrl,
+            fallbackResolver: options.agentReferenceResolver,
+        });
+        const teammateName = preparedTeammate.label?.trim() || teammateContext.resolvedAgentName;
+        if (!teammateName) {
+            continue;
+        }
+
+        seenPermanentIds.add(teammatePermanentId);
+        resolvedTeammates.push({
+            teammate: {
+                permanentId: teammatePermanentId,
+                agentName: teammateName,
+                url: preparedTeammate.url,
+                instructions: preparedTeammate.instructions?.trim() || '',
+                sourceFileName: createAgentTeamTeammateSourceFileName(teammatePermanentId),
+            },
+            source: teammateContext.resolvedAgentSource,
+        });
+    }
+
+    return resolvedTeammates;
+}
+
+/**
+ * Compares permanent ids case-insensitively, matching Agents Server routing semantics.
+ */
+function isSamePermanentId(firstPermanentId: string, secondPermanentId: string): boolean {
+    return firstPermanentId.toLowerCase() === secondPermanentId.toLowerCase();
+}
+
+/**
+ * Keeps source snapshots friendly to the Book parser and coding harness.
+ */
+function ensureTrailingNewline(source: string): string {
+    return source.endsWith('\n') ? source : `${source}\n`;
+}
+
+/**
+ * Checks whether a fixed per-message workspace manifest already exists.
+ */
+async function isExistingPath(path: string): Promise<boolean> {
+    try {
+        await stat(path);
+        return true;
+    } catch (error) {
+        if (isFileNotFoundError(error)) {
+            return false;
+        }
+
+        throw error;
+    }
+}
+
+/**
+ * Returns true when one filesystem error indicates a missing path.
+ */
+function isFileNotFoundError(error: unknown): boolean {
+    return Boolean(
+        error &&
+            typeof error === 'object' &&
+            'code' in error &&
+            ((error as { code?: string }).code === 'ENOENT' || (error as { code?: string }).code === 'ENOTDIR'),
+    );
+}

package/apps/agents-server/src/utils/localChatRunner/processLocalUserChatJob.ts

@@ -1,19 +1,25 @@
 import type { Json } from '@/src/database/schema';
+import type { ToolCall } from '@promptbook-local/types';
 import { mkdir, readFile, rm, writeFile } from 'fs/promises';
 import { join } from 'path';
 import { parseAgentSource } from '../../../../../src/book-2.0/agent-source/parseAgentSource';
 import {
     buildAgentMessageRunReportPath,
     parseAgentMessageRunReport,
+    type AgentMessageRunReport,
 } from '../../../../../src/book-3.0/AgentMessageRunReport';
+import type { AgentMessageProjectChange } from '../../../../../src/utils/agent-message-runtime/AgentMessageProjectChange';
+import type { AgentMessageTouchedExternalSource } from '../../../../../src/utils/agent-message-runtime/AgentMessageTouchedExternalSource';
+import { createAnsweredMessageChipToolCalls } from '../chatMessageChips/createAnsweredMessageChipToolCalls';
 import { createUserChatJobFailureDetails } from '../userChat/createUserChatJobFailureDetails';
 import { claimNextQueuedUserChatJob } from '../userChat/claimNextQueuedUserChatJob';
 import { finalizeUserChatJob } from '../userChat/finalizeUserChatJob';
-import { getUserChat } from '../userChat/getUserChat';
+import { getUserChatForJobRunner } from '../userChat/getUserChatForJobRunner';
 import { getUserChatJobById } from '../userChat/getUserChatJobById';
 import { persistUserChatJobTerminalState } from '../userChat/persistUserChatJobTerminalState';
 import { provideUserChatJobTable } from '../userChat/provideUserChatJobTable';
 import { updateUserChatAssistantMessage } from '../userChat/updateUserChatAssistantMessage';
+import { resolveUserChatJobExecutionTiming } from '../userChat/userChatJobRunReport';
 import type { UserChatJobRecord } from '../userChat/UserChatJobRecord';
 import type { UserChatJobRow } from '../userChat/UserChatJobRow';
 import { createUserChatRunnerThreadMessages } from '../userChat/userChatMessageLifecycle';
@@ -32,11 +38,20 @@ import {
     parseLocalChatFinishedMessageBook,
 } from './localChatMessageBook';
 import { LOCAL_USER_CHAT_JOB_ANSWER_TIMEOUT_MS, LOCAL_USER_CHAT_JOB_PROVIDER } from './localChatRunnerConstants';
+import {
+    applyLocalAgentPlannedMessageCommands,
+    removeLocalAgentPlannedMessagesSidecar,
+    type AppliedAgentPlannedMessageCommand,
+} from './applyLocalAgentPlannedMessageCommands';
+import { prepareLocalAgentPlannedMessagesSidecar } from './prepareLocalAgentPlannedMessagesSidecar';
 import {
     ensureLocalAgentFolder,
     loadLocalAgentSourceSnapshot,
     resolveLocalAgentRootPath,
 } from './ensureLocalAgentFolder';
+import { parseFinishedLocalTeamConversations } from './parseLocalTeamConversations';
+import { prepareLocalTeamConversationWorkspace } from './prepareLocalTeamConversationWorkspace';
+import { persistLocalTeamConversations } from './persistLocalTeamConversations';
 import { persistLocalUserChatJobProgressFromRuntimeLog } from './persistLocalUserChatJobProgressFromRuntimeLog';
 
 /**
@@ -145,11 +160,7 @@ async function enqueueLocalUserChatJobWithinTerminalCapture(
     job: UserChatJobRecord,
 ): Promise<ProcessLocalUserChatJobResult> {
     const [chat, agentSourceSnapshot] = await Promise.all([
-        getUserChat({
-            userId: job.userId,
-            agentPermanentId: job.agentPermanentId,
-            chatId: job.chatId,
-        }),
+        getUserChatForJobRunner(job),
         loadLocalAgentSourceSnapshot(job.agentPermanentId),
     ]);
 
@@ -186,6 +197,13 @@ async function enqueueLocalUserChatJobWithinTerminalCapture(
     });
     const queuedMessagePath = join(agentFolder.directoryPath, metadata.queuedPath);
 
+    await prepareLocalTeamConversationWorkspaceIfPossible({
+        job,
+        agentFolder,
+        metadata,
+        primaryAgentName: agentSourceSnapshot.agentName,
+    });
+    await prepareLocalAgentPlannedMessagesSidecarIfPossible({ job, agentFolder, metadata });
     await mkdir(join(agentFolder.directoryPath, 'messages', 'queued'), { recursive: true });
     await writeFile(queuedMessagePath, createLocalChatQueuedMessageBook({ messages: threadMessages }), 'utf-8');
 
@@ -207,6 +225,38 @@ async function enqueueLocalUserChatJobWithinTerminalCapture(
     return { didMutate: true, outcome: 'queued' };
 }
 
+/**
+ * Creates the optional TEAM workspace without preventing a normal answer when a teammate cannot be resolved.
+ */
+async function prepareLocalTeamConversationWorkspaceIfPossible(
+    options: Parameters<typeof prepareLocalTeamConversationWorkspace>[0],
+): Promise<void> {
+    try {
+        await prepareLocalTeamConversationWorkspace(options);
+    } catch (error) {
+        console.warn('[local-chat-runner] team_workspace_prepare_failed', {
+            agentPermanentId: options.job.agentPermanentId,
+            error,
+        });
+    }
+}
+
+/**
+ * Prepares the planned-message sidecar without preventing an answer when planned messages cannot be read.
+ */
+async function prepareLocalAgentPlannedMessagesSidecarIfPossible(
+    options: Parameters<typeof prepareLocalAgentPlannedMessagesSidecar>[0],
+): Promise<void> {
+    try {
+        await prepareLocalAgentPlannedMessagesSidecar(options);
+    } catch (error) {
+        console.warn('[local-chat-runner] planned_messages_sidecar_prepare_failed', {
+            agentPermanentId: options.job.agentPermanentId,
+            error,
+        });
+    }
+}
+
 /**
  * Synchronizes one already queued local job with message-folder output.
  */
@@ -224,13 +274,40 @@ async function synchronizeLocalUserChatJob(
         });
 
         if (content) {
-            await persistLocalUserChatJobRunReportIfPresent(job, agentDirectoryPath, metadata);
+            const runReport = await persistLocalUserChatJobRunReportIfPresent(job, agentDirectoryPath, metadata);
+            const executionTiming = resolveUserChatJobExecutionTiming(runReport);
+            // Note: Planned messages are applied before the answer becomes terminal, so a wake-up the
+            //       agent announced in its answer is already stored when the answer becomes visible.
+            const appliedPlannedMessageCommands = await applyLocalAgentPlannedMessageCommandsIfPossible({
+                job,
+                agentDirectoryPath,
+                metadata,
+            });
+            const teamConversations = await parseFinishedLocalTeamConversations({
+                agentDirectoryPath,
+                metadata,
+                job,
+            });
+            const teamToolCalls = await persistLocalTeamConversations({
+                job,
+                conversations: teamConversations,
+            });
+            const chipToolCalls = await createAnsweredMessageChipToolCallsIfPossible({
+                job,
+                appliedPlannedMessageCommands,
+                touchedProjectNames: runReport?.touchedProjectNames || [],
+                projectChanges: runReport?.projectChanges || [],
+                touchedExternalSources: runReport?.touchedExternalSources || [],
+            });
+            const toolCalls = [...teamToolCalls, ...chipToolCalls];
             await persistUserChatJobTerminalState({
                 job,
                 status: 'COMPLETED',
                 provider: LOCAL_USER_CHAT_JOB_PROVIDER,
                 content,
-                generationDurationMs: resolveLocalUserChatJobDurationMs(metadata.queuedAt),
+                toolCalls: toolCalls.length > 0 ? toolCalls : undefined,
+                executedAt: executionTiming?.executedAt,
+                generationDurationMs: executionTiming?.generationDurationMs,
             });
             return { didMutate: true, outcome: 'completed' };
         }
@@ -247,26 +324,26 @@ async function synchronizeLocalUserChatJob(
             return { didMutate: false, outcome: 'waiting' };
         }
 
+        await removeLocalAgentPlannedMessagesSidecar(agentDirectoryPath, metadata);
         await persistUserChatJobTerminalState({
             job,
             status: 'FAILED',
             provider: LOCAL_USER_CHAT_JOB_PROVIDER,
             failureReason,
             failureDetails: createLocalUserChatJobFailureDetails(job, failureReason, 'localRunnerFailedFile'),
-            generationDurationMs: resolveLocalUserChatJobDurationMs(metadata.queuedAt),
         });
         return { didMutate: true, outcome: 'failed' };
     }
 
     if (isLocalUserChatJobTimedOut(metadata) && job.status !== 'FAILED') {
         const failureReason = 'Local agent runner did not finish the queued message within 30 minutes.';
+        await removeLocalAgentPlannedMessagesSidecar(agentDirectoryPath, metadata);
         await persistUserChatJobTerminalState({
             job,
             status: 'FAILED',
             provider: LOCAL_USER_CHAT_JOB_PROVIDER,
             failureReason,
             failureDetails: createLocalUserChatJobFailureDetails(job, failureReason, 'localRunnerTimeout'),
-            generationDurationMs: resolveLocalUserChatJobDurationMs(metadata.queuedAt),
         });
         return { didMutate: true, outcome: 'failed' };
     }
@@ -284,28 +361,34 @@ async function synchronizeLocalUserChatJob(
  *
  * The report is best-effort telemetry shown in the admin task details, so any read or
  * persistence failure only logs a warning instead of failing the finished chat answer.
+ *
+ * @returns The report of the answered message, or `null` when the runner wrote none.
  */
 async function persistLocalUserChatJobRunReportIfPresent(
     job: UserChatJobRecord,
     agentDirectoryPath: string,
     metadata: LocalUserChatJobMetadata,
-): Promise<void> {
+): Promise<AgentMessageRunReport | null> {
     try {
         const reportFileContent = await readOptionalTextFile(
             join(agentDirectoryPath, buildAgentMessageRunReportPath(metadata.finishedPath)),
         );
         const report = reportFileContent === null ? null : parseAgentMessageRunReport(reportFileContent);
         if (!report) {
-            return;
+            return null;
         }
 
         await persistUserChatJobRunReport(job, report);
+
+        return report;
     } catch (error) {
         console.warn('[local-chat-runner] run_report_sync_failed', {
             chatId: job.chatId,
             jobId: job.id,
             error,
         });
+
+        return null;
     }
 }
 
@@ -420,9 +503,65 @@ async function removeQueuedLocalMessageIfPresent(metadata: LocalUserChatJobMetad
         return;
     }
 
-    await rm(join(resolveLocalAgentRootPath(), metadata.agentDirectoryName, metadata.queuedPath), {
-        force: true,
-    }).catch(() => undefined);
+    const agentDirectoryPath = join(resolveLocalAgentRootPath(), metadata.agentDirectoryName);
+
+    await rm(join(agentDirectoryPath, metadata.queuedPath), { force: true }).catch(() => undefined);
+    await removeLocalAgentPlannedMessagesSidecar(agentDirectoryPath, metadata);
+}
+
+/**
+ * Applies planned-message commands without preventing an already answered message from completing.
+ *
+ * @returns The applied commands, or an empty list when the sidecar could not be applied.
+ */
+async function applyLocalAgentPlannedMessageCommandsIfPossible(
+    options: Parameters<typeof applyLocalAgentPlannedMessageCommands>[0],
+): Promise<ReadonlyArray<AppliedAgentPlannedMessageCommand>> {
+    try {
+        return await applyLocalAgentPlannedMessageCommands(options);
+    } catch (error) {
+        console.warn('[local-chat-runner] planned_messages_sidecar_apply_failed', {
+            chatId: options.job.chatId,
+            jobId: options.job.id,
+            error,
+        });
+
+        return [];
+    }
+}
+
+/**
+ * Builds the chips of one answered message without preventing it from completing.
+ *
+ * The chips only enrich the answer, so a failure to resolve them never hides an answer the
+ * agent already produced.
+ *
+ * @returns Tool calls rendered as chips below the answer, or an empty list when they failed.
+ */
+async function createAnsweredMessageChipToolCallsIfPossible(options: {
+    readonly job: UserChatJobRecord;
+    readonly appliedPlannedMessageCommands: ReadonlyArray<AppliedAgentPlannedMessageCommand>;
+    readonly touchedProjectNames: ReadonlyArray<string>;
+    readonly projectChanges: ReadonlyArray<AgentMessageProjectChange>;
+    readonly touchedExternalSources: ReadonlyArray<AgentMessageTouchedExternalSource>;
+}): Promise<ReadonlyArray<ToolCall>> {
+    try {
+        return await createAnsweredMessageChipToolCalls({
+            agentPermanentId: options.job.agentPermanentId,
+            appliedPlannedMessageCommands: options.appliedPlannedMessageCommands,
+            touchedProjectNames: options.touchedProjectNames,
+            projectChanges: options.projectChanges,
+            touchedExternalSources: options.touchedExternalSources,
+        });
+    } catch (error) {
+        console.warn('[local-chat-runner] message_chips_build_failed', {
+            chatId: options.job.chatId,
+            jobId: options.job.id,
+            error,
+        });
+
+        return [];
+    }
 }
 
 /**
@@ -448,18 +587,6 @@ function isLocalUserChatJobTimedOut(metadata: LocalUserChatJobMetadata): boolean
     return Number.isFinite(queuedAtMs) && Date.now() - queuedAtMs >= LOCAL_USER_CHAT_JOB_ANSWER_TIMEOUT_MS;
 }
 
-/**
- * Resolves elapsed time since the local message was queued.
- */
-function resolveLocalUserChatJobDurationMs(queuedAt: string): number | undefined {
-    const queuedAtMs = Date.parse(queuedAt);
-    if (!Number.isFinite(queuedAtMs)) {
-        return undefined;
-    }
-
-    return Math.max(0, Date.now() - queuedAtMs);
-}
-
 /**
  * Returns true when one filesystem error indicates a missing path.
  */