@cortexkit/opencode-magic-context 0.15.6 → 0.15.7

package/dist/features/magic-context/migrations.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"migrations.d.ts","sourceRoot":"","sources":["../../../src/features/magic-context/migrations.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAsQ3C;;;;GAIG;AACH,wBAAgB,aAAa,CAAC,EAAE,EAAE,QAAQ,GAAG,IAAI,CAkChD"}
+{"version":3,"file":"migrations.d.ts","sourceRoot":"","sources":["../../../src/features/magic-context/migrations.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAkT3C;;;;GAIG;AACH,wBAAgB,aAAa,CAAC,EAAE,EAAE,QAAQ,GAAG,IAAI,CAkChD"}

package/dist/features/magic-context/storage-db.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"storage-db.d.ts","sourceRoot":"","sources":["../../../src/features/magic-context/storage-db.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAkBtC,wBAAgB,kBAAkB,CAAC,EAAE,EAAE,QAAQ,GAAG,IAAI,CA8TrD;AAED;;;;;;;;;;;;;;;;;;GAkBG;AACH,wBAAgB,kBAAkB,CAAC,EAAE,EAAE,QAAQ,GAAG,IAAI,CAIrD;AAsHD,wBAAgB,YAAY,IAAI,QAAQ,CAsCvC;AAED,wBAAgB,mBAAmB,CAAC,EAAE,EAAE,QAAQ,GAAG,OAAO,CAEzD;AAED,wBAAgB,2BAA2B,CAAC,EAAE,EAAE,QAAQ,GAAG,MAAM,GAAG,IAAI,CAEvE;AAED,wBAAgB,aAAa,IAAI,IAAI,CAUpC;AAED,MAAM,MAAM,eAAe,GAAG,UAAU,CAAC,OAAO,YAAY,CAAC,CAAC"}
+{"version":3,"file":"storage-db.d.ts","sourceRoot":"","sources":["../../../src/features/magic-context/storage-db.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAkBtC,wBAAgB,kBAAkB,CAAC,EAAE,EAAE,QAAQ,GAAG,IAAI,CA+TrD;AAED;;;;;;;;;;;;;;;;;;GAkBG;AACH,wBAAgB,kBAAkB,CAAC,EAAE,EAAE,QAAQ,GAAG,IAAI,CAIrD;AAsHD,wBAAgB,YAAY,IAAI,QAAQ,CAsCvC;AAED,wBAAgB,mBAAmB,CAAC,EAAE,EAAE,QAAQ,GAAG,OAAO,CAEzD;AAED,wBAAgB,2BAA2B,CAAC,EAAE,EAAE,QAAQ,GAAG,MAAM,GAAG,IAAI,CAEvE;AAED,wBAAgB,aAAa,IAAI,IAAI,CAUpC;AAED,MAAM,MAAM,eAAe,GAAG,UAAU,CAAC,OAAO,YAAY,CAAC,CAAC"}

package/dist/features/magic-context/storage-tags.d.ts

@@ -14,6 +14,14 @@ export declare function updateCavemanDepth(db: Database, sessionId: string, tagN
 export declare function updateTagMessageId(db: Database, sessionId: string, tagId: number, messageId: string): void;
 export declare function deleteTagsByMessageId(db: Database, sessionId: string, messageId: string): number[];
 export declare function getMaxTagNumberBySession(db: Database, sessionId: string): number;
+/**
+ * Look up the tag_number assigned to a specific (session_id, message_id).
+ *
+ * Used by the tagger's recovery path to bind an existing DB-assigned tag back
+ * into the in-memory assignment map without bumping the counter past the DB's
+ * actual max. Returns null when no tag exists for that message yet.
+ */
+export declare function getTagNumberByMessageId(db: Database, sessionId: string, messageId: string): number | null;
 export declare function getTagsBySession(db: Database, sessionId: string): TagEntry[];
 export declare function getTagById(db: Database, sessionId: string, tagId: number): TagEntry | null;
 export declare function getTopNBySize(db: Database, sessionId: string, n: number): TagEntry[];

package/dist/features/magic-context/storage-tags.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"storage-tags.d.ts","sourceRoot":"","sources":["../../../src/features/magic-context/storage-tags.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAC3C,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAiKxC,wBAAgB,SAAS,CACrB,EAAE,EAAE,QAAQ,EACZ,SAAS,EAAE,MAAM,EACjB,SAAS,EAAE,MAAM,EACjB,IAAI,EAAE,QAAQ,CAAC,MAAM,CAAC,EACtB,QAAQ,EAAE,MAAM,EAChB,SAAS,EAAE,MAAM,EACjB,iBAAiB,GAAE,MAAU,EAC7B,QAAQ,GAAE,MAAM,GAAG,IAAW,EAC9B,aAAa,GAAE,MAAU,GAC1B,MAAM,CAaR;AAED,wBAAgB,eAAe,CAC3B,EAAE,EAAE,QAAQ,EACZ,SAAS,EAAE,MAAM,EACjB,KAAK,EAAE,MAAM,EACb,MAAM,EAAE,QAAQ,CAAC,QAAQ,CAAC,GAC3B,IAAI,CAEN;AAED,wBAAgB,iBAAiB,CAC7B,EAAE,EAAE,QAAQ,EACZ,SAAS,EAAE,MAAM,EACjB,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,QAAQ,CAAC,UAAU,CAAC,GAC/B,IAAI,CAEN;AAED;;;;;;GAMG;AACH,wBAAgB,kBAAkB,CAC9B,EAAE,EAAE,QAAQ,EACZ,SAAS,EAAE,MAAM,EACjB,SAAS,EAAE,MAAM,EACjB,KAAK,EAAE,MAAM,GACd,IAAI,CAMN;AAED,wBAAgB,kBAAkB,CAC9B,EAAE,EAAE,QAAQ,EACZ,SAAS,EAAE,MAAM,EACjB,KAAK,EAAE,MAAM,EACb,SAAS,EAAE,MAAM,GAClB,IAAI,CAEN;AAED,wBAAgB,qBAAqB,CACjC,EAAE,EAAE,QAAQ,EACZ,SAAS,EAAE,MAAM,EACjB,SAAS,EAAE,MAAM,GAClB,MAAM,EAAE,CAoBV;AAED,wBAAgB,wBAAwB,CAAC,EAAE,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,GAAG,MAAM,CAGhF;AAED,wBAAgB,gBAAgB,CAAC,EAAE,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,GAAG,QAAQ,EAAE,CAS5E;AAED,wBAAgB,UAAU,CAAC,EAAE,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,QAAQ,GAAG,IAAI,CAY1F;AAED,wBAAgB,aAAa,CAAC,EAAE,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,GAAG,QAAQ,EAAE,CAapF"}
+{"version":3,"file":"storage-tags.d.ts","sourceRoot":"","sources":["../../../src/features/magic-context/storage-tags.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAC3C,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AA6KxC,wBAAgB,SAAS,CACrB,EAAE,EAAE,QAAQ,EACZ,SAAS,EAAE,MAAM,EACjB,SAAS,EAAE,MAAM,EACjB,IAAI,EAAE,QAAQ,CAAC,MAAM,CAAC,EACtB,QAAQ,EAAE,MAAM,EAChB,SAAS,EAAE,MAAM,EACjB,iBAAiB,GAAE,MAAU,EAC7B,QAAQ,GAAE,MAAM,GAAG,IAAW,EAC9B,aAAa,GAAE,MAAU,GAC1B,MAAM,CAaR;AAED,wBAAgB,eAAe,CAC3B,EAAE,EAAE,QAAQ,EACZ,SAAS,EAAE,MAAM,EACjB,KAAK,EAAE,MAAM,EACb,MAAM,EAAE,QAAQ,CAAC,QAAQ,CAAC,GAC3B,IAAI,CAEN;AAED,wBAAgB,iBAAiB,CAC7B,EAAE,EAAE,QAAQ,EACZ,SAAS,EAAE,MAAM,EACjB,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,QAAQ,CAAC,UAAU,CAAC,GAC/B,IAAI,CAEN;AAED;;;;;;GAMG;AACH,wBAAgB,kBAAkB,CAC9B,EAAE,EAAE,QAAQ,EACZ,SAAS,EAAE,MAAM,EACjB,SAAS,EAAE,MAAM,EACjB,KAAK,EAAE,MAAM,GACd,IAAI,CAMN;AAED,wBAAgB,kBAAkB,CAC9B,EAAE,EAAE,QAAQ,EACZ,SAAS,EAAE,MAAM,EACjB,KAAK,EAAE,MAAM,EACb,SAAS,EAAE,MAAM,GAClB,IAAI,CAEN;AAED,wBAAgB,qBAAqB,CACjC,EAAE,EAAE,QAAQ,EACZ,SAAS,EAAE,MAAM,EACjB,SAAS,EAAE,MAAM,GAClB,MAAM,EAAE,CAoBV;AAED,wBAAgB,wBAAwB,CAAC,EAAE,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,GAAG,MAAM,CAGhF;AAED;;;;;;GAMG;AACH,wBAAgB,uBAAuB,CACnC,EAAE,EAAE,QAAQ,EACZ,SAAS,EAAE,MAAM,EACjB,SAAS,EAAE,MAAM,GAClB,MAAM,GAAG,IAAI,CAGf;AAED,wBAAgB,gBAAgB,CAAC,EAAE,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,GAAG,QAAQ,EAAE,CAS5E;AAED,wBAAgB,UAAU,CAAC,EAAE,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,QAAQ,GAAG,IAAI,CAY1F;AAED,wBAAgB,aAAa,CAAC,EAAE,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,GAAG,QAAQ,EAAE,CAapF"}

package/dist/features/magic-context/tagger.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tagger.d.ts","sourceRoot":"","sources":["../../../src/features/magic-context/tagger.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAE3C,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AACxC,MAAM,WAAW,MAAM;IACnB,SAAS,CACL,SAAS,EAAE,MAAM,EACjB,SAAS,EAAE,MAAM,EACjB,IAAI,EAAE,QAAQ,CAAC,MAAM,CAAC,EACtB,QAAQ,EAAE,MAAM,EAChB,EAAE,EAAE,QAAQ,EACZ,iBAAiB,CAAC,EAAE,MAAM,EAC1B,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI,EACxB,aAAa,CAAC,EAAE,MAAM,GACvB,MAAM,CAAC;IACV,MAAM,CAAC,SAAS,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAAC;IACjE,OAAO,CAAC,SAAS,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACvE,cAAc,CAAC,SAAS,EAAE,MAAM,GAAG,WAAW,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC/D,YAAY,CAAC,SAAS,EAAE,MAAM,EAAE,EAAE,EAAE,QAAQ,GAAG,IAAI,CAAC;IACpD,UAAU,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,CAAC;IACtC,UAAU,CAAC,SAAS,EAAE,MAAM,EAAE,EAAE,EAAE,QAAQ,GAAG,IAAI,CAAC;IAClD,OAAO,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;CACpC;AAuCD,wBAAgB,YAAY,IAAI,MAAM,CA4IrC"}
+{"version":3,"file":"tagger.d.ts","sourceRoot":"","sources":["../../../src/features/magic-context/tagger.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAE3C,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AACxC,MAAM,WAAW,MAAM;IACnB,SAAS,CACL,SAAS,EAAE,MAAM,EACjB,SAAS,EAAE,MAAM,EACjB,IAAI,EAAE,QAAQ,CAAC,MAAM,CAAC,EACtB,QAAQ,EAAE,MAAM,EAChB,EAAE,EAAE,QAAQ,EACZ,iBAAiB,CAAC,EAAE,MAAM,EAC1B,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI,EACxB,aAAa,CAAC,EAAE,MAAM,GACvB,MAAM,CAAC;IACV,MAAM,CAAC,SAAS,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAAC;IACjE,OAAO,CAAC,SAAS,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACvE,cAAc,CAAC,SAAS,EAAE,MAAM,GAAG,WAAW,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC/D,YAAY,CAAC,SAAS,EAAE,MAAM,EAAE,EAAE,EAAE,QAAQ,GAAG,IAAI,CAAC;IACpD,UAAU,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,CAAC;IACtC,UAAU,CAAC,SAAS,EAAE,MAAM,EAAE,EAAE,EAAE,QAAQ,GAAG,IAAI,CAAC;IAClD,OAAO,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;CACpC;AAuED,wBAAgB,YAAY,IAAI,MAAM,CA4NrC"}

package/dist/hooks/magic-context/tag-messages.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tag-messages.d.ts","sourceRoot":"","sources":["../../../src/hooks/magic-context/tag-messages.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sCAAsC,CAAC;AAE5E,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,qCAAqC,CAAC;AAYlE,OAAO,EAGH,KAAK,aAAa,EAClB,KAAK,cAAc,EACnB,iBAAiB,EACpB,MAAM,oBAAoB,CAAC;AAE5B,MAAM,MAAM,WAAW,GAAG;IAAE,EAAE,CAAC,EAAE,MAAM,CAAC;IAAC,IAAI,CAAC,EAAE,MAAM,CAAC;IAAC,SAAS,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC;AAE7E,MAAM,WAAW,gBAAgB;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,IAAI,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,MAAM,WAAW,GAAG;IAAE,IAAI,EAAE,WAAW,CAAC;IAAC,KAAK,EAAE,OAAO,EAAE,CAAA;CAAE,CAAC;AAElE,MAAM,MAAM,SAAS,GAAG;IACpB,UAAU,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,OAAO,CAAC;IACzC,UAAU,CAAC,EAAE,MAAM,MAAM,GAAG,IAAI,CAAC;IACjC,IAAI,CAAC,EAAE,MAAM,cAAc,CAAC;IAC5B,QAAQ,CAAC,EAAE,MAAM,cAAc,CAAC;IAChC,OAAO,CAAC,EAAE,WAAW,CAAC;CACzB,CAAC;AAEF,MAAM,WAAW,iBAAiB;IAC9B,OAAO,EAAE,GAAG,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;IAChC,kBAAkB,EAAE,GAAG,CAAC,WAAW,EAAE,gBAAgB,EAAE,CAAC,CAAC;IACzD,iBAAiB,EAAE,GAAG,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC;IAC5C,aAAa,EAAE,aAAa,CAAC;IAC7B,KAAK,EAAE,iBAAiB,CAAC;IACzB,mBAAmB,EAAE,OAAO,CAAC;IAC7B,yEAAyE;IACzE,eAAe,EAAE,OAAO,CAAC;CAC5B;AAkED,MAAM,WAAW,kBAAkB;IAC/B;;;;;;;;OAQG;IACH,mBAAmB,CAAC,EAAE,OAAO,CAAC;CACjC;AAED,wBAAgB,WAAW,CACvB,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,WAAW,EAAE,EACvB,MAAM,EAAE,MAAM,EACd,EAAE,EAAE,eAAe,EACnB,OAAO,GAAE,kBAAuB,GACjC,iBAAiB,CA4PnB"}
+{"version":3,"file":"tag-messages.d.ts","sourceRoot":"","sources":["../../../src/hooks/magic-context/tag-messages.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sCAAsC,CAAC;AAE5E,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,qCAAqC,CAAC;AAYlE,OAAO,EAGH,KAAK,aAAa,EAClB,KAAK,cAAc,EACnB,iBAAiB,EACpB,MAAM,oBAAoB,CAAC;AAE5B,MAAM,MAAM,WAAW,GAAG;IAAE,EAAE,CAAC,EAAE,MAAM,CAAC;IAAC,IAAI,CAAC,EAAE,MAAM,CAAC;IAAC,SAAS,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC;AAE7E,MAAM,WAAW,gBAAgB;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,IAAI,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,MAAM,WAAW,GAAG;IAAE,IAAI,EAAE,WAAW,CAAC;IAAC,KAAK,EAAE,OAAO,EAAE,CAAA;CAAE,CAAC;AAElE,MAAM,MAAM,SAAS,GAAG;IACpB,UAAU,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,OAAO,CAAC;IACzC,UAAU,CAAC,EAAE,MAAM,MAAM,GAAG,IAAI,CAAC;IACjC,IAAI,CAAC,EAAE,MAAM,cAAc,CAAC;IAC5B,QAAQ,CAAC,EAAE,MAAM,cAAc,CAAC;IAChC,OAAO,CAAC,EAAE,WAAW,CAAC;CACzB,CAAC;AAEF,MAAM,WAAW,iBAAiB;IAC9B,OAAO,EAAE,GAAG,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;IAChC,kBAAkB,EAAE,GAAG,CAAC,WAAW,EAAE,gBAAgB,EAAE,CAAC,CAAC;IACzD,iBAAiB,EAAE,GAAG,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC;IAC5C,aAAa,EAAE,aAAa,CAAC;IAC7B,KAAK,EAAE,iBAAiB,CAAC;IACzB,mBAAmB,EAAE,OAAO,CAAC;IAC7B,yEAAyE;IACzE,eAAe,EAAE,OAAO,CAAC;CAC5B;AAkED,MAAM,WAAW,kBAAkB;IAC/B;;;;;;;;OAQG;IACH,mBAAmB,CAAC,EAAE,OAAO,CAAC;CACjC;AAED,wBAAgB,WAAW,CACvB,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,WAAW,EAAE,EACvB,MAAM,EAAE,MAAM,EACd,EAAE,EAAE,eAAe,EACnB,OAAO,GAAE,kBAAuB,GACjC,iBAAiB,CAmQnB"}

package/dist/hooks/magic-context/transform.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"transform.d.ts","sourceRoot":"","sources":["../../../src/hooks/magic-context/transform.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"transform.d.ts","sourceRoot":"","sources":["../../../src/hooks/magic-context/transform.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,wCAAwC,CAAC;AAExE,OAAO,EACH,KAAK,eAAe,EAIpB,KAAK,aAAa,EAErB,MAAM,sCAAsC,CAAC;AAC9C,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,qCAAqC,CAAC;AAClE,OAAO,KAAK,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,oCAAoC,CAAC;AACjF,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAcxD,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AACnE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AAyB7C,OAAO,EAAE,yBAAyB,EAAE,KAAK,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAS9F,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAC;AA+B1D,wBAAgB,uBAAuB,CAAC,SAAS,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI,CAOnF;AAED;;;;GAIG;AACH,wBAAgB,8BAA8B,CAC1C,SAAS,EAAE,MAAM,GAClB,GAAG,CAAC,MAAM,EAAE;IAAE,YAAY,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAA;CAAE,CAAC,CAEzD;AAwBD,MAAM,WAAW,aAAa;IAC1B,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,SAAS,CAAC;IACrB,eAAe,EAAE,GAAG,CAAC,MAAM,EAAE;QAAE,KAAK,EAAE,YAAY,CAAC;QAAC,SAAS,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IACzE,MAAM,EAAE,CACJ,SAAS,EAAE,MAAM,EACjB,YAAY,EAAE,YAAY,EAC1B,EAAE,EAAE,eAAe,EACnB,MAAM,EAAE,OAAO,aAAa,EAC5B,aAAa,CAAC,EAAE,QAAQ,EAAE,EAC1B,qBAAqB,CAAC,EAAE,MAAM,EAC9B,oBAAoB,CAAC,EAAE,OAAO,oCAAoC,EAAE,WAAW,KAC9E,YAAY,GAAG,IAAI,CAAC;IACzB,EAAE,EAAE,eAAe,CAAC;IACpB,eAAe,EAAE,mBAAmB,CAAC;IACrC,aAAa,EAAE,MAAM,CAAC;IACtB;;;;;;OAMG;IACH,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,eAAe,EAAE,MAAM,CAAC;IACxB,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,iBAAiB,EAAE,MAAM,CAAC;IAC1B;;;;;OAKG;IACH,sBAAsB,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IACpC;;;;OAIG;IACH,8BAA8B,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IAC5C,oBAAoB,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC1C,kBAAkB,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC1C,MAAM,CAAC,EAAE,aAAa,CAAC,QAAQ,CAAC,CAAC;IACjC,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,YAAY,CAAC,EAAE;QACX,OAAO,EAAE,OAAO,CAAC;QACjB,qBAAqB,EAAE,MAAM,CAAC;QAC9B;;iFAEyE;QACzE,WAAW,EAAE,OAAO,CAAC;KACxB,CAAC;IACF;;;;;OAKG;IACH,uBAAuB,CAAC,EAAE,MAAM,MAAM,CAAC;IACvC,uBAAuB,CAAC,EAAE,MAAM,CAAC;IACjC,0BAA0B,CAAC,EAAE,MAAM,GAAG;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,CAAC;IACtF,sBAAsB,CAAC,EAAE;QAAE,OAAO,CAAC,EAAE,MAAM,CAAC;QAAC,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAAA;KAAE,CAAC;IACtF,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,qBAAqB,CAAC,EAAE,CACpB,SAAS,EAAE,MAAM,KAChB,OAAO,6BAA6B,EAAE,kBAAkB,CAAC;IAC9D,WAAW,CAAC,EAAE,CAAC,SAAS,EAAE,MAAM,KAAK,MAAM,GAAG,SAAS,CAAC;IACxD,kBAAkB,CAAC,EAAE,CAAC,SAAS,EAAE,MAAM,KAAK,MAAM,GAAG,SAAS,CAAC;IAC/D,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,6BAA6B,CAAC,EAAE,OAAO,CAAC;IACxC,wBAAwB,CAAC,EAAE,OAAO,CAAC;IACnC;;kEAE8D;IAC9D,6BAA6B,CAAC,EAAE,OAAO,CAAC;IACxC;yFACqF;IACrF,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B;mEAC+D;IAC/D,6BAA6B,CAAC,EAAE,MAAM,CAAC;IACvC,2FAA2F;IAC3F,uBAAuB,CAAC,EAAE,MAAM,CAAC;IACjC,0FAA0F;IAC1F,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,kBAAkB,CAAC,EAAE,kBAAkB,CAAC;IACxC;;;+CAG2C;IAC3C,UAAU,CAAC,EAAE;QACT,OAAO,EAAE,OAAO,CAAC;QACjB,cAAc,EAAE,MAAM,CAAC;QACvB,cAAc,EAAE,MAAM,CAAC;QACvB,aAAa,EAAE,OAAO,CAAC;QACvB,gBAAgB,EAAE,OAAO,CAAC;QAC1B,iBAAiB,EAAE,OAAO,CAAC;KAC9B,CAAC;IACF;;;;;;OAMG;IACH,sBAAsB,CAAC,EAAE;QACrB,OAAO,EAAE,OAAO,CAAC;QACjB,QAAQ,EAAE,MAAM,CAAC;KACpB,CAAC;CACL;AAED,wBAAgB,eAAe,CAAC,IAAI,EAAE,aAAa,IAK3C,QAAQ,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,EAC7B,QAAQ;IAAE,QAAQ,EAAE,OAAO,EAAE,CAAA;CAAE,KAChC,OAAO,CAAC,IAAI,CAAC,CAw3BnB"}

package/dist/index.js

@@ -158357,6 +158357,24 @@ var init_migrations = __esm(() => {
       up: (db) => {
         healAllNullColumns(db);
       }
+    },
+    {
+      version: 6,
+      description: "Heal session_meta.counter drift below MAX(tag_number)",
+      up: (db) => {
+        db.prepare(`UPDATE session_meta
+                 SET counter = (
+                     SELECT MAX(tag_number)
+                     FROM tags
+                     WHERE tags.session_id = session_meta.session_id
+                 )
+                 WHERE EXISTS (
+                     SELECT 1
+                     FROM tags
+                     WHERE tags.session_id = session_meta.session_id
+                       AND tags.tag_number > session_meta.counter
+                 )`).run();
+      }
     }
   ];
 });
@@ -158569,6 +158587,7 @@ CREATE INDEX IF NOT EXISTS idx_dream_queue_pending ON dream_queue(started_at, en
     );
 
     CREATE INDEX IF NOT EXISTS idx_tags_session_tag_number ON tags(session_id, tag_number);
+    CREATE INDEX IF NOT EXISTS idx_tags_session_message_id ON tags(session_id, message_id);
     CREATE INDEX IF NOT EXISTS idx_pending_ops_session ON pending_ops(session_id);
     CREATE INDEX IF NOT EXISTS idx_pending_ops_session_tag_id ON pending_ops(session_id, tag_id);
     CREATE INDEX IF NOT EXISTS idx_source_contents_session ON source_contents(session_id);
@@ -159382,6 +159401,14 @@ function getMaxTagNumberBySessionStatement(db) {
   }
   return stmt;
 }
+function getTagNumberByMessageIdStatement(db) {
+  let stmt = getTagNumberByMessageIdStatements.get(db);
+  if (!stmt) {
+    stmt = db.prepare("SELECT tag_number FROM tags WHERE session_id = ? AND message_id = ? ORDER BY tag_number ASC LIMIT 1");
+    getTagNumberByMessageIdStatements.set(db, stmt);
+  }
+  return stmt;
+}
 function isTagRow(row) {
   if (row === null || typeof row !== "object")
     return false;
@@ -159451,6 +159478,10 @@ function getMaxTagNumberBySession(db, sessionId) {
   const row = getMaxTagNumberBySessionStatement(db).get(sessionId);
   return isMaxTagNumberRow(row) ? row.max_tag_number : 0;
 }
+function getTagNumberByMessageId(db, sessionId, messageId) {
+  const row = getTagNumberByMessageIdStatement(db).get(sessionId, messageId);
+  return isTagNumberRow(row) ? row.tag_number : null;
+}
 function getTagsBySession(db, sessionId) {
   const rows = db.prepare("SELECT id, message_id, type, status, drop_mode, tool_name, input_byte_size, byte_size, reasoning_byte_size, session_id, tag_number, caveman_depth FROM tags WHERE session_id = ? ORDER BY tag_number ASC, id ASC").all(sessionId).filter(isTagRow);
   return rows.map(toTagEntry);
@@ -159462,7 +159493,7 @@ function getTopNBySize(db, sessionId, n) {
   const rows = db.prepare("SELECT id, message_id, type, status, drop_mode, tool_name, input_byte_size, byte_size, reasoning_byte_size, session_id, tag_number, caveman_depth FROM tags WHERE session_id = ? AND status = 'active' ORDER BY byte_size DESC, tag_number ASC LIMIT ?").all(sessionId, n).filter(isTagRow);
   return rows.map(toTagEntry);
 }
-var insertTagStatements, updateTagStatusStatements, updateTagDropModeStatements, updateTagMessageIdStatements, getTagNumbersByMessageIdStatements, deleteTagsByMessageIdStatements, getMaxTagNumberBySessionStatements;
+var insertTagStatements, updateTagStatusStatements, updateTagDropModeStatements, updateTagMessageIdStatements, getTagNumbersByMessageIdStatements, deleteTagsByMessageIdStatements, getMaxTagNumberBySessionStatements, getTagNumberByMessageIdStatements;
 var init_storage_tags = __esm(() => {
   insertTagStatements = new WeakMap;
   updateTagStatusStatements = new WeakMap;
@@ -159471,6 +159502,7 @@ var init_storage_tags = __esm(() => {
   getTagNumbersByMessageIdStatements = new WeakMap;
   deleteTagsByMessageIdStatements = new WeakMap;
   getMaxTagNumberBySessionStatements = new WeakMap;
+  getTagNumberByMessageIdStatements = new WeakMap;
 });
 
 // src/features/magic-context/storage.ts
@@ -166316,7 +166348,7 @@ function isAssignmentRow(row) {
 var UPSERT_COUNTER_SQL = `
   INSERT INTO session_meta (session_id, counter)
   VALUES (?, ?)
-  ON CONFLICT(session_id) DO UPDATE SET counter = excluded.counter
+  ON CONFLICT(session_id) DO UPDATE SET counter = MAX(session_meta.counter, excluded.counter)
 `;
 var upsertCounterStatements = new WeakMap;
 function getUpsertCounterStatement(db) {
@@ -166327,6 +166359,21 @@ function getUpsertCounterStatement(db) {
   }
   return stmt;
 }
+var RESET_COUNTER_SQL = `
+  INSERT INTO session_meta (session_id, counter)
+  VALUES (?, 0)
+  ON CONFLICT(session_id) DO UPDATE SET counter = 0
+`;
+var resetCounterStatements = new WeakMap;
+function getResetCounterStatement(db) {
+  let stmt = resetCounterStatements.get(db);
+  if (!stmt) {
+    stmt = db.prepare(RESET_COUNTER_SQL);
+    resetCounterStatements.set(db, stmt);
+  }
+  return stmt;
+}
+var MAX_TAG_ALLOC_RETRIES = 5;
 function createTagger() {
   const counters = new Map;
   const assignments = new Map;
@@ -166338,32 +166385,56 @@ function createTagger() {
     }
     return map2;
   }
+  function isUniqueConstraintError(error48) {
+    return error48 instanceof Error && "code" in error48 && error48.code === "SQLITE_CONSTRAINT_UNIQUE";
+  }
+  function syncCounterAtLeast(sessionId, db, value) {
+    if (value <= 0)
+      return;
+    const next = Math.max(counters.get(sessionId) ?? 0, value);
+    counters.set(sessionId, next);
+    getUpsertCounterStatement(db).run(sessionId, next);
+  }
   function assignTag(sessionId, messageId, type, byteSize2, db, reasoningByteSize = 0, toolName = null, inputByteSize = 0) {
     const sessionAssignments = getSessionAssignments(sessionId);
     const existing = sessionAssignments.get(messageId);
     if (existing !== undefined) {
       return existing;
     }
-    const current = counters.get(sessionId) ?? 0;
-    const next = current + 1;
-    try {
-      db.transaction(() => {
-        insertTag(db, sessionId, messageId, type, byteSize2, next, reasoningByteSize, toolName, inputByteSize);
-        getUpsertCounterStatement(db).run(sessionId, next);
-      })();
-    } catch (error48) {
-      if (error48 instanceof Error && "code" in error48 && error48.code === "SQLITE_CONSTRAINT_UNIQUE") {
-        const row = db.prepare("SELECT tag_number FROM tags WHERE session_id = ? AND message_id = ?").get(sessionId, messageId);
-        if (row) {
-          sessionAssignments.set(messageId, row.tag_number);
-          return row.tag_number;
+    const dbExisting = getTagNumberByMessageId(db, sessionId, messageId);
+    if (dbExisting !== null) {
+      sessionAssignments.set(messageId, dbExisting);
+      syncCounterAtLeast(sessionId, db, dbExisting);
+      return dbExisting;
+    }
+    for (let attempt = 0;attempt < MAX_TAG_ALLOC_RETRIES; attempt += 1) {
+      const memCounter = counters.get(sessionId) ?? 0;
+      const dbMax = getMaxTagNumberBySession(db, sessionId);
+      const next = Math.max(memCounter, dbMax) + 1;
+      try {
+        db.transaction(() => {
+          insertTag(db, sessionId, messageId, type, byteSize2, next, reasoningByteSize, toolName, inputByteSize);
+          getUpsertCounterStatement(db).run(sessionId, next);
+        })();
+      } catch (error48) {
+        if (!isUniqueConstraintError(error48)) {
+          throw error48;
         }
+        const racedRow = getTagNumberByMessageId(db, sessionId, messageId);
+        if (racedRow !== null) {
+          sessionAssignments.set(messageId, racedRow);
+          syncCounterAtLeast(sessionId, db, racedRow);
+          return racedRow;
+        }
+        const advancedDbMax = getMaxTagNumberBySession(db, sessionId);
+        counters.set(sessionId, Math.max(memCounter, advancedDbMax));
+        continue;
       }
-      throw error48;
+      counters.set(sessionId, next);
+      sessionAssignments.set(messageId, next);
+      return next;
     }
-    counters.set(sessionId, next);
-    sessionAssignments.set(messageId, next);
-    return next;
+    throw new Error(`tagger.assignTag: failed to allocate tag for session=${sessionId} message=${messageId} after ${MAX_TAG_ALLOC_RETRIES} retries`);
   }
   function getTag(sessionId, messageId) {
     return assignments.get(sessionId)?.get(messageId);
@@ -166377,15 +166448,12 @@ function createTagger() {
   function resetCounter(sessionId, db) {
     counters.set(sessionId, 0);
     assignments.delete(sessionId);
-    getUpsertCounterStatement(db).run(sessionId, 0);
+    getResetCounterStatement(db).run(sessionId);
   }
   function getCounter(sessionId) {
     return counters.get(sessionId) ?? 0;
   }
   function initFromDb(sessionId, db) {
-    if (counters.has(sessionId)) {
-      return;
-    }
     const row = db.prepare(GET_COUNTER_SQL).get(sessionId);
     const assignmentRows = db.prepare(GET_ASSIGNMENTS_SQL).all(sessionId).filter(isAssignmentRow);
     const sessionAssignments = getSessionAssignments(sessionId);
@@ -166397,7 +166465,7 @@ function createTagger() {
         maxTagNumber = assignment.tag_number;
       }
     }
-    const counter = Math.max(row?.counter ?? 0, maxTagNumber);
+    const counter = Math.max(row?.counter ?? 0, maxTagNumber, counters.get(sessionId) ?? 0);
     counters.set(sessionId, counter);
   }
   function cleanup(sessionId) {
@@ -168734,146 +168802,142 @@ function tagMessages(sessionId, messages, tagger, db, options = {}) {
   const COMMIT_LOOKBACK = 5;
   const COMMIT_HASH_PATTERN2 = /\b[0-9a-f]{7,12}\b/;
   let commitDetected = false;
-  db.transaction(() => {
-    for (let msgIndex = 0;msgIndex < messages.length; msgIndex++) {
-      const message = messages[msgIndex];
-      const messageId = typeof message.info.id === "string" ? message.info.id : null;
-      if (message.info.role === "user") {
-        precedingThinkingParts = [];
-      }
-      const messageThinkingParts = message.parts.filter(isThinkingPart);
-      if (messageThinkingParts.length > 0) {
-        reasoningByMessage.set(message, messageThinkingParts);
-      }
-      const messageHasTextPart = message.parts.some(isTextPart);
-      let textOrdinal = 0;
-      let fileOrdinal = 0;
-      for (let partIndex = 0;partIndex < message.parts.length; partIndex += 1) {
-        const part = message.parts[partIndex];
-        if (isReduceToolPart(part)) {
-          lastReduceMessageIndex = msgIndex;
-        }
-        const toolObservation = extractToolCallObservation(part);
-        if (toolObservation) {
-          const entry = toolCallIndex.get(toolObservation.callId) ?? {
-            occurrences: [],
-            hasResult: false
-          };
-          entry.occurrences.push({ message, part, kind: toolObservation.kind });
-          if (toolObservation.kind === "result")
-            entry.hasResult = true;
-          toolCallIndex.set(toolObservation.callId, entry);
-          const existingTagId = tagger.getTag(sessionId, toolObservation.callId);
-          if (existingTagId !== undefined) {
-            toolTagByCallId.set(toolObservation.callId, existingTagId);
-            messageTagNumbers.set(message, Math.max(messageTagNumbers.get(message) ?? 0, existingTagId));
-            if (message.info.role === "tool" && precedingThinkingParts.length > 0 && !toolThinkingByCallId.has(toolObservation.callId)) {
-              toolThinkingByCallId.set(toolObservation.callId, precedingThinkingParts);
-            }
+  for (let msgIndex = 0;msgIndex < messages.length; msgIndex++) {
+    const message = messages[msgIndex];
+    const messageId = typeof message.info.id === "string" ? message.info.id : null;
+    if (message.info.role === "user") {
+      precedingThinkingParts = [];
+    }
+    const messageThinkingParts = message.parts.filter(isThinkingPart);
+    if (messageThinkingParts.length > 0) {
+      reasoningByMessage.set(message, messageThinkingParts);
+    }
+    const messageHasTextPart = message.parts.some(isTextPart);
+    let textOrdinal = 0;
+    let fileOrdinal = 0;
+    for (let partIndex = 0;partIndex < message.parts.length; partIndex += 1) {
+      const part = message.parts[partIndex];
+      if (isReduceToolPart(part)) {
+        lastReduceMessageIndex = msgIndex;
+      }
+      const toolObservation = extractToolCallObservation(part);
+      if (toolObservation) {
+        const entry = toolCallIndex.get(toolObservation.callId) ?? {
+          occurrences: [],
+          hasResult: false
+        };
+        entry.occurrences.push({ message, part, kind: toolObservation.kind });
+        if (toolObservation.kind === "result")
+          entry.hasResult = true;
+        toolCallIndex.set(toolObservation.callId, entry);
+        const existingTagId = tagger.getTag(sessionId, toolObservation.callId);
+        if (existingTagId !== undefined) {
+          toolTagByCallId.set(toolObservation.callId, existingTagId);
+          messageTagNumbers.set(message, Math.max(messageTagNumbers.get(message) ?? 0, existingTagId));
+          if (message.info.role === "tool" && precedingThinkingParts.length > 0 && !toolThinkingByCallId.has(toolObservation.callId)) {
+            toolThinkingByCallId.set(toolObservation.callId, precedingThinkingParts);
           }
         }
-        if (messageId && isTextPart(part)) {
-          const textPart = part;
-          const thinkingParts = messageThinkingParts;
-          const contentId = `${messageId}:p${partIndex}`;
-          const existingTagId = resolver.resolve(messageId, "message", contentId, textOrdinal);
-          const reasoningBytes = textOrdinal === 0 ? getReasoningByteSize(thinkingParts) : 0;
-          const tagId = tagger.assignTag(sessionId, contentId, "message", byteSize(textPart.text), db, reasoningBytes);
-          if (existingTagId === undefined) {
-            const sourceContent = stripTagPrefix(textPart.text);
-            if (sourceContent.trim().length > 0) {
-              saveSourceContent(db, sessionId, tagId, sourceContent);
-            }
-          } else {
-            const sourceContent = sourceContents.get(tagId);
-            if (sourceContent !== undefined) {
-              textPart.text = sourceContent;
-            }
-          }
-          messageTagNumbers.set(message, Math.max(messageTagNumbers.get(message) ?? 0, tagId));
-          if (!skipPrefixInjection) {
-            textPart.text = prependTag(tagId, textPart.text);
+      }
+      if (messageId && isTextPart(part)) {
+        const textPart = part;
+        const thinkingParts = messageThinkingParts;
+        const contentId = `${messageId}:p${partIndex}`;
+        resolver.resolve(messageId, "message", contentId, textOrdinal);
+        const reasoningBytes = textOrdinal === 0 ? getReasoningByteSize(thinkingParts) : 0;
+        const tagId = tagger.assignTag(sessionId, contentId, "message", byteSize(textPart.text), db, reasoningBytes);
+        const persistedSource = sourceContents.get(tagId);
+        if (persistedSource !== undefined) {
+          textPart.text = persistedSource;
+        } else {
+          const sourceContent = stripTagPrefix(textPart.text);
+          if (sourceContent.trim().length > 0) {
+            saveSourceContent(db, sessionId, tagId, sourceContent);
           }
-          targets.set(tagId, {
-            message,
-            setContent: (content) => {
-              if (textPart.text === content)
-                return false;
-              textPart.text = content;
-              for (const tp of thinkingParts) {
-                if (tp.thinking !== undefined)
-                  tp.thinking = "[cleared]";
-                if (tp.text !== undefined)
-                  tp.text = "[cleared]";
-              }
-              return true;
-            },
-            getContent: () => textPart.text
-          });
-          textOrdinal += 1;
-          continue;
         }
-        if (isToolPartWithOutput(part)) {
-          const toolPart = part;
-          const thinkingParts = precedingThinkingParts;
-          const reasoningBytes = getReasoningByteSize(thinkingParts);
-          const { toolName, inputByteSize } = extractToolTagMetadata(toolPart);
-          const tagId = tagger.assignTag(sessionId, toolPart.callID, "tool", byteSize(toolPart.state.output), db, reasoningBytes, toolName, inputByteSize);
-          messageTagNumbers.set(message, Math.max(messageTagNumbers.get(message) ?? 0, tagId));
-          if (!skipPrefixInjection) {
-            toolPart.state.output = prependTag(tagId, toolPart.state.output);
-          }
-          toolTagByCallId.set(toolPart.callID, tagId);
-          if (thinkingParts.length > 0 && !toolThinkingByCallId.has(toolPart.callID)) {
-            toolThinkingByCallId.set(toolPart.callID, thinkingParts);
-          }
+        messageTagNumbers.set(message, Math.max(messageTagNumbers.get(message) ?? 0, tagId));
+        if (!skipPrefixInjection) {
+          textPart.text = prependTag(tagId, textPart.text);
         }
-        if (messageId && isFilePart(part)) {
-          const filePart = part;
-          const messageParts = message.parts;
-          const contentId = `${messageId}:file${partIndex}`;
-          const existingTagId = resolver.resolve(messageId, "file", contentId, fileOrdinal);
-          const tagId = tagger.assignTag(sessionId, contentId, "file", byteSize(filePart.url), db);
-          if (existingTagId === undefined) {
-            const sourceContent = buildFileSourceContent(message.parts);
-            if (sourceContent) {
-              saveSourceContent(db, sessionId, tagId, sourceContent);
-            }
-          }
-          messageTagNumbers.set(message, Math.max(messageTagNumbers.get(message) ?? 0, tagId));
-          targets.set(tagId, {
-            message,
-            setContent: (content) => {
-              const prev = messageParts[partIndex];
-              const prevText = typeof prev === "object" && prev !== null && "text" in prev ? prev.text : "";
-              if (prevText === content)
-                return false;
-              messageParts[partIndex] = {
-                type: "text",
-                text: content
-              };
-              return true;
+        targets.set(tagId, {
+          message,
+          setContent: (content) => {
+            if (textPart.text === content)
+              return false;
+            textPart.text = content;
+            for (const tp of thinkingParts) {
+              if (tp.thinking !== undefined)
+                tp.thinking = "[cleared]";
+              if (tp.text !== undefined)
+                tp.text = "[cleared]";
             }
-          });
-          fileOrdinal += 1;
+            return true;
+          },
+          getContent: () => textPart.text
+        });
+        textOrdinal += 1;
+        continue;
+      }
+      if (isToolPartWithOutput(part)) {
+        const toolPart = part;
+        const thinkingParts = precedingThinkingParts;
+        const reasoningBytes = getReasoningByteSize(thinkingParts);
+        const { toolName, inputByteSize } = extractToolTagMetadata(toolPart);
+        const tagId = tagger.assignTag(sessionId, toolPart.callID, "tool", byteSize(toolPart.state.output), db, reasoningBytes, toolName, inputByteSize);
+        messageTagNumbers.set(message, Math.max(messageTagNumbers.get(message) ?? 0, tagId));
+        if (!skipPrefixInjection) {
+          toolPart.state.output = prependTag(tagId, toolPart.state.output);
+        }
+        toolTagByCallId.set(toolPart.callID, tagId);
+        if (thinkingParts.length > 0 && !toolThinkingByCallId.has(toolPart.callID)) {
+          toolThinkingByCallId.set(toolPart.callID, thinkingParts);
         }
       }
-      if (message.info.role === "assistant" && !messageHasTextPart) {
-        precedingThinkingParts = messageThinkingParts;
+      if (messageId && isFilePart(part)) {
+        const filePart = part;
+        const messageParts = message.parts;
+        const contentId = `${messageId}:file${partIndex}`;
+        const existingTagId = resolver.resolve(messageId, "file", contentId, fileOrdinal);
+        const tagId = tagger.assignTag(sessionId, contentId, "file", byteSize(filePart.url), db);
+        if (existingTagId === undefined) {
+          const sourceContent = buildFileSourceContent(message.parts);
+          if (sourceContent) {
+            saveSourceContent(db, sessionId, tagId, sourceContent);
+          }
+        }
+        messageTagNumbers.set(message, Math.max(messageTagNumbers.get(message) ?? 0, tagId));
+        targets.set(tagId, {
+          message,
+          setContent: (content) => {
+            const prev = messageParts[partIndex];
+            const prevText = typeof prev === "object" && prev !== null && "text" in prev ? prev.text : "";
+            if (prevText === content)
+              return false;
+            messageParts[partIndex] = {
+              type: "text",
+              text: content
+            };
+            return true;
+          }
+        });
+        fileOrdinal += 1;
       }
-      if (!commitDetected && message.info.role === "assistant" && messages.length - msgIndex <= COMMIT_LOOKBACK) {
-        for (const part of message.parts) {
-          if (isTextPart(part)) {
-            const text = part.text;
-            if (COMMIT_HASH_PATTERN2.test(text) && /\b(commit|committed|cherry-pick|merge|rebas)/i.test(text)) {
-              commitDetected = true;
-              break;
-            }
+    }
+    if (message.info.role === "assistant" && !messageHasTextPart) {
+      precedingThinkingParts = messageThinkingParts;
+    }
+    if (!commitDetected && message.info.role === "assistant" && messages.length - msgIndex <= COMMIT_LOOKBACK) {
+      for (const part of message.parts) {
+        if (isTextPart(part)) {
+          const text = part.text;
+          if (COMMIT_HASH_PATTERN2.test(text) && /\b(commit|committed|cherry-pick|merge|rebas)/i.test(text)) {
+            commitDetected = true;
+            break;
           }
         }
       }
     }
-  })();
+  }
   for (const [callId, tagId] of toolTagByCallId) {
     const thinkingParts = toolThinkingByCallId.get(callId) ?? [];
     targets.set(tagId, createToolDropTarget(callId, thinkingParts, toolCallIndex, batch));
@@ -170390,6 +170454,7 @@ Historian previously failed ${historianFailureState.failureCount} time(s), so ma
       }
       logTransformTiming(sessionId, "injectTemporalMarkers", tTemporal);
     }
+    let taggingSucceeded = false;
     try {
       const t0 = performance.now();
       deps.tagger.initFromDb(sessionId, db);
@@ -170410,23 +170475,31 @@ Historian previously failed ${historianFailureState.failureCount} time(s), so ma
       }
       deps.commitSeenLastPass?.set(sessionId, result.hasRecentCommit);
       logTransformTiming(sessionId, "tagMessages", t0);
+      taggingSucceeded = true;
     } catch (error48) {
       sessionLog(sessionId, "transform tag persistence failed; continuing without tagging:", error48);
+      try {
+        deps.tagger.cleanup(sessionId);
+      } catch (cleanupError) {
+        sessionLog(sessionId, "tagger cleanup after failure threw:", cleanupError);
+      }
     }
     const t1 = performance.now();
     const tags = getTagsBySession(db, sessionId);
     logTransformTiming(sessionId, "getTagsBySession", t1, `count=${tags.length}`);
     let didMutateFromFlushedStatuses = false;
-    try {
-      const t2 = performance.now();
-      didMutateFromFlushedStatuses = applyFlushedStatuses(sessionId, db, targets, tags);
-      logTransformTiming(sessionId, "applyFlushedStatuses", t2);
-      batch?.finalize();
-      logTransformTiming(sessionId, "batchFinalize:flushed", t2);
-    } catch (error48) {
-      sessionLog(sessionId, "transform failed applying flushed statuses:", error48);
-      if (isCacheBusting)
-        deps.nudgePlacements.clear(sessionId);
+    if (taggingSucceeded) {
+      try {
+        const t2 = performance.now();
+        didMutateFromFlushedStatuses = applyFlushedStatuses(sessionId, db, targets, tags);
+        logTransformTiming(sessionId, "applyFlushedStatuses", t2);
+        batch?.finalize();
+        logTransformTiming(sessionId, "batchFinalize:flushed", t2);
+      } catch (error48) {
+        sessionLog(sessionId, "transform failed applying flushed statuses:", error48);
+        if (isCacheBusting)
+          deps.nudgePlacements.clear(sessionId);
+      }
     }
     if (didMutateFromFlushedStatuses && isCacheBusting) {
       deps.nudgePlacements.clear(sessionId);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cortexkit/opencode-magic-context",
-  "version": "0.15.6",
+  "version": "0.15.7",
   "type": "module",
   "description": "OpenCode plugin for Magic Context — cross-session memory and context management",
   "main": "dist/index.js",