pi-orchestrator-config 4.10.0 → 4.11.0

package/extensions/orchestrator/dreaming.ts

@@ -26,7 +26,7 @@ import { setSlot } from "./status-bar.js";
 import { rebuildAndOrganize } from "./situation-report.js";
 import { runPromotionPass } from "./memory-promotion.js";
 import { mergeProvenancePending } from "./memory-provenance.js";
-import { getProjectTmpDir, shouldSkipOneshotShutdownDream } from "./utils.js";
+import { getProjectTmpDir, getProjectMemoryDir, shouldSkipOneshotShutdownDream } from "./utils.js";
 import { fileLog } from "../shared/file-logger.js";
 
 // Scoring rebuild runs every 30 minutes (cheap, no LLM — just rescores and reorganizes)
@@ -101,7 +101,7 @@ export function registerDreaming(
     updateDreamStatus();
     currentDreamId = "";  // Reset until we get the ID from spawnAsyncAgent
     const { agents } = discoverAgents(cwd, "user");
-    const topicsDir = path.join(cwd, ".pi", "memory", "topics");
+    const topicsDir = path.join(getProjectMemoryDir(cwd), "topics");
     const { id } = spawnAsyncAgent(
       "worker",
       `Memory dreaming — analyze session and maintain topic files.\n` +

package/extensions/orchestrator/index.ts

@@ -37,6 +37,7 @@ import { registerSessionSearch } from "./session-search.js";
 import { registerSettingsTui } from "./settings-tui.js";
 import { registerMarkdownTransformer } from "./markdown-transformer.js";
 import { registerGraft } from "./graft.js";
+import { registerReviewLearning } from "./review-learning.js";
 import { ensureGitSshTimeout, isRunningInContainer, terminalNotify } from "./utils.js";
 import { createLogger } from "../shared/logger.js";
 import { registerProviderStreamLog } from "../shared/provider-stream-log.js";
@@ -112,6 +113,7 @@ export default function (pi: ExtensionAPI) {
   registerNvim(pi);
   registerPreferenceExtractor(pi);
   registerMemoryTools(pi);
+  registerReviewLearning(pi);
   registerSessionSearch(pi);
   registerSettingsTui(pi);
   registerMarkdownTransformer(pi);

package/extensions/orchestrator/memory-embeddings.ts

@@ -14,6 +14,7 @@ import { join } from "node:path";
 import { createHash } from "node:crypto";
 import { createCachedStore } from "./state-jsonl.js";
 import type { JsonlStateStore } from "./state-jsonl.js";
+import { getProjectMemoryDir } from "./utils.js";
 
 const EMBEDDING_DIM = 384;
 export const EMBEDDING_POOLING = "mean";
@@ -42,12 +43,12 @@ const LEGACY_STORE_FILENAME = "embeddings.json";
 
 function getEmbeddingStore(cwd: string): JsonlStateStore<EmbeddingStore> {
   return createCachedStore<EmbeddingStore>(
-    join(cwd, ".pi", "memory"), STORE_FILENAME_JSONL, LEGACY_STORE_FILENAME, { compactThreshold: 30 },
+    getProjectMemoryDir(cwd), STORE_FILENAME_JSONL, LEGACY_STORE_FILENAME, { compactThreshold: 30 },
   );
 }
 
 function getStorePath(cwd: string): string {
-  return join(cwd, ".pi", "memory", STORE_FILENAME_JSONL);
+  return join(getProjectMemoryDir(cwd), STORE_FILENAME_JSONL);
 }
 
 function loadStore(cwd: string): EmbeddingStore {

package/extensions/orchestrator/memory-promotion.ts

@@ -9,6 +9,7 @@
 import { existsSync, readFileSync, writeFileSync } from "node:fs";
 import { join } from "node:path";
 import { createLogger } from "../shared/logger.js";
+import { getProjectMemoryDir } from "./utils.js";
 import {
   type EnforcementAction,
   type EnforcementTrigger,
@@ -159,7 +160,7 @@ export function markTopicEntryEnforced(
 ): boolean {
   const topicName = CATEGORY_TO_TOPIC[category];
   if (!topicName) return false;
-  const topicPath = join(cwd, ".pi", "memory", "topics", `${topicName}.md`);
+  const topicPath = join(getProjectMemoryDir(cwd), "topics", `${topicName}.md`);
   if (!existsSync(topicPath)) return false;
 
   let content = readFileSync(topicPath, "utf-8");

package/extensions/orchestrator/memory-provenance.ts

@@ -13,6 +13,7 @@ import { join } from "node:path";
 import { entryHash, mutateScores, type MemoryCategory } from "./memory-scoring.js";
 import { createCachedStore } from "./state-jsonl.js";
 import type { JsonlStateStore } from "./state-jsonl.js";
+import { getProjectMemoryDir } from "./utils.js";
 
 export interface ProvenancePendingItem {
   category: MemoryCategory | string;
@@ -31,12 +32,12 @@ const LEGACY_PROVENANCE_FILENAME = "provenance-pending.json";
 
 function getProvenanceStore(cwd: string): JsonlStateStore<ProvenancePendingFile> {
   return createCachedStore<ProvenancePendingFile>(
-    join(cwd, ".pi", "memory"), PROVENANCE_FILENAME_JSONL, LEGACY_PROVENANCE_FILENAME,
+    getProjectMemoryDir(cwd), PROVENANCE_FILENAME_JSONL, LEGACY_PROVENANCE_FILENAME,
   );
 }
 
 export function getProvenancePendingPath(cwd: string): string {
-  return join(cwd, ".pi", "memory", PROVENANCE_FILENAME_JSONL);
+  return join(getProjectMemoryDir(cwd), PROVENANCE_FILENAME_JSONL);
 }
 
 export function writeProvenancePending(

package/extensions/orchestrator/memory-scoring.ts

@@ -16,6 +16,7 @@ import { existsSync, readFileSync, readdirSync } from "node:fs";
 import { createCachedStore } from "./state-jsonl.js";
 import type { JsonlStateStore } from "./state-jsonl.js";
 import { getSetting } from "./project-settings.js";
+import { getProjectMemoryDir } from "./utils.js";
 
 // ── Types ──────────────────────────────────────────────────────────────────
 
@@ -246,12 +247,12 @@ const LEGACY_SCORES_FILENAME = "memory-scores.json";
 
 function getScoresStore(cwd: string): JsonlStateStore<ScoresFile> {
   return createCachedStore<ScoresFile>(
-    join(cwd, ".pi", "memory"), SCORES_FILENAME_JSONL, LEGACY_SCORES_FILENAME, { compactThreshold: 50 },
+    getProjectMemoryDir(cwd), SCORES_FILENAME_JSONL, LEGACY_SCORES_FILENAME, { compactThreshold: 50 },
   );
 }
 
 export function getScoresPath(cwd: string): string {
-  return join(cwd, ".pi", "memory", SCORES_FILENAME_JSONL);
+  return join(getProjectMemoryDir(cwd), SCORES_FILENAME_JSONL);
 }
 
 /**
@@ -320,7 +321,7 @@ export function loadScores(cwd: string): ScoresFile {
  * imports loadScores/entryHash from this module).
  */
 function parseTopicLinesForMigration(cwd: string): { category: string; text: string }[] {
-  const topicsDir = join(cwd, ".pi", "memory", "topics");
+  const topicsDir = join(getProjectMemoryDir(cwd), "topics");
   const out: { category: string; text: string }[] = [];
   if (!existsSync(topicsDir)) return out;
   try {

package/extensions/orchestrator/memory-tools.ts

@@ -17,6 +17,7 @@ import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
 import { Type } from "typebox";
 import { existsSync, readFileSync, writeFileSync, mkdirSync } from "node:fs";
 import { join } from "node:path";
+import { getProjectMemoryDir } from "./utils.js";
 import {
   loadScores,
   entryHash,
@@ -365,7 +366,7 @@ function registerMemoryRemove(pi: ExtensionAPI): void {
       }
 
       const topicName = CATEGORY_TO_TOPIC[category as keyof typeof CATEGORY_TO_TOPIC];
-      const topicPath = join(cwd, ".pi", "memory", "topics", `${topicName}.md`);
+      const topicPath = join(getProjectMemoryDir(cwd), "topics", `${topicName}.md`);
 
       if (!existsSync(topicPath)) {
         return { content: [{ type: "text", text: `Topic file not found for category "${category}".` }] };
@@ -517,7 +518,7 @@ function registerMemoryEdit(pi: ExtensionAPI): void {
       }
 
       const topicName = CATEGORY_TO_TOPIC[category as keyof typeof CATEGORY_TO_TOPIC];
-      const topicPath = join(cwd, ".pi", "memory", "topics", `${topicName}.md`);
+      const topicPath = join(getProjectMemoryDir(cwd), "topics", `${topicName}.md`);
 
       if (!existsSync(topicPath)) {
         return { content: [{ type: "text", text: `Topic file not found for category "${category}".` }] };

package/extensions/orchestrator/memory-tree.ts

@@ -11,6 +11,7 @@
  */
 
 import { createLogger } from "../shared/logger.js";
+import { getProjectMemoryDir } from "./utils.js";
 import { existsSync, readFileSync, readdirSync, statSync } from "node:fs";
 import { join } from "node:path";
 import {
@@ -58,7 +59,7 @@ export interface TopicEntry {
 // ── Topic Directory ────────────────────────────────────────────────────────
 
 function getTopicsDir(cwd: string): string {
-  return join(cwd, ".pi", "memory", "topics");
+  return join(getProjectMemoryDir(cwd), "topics");
 }
 
 // ── Topic File I/O ─────────────────────────────────────────────────────────

package/extensions/orchestrator/memory-write.ts

@@ -19,6 +19,7 @@
 import { createLogger } from "../shared/logger.js";
 import { existsSync, readFileSync, writeFileSync, mkdirSync, readdirSync } from "node:fs";
 import { join } from "node:path";
+import { getProjectMemoryDir } from "./utils.js";
 import {
   type MemoryCategory,
   type MemoryScope,
@@ -298,7 +299,7 @@ function supersedeEntry(cwd: string, category: string, text: string): void {
   try {
     const topicName = CATEGORY_TO_TOPIC[category as MemoryCategory];
     if (!topicName) return;
-    const topicPath = join(cwd, ".pi", "memory", "topics", `${topicName}.md`);
+    const topicPath = join(getProjectMemoryDir(cwd), "topics", `${topicName}.md`);
     if (!existsSync(topicPath)) return;
     const content = readFileSync(topicPath, "utf-8");
     const match = findTopicLine(content, category, text);
@@ -334,7 +335,7 @@ function supersedeEntry(cwd: string, category: string, text: string): void {
 function topicCapRejection(cwd: string, category: string, entryLine: string): AddMemoryResult | null {
   const topicName = CATEGORY_TO_TOPIC[category as MemoryCategory];
   if (!topicName) return null;
-  const topicPath = join(cwd, ".pi", "memory", "topics", `${topicName}.md`);
+  const topicPath = join(getProjectMemoryDir(cwd), "topics", `${topicName}.md`);
   let content = "";
   if (existsSync(topicPath)) {
     content = readFileSync(topicPath, "utf-8");
@@ -600,7 +601,7 @@ export async function addMemoryEntry(cwd: string, input: AddMemoryInput): Promis
   // 5. Topic cap + write (cap precheck already ran in the override path;
   // this re-check is a race safety net — another writer may have appended)
   const topicName = CATEGORY_TO_TOPIC[category as MemoryCategory];
-  const topicsDir = join(cwd, ".pi", "memory", "topics");
+  const topicsDir = join(getProjectMemoryDir(cwd), "topics");
   const topicPath = join(topicsDir, `${topicName}.md`);
 
   if (!existsSync(topicsDir)) {
@@ -683,7 +684,7 @@ export async function addMemoryEntry(cwd: string, input: AddMemoryInput): Promis
  * entries cannot outlive their scope (issue #915).
  */
 export function pruneExpiredEntries(cwd: string): number {
-  const topicsDir = join(cwd, ".pi", "memory", "topics");
+  const topicsDir = join(getProjectMemoryDir(cwd), "topics");
   if (!existsSync(topicsDir)) return 0;
   const scores = loadScores(cwd);
   const now = Date.now();

package/extensions/orchestrator/pi-config-review-state.ts

@@ -10,12 +10,12 @@
  * On first access, migrates any legacy pi-config-review-state.json automatically.
  */
 
-import { readFileSync, writeFileSync, unlinkSync } from "node:fs";
+import { readFileSync, writeFileSync, unlinkSync, mkdirSync } from "node:fs";
 import { join } from "node:path";
 import { getSetting } from "./project-settings.js";
 import { createCachedStore } from "./state-jsonl.js";
 import type { JsonlStateStore } from "./state-jsonl.js";
-import { resolveWorktreeRoot, getProjectDataDir } from "./utils.js";
+import { resolveWorktreeRoot } from "./utils.js";
 
 type StateTransitionCallback = (state: ReviewState) => void;
 let onTransitionCb: StateTransitionCallback | null = null;
@@ -48,13 +48,21 @@ export interface ReviewState {
 const STATE_FILE_JSONL = "pi-config-review-state.jsonl";
 const LEGACY_STATE_FILE = "pi-config-review-state.json";
 
+/** Per-worktree data dir — deliberately NOT the shared getProjectDataDir:
+ *  review state must stay per-worktree (one review loop per issue branch),
+ *  so it joins the worktree root directly (issue #918 kept this per-cwd). */
+function getWorktreeDataDir(cwd: string): string {
+  const dir = join(resolveWorktreeRoot(cwd), ".pi", "data");
+  mkdirSync(dir, { recursive: true, mode: 0o700 });
+  return dir;
+}
+
 function getStore(cwd: string): JsonlStateStore<ReviewState> {
-  const dataDir = getProjectDataDir(resolveWorktreeRoot(cwd));
-  return createCachedStore<ReviewState>(dataDir, STATE_FILE_JSONL, LEGACY_STATE_FILE);
+  return createCachedStore<ReviewState>(getWorktreeDataDir(cwd), STATE_FILE_JSONL, LEGACY_STATE_FILE);
 }
 
 export function statePath(cwd: string): string {
-  return join(getProjectDataDir(resolveWorktreeRoot(cwd)), STATE_FILE_JSONL);
+  return join(getWorktreeDataDir(cwd), STATE_FILE_JSONL);
 }
 
 function defaultState(): ReviewState {
@@ -108,7 +116,7 @@ function acquireLock(cwd: string): boolean {
   const maxRetries = 100;
   for (let i = 0; i < maxRetries; i++) {
     try {
-      getProjectDataDir(resolveWorktreeRoot(cwd));
+      getWorktreeDataDir(cwd);
       writeFileSync(lock, String(process.pid), { flag: "wx" });
       return true;
     } catch {

package/extensions/orchestrator/project-settings.ts

@@ -100,6 +100,8 @@ interface ProjectSettings {
   pidiff_stale_lock_timeout_ms?: number;
   /** Pidiff: daemon startup timeout in seconds. */
   pidiff_daemon_startup_timeout_s?: number;
+  /** Distill addressed review findings into memory lessons after `reviews address`. Default: true. */
+  review_learning?: boolean;
 }
 
 /** Settings metadata is loaded from settings-keys.json by the cycle-free settings source. */
@@ -150,6 +152,7 @@ const PROJECT_SETTINGS_KEYS: (keyof ProjectSettings)[] = [
   "coms_probe_timeout_ms",
   "pidiff_stale_lock_timeout_ms",
   "pidiff_daemon_startup_timeout_s",
+  "review_learning",
 ];
 for (const key of PROJECT_SETTINGS_KEYS) {
   if (!(key in SETTINGS_KEYS)) {
@@ -482,6 +485,7 @@ export function getSetting(cwd: string, key: "coms_entry_grace_period_ms"): numb
 export function getSetting(cwd: string, key: "coms_probe_timeout_ms"): number;
 export function getSetting(cwd: string, key: "pidiff_stale_lock_timeout_ms"): number;
 export function getSetting(cwd: string, key: "pidiff_daemon_startup_timeout_s"): number;
+export function getSetting(cwd: string, key: "review_learning"): boolean;
 export function getSetting(cwd: string, key: string): boolean | string | number | string[] | Record<string, { provider?: string | null; model?: string | null }> {
   const settings = getSettings(cwd);
   const def = SETTINGS_KEYS[key];

package/extensions/orchestrator/promotion-queue.ts

@@ -8,6 +8,7 @@
 import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
 import { dirname, join } from "node:path";
 import { createHash } from "node:crypto";
+import { getProjectMemoryDir } from "./utils.js";
 
 export type PromotionDestination =
   | "memory"
@@ -45,7 +46,7 @@ const DESTINATIONS: PromotionDestination[] = [
 const STATUSES: PromotionStatus[] = ["proposed", "applied", "rejected"];
 
 export function getPromotionsPath(cwd: string): string {
-  return join(cwd, ".pi", "memory", "promotions.md");
+  return join(getProjectMemoryDir(cwd), "promotions.md");
 }
 
 /** Stable id from destination + category + text (dedup key). */