@sema-agent/core 1.302.1 → 1.304.0

package/dist/core/runner/prepare-task.js

@@ -37,7 +37,11 @@ import { compileOutputSchema } from "./strict-output-schema.js";
 import { TOOL_SEARCH_NAME, buildDeferredRegistry, classifyDeferred, extractDiscoveredToolNames, makePlaceholderTool, makeToolSearchTool, } from "./tool-disclosure.js";
 import { composeMemoryBlock, normalizeMemorySpec } from "../memory.js";
 import {} from "./memory-consolidation.js";
-import { composeSystemPrompt, composeConstitution, defaultPromptProvider, buildEnvironmentContext, buildGitSnapshot, formatLocalDate, isValidTimeZone, CYBER_RISK, URL_SAFETY, DEFAULT_SYSTEM_PROMPT, PROJECT_CONTEXT_FRAMING } from "../../prompts/default.js";
+import { defaultPromptProvider, buildEnvironmentContext, buildGitSnapshot, formatLocalDate, isValidTimeZone, PROJECT_CONTEXT_FRAMING } from "../../prompts/default.js";
+import { assemblePrompt } from "../../prompt-assembly/assemble.js";
+import { projectToolManifest } from "../../prompt-assembly/tool-catalog.js";
+import { resolveEpochAgainstBundled } from "../../prompt-assembly/epoch.js";
+import { SEMA_DEFAULT_PACK } from "../../prompt-assembly/packs/sema-default.js";
 import { clearStaleToolResults, dropEmptyFailureAssistants, editBudget } from "../context-edit.js";
 import { capAggregateToolResults } from "../tool-result-budget.js";
 import { capAggregateMediaBytes, AGGREGATE_MEDIA_BUDGET_BYTES } from "../media-byte-cap.js";
@@ -285,7 +289,19 @@ export async function prepareTask(spec, deps, sessions, resume, _memorySelector,
                         e.code = "resume_at.before_target_not_user";
                         throw e;
                     }
-                    if (entry.parentId === null) {
+                    let ancestorId = entry.parentId;
+                    let sawConversationAbove = false;
+                    while (ancestorId !== null) {
+                        const ancestor = await session.getEntry(ancestorId);
+                        if (!ancestor)
+                            break;
+                        if (ancestor.type === "message" || ancestor.type === "custom_message") {
+                            sawConversationAbove = true;
+                            break;
+                        }
+                        ancestorId = ancestor.parentId;
+                    }
+                    if (!sawConversationAbove) {
                         const e = new Error(`resumeAt entry "${spec.resumeAt}" is the session's first message; resumeAtMode "before" cannot rewind past the session root — start a NEW session instead`);
                         e.code = "resume_at.before_root_unsupported";
                         throw e;
@@ -310,6 +326,14 @@ export async function prepareTask(spec, deps, sessions, resume, _memorySelector,
     }
     const sessionId = acquired.sessionId;
     const hostTaskId = spec.taskId ?? sessionId;
+    {
+        const pinned = await session.getPromptEpoch();
+        const resolved = resolveEpochAgainstBundled(pinned, SEMA_DEFAULT_PACK);
+        if (resolved.migrated) {
+            const activatedBy = pinned === undefined && !spec.sessionId ? "session_start" : "legacy_migration";
+            await session.appendPromptEpoch({ ...resolved.descriptor, activatedBy });
+        }
+    }
     if (compModel !== undefined) {
         const compWindow = compModel.contextTokens ?? compModel.contextWindow;
         const mainWindow = model.autoCompactTokens ?? model.contextTokens ?? model.contextWindow;
@@ -1265,7 +1289,8 @@ export async function prepareTask(spec, deps, sessions, resume, _memorySelector,
             if (spec.sessionId) {
                 try {
                     const branch = await session.getBranch();
-                    if (branch.length === 0)
+                    const hasConversation = branch.some((e) => e.type === "message" || e.type === "custom_message" || e.type === "compaction");
+                    if (!hasConversation)
                         projectMemoryPhase = "fresh";
                     else {
                         for (let i = branch.length - 1; i >= 0; i--) {
@@ -1458,76 +1483,37 @@ export async function prepareTask(spec, deps, sessions, resume, _memorySelector,
                 }
             }
         }
-        let systemPrompt;
-        let renderWithDate;
-        const promptCtx = { userSystemPrompt, userAppendSystemPrompt, tools, memoryEnabled: false, consolidationEnabled: false, ...featureFlags };
-        let promptConstitution = "core";
-        let promptBlocks = [];
-        const finishStable = (stableCore) => {
-            const stable = composeSystemPrompt(stableCore, mcpInstructionsBlock);
-            if (mcpInstructionsBlock?.trim())
-                promptBlocks.push({ id: "mcp.instructions", text: mcpInstructionsBlock });
-            renderWithDate = (date) => composeSystemPrompt(composeSystemPrompt(stable, buildEnvironmentContext({ ...envFacts, date }) || undefined), memoryBlock);
-            systemPrompt = renderWithDate(envFacts.date);
-            const envBlock = buildEnvironmentContext({ ...envFacts, date: envFacts.date });
-            if (envBlock?.trim())
-                promptBlocks.push({ id: "env.context", text: envBlock });
-            if (memoryBlock?.trim())
-                promptBlocks.push({ id: "memory.tail", text: memoryBlock });
-        };
-        if (provider === defaultPromptProvider) {
-            const c = composeConstitution(userSystemPrompt ?? DEFAULT_SYSTEM_PROMPT, promptCtx);
-            promptBlocks = [...c.blocks];
-            finishStable(c.text);
-        }
-        else if (provider.stableSystem) {
-            const roleOut = provider.stableSystem(promptCtx);
-            if (provider.replaceAll) {
-                promptConstitution = "replaced";
-                promptBlocks = [{ id: "provider.replace_all", text: roleOut }];
-                finishStable(roleOut);
-            }
-            else if (roleOut.includes(CYBER_RISK) && roleOut.includes(URL_SAFETY) && roleOut.includes("# Harness")) {
-                promptConstitution = "provider-assembled";
-                promptBlocks = [{ id: "provider.assembled", text: roleOut }];
-                deps.onError?.(new Error("prompt-constitution: this PromptProvider returns an already-assembled prompt (constitution anchor found). Core now appends the constitution structurally — return ONLY the role base from stableSystem (or set replaceAll:true to own the whole base). Passed through un-doubled."), { phase: "prompt-constitution", sessionId });
-                finishStable(roleOut);
-            }
-            else {
-                const c = composeConstitution(roleOut, promptCtx);
-                promptBlocks = [...c.blocks];
-                finishStable(c.text);
-            }
-        }
-        else if (provider.system) {
-            systemPrompt = provider.system({ ...promptCtx, memoryBlock });
-            promptConstitution = "legacy";
-            promptBlocks = [{ id: "provider.legacy", text: systemPrompt }];
-            const memTrim = memoryBlock?.trim();
-            if (memTrim && systemPrompt.includes(memTrim) && !systemPrompt.trimEnd().endsWith(memTrim)) {
-                deps.onError?.(new Error("prompt-cache: the <user_memory> block is not at the END of the system prompt — the cacheable prefix changes every turn, so vLLM/Anthropic prefix caching will miss. Put memoryBlock LAST (STABLE→VARIABLE), or implement PromptProvider.stableSystem and let core place memory."), { phase: "prompt-cache", sessionId });
-            }
-        }
-        else {
-            const c = composeConstitution(userSystemPrompt ?? DEFAULT_SYSTEM_PROMPT, promptCtx);
-            promptBlocks = [...c.blocks];
-            finishStable(c.text);
-        }
-        if (model.promptGuidance && model.promptGuidance.length > 0) {
-            const guidance = model.promptGuidance.join("\n\n");
-            const baseRender = renderWithDate;
-            if (baseRender) {
-                renderWithDate = (date) => composeSystemPrompt(baseRender(date), guidance);
-                systemPrompt = renderWithDate(envFacts.date);
-            }
-            else {
-                systemPrompt = composeSystemPrompt(systemPrompt, guidance) ?? systemPrompt;
+        const assembled = assemblePrompt({
+            provider,
+            isDefaultProvider: provider === defaultPromptProvider,
+            userSystemPrompt,
+            userAppendSystemPrompt,
+            tools,
+            facts: { supervisorEnabled: false, ...featureFlags },
+            mcpInstructionsBlock,
+            memoryBlock,
+            buildEnvBlock: (date) => buildEnvironmentContext({ ...envFacts, date }) || undefined,
+            date: envFacts.date,
+            ...(model.promptGuidance && model.promptGuidance.length > 0 ? { modelGuidance: model.promptGuidance.join("\n\n") } : {}),
+            onWarn: (message, phase) => deps.onError?.(new Error(message), { phase, sessionId }),
+        });
+        let systemPrompt = assembled.systemPrompt;
+        const renderWithDate = assembled.renderWithDate
+            ? (date) => {
+                systemPrompt = assembled.renderWithDate(date);
+                return systemPrompt;
             }
-            promptBlocks.push({ id: "model.guidance", text: guidance });
-        }
+            : undefined;
+        const promptConstitution = assembled.constitution;
+        const promptBlocks = assembled.legacyBlocks;
+        const saltedHash = (text) => createHash("sha256").update(PROMPT_HASH_SALT).update(text).digest("hex").slice(0, 12);
         const promptManifest = {
             constitution: promptConstitution,
-            blocks: promptBlocks.map((b) => ({ id: b.id, chars: b.text.length, hash: createHash("sha256").update(PROMPT_HASH_SALT).update(b.text).digest("hex").slice(0, 12) })),
+            blocks: promptBlocks.map((b) => ({ id: b.id, chars: b.text.length, hash: saltedHash(b.text) })),
+            ...(assembled.sections
+                ? { sections: assembled.sections.map((s) => ({ id: s.id, slot: s.slot, carrier: s.carrier, cadence: s.cadence, cacheClass: s.cacheClass, chars: s.text.length, hash: saltedHash(s.text) })) }
+                : {}),
+            tools: projectToolManifest(tools, (t) => (t.name.startsWith("mcp__") ? "mcp" : "caller")),
         };
         const userToolNames = (spec.tools ?? []).map((t) => t.name);
         const mcpToolNames = mcp.tools.map((t) => t.name);