opencode-codex-memory 0.1.6 → 0.1.7

package/dist/src/llm.d.ts

@@ -15,5 +15,6 @@ export declare function extractViaSubagent(sessionId: string, transcript: string
 export declare function consolidateViaSubagent(memoryRoot: string, diffFileName: string, model?: string): Promise<void>;
 export declare function cleanupOldSubSessions(maxAgeMinutes?: number): Promise<void>;
 export declare function fillTemplate(tmpl: string, vars: Record<string, string>): string;
+export declare function buildConsolidationPrompt(memoryRoot: string, diffFileName: string): string;
 /** Parses the stage-1 JSON output. Returns null for the all-empty no-op response. */
 export declare function parseExtraction(raw: string): ExtractionResult | null;

package/dist/src/llm.js

@@ -209,10 +209,46 @@ function buildExtractionInput(sessionId, cwd, transcript) {
         transcript,
     });
 }
-function buildConsolidationPrompt(memoryRoot, diffFileName) {
+// codex lib.rs prompt_blocks: rendered into consolidation.md's
+// {{ memory_extensions_* }} placeholders when <memory_root>/extensions exists
+// (prompts.rs build_consolidation_prompt), empty strings otherwise.
+const EXTENSIONS_FOLDER_STRUCTURE = `
+Memory extensions (under {{ memory_extensions_root }}/):
+
+- <extension_name>/instructions.md
+  - Source-specific guidance for interpreting additional memory signals. If an
+    extension folder exists, you must read its instructions.md to determine how to use this memory
+    source.
+
+If the user has any memory extensions, you MUST read the instructions for each extension to
+determine how to use the memory source. If the workspace diff shows deleted extension resource files,
+remove stale memories derived only from those resources. If it has no extension folders, continue
+with the standard memory inputs only.
+`;
+const EXTENSIONS_PRIMARY_INPUTS = `
+Optional source-specific inputs:
+Under \`{{ memory_extensions_root }}/\`:
+
+- \`<extension_name>/instructions.md\`
+  - If extension folders exist, read each instructions.md first and follow it when interpreting
+    that extension's memory source.
+
+If the workspace diff shows deleted memory extension resources, use that extension-specific deletion
+signal to remove stale memories derived only from those resources.
+`;
+export function buildConsolidationPrompt(memoryRoot, diffFileName) {
+    const extensionsRoot = path.join(memoryRoot, "extensions");
+    let extensionsExist = false;
+    try {
+        extensionsExist = fs.statSync(extensionsRoot).isDirectory();
+    }
+    catch { }
+    const blockVars = { memory_extensions_root: extensionsRoot };
     return fillTemplate(readTemplate("consolidation.md"), {
         memory_root: memoryRoot,
         phase2_workspace_diff_file: diffFileName,
+        memory_extensions_folder_structure: extensionsExist ? fillTemplate(EXTENSIONS_FOLDER_STRUCTURE, blockVars) : "",
+        memory_extensions_primary_inputs: extensionsExist ? fillTemplate(EXTENSIONS_PRIMARY_INPUTS, blockVars) : "",
     });
 }
 function readTemplate(name) {
@@ -231,7 +267,8 @@ export function parseExtraction(raw) {
     if (typeof obj.raw_memory !== "string" || typeof obj.rollout_summary !== "string") {
         throw new Error("extraction response missing required fields");
     }
-    if (!obj.raw_memory.trim() && !obj.rollout_summary.trim()) {
+    // codex phase1: either field empty → SucceededNoOutput (not a partial upsert).
+    if (!obj.raw_memory.trim() || !obj.rollout_summary.trim()) {
         return null;
     }
     // Guard against the model echoing the format skeleton from the system prompt.

package/dist/src/phase2.js

@@ -1,4 +1,4 @@
-import { ensureLayout, rebuildRawMemories, writeRolloutSummaries, pruneExtensionResources, writeWorkspaceDiff } from "./workspace.js";
+import { ensureLayout, rebuildRawMemories, writeRolloutSummaries, pruneExtensionResources, writeWorkspaceDiff, validateConsolidationArtifacts, } from "./workspace.js";
 import { ensureBaseline, captureWorkspaceDiff, resetBaseline, DIFF_ARTIFACT } from "./git-baseline.js";
 import { consolidateViaSubagent } from "./llm.js";
 import { invalidateCache } from "./source.js";
@@ -37,9 +37,16 @@ export async function runPhase2(store, opts = DEFAULT_PHASE2_OPTIONS) {
             writeRolloutSummaries(outputs);
             pruneExtensionResources(opts.extensionRetentionDays);
             const diff = await captureWorkspaceDiff();
+            // codex: early succeed only when there are no changes AND artifacts are
+            // already valid. Invalid/empty summary (e.g. ensureLayout's empty file)
+            // falls through so the consolidator can INIT/repair.
             if (diff.changes.length === 0) {
-                store.markPhase2Succeeded(claim.ownershipToken, outputs);
-                return { status: "no_workspace_changes" };
+                const valid = validateConsolidationArtifacts();
+                if (valid.ok) {
+                    store.markPhase2Succeeded(claim.ownershipToken, outputs);
+                    return { status: "no_workspace_changes" };
+                }
+                console.warn("[opencode-codex-memory] no workspace changes but artifacts invalid; running consolidator:", valid.reason);
             }
             writeWorkspaceDiff(diff);
             let heartbeatLost = false;
@@ -48,8 +55,10 @@ export async function runPhase2(store, opts = DEFAULT_PHASE2_OPTIONS) {
                     heartbeatLost = true;
                 }
             }, 90_000);
+            let agentCompleted = false;
             try {
                 await consolidateViaSubagent(memoryRoot(), DIFF_ARTIFACT, opts.consolidationModel);
+                agentCompleted = true;
             }
             finally {
                 clearInterval(heartbeat);
@@ -64,6 +73,17 @@ export async function runPhase2(store, opts = DEFAULT_PHASE2_OPTIONS) {
                 store.markPhase2Failed(claim.ownershipToken, "ownership lost");
                 return { status: "heartbeat_lost" };
             }
+            if (!agentCompleted) {
+                store.markPhase2Failed(claim.ownershipToken, "failed_agent");
+                return { status: "failed_agent" };
+            }
+            // codex failed_invalid_artifacts: do not reset baseline on bad output so
+            // the next run still sees a diff / can re-INIT.
+            const artifacts = validateConsolidationArtifacts();
+            if (!artifacts.ok) {
+                store.markPhase2Failed(claim.ownershipToken, `failed_invalid_artifacts: ${artifacts.reason}`);
+                return { status: "failed_invalid_artifacts" };
+            }
             if (!await resetBaseline()) {
                 store.markPhase2Failed(claim.ownershipToken, "baseline reset failed");
                 return { status: "baseline_reset_failed" };