@cortexkit/opencode-magic-context 0.49.28 → 0.49.30

package/dist/auto-search-worker.js

@@ -24,11 +24,11 @@ var [
   { Database, registerSqliteDiagnosticSink },
   { log }
 ] = await Promise.all([
-  import("./embedding-backfill-cwnyr4fj.js"),
+  import("./embedding-backfill-mms9nb0h.js"),
   import("./embedding-cache-mgyr73ef.js"),
   import("./storage-memory-e6a7mb0k.js"),
-  import("./project-embedding-registry-94nncs5g.js"),
-  import("./search-spq6nfyf.js"),
+  import("./project-embedding-registry-cg281d9j.js"),
+  import("./search-fbaz1m8r.js"),
   import("./compartment-chunk-embedding-qgp0tbf7.js"),
   import("./embedding-activity-g1dhes6g.js"),
   import("./harness-e4avh192.js"),

package/dist/chunk-embedding-write-worker.js

@@ -35,7 +35,7 @@ import"./index-c7phnbvk.js";
 import {
   LATEST_SUPPORTED_VERSION,
   enforceSchemaFence
-} from "./index-4cpc59jv.js";
+} from "./index-hbt0sbv2.js";
 import"./index-7kkphb6c.js";
 import"./index-xrnsygfq.js";
 import"./index-fr0wbhdn.js";

package/dist/config/commit-retention-recovery.d.ts

@@ -0,0 +1,9 @@
+import type { MagicContextConfig } from "./schema/magic-context";
+type CommitIndexing = MagicContextConfig["memory"]["git_commit_indexing"];
+/** Keep a defaulted cap useful for bounded reads without letting it delete stored history. */
+export declare function applyCommitRetentionRecovery(config: MagicContextConfig, recoveredFieldPaths: readonly string[], warnings: string[]): void;
+export declare function isCommitRetentionPaused(settings: CommitIndexing): boolean;
+/** Live sampling copies settings objects; recovery state must follow the sampled cap. */
+export declare function copyCommitRetentionRecovery(from: CommitIndexing, to: CommitIndexing): void;
+export {};
+//# sourceMappingURL=commit-retention-recovery.d.ts.map

package/dist/config/commit-retention-recovery.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"commit-retention-recovery.d.ts","sourceRoot":"","sources":["../../src/config/commit-retention-recovery.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAEjE,KAAK,cAAc,GAAG,kBAAkB,CAAC,QAAQ,CAAC,CAAC,qBAAqB,CAAC,CAAC;AAI1E,8FAA8F;AAC9F,wBAAgB,4BAA4B,CACxC,MAAM,EAAE,kBAAkB,EAC1B,mBAAmB,EAAE,SAAS,MAAM,EAAE,EACtC,QAAQ,EAAE,MAAM,EAAE,GACnB,IAAI,CAYN;AAED,wBAAgB,uBAAuB,CAAC,QAAQ,EAAE,cAAc,GAAG,OAAO,CAEzE;AAED,yFAAyF;AACzF,wBAAgB,2BAA2B,CAAC,IAAI,EAAE,cAAc,EAAE,EAAE,EAAE,cAAc,GAAG,IAAI,CAG1F"}

package/dist/config/index.d.ts

@@ -34,6 +34,7 @@ export interface LoadResultDetailed {
         message: string;
     }>;
     recoveredTopLevelKeys: string[];
+    recoveredFieldPaths: string[];
     configParseFailures: ConfigParseFailure[];
     warningDetails: ConfigWarningDetail[];
     cacheTtlConfigured: boolean;
@@ -62,7 +63,7 @@ export declare function formatProtectedTokensBelowMinWarning(value: number): str
 export declare function misplacedAgentModelWarnings(rawConfig: Record<string, unknown>): string[];
 export declare function resetProtectedTagsDeprecationWarningForTest(): void;
 export declare function warnProtectedTagsDeprecationOnce(): void;
-export declare function parsePluginConfig(rawConfig: Record<string, unknown>, recoveredTopLevelKeys?: string[]): MagicContextPluginConfig & {
+export declare function parsePluginConfig(rawConfig: Record<string, unknown>, recoveredTopLevelKeys?: string[], recoveredFieldPaths?: string[]): MagicContextPluginConfig & {
     configWarnings?: string[];
 };
 export declare function loadPluginConfig(directory: string): MagicContextPluginConfig & {

package/dist/config/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/config/index.ts"],"names":[],"mappings":"AAGA,OAAO,EAEH,KAAK,kBAAkB,EACvB,KAAK,mBAAmB,EAC3B,MAAM,8BAA8B,CAAC;AAQtC,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAwBpE,OAAO,EACH,KAAK,kBAAkB,EAG1B,MAAM,wBAAwB,CAAC;AAIhC,MAAM,WAAW,wBAAyB,SAAQ,kBAAkB;IAChE,cAAc,CAAC,EAAE,MAAM,EAAE,CAAC;IAC1B,6DAA6D;IAC7D,mBAAmB,CAAC,EAAE,kBAAkB,EAAE,CAAC;IAC3C,oBAAoB,CAAC,EAAE,mBAAmB,EAAE,CAAC;IAC7C,6FAA6F;IAC7F,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,OAAO,CAAC,EAAE,MAAM,CACZ,MAAM,EACN;QACI,QAAQ,EAAE,MAAM,CAAC;QACjB,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,KAAK,CAAC,EAAE,MAAM,CAAC;QACf,KAAK,CAAC,EAAE,MAAM,CAAC;QACf,OAAO,CAAC,EAAE,OAAO,CAAC;KACrB,CACJ,CAAC;CACL;AAwCD,MAAM,MAAM,WAAW,GACjB,IAAI,GACJ,0BAA0B,GAC1B,uBAAuB,GACvB,0BAA0B,GAC1B,iBAAiB,GACjB,sBAAsB,CAAC;AAE7B,MAAM,WAAW,kBAAkB;IAC/B,MAAM,EAAE,wBAAwB,GAAG;QAAE,cAAc,CAAC,EAAE,MAAM,EAAE,CAAA;KAAE,CAAC;IACjE,6EAA6E;IAC7E,yBAAyB,EAAE,mBAAmB,CAAC;IAC/C,WAAW,EAAE,WAAW,CAAC;IACzB,OAAO,EAAE;QACL,UAAU,EAAE,WAAW,CAAC;QACxB,aAAa,EAAE,WAAW,CAAC;KAC9B,CAAC;IACF,oBAAoB,EAAE,KAAK,CAAC;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IAC9F,qBAAqB,EAAE,MAAM,EAAE,CAAC;IAChC,mBAAmB,EAAE,kBAAkB,EAAE,CAAC;IAC1C,cAAc,EAAE,mBAAmB,EAAE,CAAC;IACtC,kBAAkB,EAAE,OAAO,CAAC;CAC/B;AA2ND;;;;;;;GAOG;AACH,wBAAgB,oCAAoC,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAE1E;AAKD;;;;;;;;;;;GAWG;AACH,wBAAgB,2BAA2B,CAAC,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,EAAE,CAsBxF;AAED,wBAAgB,2CAA2C,IAAI,IAAI,CAElE;AAED,wBAAgB,gCAAgC,IAAI,IAAI,CAOvD;AAED,wBAAgB,iBAAiB,CAC7B,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAClC,qBAAqB,GAAE,MAAM,EAAO,GACrC,wBAAwB,GAAG;IAAE,cAAc,CAAC,EAAE,MAAM,EAAE,CAAA;CAAE,CA6M1D;AAyBD,wBAAgB,gBAAgB,CAC5B,SAAS,EAAE,MAAM,GAClB,wBAAwB,GAAG;IAAE,cAAc,CAAC,EAAE,MAAM,EAAE,CAAA;CAAE,CAY1D;AAwDD,wBAAgB,wBAAwB,CACpC,SAAS,EAAE,MAAM,EACjB,mBAAmB,UAAO,GAC3B,kBAAkB,CAgOpB"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/config/index.ts"],"names":[],"mappings":"AAGA,OAAO,EAEH,KAAK,kBAAkB,EACvB,KAAK,mBAAmB,EAC3B,MAAM,8BAA8B,CAAC;AAQtC,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAyBpE,OAAO,EACH,KAAK,kBAAkB,EAG1B,MAAM,wBAAwB,CAAC;AAIhC,MAAM,WAAW,wBAAyB,SAAQ,kBAAkB;IAChE,cAAc,CAAC,EAAE,MAAM,EAAE,CAAC;IAC1B,6DAA6D;IAC7D,mBAAmB,CAAC,EAAE,kBAAkB,EAAE,CAAC;IAC3C,oBAAoB,CAAC,EAAE,mBAAmB,EAAE,CAAC;IAC7C,6FAA6F;IAC7F,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,OAAO,CAAC,EAAE,MAAM,CACZ,MAAM,EACN;QACI,QAAQ,EAAE,MAAM,CAAC;QACjB,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,KAAK,CAAC,EAAE,MAAM,CAAC;QACf,KAAK,CAAC,EAAE,MAAM,CAAC;QACf,OAAO,CAAC,EAAE,OAAO,CAAC;KACrB,CACJ,CAAC;CACL;AAwCD,MAAM,MAAM,WAAW,GACjB,IAAI,GACJ,0BAA0B,GAC1B,uBAAuB,GACvB,0BAA0B,GAC1B,iBAAiB,GACjB,sBAAsB,CAAC;AAE7B,MAAM,WAAW,kBAAkB;IAC/B,MAAM,EAAE,wBAAwB,GAAG;QAAE,cAAc,CAAC,EAAE,MAAM,EAAE,CAAA;KAAE,CAAC;IACjE,6EAA6E;IAC7E,yBAAyB,EAAE,mBAAmB,CAAC;IAC/C,WAAW,EAAE,WAAW,CAAC;IACzB,OAAO,EAAE;QACL,UAAU,EAAE,WAAW,CAAC;QACxB,aAAa,EAAE,WAAW,CAAC;KAC9B,CAAC;IACF,oBAAoB,EAAE,KAAK,CAAC;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IAC9F,qBAAqB,EAAE,MAAM,EAAE,CAAC;IAChC,mBAAmB,EAAE,MAAM,EAAE,CAAC;IAC9B,mBAAmB,EAAE,kBAAkB,EAAE,CAAC;IAC1C,cAAc,EAAE,mBAAmB,EAAE,CAAC;IACtC,kBAAkB,EAAE,OAAO,CAAC;CAC/B;AA2ND;;;;;;;GAOG;AACH,wBAAgB,oCAAoC,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAE1E;AAKD;;;;;;;;;;;GAWG;AACH,wBAAgB,2BAA2B,CAAC,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,EAAE,CAsBxF;AAED,wBAAgB,2CAA2C,IAAI,IAAI,CAElE;AAED,wBAAgB,gCAAgC,IAAI,IAAI,CAOvD;AAED,wBAAgB,iBAAiB,CAC7B,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAClC,qBAAqB,GAAE,MAAM,EAAO,EACpC,mBAAmB,GAAE,MAAM,EAAO,GACnC,wBAAwB,GAAG;IAAE,cAAc,CAAC,EAAE,MAAM,EAAE,CAAA;CAAE,CAsN1D;AAyBD,wBAAgB,gBAAgB,CAC5B,SAAS,EAAE,MAAM,GAClB,wBAAwB,GAAG;IAAE,cAAc,CAAC,EAAE,MAAM,EAAE,CAAA;CAAE,CAY1D;AAwDD,wBAAgB,wBAAwB,CACpC,SAAS,EAAE,MAAM,EACjB,mBAAmB,UAAO,GAC3B,kBAAkB,CAwOpB"}

package/dist/config/live-child-output-cap.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"live-child-output-cap.d.ts","sourceRoot":"","sources":["../../src/config/live-child-output-cap.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,iDAAiD,CAAC;AAGhG,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAIjE,uFAAuF;AACvF,wBAAgB,0BAA0B,CAAC,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,SAAS,QAEpF;AAED,wBAAgB,wBAAwB,CAAC,SAAS,EAAE,MAAM,QAEzD;AAED,oGAAoG;AACpG,wBAAgB,wBAAwB,CAAC,CAAC,SAAS,kBAAkB,EACjE,QAAQ,EAAE,wBAAwB,EAClC,IAAI,EAAE,CAAC,EACP,KAAK,EAAE,MAAM,CAAC,GACf,wBAAwB,CAY1B;AAED,4FAA4F;AAC5F,wBAAgB,6BAA6B,CAAC,CAAC,SAAS,kBAAkB,EACtE,IAAI,EAAE,CAAC,EACP,KAAK,EAAE,MAAM,CAAC;iBAKC;QAAE,SAAS,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,UACnC;QAAE,eAAe,EAAE,MAAM,GAAG,SAAS,CAAA;KAAE;sBAwBjC,MAAM;EAK/B"}
+{"version":3,"file":"live-child-output-cap.d.ts","sourceRoot":"","sources":["../../src/config/live-child-output-cap.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,iDAAiD,CAAC;AAGhG,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAIjE,uFAAuF;AACvF,wBAAgB,0BAA0B,CAAC,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,SAAS,QAEpF;AAED,wBAAgB,wBAAwB,CAAC,SAAS,EAAE,MAAM,QAEzD;AAED,oGAAoG;AACpG,wBAAgB,wBAAwB,CAAC,CAAC,SAAS,kBAAkB,EACjE,QAAQ,EAAE,wBAAwB,EAClC,IAAI,EAAE,CAAC,EACP,KAAK,EAAE,MAAM,CAAC,GACf,wBAAwB,CAc1B;AAED,4FAA4F;AAC5F,wBAAgB,6BAA6B,CAAC,CAAC,SAAS,kBAAkB,EACtE,IAAI,EAAE,CAAC,EACP,KAAK,EAAE,MAAM,CAAC;iBAKC;QAAE,SAAS,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,UACnC;QAAE,eAAe,EAAE,MAAM,GAAG,SAAS,CAAA;KAAE;sBAwBjC,MAAM;EAK/B"}

package/dist/config/live-run-config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"live-run-config.d.ts","sourceRoot":"","sources":["../../src/config/live-run-config.ts"],"names":[],"mappings":"AACA,OAAO,EAA4B,KAAK,wBAAwB,EAAE,MAAM,SAAS,CAAC;AAClF,OAAO,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AACnD,OAAO,EAA4B,KAAK,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAE3F,+FAA+F;AAC/F,wBAAgB,gBAAgB,CAAC,CAAC,SAAS,kBAAkB,EAAE,IAAI,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,GAAG,CAAC,CA6BnF;AAsBD,wBAAgB,eAAe,CAAC,QAAQ,EAAE,kBAAkB,EAAE,IAAI,EAAE,kBAAkB,GAAG,MAAM,EAAE,CAWhG;AAED,eAAO,MAAM,kBAAkB,yBAAmB,CAAC;AACnD,eAAO,MAAM,gBAAgB,yBAAmB,CAAC;AAIjD,2EAA2E;AAC3E,wBAAgB,kBAAkB,CAAC,SAAS,EAAE,MAAM,EAAE,IAAI,EAAE,wBAAwB,8CA4BnF;AAED,wBAAgB,yBAAyB,CAAC,SAAS,EAAE,MAAM,0DAE1D"}
+{"version":3,"file":"live-run-config.d.ts","sourceRoot":"","sources":["../../src/config/live-run-config.ts"],"names":[],"mappings":"AAEA,OAAO,EAA4B,KAAK,wBAAwB,EAAE,MAAM,SAAS,CAAC;AAClF,OAAO,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AACnD,OAAO,EAA4B,KAAK,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAE3F,+FAA+F;AAC/F,wBAAgB,gBAAgB,CAAC,CAAC,SAAS,kBAAkB,EAAE,IAAI,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,GAAG,CAAC,CAmCnF;AAsBD,wBAAgB,eAAe,CAAC,QAAQ,EAAE,kBAAkB,EAAE,IAAI,EAAE,kBAAkB,GAAG,MAAM,EAAE,CAWhG;AAED,eAAO,MAAM,kBAAkB,yBAAmB,CAAC;AACnD,eAAO,MAAM,gBAAgB,yBAAmB,CAAC;AAIjD,2EAA2E;AAC3E,wBAAgB,kBAAkB,CAAC,SAAS,EAAE,MAAM,EAAE,IAAI,EAAE,wBAAwB,8CA4BnF;AAED,wBAAgB,yBAAyB,CAAC,SAAS,EAAE,MAAM,0DAE1D"}

package/dist/config/project-security.d.ts

@@ -110,6 +110,7 @@ export declare function restoreTrustedValuesOverInvalidProjectValues(args: {
 }): {
     warnings: string[];
     restoredTopLevelKeys: string[];
+    restoredFieldPaths: string[];
 };
 /**
  * Rebuild the merged `command` block so a repository may only ADD commands.

package/dist/config/project-security.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"project-security.d.ts","sourceRoot":"","sources":["../../src/config/project-security.ts"],"names":[],"mappings":"AA0FA,wBAAgB,4BAA4B,CAAC,KAAK,EAAE,OAAO,GAAG,MAAM,GAAG,SAAS,CAU/E;AAED,MAAM,WAAW,4BAA4B;IACzC,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,OAAO,CAAC,EAAE,MAAM,CAAC;CAC7B;AAUD;;;;GAIG;AACH,wBAAgB,kCAAkC,CAAC,CAAC,SAAS,MAAM,EAC/D,MAAM,EAAE,CAAC,EACT,IAAI,EAAE;IAAE,WAAW,EAAE,OAAO,CAAC;IAAC,OAAO,EAAE,OAAO,CAAA;CAAE,GACjD,CAAC,CAmBH;AAED,wBAAgB,+BAA+B,CAC3C,MAAM,EAAE,MAAM,GACf,4BAA4B,GAAG,SAAS,CAE1C;AAsKD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAkDG;AACH,wBAAgB,8BAA8B,CAAC,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,EAAE,CA0P5F;AAED;;;;;GAKG;AACH,wBAAgB,kCAAkC,CAAC,IAAI,EAAE;IACrD,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACnC,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACpC,iBAAiB,EAAE;QACf,4BAA4B,CAAC,EAAE,OAAO,CAAC;QACvC,wBAAwB,CAAC,EAAE,OAAO,CAAC;QACnC,gBAAgB,CAAC,EAAE,OAAO,CAAC;KAC9B,CAAC;CACL,GAAG,MAAM,EAAE,CA6KX;AA2BD,wBAAgB,mCAAmC,CAC/C,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACnC,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAClC,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAClC,MAAM,EAAE,CAsCV;AAED,uFAAuF;AACvF,MAAM,MAAM,eAAe,GAAG,SAAS,WAAW,EAAE,CAAC;AA2ErD;;;;;;;;;;;;;;;;;;GAkBG;AACH,wBAAgB,4CAA4C,CAAC,IAAI,EAAE;IAC/D,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACnC,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACpC,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACpC,iBAAiB,EAAE,CAAC,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,KAAK,SAAS,eAAe,EAAE,CAAC;CACnF,GAAG;IAAE,QAAQ,EAAE,MAAM,EAAE,CAAC;IAAC,oBAAoB,EAAE,MAAM,EAAE,CAAA;CAAE,CA4BzD;AAqBD;;;;;;;;;;;GAWG;AACH,wBAAgB,wBAAwB,CAAC,IAAI,EAAE;IAC3C,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACnC,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACpC,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACpC,aAAa,EAAE,SAAS,MAAM,EAAE,CAAC;CACpC,GAAG,MAAM,EAAE,CA8CX"}
+{"version":3,"file":"project-security.d.ts","sourceRoot":"","sources":["../../src/config/project-security.ts"],"names":[],"mappings":"AA0FA,wBAAgB,4BAA4B,CAAC,KAAK,EAAE,OAAO,GAAG,MAAM,GAAG,SAAS,CAU/E;AAED,MAAM,WAAW,4BAA4B;IACzC,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,OAAO,CAAC,EAAE,MAAM,CAAC;CAC7B;AAUD;;;;GAIG;AACH,wBAAgB,kCAAkC,CAAC,CAAC,SAAS,MAAM,EAC/D,MAAM,EAAE,CAAC,EACT,IAAI,EAAE;IAAE,WAAW,EAAE,OAAO,CAAC;IAAC,OAAO,EAAE,OAAO,CAAA;CAAE,GACjD,CAAC,CAmBH;AAED,wBAAgB,+BAA+B,CAC3C,MAAM,EAAE,MAAM,GACf,4BAA4B,GAAG,SAAS,CAE1C;AAsKD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAkDG;AACH,wBAAgB,8BAA8B,CAAC,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,EAAE,CA0P5F;AAED;;;;;GAKG;AACH,wBAAgB,kCAAkC,CAAC,IAAI,EAAE;IACrD,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACnC,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACpC,iBAAiB,EAAE;QACf,4BAA4B,CAAC,EAAE,OAAO,CAAC;QACvC,wBAAwB,CAAC,EAAE,OAAO,CAAC;QACnC,gBAAgB,CAAC,EAAE,OAAO,CAAC;KAC9B,CAAC;CACL,GAAG,MAAM,EAAE,CA6KX;AA2BD,wBAAgB,mCAAmC,CAC/C,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACnC,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAClC,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAClC,MAAM,EAAE,CAsCV;AAED,uFAAuF;AACvF,MAAM,MAAM,eAAe,GAAG,SAAS,WAAW,EAAE,CAAC;AA2ErD;;;;;;;;;;;;;;;;;;GAkBG;AACH,wBAAgB,4CAA4C,CAAC,IAAI,EAAE;IAC/D,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACnC,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACpC,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACpC,iBAAiB,EAAE,CAAC,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,KAAK,SAAS,eAAe,EAAE,CAAC;CACnF,GAAG;IAAE,QAAQ,EAAE,MAAM,EAAE,CAAC;IAAC,oBAAoB,EAAE,MAAM,EAAE,CAAC;IAAC,kBAAkB,EAAE,MAAM,EAAE,CAAA;CAAE,CAgCvF;AAqBD;;;;;;;;;;;GAWG;AACH,wBAAgB,wBAAwB,CAAC,IAAI,EAAE;IAC3C,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACnC,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACpC,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACpC,aAAa,EAAE,SAAS,MAAM,EAAE,CAAC;CACpC,GAAG,MAAM,EAAE,CA8CX"}

package/dist/{conflict-warning-hook-tgnw019g.js → conflict-warning-hook-xgskea1v.js}

@@ -4,12 +4,12 @@ import {
   cleanupConflictWarnings2,
   sendSchemaFenceWarning2,
   sendStartupAnnouncement2
-} from "./index-tvzvjggy.js";
+} from "./index-gkee6p4g.js";
 import"./index-4pnsgvfk.js";
 import"./index-sd3egckz.js";
-import"./index-077ht5cq.js";
+import"./index-waktfbjy.js";
 import"./index-qt1qqasc.js";
-import"./index-v0dhhxsq.js";
+import"./index-y1qwzvxn.js";
 import"./index-rrv26qjz.js";
 import"./index-58e3y90n.js";
 import"./index-rverk2vz.js";

package/dist/{context-dxfztzsd.js → context-vnfr6d7t.js}

@@ -12,7 +12,6 @@ import {
   releaseCompartmentLeaseBestEffort,
   isCompartmentLeaseHeld,
   queueM0Mutation,
-  getCompartments,
   getUncoveredCompartmentEndsThrough,
   providerResponseFailed,
   isSuccessfulProviderCompletion,
@@ -65,7 +64,7 @@ import {
   rebaseSessionCoordinatesAsync,
   resolveOpenCodeProtectedTailBoundary,
   getActiveCompartmentRun
-} from "./index-dcqk0y27.js";
+} from "./index-k0dpkyn7.js";
 import"./index-sd3egckz.js";
 import {
   getHarness2
@@ -157,7 +156,7 @@ import {
   applyJsonSchemaParameterDescriptions,
   MagicContextRpcServer,
   subagentTemperature
-} from "./index-k9jx7ma9.js";
+} from "./index-ekzzw66a.js";
 import {
   resolveHistorianModel2
 } from "./index-5kym00ag.js";
@@ -172,7 +171,7 @@ import {
   openDatabaseAsync,
   isDatabasePersisted,
   getDatabasePersistenceError
-} from "./index-4cpc59jv.js";
+} from "./index-hbt0sbv2.js";
 import {
   setHomeProjectPermission,
   resolveProjectIdentityForSession,
@@ -202,9 +201,11 @@ import {
   preloadTokenizer,
   estimateTokens
 } from "./index-b88dwwrh.js";
-import"./index-xrnsygfq.js";
+import {
+  getTableColumnNames
+} from "./index-xrnsygfq.js";
 import"./index-58e3y90n.js";
-import"./index-v0dhhxsq.js";
+import"./index-y1qwzvxn.js";
 import {
   needsBlockedRead,
   markHostUnservedRow,
@@ -240,19 +241,19 @@ import {
   cleanUserText2,
   readRawSessionMessageIdOrdinalsForRange2,
   readRawSessionMessageOrdinalById2
-} from "./index-yzjhx10y.js";
+} from "./index-0fe4q77z.js";
 import {
   BoundedSessionMap,
   recordToolDefinitionSet,
   getCurrentToolSetHash
 } from "./index-s1n8dd2n.js";
-import"./index-7gbcg8xv.js";
+import"./index-4s4zq97n.js";
 import"./index-v15ne3a3.js";
 import {
   invalidateAutoEmbedSession,
   clearEmbedSessionState,
   retainProjectEmbedding2
-} from "./index-a2fz9hpa.js";
+} from "./index-gxkhzmjq.js";
 import"./index-wfybj1dw.js";
 import {
   deleteChunkEmbedBackoffForSession2
@@ -264,7 +265,7 @@ import"./index-fb3zxn06.js";
 import {
   renderUserFacingFailure,
   userFacingFailureCode
-} from "./index-t3rbb8wr.js";
+} from "./index-pe6b4bhs.js";
 import {
   createTagger,
   cavemanWordRulesForLanguage,
@@ -273,29 +274,29 @@ import {
   EmergencyFailClosedError,
   DegradedPassRefusalError,
   isSyntheticHeadMessage2
-} from "./index-fq2p158w.js";
+} from "./index-vzz570j8.js";
 import"./index-qgh1qwjj.js";
 import"./index-qt1qqasc.js";
 import"./index-kfyb3k6n.js";
 import"./index-4dhv7mqz.js";
 import"./index-51rdvtkz.js";
-import"./index-4ypqzvhf.js";
+import"./index-vnn5405n.js";
 import"./index-jjvbk92s.js";
 import {
   pushNotification2,
   isTuiConnected2
 } from "./index-x8a7jmkh.js";
 import"./index-rrv26qjz.js";
-import"./index-077ht5cq.js";
-import"./index-dzfevacx.js";
-import"./index-n8qmmd7f.js";
+import"./index-waktfbjy.js";
+import"./index-vtz789ex.js";
+import"./index-adr4vfys.js";
 import"./index-gp3kcpc4.js";
 import {
   detectConflicts
 } from "./index-4pnsgvfk.js";
 import"./index-fmsr7v69.js";
 import"./index-kaqs6h31.js";
-import"./index-89k1w6x2.js";
+import"./index-3jmx3fae.js";
 import {
   isDreamerRunnable,
   isSmartNoteSurfaceAvailable,
@@ -313,6 +314,26 @@ import"./index-t5pck3ss.js";
 import { setTimeout as delay } from "node:timers/promises";
 
 // src/hooks/magic-context/history-boundary-repair.ts
+function readStoreBoundaries(db, sessionId) {
+  const columns = getTableColumnNames(db, "compartments");
+  const numbers = ["id", "sequence", "start_message", "end_message", "created_at"];
+  const strings = ["session_id", "start_message_id", "end_message_id", "title", "content"];
+  const predicates = [...numbers, ...strings].every((column) => columns.has(column)) ? [
+    ...numbers.map((column) => `typeof(${column}) IN ('integer', 'real')`),
+    ...strings.map((column) => `typeof(${column}) = 'text'`)
+  ] : ["0"];
+  for (const column of ["p1", "p2", "p3", "p4", "episode_type"]) {
+    if (columns.has(column))
+      predicates.push(`typeof(${column}) IN ('text', 'null')`);
+  }
+  for (const column of ["importance", "legacy"]) {
+    if (columns.has(column))
+      predicates.push(`typeof(${column}) IN ('integer', 'real', 'null')`);
+  }
+  return db.prepare(`SELECT sequence, ${columns.has("end_message_id") ? "end_message_id" : "NULL"} AS endMessageId
+             FROM compartments WHERE session_id = ? AND ${predicates.join(" AND ")}
+             ORDER BY sequence ASC`).all(sessionId);
+}
 function readBaseline(db, sessionId) {
   const row = db.prepare("SELECT cached_m0_bytes IS NOT NULL AS hasM0, cached_m0_last_baseline_end_message_id AS boundary FROM session_meta WHERE session_id = ?").get(sessionId);
   return {
@@ -379,7 +400,7 @@ function dropCompartmentsAfter(db, sessionId, anchor, holderId, activeBranch = f
 }
 function repairMissingHistoryBoundary(args) {
   const { db, sessionId, isInHostStore, scope = "store" } = args;
-  const compartments = scope === "active-branch" ? db.prepare("SELECT sequence, COALESCE(end_message_id, '') AS endMessageId FROM compartments WHERE session_id = ? ORDER BY sequence").all(sessionId) : getCompartments(db, sessionId);
+  const compartments = scope === "active-branch" ? db.prepare("SELECT sequence, COALESCE(end_message_id, '') AS endMessageId FROM compartments WHERE session_id = ? ORDER BY sequence").all(sessionId) : readStoreBoundaries(db, sessionId);
   let latestIndex = compartments.length - 1;
   while (latestIndex >= 0 && !compartments[latestIndex]?.endMessageId)
     latestIndex -= 1;
@@ -423,7 +444,7 @@ function repairMissingHistoryBoundary(args) {
     let dropped;
     let anchorForDrop = anchor;
     try {
-      if (scope === "active-branch" && anchor) {
+      if (anchor) {
         const row = db.prepare("SELECT end_message AS endMessage FROM compartments WHERE session_id = ? AND sequence = ?").get(sessionId, anchor.sequence);
         if (!row)
           return { kind: "unresolved", reason: "busy", missingEndMessageId: missing };
@@ -2451,6 +2472,7 @@ function createNativeHiddenChildren(host, removeSession, options) {
     const inFlight = removing.get(child.id);
     if (inFlight)
       return inFlight;
+    options.log(`[magic-context] hidden child ${child.id} removing`);
     const done = (async () => {
       try {
         let timer;
@@ -2465,6 +2487,7 @@ function createNativeHiddenChildren(host, removeSession, options) {
           if (timer)
             clearTimeout(timer);
         }
+        options.log(`[magic-context] hidden child ${child.id} removed`);
       } catch (error) {
         if (isSessionNotFound(error))
           return;
@@ -2476,14 +2499,19 @@ function createNativeHiddenChildren(host, removeSession, options) {
     removing.set(child.id, done);
     return done;
   };
-  const confirmPlacement = async (sessionID, parentID) => {
+  const noteCreated = (sessionID, role, parentID) => {
+    options.log(`[magic-context] hidden child ${sessionID} created role=${role} parent=${parentID} keep_subagents=${options.keepSubagents}`);
+  };
+  const confirmPlacement = async (sessionID, parentID, role) => {
     let stored;
     try {
       stored = await host.get({ sessionID });
     } catch (error) {
+      noteCreated(sessionID, role, "unknown");
       options.log(`[magic-context] could not read back hidden child ${sessionID} to confirm its parent: ${errorText(error)}`);
       return;
     }
+    noteCreated(sessionID, role, stored.parentID ?? "none");
     const directory = stored.location?.directory;
     if (options.directory !== undefined && directory !== undefined && !sameProjectDirectory(directory, options.directory)) {
       throw new HiddenCompletionRefusal("hidden_prompt_unrecognized", `hidden child ${sessionID} is bound to ${directory}, not to this instance's ${options.directory}. Reopen the parent session in ${directory}, then run /ctx-recomp so its owning instance can rebuild history.`, true);
@@ -2512,11 +2540,13 @@ function createNativeHiddenChildren(host, removeSession, options) {
     };
     if (parentID) {
       try {
-        await confirmPlacement(created.id, parentID);
+        await confirmPlacement(created.id, parentID, role);
       } catch (error) {
         await remove(child);
         throw error;
       }
+    } else {
+      noteCreated(created.id, role, "none");
     }
     return child;
   };
@@ -2525,16 +2555,22 @@ function createNativeHiddenChildren(host, removeSession, options) {
     open: create,
     create,
     retire(child) {
-      if (!kept(child))
+      if (kept(child)) {
+        options.log(`[magic-context] hidden child ${child.id} kept (keep_subagents)`);
+      } else {
         remove(child);
+      }
     },
     async finish(child, retired) {
       if (retired) {
         await removing.get(child.id);
         return;
       }
-      if (!kept(child))
+      if (kept(child)) {
+        options.log(`[magic-context] hidden child ${child.id} kept (keep_subagents)`);
+      } else {
         await remove(child);
+      }
     },
     updateModel: (child, model) => ({ ...child, model }),
     markEverSettled: (child) => ({ ...child, ever_settled: true })
@@ -2581,6 +2617,7 @@ async function cleanupLegacyHiddenChildren(db, remove, note, options = {}) {
               timer = setTimeout(() => reject(new Error("session.remove timed out")), Math.min(options.timeoutMs ?? 1000, Math.max(1, deadline - now())));
             })
           ]);
+          note(`[magic-context] legacy hidden child ${child.id} removed`);
         } catch (error) {
           if (!isSessionNotFound(error))
             throw error;
@@ -2669,6 +2706,16 @@ function toolResultText(result) {
 `);
   return text.length > 0 ? text : undefined;
 }
+function sumRowUsage(rows) {
+  const count = (value) => typeof value === "number" && Number.isFinite(value) ? value : 0;
+  return rows.reduce((total, row) => ({
+    input: total.input + count(row.data.tokens?.input),
+    output: total.output + count(row.data.tokens?.output),
+    cacheRead: total.cacheRead + count(row.data.tokens?.cache?.read),
+    cacheWrite: total.cacheWrite + count(row.data.tokens?.cache?.write),
+    ...total.reasoning !== undefined || row.data.tokens?.reasoning !== undefined ? { reasoning: (total.reasoning ?? 0) + count(row.data.tokens?.reasoning) } : {}
+  }), { input: 0, output: 0, cacheRead: 0, cacheWrite: 0 });
+}
 function toolLoopMessages(attempt, rows) {
   const messages = attempt.observedMessages ?? [];
   const results = new Map;
@@ -2861,6 +2908,10 @@ function createLateHiddenExecutor(current) {
     open: (run) => wired().open(run),
     attempt: (handle, request) => wired().attempt(handle, request),
     collect: (handle, limit) => wired().collect(handle, limit),
+    collectPartial: (handle, limit) => {
+      const executor = wired();
+      return executor.collectPartial?.(handle, limit) ?? executor.collect(handle, limit);
+    },
     close: (handle, settlement) => wired().close(handle, settlement)
   };
 }
@@ -2950,9 +3001,32 @@ async function createV2HiddenCompletionExecutor(host, options) {
     });
     run.child = lifecycle.updateModel(run.child, requested);
   };
+  const partialCompletion = (run) => {
+    const attempt = run.attempt;
+    const rows = attempt ? withReader(options.openReader, (reader) => {
+      const latest = reader.latestAssistant(run.child.id);
+      return (reader.assistantSince?.(run.child.id, attempt.baseline) ?? (latest ? [latest] : [])).filter((row) => row.seq > attempt.baseline);
+    }) : [];
+    const usage = sumRowUsage(rows);
+    return {
+      text: rows.map(assistantText).filter(Boolean).join(`
+`) || null,
+      messages: attempt ? toolLoopMessages(attempt.child, rows) : [],
+      usage,
+      tokenLog: runTokenLog(usage),
+      lengthCapped: false
+    };
+  };
   const retire = (run, reason) => {
     if (run.retired)
       return;
+    if (hiddenToolLoop(run.identity) && !run.completion) {
+      try {
+        run.partialCompletion = partialCompletion(run);
+      } catch (error) {
+        note(`[magic-context] could not read interrupted child output: ${String(error)}`);
+      }
+    }
     lifecycle.retire(run.child, reason);
     run.retired = true;
   };
@@ -3083,6 +3157,8 @@ async function createV2HiddenCompletionExecutor(host, options) {
         shaped: false,
         budget: run.budget
       };
+      run.partialCompletion = undefined;
+      run.attempt = { child: attempt, baseline };
       options.hook.registerAttempt(marker, attempt);
       const deadline = Date.now() + run.identity.timeoutMs;
       const budget = run.budget;
@@ -3218,19 +3294,14 @@ async function createV2HiddenCompletionExecutor(host, options) {
         const tokenNumber = (value) => typeof value === "number" && Number.isFinite(value) ? value : undefined;
         const steps = withReader(options.openReader, (reader) => reader.assistantSince?.(run.child.id, baseline) ?? [row]).filter((step) => step.seq > baseline && step.seq <= row.seq);
         const reportedUsage = steps.some((step) => tokenNumber(step.data.tokens?.input) !== undefined || tokenNumber(step.data.tokens?.output) !== undefined);
-        const usage = steps.reduce((total, step) => ({
-          input: total.input + (tokenNumber(step.data.tokens?.input) ?? 0),
-          output: total.output + (tokenNumber(step.data.tokens?.output) ?? 0),
-          cacheRead: total.cacheRead + (tokenNumber(step.data.tokens?.cache?.read) ?? 0),
-          cacheWrite: total.cacheWrite + (tokenNumber(step.data.tokens?.cache?.write) ?? 0)
-        }), { input: 0, output: 0, cacheRead: 0, cacheWrite: 0 });
+        const usage = sumRowUsage(steps);
         if (request.signal?.aborted || run.retired || Date.now() >= deadline) {
           await interruptAndRetire(run, "prompt-aborted-or-timeout");
           throw new Error(request.signal?.aborted ? "Hidden completion prompt aborted" : "Hidden completion prompt timed out");
         }
         run.completion = {
           text,
-          tokenLog: runTokenLog(tokens, run.identity.maxOutputTokens, row.data.finish),
+          tokenLog: runTokenLog(reportedUsage ? usage : tokens, run.identity.maxOutputTokens, row.data.finish),
           ...hiddenToolLoop(run.identity) ? { messages: toolLoopMessages(attempt, steps) } : {},
           reasoning: text ? null : assistantReasoning(row),
           usage: reportedUsage ? usage : meter(system, promptText(request), text ?? ""),
@@ -3279,6 +3350,12 @@ async function createV2HiddenCompletionExecutor(host, options) {
         throw new Error("Hidden completion has no settled output");
       return completion;
     },
+    async collectPartial(handle) {
+      const run = runs.get(handle);
+      if (!run)
+        throw new Error("Hidden completion handle is closed");
+      return run.completion ?? run.partialCompletion ?? partialCompletion(run);
+    },
     async close(handle, settlement) {
       if (!handle)
         return;
@@ -3343,6 +3420,96 @@ class HiddenModelActivity {
   }
 }
 
+// src/v2/message-times.ts
+function isSettled(entry, readAt) {
+  return (entry.version.type === "user" || entry.time.completed !== undefined) && typeof entry.version.updated === "number" && Number.isFinite(entry.version.updated) && entry.version.updated <= readAt - 1000;
+}
+function sameVersion(a, b) {
+  return a.type === b.type && a.seq === b.seq && a.created === b.created && a.updated === b.updated;
+}
+
+class V2MessageTimesCache {
+  capacity;
+  sessions = new Map;
+  constructor(capacity = 64) {
+    this.capacity = capacity;
+  }
+  delete(sessionID) {
+    this.sessions.delete(sessionID);
+  }
+  deleteMessage(sessionID, messageID) {
+    this.sessions.get(sessionID)?.entries.delete(messageID);
+  }
+  clear() {
+    this.sessions.clear();
+  }
+  pass(sessionID) {
+    const previous = this.sessions.get(sessionID);
+    const current = { entries: new Map };
+    this.sessions.delete(sessionID);
+    this.sessions.set(sessionID, current);
+    while (this.sessions.size > this.capacity) {
+      const oldest = this.sessions.keys().next().value;
+      if (oldest === undefined)
+        break;
+      this.sessions.delete(oldest);
+    }
+    const passTimes = new Map;
+    return (reader, ids) => {
+      const missing = [...new Set(ids)].filter((id) => !passTimes.has(id));
+      if (missing.length > 0) {
+        const readAt = Date.now();
+        const identity = reader.hostIdentity();
+        current.identity = identity;
+        const reusable = previous?.identity === identity ? previous.entries : undefined;
+        const known = [];
+        const refresh = [];
+        let first = Infinity;
+        let last = -Infinity;
+        for (const id of missing) {
+          const entry = reusable?.get(id);
+          if (entry && isSettled(entry, readAt)) {
+            known.push(id);
+            first = Math.min(first, entry.version.seq);
+            last = Math.max(last, entry.version.seq);
+          } else
+            refresh.push(id);
+        }
+        const versions = reader.messageTimeVersions(sessionID, known, { first, last });
+        for (const id of known) {
+          const version = versions.get(id);
+          const cached = reusable?.get(id);
+          if (!version) {
+            passTimes.set(id, null);
+          } else if (cached && sameVersion(cached.version, version) && (version.type === "user" || cached.time.completed !== undefined)) {
+            current.entries.set(id, cached);
+            passTimes.set(id, cached.time);
+          } else
+            refresh.push(id);
+        }
+        const times = reader.messageTimes(sessionID, refresh, versions);
+        for (const id of refresh) {
+          const time = times.get(id);
+          const version = versions.get(id);
+          passTimes.set(id, time ?? null);
+          if (time && version) {
+            const entry = { version, time };
+            if (isSettled(entry, readAt))
+              current.entries.set(id, entry);
+          }
+        }
+      }
+      const result = new Map;
+      for (const id of ids) {
+        const time = passTimes.get(id);
+        if (time)
+          result.set(id, { ...time });
+      }
+      return result;
+    };
+  }
+}
+
 // src/v2/hooks/channel2.ts
 import { randomBytes } from "node:crypto";
 var pendingCandidates = new WeakMap;
@@ -3739,11 +3906,7 @@ function registerV2DreamScheduleTimer(args) {
     embeddingConfig: config.embedding,
     transformMode: config.transform_mode,
     moduleClient: createDreamTimerModuleClient(args.rustModeModuleClient),
-    gitCommitIndexing: gitCommitIndexing?.enabled ? {
-      enabled: true,
-      since_days: gitCommitIndexing.since_days,
-      max_commits: gitCommitIndexing.max_commits
-    } : undefined,
+    gitCommitIndexing: gitCommitIndexing?.enabled ? gitCommitIndexing : undefined,
     ensureRegistered: args.ensureRegistered ?? ensureProjectRegisteredFromOpenCodeDirectory
   }).catch((error) => {
     log2(`[magic-context] v2 dream timer registration failed (continuing without it): ${error}`);
@@ -4315,7 +4478,7 @@ function projectRawMessages(rows, ordinalFor) {
     const message = {
       id: row.id,
       ordinal: ordinalFor(row, index),
-      role: row.type === "assistant" ? "assistant" : "user",
+      role: row.type === "assistant" ? "assistant" : row.type === "system" ? "system" : "user",
       createdAt: row.time_created ?? row.data.time?.created,
       parts: row.type === "assistant" ? (row.data.content ?? []).map((part) => {
         if (part.type !== "tool")
@@ -5032,6 +5195,7 @@ function coveredInstructionRows(reader, sessionID, throughSeq, model) {
 async function registerContext(context) {
   const directory = context.location.directory;
   const config = loadPluginConfigDetailed(directory).config;
+  log2(`[magic-context] OpenCode 2 keep_subagents=${config.keep_subagents === true}`);
   setHomeProjectPermission(config.allow_home_project);
   if (!config.enabled)
     return;
@@ -5164,6 +5328,7 @@ async function registerContext(context) {
   });
   let hiddenAgentsReady;
   const readerPool = new V2StoreReaderPool;
+  const messageTimesCache = new V2MessageTimesCache;
   const openStoreReader = () => readerPool.open(gaDatabasePath(getDataDir(), process.env.OPENCODE_CHANNEL ?? "latest"));
   const createHiddenExecutor = async (database) => {
     await cleanupLegacyOnce(database);
@@ -5527,6 +5692,12 @@ async function registerContext(context) {
             if (event.type?.startsWith("session.revert.") || event.type === "session.message.content.updated") {
               nativeFoldReplay?.onEvent(event);
               restoredRows.forget(sessionID);
+              messageTimesCache.delete(sessionID);
+            }
+            if (event.type === "session.step.started" || event.type === "session.step.ended" || event.type === "session.step.failed") {
+              const messageID = event.data.assistantMessageID;
+              if (typeof messageID === "string")
+                messageTimesCache.deleteMessage(sessionID, messageID);
             }
             if (event.type === "session.error" || event.type === "session.execution.failed") {
               const error = hiddenTerminalError(event);
@@ -5565,6 +5736,7 @@ async function registerContext(context) {
                 rawProviders.get(sessionID)?.();
                 rawProviders.delete(sessionID);
                 usage.delete(sessionID);
+                messageTimesCache.delete(sessionID);
                 hiddenSessionErrors.delete(sessionID);
                 storageNoticeBySession.delete(sessionID);
                 liveModels.delete(sessionID);
@@ -5859,22 +6031,9 @@ async function registerContext(context) {
     }
     await dropStorageNotices(draft.messages, isMagicContextSynthetic);
     const hostMessagesAtEntry = [...draft.messages];
-    const passTimes = new Map;
+    const cachedTimes = messageTimesCache.pass(draft.sessionID);
     const readTimes = (reader, messages) => {
-      const ids = timeIds(messages);
-      const missing = ids.filter((id) => !passTimes.has(id));
-      if (missing.length > 0) {
-        const read = reader.messageTimes(draft.sessionID, missing);
-        for (const id of missing)
-          passTimes.set(id, read.get(id) ?? null);
-      }
-      const times = new Map;
-      for (const id of ids) {
-        const time = passTimes.get(id);
-        if (time)
-          times.set(id, time);
-      }
-      return times;
+      return cachedTimes(reader, timeIds(messages));
     };
     liveModels.set(draft.sessionID, {
       providerID: draft.model.providerID,
@@ -6399,6 +6558,7 @@ async function registerContext(context) {
   }, 0));
   return {
     async dispose() {
+      messageTimesCache.clear();
       usageController.abort();
       await hiddenCompletionExecutor?.dispose();
       await usageDone;

package/dist/{embedding-backfill-cwnyr4fj.js → embedding-backfill-mms9nb0h.js}

@@ -1,7 +1,7 @@
 import {
   ensureMemoryEmbeddings2
-} from "./index-4ypqzvhf.js";
-import"./index-a2fz9hpa.js";
+} from "./index-vnn5405n.js";
+import"./index-gxkhzmjq.js";
 import"./index-4dhv7mqz.js";
 import"./index-qt1qqasc.js";
 import"./index-51rdvtkz.js";