@pi-unipi/unipi 2.4.2 → 2.5.0

package/packages/unipi/bundled.js

@@ -868,12 +868,40 @@ var init_core = __esm({
 
 // packages/memory/mempalace.ts
 import { spawnSync, spawn } from "node:child_process";
+import { createHash } from "node:crypto";
+import { createRequire } from "node:module";
 import * as fs4 from "node:fs";
 import * as path4 from "node:path";
 import * as os from "node:os";
 import { fileURLToPath as fileURLToPath3 } from "node:url";
-function dirname5(p) {
-  return path4.dirname(p);
+function isReadableFile(candidate) {
+  try {
+    return fs4.statSync(candidate).isFile() && fs4.accessSync(candidate, fs4.constants.R_OK) === void 0;
+  } catch {
+    return false;
+  }
+}
+function resolveMempalaceBridgePath(moduleUrl = import.meta.url) {
+  const moduleDir = path4.dirname(fileURLToPath3(moduleUrl));
+  const candidates = [];
+  if (process.env.UNIPI_MEMPALACE_BRIDGE) {
+    candidates.push(path4.resolve(process.env.UNIPI_MEMPALACE_BRIDGE));
+  }
+  candidates.push(
+    path4.join(moduleDir, "bridge", "mempalace_bridge.py"),
+    path4.join(moduleDir, "..", "memory", "bridge", "mempalace_bridge.py")
+  );
+  try {
+    const require2 = createRequire(moduleUrl);
+    const memoryPackage = require2.resolve("@pi-unipi/memory/package.json");
+    candidates.push(path4.join(path4.dirname(memoryPackage), "bridge", "mempalace_bridge.py"));
+  } catch {
+  }
+  return candidates.find(isReadableFile) ?? null;
+}
+function getBridgePath() {
+  if (cachedBridgePath === void 0) cachedBridgePath = resolveMempalaceBridgePath();
+  return cachedBridgePath;
 }
 function which(bin) {
   try {
@@ -973,17 +1001,71 @@ function invalidatePingVerified() {
   } catch {
   }
 }
-function isMigrated() {
-  return fs4.existsSync(MIGRATED_FLAG);
+function getMemorySourceFingerprint(sourceDir = path4.join(os.homedir(), ".unipi", "memory")) {
+  const hash = createHash("sha256");
+  if (!fs4.existsSync(sourceDir)) return hash.update("missing").digest("hex");
+  const visit = (dir) => {
+    let entries;
+    try {
+      entries = fs4.readdirSync(dir, { withFileTypes: true }).sort((a, b) => a.name.localeCompare(b.name));
+    } catch {
+      hash.update(`unreadable:${dir}`);
+      return;
+    }
+    for (const entry of entries) {
+      if (entry.name.startsWith(".")) continue;
+      const full = path4.join(dir, entry.name);
+      if (entry.isDirectory()) {
+        visit(full);
+        continue;
+      }
+      if (!entry.isFile() || entry.name !== "memory.db" && !entry.name.endsWith(".md")) continue;
+      try {
+        const stat = fs4.statSync(full);
+        hash.update(`${path4.relative(sourceDir, full)}\0${stat.size}\0${stat.mtimeMs}
+`);
+      } catch {
+        hash.update(`unreadable:${path4.relative(sourceDir, full)}
+`);
+      }
+    }
+  };
+  visit(sourceDir);
+  return hash.digest("hex");
+}
+function readMigrationState(flagPath = MIGRATED_FLAG) {
+  try {
+    const parsed = JSON.parse(fs4.readFileSync(flagPath, "utf-8"));
+    if (parsed?.version !== MIGRATION_STATE_VERSION || typeof parsed.completedAt !== "string" || typeof parsed.sourceFingerprint !== "string" || !parsed.result || parsed.result.failed !== 0 || parsed.result.verified !== parsed.result.discovered) return null;
+    return parsed;
+  } catch {
+    return null;
+  }
+}
+function isMigrated(sourceFingerprint = getMemorySourceFingerprint(), flagPath = MIGRATED_FLAG) {
+  return readMigrationState(flagPath)?.sourceFingerprint === sourceFingerprint;
 }
-function markMigrated() {
+function markMigrated(sourceFingerprint, result, flagPath = MIGRATED_FLAG) {
+  if (result.failed !== 0 || result.verified !== result.discovered) return false;
   try {
-    fs4.mkdirSync(path4.dirname(MIGRATED_FLAG), { recursive: true });
-    fs4.writeFileSync(MIGRATED_FLAG, (/* @__PURE__ */ new Date()).toISOString(), "utf-8");
+    fs4.mkdirSync(path4.dirname(flagPath), { recursive: true });
+    const state = {
+      version: MIGRATION_STATE_VERSION,
+      completedAt: (/* @__PURE__ */ new Date()).toISOString(),
+      sourceFingerprint,
+      result
+    };
+    const temp = `${flagPath}.${process.pid}.tmp`;
+    fs4.writeFileSync(temp, JSON.stringify(state, null, 2), "utf-8");
+    fs4.renameSync(temp, flagPath);
+    return true;
   } catch {
+    return false;
   }
 }
-function runBridge(install, palace, cmd, args = {}) {
+function runBridge(install, palace, cmd, args = {}, timeoutMs = 6e4) {
+  const bridgePath = getBridgePath();
+  if (!bridgePath) return null;
   let argsJson;
   try {
     argsJson = JSON.stringify(args);
@@ -992,9 +1074,9 @@ function runBridge(install, palace, cmd, args = {}) {
   }
   let res;
   try {
-    res = spawnSync(install.python, [BRIDGE_PATH, palace, cmd, argsJson], {
+    res = spawnSync(install.python, [bridgePath, palace, cmd, argsJson], {
       encoding: "utf-8",
-      timeout: 6e4,
+      timeout: timeoutMs,
       maxBuffer: 64 * 1024 * 1024
     });
   } catch {
@@ -1013,22 +1095,27 @@ function runBridge(install, palace, cmd, args = {}) {
     return null;
   }
 }
-function runBridgeAsync(install, palace, cmd, args = {}) {
-  return new Promise((resolve13) => {
+function runBridgeAsync(install, palace, cmd, args = {}, timeoutMs = 6e4) {
+  return new Promise((resolve14) => {
+    const bridgePath = getBridgePath();
+    if (!bridgePath) {
+      resolve14(null);
+      return;
+    }
     let argsJson;
     try {
       argsJson = JSON.stringify(args);
     } catch {
-      resolve13(null);
+      resolve14(null);
       return;
     }
     let child;
     try {
-      child = spawn(install.python, [BRIDGE_PATH, palace, cmd, argsJson], {
+      child = spawn(install.python, [bridgePath, palace, cmd, argsJson], {
         stdio: ["ignore", "pipe", "ignore"]
       });
     } catch {
-      resolve13(null);
+      resolve14(null);
       return;
     }
     let out = "";
@@ -1037,7 +1124,7 @@ function runBridgeAsync(install, palace, cmd, args = {}) {
       if (settled) return;
       settled = true;
       clearTimeout(timer);
-      resolve13(value);
+      resolve14(value);
     };
     const timer = setTimeout(() => {
       try {
@@ -1045,7 +1132,7 @@ function runBridgeAsync(install, palace, cmd, args = {}) {
       } catch {
       }
       finish(null);
-    }, 6e4);
+    }, timeoutMs);
     timer.unref?.();
     child.stdout?.setEncoding("utf-8");
     child.stdout?.on("data", (chunk) => {
@@ -1065,7 +1152,7 @@ function runBridgeAsync(install, palace, cmd, args = {}) {
     });
   });
 }
-var DEFAULT_PALACE, INSTALL_FLAG, MIGRATED_FLAG, PING_VERIFIED_FLAG, PING_VERIFIED_TTL_MS, BRIDGE_PATH;
+var DEFAULT_PALACE, INSTALL_FLAG, MIGRATED_FLAG, PING_VERIFIED_FLAG, PING_VERIFIED_TTL_MS, MIGRATION_STATE_VERSION, cachedBridgePath;
 var init_mempalace = __esm({
   "packages/memory/mempalace.ts"() {
     "use strict";
@@ -1074,7 +1161,7 @@ var init_mempalace = __esm({
     MIGRATED_FLAG = path4.join(os.homedir(), ".unipi", "memory", ".mempalace-migrated");
     PING_VERIFIED_FLAG = path4.join(os.homedir(), ".unipi", "memory", ".mempalace-ping-verified");
     PING_VERIFIED_TTL_MS = 24 * 60 * 60 * 1e3;
-    BRIDGE_PATH = path4.join(dirname5(fileURLToPath3(import.meta.url)), "bridge", "mempalace_bridge.py");
+    MIGRATION_STATE_VERSION = 2;
   }
 });
 
@@ -1174,7 +1261,7 @@ function parseMemoryContent(content) {
   const [, frontmatterStr, body] = match;
   const frontmatter = yaml.load(frontmatterStr);
   return {
-    id: "",
+    id: frontmatter.id || "",
     title: frontmatter.title,
     content: body.trim(),
     tags: frontmatter.tags || [],
@@ -1186,6 +1273,7 @@ function parseMemoryContent(content) {
 }
 function writeMemoryFile(filePath, record) {
   const frontmatter = {
+    id: record.id,
     title: record.title,
     tags: record.tags,
     project: record.project,
@@ -1405,12 +1493,15 @@ var init_storage = __esm({
         }
         this.mempalaceInstall = install;
         this.backend = "mempalace";
-        if (!isMigrated()) {
+        const sourceFingerprint = getMemorySourceFingerprint(getMemoryBaseDir());
+        if (!isMigrated(sourceFingerprint)) {
           try {
-            runBridge(install, this.palacePath, "migrate", {
+            const result = runBridge(install, this.palacePath, "migrate", {
               source_dir: getMemoryBaseDir()
-            });
-            markMigrated();
+            }, 15 * 6e4);
+            if (result && result.failed === 0 && result.verified === result.discovered) {
+              markMigrated(sourceFingerprint, result);
+            }
           } catch {
           }
         }
@@ -1597,7 +1688,7 @@ ${record.content}
           const filePath = path5.join(this.scopeDir, file);
           const record = parseMemoryFile(filePath);
           if (!record) continue;
-          const id = record.title.toLowerCase().replace(/[^a-z0-9]+/g, "_");
+          const id = record.id || record.title.toLowerCase().replace(/[^a-z0-9]+/g, "_");
           if (existingIds.has(id)) continue;
           try {
             record.id = id;
@@ -2239,8 +2330,8 @@ var init_embedding = __esm({
 });
 
 // packages/info-screen/usage-parser.ts
-import { readdirSync as readdirSync4, readFileSync as readFileSync8, statSync as statSync4, existsSync as existsSync9, mkdirSync as mkdirSync7, writeFileSync as writeFileSync8, renameSync as renameSync2, openSync, readSync, closeSync } from "node:fs";
-import { join as join9, dirname as dirname10 } from "node:path";
+import { readdirSync as readdirSync5, readFileSync as readFileSync8, statSync as statSync5, existsSync as existsSync9, mkdirSync as mkdirSync7, writeFileSync as writeFileSync8, renameSync as renameSync3, openSync, readSync, closeSync } from "node:fs";
+import { join as join9, dirname as dirname9 } from "node:path";
 import { homedir as homedir5 } from "node:os";
 function getCachePath() {
   const base = process.env.UNIPI_DIR || join9(homedir5(), ".unipi");
@@ -2262,10 +2353,10 @@ function readCache() {
 function writeCache(cache) {
   try {
     const path28 = getCachePath();
-    mkdirSync7(dirname10(path28), { recursive: true });
+    mkdirSync7(dirname9(path28), { recursive: true });
     const tmp = `${path28}.${process.pid}.tmp`;
     writeFileSync8(tmp, JSON.stringify(cache), "utf-8");
-    renameSync2(tmp, path28);
+    renameSync3(tmp, path28);
   } catch {
   }
 }
@@ -2361,7 +2452,7 @@ function extractRecords(filePath, modelIndex, models) {
 }
 function collectSessionFiles(dir, files) {
   try {
-    const entries = readdirSync4(dir, { withFileTypes: true });
+    const entries = readdirSync5(dir, { withFileTypes: true });
     for (const entry of entries) {
       const entryPath = join9(dir, entry.name);
       if (entry.isDirectory()) {
@@ -2375,7 +2466,7 @@ function collectSessionFiles(dir, files) {
 }
 async function parseUsageStatsAsync() {
   const yielder = async () => {
-    await new Promise((resolve13) => setImmediate(resolve13));
+    await new Promise((resolve14) => setImmediate(resolve14));
   };
   const { stats, pending } = collectStats(yielder);
   if (pending) await pending;
@@ -2411,7 +2502,7 @@ function collectStats(yielder) {
     let mtimeMs = 0;
     let size = 0;
     try {
-      const st = statSync4(filePath);
+      const st = statSync5(filePath);
       mtimeMs = st.mtimeMs;
       size = st.size;
     } catch {
@@ -2592,19 +2683,19 @@ __export(env_exports, {
   formatEnvironmentInfo: () => formatEnvironmentInfo,
   getEnvironmentInfo: () => getEnvironmentInfo
 });
-import { existsSync as existsSync18, readdirSync as readdirSync10 } from "node:fs";
-import { join as join18, resolve as resolve5 } from "node:path";
+import { existsSync as existsSync18, readdirSync as readdirSync11 } from "node:fs";
+import { join as join18, resolve as resolve6 } from "node:path";
 import { homedir as homedir14 } from "node:os";
 function getEnvironmentInfo() {
   const unipiModules = [];
   const configPaths = [];
   const extensionPaths = [];
   try {
-    const nodeModules = resolve5(process.cwd(), "node_modules");
+    const nodeModules = resolve6(process.cwd(), "node_modules");
     if (existsSync18(nodeModules)) {
       const scopePath = join18(nodeModules, "@pi-unipi");
       if (existsSync18(scopePath)) {
-        for (const entry of readdirSync10(scopePath)) {
+        for (const entry of readdirSync11(scopePath)) {
           if (entry.startsWith(".")) continue;
           const pkgPath = join18(scopePath, entry, "package.json");
           if (existsSync18(pkgPath)) {
@@ -2616,7 +2707,7 @@ function getEnvironmentInfo() {
   } catch {
   }
   const globalConfig = join18(homedir14(), ".unipi", "config");
-  const projectConfig = resolve5(process.cwd(), ".unipi", "config");
+  const projectConfig = resolve6(process.cwd(), ".unipi", "config");
   if (existsSync18(globalConfig)) {
     configPaths.push(globalConfig);
   }
@@ -3863,7 +3954,7 @@ var init_schema = __esm({
 // packages/compactor/src/config/manager.ts
 import { existsSync as existsSync31, mkdirSync as mkdirSync19, readFileSync as readFileSync29, writeFileSync as writeFileSync23 } from "node:fs";
 import { homedir as homedir20 } from "node:os";
-import { dirname as dirname25, join as join32 } from "node:path";
+import { dirname as dirname24, join as join32 } from "node:path";
 function projectConfigPath(cwd) {
   return join32(cwd, ".unipi", "config", "compactor.json");
 }
@@ -3900,7 +3991,7 @@ function loadConfig4(cwd) {
 function saveConfig3(config, opts) {
   try {
     const targetPath = opts?.perProject && opts?.cwd ? projectConfigPath(opts.cwd) : COMPACTOR_CONFIG_PATH;
-    const dir = dirname25(targetPath);
+    const dir = dirname24(targetPath);
     if (!existsSync31(dir)) mkdirSync19(dir, { recursive: true });
     writeFileSync23(targetPath, `${JSON.stringify(config, null, 2)}
 `);
@@ -3935,7 +4026,7 @@ function migrateConfig(partial) {
 }
 function scaffoldConfig() {
   try {
-    const dir = dirname25(COMPACTOR_CONFIG_PATH);
+    const dir = dirname24(COMPACTOR_CONFIG_PATH);
     if (!existsSync31(dir)) mkdirSync19(dir, { recursive: true });
     if (!existsSync31(COMPACTOR_CONFIG_PATH)) {
       writeFileSync23(COMPACTOR_CONFIG_PATH, `${JSON.stringify(DEFAULT_COMPACTOR_CONFIG, null, 2)}
@@ -5452,9 +5543,9 @@ var init_snapshot = __esm({
 });
 
 // packages/compactor/src/config/presets.ts
-import { createHash as createHash3 } from "node:crypto";
+import { createHash as createHash4 } from "node:crypto";
 function presetHash(config) {
-  return createHash3("sha256").update(JSON.stringify(config)).digest("hex");
+  return createHash4("sha256").update(JSON.stringify(config)).digest("hex");
 }
 function configsEqual(a, b) {
   const aHash = presetHash(a);
@@ -6309,7 +6400,7 @@ __export(evaluator_exports, {
   splitChainedCommands: () => splitChainedCommands
 });
 import { realpathSync as realpathSync2, existsSync as existsSync37, readFileSync as readFileSync32 } from "node:fs";
-import { resolve as resolve11, join as join36 } from "node:path";
+import { resolve as resolve12, join as join36 } from "node:path";
 import { homedir as homedir22 } from "node:os";
 function loadProjectPermissions(cwd, basePolicy) {
   const settingsPath = join36(cwd, ".pi", "settings.json");
@@ -6381,7 +6472,7 @@ function splitChainedCommands(command) {
   return commands;
 }
 function evaluateFilePath(filePath, policy, cwd = process.cwd()) {
-  const resolved = resolve11(cwd, filePath);
+  const resolved = resolve12(cwd, filePath);
   try {
     const real = realpathSync2(resolved);
     const home = homedir22();
@@ -6551,6 +6642,9 @@ var init_thinking_label = __esm({
 init_core();
 import { dirname as dirname2 } from "node:path";
 import { fileURLToPath } from "node:url";
+import {
+  buildSessionContext
+} from "@earendil-works/pi-coding-agent";
 
 // packages/workflow/commands.ts
 init_core();
@@ -6824,15 +6918,10 @@ function registerWorkflowCommands(pi, options) {
           fullCommand: `/${fullCommand}`,
           args: args?.trim() ?? ""
         };
-        if (!options.startWorkflow(workflowEvent)) {
+        if (!options.activateSandbox(workflowEvent)) {
           if (ctx.hasUI) ctx.ui.notify("Another UniPi workflow is still active", "warning");
           return;
         }
-        const currentTools = options.getActiveTools();
-        options.saveTools(currentTools);
-        const sandboxTools = getToolsForCommand(cmd.name, currentTools);
-        const sandboxLevel = getSandboxLevel(cmd.name);
-        options.setActiveTools([...sandboxTools], sandboxLevel);
         let skillContent = "";
         try {
           const skillPath = join3(
@@ -6861,7 +6950,12 @@ Arguments: ${args.trim()}`;
 ${skillContent}
 </skill_content>`;
         }
-        pi.sendUserMessage(message, { deliverAs: "followUp" });
+        try {
+          pi.sendUserMessage(message, { deliverAs: "followUp" });
+        } catch (error) {
+          options.abortWorkflow();
+          throw error;
+        }
         if (ctx.hasUI) {
           ctx.ui.notify(`Running /${fullCommand}`, "info");
           const ralphStatus = options.isRalphDetected() ? "\u2713 rl" : "\u25CB rl";
@@ -6929,90 +7023,147 @@ var WorkflowLifecycle = class {
 
 // packages/workflow/index.ts
 var VERSION = getPackageVersion(dirname2(fileURLToPath(import.meta.url)));
-var ralphDetected = false;
-var savedTools = null;
-var sandboxActive = false;
-var currentSandboxLevel = null;
-var currentSandboxTools = null;
+var WORKFLOW_SANDBOX_SNAPSHOT_TYPE = "unipi-workflow-sandbox-snapshot";
+function sandboxRestrictions(level) {
+  const common = [
+    "Do not attempt to call tools blocked by name.",
+    "If the user requests an action that requires a blocked tool, explain that the workflow sandbox does not allow it."
+  ];
+  if (level === "brainstorm") {
+    return [
+      "The write tool is restricted to .unipi/docs/specs/ only.",
+      "Use bash only for specific setup operations such as git init or mkdir; use grep, find, and ls for discovery instead of bash.",
+      ...common
+    ];
+  }
+  if (level === "write_unipi") {
+    return [
+      "The write tool is restricted to .unipi/docs/ only (specs and plans).",
+      "Use grep, find, and ls for file discovery instead of guessing filenames.",
+      "Bash is blocked; use read, write, edit, grep, find, and ls only.",
+      ...common
+    ];
+  }
+  return common;
+}
+function formatActiveSandboxSnapshot(command, level) {
+  const blocked = getBlockedToolsForLevel(level);
+  const blockedLine = blocked.length > 0 ? blocked.join(", ") : "none";
+  return [
+    "# UniPi Workflow Sandbox Snapshot",
+    "This snapshot supersedes all prior UniPi workflow sandbox snapshots; use only this snapshot for workflow sandbox status and restrictions.",
+    "Status: active",
+    `Workflow: /unipi:${command}`,
+    `Sandbox level: ${level}`,
+    `Blocked tool names: ${blockedLine}`,
+    "Pi's provider tool schemas and tool order remain unchanged. Calls to blocked tool names are rejected by the workflow sandbox.",
+    ["Restrictions:", ...sandboxRestrictions(level).map((restriction) => `- ${restriction}`)].join("\n")
+  ].join("\n\n");
+}
+function formatInactiveSandboxSnapshot() {
+  return [
+    "# UniPi Workflow Sandbox Snapshot",
+    "This snapshot supersedes all prior UniPi workflow sandbox snapshots; use only this snapshot for workflow sandbox status and restrictions.",
+    "Status: inactive",
+    "No UniPi workflow sandbox is active. Prior workflow sandbox restrictions no longer apply."
+  ].join("\n\n");
+}
+function latestEffectiveSandboxSnapshot(branch) {
+  const messages = buildSessionContext(branch).messages;
+  for (let index = messages.length - 1; index >= 0; index--) {
+    const message = messages[index];
+    if (message.role === "custom" && message.customType === WORKFLOW_SANDBOX_SNAPSHOT_TYPE) {
+      return {
+        content: message.content,
+        details: message.details
+      };
+    }
+  }
+  return void 0;
+}
+function latestHistoricalSandboxSnapshot(branch) {
+  for (let index = branch.length - 1; index >= 0; index--) {
+    const entry = branch[index];
+    if (entry.type === "custom_message" && entry.customType === WORKFLOW_SANDBOX_SNAPSHOT_TYPE) {
+      return {
+        content: entry.content,
+        details: entry.details
+      };
+    }
+  }
+  return void 0;
+}
+function isActiveSnapshot(snapshot) {
+  if (typeof snapshot.details?.active === "boolean") return snapshot.details.active;
+  return typeof snapshot.content === "string" && snapshot.content.includes("Status: active");
+}
 function workflow_default(pi) {
   const workflowLifecycle = new WorkflowLifecycle();
+  let ralphDetected = false;
+  let sandboxCommand = null;
   registerWorkflowCommands(pi, {
     isRalphDetected: () => ralphDetected,
-    getActiveTools: () => pi.getActiveTools(),
-    setActiveTools: (tools, level) => {
-      pi.setActiveTools(tools);
-      sandboxActive = true;
-      currentSandboxLevel = level;
-      currentSandboxTools = tools;
-    },
-    saveTools: (tools) => {
-      savedTools = tools;
-    },
-    startWorkflow: (event) => {
+    activateSandbox: (event) => {
       if (!workflowLifecycle.start(event)) return false;
+      sandboxCommand = event.command;
       emitEvent(pi, UNIPI_EVENTS.WORKFLOW_START, event);
       return true;
+    },
+    abortWorkflow: () => {
+      sandboxCommand = null;
+      workflowLifecycle.reset();
     }
   });
   pi.on("tool_call", async (event, _ctx) => {
-    if (!sandboxActive || !currentSandboxLevel) return;
-    const allowed = currentSandboxTools ?? [];
-    if (!allowed.includes(event.toolName)) {
+    if (!sandboxCommand) return;
+    const level = getSandboxLevel(sandboxCommand);
+    if (!isToolAllowed(level, event.toolName)) {
+      const blocked = getBlockedToolsForLevel(level);
       return {
         block: true,
-        reason: `Tool "${event.toolName}" is not allowed in ${currentSandboxLevel} sandbox. Allowed: ${allowed.join(", ")}`
+        reason: `Tool "${event.toolName}" is not allowed in ${level} sandbox. Blocked: ${blocked.join(", ")}`
       };
     }
   });
-  pi.on("before_agent_start", async (event, _ctx) => {
-    if (!sandboxActive || !currentSandboxLevel) return;
-    const allowed = currentSandboxTools ?? pi.getActiveTools();
-    const blocked = getBlockedToolsForLevel(currentSandboxLevel);
-    const blockedLine = blocked.length > 0 ? `
-Blocked tools: ${blocked.join(", ")} \u2014 removed from your tool list.` : "\nNo tools were blocked by this sandbox.";
-    const base = `
-
-<sandbox>
-Sandbox mode: ${currentSandboxLevel}.
-Available tools: ${allowed.join(", ")}.${blockedLine}`;
-    if (currentSandboxLevel === "brainstorm") {
-      return {
-        systemPrompt: event.systemPrompt + base + `
-The write tool is available but restricted to .unipi/docs/specs/ only.
-bash is available ONLY for specific setup use case (e.g., git init, mkdir). Do NOT use bash for reading files or listing directories \u2014 use grep, find, ls instead.
-Do NOT attempt to call blocked tools. Do NOT output tool call XML for them.
-If the user requests an action that requires a blocked tool, respond that you do not have access.
-</sandbox>`
-      };
-    }
-    if (currentSandboxLevel === "write_unipi") {
+  pi.on("before_agent_start", async (_event, ctx) => {
+    const branch = ctx.sessionManager.getBranch();
+    const latest = latestEffectiveSandboxSnapshot(branch);
+    const historical = latestHistoricalSandboxSnapshot(branch);
+    if (sandboxCommand) {
+      const level = getSandboxLevel(sandboxCommand);
+      const content = formatActiveSandboxSnapshot(sandboxCommand, level);
+      if (latest?.content === content) return void 0;
       return {
-        systemPrompt: event.systemPrompt + base + `
-Write tool is restricted to .unipi/docs/ only (specs and plans).
-Use grep, find, ls for file discovery \u2014 do NOT guess filenames.
-bash is blocked \u2014 use read, write, edit, grep, find, ls only.
-Do NOT attempt to call blocked tools. Do NOT output tool call XML for them.
-If the user requests an action that requires a blocked tool, respond that you do not have access.
-</sandbox>`
+        message: {
+          customType: WORKFLOW_SANDBOX_SNAPSHOT_TYPE,
+          content,
+          display: false,
+          details: {
+            active: true,
+            command: sandboxCommand,
+            level
+          }
+        }
       };
     }
+    const prior = latest ?? historical;
+    if (!prior || !isActiveSnapshot(prior)) return void 0;
     return {
-      systemPrompt: event.systemPrompt + base + `
-Do NOT attempt to call blocked tools. Do NOT output tool call XML for them.
-If the user requires an action that requires a blocked tool, respond that you do not have access.
-</sandbox>`
+      message: {
+        customType: WORKFLOW_SANDBOX_SNAPSHOT_TYPE,
+        content: formatInactiveSandboxSnapshot(),
+        display: false,
+        details: {
+          active: false
+        }
+      }
     };
   });
   pi.on("agent_end", async (event, _ctx) => {
-    if (sandboxActive && savedTools) {
-      pi.setActiveTools(savedTools);
-      savedTools = null;
-      sandboxActive = false;
-      currentSandboxLevel = null;
-      currentSandboxTools = null;
-    }
     const completedWorkflow = workflowLifecycle.complete(event.messages);
-    if (completedWorkflow) emitEvent(pi, UNIPI_EVENTS.WORKFLOW_END, completedWorkflow);
+    if (!completedWorkflow) return;
+    sandboxCommand = null;
+    emitEvent(pi, UNIPI_EVENTS.WORKFLOW_END, completedWorkflow);
   });
   pi.on("session_start", async (_event, ctx) => {
     initUnipiDirs();
@@ -7025,7 +7176,7 @@ If the user requires an action that requires a blocked tool, respond that you do
     if (!ralphDetected) {
       try {
         const allTools = pi.getAllTools();
-        ralphDetected = allTools.some((t) => t.name === "ralph_start");
+        ralphDetected = allTools.some((tool) => tool.name === "ralph_start");
       } catch {
       }
     }
@@ -7036,14 +7187,11 @@ If the user requires an action that requires a blocked tool, respond that you do
   });
   pi.events.on(UNIPI_EVENTS.MODULE_READY, (data) => {
     const event = data;
-    if (event?.name === MODULES.RALPH) {
-      ralphDetected = true;
-    }
+    if (event?.name === MODULES.RALPH) ralphDetected = true;
   });
   pi.on("session_shutdown", async () => {
     ralphDetected = false;
-    savedTools = null;
-    sandboxActive = false;
+    sandboxCommand = null;
     workflowLifecycle.reset();
   });
 }
@@ -7922,7 +8070,7 @@ function handleNuke(rest, ctx, pi) {
 // packages/memory/index.ts
 init_core();
 init_storage();
-import { dirname as dirname8 } from "node:path";
+import { dirname as dirname7 } from "node:path";
 import { fileURLToPath as fileURLToPath4 } from "node:url";
 
 // packages/memory/tools.ts
@@ -8630,7 +8778,7 @@ init_settings();
 function getInfoRegistry2() {
   return globalThis.__unipi_info_registry;
 }
-var VERSION3 = getPackageVersion(dirname8(fileURLToPath4(import.meta.url)));
+var VERSION3 = getPackageVersion(dirname7(fileURLToPath4(import.meta.url)));
 var projectStorage = null;
 var orphanSyncPending = false;
 function ensureOrphanSync(storage) {
@@ -8852,12 +9000,12 @@ function memory_default(pi) {
 
 // packages/info-screen/index.ts
 init_core();
-import { dirname as dirname11 } from "node:path";
+import { dirname as dirname10 } from "node:path";
 import { fileURLToPath as fileURLToPath5 } from "node:url";
 
 // packages/info-screen/config.ts
 import { readFileSync as readFileSync7, writeFileSync as writeFileSync7, existsSync as existsSync8, mkdirSync as mkdirSync6 } from "node:fs";
-import { join as join8, dirname as dirname9 } from "node:path";
+import { join as join8, dirname as dirname8 } from "node:path";
 import { homedir as homedir4 } from "node:os";
 
 // packages/info-screen/types.ts
@@ -8886,7 +9034,7 @@ function readSettingsFile() {
   }
 }
 function writeSettingsFile(data) {
-  const dir = dirname9(SETTINGS_PATH);
+  const dir = dirname8(SETTINGS_PATH);
   if (!existsSync8(dir)) {
     mkdirSync6(dir, { recursive: true });
   }
@@ -9187,7 +9335,7 @@ if (!globalThis.__unipi_info_registry) {
 
 // packages/info-screen/core-groups.ts
 init_core();
-import { readFileSync as readFileSync9, readdirSync as readdirSync5, existsSync as existsSync10 } from "node:fs";
+import { readFileSync as readFileSync9, readdirSync as readdirSync6, existsSync as existsSync10 } from "node:fs";
 import { join as join10 } from "node:path";
 import { homedir as homedir6 } from "node:os";
 init_usage_parser();
@@ -9248,7 +9396,7 @@ function discoverExtensions() {
   for (const dir of extensionDirs) {
     if (!existsSync10(dir)) continue;
     try {
-      const entries = readdirSync5(dir, { withFileTypes: true });
+      const entries = readdirSync6(dir, { withFileTypes: true });
       for (const entry of entries) {
         const name = entry.name;
         if (counted.has(name)) continue;
@@ -9322,7 +9470,7 @@ function discoverSkills() {
   for (const dir of skillDirs) {
     if (!existsSync10(dir)) continue;
     try {
-      const entries = readdirSync5(dir, { withFileTypes: true });
+      const entries = readdirSync6(dir, { withFileTypes: true });
       for (const entry of entries) {
         if (!entry.isDirectory()) continue;
         const name = entry.name;
@@ -10433,7 +10581,7 @@ var SettingsOverlay = class _SettingsOverlay {
 };
 
 // packages/info-screen/index.ts
-var VERSION4 = getPackageVersion(dirname11(fileURLToPath5(import.meta.url)));
+var VERSION4 = getPackageVersion(dirname10(fileURLToPath5(import.meta.url)));
 function info_screen_default(pi) {
   setPiApi(pi);
   registerCoreGroups();
@@ -10576,7 +10724,7 @@ function info_screen_default(pi) {
 import { defineTool } from "@earendil-works/pi-coding-agent";
 import { Text } from "@earendil-works/pi-tui";
 import { Type as Type3 } from "typebox";
-import { existsSync as existsSync13, readdirSync as readdirSync7 } from "node:fs";
+import { existsSync as existsSync13, readdirSync as readdirSync8 } from "node:fs";
 import { join as join13 } from "node:path";
 import { homedir as homedir9 } from "node:os";
 
@@ -10815,14 +10963,14 @@ ${agentPrompt}`;
 init_model_resolver();
 
 // packages/subagents/src/custom-agents.ts
-import { existsSync as existsSync11, readdirSync as readdirSync6, readFileSync as readFileSync10, renameSync as renameSync3 } from "node:fs";
+import { existsSync as existsSync11, readdirSync as readdirSync7, readFileSync as readFileSync10, renameSync as renameSync4 } from "node:fs";
 import { join as join11 } from "node:path";
 import { homedir as homedir7 } from "node:os";
 import { parseFrontmatter } from "@earendil-works/pi-coding-agent";
 function backupCorrupted(filePath) {
   const backupPath = filePath + ".bak";
   try {
-    renameSync3(filePath, backupPath);
+    renameSync4(filePath, backupPath);
   } catch {
   }
 }
@@ -10871,7 +11019,7 @@ function loadCustomAgents(cwd) {
   const agents = /* @__PURE__ */ new Map();
   const globalDir = getGlobalAgentsDir();
   if (existsSync11(globalDir)) {
-    const files = readdirSync6(globalDir).filter((f) => f.endsWith(".md"));
+    const files = readdirSync7(globalDir).filter((f) => f.endsWith(".md"));
     for (const file of files) {
       const agent = loadAgentFromFile(join11(globalDir, file), "global");
       if (agent) {
@@ -10881,7 +11029,7 @@ function loadCustomAgents(cwd) {
   }
   const projectDir = getProjectAgentsDir(cwd);
   if (existsSync11(projectDir)) {
-    const files = readdirSync6(projectDir).filter((f) => f.endsWith(".md"));
+    const files = readdirSync7(projectDir).filter((f) => f.endsWith(".md"));
     for (const file of files) {
       const agent = loadAgentFromFile(join11(projectDir, file), "project");
       if (agent) {
@@ -10908,17 +11056,17 @@ var FileLock = class {
    */
   async acquire(filePath, agentId) {
     while (this.locks.has(filePath)) {
-      await new Promise((resolve13) => {
+      await new Promise((resolve14) => {
         const queue = this.queues.get(filePath) ?? [];
-        queue.push(resolve13);
+        queue.push(resolve14);
         this.queues.set(filePath, queue);
       });
     }
     let releaseFn;
-    const promise = new Promise((resolve13) => {
+    const promise = new Promise((resolve14) => {
       releaseFn = () => {
         this.locks.delete(filePath);
-        resolve13();
+        resolve14();
         const queue = this.queues.get(filePath);
         if (queue && queue.length > 0) {
           const next = queue.shift();
@@ -11236,7 +11384,7 @@ var AgentManager = class {
 };
 
 // packages/subagents/src/config.ts
-import { existsSync as existsSync12, mkdirSync as mkdirSync8, readFileSync as readFileSync11, renameSync as renameSync4, writeFileSync as writeFileSync9 } from "node:fs";
+import { existsSync as existsSync12, mkdirSync as mkdirSync8, readFileSync as readFileSync11, renameSync as renameSync5, writeFileSync as writeFileSync9 } from "node:fs";
 import { join as join12 } from "node:path";
 import { homedir as homedir8 } from "node:os";
 var DEFAULT_CONFIG2 = {
@@ -11261,7 +11409,7 @@ function ensureDirExists(dirPath) {
 function writeConfigAtomic(filePath, config) {
   const tmpPath = filePath + ".tmp";
   writeFileSync9(tmpPath, JSON.stringify(config, null, 2), "utf-8");
-  renameSync4(tmpPath, filePath);
+  renameSync5(tmpPath, filePath);
 }
 function loadConfigFromPath(filePath) {
   if (!existsSync12(filePath)) return null;
@@ -11277,7 +11425,7 @@ function loadConfigFromPath(filePath) {
 function repairCorrupted(filePath) {
   const backupPath = filePath + ".bak";
   try {
-    renameSync4(filePath, backupPath);
+    renameSync5(filePath, backupPath);
   } catch {
   }
   writeConfigAtomic(filePath, DEFAULT_CONFIG2);
@@ -12096,7 +12244,7 @@ function src_default(pi) {
         for (const dir of [globalAgentsDir, workspaceAgentsDir]) {
           try {
             if (existsSync13(dir)) {
-              for (const file of readdirSync7(dir)) {
+              for (const file of readdirSync8(dir)) {
                 if (file.endsWith(".md") && !customTypes.includes(file.replace(".md", ""))) {
                   customTypes.push(file.replace(".md", ""));
                 }
@@ -12542,7 +12690,7 @@ Description: ${record.description}
 // packages/btw/extensions/btw.ts
 init_core();
 import {
-  buildSessionContext,
+  buildSessionContext as buildSessionContext2,
   createAgentSession as createAgentSession2,
   createExtensionRuntime,
   SessionManager as SessionManager2
@@ -12628,7 +12776,7 @@ function buildBtwSeedState(ctx, thread, mode) {
   if (mode === "contextual") {
     try {
       messages.push(
-        ...buildSessionContext(ctx.sessionManager.getEntries(), ctx.sessionManager.getLeafId()).messages.filter(
+        ...buildSessionContext2(ctx.sessionManager.getEntries(), ctx.sessionManager.getLeafId()).messages.filter(
           (message) => !isVisibleBtwMessage(message)
         )
       );
@@ -14031,7 +14179,7 @@ ${summary}`;
 
 // packages/web-api/src/index.ts
 init_core();
-import { dirname as dirname12 } from "node:path";
+import { dirname as dirname11 } from "node:path";
 import { fileURLToPath as fileURLToPath6 } from "node:url";
 
 // packages/web-api/src/tools.ts
@@ -16701,7 +16849,7 @@ var llmSummarizeProvider = {
 registry.register(llmSummarizeProvider);
 
 // packages/web-api/src/index.ts
-var VERSION5 = getPackageVersion(dirname12(fileURLToPath6(import.meta.url)));
+var VERSION5 = getPackageVersion(dirname11(fileURLToPath6(import.meta.url)));
 function getInfoRegistry4() {
   return globalThis.__unipi_info_registry;
 }
@@ -16773,14 +16921,14 @@ function src_default2(pi) {
 
 // packages/utility/src/index.ts
 init_core();
-import { dirname as dirname15 } from "node:path";
+import { dirname as dirname14 } from "node:path";
 import { fileURLToPath as fileURLToPath7 } from "node:url";
 
 // packages/utility/src/commands.ts
 init_core();
 
 // packages/utility/src/lifecycle/cleanup.ts
-import { existsSync as existsSync16, statSync as statSync7, readdirSync as readdirSync9, unlinkSync as unlinkSync5, rmdirSync } from "node:fs";
+import { existsSync as existsSync16, statSync as statSync8, readdirSync as readdirSync10, unlinkSync as unlinkSync5, rmdirSync } from "node:fs";
 import { join as join16 } from "node:path";
 import { homedir as homedir12, tmpdir } from "node:os";
 var DEFAULTS = {
@@ -16797,7 +16945,7 @@ function expandHome(path28) {
 }
 function isStale(path28, maxAgeDays) {
   try {
-    const stats = statSync7(path28);
+    const stats = statSync8(path28);
     const ageMs = Date.now() - stats.mtime.getTime();
     return ageMs > maxAgeDays * 24 * 60 * 60 * 1e3;
   } catch {
@@ -16809,7 +16957,7 @@ function hasWalLock(dbPath) {
   const shmPath = dbPath + "-shm";
   if (existsSync16(walPath)) {
     try {
-      const walStats = statSync7(walPath);
+      const walStats = statSync8(walPath);
       const ageMs = Date.now() - walStats.mtime.getTime();
       return ageMs > 5 * 60 * 1e3;
     } catch {
@@ -16830,14 +16978,14 @@ function cleanDbs(options) {
   const scanDir = (dir) => {
     let entries;
     try {
-      entries = readdirSync9(dir);
+      entries = readdirSync10(dir);
     } catch {
       return;
     }
     for (const entry of entries) {
       const fullPath = join16(dir, entry);
       try {
-        const stats = statSync7(fullPath);
+        const stats = statSync8(fullPath);
         if (stats.isDirectory()) {
           scanDir(fullPath);
           continue;
@@ -16853,7 +17001,7 @@ function cleanDbs(options) {
                   const companion = fullPath + suffix;
                   if (existsSync16(companion)) {
                     unlinkSync5(companion);
-                    result.bytesFreed += statSync7(companion).size;
+                    result.bytesFreed += statSync8(companion).size;
                   }
                 }
                 result.removed++;
@@ -16882,7 +17030,7 @@ function cleanTemps(options) {
   const tmpDir = tmpdir();
   let entries;
   try {
-    entries = readdirSync9(tmpDir);
+    entries = readdirSync10(tmpDir);
   } catch {
     return result;
   }
@@ -16890,7 +17038,7 @@ function cleanTemps(options) {
     if (!patterns.some((p) => p.test(entry))) continue;
     const fullPath = join16(tmpDir, entry);
     try {
-      const stats = statSync7(fullPath);
+      const stats = statSync8(fullPath);
       if (!stats.isFile()) continue;
       if (isStale(fullPath, options.tempMaxAgeDays)) {
         result.bytesFreed += stats.size;
@@ -16922,14 +17070,14 @@ function cleanSessions(options) {
   if (!existsSync16(sessionsDir)) return result;
   let entries;
   try {
-    entries = readdirSync9(sessionsDir);
+    entries = readdirSync10(sessionsDir);
   } catch {
     return result;
   }
   for (const entry of entries) {
     const fullPath = join16(sessionsDir, entry);
     try {
-      const stats = statSync7(fullPath);
+      const stats = statSync8(fullPath);
       if (!stats.isDirectory()) continue;
       if (isStale(fullPath, options.sessionMaxAgeDays)) {
         result.bytesFreed += stats.size;
@@ -16937,10 +17085,10 @@ function cleanSessions(options) {
         if (!options.dryRun) {
           try {
             const removeRecursive = (dir) => {
-              const items = readdirSync9(dir);
+              const items = readdirSync10(dir);
               for (const item of items) {
                 const itemPath = join16(dir, item);
-                const itemStats = statSync7(itemPath);
+                const itemStats = statSync8(itemPath);
                 if (itemStats.isDirectory()) {
                   removeRecursive(itemPath);
                 } else {
@@ -16973,14 +17121,14 @@ function cleanCache(options) {
   if (!existsSync16(cacheDir)) return result;
   let entries;
   try {
-    entries = readdirSync9(cacheDir);
+    entries = readdirSync10(cacheDir);
   } catch {
     return result;
   }
   for (const entry of entries) {
     const fullPath = join16(cacheDir, entry);
     try {
-      const stats = statSync7(fullPath);
+      const stats = statSync8(fullPath);
       if (!stats.isFile()) continue;
       if (isStale(fullPath, options.tempMaxAgeDays)) {
         result.bytesFreed += stats.size;
@@ -17044,7 +17192,7 @@ function formatCleanupReport(report) {
 }
 
 // packages/utility/src/diagnostics/engine.ts
-import { existsSync as existsSync17, accessSync, constants } from "node:fs";
+import { existsSync as existsSync17, accessSync as accessSync2, constants as constants2 } from "node:fs";
 import { join as join17 } from "node:path";
 import { homedir as homedir13 } from "node:os";
 function expandHome2(path28) {
@@ -17055,7 +17203,7 @@ function expandHome2(path28) {
 }
 function isReadable(path28) {
   try {
-    accessSync(path28, constants.R_OK);
+    accessSync2(path28, constants2.R_OK);
     return true;
   } catch {
     return false;
@@ -17063,7 +17211,7 @@ function isReadable(path28) {
 }
 function isWritable(path28) {
   try {
-    accessSync(path28, constants.W_OK);
+    accessSync2(path28, constants2.W_OK);
     return true;
   } catch {
     return false;
@@ -19333,7 +19481,7 @@ function registerInfoScreen(pi) {
 }
 
 // packages/utility/src/index.ts
-var VERSION6 = getPackageVersion(dirname15(fileURLToPath7(import.meta.url)));
+var VERSION6 = getPackageVersion(dirname14(fileURLToPath7(import.meta.url)));
 var firstMessageSeen = false;
 var firstUserText = "";
 var firstInputCtx = null;
@@ -19545,7 +19693,7 @@ function registerUtilityTools(pi, nameBadgeState) {
 
 // packages/ask-user/index.ts
 init_core();
-import { dirname as dirname16 } from "node:path";
+import { dirname as dirname15 } from "node:path";
 import { fileURLToPath as fileURLToPath8 } from "node:url";
 
 // packages/ask-user/tools.ts
@@ -20930,7 +21078,7 @@ function registerAskUserCommands(pi) {
 }
 
 // packages/ask-user/index.ts
-var VERSION7 = getPackageVersion(dirname16(fileURLToPath8(import.meta.url)));
+var VERSION7 = getPackageVersion(dirname15(fileURLToPath8(import.meta.url)));
 function ask_user_default(pi) {
   registerAskUserTools(pi);
   registerAskUserCommands(pi);
@@ -20946,7 +21094,7 @@ function ask_user_default(pi) {
 
 // packages/mcp/src/index.ts
 init_core();
-import { dirname as dirname19 } from "node:path";
+import { dirname as dirname18 } from "node:path";
 import { fileURLToPath as fileURLToPath9 } from "node:url";
 
 // packages/mcp/src/config/manager.ts
@@ -21444,7 +21592,7 @@ var McpClient = class {
     if (this.connected) {
       throw new Error("McpClient is already connected");
     }
-    return new Promise((resolve13, reject) => {
+    return new Promise((resolve14, reject) => {
       try {
         const mergedEnv = { ...process.env, ...env };
         this.process = spawn2(command, args, {
@@ -21493,7 +21641,7 @@ Stderr: ${this.stderrBuffer}`
         }).then(() => {
           this.sendNotification("notifications/initialized", {});
           this.connected = true;
-          resolve13();
+          resolve14();
         }).catch((err) => {
           this.cleanup();
           reject(
@@ -21537,16 +21685,16 @@ Stderr: ${this.stderrBuffer}`
       this.sendNotification("shutdown", {});
     } catch {
     }
-    await new Promise((resolve13) => {
-      const timer = setTimeout(() => resolve13(), 500);
+    await new Promise((resolve14) => {
+      const timer = setTimeout(() => resolve14(), 500);
       this.process.on("exit", () => {
         clearTimeout(timer);
-        resolve13();
+        resolve14();
       });
       try {
         this.process.kill("SIGTERM");
       } catch {
-        resolve13();
+        resolve14();
       }
     });
     if (this.process && !this.process.killed) {
@@ -21576,7 +21724,7 @@ Stderr: ${this.stderrBuffer}`
     }
   }
   sendRequest(method, params) {
-    return new Promise((resolve13, reject) => {
+    return new Promise((resolve14, reject) => {
       if (!this.process?.stdin) {
         reject(new Error("MCP server process not available"));
         return;
@@ -21596,7 +21744,7 @@ Stderr: ${this.stderrBuffer}`
           )
         );
       }, this.timeoutMs);
-      this.pending.set(id, { resolve: resolve13, reject, timer });
+      this.pending.set(id, { resolve: resolve14, reject, timer });
       const message = JSON.stringify(request) + "\n";
       this.process.stdin.write(message);
     });
@@ -21659,15 +21807,45 @@ Stderr: ${this.stderrBuffer}`
 
 // packages/mcp/src/bridge/translator.ts
 init_core();
+function compareCodeUnits(left, right) {
+  return left < right ? -1 : left > right ? 1 : 0;
+}
+function isObject(value) {
+  return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+var LITERAL_VALUE_KEYWORDS = /* @__PURE__ */ new Set(["const", "default", "enum", "examples"]);
+function canonicalizeValue(value, key, normalizeSchemaKeywords = true) {
+  if (Array.isArray(value)) {
+    if (normalizeSchemaKeywords && key === "required" && value.every((item) => typeof item === "string")) {
+      return [...new Set(value)].sort(compareCodeUnits);
+    }
+    return value.map((item) => canonicalizeValue(item, void 0, normalizeSchemaKeywords));
+  }
+  if (!isObject(value)) return value;
+  const canonical = {};
+  for (const objectKey of Object.keys(value).sort(compareCodeUnits)) {
+    const childNormalizesSchemaKeywords = normalizeSchemaKeywords && !LITERAL_VALUE_KEYWORDS.has(objectKey);
+    canonical[objectKey] = canonicalizeValue(
+      value[objectKey],
+      objectKey,
+      childNormalizesSchemaKeywords
+    );
+  }
+  return canonical;
+}
+function canonicalizeJsonSchema(schema) {
+  return canonicalizeValue(schema);
+}
 function translateMcpTool(mcpTool, serverName, client) {
   const separator = MCP_DEFAULTS.TOOL_NAME_SEPARATOR;
   const toolName = `${serverName}${separator}${mcpTool.name}`;
-  const inputSchema = mcpTool.inputSchema ?? {};
-  const parameters = {
+  const inputSchema = isObject(mcpTool.inputSchema) ? mcpTool.inputSchema : {};
+  const normalizedSchema = {
     type: "object",
-    properties: inputSchema.properties ?? {},
-    required: inputSchema.required
+    properties: isObject(inputSchema.properties) ? inputSchema.properties : {},
+    required: Array.isArray(inputSchema.required) ? inputSchema.required : []
   };
+  const parameters = canonicalizeJsonSchema(normalizedSchema);
   const description = [
     mcpTool.description || `MCP tool: ${mcpTool.name}`,
     `[Server: ${serverName}]`
@@ -21725,6 +21903,7 @@ Check server status via /unipi:mcp-settings`
   };
   return {
     name: toolName,
+    label: toolName,
     description,
     parameters,
     execute: execute2
@@ -21737,26 +21916,125 @@ var ServerRegistry = class {
   emitEvent;
   registerTool;
   unregisterTool;
+  canUnregisterTools;
   timeoutMs;
+  createClient;
   constructor(options) {
     this.emitEvent = options.emitEvent;
     this.registerTool = options.registerTool;
     this.unregisterTool = options.unregisterTool;
+    this.canUnregisterTools = options.canUnregisterTools ?? true;
     this.timeoutMs = options.timeoutMs ?? MCP_DEFAULTS.STARTUP_TIMEOUT_MS;
+    this.createClient = options.createClient ?? (() => new McpClient({ timeoutMs: this.timeoutMs }));
   }
   /**
-   * Start an MCP server: spawn process, initialize, discover tools, register.
+   * Start one MCP server. Discovery completes before its tools are registered,
+   * and registration always follows final Pi tool-name order.
    */
   async startServer(resolved) {
-    const { name, def } = resolved;
-    if (this.entries.size >= MCP_DEFAULTS.MAX_SERVERS) {
+    await this.startServers([resolved]);
+    const state = this.getServerState(resolved.name);
+    if (state?.status === "error") {
+      throw new Error(state.error ?? `MCP server "${resolved.name}" failed to start`);
+    }
+  }
+  /**
+   * Start MCP servers behind a discovery barrier.
+   *
+   * Connections and tool discovery run in parallel. Once every server has
+   * either prepared or failed, tools from all successful servers are checked
+   * for duplicate final names, sorted, and only then registered with Pi.
+   * Individual connection failures remain represented by error registry
+   * entries and do not prevent tools from other servers being registered.
+   */
+  async startServers(resolvedServers) {
+    if (resolvedServers.length === 0) return;
+    const names = /* @__PURE__ */ new Set();
+    for (const { name } of resolvedServers) {
+      if (names.has(name)) {
+        throw new Error(`Duplicate MCP server name in startup batch: "${name}"`);
+      }
+      names.add(name);
+    }
+    const replacementCount = [...names].filter((name) => this.entries.has(name)).length;
+    if (this.entries.size - replacementCount + resolvedServers.length > MCP_DEFAULTS.MAX_SERVERS) {
       throw new Error(
         `Maximum number of MCP servers (${MCP_DEFAULTS.MAX_SERVERS}) reached. Stop a server before starting a new one.`
       );
     }
-    if (this.entries.has(name)) {
-      await this.stopServer(name);
+    await Promise.all(
+      [...names].filter((name) => this.entries.has(name)).map((name) => this.stopServer(name))
+    );
+    const settled = await Promise.allSettled(
+      resolvedServers.map((resolved) => this.prepareServer(resolved))
+    );
+    const prepared = settled.filter((result) => result.status === "fulfilled").map((result) => result.value);
+    if (prepared.length === 0) return;
+    const registrations = prepared.flatMap(({ entry, tools }) => tools.map((tool) => ({ entry, tool }))).sort((left, right) => compareCodeUnits(left.tool.name, right.tool.name));
+    try {
+      this.assertUniqueFinalToolNames(registrations.map(({ tool }) => tool.name));
+    } catch (error) {
+      await this.failPreparedServers(prepared, error);
+      throw error;
+    }
+    const registeredNames = [];
+    try {
+      for (const { tool } of registrations) {
+        this.registerTool(tool);
+        registeredNames.push(tool.name);
+      }
+    } catch (error) {
+      if (this.canUnregisterTools) {
+        for (const toolName of registeredNames.reverse()) {
+          try {
+            this.unregisterTool(toolName);
+          } catch {
+          }
+        }
+        await this.failPreparedServers(prepared, error);
+      } else {
+        const message = `${error instanceof Error ? error.message : String(error)}; some MCP tools remain registered until Pi restarts`;
+        for (const { entry, client, tools } of prepared) {
+          const toolNames = tools.map((tool) => tool.name).filter((name) => registeredNames.includes(name)).sort(compareCodeUnits);
+          entry.toolNames = toolNames;
+          entry.state = {
+            ...entry.state,
+            status: "error",
+            pid: client.pid,
+            toolCount: toolNames.length,
+            error: message
+          };
+          this.emitEvent(UNIPI_EVENTS.MCP_SERVER_ERROR, {
+            name: entry.name,
+            error: message
+          });
+        }
+      }
+      throw error;
     }
+    for (const { entry, client, tools } of [...prepared].sort((left, right) => compareCodeUnits(left.entry.name, right.entry.name))) {
+      const toolNames = tools.map((tool) => tool.name).sort(compareCodeUnits);
+      entry.toolNames = toolNames;
+      entry.state = {
+        ...entry.state,
+        status: "running",
+        pid: client.pid,
+        toolCount: toolNames.length
+      };
+      this.emitEvent(UNIPI_EVENTS.MCP_SERVER_STARTED, {
+        name: entry.name,
+        toolCount: toolNames.length
+      });
+      if (toolNames.length > 0) {
+        this.emitEvent(UNIPI_EVENTS.MCP_TOOLS_REGISTERED, {
+          serverName: entry.name,
+          toolNames
+        });
+      }
+    }
+  }
+  async prepareServer(resolved) {
+    const { name, def } = resolved;
     const state = {
       name,
       status: "starting",
@@ -21771,73 +22049,74 @@ var ServerRegistry = class {
       toolNames: []
     };
     this.entries.set(name, entry);
+    let client = null;
     try {
       const safeCommand = typeof def.command === "string" ? def.command : String(def.command);
       const safeArgs = Array.isArray(def.args) ? def.args : [];
       let safeEnv;
-      if (def.env !== void 0 && def.env !== null) {
-        if (typeof def.env === "object" && !Array.isArray(def.env)) {
-          safeEnv = {};
-          for (const [k, v] of Object.entries(def.env)) {
-            safeEnv[k] = typeof v === "string" ? v : String(v);
-          }
-        } else {
-        }
-      }
-      const client = new McpClient({ timeoutMs: this.timeoutMs });
-      await client.connect(safeCommand, safeArgs, safeEnv);
-      entry.client = client;
-      const mcpTools = await client.listTools();
-      const toolNames = [];
-      for (const mcpTool of mcpTools) {
-        const piTool = translateMcpTool(mcpTool, name, client);
-        this.registerTool(piTool);
-        toolNames.push(piTool.name);
-      }
-      entry.state = {
-        ...state,
-        status: "running",
-        pid: client.pid,
-        toolCount: toolNames.length
-      };
-      entry.toolNames = toolNames;
-      this.emitEvent(UNIPI_EVENTS.MCP_SERVER_STARTED, {
-        name,
-        toolCount: toolNames.length
-      });
-      if (toolNames.length > 0) {
-        this.emitEvent(UNIPI_EVENTS.MCP_TOOLS_REGISTERED, {
-          serverName: name,
-          toolNames
-        });
-      }
-    } catch (err) {
-      const error = err instanceof Error ? err.message : String(err);
-      entry.state = {
-        ...state,
-        status: "error",
-        error
-      };
-      if (entry.client) {
+      if (def.env !== void 0 && def.env !== null && typeof def.env === "object" && !Array.isArray(def.env)) {
+        safeEnv = {};
+        for (const [key, value] of Object.entries(def.env)) {
+          safeEnv[key] = typeof value === "string" ? value : String(value);
+        }
+      }
+      client = this.createClient();
+      const connectedClient = client;
+      await connectedClient.connect(safeCommand, safeArgs, safeEnv);
+      entry.client = connectedClient;
+      const mcpTools = await connectedClient.listTools();
+      const tools = mcpTools.map((tool) => translateMcpTool(tool, name, connectedClient)).sort((left, right) => compareCodeUnits(left.name, right.name));
+      return { entry, client: connectedClient, tools };
+    } catch (error) {
+      const message = error instanceof Error ? error.message : String(error);
+      entry.state = { ...state, status: "error", error: message };
+      if (client) {
         try {
-          await entry.client.disconnect();
+          await client.disconnect();
         } catch {
         }
-        entry.client = null;
       }
-      this.emitEvent(UNIPI_EVENTS.MCP_SERVER_ERROR, {
-        name,
-        error
-      });
-      throw err;
+      entry.client = null;
+      this.emitEvent(UNIPI_EVENTS.MCP_SERVER_ERROR, { name, error: message });
+      throw error;
     }
   }
-  /**
-   * Stop an MCP server: unregister tools, disconnect client.
-   */
+  assertUniqueFinalToolNames(newNames) {
+    const existingNames = this.getActive().flatMap((state) => this.entries.get(state.name)?.toolNames ?? []);
+    const seen = /* @__PURE__ */ new Set();
+    const duplicates = /* @__PURE__ */ new Set();
+    for (const name of [...existingNames, ...newNames]) {
+      if (seen.has(name)) duplicates.add(name);
+      seen.add(name);
+    }
+    if (duplicates.size > 0) {
+      throw new Error(
+        `Duplicate final MCP tool name(s): ${[...duplicates].sort(compareCodeUnits).join(", ")}`
+      );
+    }
+  }
+  async failPreparedServers(prepared, error) {
+    const message = error instanceof Error ? error.message : String(error);
+    await Promise.all(prepared.map(async ({ entry, client }) => {
+      entry.state = { ...entry.state, status: "error", toolCount: 0, error: message };
+      entry.toolNames = [];
+      try {
+        await client.disconnect();
+      } catch {
+      }
+      entry.client = null;
+      this.emitEvent(UNIPI_EVENTS.MCP_SERVER_ERROR, { name: entry.name, error: message });
+    }));
+  }
+  /** Stop an MCP server: unregister tools, disconnect client. */
   async stopServer(name) {
     const entry = this.entries.get(name);
     if (!entry) return;
+    if (entry.toolNames.length > 0 && !this.canUnregisterTools) {
+      throw new Error(
+        "This Pi version cannot remove MCP tools at runtime; restart Pi to change the MCP tool set."
+      );
+    }
     for (const toolName of entry.toolNames) {
       this.unregisterTool(toolName);
     }
@@ -21854,78 +22133,63 @@ var ServerRegistry = class {
       }
       entry.client = null;
     }
-    entry.state = {
-      ...entry.state,
-      status: "stopped",
-      toolCount: 0
-    };
+    entry.state = { ...entry.state, status: "stopped", toolCount: 0 };
     entry.toolNames = [];
     this.emitEvent(UNIPI_EVENTS.MCP_SERVER_STOPPED, { name });
   }
-  /**
-   * Restart an MCP server: stop then start.
-   */
+  /** Restart an MCP server: stop then start. */
   async restartServer(name) {
     const entry = this.entries.get(name);
-    if (!entry) {
-      throw new Error(`Server '${name}' not found in registry`);
-    }
+    if (!entry) throw new Error(`Server '${name}' not found in registry`);
     const resolved = entry.resolved;
     await this.stopServer(name);
     await this.startServer(resolved);
   }
-  /**
-   * Stop all running servers.
-   */
+  /** Stop all running servers when runtime unregistration is supported. */
   async stopAll() {
     const names = Array.from(this.entries.keys());
     await Promise.allSettled(names.map((name) => this.stopServer(name)));
   }
-  /**
-   * Get all registered server states.
-   */
+  /** Disconnect clients during extension shutdown without claiming tools were removed. */
+  async disconnectAll() {
+    await Promise.allSettled([...this.entries.values()].map(async (entry) => {
+      if (!entry.client) return;
+      try {
+        await entry.client.disconnect();
+      } finally {
+        entry.client = null;
+      }
+    }));
+  }
+  /** Get all registered server states. */
   getAll() {
-    return Array.from(this.entries.values()).map((e) => e.state);
+    return Array.from(this.entries.values()).map((entry) => entry.state);
   }
-  /**
-   * Get states of running servers.
-   */
+  /** Get states of running servers. */
   getActive() {
-    return this.getAll().filter((s) => s.status === "running");
+    return this.getAll().filter((state) => state.status === "running");
   }
-  /**
-   * Get states of servers in error state.
-   */
+  /** Get states of servers in error state. */
   getFailed() {
-    return this.getAll().filter((s) => s.status === "error");
+    return this.getAll().filter((state) => state.status === "error");
   }
-  /**
-   * Get total number of tools across all active servers.
-   */
+  /** Get total number of tools across all active servers. */
   getTotalToolCount() {
-    return this.getActive().reduce((sum, s) => sum + s.toolCount, 0);
+    return this.getActive().reduce((sum, state) => sum + state.toolCount, 0);
   }
-  /**
-   * Get the state of a specific server.
-   */
+  /** Get the state of a specific server. */
   getServerState(name) {
     return this.entries.get(name)?.state ?? null;
   }
-  /**
-   * Get the full registry entry for a server.
-   */
+  /** Get the full registry entry for a server. */
   getEntry(name) {
     return this.entries.get(name) ?? null;
   }
-  /**
-   * Check if a server exists in the registry.
-   */
+  /** Check if a server exists in the registry. */
   hasServer(name) {
     return this.entries.has(name);
   }
-  /**
-   * Get the number of registered servers.
-   */
+  /** Get the number of registered servers. */
   get size() {
     return this.entries.size;
   }
@@ -22538,12 +22802,6 @@ function renderMcpSettingsOverlay(params) {
           addedAt: meta.servers[server.name]?.addedAt ?? (/* @__PURE__ */ new Date()).toISOString()
         };
         saveMetadata(configDir, meta);
-        if (!newEnabled && registry3) {
-          try {
-            await registry3.stopServer(server.name);
-          } catch {
-          }
-        }
         refreshServers();
         refresh();
       } catch (err) {
@@ -22690,7 +22948,7 @@ function renderMcpSettingsOverlay(params) {
 }
 
 // packages/mcp/src/index.ts
-var VERSION8 = getPackageVersion(dirname19(fileURLToPath9(import.meta.url)));
+var VERSION8 = getPackageVersion(dirname18(fileURLToPath9(import.meta.url)));
 var registry2 = null;
 function getInfoRegistry5() {
   return globalThis.__unipi_info_registry;
@@ -22700,20 +22958,18 @@ function getRegistry() {
 }
 function src_default4(pi) {
   pi.on("session_start", async (_event, ctx) => {
+    const toolApi = pi;
+    const registerTool = typeof toolApi.registerTool === "function" ? (tool) => toolApi.registerTool(tool) : typeof toolApi.registerExternalTool === "function" ? (tool) => toolApi.registerExternalTool(tool) : () => {
+      throw new Error("Pi does not expose a supported MCP tool registration API");
+    };
+    const canUnregisterTools = typeof toolApi.unregisterTool === "function" || typeof toolApi.unregisterExternalTool === "function";
+    const unregisterTool = typeof toolApi.unregisterTool === "function" ? (toolName) => toolApi.unregisterTool(toolName) : typeof toolApi.unregisterExternalTool === "function" ? (toolName) => toolApi.unregisterExternalTool(toolName) : () => {
+    };
     registry2 = new ServerRegistry({
       emitEvent: (event, payload) => emitEvent(pi, event, payload),
-      registerTool: (tool) => {
-        try {
-          pi.registerTool?.(tool) ?? pi.registerExternalTool?.(tool);
-        } catch {
-        }
-      },
-      unregisterTool: (toolName) => {
-        try {
-          pi.unregisterTool?.(toolName) ?? pi.unregisterExternalTool?.(toolName);
-        } catch {
-        }
-      }
+      registerTool,
+      unregisterTool,
+      canUnregisterTools
     });
     const cwd = ctx.cwd ?? process.cwd();
     let servers = [];
@@ -22722,13 +22978,10 @@ function src_default4(pi) {
       servers = result.servers;
     } catch (_err) {
     }
-    const startPromises = servers.filter((s) => s.enabled).map(async (server) => {
-      try {
-        await registry2.startServer(server);
-      } catch (err) {
-      }
-    });
-    await Promise.allSettled(startPromises);
+    try {
+      await registry2.startServers(servers.filter((server) => server.enabled));
+    } catch (_err) {
+    }
     const infoRegistry2 = getInfoRegistry5();
     if (infoRegistry2 && registry2) {
       const reg = registry2;
@@ -22785,14 +23038,12 @@ function src_default4(pi) {
         `unipi:${MCP_COMMANDS.STATUS}`,
         `unipi:${MCP_COMMANDS.RELOAD}`
       ],
-      tools: activeServers.flatMap(
-        (s) => registry2?.getEntry(s.name)?.toolNames ?? []
-      )
+      tools: activeServers.flatMap((server) => registry2?.getEntry(server.name)?.toolNames ?? []).sort(compareCodeUnits)
     });
   });
   pi.on("session_shutdown", async (_event, _ctx) => {
     if (registry2) {
-      await registry2.stopAll();
+      await registry2.disconnectAll();
       registry2 = null;
     }
   });
@@ -22906,38 +23157,16 @@ Updated: ${catalog.lastUpdated}`,
     }
   });
   pi.registerCommand(`unipi:${MCP_COMMANDS.RELOAD}`, {
-    description: "Reload all MCP servers (restart with current config)",
+    description: "Explain how to reload MCP servers safely",
     handler: async (_args, ctx) => {
-      const reg = getRegistry();
-      if (!reg) {
-        ctx.ui.notify("MCP extension not initialized", "warning");
-        return;
-      }
-      const all = reg.getAll();
-      if (all.length === 0) {
-        ctx.ui.notify("No MCP servers configured. Use /unipi:mcp-add to add one.", "info");
-        return;
-      }
-      ctx.ui.notify(`Reloading ${all.length} MCP server(s)...`, "info");
-      let restarted = 0;
-      let failed = 0;
-      for (const state of all) {
-        try {
-          await reg.restartServer(state.name);
-          restarted++;
-        } catch (_err) {
-          failed++;
-        }
-      }
-      const msg = failed > 0 ? `Reloaded: ${restarted} ok, ${failed} failed` : `Reloaded ${restarted} MCP server(s) successfully`;
-      ctx.ui.notify(msg, failed > 0 ? "warning" : "info");
+      ctx.ui.notify("Restart Pi to reload MCP servers and tool schemas safely.", "info");
     }
   });
 }
 
 // packages/notify/index.ts
 init_core();
-import { dirname as dirname22 } from "node:path";
+import { dirname as dirname21 } from "node:path";
 import { fileURLToPath as fileURLToPath10 } from "node:url";
 
 // packages/notify/tools.ts
@@ -22947,7 +23176,7 @@ import { Type as Type6 } from "typebox";
 // packages/notify/settings.ts
 init_core();
 import { readFileSync as readFileSync19, writeFileSync as writeFileSync17, mkdirSync as mkdirSync15, existsSync as existsSync24 } from "fs";
-import { dirname as dirname20, join as join22 } from "path";
+import { dirname as dirname19, join as join22 } from "path";
 import { homedir as homedir17 } from "os";
 function resolveConfigPath() {
   const base = NOTIFY_DIRS.CONFIG.replace("~", homedir17());
@@ -23001,7 +23230,7 @@ function loadConfig2() {
 }
 function saveConfig2(config) {
   const configPath = resolveConfigPath();
-  const dir = dirname20(configPath);
+  const dir = dirname19(configPath);
   mkdirSync15(dir, { recursive: true });
   writeFileSync17(configPath, JSON.stringify(config, null, 2) + "\n", "utf-8");
 }
@@ -23062,7 +23291,7 @@ init_core();
 
 // packages/notify/ntfy-config.ts
 import { readFileSync as readFileSync20, writeFileSync as writeFileSync18, mkdirSync as mkdirSync16, existsSync as existsSync25 } from "fs";
-import { dirname as dirname21, join as join23 } from "path";
+import { dirname as dirname20, join as join23 } from "path";
 import { homedir as homedir18 } from "os";
 var DEFAULT_NTFY_CONFIG = {
   enabled: false,
@@ -23102,7 +23331,7 @@ function loadNtfyConfig(cwd) {
 }
 function saveNtfyConfig(scope, cwd, config) {
   const filePath = scope === "project" ? getProjectNtfyPath(cwd) : getGlobalNtfyPath();
-  const dir = dirname21(filePath);
+  const dir = dirname20(filePath);
   mkdirSync16(dir, { recursive: true });
   writeFileSync18(filePath, JSON.stringify(config, null, 2) + "\n", "utf-8");
 }
@@ -23142,7 +23371,7 @@ function migrateFromLegacyConfig() {
       token: ntfySection.token,
       priority: ntfySection.priority ?? 3
     };
-    const dir = dirname21(globalNtfyPath);
+    const dir = dirname20(globalNtfyPath);
     mkdirSync16(dir, { recursive: true });
     writeFileSync18(
       globalNtfyPath,
@@ -23198,7 +23427,7 @@ async function isWindowFocusedOnWindows() {
     tmpDir = mkdtempSync(join24(tmpdir2(), "pi-focus-"));
     const scriptPath = join24(tmpDir, "check.ps1");
     writeFileSync19(scriptPath, POWERCHECK_SCRIPT, "utf-8");
-    const stdout = await new Promise((resolve13, reject) => {
+    const stdout = await new Promise((resolve14, reject) => {
       execFile(
         "powershell.exe",
         [
@@ -23213,7 +23442,7 @@ async function isWindowFocusedOnWindows() {
         { timeout: 5e3, encoding: "utf-8" },
         (err, out) => {
           if (err) reject(err);
-          else resolve13(out);
+          else resolve14(out);
         }
       );
     });
@@ -23255,7 +23484,7 @@ async function sendNativeNotification(title, message, options) {
   if (options?.suppressWhenFocused && await isWindowFocused()) {
     throw new SuppressedError2();
   }
-  return new Promise((resolve13, reject) => {
+  return new Promise((resolve14, reject) => {
     notifier.notify(
       {
         title,
@@ -23270,7 +23499,7 @@ async function sendNativeNotification(title, message, options) {
             )
           );
         } else {
-          resolve13();
+          resolve14();
         }
       }
     );
@@ -26006,7 +26235,7 @@ ${results.join("\n")}`, "info");
 }
 
 // packages/notify/index.ts
-var VERSION9 = getPackageVersion(dirname22(fileURLToPath10(import.meta.url)));
+var VERSION9 = getPackageVersion(dirname21(fileURLToPath10(import.meta.url)));
 function notify_default(pi) {
   registerNotifyTools(pi);
   registerNotifyCommands(pi);
@@ -26035,6 +26264,9 @@ init_core();
 init_core();
 import * as fs14 from "node:fs";
 import * as path13 from "node:path";
+import {
+  buildSessionContext as buildSessionContext3
+} from "@earendil-works/pi-coding-agent";
 
 // packages/milestone/milestone.ts
 init_core();
@@ -26180,7 +26412,7 @@ function getProgressSummary(filePath) {
 }
 
 // packages/milestone/hooks.ts
-var sessionStartMs = 0;
+var MILESTONE_SNAPSHOT_TYPE = "unipi-milestone-snapshot";
 function formatMilestoneContext(filePath) {
   const summary = getProgressSummary(filePath);
   if (summary.totalItems === 0) return null;
@@ -26193,16 +26425,67 @@ function formatMilestoneContext(filePath) {
     focus
   ].filter(Boolean).join("\n");
 }
+function formatMilestoneSnapshot(workspace, context) {
+  return [
+    "# UniPi Milestone Snapshot",
+    "This snapshot supersedes all prior UniPi milestone snapshots; use only this snapshot for milestone status.",
+    `Workspace: ${workspace}`,
+    `Status: ${context ? "active" : "inactive"}`,
+    context ?? "No milestones are active for this workspace."
+  ].join("\n\n");
+}
+function latestEffectiveSnapshot(branch) {
+  const messages = buildSessionContext3(branch).messages;
+  for (let index = messages.length - 1; index >= 0; index--) {
+    const message = messages[index];
+    if (message.role === "custom" && message.customType === MILESTONE_SNAPSHOT_TYPE) {
+      return {
+        content: message.content,
+        details: message.details
+      };
+    }
+  }
+  return void 0;
+}
+function latestHistoricalSnapshot(branch) {
+  for (let index = branch.length - 1; index >= 0; index--) {
+    const entry = branch[index];
+    if (entry.type === "custom_message" && entry.customType === MILESTONE_SNAPSHOT_TYPE) {
+      return {
+        content: entry.content,
+        details: entry.details
+      };
+    }
+  }
+  return void 0;
+}
+function isActiveSnapshot2(snapshot) {
+  if (typeof snapshot.details?.active === "boolean") return snapshot.details.active;
+  return typeof snapshot.content === "string" && snapshot.content.includes("Status: active");
+}
 function registerSessionStartHook(pi) {
-  pi.on("before_agent_start", (event) => {
-    sessionStartMs = Date.now();
-    const cwd = process.cwd();
-    const milestonesPath = path13.join(cwd, MILESTONE_DIRS.MILESTONES);
+  pi.on("before_agent_start", (_event, ctx) => {
+    const workspace = ctx.cwd;
+    const milestonesPath = path13.join(workspace, MILESTONE_DIRS.MILESTONES);
     const context = formatMilestoneContext(milestonesPath);
-    if (!context) return void 0;
-    const currentPrompt = event.systemPrompt ?? "";
+    const branch = ctx.sessionManager.getBranch();
+    const latest = latestEffectiveSnapshot(branch);
+    const historical = latestHistoricalSnapshot(branch);
+    if (!context && !latest && !historical) return void 0;
+    const prior = latest ?? historical;
+    if (!context && prior && !isActiveSnapshot2(prior)) return void 0;
+    const content = formatMilestoneSnapshot(workspace, context);
+    if (latest?.content === content) return void 0;
     return {
-      systemPrompt: currentPrompt + "\n\n" + context
+      message: {
+        customType: MILESTONE_SNAPSHOT_TYPE,
+        content,
+        display: false,
+        details: {
+          active: context !== null,
+          workspace
+        }
+      }
     };
   });
 }
@@ -26258,14 +26541,16 @@ function scanModifiedDocs(dirs, since) {
 }
 function registerSessionEndHook(pi) {
   const baselineSnapshots = /* @__PURE__ */ new Map();
-  pi.on("session_start", () => {
+  let sessionStartMs = 0;
+  let sessionWorkspace = null;
+  pi.on("session_start", (_event, ctx) => {
     sessionStartMs = Date.now();
+    sessionWorkspace = ctx.cwd;
     baselineSnapshots.clear();
-    const cwd = process.cwd();
     const scanDirs = [
-      path13.join(cwd, ".unipi/docs/specs"),
-      path13.join(cwd, ".unipi/docs/plans"),
-      path13.join(cwd, ".unipi/docs/quick-work")
+      path13.join(sessionWorkspace, ".unipi/docs/specs"),
+      path13.join(sessionWorkspace, ".unipi/docs/plans"),
+      path13.join(sessionWorkspace, ".unipi/docs/quick-work")
     ];
     for (const dir of scanDirs) {
       if (!fs14.existsSync(dir)) continue;
@@ -26279,13 +26564,13 @@ function registerSessionEndHook(pi) {
     }
   });
   const syncModifiedDocs = () => {
-    const cwd = process.cwd();
-    const milestonesPath = path13.join(cwd, MILESTONE_DIRS.MILESTONES);
+    if (!sessionWorkspace) return;
+    const milestonesPath = path13.join(sessionWorkspace, MILESTONE_DIRS.MILESTONES);
     if (!fs14.existsSync(milestonesPath)) return;
     const scanDirs = [
-      path13.join(cwd, ".unipi/docs/specs"),
-      path13.join(cwd, ".unipi/docs/plans"),
-      path13.join(cwd, ".unipi/docs/quick-work")
+      path13.join(sessionWorkspace, ".unipi/docs/specs"),
+      path13.join(sessionWorkspace, ".unipi/docs/plans"),
+      path13.join(sessionWorkspace, ".unipi/docs/quick-work")
     ];
     const modifiedFiles = scanModifiedDocs(scanDirs, sessionStartMs);
     for (const filePath of modifiedFiles) {
@@ -26303,10 +26588,10 @@ function registerSessionEndHook(pi) {
 
 // packages/milestone/commands.ts
 init_core();
-import { dirname as dirname23, join as join26 } from "node:path";
+import { dirname as dirname22, join as join26 } from "node:path";
 import { fileURLToPath as fileURLToPath11 } from "node:url";
 import { readFileSync as readFileSync21 } from "node:fs";
-var SKILLS_DIR = join26(dirname23(fileURLToPath11(import.meta.url)), "skills");
+var SKILLS_DIR = join26(dirname22(fileURLToPath11(import.meta.url)), "skills");
 function loadSkill(skillName) {
   try {
     return readFileSync21(join26(SKILLS_DIR, skillName, "SKILL.md"), "utf-8");
@@ -26533,9 +26818,9 @@ var KanboardServer = class {
   }
   /** Bind server to a port */
   listen(port) {
-    return new Promise((resolve13, reject) => {
+    return new Promise((resolve14, reject) => {
       this.server.once("error", reject);
-      this.server.listen(port, () => resolve13());
+      this.server.listen(port, () => resolve14());
     });
   }
   /** Handle incoming HTTP request */
@@ -27504,11 +27789,11 @@ function markAutoCompactionError(state, nowMs) {
 }
 
 // packages/compactor/src/session/db.ts
-import { createHash as createHash2 } from "node:crypto";
+import { createHash as createHash3 } from "node:crypto";
 import { execFileSync } from "node:child_process";
 import { existsSync as existsSync32, mkdirSync as mkdirSync20 } from "node:fs";
 import { homedir as homedir21 } from "node:os";
-import { dirname as dirname26, join as join33 } from "node:path";
+import { dirname as dirname25, join as join33 } from "node:path";
 function getWorktreeSuffix() {
   const envSuffix = process.env.COMPACTOR_SESSION_SUFFIX;
   if (envSuffix !== void 0) {
@@ -27522,7 +27807,7 @@ function getWorktreeSuffix() {
       { encoding: "utf-8", timeout: 2e3, stdio: ["ignore", "pipe", "ignore"] }
     ).split(/\r?\n/).find((l) => l.startsWith("worktree "))?.replace("worktree ", "")?.trim();
     if (mainWorktree && cwd !== mainWorktree) {
-      const suffix = createHash2("sha256").update(cwd).digest("hex").slice(0, 8);
+      const suffix = createHash3("sha256").update(cwd).digest("hex").slice(0, 8);
       return `__${suffix}`;
     }
   } catch {
@@ -27553,7 +27838,7 @@ var SessionDB = class {
     this.dbPath = opts?.dbPath ?? defaultDBPath("session");
   }
   async init() {
-    const dir = dirname26(this.dbPath);
+    const dir = dirname25(this.dbPath);
     if (!existsSync32(dir)) mkdirSync20(dir, { recursive: true });
     const sqlite = await getSQLite();
     const Database2 = sqlite.Database ?? sqlite.default?.Database ?? sqlite.default ?? sqlite;
@@ -27664,7 +27949,7 @@ var SessionDB = class {
   }
   insertEvent(sessionId, event, sourceHook = "PostToolUse") {
     if (!this.stmts) return;
-    const dataHash = createHash2("sha256").update(event.data).digest("hex").slice(0, 16).toUpperCase();
+    const dataHash = createHash3("sha256").update(event.data).digest("hex").slice(0, 16).toUpperCase();
     const projectDir = String(event.project_dir ?? "").trim();
     const attributionSource = String(event.attribution_source ?? "unknown");
     const rawConfidence = Number(event.attribution_confidence ?? 0);
@@ -27948,7 +28233,7 @@ async function buildResumeContextMessage(db, sessionId) {
 // packages/compactor/src/executor/executor.ts
 import { spawn as spawn3, execSync, execFileSync as execFileSync2 } from "node:child_process";
 import { mkdtempSync as mkdtempSync2, writeFileSync as writeFileSync24, rmSync as rmSync3 } from "node:fs";
-import { join as join34, resolve as resolve10 } from "node:path";
+import { join as join34, resolve as resolve11 } from "node:path";
 import { tmpdir as tmpdir3 } from "node:os";
 
 // packages/compactor/src/executor/runtime.ts
@@ -28040,7 +28325,7 @@ var OS_TMPDIR = (() => {
       process.platform === "darwin" ? ["DARWIN_USER_TEMP_DIR"] : ["-u", "-d"],
       { env: { ...process.env, TMPDIR: void 0 }, encoding: "utf-8" }
     ).trim();
-    const dir = process.platform === "darwin" ? result : resolve10(result, "..");
+    const dir = process.platform === "darwin" ? result : resolve11(result, "..");
     if (dir && dir !== process.cwd()) return dir;
   } catch {
   }
@@ -28161,7 +28446,7 @@ var PolyglotExecutor = class {
   async executeFile(opts) {
     const { language, path: path28, timeout = 3e4, background = false } = opts;
     const cmd = buildCommand(this.#runtimes, language, path28);
-    const cwd = language === "shell" ? this.#projectRoot : resolve10(path28, "..");
+    const cwd = language === "shell" ? this.#projectRoot : resolve11(path28, "..");
     return this.#spawn(cmd, cwd, "", timeout, background);
   }
   #writeScript(tmpDir, code, language) {
@@ -28184,7 +28469,7 @@ var PolyglotExecutor = class {
     return filePath;
   }
   async #spawn(cmd, cwd, tmpDir, timeout, background) {
-    return new Promise((resolve13) => {
+    return new Promise((resolve14) => {
       const proc = spawn3(cmd[0], cmd.slice(1), {
         cwd,
         env: sanitizeEnv(),
@@ -28220,14 +28505,14 @@ var PolyglotExecutor = class {
       }, timeout);
       proc.on("error", (err) => {
         if (timer) clearTimeout(timer);
-        resolve13({ stdout, stderr: err.message, exitCode: 1, timedOut: false });
+        resolve14({ stdout, stderr: err.message, exitCode: 1, timedOut: false });
       });
       proc.on("close", (code) => {
         if (timer) clearTimeout(timer);
         if (background && proc.pid) {
           this.#backgroundedPids.add(proc.pid);
         }
-        resolve13({
+        resolve14({
           stdout: stdout.slice(0, this.#hardCapBytes),
           stderr: stderr.slice(0, this.#hardCapBytes),
           exitCode: code ?? 0,
@@ -28265,7 +28550,7 @@ init_core();
 init_hooks();
 
 // packages/compactor/src/compaction/search-entries.ts
-import { createHash as createHash4 } from "node:crypto";
+import { createHash as createHash5 } from "node:crypto";
 function tokenize(text) {
   return text.toLowerCase().replace(/[^\p{L}\p{N}\s]/gu, " ").split(/\s+/).filter((w) => w.length > 1);
 }
@@ -28309,7 +28594,7 @@ function searchEntries(blocks, query, opts) {
     kind: b.kind
   }));
   const hashSource = docs.length > 0 ? `${docs.length}:${docs[0].text.slice(0, 80)}:${docs[docs.length - 1].text.slice(-80)}` : "empty";
-  const currentHash = createHash4("sha256").update(hashSource).digest("hex");
+  const currentHash = createHash5("sha256").update(hashSource).digest("hex");
   let index;
   let docCount;
   let avgDocLen;
@@ -32795,7 +33080,7 @@ import { Key as Key6, matchesKey as matchesKey14, truncateToWidth as truncateToW
 // packages/updater/src/readme.ts
 init_core();
 init_core();
-import { dirname as dirname28 } from "node:path";
+import { dirname as dirname27 } from "node:path";
 import { fileURLToPath as fileURLToPath12 } from "node:url";
 import { existsSync as existsSync39, readFileSync as readFileSync34 } from "fs";
 import { join as join38 } from "path";
@@ -32822,7 +33107,7 @@ var PACKAGE_MAP = {
   updater: MODULES.UPDATER
 };
 function resolveUnipiRoot() {
-  const dir = dirname28(fileURLToPath12(import.meta.url));
+  const dir = dirname27(fileURLToPath12(import.meta.url));
   const root = findPackageRoot(dir, "@pi-unipi/unipi");
   return root ?? join38(dir, "..");
 }
@@ -33159,7 +33444,7 @@ import { Key as Key7, matchesKey as matchesKey15, truncateToWidth as truncateToW
 // packages/updater/src/changelog.ts
 init_core();
 import { existsSync as existsSync40, readFileSync as readFileSync36 } from "fs";
-import { dirname as dirname29, join as join39 } from "node:path";
+import { dirname as dirname28, join as join39 } from "node:path";
 import { fileURLToPath as fileURLToPath13 } from "node:url";
 
 // packages/updater/src/version.ts
@@ -33184,7 +33469,7 @@ function isNewerVersion(latest, current) {
 // packages/updater/src/changelog.ts
 function resolveChangelogPath() {
   try {
-    const dir = dirname29(fileURLToPath13(import.meta.url));
+    const dir = dirname28(fileURLToPath13(import.meta.url));
     const root = findPackageRoot(dir, "@pi-unipi/unipi");
     if (root) {
       const packaged = join39(root, "CHANGELOG.md");
@@ -33445,7 +33730,7 @@ function renderChangelogOverlay() {
 // packages/updater/src/settings.ts
 init_core();
 import { readFileSync as readFileSync37, writeFileSync as writeFileSync26, mkdirSync as mkdirSync22, existsSync as existsSync42 } from "fs";
-import { dirname as dirname30, join as join40 } from "path";
+import { dirname as dirname29, join as join40 } from "path";
 import { homedir as homedir24 } from "os";
 var DEFAULT_CONFIG6 = {
   checkIntervalMs: 36e5,
@@ -33477,7 +33762,7 @@ function loadConfig5() {
 }
 function saveConfig4(config) {
   const configPath = resolveConfigPath2();
-  const dir = dirname30(configPath);
+  const dir = dirname29(configPath);
   mkdirSync22(dir, { recursive: true });
   writeFileSync26(configPath, JSON.stringify(config, null, 2) + "\n", "utf-8");
 }
@@ -33713,7 +33998,7 @@ init_core();
 // packages/updater/src/cache.ts
 init_core();
 import { readFileSync as readFileSync38, writeFileSync as writeFileSync27, mkdirSync as mkdirSync23, existsSync as existsSync43 } from "fs";
-import { dirname as dirname31, join as join41 } from "path";
+import { dirname as dirname30, join as join41 } from "path";
 import { homedir as homedir25 } from "os";
 function resolveCachePath() {
   const base = UPDATER_DIRS.CACHE.replace("~", homedir25());
@@ -33735,7 +34020,7 @@ function readLastCheck() {
 }
 function writeLastCheck(cache) {
   const cachePath = resolveCachePath();
-  const dir = dirname31(cachePath);
+  const dir = dirname30(cachePath);
   mkdirSync23(dir, { recursive: true });
   writeFileSync27(cachePath, JSON.stringify(cache, null, 2) + "\n", "utf-8");
 }
@@ -34145,8 +34430,8 @@ init_core();
 import { Key as Key10 } from "@earendil-works/pi-tui";
 
 // packages/input-shortcuts/src/registers.ts
-import { existsSync as existsSync44, mkdirSync as mkdirSync24, readFileSync as readFileSync39, renameSync as renameSync7, writeFileSync as writeFileSync28 } from "node:fs";
-import { dirname as dirname32, join as join42 } from "node:path";
+import { existsSync as existsSync44, mkdirSync as mkdirSync24, readFileSync as readFileSync39, renameSync as renameSync8, writeFileSync as writeFileSync28 } from "node:fs";
+import { dirname as dirname31, join as join42 } from "node:path";
 
 // packages/input-shortcuts/src/types.ts
 var DEFAULT_CONFIG7 = {
@@ -34216,13 +34501,13 @@ var RegisterStore = class {
   /** Atomic write: write to .tmp then rename. */
   save() {
     try {
-      const dir = dirname32(this.filePath);
+      const dir = dirname31(this.filePath);
       if (!existsSync44(dir)) {
         mkdirSync24(dir, { recursive: true });
       }
       const tmpPath = this.filePath + ".tmp";
       writeFileSync28(tmpPath, JSON.stringify(this.data, null, 2), "utf-8");
-      renameSync7(tmpPath, this.filePath);
+      renameSync8(tmpPath, this.filePath);
     } catch {
     }
   }
@@ -34443,8 +34728,8 @@ var ChordOverlay = class extends Container2 {
 
 // packages/input-shortcuts/src/settings-overlay.ts
 import { SettingsList as SettingsList3 } from "@earendil-works/pi-tui";
-import { existsSync as existsSync45, mkdirSync as mkdirSync25, readFileSync as readFileSync40, renameSync as renameSync8, writeFileSync as writeFileSync29 } from "node:fs";
-import { dirname as dirname33, join as join43 } from "node:path";
+import { existsSync as existsSync45, mkdirSync as mkdirSync25, readFileSync as readFileSync40, renameSync as renameSync9, writeFileSync as writeFileSync29 } from "node:fs";
+import { dirname as dirname32, join as join43 } from "node:path";
 var ALT_KEY_OPTIONS = [
   "alt+a",
   "alt+b",
@@ -34493,13 +34778,13 @@ function loadConfig6(baseDir) {
 function saveConfig5(config, baseDir) {
   const filePath = baseDir ? join43(baseDir, CONFIG_FILE) : CONFIG_FILE;
   try {
-    const dir = dirname33(filePath);
+    const dir = dirname32(filePath);
     if (!existsSync45(dir)) {
       mkdirSync25(dir, { recursive: true });
     }
     const tmpPath = filePath + ".tmp";
     writeFileSync29(tmpPath, JSON.stringify(config, null, 2), "utf-8");
-    renameSync8(tmpPath, filePath);
+    renameSync9(tmpPath, filePath);
   } catch {
   }
 }
@@ -34927,7 +35212,7 @@ import { Type as Type8 } from "typebox";
 // packages/cocoindex/bridge.ts
 init_core();
 import { execFileSync as execFileSync3, spawn as spawn4 } from "node:child_process";
-import { existsSync as existsSync46, mkdirSync as mkdirSync26, readFileSync as readFileSync41, writeFileSync as writeFileSync30, readdirSync as readdirSync13, statSync as statSync8 } from "node:fs";
+import { existsSync as existsSync46, mkdirSync as mkdirSync26, readFileSync as readFileSync41, writeFileSync as writeFileSync30, readdirSync as readdirSync14, statSync as statSync9 } from "node:fs";
 import { homedir as homedir26 } from "node:os";
 import { join as join44 } from "node:path";
 var DEFAULT_PIPELINE_DIR = ".unipi/cocoindex";
@@ -35003,7 +35288,7 @@ function resolveCocoindexBin() {
   if (existsSync46(uvToolBin)) return uvToolBin;
   const miseRoot = join44(homedir26(), ".local", "share", "mise", "installs", "python");
   try {
-    const versions = readdirSync13(miseRoot).sort().reverse();
+    const versions = readdirSync14(miseRoot).sort().reverse();
     for (const ver of versions) {
       const binPath = join44(miseRoot, ver, "bin", "cocoindex");
       if (existsSync46(binPath)) return binPath;
@@ -35066,7 +35351,7 @@ async function indexProject(projectDir) {
   }
   const start = Date.now();
   const cocoindexBin = resolveCocoindexBin();
-  return new Promise((resolve13) => {
+  return new Promise((resolve14) => {
     const proc = spawn4(cocoindexBin, ["update", "main.py"], {
       cwd: pipelineDir,
       stdio: ["pipe", "pipe", "pipe"]
@@ -35096,9 +35381,9 @@ async function indexProject(projectDir) {
       const durationMs = Date.now() - start;
       const chunksProcessed = parseChunksProcessed(stdout);
       if (code === 0) {
-        resolve13({ success: true, chunksProcessed, durationMs });
+        resolve14({ success: true, chunksProcessed, durationMs });
       } else {
-        resolve13({
+        resolve14({
           success: false,
           chunksProcessed,
           durationMs,
@@ -35109,7 +35394,7 @@ async function indexProject(projectDir) {
     proc.on("error", (err) => {
       settled = true;
       clearTimeout(timer);
-      resolve13({
+      resolve14({
         success: false,
         chunksProcessed: 0,
         durationMs: Date.now() - start,
@@ -35174,9 +35459,9 @@ async function status(projectDir) {
   const lancedbPath = join44(pipelineDir, ".lancedb");
   if (existsSync46(lancedbPath)) {
     try {
-      const stat = statSync8(lancedbPath);
+      const stat = statSync9(lancedbPath);
       lastRun = stat.mtime.toISOString();
-      const files = readdirSync13(lancedbPath, { recursive: true });
+      const files = readdirSync14(lancedbPath, { recursive: true });
       docCount = files.filter((f) => f.endsWith(".lance")).length;
     } catch {
     }
@@ -35836,7 +36121,7 @@ function buildUvInstallerFallback(shell) {
   ];
 }
 function runStep(step) {
-  return new Promise((resolve13) => {
+  return new Promise((resolve14) => {
     const proc = spawn5(step.command, step.args ?? [], {
       stdio: ["ignore", "pipe", "pipe"],
       env: installerEnv()
@@ -35859,12 +36144,12 @@ Timed out after ${step.timeoutMs ?? DEFAULT_STEP_TIMEOUT_MS}ms.`;
     proc.on("close", (code, signal) => {
       settled = true;
       clearTimeout(timeout);
-      resolve13({ ok: code === 0, stdout, stderr, exitCode: code, signal });
+      resolve14({ ok: code === 0, stdout, stderr, exitCode: code, signal });
     });
     proc.on("error", (err) => {
       settled = true;
       clearTimeout(timeout);
-      resolve13({ ok: false, stdout, stderr: stderr || err.message });
+      resolve14({ ok: false, stdout, stderr: stderr || err.message });
     });
   });
 }
@@ -36066,7 +36351,7 @@ function cocoindexExtension(pi) {
 
 // packages/image/src/index.ts
 init_core();
-import { dirname as dirname35 } from "node:path";
+import { dirname as dirname34 } from "node:path";
 import { fileURLToPath as fileURLToPath14 } from "node:url";
 
 // packages/image/src/commands.ts
@@ -37820,7 +38105,7 @@ function currentSessionModel(ctx) {
 }
 
 // packages/image/src/index.ts
-var VERSION11 = getPackageVersion(dirname35(fileURLToPath14(import.meta.url)));
+var VERSION11 = getPackageVersion(dirname34(fileURLToPath14(import.meta.url)));
 function getInfoRegistry6() {
   return globalThis.__unipi_info_registry;
 }