@wrongstack/cli 0.89.1 → 0.89.3

package/dist/index.js

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { color, writeErr, renderProgress, SpecStore, TaskGraphStore, analyzeCriticalPath, getTemplate, listTemplates, templateToMarkdown, SpecParser, renderSpecAnalysis, AISpecBuilder, DefaultTaskStore, TaskTracker, renderTaskGraph, DefaultSecretScrubber, DefaultPathResolver, TOKENS, mergeCustomModelDefs, DefaultSystemPromptBuilder, makeAutonomyPromptContributor, ToolRegistry, createContextManagerTool, EventBus, resolveSessionLoggingConfig, createSessionEventBridge, HookRegistry, HookRunner, SlashCommandRegistry, BrainDecisionQueue, ObservableBrainArbiter, HumanEscalatingBrainArbiter, DefaultBrainArbiter, createDelegateTool, FLEET_ROSTER, createMcpControlTool, SpecVersioning, atomicWrite, DefaultLogger, DefaultModelsRegistry, isStdinTTY, writeOut, runProviderWithRetry, ReplayLogStore, ReplayProviderRunner, ProviderRegistry, InMemoryMetricsSink, wireMetricsToEvents, DefaultHealthRegistry, startMetricsServer, DEFAULT_SESSION_PRUNE_DAYS, RecoveryLock, DefaultAttachmentStore, QueueStore, Context, loadTodosCheckpoint, attachTodosCheckpoint, loadDirectorState, loadPlan, createDefaultPipelines, resolveContextWindowPolicy, resolveAuditLevel, AutoCompactionMiddleware, estimateRequestTokensCalibrated, Agent, loadPlugins, FleetManager, makeDirectorSessionFactory, Director, makeFleetEmitTool, makeFleetStatusTool, resolveModelMatrix, DEFAULT_SUBAGENT_BASELINE, AutoApprovePermissionPolicy, PhaseStore, AutoPhasePlanner, PhaseGraphBuilder, WorktreeManager, PhaseOrchestrator, makeLLMClassifier, ParallelEternalEngine, EternalAutonomyEngine, allServers as allServers$1, decryptConfigSecrets as decryptConfigSecrets$1, encryptConfigSecrets as encryptConfigSecrets$1, bootConfig as bootConfig$1, setOutputLineGuard, setRawMode, DefaultSessionReader, resolveWstackPaths, ToolAuditLog, DefaultSessionRewinder, DefaultSessionStore, DefaultPluginAPI, ProviderError, makeAgentSubagentRunner, NULL_FLEET_BUS, buildChildEnv, formatContextWindowModeList, repairToolUseAdjacency, getContextWindowMode, AGENTS_BY_PHASE, dispatchAgent, formatTodosList, SessionRecovery, loadGoal, goalFilePath, summarizeUsage, saveGoal, emptyGoal, buildGoalPreamble, formatGoal, pendingBtwCount, setBtwNote, MATRIX_PHASE_KEYS, AGENT_CATALOG, matrixKeyKind, onResize, ERROR_CODES, InputBuilder, FsError } from '@wrongstack/core';
+import { color, writeErr, renderProgress, SpecStore, TaskGraphStore, analyzeCriticalPath, getTemplate, listTemplates, templateToMarkdown, SpecParser, renderSpecAnalysis, AISpecBuilder, expectDefined, DefaultTaskStore, TaskTracker, renderTaskGraph, DefaultSecretScrubber, DefaultPathResolver, EventBus, TOKENS, mergeCustomModelDefs, DefaultSystemPromptBuilder, makeAutonomyPromptContributor, ToolRegistry, createContextManagerTool, resolveSessionLoggingConfig, createSessionEventBridge, HookRegistry, HookRunner, SlashCommandRegistry, SessionMemoryConsolidator, BrainDecisionQueue, ObservableBrainArbiter, HumanEscalatingBrainArbiter, DefaultBrainArbiter, createDelegateTool, FLEET_ROSTER, createMcpControlTool, SpecVersioning, atomicWrite, DefaultLogger, DefaultModelsRegistry, isStdinTTY, writeOut, runProviderWithRetry, ReplayLogStore, ReplayProviderRunner, ProviderRegistry, InMemoryMetricsSink, wireMetricsToEvents, DefaultHealthRegistry, startMetricsServer, DEFAULT_SESSION_PRUNE_DAYS, RecoveryLock, DefaultAttachmentStore, QueueStore, Context, loadTodosCheckpoint, attachTodosCheckpoint, loadDirectorState, loadPlan, createDefaultPipelines, resolveContextWindowPolicy, resolveAuditLevel, AutoCompactionMiddleware, estimateRequestTokensCalibrated, Agent, loadPlugins, FleetManager, makeDirectorSessionFactory, Director, makeFleetEmitTool, makeFleetStatusTool, resolveModelMatrix, DEFAULT_SUBAGENT_BASELINE, AutoApprovePermissionPolicy, PhaseStore, AutoPhasePlanner, PhaseGraphBuilder, WorktreeManager, PhaseOrchestrator, makeLLMClassifier, ParallelEternalEngine, EternalAutonomyEngine, allServers as allServers$1, decryptConfigSecrets as decryptConfigSecrets$1, encryptConfigSecrets as encryptConfigSecrets$1, bootConfig as bootConfig$1, setOutputLineGuard, setRawMode, DefaultSessionReader, resolveWstackPaths, ToolAuditLog, DefaultSessionRewinder, DefaultSessionStore, DefaultPluginAPI, ProviderError, makeAgentSubagentRunner, NULL_FLEET_BUS, buildChildEnv, formatContextWindowModeList, repairToolUseAdjacency, getContextWindowMode, AGENTS_BY_PHASE, dispatchAgent, formatTodosList, SessionRecovery, loadGoal, goalFilePath, summarizeUsage, saveGoal, emptyGoal, buildGoalPreamble, formatGoal, pendingBtwCount, setBtwNote, MATRIX_PHASE_KEYS, AGENT_CATALOG, matrixKeyKind, onResize, ERROR_CODES, InputBuilder, FsError } from '@wrongstack/core';
 import * as path8 from 'path';
 import { join } from 'path';
 import * as fsp4 from 'fs/promises';
@@ -15,7 +15,7 @@ import { spawn } from 'child_process';
 import { MCPRegistry, MCPServer, serveHttp, serveStdio } from '@wrongstack/mcp';
 import { capabilitiesFor, buildProviderFactoriesFromRegistry, makeProviderFromConfig } from '@wrongstack/providers';
 import { createDefaultContainer, routeImagesForModel, readClipboardImage } from '@wrongstack/runtime';
-import { builtinToolsPack, rememberTool, forgetTool, runStartupIndex, isIndexableFile, enqueueReindex, cancelPendingReindexes } from '@wrongstack/tools';
+import { builtinToolsPack, rememberTool, forgetTool, searchMemoryTool, relatedMemoryTool, runStartupIndex, isIndexableFile, enqueueReindex, cancelPendingReindexes } from '@wrongstack/tools';
 import { fileURLToPath } from 'url';
 import * as readline from 'readline';
 import * as fs12 from 'fs';
@@ -28,9 +28,7 @@ import { ToolExecutor } from '@wrongstack/core/execution';
 import { createToolVisionAdapters } from '@wrongstack/runtime/vision';
 
 var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __esm = (fn, res) => function __init() {
   return fn && (res = (0, fn[__getOwnPropNames(fn)[0]])(fn = 0)), res;
 };
@@ -38,15 +36,6 @@ var __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, { get: all[name], enumerable: true });
 };
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 function getSessionState(ctx) {
   if (!ctx) return sddState;
   let state = ctx.meta[SDD_META_KEY];
@@ -132,12 +121,6 @@ var init_state = __esm({
     sddState = new SDDState();
   }
 });
-function expectDefined3(value) {
-  if (value === null || value === void 0) {
-    throw new Error("Expected value to be defined");
-  }
-  return value;
-}
 function formatElapsed(ms) {
   if (ms < 1e3) return `${ms}ms`;
   const s = Math.floor(ms / 1e3);
@@ -201,7 +184,7 @@ function getCurrentTask() {
   if (!tracker) return null;
   const nodes = tracker.getAllNodes({ status: ["in_progress"] });
   if (nodes.length === 0) return null;
-  const n = expectDefined3(nodes[0]);
+  const n = expectDefined(nodes[0]);
   return { id: n.id, title: n.title, description: n.description, priority: n.priority, estimateHours: n.estimateHours ?? 0, tags: n.tags ?? [], startedAt: n.startedAt };
 }
 function advanceToNextTask() {
@@ -240,7 +223,7 @@ function renderTaskListWithProgress() {
     return (order[a.status] ?? 6) - (order[b.status] ?? 6);
   });
   for (let i = 0; i < sorted.length; i++) {
-    const n = expectDefined3(sorted[i]);
+    const n = expectDefined(sorted[i]);
     const status = n.status === "completed" ? "\u2705" : n.status === "in_progress" ? "\u{1F504}" : n.status === "failed" ? "\u274C" : n.status === "blocked" ? "\u{1F6AB}" : n.status === "review" ? "\u{1F441}" : "\u23F3";
     const title = n.title.length > 50 ? n.title.slice(0, 49) + "\u2026" : n.title;
     let elapsed = "";
@@ -254,7 +237,7 @@ function getCurrentExecutingContext() {
   if (!tracker) return null;
   const nodes = tracker.getAllNodes({ status: ["in_progress"] });
   if (nodes.length === 0) return null;
-  const n = expectDefined3(nodes[0]);
+  const n = expectDefined(nodes[0]);
   const elapsed = n.startedAt ? ` \xB7 elapsed: ${formatElapsed(Date.now() - n.startedAt)}` : "";
   const progress = tracker.getProgress();
   return [
@@ -562,12 +545,6 @@ __export(sdd_exports, {
   trySaveSpecFromAIOutput: () => trySaveSpecFromAIOutput,
   trySaveTasksFromAIOutput: () => trySaveTasksFromAIOutput
 });
-function expectDefined4(value) {
-  if (value === null || value === void 0) {
-    throw new Error("Expected value to be defined");
-  }
-  return value;
-}
 function getTaskTracker() {
   return getTaskTrackerExport();
 }
@@ -633,7 +610,7 @@ function buildSddCommand(opts) {
           }));
           sddState.setSessionStartTime(Date.now());
           sddState.setPhaseStartTime(Date.now());
-          const builder = expectDefined4(sddState.getBuilder());
+          const builder = expectDefined(sddState.getBuilder());
           builder.startSession(title);
           const aiPrompt = builder.getAIPrompt();
           return {
@@ -875,7 +852,7 @@ Start executing the tasks one by one.`
             return (order[a.status] ?? 6) - (order[b.status] ?? 6);
           });
           for (let i = 0; i < sorted.length; i++) {
-            const n = expectDefined4(sorted[i]);
+            const n = expectDefined(sorted[i]);
             const status = n.status === "completed" ? "\u2705" : n.status === "in_progress" ? "\u{1F504}" : n.status === "failed" ? "\u274C" : n.status === "blocked" ? "\u{1F6AB}" : n.status === "review" ? "\u{1F441}" : "\u23F3";
             const num = `${i + 1}`.padStart(3);
             const prio = n.priority.slice(0, 4).padEnd(5);
@@ -883,7 +860,7 @@ Start executing the tasks one by one.`
             const elapsed = n.status === "in_progress" && n.startedAt ? ` (${formatElapsed(Date.now() - n.startedAt)})` : "";
             lines.push(`  ${num}  ${status}     ${prio}   ${title}${elapsed}`);
             if (n.description && n.status !== "completed") {
-              const first = expectDefined4(n.description.split("\n")[0]);
+              const first = expectDefined(n.description.split("\n")[0]);
               const truncated = first.length > 42 ? first.slice(0, 41) + "\u2026" : first;
               lines.push(`        \u21B3 ${truncated}`);
             }
@@ -1050,7 +1027,7 @@ Start executing the tasks one by one.`
           if (completed.length === 0) {
             return { message: "No completed tasks to undo." };
           }
-          const last = expectDefined4(completed[completed.length - 1]);
+          const last = expectDefined(completed[completed.length - 1]);
           undoTracker.updateNodeStatus(last.id, "pending");
           const progress = undoTracker.getProgress();
           return {
@@ -1100,7 +1077,7 @@ Start executing the tasks one by one.`
             `  \u{1F504} ${next.title}`
           ];
           if (next.description) {
-            const first = expectDefined4(next.description.split("\n")[0]);
+            const first = expectDefined(next.description.split("\n")[0]);
             lines.push(`     \u21B3 ${first}`);
           }
           const taskElapsed = next.startedAt ? ` \u23F1 ${formatElapsed(Date.now() - next.startedAt)}` : "";
@@ -1212,7 +1189,7 @@ Start executing the tasks one by one.`
               return (order[a.status] ?? 6) - (order[b.status] ?? 6);
             });
             for (let i = 0; i < sorted2.length; i++) {
-              const n = expectDefined4(sorted2[i]);
+              const n = expectDefined(sorted2[i]);
               const status = n.status === "completed" ? "\u2705" : n.status === "in_progress" ? "\u{1F504}" : n.status === "failed" ? "\u274C" : n.status === "blocked" ? "\u{1F6AB}" : n.status === "review" ? "\u{1F441}" : "\u23F3";
               lines2.push(`${i + 1}. ${status} [${n.priority}] ${n.title}`);
             }
@@ -1237,7 +1214,7 @@ Start executing the tasks one by one.`
             return (order[a.status] ?? 6) - (order[b.status] ?? 6);
           });
           for (let i = 0; i < sorted.length; i++) {
-            const n = expectDefined4(sorted[i]);
+            const n = expectDefined(sorted[i]);
             const status = n.status === "completed" ? "\u2705" : n.status === "in_progress" ? "\u{1F504}" : n.status === "failed" ? "\u274C" : n.status === "blocked" ? "\u{1F6AB}" : n.status === "review" ? "\u{1F441}" : "\u23F3";
             lines.push(`${i + 1}. ${status} [${n.priority}] ${n.title}`);
           }
@@ -1285,7 +1262,7 @@ Start executing the tasks one by one.`
             maxQuestions: 10,
             sessionPath
           }));
-          const resumeBuilder = expectDefined4(sddState.getBuilder());
+          const resumeBuilder = expectDefined(sddState.getBuilder());
           const loaded = await resumeBuilder.loadSession();
           if (!loaded) {
             sddState.setBuilder(null);
@@ -1519,12 +1496,6 @@ var init_sdd = __esm({
     init_rendering();
   }
 });
-function expectDefined7(value) {
-  if (value === null || value === void 0) {
-    throw new Error("Expected value to be defined");
-  }
-  return value;
-}
 function normalizeKeys(cfg) {
   if (Array.isArray(cfg.apiKeys) && cfg.apiKeys.length > 0) {
     return cfg.apiKeys.map((k) => ({ ...k }));
@@ -1542,7 +1513,7 @@ function writeKeysBack(cfg, keys) {
     return;
   }
   cfg.apiKeys = keys;
-  const active = keys.find((k) => k.label === cfg.activeKey) ?? expectDefined7(keys[0]);
+  const active = keys.find((k) => k.label === cfg.activeKey) ?? expectDefined(keys[0]);
   cfg.apiKey = active.apiKey;
   if (!cfg.activeKey || !keys.some((k) => k.label === cfg.activeKey)) {
     cfg.activeKey = active.label;
@@ -2337,7 +2308,7 @@ async function runWebUI(opts) {
       const keys = normalizeKeys(existing);
       const existingIdx = keys.findIndex((k) => k.label === label);
       if (existingIdx >= 0) {
-        keys[existingIdx] = { ...expectDefined7(keys[existingIdx]), apiKey, createdAt: nowIso() };
+        keys[existingIdx] = { ...expectDefined(keys[existingIdx]), apiKey, createdAt: nowIso() };
       } else {
         keys.push({ label, apiKey, createdAt: nowIso() });
       }
@@ -2471,14 +2442,6 @@ try {
   if (corePkg.wrongstackApiVersion) API_VERSION = corePkg.wrongstackApiVersion;
 } catch {
 }
-
-// src/slash-commands/commit-llm.ts
-function expectDefined(value) {
-  if (value === null || value === void 0) {
-    throw new Error("Expected value to be defined");
-  }
-  return value;
-}
 async function generateCommitMessageWithLLM(diff, opts) {
   const systemPrompt = "You are a helpful assistant that generates concise, conventional-commit-formatted git commit messages. Analyze the provided diff and output ONLY the commit message (no explanation, no quotes). Format: <type>(<scope>): <short description> \u2014 <type> is one of: feat, fix, docs, style, refactor, test, chore, perf, ci, build, temp. If the diff contains multiple unrelated changes, pick the most important one. Keep the description under 72 characters. Example: feat(cli): add /commit LLM integration";
   const userPrompt = `Here is the git diff:
@@ -5424,17 +5387,11 @@ No project type auto-detected. Edit the file with project context and instructio
     }
   };
 }
-function expectDefined2(value) {
-  if (value === null || value === void 0) {
-    throw new Error("Expected value to be defined");
-  }
-  return value;
-}
 function parseMcpArgs(args) {
   const trimmed = args.trim();
   if (!trimmed || trimmed === "list") return { action: "list", name: "" };
   const parts = trimmed.split(/\s+/);
-  const action = expectDefined2(parts[0]);
+  const action = expectDefined(parts[0]);
   const name = parts[1] ?? "";
   const enable = parts.includes("--enable") || parts.includes("-e");
   switch (action) {
@@ -5681,7 +5638,7 @@ function buildMemoryCommand(opts) {
   return {
     name: "memory",
     category: "Inspect",
-    description: "Inspect or edit persistent memory: /memory [show|remember <text>|forget <query>|clear]",
+    description: "Inspect or edit persistent memory: /memory [show|remember <text>|forget <query>|clear|compact|stats]",
     async run(args) {
       const store = opts.memoryStore;
       if (!store) return { message: "No memory store configured." };
@@ -5714,14 +5671,350 @@ function buildMemoryCommand(opts) {
           await store.clear();
           return { message: "Cleared all memory scopes." };
         }
+        case "compact": {
+          return runCompact(opts);
+        }
+        case "stats": {
+          return runStats(opts);
+        }
         default:
           return {
-            message: `Unknown subcommand "${verb}". Try: show | remember <text> | forget <query> | clear`
+            message: `Unknown subcommand "${verb}". Try: show | remember <text> | forget <query> | clear | compact | stats`
           };
       }
     }
   };
 }
+function buildCompactPrompt(entries) {
+  const entriesBlock = entries.map(
+    (e, i) => `${i + 1}. [${e.ts.slice(0, 10)}] ${e.id}
+   ${e.text}${e.tags ? `
+   tags: ${e.tags.join(", ")}` : ""}${e.type ? `
+   type: ${e.type}` : ""}${e.priority ? `
+   priority: ${e.priority}` : ""}`
+  ).join("\n\n");
+  return `You are a memory curator. Your task is to review, deduplicate, and improve a set of long-term memory entries.
+
+These entries are injected into the context of an AI coding agent. Every token counts. The memory must be concise, accurate, and free of noise.
+
+## Current Memory Entries
+
+${entriesBlock}
+
+## Your Task
+
+Review each entry and return a JSON object with an "operations" array. Each operation targets one or more entries:
+
+### Actions
+
+- **"keep"** \u2014 The entry is valuable as-is. Include it in the operations so I know you reviewed it.
+- **"rewrite"** \u2014 The entry has value but needs better wording. Provide improved "newText". Target a single entry.
+- **"merge"** \u2014 Two or more entries say essentially the same thing. Combine them into one concise entry. The "targets" should list all entries being merged. Provide the combined "newText".
+- **"delete"** \u2014 The entry is obsolete, redundant, too vague, or not useful for future sessions. Target one or more entries.
+
+### Rules
+
+1. **Be ruthless about noise.** If an entry won't help a future AI agent do its job better, delete it.
+2. **Deduplicate aggressively.** Similar entries should be merged. Identical entries MUST be merged.
+3. **Keep entries concise.** Each entry should be one clear sentence. Remove filler words.
+4. **Preserve factual accuracy.** Don't change the meaning of entries unless they're wrong.
+5. **Handle every entry.** Every entry must appear in at least one operation (keep, rewrite, merge, or delete).
+6. **Prefer quality over quantity.** 10 excellent entries > 30 mediocre ones.
+7. **Tag entries appropriately.** If an entry mentions a technology or concept that could be tagged, suggest tags in the newText using #hashtag syntax.
+
+### Response Format
+
+Return ONLY valid JSON with this structure:
+
+{
+  "operations": [
+    { "action": "keep",    "targets": ["mem_1234_abcd"], "reason": "Clear and useful" },
+    { "action": "rewrite", "targets": ["mem_5678_ef01"], "newText": "Project uses pnpm v9 with ESM-only modules #pnpm #esm", "reason": "Added version and ESM detail" },
+    { "action": "merge",   "targets": ["mem_aaaa_1111", "mem_bbbb_2222"], "newText": "All packages use TypeScript strict mode with noUncheckedIndexedAccess #typescript", "reason": "Two entries about TS config, merged" },
+    { "action": "delete",  "targets": ["mem_cccc_3333"], "reason": "Obsolete \u2014 was a temporary debug note" }
+  ],
+  "summary": "Merged 2 TS entries, rewrote 1 for clarity, deleted 1 obsolete note. 12 entries \u2192 10 entries."
+}
+
+Use the EXACT entry IDs from the list above for "targets". No markdown, no explanation outside the JSON.`;
+}
+async function runCompact(opts) {
+  const store = opts.memoryStore;
+  if (!store) return { message: "No memory store configured." };
+  const entries = await store.list("project-memory");
+  if (entries.length === 0) {
+    return { message: "Memory is empty \u2014 nothing to compact." };
+  }
+  const raw = await store.read("project-memory");
+  const compactEntries = parseCompactEntries(raw);
+  if (compactEntries.length === 0) {
+    return { message: "No parseable entries found." };
+  }
+  const provider = opts.llmProvider;
+  if (!provider || !provider.complete) {
+    return { message: "No LLM provider available. /memory compact requires an active session with a configured provider." };
+  }
+  const prompt = buildCompactPrompt(compactEntries);
+  let responseText;
+  try {
+    const signal = AbortSignal.timeout(3e4);
+    const response = await provider.complete(
+      {
+        model: opts.llmModel ?? "",
+        system: [{ type: "text", text: prompt }],
+        messages: [
+          {
+            role: "user",
+            content: `Review the ${compactEntries.length} memory entries above and return operations as JSON.`
+          }
+        ],
+        maxTokens: 2e3,
+        temperature: 0.1
+        // low temperature for deterministic curation
+      },
+      { signal }
+    );
+    responseText = response.content.filter((b) => b.type === "text").map((b) => b.text).join("").trim();
+  } catch (err) {
+    return {
+      message: `LLM call failed: ${err instanceof Error ? err.message : String(err)}`
+    };
+  }
+  if (!responseText) {
+    return { message: "LLM returned empty response." };
+  }
+  let parsed;
+  try {
+    const jsonMatch = responseText.match(/\{[\s\S]*\}/);
+    if (!jsonMatch) {
+      return { message: `LLM response is not valid JSON:
+${responseText.slice(0, 500)}` };
+    }
+    parsed = JSON.parse(jsonMatch[0]);
+  } catch (err) {
+    return {
+      message: `Failed to parse LLM response: ${err instanceof Error ? err.message : String(err)}
+
+Raw response:
+${responseText.slice(0, 500)}`
+    };
+  }
+  if (!Array.isArray(parsed.operations) || parsed.operations.length === 0) {
+    return { message: "LLM returned no operations." };
+  }
+  let kept = 0;
+  let rewritten = 0;
+  let merged = 0;
+  let deleted = 0;
+  const errors = [];
+  for (const op of parsed.operations) {
+    try {
+      switch (op.action) {
+        case "keep": {
+          kept += op.targets.length;
+          break;
+        }
+        case "rewrite": {
+          if (!op.newText) {
+            errors.push(`rewrite missing newText for targets: ${op.targets.join(", ")}`);
+            continue;
+          }
+          for (const target of op.targets) {
+            await store.forget(target);
+          }
+          await store.remember(op.newText);
+          rewritten++;
+          break;
+        }
+        case "merge": {
+          if (!op.newText) {
+            errors.push(`merge missing newText for targets: ${op.targets.join(", ")}`);
+            continue;
+          }
+          for (const target of op.targets) {
+            await store.forget(target);
+          }
+          await store.remember(op.newText);
+          merged++;
+          break;
+        }
+        case "delete": {
+          for (const target of op.targets) {
+            await store.forget(target);
+          }
+          deleted += op.targets.length;
+          break;
+        }
+        default: {
+          errors.push(`unknown action "${op.action}"`);
+        }
+      }
+    } catch (err) {
+      errors.push(
+        `${op.action} failed for ${op.targets.join(", ")}: ${err instanceof Error ? err.message : String(err)}`
+      );
+    }
+  }
+  const lines = ["## Memory Compact \u2014 Complete"];
+  const stats = [];
+  if (kept > 0) stats.push(`${kept} kept`);
+  if (rewritten > 0) stats.push(`${rewritten} rewritten`);
+  if (merged > 0) stats.push(`${merged} merged`);
+  if (deleted > 0) stats.push(`${deleted} deleted`);
+  lines.push(`**Result:** ${stats.join(", ")}`);
+  lines.push(`**Before:** ${compactEntries.length} entries \u2192 **After:** ${kept + rewritten + merged} entries`);
+  if (parsed.summary) {
+    lines.push("");
+    lines.push(parsed.summary);
+  }
+  lines.push("");
+  lines.push("### Operations");
+  for (const op of parsed.operations) {
+    const icon = op.action === "keep" ? "\u2713" : op.action === "rewrite" ? "\u270F\uFE0F" : op.action === "merge" ? "\u{1F500}" : op.action === "delete" ? "\u2717" : "?";
+    const detail = op.newText ? ` \u2192 "${op.newText}"` : "";
+    lines.push(`- ${icon} **${op.action}** ${op.targets.join(", ")}${detail}`);
+    if (op.reason) lines.push(`  _${op.reason}_`);
+  }
+  if (errors.length > 0) {
+    lines.push("");
+    lines.push("### Errors");
+    for (const err of errors) {
+      lines.push(`- \u26A0\uFE0F ${err}`);
+    }
+  }
+  return { message: lines.join("\n") };
+}
+function parseCompactEntries(raw) {
+  const entries = [];
+  for (const line of raw.split("\n")) {
+    const trimmed = line.trim();
+    if (!trimmed.startsWith("- [")) continue;
+    const idMatch = trimmed.match(/mem_(\d+_\w+)/);
+    if (!idMatch) continue;
+    const id = idMatch[0] ?? "";
+    const afterId = trimmed.slice((idMatch.index ?? 0) + id.length).trim();
+    const tsMatch = trimmed.match(/^-\s*\[([^\]]+)\]/);
+    const ts = tsMatch?.[1] ?? "";
+    const tags = [];
+    const tagRe = /#([\w-]+)/g;
+    let tm;
+    while ((tm = tagRe.exec(afterId)) !== null) {
+      tags.push(tm[1] ?? "");
+    }
+    const text = afterId.replace(tagRe, "").replace(/\s{2,}/g, " ").trim();
+    if (!text) continue;
+    entries.push({ id, text, ts, tags: tags.length > 0 ? tags : void 0 });
+  }
+  return entries;
+}
+async function runStats(opts) {
+  const store = opts.memoryStore;
+  if (!store) return { message: "No memory store configured." };
+  const entries = await store.list("project-memory");
+  if (entries.length === 0) {
+    return { message: "\u{1F4CA} Memory is empty. Start adding entries with `/memory remember <text>`." };
+  }
+  const now = Date.now();
+  const lines = ["## \u{1F4CA} Memory Stats"];
+  const raw = await store.read("project-memory");
+  const byteSize = Buffer.byteLength(raw, "utf8");
+  const kbSize = (byteSize / 1024).toFixed(1);
+  const maxKb = (32e3 / 1024).toFixed(1);
+  const pctFull = (byteSize / 32e3 * 100).toFixed(0);
+  lines.push(`**Total:** ${entries.length} entries \xB7 ${kbSize} KB / ${maxKb} KB (${pctFull}%)`);
+  const byType = /* @__PURE__ */ new Map();
+  for (const e of entries) {
+    const t = e.type ?? "untyped";
+    byType.set(t, (byType.get(t) ?? 0) + 1);
+  }
+  if (byType.size > 0) {
+    lines.push("");
+    lines.push("### By Type");
+    const typeOrder = ["convention", "decision", "fact", "preference", "reference", "anti_pattern", "untyped"];
+    for (const t of typeOrder) {
+      const count = byType.get(t);
+      if (count) {
+        const bar = "\u2588".repeat(Math.min(count, 20));
+        lines.push(`- \`${t}\` ${bar} ${count}`);
+      }
+    }
+  }
+  const byPriority = /* @__PURE__ */ new Map();
+  for (const e of entries) {
+    const p = e.priority ?? "unset";
+    byPriority.set(p, (byPriority.get(p) ?? 0) + 1);
+  }
+  if (byPriority.size > 0) {
+    lines.push("");
+    lines.push("### By Priority");
+    const icon = { critical: "\u26A1", high: "\u25B2", medium: "\u25CF", low: "\u25CB", unset: "\xB7" };
+    for (const [p, count] of [...byPriority.entries()].sort((a, b) => b[1] - a[1])) {
+      lines.push(`- ${icon[p] ?? "\xB7"} \`${p}\`: ${count}`);
+    }
+  }
+  const ages = entries.map((e) => {
+    const ageDays = (now - new Date(e.ts).getTime()) / (1e3 * 60 * 60 * 24);
+    if (ageDays < 1) return "<1d";
+    if (ageDays < 7) return "<7d";
+    if (ageDays < 30) return "<30d";
+    return ">30d";
+  });
+  const byAge = /* @__PURE__ */ new Map();
+  for (const a of ages) byAge.set(a, (byAge.get(a) ?? 0) + 1);
+  lines.push("");
+  lines.push("### By Age");
+  for (const age of ["<1d", "<7d", "<30d", ">30d"]) {
+    const actual = byAge.get(age) ?? 0;
+    if (actual > 0 || age === "<7d") {
+      lines.push(`- ${age}: ${actual}`);
+    }
+  }
+  const tagCounts = /* @__PURE__ */ new Map();
+  for (const e of entries) {
+    for (const t of e.tags ?? []) {
+      tagCounts.set(t, (tagCounts.get(t) ?? 0) + 1);
+    }
+  }
+  if (tagCounts.size > 0) {
+    lines.push("");
+    lines.push("### Top Tags");
+    const sorted = [...tagCounts.entries()].sort((a, b) => b[1] - a[1]).slice(0, 10);
+    for (const [tag, count] of sorted) {
+      lines.push(`- \`#${tag}\`: ${count}`);
+    }
+  }
+  lines.push("");
+  lines.push("### Health");
+  const untyped = byType.get("untyped") ?? 0;
+  const unsetPriority = byPriority.get("unset") ?? 0;
+  const old = byAge.get(">30d") ?? 0;
+  if (untyped > entries.length * 0.5) {
+    lines.push(`- \u26A0\uFE0F ${untyped}/${entries.length} entries have no type \u2014 run \`/memory compact\` to categorize`);
+  } else if (untyped > 0) {
+    lines.push(`- \u2139\uFE0F ${untyped} entries untyped \u2014 consider categorizing`);
+  } else {
+    lines.push("- \u2705 All entries have types");
+  }
+  if (unsetPriority > entries.length * 0.5) {
+    lines.push(`- \u26A0\uFE0F ${unsetPriority}/${entries.length} entries have no priority`);
+  } else if (unsetPriority > 0) {
+    lines.push(`- \u2139\uFE0F ${unsetPriority} entries have no priority set`);
+  } else {
+    lines.push("- \u2705 All entries have priorities");
+  }
+  if (old > 5) {
+    lines.push(`- \u26A0\uFE0F ${old} entries older than 30 days \u2014 run \`/memory compact\` to review`);
+  }
+  const pct2 = Number.parseInt(pctFull);
+  if (pct2 > 80) {
+    lines.push(`- \u26A0\uFE0F Storage ${pct2}% full \u2014 run \`/memory compact\` to free space`);
+  } else {
+    lines.push(`- \u2705 Storage ${pct2}% full \u2014 healthy`);
+  }
+  lines.push("");
+  lines.push("**Commands:** `/memory show` \xB7 `/memory compact` \xB7 `/memory remember <text>`");
+  return { message: lines.join("\n") };
+}
 async function runModePicker(modeStore, reader) {
   const modes = await modeStore.listModes();
   const active = await modeStore.getActiveMode();
@@ -6397,12 +6690,6 @@ function summariseEvent(ev) {
       return color.dim("\u2026");
   }
 }
-function expectDefined5(value) {
-  if (value === null || value === void 0) {
-    throw new Error("Expected value to be defined");
-  }
-  return value;
-}
 var noOpVault3 = {
   encrypt: (v) => v,
   decrypt: (v) => v,
@@ -6495,7 +6782,7 @@ function buildSetModelCommand(opts) {
       for (const k of keys.sort()) {
         const kind = matrixKeyKind(k);
         const tag = kind === "unknown" ? color.red("?") : color.dim(kind);
-        lines.push(`    ${color.amber(k.padEnd(22))} \u2192 ${fmtEntry(expectDefined5(matrix[k]))}   ${tag}`);
+        lines.push(`    ${color.amber(k.padEnd(22))} \u2192 ${fmtEntry(expectDefined(matrix[k]))}   ${tag}`);
       }
     }
     lines.push("", color.dim("  /setmodel list for valid keys \xB7 /setmodel help for usage"));
@@ -7433,7 +7720,7 @@ async function runProjectCheck(opts) {
       try {
         const { spawn: spawn4 } = await import('child_process');
         await new Promise((resolve5, reject) => {
-          const child = spawn4("git", ["init"], { cwd });
+          const child = spawn4("git", ["init"], { cwd, signal: AbortSignal.timeout(1e4) });
           child.on("error", reject);
           child.on("close", (code) => code === 0 ? resolve5() : reject(new Error(`git init failed with ${code}`)));
         });
@@ -8139,20 +8426,14 @@ async function restoreLast(homeFn = defaultHomeDir) {
 }
 
 // src/picker.ts
-function expectDefined6(value) {
-  if (value === null || value === void 0) {
-    throw new Error("Expected value to be defined");
-  }
-  return value;
-}
 var theme = { primary: color.amber };
 async function saveToGlobalConfig(configPath2, provider, model, homeFn = () => process.env.HOME ?? os2__default.homedir()) {
   try {
     const { atomicWrite: atomicWrite14 } = await import('@wrongstack/core');
-    const fs26 = await import('fs/promises');
+    const fs27 = await import('fs/promises');
     let existing = {};
     try {
-      const raw = await fs26.readFile(configPath2, "utf8");
+      const raw = await fs27.readFile(configPath2, "utf8");
       existing = JSON.parse(raw);
     } catch {
     }
@@ -8340,7 +8621,7 @@ async function pickModel(provider, registry, renderer, reader, defaultModel) {
   while (offset < models.length) {
     const page = models.slice(offset, offset + pageSize);
     for (let i = 0; i < page.length; i++) {
-      const m = expectDefined6(page[i]);
+      const m = expectDefined(page[i]);
       const num = offset + i + 1;
       const ctx = m.limit?.context ? `${(m.limit.context / 1e3).toFixed(0)}k`.padStart(6) : "     ?";
       const cost = m.cost?.input !== void 0 ? `$${m.cost.input}/$${m.cost.output ?? "?"}` : "";
@@ -9024,7 +9305,7 @@ ${color.amber("?")} Pick: `)).trim().toLowerCase();
     }
     const idx = Number.parseInt(choice, 10);
     if (!Number.isNaN(idx) && idx >= 1 && idx <= ids.length) {
-      const pid = expectDefined7(ids[idx - 1]);
+      const pid = expectDefined(ids[idx - 1]);
       await manageProvider(pid, deps);
       continue;
     }
@@ -9114,7 +9395,7 @@ ${color.bold(providerId)} ${cfg.family ? color.dim(`[${cfg.family}]`) : color.am
       deps.renderer.write(color.dim("  (no keys saved)\n"));
     } else {
       for (let i = 0; i < keys.length; i++) {
-        const k = expectDefined7(keys[i]);
+        const k = expectDefined(keys[i]);
         const marker = k.label === active ? color.green("\u25CF") : color.dim("\u25CB");
         deps.renderer.write(
           `  ${color.dim(`${i + 1}.`.padStart(4))} ${marker} ${k.label.padEnd(20)} ${maskedKey(k.apiKey)}  ${color.dim(k.createdAt)}
@@ -9176,7 +9457,7 @@ ${color.amber("?")} ${providerId} > `)).trim();
         deps.renderer.writeError(`Usage: u <1-${keys.length}>`);
         continue;
       }
-      const target = expectDefined7(keys[arg - 1]);
+      const target = expectDefined(keys[arg - 1]);
       const newKey = await readKeyInput(deps, `Updated key for ${target.label}`);
       if (!newKey) continue;
       await mutateProviders(deps, (all) => {
@@ -9196,7 +9477,7 @@ ${color.amber("?")} ${providerId} > `)).trim();
         deps.renderer.writeError(`Usage: d <1-${keys.length}>`);
         continue;
       }
-      const target = expectDefined7(keys[arg - 1]);
+      const target = expectDefined(keys[arg - 1]);
       const confirm = (await deps.reader.readLine(
         `  ${color.amber("?")} Delete key "${target.label}" (${maskedKey(target.apiKey)})? ${color.dim("[y/N/q]")} `
       )).trim().toLowerCase();
@@ -9272,7 +9553,7 @@ ${color.amber("?")} ${providerId} > `)).trim();
         deps.renderer.writeError(`Usage: s <1-${keys.length}>`);
         continue;
       }
-      const target = expectDefined7(keys[arg - 1]);
+      const target = expectDefined(keys[arg - 1]);
       await mutateProviders(deps, (all) => {
         const p = all[providerId];
         if (!p) return;
@@ -9605,12 +9886,6 @@ function mutateProviders(deps, mutator) {
 }
 
 // src/subcommands/handlers/auth.ts
-function expectDefined8(value) {
-  if (value === null || value === void 0) {
-    throw new Error("Expected value to be defined");
-  }
-  return value;
-}
 var authCmd = async (args, deps) => {
   const flags = parseAuthFlags(args);
   const menuDeps = {
@@ -9622,7 +9897,7 @@ var authCmd = async (args, deps) => {
   };
   if (flags.positional.length === 0) return runAuthMenu(menuDeps);
   return runAuthDirect(menuDeps, {
-    providerId: expectDefined8(flags.positional[0]),
+    providerId: expectDefined(flags.positional[0]),
     label: flags.label,
     family: flags.family,
     baseUrl: flags.baseUrl,
@@ -9658,7 +9933,8 @@ var updateCmd = async (args, deps) => {
       const npmCommand = process.platform === "win32" ? "npm.cmd" : "npm";
       const child = spawn(npmCommand, ["install", "-g", "wrongstack@latest"], {
         cwd,
-        stdio: "pipe"
+        stdio: "pipe",
+        signal: AbortSignal.timeout(12e4)
       });
       let _stderr = "";
       child.stderr?.on("data", (d) => {
@@ -9845,12 +10121,6 @@ var doctorCmd = async (_args, deps) => {
   deps.renderer.write(color.green("All checks passed.\n"));
   return 0;
 };
-function expectDefined9(value) {
-  if (value === null || value === void 0) {
-    throw new Error("Expected value to be defined");
-  }
-  return value;
-}
 var exportCmd = async (args, deps) => {
   if (!deps.sessionStore) {
     deps.renderer.writeError("No session store configured.");
@@ -9862,7 +10132,7 @@ var exportCmd = async (args, deps) => {
   let includeDiagnostics = true;
   let sessionId;
   for (let i = 0; i < args.length; i++) {
-    const a = expectDefined9(args[i]);
+    const a = expectDefined(args[i]);
     if (a === "--format" || a === "-f") {
       const v = args[++i];
       if (v !== "markdown" && v !== "json" && v !== "text") {
@@ -10124,12 +10394,6 @@ async function serveMcpStdio(deps) {
 }
 
 // src/subcommands/handlers/mcp.ts
-function expectDefined10(value) {
-  if (value === null || value === void 0) {
-    throw new Error("Expected value to be defined");
-  }
-  return value;
-}
 var BUILT_IN_MCP = allServers();
 var mcpCmd = async (args, deps) => {
   const sub = args[0];
@@ -10180,7 +10444,7 @@ async function addMcpServer(args, deps) {
 `);
     if (Object.keys(deps.config.mcpServers ?? {}).length === 0)
       for (const k of Object.keys(BUILT_IN_MCP)) {
-        const s = expectDefined10(BUILT_IN_MCP[k]);
+        const s = expectDefined(BUILT_IN_MCP[k]);
         deps.renderer.write(`  ${k.padEnd(20)} ${s.description}
 `);
       }
@@ -10458,12 +10722,6 @@ var projectsCmd = async (_args, deps) => {
     return 0;
   }
 };
-function expectDefined11(value) {
-  if (value === null || value === void 0) {
-    throw new Error("Expected value to be defined");
-  }
-  return value;
-}
 var providersCmd = async (args, deps) => {
   const showAll = args.includes("--all");
   const showUnsupported = args.includes("--unsupported");
@@ -10511,7 +10769,7 @@ ${color.dim(`Current: ${deps.config.provider ?? "<unset>"} / ${deps.config.model
 function parseFlags2(args) {
   const flags = {};
   for (let i = 0; i < args.length; i++) {
-    const a = expectDefined11(args[i]);
+    const a = expectDefined(args[i]);
     if (a.startsWith("--")) {
       const eq = a.indexOf("=");
       if (eq !== -1) {
@@ -10531,7 +10789,7 @@ function parseFlags2(args) {
 function positionals(args) {
   const out = [];
   for (let i = 0; i < args.length; i++) {
-    const a = expectDefined11(args[i]);
+    const a = expectDefined(args[i]);
     if (a.startsWith("--")) {
       const eq = a.indexOf("=");
       if (eq === -1) {
@@ -10686,7 +10944,7 @@ function parseSizeFlag(raw) {
   const s = raw.trim().toLowerCase();
   const match = /^(\d+(?:\.\d+)?)\s*(k|m|b)?$/.exec(s);
   if (!match) return void 0;
-  const num = Number.parseFloat(expectDefined11(match[1]));
+  const num = Number.parseFloat(expectDefined(match[1]));
   const unit = match[2];
   if (unit === "b") return Math.round(num * 1e9);
   if (unit === "m") return Math.round(num * 1e6);
@@ -11007,12 +11265,6 @@ Fleet Run: ${runId}
 }
 
 // src/subcommands/handlers/sessions-config.ts
-function expectDefined12(value) {
-  if (value === null || value === void 0) {
-    throw new Error("Expected value to be defined");
-  }
-  return value;
-}
 var sessionsCmd = async (args, deps) => {
   const sub = args[0];
   if (sub === "fleet") {
@@ -11058,7 +11310,7 @@ var configCmd = async (args, deps) => {
 };
 function extractArg(args, key) {
   const idx = args.indexOf(key);
-  if (idx !== -1 && args[idx + 1] !== void 0) return expectDefined12(args[idx + 1]);
+  if (idx !== -1 && args[idx + 1] !== void 0) return expectDefined(args[idx + 1]);
   const eq = key.startsWith("--") ? args.find((a) => a.startsWith(`${key}=`)) : null;
   if (eq) return eq.slice(eq.indexOf("=") + 1);
   return null;
@@ -11134,12 +11386,6 @@ async function runRestore(args, deps) {
 `);
   return 0;
 }
-function expectDefined13(value) {
-  if (value === null || value === void 0) {
-    throw new Error("Expected value to be defined");
-  }
-  return value;
-}
 function parseRewindFlags(args) {
   const flags = {};
   for (let i = 0; i < args.length; i++) {
@@ -11154,7 +11400,7 @@ function parseRewindFlags(args) {
 }
 function findSessionId(args) {
   for (let i = 0; i < args.length; i++) {
-    const a = expectDefined13(args[i]);
+    const a = expectDefined(args[i]);
     if (a === "--last" || a === "--to") {
       i++;
       continue;
@@ -11406,10 +11652,10 @@ var auditCmd = async (args, deps) => {
   return verify.ok ? 0 : 1;
 };
 async function listAudits(log, dir, deps) {
-  const fs26 = await import('fs/promises');
+  const fs27 = await import('fs/promises');
   let entries;
   try {
-    entries = await fs26.readdir(dir);
+    entries = await fs27.readdir(dir);
   } catch {
     deps.renderer.write(
       color.dim(`No sessions dir found at ${dir}. Run a session first.`) + "\n"
@@ -11560,22 +11806,22 @@ function fmtDuration(ms) {
   const remMin = m - h * 60;
   return `${h}h${remMin}m`;
 }
-function fmtTaskResultLine(r, color52) {
+function fmtTaskResultLine(r, color51) {
   const stats = `${r.iterations}it ${r.toolCalls}tc ${fmtDuration(r.durationMs)}`;
   const errMsg = typeof r.error === "string" ? r.error : r.error?.message;
   const errKind = typeof r.error === "object" ? r.error?.kind : void 0;
   const errTail = errMsg ? ` \u2014 ${errMsg.replace(/\s+/g, " ").slice(0, 80)}${errMsg.length > 80 ? "\u2026" : ""}` : "";
-  const errKindChip = errKind ? color52.dim(` [${errKind}]`) : "";
-  const errSnip = errMsg || errKind ? `${errKindChip}${color52.dim(errTail)}` : "";
+  const errKindChip = errKind ? color51.dim(` [${errKind}]`) : "";
+  const errSnip = errMsg || errKind ? `${errKindChip}${color51.dim(errTail)}` : "";
   switch (r.status) {
     case "success":
-      return { mark: color52.green("\u2713"), stats, tail: "" };
+      return { mark: color51.green("\u2713"), stats, tail: "" };
     case "timeout":
-      return { mark: color52.yellow("\u23F1"), stats: `${color52.yellow("timeout")} ${stats}`, tail: errSnip };
+      return { mark: color51.yellow("\u23F1"), stats: `${color51.yellow("timeout")} ${stats}`, tail: errSnip };
     case "stopped":
-      return { mark: color52.dim("\u2298"), stats: `${color52.dim("stopped")} ${stats}`, tail: errSnip };
+      return { mark: color51.dim("\u2298"), stats: `${color51.dim("stopped")} ${stats}`, tail: errSnip };
     case "failed":
-      return { mark: color52.red("\u2717"), stats: `${color52.red("failed")} ${stats}`, tail: errSnip };
+      return { mark: color51.red("\u2717"), stats: `${color51.red("failed")} ${stats}`, tail: errSnip };
   }
 }
 
@@ -11697,6 +11943,7 @@ async function boot(argv) {
   const isSingleShot = positional.length > 0 || typeof flags["prompt"] === "string";
   const isInteractiveTTY = isStdinTTY() && !isSingleShot;
   if (isInteractiveTTY) {
+    await checkGitInCwd({ cwd, renderer, reader });
     const cont = await runProjectCheck({ projectRoot, cwd, renderer, reader });
     if (!cont) {
       await reader.close();
@@ -11860,6 +12107,61 @@ async function boot(argv) {
     updateInfo
   };
 }
+async function checkGitInCwd(opts) {
+  const { cwd, renderer, reader } = opts;
+  const cwdGit = path8.join(cwd, ".git");
+  let hasCwdGit = false;
+  try {
+    await fsp4.access(cwdGit);
+    hasCwdGit = true;
+  } catch {
+  }
+  if (!hasCwdGit) {
+    renderer.write(
+      `
+  ${color.amber("\u25CB")} This folder has no ${color.bold(".git")} repository.
+`
+    );
+    const answer = (await reader.readLine(
+      `  ${color.amber("?")} Initialize one here? ${color.dim("[y/N]")} `
+    )).trim().toLowerCase();
+    if (answer === "y" || answer === "yes") {
+      try {
+        const { spawn: spawn4 } = await import('child_process');
+        await new Promise((resolve5, reject) => {
+          const child = spawn4("git", ["init"], {
+            cwd,
+            signal: AbortSignal.timeout(1e4)
+          });
+          child.on("error", reject);
+          child.on(
+            "close",
+            (code) => code === 0 ? resolve5() : reject(new Error(`git init failed with ${code}`))
+          );
+        });
+        renderer.write(`  ${color.green("\u2713")} Git repository initialized
+`);
+        hasCwdGit = true;
+      } catch (err) {
+        renderer.writeError(
+          `git init failed: ${err instanceof Error ? err.message : String(err)}
+`
+        );
+      }
+    }
+  }
+  const parentDir = path8.dirname(cwd);
+  if (parentDir !== cwd) {
+    try {
+      await fsp4.access(path8.join(parentDir, ".git"));
+      renderer.write(
+        `  ${color.dim("\u2139")} A ${color.bold(".git")} repo exists in the parent directory: ${color.dim(parentDir)}
+`
+      );
+    } catch {
+    }
+  }
+}
 var CONTEXT_OVERFLOW_RE = /context window|exceeds the context|too many tokens|context.*tokens/i;
 function contextOverflowHint(err) {
   const structured = err.code === ERROR_CODES.PROVIDER_CONTEXT_OVERFLOW || err.code === ERROR_CODES.AGENT_CONTEXT_OVERFLOW;
@@ -12168,12 +12470,6 @@ async function predictNextTasks(input, opts) {
   }
 }
 init_sdd();
-function expectDefined14(value) {
-  if (value === null || value === void 0) {
-    throw new Error("Expected value to be defined");
-  }
-  return value;
-}
 async function runRepl(opts) {
   if (opts.banner !== false) printBanner(opts.renderer, opts.projectName);
   await renderGoalBanner(opts);
@@ -12689,7 +12985,7 @@ async function renderGoalBanner(opts) {
     color.dim("Goal: ") + stateColor(summary) + color.dim(` [${goal.goalState}]  (iter ${goal.iterations})`) + "\n"
   );
   if (goal.journal.length > 0) {
-    const lastEntry = expectDefined14(goal.journal[goal.journal.length - 1]);
+    const lastEntry = expectDefined(goal.journal[goal.journal.length - 1]);
     const statusIcon = lastEntry.status === "success" ? "\u2713" : lastEntry.status === "failure" ? "\u2717" : lastEntry.status === "aborted" ? "\u2298" : lastEntry.status === "skipped" ? "\u229D" : "\xB7";
     opts.renderer.write(
       color.dim(`  Last: ${statusIcon} ${lastEntry.task} (${lastEntry.status})`) + "\n"
@@ -13159,8 +13455,8 @@ async function execute(deps) {
           initialGoal: goalFlag,
           initialAsk: askFlag,
           projectRoot,
-          getSDDContext: () => {
-            const { getActiveSDDContext: getActiveSDDContext2 } = (init_sdd(), __toCommonJS(sdd_exports));
+          getSDDContext: async () => {
+            const { getActiveSDDContext: getActiveSDDContext2 } = await Promise.resolve().then(() => (init_sdd(), sdd_exports));
             return getActiveSDDContext2();
           },
           onSDDOutput: async (output) => {
@@ -13171,7 +13467,7 @@ async function execute(deps) {
               autoDetectTaskCompletion: autoDetectTaskCompletion2,
               getTaskProgress: getTaskProgress2,
               getActiveSDDPhase: getActiveSDDPhase2
-            } = (init_sdd(), __toCommonJS(sdd_exports));
+            } = await Promise.resolve().then(() => (init_sdd(), sdd_exports));
             const messages = [];
             const specSaved = await trySaveSpecFromAIOutput2(output);
             if (specSaved)
@@ -13291,12 +13587,6 @@ async function execute(deps) {
   }
   return code;
 }
-function expectDefined15(value) {
-  if (value === null || value === void 0) {
-    throw new Error("Expected value to be defined");
-  }
-  return value;
-}
 function buildRoutingRunner(config, host) {
   const standardRunner = makeAgentSubagentRunner({
     factory: host.makeSubagentFactory(config),
@@ -13305,7 +13595,7 @@ function buildRoutingRunner(config, host) {
   return async (task, ctx) => {
     const subCfg = ctx.config;
     if (subCfg.provider === "acp") {
-      const cacheKey = subCfg.role ?? subCfg.name ?? expectDefined15(subCfg.id);
+      const cacheKey = subCfg.role ?? subCfg.name ?? expectDefined(subCfg.id);
       return host.buildACPRunner(cacheKey).then((r) => r(task, ctx));
     }
     return standardRunner(task, ctx);
@@ -14163,7 +14453,8 @@ function gitText(args, cwd) {
     const child = spawn("git", args, {
       cwd,
       env: buildChildEnv(),
-      stdio: ["ignore", "pipe", "pipe"]
+      stdio: ["ignore", "pipe", "pipe"],
+      signal: AbortSignal.timeout(1e4)
     });
     child.stdout?.on("data", (c) => {
       out += c.toString();
@@ -14186,7 +14477,8 @@ function runCmd(cmd, args, cwd, shell = false) {
       cwd,
       env: buildChildEnv(),
       stdio: ["ignore", "pipe", "pipe"],
-      shell: shell || process.platform === "win32"
+      shell: shell || process.platform === "win32",
+      signal: AbortSignal.timeout(3e4)
     });
     child.stdout?.on("data", (c) => {
       out += c.toString();
@@ -14922,10 +15214,9 @@ async function setupCodebaseIndexing(deps) {
   const onError = (err) => logger.debug(`codebase auto-index failed: ${err instanceof Error ? err.message : String(err)}`);
   if (idx.onSessionStart) {
     void runStartupIndex({ projectRoot }).then((r) => {
-      const summary = `${color.green("\u2713")} codebase index ready ${color.dim(`\u2014 ${r.symbolsIndexed} symbols \xB7 ${r.filesIndexed} files \xB7 ${r.durationMs}ms`)}`;
-      process.stderr.write(`
-${summary}
-`);
+      logger.info(
+        `codebase index ready: ${r.symbolsIndexed} symbols \xB7 ${r.filesIndexed} files \xB7 ${r.durationMs}ms`
+      );
     }).catch((err) => {
       logger.warn(
         `codebase index (startup) failed: ${err instanceof Error ? err.message : String(err)}`
@@ -15194,12 +15485,6 @@ Try \`wstack models refresh\` once you have network access, or run with --no-fea
   }
   return { resolvedProvider, provider, providerRegistry };
 }
-function expectDefined16(value) {
-  if (value === null || value === void 0) {
-    throw new Error("Expected value to be defined");
-  }
-  return value;
-}
 async function setupSession(params) {
   const {
     config,
@@ -15265,7 +15550,7 @@ async function setupSession(params) {
   const context = new Context({
     systemPrompt,
     provider,
-    session: expectDefined16(session),
+    session: expectDefined(session),
     signal: ctxSignal,
     tokenCounter,
     cwd,
@@ -15321,7 +15606,7 @@ async function setupSession(params) {
     }
   }
   return {
-    session: expectDefined16(session),
+    session: expectDefined(session),
     sessionRef,
     context,
     restoredMessages,
@@ -15430,12 +15715,6 @@ async function launchEternalFromFlag(deps) {
 }
 
 // src/cli-main.ts
-function expectDefined17(value) {
-  if (value === null || value === void 0) {
-    throw new Error("Expected value to be defined");
-  }
-  return value;
-}
 async function main(argv) {
   const ctx = await boot(argv);
   if (typeof ctx === "number") return ctx;
@@ -15455,11 +15734,14 @@ async function main(argv) {
   } = ctx;
   updateInfo = await printUpdateNotice(updateInfo);
   const pathResolver = new DefaultPathResolver(cwd);
+  const events = new EventBus();
+  events.setLogger(logger);
   const container = createDefaultContainer({
     config,
     wpaths,
     logger,
     modelsRegistry,
+    events,
     permission: {
       yolo: config.yolo,
       yoloDestructive: flags["yolo-destructive"] === true || flags["force-all-yolo"] === true,
@@ -15558,9 +15840,9 @@ async function main(argv) {
   if (config.features.memory) {
     toolRegistry.register(rememberTool(memoryStore));
     toolRegistry.register(forgetTool(memoryStore));
+    toolRegistry.register(searchMemoryTool(memoryStore));
+    toolRegistry.register(relatedMemoryTool(memoryStore));
   }
-  const events = new EventBus();
-  events.setLogger(logger);
   const { metricsSink, healthRegistry } = (() => {
     const ms = setupMetrics({
       flags,
@@ -15574,35 +15856,40 @@ async function main(argv) {
   const tuiOwnsScreen = flags.tui === true && flags["no-tui"] !== true;
   const spinner = new Spinner(process.stderr, { enabled: !tuiOwnsScreen });
   let lastInputTokens = 0;
-  events.on("provider.response", (e) => {
+  const teardownHandlers = [];
+  const evOn = (event, handler) => {
+    events.on(event, handler);
+    teardownHandlers.push(() => events.off(event, handler));
+  };
+  evOn("provider.response", (e) => {
     lastInputTokens = e.usage?.input ?? 0;
     updateSpinnerContext();
   });
-  events.on("iteration.started", () => {
+  evOn("iteration.started", () => {
     updateSpinnerContext();
     spinner.start(color.dim(`${config.provider}/${config.model} thinking\u2026`));
   });
-  events.on("provider.response", () => {
+  evOn("provider.response", () => {
     spinner.stop();
   });
-  events.on("error", () => {
+  evOn("error", () => {
     spinner.stop();
   });
   let streamingActive = false;
-  events.on("provider.text_delta", (p) => {
+  evOn("provider.text_delta", (p) => {
     if (!streamingActive) {
       spinner.stop();
       streamingActive = true;
     }
     renderer.write(p.text);
   });
-  events.on("iteration.completed", () => {
+  evOn("iteration.completed", () => {
     if (streamingActive) {
       renderer.write("\n");
       streamingActive = false;
     }
   });
-  events.on("provider.retry", (p) => {
+  evOn("provider.retry", (p) => {
     spinner.stop();
     if (streamingActive) {
       renderer.write("\n");
@@ -15613,7 +15900,7 @@ async function main(argv) {
 `));
     spinner.start(color.dim(`${config.provider}/${config.model} thinking\u2026`));
   });
-  events.on("provider.error", (p) => {
+  evOn("provider.error", (p) => {
     spinner.stop();
     if (streamingActive) {
       renderer.write("\n");
@@ -15666,7 +15953,7 @@ async function main(argv) {
   );
   const stats = new SessionStats(events, tokenCounter);
   const errorRing = [];
-  events.on("error", (e) => {
+  evOn("error", (e) => {
     const err = e.err;
     const code = err && typeof err === "object" && "code" in err && typeof err.code === "string" ? err.code : "UNKNOWN";
     const message = e.err instanceof Error ? e.err.message : String(e.err);
@@ -15681,7 +15968,7 @@ async function main(argv) {
     }).catch(() => {
     });
   });
-  events.on("tool.started", (e) => {
+  evOn("tool.started", (e) => {
     sessionBridge.append({
       type: "tool_call_start",
       ts: (/* @__PURE__ */ new Date()).toISOString(),
@@ -15691,7 +15978,7 @@ async function main(argv) {
     }).catch(() => {
     });
   });
-  events.on("tool.executed", (e) => {
+  evOn("tool.executed", (e) => {
     sessionBridge.append({
       type: "tool_call_end",
       ts: (/* @__PURE__ */ new Date()).toISOString(),
@@ -15707,16 +15994,16 @@ async function main(argv) {
     });
   });
   if (!tuiOwnsScreen) {
-    events.on("delegate.started", (e) => {
+    evOn("delegate.started", (e) => {
       const task = e.task.length > 100 ? `${e.task.slice(0, 99)}\u2026` : e.task;
       renderer.writeInfo(`\u{1F91D} Delegating \u2192 ${e.target}: ${task}`);
     });
-    events.on("delegate.completed", (e) => {
+    evOn("delegate.completed", (e) => {
       const cost = e.costUsd && e.costUsd > 0 ? ` \xB7 $${e.costUsd.toFixed(4)}` : "";
       renderer.writeInfo(`${e.ok ? "\u2705" : "\u274C"} ${e.summary}${cost}`);
     });
   }
-  events.on("tool.progress", (e) => {
+  evOn("tool.progress", (e) => {
     sessionBridge.append({
       type: "tool_progress",
       ts: (/* @__PURE__ */ new Date()).toISOString(),
@@ -15726,7 +16013,7 @@ async function main(argv) {
     }).catch(() => {
     });
   });
-  events.on("provider.retry", (e) => {
+  evOn("provider.retry", (e) => {
     sessionBridge.append({
       type: "provider_retry",
       ts: (/* @__PURE__ */ new Date()).toISOString(),
@@ -15738,7 +16025,7 @@ async function main(argv) {
     }).catch(() => {
     });
   });
-  events.on("provider.error", (e) => {
+  evOn("provider.error", (e) => {
     sessionBridge.append({
       type: "provider_error",
       ts: (/* @__PURE__ */ new Date()).toISOString(),
@@ -15870,6 +16157,13 @@ async function main(argv) {
     logger
   });
   if (fallbackExtension) agent.extensions.register(fallbackExtension);
+  if (config.features.memory && config.features.memoryConsolidation !== false) {
+    agent.extensions.register(
+      new SessionMemoryConsolidator({
+        memoryStore
+      })
+    );
+  }
   const switchProviderAndModel = (providerId, modelId) => {
     try {
       context.provider = buildProviderForId(providerId);
@@ -15916,10 +16210,10 @@ async function main(argv) {
     }
   };
   const fleetRoot = directorMode ? path8.join(wpaths.projectSessions, session.id) : void 0;
-  const manifestPath = directorMode ? typeof process.env["WRONGSTACK_FLEET_MANIFEST"] === "string" ? process.env["WRONGSTACK_FLEET_MANIFEST"] : path8.join(expectDefined17(fleetRoot), "fleet.json") : void 0;
-  const sharedScratchpadPath = directorMode ? path8.join(expectDefined17(fleetRoot), "shared") : void 0;
-  const subagentSessionsRoot = directorMode ? path8.join(expectDefined17(fleetRoot), "subagents") : void 0;
-  const stateCheckpointPath = directorMode ? path8.join(expectDefined17(fleetRoot), "director-state.json") : void 0;
+  const manifestPath = directorMode ? typeof process.env["WRONGSTACK_FLEET_MANIFEST"] === "string" ? process.env["WRONGSTACK_FLEET_MANIFEST"] : path8.join(expectDefined(fleetRoot), "fleet.json") : void 0;
+  const sharedScratchpadPath = directorMode ? path8.join(expectDefined(fleetRoot), "shared") : void 0;
+  const subagentSessionsRoot = directorMode ? path8.join(expectDefined(fleetRoot), "subagents") : void 0;
+  const stateCheckpointPath = directorMode ? path8.join(expectDefined(fleetRoot), "director-state.json") : void 0;
   const fleetRootForPromotion = path8.join(wpaths.projectSessions, session.id);
   const brainQueue = new BrainDecisionQueue(events);
   const brain = new ObservableBrainArbiter(
@@ -16338,7 +16632,7 @@ async function main(argv) {
           ...matches.map((m) => `  ${m.subagentId}  (${m.runId})`)
         ].join("\n");
       }
-      const t = expectDefined17(matches[0]);
+      const t = expectDefined(matches[0]);
       const raw = await fsp4.readFile(t.file, "utf8");
       if (mode === "raw") return raw;
       const lines = raw.split("\n").filter((l) => l.trim());
@@ -16588,6 +16882,8 @@ Restart WrongStack to load or unload plugin code in this session.`;
       parallelEngine?.stop();
     },
     onExit: () => {
+      for (const teardown of teardownHandlers) teardown();
+      teardownHandlers.length = 0;
       brainQueue.dispose();
       void mcpRegistry.stopAll();
     },
@@ -16597,7 +16893,8 @@ Restart WrongStack to load or unload plugin code in this session.`;
         (resolve5, reject) => {
           const child = spawn("git", ["status", "--porcelain"], {
             cwd: cwd2,
-            stdio: ["ignore", "pipe", "pipe"]
+            stdio: ["ignore", "pipe", "pipe"],
+            signal: AbortSignal.timeout(5e3)
           });
           let stdout = "";
           child.stdout?.on("data", (d) => {