fix(rebase): complete v0.26 resolution — SQL SET comma, dup pi import, two-phase promotion test, config-docs regen

- storage-meta-shared.ts: add missing comma after cached_m0_project_identity
  in the persistCachedM0 SET clause (TAKE-BOTH merge dropped the separator).
- inject-compartments-pi.ts: drop duplicate renderExternalMemoryBlock import
  (026b856 added it standalone; 2a8cd71 added it to the consolidated block).
- promotion.test.ts: migrate the 3 external-tee tests from the dropped
  promoteSessionFactsToMemory to upstream's two-phase
  promoteSessionFactsDurable + embedPromotedFacts (tee now lives post-commit).
- configuration.md: regenerate to include memory.external.* rows.
- lint:fix import ordering.

Author: Tehan

packages/docs/src/content/docs/reference/configuration.md

@@ -103,6 +103,24 @@ Durable project memory, semantic search, and recall features.
 | `memory.git_commit_indexing.enabled` | boolean | `false` | Index HEAD git commits for ctx_search (git_commit source). Graduated from experimental.git_commit_indexing; opt-in, default off. Independent of memory.enabled. |
 | `memory.git_commit_indexing.since_days` | number (7–3650) | `365` | Days of HEAD history to index (min: 7, max: 3650, default: 365) |
 | `memory.git_commit_indexing.max_commits` | number (100–20000) | `2000` | Max commits kept per project; oldest evicted (min: 100, max: 20000, default: 2000) |
+| `memory.external` | object | — | External long-term memory backend (tee). USER config only. |
+| `memory.external.provider` | `"hindsight"` \\| `"off"` | `"off"` | External memory backend. 'hindsight' tees memory creations to a Hindsight service; 'off' disables (default). SECURITY: this whole block only honors USER-level config. |
+| `memory.external.endpoint` | string | — | Backend base URL (e.g. http://10.0.0.1:8889). Required when provider is hindsight. |
+| `memory.external.api_key` | string | — | Bearer token for the backend (optional). |
+| `memory.external.project_bank` | string | `"mc-{name}-{id8}"` | Bank name template for project-scoped items. Placeholders: {name}=project basename, {id8}=first 8 chars of the project identity hash. |
+| `memory.external.main_bank` | string | — | Bank for user- and global-scoped items. Required when provider is hindsight. Assumed to pre-exist; never created or modified. |
+| `memory.external.retain_sources` | `"historian"` \\| `"agent"` \\| `"dreamer"`[] | `["historian","agent","dreamer"]` | Which creation points tee: historian promotion, agent ctx_memory writes, dreamer user-memory promotion. |
+| `memory.external.tags` | string[] | `[]` | Static tags attached to every retained item. |
+| `memory.external.recall` | object | — | Unified read path: session-start recall + ctx_search external source. |
+| `memory.external.recall.enabled` | boolean | `true` | Session-start recall from the external backend, merged into the context injection (default: true). |
+| `memory.external.recall.timeout_ms` | number (500–15000) | `3000` | Max wait for recall at the first render of a session (already cache-cold). Late results ride the m[1] delta. (default: 3000) |
+| `memory.external.recall.max_tokens` | number (256–8192) | `2048` | Token budget per recall slice (project / profile / global each). (default: 2048) |
+| `memory.external.recall.dedup_threshold` | number (0.5–0.99) | `0.85` | Cosine similarity above which a recalled item is dropped as a duplicate of a local memory. Hash-only fallback when embeddings are unavailable. (default: 0.85) |
+| `memory.external.recall.global_tags` | string[] | `[]` | Tag filter for the global (main-bank) recall slice, matched with tags_match 'any' (untagged content INCLUDED). Empty = no filter (full autoRecall replacement). |
+| `memory.external.recall.global_from_prompt` | boolean | `false` | Include an excerpt of the session's FIRST user prompt in the global-slice recall query (the project name is always included). The first prompt is fixed for the session, so the query — and the frozen recall snapshot — stays deterministic. Default false: pure template query. |
+| `memory.external.recall.search` | boolean | `true` | Expose the ctx_search 'external' source (project + main bank). (default: true) |
+| `memory.external.recall.mental_models` | boolean | `true` | Use Hindsight mental models as the fast path for the project/profile recall slices (single GET, server-refreshed), falling back to recall when absent/empty. (default: true) |
+| `memory.external.recall.profile_mental_models` | string[] | `["user-preferences"]` | Main-bank mental-model names (case-insensitive) used for the profile slice. The main bank is never modified by the plugin — create these manually. |
 | `embedding` | object | — | Embedding provider configuration |
 | `embedding.provider` | `"local"` \\| `"openai-compatible"` \\| `"off"` | `"local"` | Embedding provider. 'local' uses Xenova/all-MiniLM-L6-v2, 'openai-compatible' requires endpoint and model, 'off' disables embeddings. |
 | `embedding.model` | string | — | Embedding model name. Required for openai-compatible, ignored for local. |

packages/pi-plugin/src/inject-compartments-pi.ts

@@ -25,20 +25,19 @@
  *     historyRefreshSessions signal.
  */
 
+import {
+	computeRecallSnapshotHash,
+	type ExternalRecallSnapshot,
+	readExternalRecallHash,
+	readExternalRecallSnapshot,
+} from "@magic-context/core/features/magic-context/memory/external-recall-read";
 import {
 	getMaxMemoryIdForProjects,
 	getMemoriesByProject,
 	getMemoriesByProjects,
 	readNewMemoriesForM1Union,
 } from "@magic-context/core/features/magic-context/memory/storage-memory";
 import type { Memory } from "@magic-context/core/features/magic-context/memory/types";
-import {
-	computeRecallSnapshotHash,
-	type ExternalRecallSnapshot,
-	readExternalRecallHash,
-	readExternalRecallSnapshot,
-} from "@magic-context/core/features/magic-context/memory/external-recall-read";
-import { renderExternalMemoryBlock } from "@magic-context/core/hooks/magic-context/inject-compartments";
 import {
 	type ContextDatabase,
 	clearCachedM0M1,

packages/pi-plugin/src/pi-historian-runner.ts

@@ -47,11 +47,11 @@ import {
 	appendCompartments,
 	getCompartments,
 } from "@magic-context/core/features/magic-context/compartment-storage";
+import type { PromotedMemoryRef } from "@magic-context/core/features/magic-context/memory";
 import {
 	embedPromotedFacts,
 	promoteSessionFactsDurable,
 } from "@magic-context/core/features/magic-context/memory";
-import type { PromotedMemoryRef } from "@magic-context/core/features/magic-context/memory";
 import { resolveProjectIdentity } from "@magic-context/core/features/magic-context/memory/project-identity";
 import { getMemoriesByProject } from "@magic-context/core/features/magic-context/memory/storage-memory";
 import {

packages/plugin/src/features/magic-context/memory/promotion.test.ts

@@ -35,7 +35,7 @@ const {
     getMemoriesByProject,
     insertMemory,
 } = await import("./storage-memory");
-const { promoteSessionFactsDurable } = await import("./promotion");
+const { promoteSessionFactsDurable, embedPromotedFacts } = await import("./promotion");
 
 let db: Database | null = null;
 
@@ -440,13 +440,10 @@ describe("promotion", () => {
             db = makeMemoryDatabase();
             const calls = captureTee();
 
-            promoteSessionFactsToMemory(
-                db,
-                "ses_1",
-                "git:rootsha",
-                [{ category: "PROJECT_RULES", content: "tee me" }],
-                { projectName: "myproj" },
-            );
+            const refs = promoteSessionFactsDurable(db, "ses_1", "git:rootsha", [
+                { category: "PROJECT_RULES", content: "tee me" },
+            ]);
+            await embedPromotedFacts(db, "ses_1", "git:rootsha", refs, { projectName: "myproj" });
             await Bun.sleep(10);
 
             expect(calls.length).toBe(1);
@@ -465,13 +462,15 @@ describe("promotion", () => {
             db = makeMemoryDatabase();
             const calls = captureTee();
 
-            promoteSessionFactsToMemory(db, "ses_1", "git:rootsha", [
+            const refs1 = promoteSessionFactsDurable(db, "ses_1", "git:rootsha", [
                 { category: "PROJECT_RULES", content: "dup fact" },
             ]);
+            await embedPromotedFacts(db, "ses_1", "git:rootsha", refs1);
             await Bun.sleep(10);
-            promoteSessionFactsToMemory(db, "ses_2", "git:rootsha", [
+            const refs2 = promoteSessionFactsDurable(db, "ses_2", "git:rootsha", [
                 { category: "PROJECT_RULES", content: "dup fact" },
             ]);
+            await embedPromotedFacts(db, "ses_2", "git:rootsha", refs2);
             await Bun.sleep(10);
 
             expect(calls.length).toBe(1);
@@ -481,9 +480,10 @@ describe("promotion", () => {
             db = makeMemoryDatabase();
             const calls = captureTee();
 
-            promoteSessionFactsToMemory(db, "ses_1", "git:rootsha", [
+            const refs = promoteSessionFactsDurable(db, "ses_1", "git:rootsha", [
                 { category: "NOT_A_CATEGORY", content: "skip me" },
             ]);
+            await embedPromotedFacts(db, "ses_1", "git:rootsha", refs);
             await Bun.sleep(10);
 
             expect(calls.length).toBe(0);

packages/plugin/src/features/magic-context/storage-meta-shared.ts

@@ -504,7 +504,7 @@ export function persistCachedM0(
             cached_m0_upgrade_state = ?,
             cached_m0_system_hash = ?,
             cached_m0_model_key = ?,
-            cached_m0_project_identity = ?
+            cached_m0_project_identity = ?,
             cached_m0_external_recall_hash = ?
          WHERE session_id = ?`,
     ).run(