@sema-agent/core 1.299.1 → 1.301.0

package/dist/core/runner/prompt-suggestions.js

@@ -1,5 +1,6 @@
 import { brainToRuntime } from "../runtime.js";
 import { cacheFamilyOf, usageCostMicroUsd } from "./usage-accounting.js";
+import { cutEnginePrefix, cutEngineSegments, flattenableUserText } from "../untrusted-text.js";
 const SUGGESTION_MAX_CHARS = 200;
 const SUGGEST_SYSTEM_PROMPT = `You suggest plausible NEXT prompts a user might send to continue this conversation.
 
@@ -13,8 +14,19 @@ function renderTranscript(messages) {
     for (const m of messages) {
         const role = m.role;
         if (role === "user") {
-            const content = m.content;
-            const text = typeof content === "string" ? content : extractText(content);
+            const um = m;
+            if (um.engineMinted === true || um.provenance === "engine-note")
+                continue;
+            const content = um.content;
+            const flat = flattenableUserText(content);
+            let text;
+            if (flat === undefined) {
+                text = typeof content === "string" ? content : extractText(content);
+            }
+            else {
+                const bySegments = cutEngineSegments(flat, um.engineSegments);
+                text = bySegments.malformed ? flat : bySegments.cut ? bySegments.text : cutEnginePrefix(flat, um.enginePrefixChars).text;
+            }
             if (text.trim())
                 lines.push(`USER: ${text.trim()}`);
         }

package/dist/core/runner/prompt-suggestions.js.map

@@ -1 +1 @@
-{"version":3,"file":"prompt-suggestions.js","sourceRoot":"","sources":["../../../src/core/runner/prompt-suggestions.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"prompt-suggestions.js","sourceRoot":"","sources":["../../../src/core/runner/prompt-suggestions.ts"],"names":[],"mappings":"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"}

package/dist/core/runner/runtask.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"runtask.d.ts","sourceRoot":"","sources":["../../../src/core/runner/runtask.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAoB,KAAK,EAAE,MAAM,uBAAuB,CAAC;AACrE,OAAO,EAQL,KAAK,UAAU,EAEf,KAAK,eAAe,EACpB,KAAK,YAAY,EAGjB,KAAK,aAAa,EACnB,MAAM,wBAAwB,CAAC;AAChC,OAAO,KAAK,EAAgC,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAOpF,OAAO,EAAmB,KAAK,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAavE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAwBlD,OAAO,KAAK,EAAE,eAAe,EAAsC,UAAU,EAAE,SAAS,EAAE,UAAU,EAAE,QAAQ,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAwBhJ,eAAO,MAAM,iBAAiB,OAAO,CAAC;AA4HtC,MAAM,MAAM,gBAAgB,GAAG,IAAI,CAAC,QAAQ,EAAE,WAAW,GAAG,WAAW,CAAC,CAAC;AAGzE,UAAU,SAAS;IACjB,EAAE,EAAE,UAAU,CAAC;IAQf,OAAO,EAAE,OAAO,CAAC,aAAa,EAAE;QAAE,IAAI,EAAE,YAAY,GAAG,gBAAgB,GAAG,gBAAgB,GAAG,aAAa,GAAG,MAAM,CAAA;KAAE,CAAC,CAAC;IAMvH,WAAW,CAAC,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,OAAO,CAAA;KAAE,CAAC;IASjD,kBAAkB,CAAC,EAAE,CAAC,MAAM,EAAE,YAAY,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;CAC9D;AAgMD,qBAAa,MAAM;IACjB,OAAO,CAAC,IAAI,CAAa;IACzB,QAAQ,CAAC,QAAQ,EAAE,YAAY,CAAC;IAEhC,OAAO,CAAC,YAAY,CAAoC;IAOxD,OAAO,CAAC,qBAAqB,CAA6B;IAK1D,OAAO,CAAC,QAAQ,CAAC,2BAA2B,CAAqC;IAYjF,OAAO,CAAC,QAAQ,CAAC,wBAAwB,CAA+E;IACxH,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,8BAA8B,CAAQ;gBAElD,IAAI,EAAE,UAAU;IA+E5B,eAAe,CAAC,OAAO,EAAE,WAAW,GAAG,IAAI;IAS3C,IAAI,YAAY,IAAI;QAAE,MAAM,CAAC,EAAE,eAAe,EAAE,CAAC;QAAC,aAAa,CAAC,EAAE,OAAO,CAAC;QAAC,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,CAAA;KAAE,CAU1G;IAOD,IAAI,YAAY,IAAI;QAAE,UAAU,CAAC,EAAE,UAAU,CAAC,YAAY,CAAC,CAAC;QAAC,KAAK,CAAC,EAAE,UAAU,CAAC,OAAO,CAAC,CAAA;KAAE,CAsCzF;YAGa,kBAAkB;IA4BhC,aAAa,CAAC,IAAI,EAAE,QAAQ,EAAE,MAAM,CAAC,EAAE,SAAS,EAAE,SAAS,CAAC,EAAE,YAAY,GAAG,UAAU;YAygBzE,SAAS;YA84GT,iBAAiB;YAsGjB,kBAAkB;YAsElB,YAAY;IA0EpB,OAAO,CAAC,IAAI,EAAE,QAAQ,EAAE,SAAS,CAAC,EAAE,YAAY,GAAG,OAAO,CAAC,UAAU,CAAC;IAmDtE,MAAM,CACV,KAAK,EAAE,eAAe,EACtB,OAAO,EAAE,aAAa,EACtB,UAAU,EAAE,gBAAgB,GAC3B,OAAO,CAAC,UAAU,CAAC;IAyBhB,YAAY,CAChB,KAAK,EAAE,eAAe,EACtB,OAAO,EAAE,aAAa,EACtB,UAAU,EAAE,gBAAgB,EAoB5B,SAAS,CAAC,EAAE,YAAY,GACvB,OAAO,CAAC,UAAU,CAAC;YA+XR,mBAAmB;YAkGnB,kBAAkB;IAqIhC,OAAO,CAAC,sBAAsB;YA6BhB,kBAAkB;IAgDhC,OAAO,CAAC,qBAAqB;IAwD7B,OAAO,CAAC,qBAAqB;YAKf,MAAM;YAoHN,gBAAgB;CAc/B;AAGD,wBAAgB,OAAO,CAAC,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,UAAU,GAAG,OAAO,CAAC,UAAU,CAAC,CAE7E;AA8CD,YAAY,EAAE,SAAS,EAAE,UAAU,EAAE,CAAC"}
+{"version":3,"file":"runtask.d.ts","sourceRoot":"","sources":["../../../src/core/runner/runtask.ts"],"names":[],"mappings":"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"}

package/dist/core/runner/runtask.js

@@ -20,10 +20,10 @@ import { advanceCursorAfterInline } from "../consolidate-scope.js";
 import { PushQueue } from "../push-queue.js";
 import { TtlSessionStore } from "../session-store.js";
 import { toImageContent } from "./image.js";
-import { OUTPUT_TOOL_NAME, resolveOutputRetries } from "./synthetic-tools.js";
+import { OUTPUT_TOOL_NAME, SKILLS_LISTING_PROBE_HEADER, resolveOutputRetries } from "./synthetic-tools.js";
 import { cacheFamilyOf, usageCostMicroUsd } from "./usage-accounting.js";
 import { assembleResult, errorCodeOf } from "./assemble-result.js";
-import { ATTACHMENT_BYTE_CAP, CHANGED_FILES_MAX, advanceCadenceClock, agentListingDeltaHeader, agentListingInitialHeader, collectDateChange, collectDueAttachments, commitAgentListing, createAttachmentState, rebaseCadenceWindows, reduceToolEnd, renderAgentListingDelta, renderMcpInstructionsDelta, renderOrphanedBackgroundTasks, renderToolsDelta, stampWriteAnchor } from "./turn-attachments.js";
+import { ATTACHMENT_BYTE_CAP, CHANGED_FILES_MAX, SKILLS_LISTING_DELTA_HEADER, advanceCadenceClock, agentListingDeltaHeader, agentListingInitialHeader, collectDateChange, collectDueAttachments, commitAgentListing, commitSkillsListing, createAttachmentState, rebaseCadenceWindows, reduceToolEnd, renderAgentListingDelta, renderMcpInstructionsDelta, renderOrphanedBackgroundTasks, renderSkillsListingDelta, renderToolsDelta, stampWriteAnchor } from "./turn-attachments.js";
 import { prepareTask } from "./prepare-task.js";
 import { hasVerifiableStructureSignal } from "./grounding-signal.js";
 import { hasDestroy, isIsolated } from "../remote-env.js";
@@ -34,6 +34,7 @@ import { reconcileInterruptedSession } from "../session-reconcile.js";
 import { RunnerSharedToolResultStore } from "../tool-result-store.js";
 import { formatDiagnosticsBlock } from "../lsp-diagnostics.js";
 import { canonicalToolName } from "../tool-name-aliases.js";
+import { toolPolicyNameSets } from "../tool-policy.js";
 import { defaultTaskRegistry } from "../task-registry.js";
 import { discloseDroppedPending, PendingSessionNotifications, renderTaskNotificationXml, SystemInjectionQueue, taskNotificationDedupKey } from "../task-notification.js";
 import { ToolDetachHub } from "../tool-detach.js";
@@ -289,7 +290,17 @@ export class Runner {
             : undefined;
         return {
             ...(deps.toolPolicy !== undefined
-                ? { toolPolicy: { check: (req, signal) => deps.toolPolicy.check(req, signal) } }
+                ? {
+                    toolPolicy: (() => {
+                        const sets = toolPolicyNameSets(deps.toolPolicy);
+                        const wrapped = {
+                            check: (req, signal) => deps.toolPolicy.check(req, signal),
+                        };
+                        if (sets.length > 0)
+                            wrapped.nameSets = sets;
+                        return wrapped;
+                    })(),
+                }
                 : {}),
             ...(hooks !== undefined ? { hooks } : {}),
         };
@@ -504,7 +515,7 @@ export class Runner {
                 }
                 const payload = options?.trusted ? formatHookFeedback(text) : text;
                 try {
-                    await h.harness.steer(payload);
+                    await h.harness.steer(payload, { provenance: "engine-note" });
                 }
                 catch (e) {
                     if (e instanceof Error && e.code === "invalid_state") {
@@ -637,7 +648,9 @@ export class Runner {
             queue.push({ type: "task_notification", notification: item.payload, ...notificationIdent() });
             if (notificationHarness) {
                 const xml = renderTaskNotificationXml(item.payload);
-                const deliver = item.priority === "later" ? notificationHarness.followUp(xml) : notificationHarness.steer(xml);
+                const deliver = item.priority === "later"
+                    ? notificationHarness.followUp(xml, { provenance: "engine-note" })
+                    : notificationHarness.steer(xml, { provenance: "engine-note" });
                 void deliver.catch(() => {
                     if (notificationSessionId !== undefined)
                         this.pendingSessionNotifications.pend(notificationSessionId, item.payload);
@@ -683,7 +696,7 @@ export class Runner {
                 for (const payload of discloseDroppedPending(pendingIdle)) {
                     deliveredAtTurnOpen.add(taskNotificationDedupKey(payload));
                     queue.push({ type: "task_notification", notification: payload });
-                    void prepared.harness.nextTurn(renderTaskNotificationXml(payload)).catch(() => {
+                    void prepared.harness.nextTurn(renderTaskNotificationXml(payload), { provenance: "engine-note" }).catch(() => {
                         this.pendingSessionNotifications.pend(prepared.sessionId, payload);
                     });
                 }
@@ -805,7 +818,10 @@ export class Runner {
         let groundingSignalPreR9 = false;
         let groundingSignalPostR9 = false;
         const attachmentsCfg = spec.attachments;
-        const attachState = attachmentsCfg !== undefined ? createAttachmentState() : undefined;
+        const agentListingOn = attachmentsCfg?.agentListing !== false;
+        const skillsListingOn = attachmentsCfg?.skillsListing !== false;
+        const listingsLive = (agentListingOn && prepared.agentListing !== undefined) || (skillsListingOn && prepared.skillsListing !== undefined);
+        const attachState = attachmentsCfg !== undefined || listingsLive ? createAttachmentState() : undefined;
         const dateState = prepared.dateChange !== undefined ? { announcedDate: prepared.dateChange.legDate } : undefined;
         let cadenceTurns = 0;
         let lastTurnHadToolCalls = false;
@@ -825,33 +841,61 @@ export class Runner {
             catch {
             }
         }
-        if (attachState !== undefined && attachmentsCfg?.agentListing === true && prepared.agentListing?.seedAnnounced === true) {
-            const listing = prepared.agentListing;
-            try {
-                const headers = [agentListingInitialHeader(listing.toolName), agentListingDeltaHeader(listing.toolName)];
-                const textOf = (m) => {
-                    const c = m.content;
-                    if (typeof c === "string")
-                        return c;
-                    if (Array.isArray(c)) {
-                        return c
-                            .map((b) => (b !== null && typeof b === "object" && b.type === "text" ? String(b.text ?? "") : ""))
-                            .join("\n");
+        if (attachState !== undefined &&
+            ((agentListingOn && prepared.agentListing?.seedAnnounced === true) ||
+                (skillsListingOn && prepared.skillsListing?.seedAnnounced === true))) {
+            const cpListings = resume?.cp.state.announcedListings;
+            const textOf = (m) => {
+                const c = m.content;
+                if (typeof c === "string")
+                    return c;
+                if (Array.isArray(c)) {
+                    return c
+                        .map((b) => (b !== null && typeof b === "object" && b.type === "text" ? String(b.text ?? "") : ""))
+                        .join("\n");
+                }
+                return "";
+            };
+            let branchTexts = null;
+            const branchIncludes = async (headers) => {
+                try {
+                    if (branchTexts === null) {
+                        const branch = await prepared.session.getBranch();
+                        branchTexts = branch.flatMap((e) => (e.type === "message" ? [textOf(e.message)] : []));
                     }
-                    return "";
-                };
-                const branch = await prepared.session.getBranch();
-                const delivered = branch.some((e) => {
-                    if (e.type !== "message")
-                        return false;
-                    const text = textOf(e.message);
-                    return headers.some((h) => text.includes(h));
-                });
-                if (delivered) {
+                    return branchTexts.some((text) => headers.some((h) => text.includes(h)));
+                }
+                catch {
+                    return false;
+                }
+            };
+            if (agentListingOn && prepared.agentListing?.seedAnnounced === true) {
+                const listing = prepared.agentListing;
+                if (cpListings?.agents !== undefined) {
+                    const descOf = new Map(listing.entries.map((e) => [e.name, e.description]));
+                    attachState.announcedAgentTypes = new Map(cpListings.agents.map((n) => [n, descOf.get(n) ?? ""]));
+                    prepared.announcedListingsRef.agents = [...cpListings.agents];
+                    if (cpListings.models !== undefined) {
+                        attachState.announcedModels = [...cpListings.models];
+                        prepared.announcedListingsRef.models = [...cpListings.models];
+                    }
+                }
+                else if (await branchIncludes([agentListingInitialHeader(listing.toolName), agentListingDeltaHeader(listing.toolName)])) {
                     attachState.announcedAgentTypes = new Map(listing.entries.map((e) => [e.name, e.description]));
+                    prepared.announcedListingsRef.agents = listing.entries.map((e) => e.name);
                 }
             }
-            catch {
+            if (skillsListingOn && prepared.skillsListing?.seedAnnounced === true) {
+                const listing = prepared.skillsListing;
+                if (cpListings?.skills !== undefined) {
+                    const descOf = new Map(listing.entries.map((e) => [e.name, e.description]));
+                    attachState.announcedSkills = new Map(cpListings.skills.map((n) => [n, descOf.get(n) ?? ""]));
+                    prepared.announcedListingsRef.skills = [...cpListings.skills];
+                }
+                else if (await branchIncludes([SKILLS_LISTING_PROBE_HEADER, SKILLS_LISTING_DELTA_HEADER])) {
+                    attachState.announcedSkills = new Map(listing.entries.map((e) => [e.name, e.description]));
+                    prepared.announcedListingsRef.skills = listing.entries.map((e) => e.name);
+                }
             }
         }
         if (spec.finalVerification === true && resume !== undefined) {
@@ -1174,7 +1218,7 @@ export class Runner {
                     prepared.callCapRef.finalizeMode = true;
                 if (!finalizeInjected) {
                     const finalizeText = buildFinalizeText();
-                    void prepared.harness.steer(finalizeText).catch(() => { });
+                    void prepared.harness.steer(finalizeText, { engineMinted: true }).catch(() => { });
                     finalizeInjected = true;
                     nudgeIdx = nudgeSchedule.length;
                     queue.push({ type: "steering_injected", source: "finalize", preview: finalizeText.slice(0, 220), ...ident() });
@@ -1503,6 +1547,7 @@ export class Runner {
                         return [
                             {
                                 role: "user",
+                                engineMinted: true,
                                 content: "<system-reminder>[final verification] Your tool calls in this run worked with raw bytes, structural parsing, " +
                                     "or checksum/digest computation — the deliverable very likely embeds verifiable structure (structural fields, an " +
                                     "embedded checksum-family value, reference data it must match, or a replayable deterministic path). You MUST " +
@@ -1519,6 +1564,7 @@ export class Runner {
                     return [
                         {
                             role: "user",
+                            engineMinted: true,
                             content: "<system-reminder>[final verification] Before finishing: re-verify the FINAL deliverable through its REAL entry point, " +
                                 "exactly as the acceptance criteria would exercise it — execute the binary/function/endpoint directly and read the ACTUAL " +
                                 "output and exit code. Do NOT rely on earlier self-tests, shell redirections, or assumptions (a program that prints to " +
@@ -1565,6 +1611,7 @@ export class Runner {
                 if (result?.additionalContext) {
                     messages.push({
                         role: "user",
+                        engineMinted: true,
                         content: formatHookFeedback(`Stop hook additional context: ${result.additionalContext}`),
                         timestamp: Date.now(),
                     });
@@ -1580,7 +1627,12 @@ export class Runner {
                         `Check ctx.stopHookActive in the hook and return success while it's true.`), { phase: "hook", sessionId: prepared.sessionId });
                     return [];
                 }
-                messages.push({ role: "user", content: formatHookFeedback(`Stop hook stopped continuation: ${result.block}`), timestamp: Date.now() });
+                messages.push({
+                    role: "user",
+                    engineMinted: true,
+                    content: formatHookFeedback(`Stop hook stopped continuation: ${result.block}`),
+                    timestamp: Date.now(),
+                });
                 return messages;
             });
         }
@@ -1708,7 +1760,7 @@ export class Runner {
                         prepared.callCapRef.finalizeMode = true;
                         nudgeIdx = nudgeSchedule.length;
                         const finalizeText = buildFinalizeText();
-                        void prepared.harness.steer(finalizeText).catch(() => { });
+                        void prepared.harness.steer(finalizeText, { engineMinted: true }).catch(() => { });
                         boundarySteered = true;
                         queue.push({ type: "steering_injected", source: "finalize", preview: finalizeText.slice(0, 220), ...ident() });
                     }
@@ -1718,7 +1770,7 @@ export class Runner {
                     due = nudgeSchedule[nudgeIdx++];
                 }
                 if (due) {
-                    void prepared.harness.steer(due.text).catch(() => { });
+                    void prepared.harness.steer(due.text, { engineMinted: true }).catch(() => { });
                     nudgesSent += 1;
                     boundarySteered = true;
                     queue.push({ type: "steering_injected", source: "deadline_nudge", preview: due.text.slice(0, 220), ...ident() });
@@ -1769,23 +1821,23 @@ export class Runner {
                 if (files.length > 0) {
                     queue.push({ type: "diagnostics", files, isNew: true, ...ident() });
                     const block = formatDiagnosticsBlock(files);
-                    void prepared.harness.steer(block).catch(() => undefined);
+                    void prepared.harness.steer(block, { provenance: "engine-note" }).catch(() => undefined);
                     boundarySteered = true;
                 }
             }
             let boundaryAttachmentBytes = 0;
             let attachmentsPayload;
-            if ((dateState !== undefined || (attachState !== undefined && attachmentsCfg !== undefined)) &&
+            if ((dateState !== undefined || attachState !== undefined) &&
                 !boundarySteered &&
                 !finalizeInjected &&
                 finalVerifyInjections === 0 &&
                 !prepared.abortController.signal.aborted) {
                 const due = [];
-                if (attachState !== undefined && attachmentsCfg !== undefined) {
-                    const changedFilesOn = Boolean(attachmentsCfg.changedFiles);
+                if (attachState !== undefined) {
+                    const changedFilesOn = Boolean(attachmentsCfg?.changedFiles);
                     let changed;
                     if (changedFilesOn && prepared.detectExternalChanges !== undefined) {
-                        const maxFiles = typeof attachmentsCfg.changedFiles === "object"
+                        const maxFiles = typeof attachmentsCfg?.changedFiles === "object"
                             ? (attachmentsCfg.changedFiles.maxFiles ?? CHANGED_FILES_MAX)
                             : CHANGED_FILES_MAX;
                         const SCAN_CEILING_MS = 2_000;
@@ -1800,18 +1852,17 @@ export class Runner {
                             attachState.surfacedMtime.delete(p);
                         changed = scan.changed;
                     }
-                    const backgroundTasksOn = attachmentsCfg.backgroundTasks === true;
+                    const backgroundTasksOn = attachmentsCfg?.backgroundTasks === true;
                     const bgTasks = backgroundTasksOn && attachState.postCompactPending ? prepared.listBackgroundTasks() : undefined;
-                    const toolsDeltaOn = attachmentsCfg.toolsDelta === true;
+                    const toolsDeltaOn = attachmentsCfg?.toolsDelta === true;
                     const pendingTools = toolsDeltaOn && prepared.toolsDeltaRef !== undefined && prepared.toolsDeltaRef.pending.length > 0
                         ? [...prepared.toolsDeltaRef.pending]
                         : undefined;
-                    const agentListingOn = attachmentsCfg.agentListing === true;
-                    const mcpInstructionsOn = attachmentsCfg.mcpInstructions === true;
+                    const mcpInstructionsOn = attachmentsCfg?.mcpInstructions === true;
                     const mcpDelta = prepared.mcp.instructionsDelta;
                     const mcpAdds = mcpInstructionsOn && mcpDelta.pendingAdds.length > 0 ? [...mcpDelta.pendingAdds] : undefined;
                     const mcpRemovals = mcpInstructionsOn && mcpDelta.pendingRemovals.length > 0 ? [...mcpDelta.pendingRemovals] : undefined;
-                    const budgetUsdOn = attachmentsCfg.budgetUsd === true && maxCostMicroUsd !== undefined && lastTurnHadToolCalls;
+                    const budgetUsdOn = attachmentsCfg?.budgetUsd === true && maxCostMicroUsd !== undefined && lastTurnHadToolCalls;
                     due.push(...collectDueAttachments(attachState, {
                         turn: stats.turns,
                         cadenceTurn: cadenceTurns,
@@ -1819,14 +1870,15 @@ export class Runner {
                         taskListMounted: taskToolsMounted,
                         planActive: prepared.planModeRef.active,
                         config: {
-                            todoReminder: attachmentsCfg.todoReminder === true,
-                            ...(attachmentsCfg.todoReminderMode !== undefined ? { todoReminderMode: attachmentsCfg.todoReminderMode } : {}),
+                            todoReminder: attachmentsCfg?.todoReminder === true,
+                            ...(attachmentsCfg?.todoReminderMode !== undefined ? { todoReminderMode: attachmentsCfg.todoReminderMode } : {}),
                             changedFiles: changedFilesOn,
-                            planModeReminder: attachmentsCfg.planModeReminder === true,
+                            planModeReminder: attachmentsCfg?.planModeReminder === true,
                             budgetUsd: budgetUsdOn,
                             backgroundTasks: backgroundTasksOn,
                             toolsDelta: toolsDeltaOn,
                             agentListing: agentListingOn,
+                            skillsListing: skillsListingOn,
                             mcpInstructions: mcpInstructionsOn,
                         },
                         ...(changed !== undefined ? { changedFiles: changed } : {}),
@@ -1836,8 +1888,13 @@ export class Runner {
                         ...(bgTasks !== undefined ? { backgroundTasks: bgTasks } : {}),
                         ...(pendingTools !== undefined ? { newTools: pendingTools } : {}),
                         ...(agentListingOn && prepared.agentListing !== undefined
-                            ? { agentListing: prepared.agentListing.entries, agentToolName: prepared.agentListing.toolName }
+                            ? {
+                                agentListing: prepared.agentListing.entries,
+                                agentToolName: prepared.agentListing.toolName,
+                                ...(prepared.agentListing.models !== undefined ? { agentModels: prepared.agentListing.models } : {}),
+                            }
                             : {}),
+                        ...(skillsListingOn && prepared.skillsListing !== undefined ? { skillsListing: prepared.skillsListing.entries } : {}),
                         ...(mcpAdds !== undefined || mcpRemovals !== undefined
                             ? { mcpInstructions: { added: mcpAdds ?? [], removed: mcpRemovals ?? [] } }
                             : {}),
@@ -1854,9 +1911,20 @@ export class Runner {
                     }
                     if (agentListingOn && prepared.agentListing !== undefined && due.some((a) => a.source === "agent_listing")) {
                         const listing = prepared.agentListing;
-                        const intactBody = renderAgentListingDelta(attachState, listing.entries, listing.toolName);
+                        const intactBody = renderAgentListingDelta(attachState, listing.entries, listing.toolName, listing.models);
                         if (intactBody !== undefined && due.some((a) => a.source === "agent_listing" && a.body === intactBody)) {
-                            commitAgentListing(attachState, listing.entries);
+                            commitAgentListing(attachState, listing.entries, listing.models);
+                            prepared.announcedListingsRef.agents = listing.entries.map((e) => e.name);
+                            if (listing.models !== undefined)
+                                prepared.announcedListingsRef.models = [...listing.models];
+                        }
+                    }
+                    if (skillsListingOn && prepared.skillsListing !== undefined && due.some((a) => a.source === "skills_listing")) {
+                        const listing = prepared.skillsListing;
+                        const intactBody = renderSkillsListingDelta(attachState, listing.entries);
+                        if (intactBody !== undefined && due.some((a) => a.source === "skills_listing" && a.body === intactBody)) {
+                            commitSkillsListing(attachState, listing.entries);
+                            prepared.announcedListingsRef.skills = listing.entries.map((e) => e.name);
                         }
                     }
                 }
@@ -1908,7 +1976,7 @@ export class Runner {
             }
             if (attachmentsPayload !== undefined || batchContextBlock !== undefined) {
                 const payload = attachmentsPayload !== undefined && batchContextBlock !== undefined ? `${attachmentsPayload}\n${batchContextBlock}` : (attachmentsPayload ?? batchContextBlock);
-                void prepared.harness.steer(payload).catch(() => { });
+                void prepared.harness.steer(payload, { engineMinted: true }).catch(() => { });
             }
             const forceManual = manualCompactRef.requested;
             if ((!withinTaskCompaction && !forceManual) ||
@@ -2166,14 +2234,18 @@ export class Runner {
                             continuation += "\n\n" + formatHookFeedback(renderOrphanedBackgroundTasks(orphans));
                         }
                     }
+                    const engineSegments = continuation.length > 0 ? [{ start: 0, end: continuation.length }] : [];
                     for (const steer of [resume.cp.state.pendingSteer, resume.wakeMessage]) {
-                        if (steer) {
-                            continuation +=
-                                "\n\n" +
-                                    (steer.trusted ? formatHookFeedback(steer.text) : delimitUntrusted("supervisor steering message", steer.text));
-                        }
+                        if (steer === undefined)
+                            continue;
+                        const start = continuation.length;
+                        continuation +=
+                            "\n\n" +
+                                (steer.trusted ? formatHookFeedback(steer.text) : delimitUntrusted("supervisor steering message", steer.text));
+                        if (steer.trusted)
+                            engineSegments.push({ start, end: continuation.length });
                     }
-                    final = await withBrainSinks(() => prepared.harness.prompt(continuation));
+                    final = await withBrainSinks(() => prepared.harness.prompt(continuation, { engineSegments }));
                 }
             }
             else {
@@ -2190,6 +2262,43 @@ export class Runner {
                         effectiveObjective = `${formatHookFeedback(decision.additionalContext)}\n\n${spec.objective}`;
                     }
                 }
+                const firstFrames = [];
+                if (attachState !== undefined) {
+                    const attach = attachState;
+                    if (agentListingOn && prepared.agentListing !== undefined) {
+                        const listing = prepared.agentListing;
+                        const body = renderAgentListingDelta(attach, listing.entries, listing.toolName, listing.models);
+                        if (body !== undefined) {
+                            firstFrames.push({
+                                source: "agent_listing",
+                                body,
+                                commit: () => {
+                                    commitAgentListing(attach, listing.entries, listing.models);
+                                    prepared.announcedListingsRef.agents = listing.entries.map((e) => e.name);
+                                    if (listing.models !== undefined)
+                                        prepared.announcedListingsRef.models = [...listing.models];
+                                },
+                            });
+                        }
+                    }
+                    if (skillsListingOn && prepared.skillsListing !== undefined) {
+                        const listing = prepared.skillsListing;
+                        const body = renderSkillsListingDelta(attach, listing.entries);
+                        if (body !== undefined) {
+                            firstFrames.push({
+                                source: "skills_listing",
+                                body,
+                                commit: () => {
+                                    commitSkillsListing(attach, listing.entries);
+                                    prepared.announcedListingsRef.skills = listing.entries.map((e) => e.name);
+                                },
+                            });
+                        }
+                    }
+                    if (firstFrames.length > 0) {
+                        effectiveObjective = `${firstFrames.map((f) => `<system-reminder>\n${sanitizeUntrustedText(f.body)}\n</system-reminder>`).join("\n")}\n${effectiveObjective}`;
+                    }
+                }
                 const precallMicroUsd = maxCostMicroUsd === undefined
                     ? 0
                     : computeCostMicroUsd({
@@ -2209,7 +2318,16 @@ export class Runner {
                     const images = spec.images
                         ? await Promise.all(spec.images.map((img) => toImageContent(img, this.deps.allowImageUrl)))
                         : undefined;
-                    final = await withBrainSinks(() => prepared.harness.prompt(effectiveObjective, images && images.length > 0 ? { images } : undefined));
+                    for (const f of firstFrames) {
+                        f.commit();
+                        queue.push({ type: "steering_injected", source: f.source, preview: f.body.slice(0, 220), ...ident() });
+                    }
+                    attachmentsInjected += firstFrames.length;
+                    const enginePrefixChars = effectiveObjective.length - spec.objective.length;
+                    final = await withBrainSinks(() => prepared.harness.prompt(effectiveObjective, {
+                        ...(images && images.length > 0 ? { images } : {}),
+                        ...(enginePrefixChars > 0 ? { enginePrefixChars } : {}),
+                    }));
                 }
             }
             abortedLive = prepared.abortController.signal.aborted;
@@ -3001,7 +3119,7 @@ export class Runner {
                 dr.surfacedIds.add(id);
             for (const k of outcome.surfacedKeys)
                 dr.surfacedKeys.add(k);
-            await prepared.harness.steer(outcome.block);
+            await prepared.harness.steer(outcome.block, { provenance: "engine-note" });
         }
         catch {
         }