@cydm/pie 1.0.35 → 1.0.37

package/dist/chunks/{test-stream-A7JSM2UM.js → test-stream-L4PUYWQQ.js}

@@ -5,6 +5,28 @@ import {
 import "./chunk-TG2EQLX2.js";
 
 // src/app/test-stream.ts
+function parseSystemPromptExpectations(value) {
+  if (!value) return [];
+  const parsed = JSON.parse(value);
+  const normalize = (item) => {
+    if (typeof item === "string") return [item];
+    if (Array.isArray(item) && item.every((entry) => typeof entry === "string")) return item;
+    throw new Error("PIE_TEST_EXPECT_SYSTEM_PROMPT_INCLUDES entries must be strings");
+  };
+  if (typeof parsed === "string" || Array.isArray(parsed) && parsed.every((entry) => typeof entry === "string")) {
+    return [normalize(parsed)];
+  }
+  if (!Array.isArray(parsed)) throw new Error("PIE_TEST_EXPECT_SYSTEM_PROMPT_INCLUDES must be JSON");
+  return parsed.map(normalize);
+}
+function assertSystemPromptIncludes(systemPrompt, callIndex) {
+  const expectations = parseSystemPromptExpectations(process.env.PIE_TEST_EXPECT_SYSTEM_PROMPT_INCLUDES);
+  for (const expected of expectations[Math.min(callIndex, Math.max(0, expectations.length - 1))] ?? []) {
+    if (!systemPrompt.includes(expected)) {
+      throw new Error(`Expected system prompt to include ${JSON.stringify(expected)}`);
+    }
+  }
+}
 function createAssistantMessage(model, text, stopReason = "stop", errorMessage) {
   return {
     role: "assistant",
@@ -68,8 +90,9 @@ function createTestStreamFnFromSequenceEnv(value = process.env.PIE_TEST_MOCK_STR
   }
   const steps = parseMockStreamSequence(value);
   let callIndex = 0;
-  return async (model) => {
+  return async (model, context) => {
     const step = steps[Math.min(callIndex, steps.length - 1)];
+    assertSystemPromptIncludes(context.systemPrompt, callIndex);
     callIndex += 1;
     const stream = new EventStream(
       (event) => event.type === "done" || event.type === "error",

package/dist/cli.js

@@ -985,15 +985,15 @@ var require_route = __commonJS({
       };
     }
     function wrapConversion(toModel, graph) {
-      const path30 = [graph[toModel].parent, toModel];
+      const path31 = [graph[toModel].parent, toModel];
       let fn = conversions[graph[toModel].parent][toModel];
       let cur = graph[toModel].parent;
       while (graph[cur].parent) {
-        path30.unshift(graph[cur].parent);
+        path31.unshift(graph[cur].parent);
         fn = link(conversions[graph[cur].parent][cur], fn);
         cur = graph[cur].parent;
       }
-      fn.conversion = path30;
+      fn.conversion = path31;
       return fn;
     }
     module.exports = function(fromModel) {
@@ -43957,11 +43957,11 @@ var require_dist = __commonJS({
 });
 
 // src/cli.ts
-import * as fs26 from "fs";
-import * as path29 from "path";
+import * as fs27 from "fs";
+import * as path30 from "path";
 
 // src/cli-args.ts
-var FLAGS_WITH_VALUES = /* @__PURE__ */ new Set(["--session-id", "--extension-path"]);
+var FLAGS_WITH_VALUES = /* @__PURE__ */ new Set(["--session-id", "--extension-path", "--developer-instructions", "--developer-instructions-file"]);
 var BOOLEAN_FLAGS = /* @__PURE__ */ new Set(["--raw-output", "--json-output", "--json-events", "--resume-required"]);
 var HELP_FLAGS = /* @__PURE__ */ new Set(["help", "--help", "-h"]);
 var COMMANDS = /* @__PURE__ */ new Set(["chat", "help"]);
@@ -44561,7 +44561,7 @@ async function acquireRemoteRefreshLock(modelsPath) {
         throw lockError;
       }
       if (Date.now() >= deadline) throw new Error(`timed out waiting for remote catalog refresh lock: ${lockPath}`);
-      await new Promise((resolve5) => setTimeout(resolve5, 25));
+      await new Promise((resolve6) => setTimeout(resolve6, 25));
     }
   }
 }
@@ -46565,6 +46565,165 @@ function parseModelsCommandArgs(args) {
 
 // src/commands/sessions.ts
 import fs6 from "node:fs";
+
+// src/session-control.ts
+var SessionControlError = class extends Error {
+  constructor(code, message, recoverable = sessionControlErrorRecoverable(code)) {
+    super(message);
+    this.code = code;
+    this.recoverable = recoverable;
+    this.name = "SessionControlError";
+  }
+  code;
+  recoverable;
+};
+function sessionControlErrorRecoverable(code) {
+  return code !== "session_unrecoverable" && code !== "session_mismatch";
+}
+async function loadRequiredSession(store, sessionId) {
+  const exists = await store.exists(sessionId);
+  const data = await store.load(sessionId);
+  if (data) return data;
+  throw new SessionControlError(
+    exists ? "session_unrecoverable" : "session_not_found",
+    exists ? `Session could not be recovered: ${sessionId}` : `Session not found: ${sessionId}`
+  );
+}
+async function rewindStoredSession(params) {
+  const data = await loadRequiredSession(params.store, params.sessionId);
+  if (!data.entries.some((entry) => entry.id === params.entryId)) {
+    throw new SessionControlError("checkpoint_not_found", `Entry not found: ${params.entryId}`);
+  }
+  try {
+    await params.store.save(params.sessionId, data.entries, {
+      ...data.metadata,
+      activeEntryId: params.entryId,
+      updatedAt: params.now ?? Date.now()
+    });
+    const metadata = await params.store.getMetadata(params.sessionId);
+    if (!metadata) {
+      throw new SessionControlError("session_unrecoverable", `Session could not be recovered after rewind: ${params.sessionId}`, false);
+    }
+    return {
+      sessionId: params.sessionId,
+      entryId: params.entryId,
+      checkpointId: params.entryId,
+      activeEntryId: params.entryId,
+      headEntryId: params.entryId,
+      metadata
+    };
+  } catch (error) {
+    if (error instanceof SessionControlError) throw error;
+    throw new SessionControlError("session_io_error", error instanceof Error ? error.message : String(error));
+  }
+}
+async function forkStoredSession(params) {
+  try {
+    const existingTarget = await maybeLoadExistingForkTarget(params);
+    if (existingTarget) return existingTarget;
+    const source = await loadRequiredSession(params.store, params.sourceSessionId);
+    const pathEntries = pathToEntry(source, params.sourceEntryId);
+    if (pathEntries.length === 0 || pathEntries[pathEntries.length - 1]?.id !== params.sourceEntryId) {
+      throw new SessionControlError("checkpoint_not_found", `Entry not found: ${params.sourceEntryId}`);
+    }
+    const now = params.now ?? Date.now();
+    const idMap = /* @__PURE__ */ new Map();
+    for (const entry of pathEntries) idMap.set(entry.id, generateEntryId());
+    const forkedEntries = pathEntries.map((entry) => {
+      const nextId = idMap.get(entry.id);
+      if (!nextId) throw new SessionControlError("session_io_error", `Failed to map entry: ${entry.id}`);
+      const parentId = entry.parentId ? idMap.get(entry.parentId) ?? null : null;
+      return {
+        ...cloneJson(entry),
+        id: nextId,
+        parentId,
+        timestamp: entry.timestamp
+      };
+    });
+    const activeEntryId = idMap.get(params.sourceEntryId);
+    if (!activeEntryId) {
+      throw new SessionControlError("session_io_error", `Failed to map active entry: ${params.sourceEntryId}`);
+    }
+    await params.store.save(params.targetSessionId, forkedEntries, {
+      name: params.name,
+      createdAt: now,
+      updatedAt: now,
+      activeEntryId,
+      cwd: params.cwd ?? source.metadata.cwd,
+      sourceSessionId: params.sourceSessionId,
+      sourceEntryId: params.sourceEntryId,
+      sourceActiveEntryId: source.metadata.activeEntryId ?? void 0,
+      forkBaseEntryId: activeEntryId,
+      ...params.requestId ? { sessionControlRequestId: params.requestId } : {}
+    });
+    const metadata = await params.store.getMetadata(params.targetSessionId);
+    if (!metadata) {
+      throw new SessionControlError("session_unrecoverable", `Session could not be recovered after fork: ${params.targetSessionId}`, false);
+    }
+    return buildForkResult({
+      metadata,
+      sourceSessionId: params.sourceSessionId,
+      sourceEntryId: params.sourceEntryId,
+      sourceActiveEntryId: source.metadata.activeEntryId ?? null
+    });
+  } catch (error) {
+    if (error instanceof SessionControlError) throw error;
+    throw new SessionControlError("session_io_error", error instanceof Error ? error.message : String(error));
+  }
+}
+async function maybeLoadExistingForkTarget(params) {
+  if (!await params.store.exists(params.targetSessionId)) return null;
+  const target = await params.store.load(params.targetSessionId);
+  if (!target) {
+    throw new SessionControlError("session_unrecoverable", `Session could not be recovered: ${params.targetSessionId}`, false);
+  }
+  const metadata = target.metadata;
+  if (params.requestId && metadata.sessionControlRequestId === params.requestId && metadata.sourceSessionId === params.sourceSessionId && metadata.sourceEntryId === params.sourceEntryId && typeof metadata.forkBaseEntryId === "string" && metadata.activeEntryId === metadata.forkBaseEntryId) {
+    return buildForkResult({
+      metadata,
+      sourceSessionId: params.sourceSessionId,
+      sourceEntryId: params.sourceEntryId,
+      sourceActiveEntryId: typeof metadata.sourceActiveEntryId === "string" ? metadata.sourceActiveEntryId : null
+    });
+  }
+  throw new SessionControlError("target_exists", `Target session already exists: ${params.targetSessionId}`);
+}
+function buildForkResult(params) {
+  const targetActiveEntryId = params.metadata.activeEntryId;
+  if (!targetActiveEntryId) {
+    throw new SessionControlError("session_unrecoverable", `Fork target has no active entry: ${params.metadata.id}`, false);
+  }
+  const forkBaseEntryId = typeof params.metadata.forkBaseEntryId === "string" ? params.metadata.forkBaseEntryId : targetActiveEntryId;
+  return {
+    sourceSessionId: params.sourceSessionId,
+    sourceEntryId: params.sourceEntryId,
+    sourceCheckpointId: params.sourceEntryId,
+    targetSessionId: params.metadata.id,
+    targetActiveEntryId,
+    targetHeadEntryId: targetActiveEntryId,
+    headEntryId: targetActiveEntryId,
+    sourceActiveEntryId: params.sourceActiveEntryId,
+    forkBaseEntryId,
+    metadata: params.metadata
+  };
+}
+function pathToEntry(data, entryId) {
+  const byId = new Map(data.entries.map((entry) => [entry.id, entry]));
+  const path31 = [];
+  let current = entryId;
+  while (current) {
+    const entry = byId.get(current);
+    if (!entry) return [];
+    path31.unshift(entry);
+    current = entry.parentId;
+  }
+  return path31;
+}
+function cloneJson(value) {
+  return JSON.parse(JSON.stringify(value));
+}
+
+// src/commands/sessions.ts
 async function runSessionsCommand(args) {
   const command = args[0] || "help";
   const rest = args.slice(1);
@@ -46691,17 +46850,12 @@ async function rewindSession(args) {
   const entryId = stringFlag(args, "--to");
   if (!sessionId || !entryId) throw new Error("Usage: pie sessions rewind <sessionId> --to <entryId> [--json]");
   const store = new FileSessionStore(getSessionsDir());
-  const data = await store.load(sessionId);
-  if (!data) throw new Error(`Session not found: ${sessionId}`);
-  if (!data.entries.some((entry) => entry.id === entryId)) throw new Error(`Entry not found: ${entryId}`);
-  await store.save(sessionId, data.entries, { ...data.metadata, activeEntryId: entryId, updatedAt: Date.now() });
-  const updated = await store.getMetadata(sessionId);
-  if (!updated) throw new Error(`Session not found after rewind: ${sessionId}`);
+  const result = await rewindStoredSession({ store, sessionId, entryId });
   const response = {
     ok: true,
-    session: sessionSummary(updated),
-    activeEntryId: entryId,
-    currentHead: entryId
+    session: sessionSummary(result.metadata),
+    activeEntryId: result.activeEntryId,
+    currentHead: result.headEntryId
   };
   if (json) {
     console.log(JSON.stringify(response, null, 2));
@@ -46720,50 +46874,23 @@ async function forkSession(args) {
     throw new Error("Usage: pie sessions fork <sessionId> --from <entryId> --target <newSessionId> --name <name> [--cwd <path>] [--json]");
   }
   const store = new FileSessionStore(getSessionsDir());
-  const source = await store.load(sourceSessionId);
-  if (!source) throw new Error(`Session not found: ${sourceSessionId}`);
-  if (await store.exists(targetSessionId)) throw new Error(`Target session already exists: ${targetSessionId}`);
-  const pathEntries = pathToEntry(source, sourceEntryId);
-  if (pathEntries.length === 0 || pathEntries[pathEntries.length - 1]?.id !== sourceEntryId) {
-    throw new Error(`Entry not found: ${sourceEntryId}`);
-  }
-  const now = Date.now();
-  const idMap = /* @__PURE__ */ new Map();
-  for (const entry of pathEntries) idMap.set(entry.id, generateEntryId());
-  const forkedEntries = pathEntries.map((entry) => {
-    const nextId = idMap.get(entry.id);
-    if (!nextId) throw new Error(`Failed to map entry: ${entry.id}`);
-    const parentId = entry.parentId ? idMap.get(entry.parentId) ?? null : null;
-    return {
-      ...cloneJson(entry),
-      id: nextId,
-      parentId,
-      timestamp: entry.timestamp
-    };
-  });
-  const activeEntryId = idMap.get(sourceEntryId) ?? null;
-  await store.save(targetSessionId, forkedEntries, {
-    name,
-    createdAt: now,
-    updatedAt: now,
-    activeEntryId,
-    cwd: cwd ?? source.metadata.cwd,
+  const result = await forkStoredSession({
+    store,
     sourceSessionId,
     sourceEntryId,
-    sourceActiveEntryId: source.metadata.activeEntryId ?? void 0,
-    forkBaseEntryId: activeEntryId ?? void 0
+    targetSessionId,
+    name,
+    cwd
   });
-  const updated = await store.getMetadata(targetSessionId);
-  if (!updated) throw new Error(`Session not found after fork: ${targetSessionId}`);
   const response = {
     ok: true,
-    session: sessionSummary(updated),
+    session: sessionSummary(result.metadata),
     sourceSessionId,
     sourceEntryId,
-    sourceActiveEntryId: source.metadata.activeEntryId,
-    forkBaseEntryId: activeEntryId,
-    activeEntryId,
-    currentHead: activeEntryId
+    sourceActiveEntryId: result.sourceActiveEntryId,
+    forkBaseEntryId: result.forkBaseEntryId,
+    activeEntryId: result.targetActiveEntryId,
+    currentHead: result.targetHeadEntryId
   };
   if (json) {
     console.log(JSON.stringify(response, null, 2));
@@ -46856,7 +46983,7 @@ function activeTranscriptEvents(entries) {
       role,
       turnId,
       content: textFromMessage(entry.message),
-      message: entry.message ? cloneJson(entry.message) : void 0
+      message: entry.message ? cloneJson2(entry.message) : void 0
     };
   });
 }
@@ -46879,18 +47006,6 @@ function activePathEntries(data) {
   if (!activeEntryId) return [];
   return pathToEntry(data, activeEntryId);
 }
-function pathToEntry(data, entryId) {
-  const byId = new Map(data.entries.map((entry) => [entry.id, entry]));
-  const path30 = [];
-  let current = entryId;
-  while (current) {
-    const entry = byId.get(current);
-    if (!entry) return [];
-    path30.unshift(entry);
-    current = entry.parentId;
-  }
-  return path30;
-}
 function resolveBeforeCursor(events, cursor) {
   if (!cursor) return events.length;
   const numeric = Number(cursor);
@@ -46900,7 +47015,7 @@ function resolveBeforeCursor(events, cursor) {
   const index = events.findIndex((event) => event.entryId === cursor || event.checkpointId === cursor);
   return index >= 0 ? index : events.length;
 }
-function cloneJson(value) {
+function cloneJson2(value) {
   return JSON.parse(JSON.stringify(value));
 }
 function listCursorQueryKey(input) {
@@ -46952,19 +47067,19 @@ var CommandTree = class {
    *   register(["session", "new"], { description, handler })
    *   register(["tools", "subagent", "spawn", "local"], { description, handler })
    */
-  register(path30, info) {
-    if (path30.length === 0) {
+  register(path31, info) {
+    if (path31.length === 0) {
       throw new Error("Command path cannot be empty");
     }
     let current = this.root;
     const fullPath = [];
-    for (let i = 0; i < path30.length; i++) {
-      const segment = path30[i];
+    for (let i = 0; i < path31.length; i++) {
+      const segment = path31[i];
       fullPath.push(segment);
       if (!current.children) {
         current.children = [];
       }
-      const isLast = i === path30.length - 1;
+      const isLast = i === path31.length - 1;
       let node = current.children.find((n) => n.name === segment);
       if (!node) {
         node = {
@@ -46994,31 +47109,31 @@ var CommandTree = class {
   /**
    * Find a node by path
    */
-  find(path30) {
-    if (path30.length === 0) {
+  find(path31) {
+    if (path31.length === 0) {
       return this.root;
     }
-    const key = path30.join("/");
+    const key = path31.join("/");
     return this.pathCache.get(key) || null;
   }
   /**
    * Get children of a path
    */
-  getChildren(path30) {
-    const node = this.find(path30);
+  getChildren(path31) {
+    const node = this.find(path31);
     return (node?.children || []).filter((child) => !child.hidden);
   }
   /**
    * Check if a path exists (as category or command)
    */
-  exists(path30) {
-    return this.find(path30) !== null;
+  exists(path31) {
+    return this.find(path31) !== null;
   }
   /**
    * Check if path is a category (has children)
    */
-  isCategory(path30) {
-    const node = this.find(path30);
+  isCategory(path31) {
+    const node = this.find(path31);
     return node?.isCategory || false;
   }
   /**
@@ -47097,8 +47212,8 @@ var CommandTree = class {
    * Supports dot notation: "tools.subagent.spawn.local"
    */
   registerFromPath(pathStr, info) {
-    const path30 = pathStr.split(/[./]/).filter(Boolean);
-    this.register(path30, info);
+    const path31 = pathStr.split(/[./]/).filter(Boolean);
+    this.register(path31, info);
   }
 };
 var commandTree = new CommandTree();
@@ -54388,7 +54503,7 @@ var ProcessTerminal = class {
         const timeLeft = endTime - now;
         if (timeLeft <= 0) break;
         if (now - lastDataTime >= idleMs) break;
-        await new Promise((resolve5) => setTimeout(resolve5, Math.min(idleMs, timeLeft)));
+        await new Promise((resolve6) => setTimeout(resolve6, Math.min(idleMs, timeLeft)));
       }
     } finally {
       process.stdin.removeListener("data", onData);
@@ -54922,10 +55037,10 @@ var KeybindingsManager = class _KeybindingsManager {
   static inMemory(config = {}) {
     return new _KeybindingsManager(config);
   }
-  static loadFromFile(path30) {
-    if (!existsSync7(path30)) return {};
+  static loadFromFile(path31) {
+    if (!existsSync7(path31)) return {};
     try {
-      return JSON.parse(readFileSync6(path30, "utf-8"));
+      return JSON.parse(readFileSync6(path31, "utf-8"));
     } catch {
       return {};
     }
@@ -57635,11 +57750,11 @@ var FileCache = class _FileCache {
   // Hash Computation
   // ============================================================================
   async computeHash(filePath) {
-    return new Promise((resolve5, reject) => {
+    return new Promise((resolve6, reject) => {
       const hash = crypto.createHash("sha256");
       const stream = fs16.createReadStream(filePath);
       stream.on("data", (chunk) => hash.update(chunk));
-      stream.on("end", () => resolve5(hash.digest("hex")));
+      stream.on("end", () => resolve6(hash.digest("hex")));
       stream.on("error", reject);
     });
   }
@@ -58349,17 +58464,17 @@ var FFmpegProcessor = class {
   // Detection
   // ============================================================================
   async checkAvailability() {
-    return new Promise((resolve5) => {
+    return new Promise((resolve6) => {
       const proc = spawn(this.ffmpegPath, ["-version"]);
-      proc.on("error", () => resolve5(false));
-      proc.on("exit", (code) => resolve5(code === 0));
+      proc.on("error", () => resolve6(false));
+      proc.on("exit", (code) => resolve6(code === 0));
     });
   }
   // ============================================================================
   // Video Analysis
   // ============================================================================
   async analyzeVideo(videoPath) {
-    return new Promise((resolve5, reject) => {
+    return new Promise((resolve6, reject) => {
       const args = [
         "-v",
         "error",
@@ -58388,7 +58503,7 @@ var FFmpegProcessor = class {
         }
         try {
           const info = this.parseProbeOutput(stdout, videoPath);
-          resolve5(info);
+          resolve6(info);
         } catch (err) {
           reject(err);
         }
@@ -58583,7 +58698,7 @@ var FFmpegProcessor = class {
   // FFmpeg Execution
   // ============================================================================
   runFFmpeg(args) {
-    return new Promise((resolve5, reject) => {
+    return new Promise((resolve6, reject) => {
       const proc = spawn(this.ffmpegPath, args);
       let stderr = "";
       proc.stderr.on("data", (data) => {
@@ -58598,7 +58713,7 @@ var FFmpegProcessor = class {
             )
           );
         } else {
-          resolve5();
+          resolve6();
         }
       });
       proc.on("error", (err) => {
@@ -58615,7 +58730,7 @@ var FFmpegProcessor = class {
   // Progress Monitoring (for future use)
   // ============================================================================
   async runWithProgress(args, onProgress) {
-    return new Promise((resolve5, reject) => {
+    return new Promise((resolve6, reject) => {
       const progressArgs = [
         ...args,
         "-progress",
@@ -58645,7 +58760,7 @@ var FFmpegProcessor = class {
             )
           );
         } else {
-          resolve5();
+          resolve6();
         }
       });
     });
@@ -59635,7 +59750,7 @@ async function waitForReady(params) {
     if (status.status === "error" || status.status === "expired") {
       throw new Error(`Uploaded file is not ready: ${status.status}${status.error ? ` (${status.error})` : ""}`);
     }
-    await new Promise((resolve5) => setTimeout(resolve5, 1500));
+    await new Promise((resolve6) => setTimeout(resolve6, 1500));
   }
   throw new Error("Timed out waiting for uploaded file to become ready");
 }
@@ -59731,8 +59846,8 @@ function createIsolatedRegexSession(pattern, ignoreCase) {
   let initError;
   let readyResolve;
   let readyReject;
-  const ready = new Promise((resolve5, reject) => {
-    readyResolve = resolve5;
+  const ready = new Promise((resolve6, reject) => {
+    readyResolve = resolve6;
     readyReject = reject;
   });
   void ready.catch(() => void 0);
@@ -59754,7 +59869,7 @@ function createIsolatedRegexSession(pattern, ignoreCase) {
       if (initError) throw initError;
       if (signal?.aborted) throw new Error("Operation aborted");
       const id = nextId++;
-      return new Promise((resolve5, reject) => {
+      return new Promise((resolve6, reject) => {
         let settled = false;
         const finish = (error, matches) => {
           if (settled) return;
@@ -59764,7 +59879,7 @@ function createIsolatedRegexSession(pattern, ignoreCase) {
           worker.off("message", onMessage);
           worker.off("error", onWorkerError);
           if (error) reject(error);
-          else resolve5(matches ?? []);
+          else resolve6(matches ?? []);
         };
         const terminate = (error) => {
           disposed = true;
@@ -60992,7 +61107,7 @@ async function handleCacheTest(host) {
     host.chatContainer.addChild(new Text(theme.fg("dim", `  ${summarizeUsage(result1.usage)}`), 1, 0));
     host.chatContainer.addChild(new Text(theme.fg("dim", "  Waiting 2s before replaying identical request..."), 1, 0));
     host.ui.requestRender();
-    await new Promise((resolve5) => setTimeout(resolve5, 2e3));
+    await new Promise((resolve6) => setTimeout(resolve6, 2e3));
     host.chatContainer.addChild(new Text(theme.fg("accent", "Request 2/2: replaying identical request..."), 1, 0));
     host.ui.requestRender();
     result2 = await completeSimple(model, context, options);
@@ -61982,16 +62097,16 @@ var Diff = class {
       }
     }
   }
-  addToPath(path30, added, removed, oldPosInc, options) {
-    const last = path30.lastComponent;
+  addToPath(path31, added, removed, oldPosInc, options) {
+    const last = path31.lastComponent;
     if (last && !options.oneChangePerToken && last.added === added && last.removed === removed) {
       return {
-        oldPos: path30.oldPos + oldPosInc,
+        oldPos: path31.oldPos + oldPosInc,
         lastComponent: { count: last.count + 1, added, removed, previousComponent: last.previousComponent }
       };
     } else {
       return {
-        oldPos: path30.oldPos + oldPosInc,
+        oldPos: path31.oldPos + oldPosInc,
         lastComponent: { count: 1, added, removed, previousComponent: last }
       };
     }
@@ -62439,13 +62554,13 @@ function formatSize2(bytes) {
 }
 var DEFAULT_MAX_BYTES = 102400;
 var DEFAULT_MAX_LINES = 100;
-function shortenPath(path30) {
-  if (typeof path30 !== "string") return "";
+function shortenPath(path31) {
+  if (typeof path31 !== "string") return "";
   const home = os4.homedir();
-  if (path30.startsWith(home)) {
-    return `~${path30.slice(home.length)}`;
+  if (path31.startsWith(home)) {
+    return `~${path31.slice(home.length)}`;
   }
-  return path30;
+  return path31;
 }
 function replaceTabs(text) {
   return text.replace(/\t/g, "   ");
@@ -62526,14 +62641,14 @@ ${renderManageTodoListResult(this.result, { expanded: this.expanded }, theme)}`;
       }
     } else if (this.toolName === "read_file") {
       const rawPath = str(this.args?.file_path ?? this.args?.path);
-      const path30 = rawPath !== null ? shortenPath(rawPath) : null;
+      const path31 = rawPath !== null ? shortenPath(rawPath) : null;
       const offset = typeof this.args?.offset === "number" ? this.args.offset : void 0;
       const limit = typeof this.args?.limit === "number" ? this.args.limit : void 0;
       let pathDisplay;
-      if (path30 === null) {
+      if (path31 === null) {
         pathDisplay = invalidArg;
-      } else if (path30) {
-        pathDisplay = theme.fg("accent", path30);
+      } else if (path31) {
+        pathDisplay = theme.fg("accent", path31);
       } else {
         const partialPath = partialStr(this.args?.file_path ?? this.args?.path);
         pathDisplay = theme.fg("toolOutput", partialPath);
@@ -62580,12 +62695,12 @@ ${renderManageTodoListResult(this.result, { expanded: this.expanded }, theme)}`;
     } else if (this.toolName === "write_file") {
       const rawPath = str(this.args?.file_path ?? this.args?.path);
       const fileContent = str(this.args?.content);
-      const path30 = rawPath !== null ? shortenPath(rawPath) : null;
+      const path31 = rawPath !== null ? shortenPath(rawPath) : null;
       let pathDisplay;
-      if (path30 === null) {
+      if (path31 === null) {
         pathDisplay = invalidArg;
-      } else if (path30) {
-        pathDisplay = theme.fg("accent", path30);
+      } else if (path31) {
+        pathDisplay = theme.fg("accent", path31);
       } else {
         const partialPath = partialStr(this.args?.file_path ?? this.args?.path);
         pathDisplay = theme.fg("toolOutput", partialPath);
@@ -62622,12 +62737,12 @@ ${theme.fg("error", errorText)}`;
       }
     } else if (this.toolName === "edit_file") {
       const rawPath = str(this.args?.file_path ?? this.args?.path);
-      const path30 = rawPath !== null ? shortenPath(rawPath) : null;
+      const path31 = rawPath !== null ? shortenPath(rawPath) : null;
       let pathDisplay;
-      if (path30 === null) {
+      if (path31 === null) {
         pathDisplay = invalidArg;
-      } else if (path30) {
-        pathDisplay = theme.fg("accent", path30);
+      } else if (path31) {
+        pathDisplay = theme.fg("accent", path31);
       } else {
         const partialPath = partialStr(this.args?.file_path ?? this.args?.path);
         pathDisplay = theme.fg("toolOutput", partialPath);
@@ -62652,7 +62767,7 @@ ${theme.fg("error", errorText)}`;
         const diff = this.result.details.diff;
         const firstChangedLine = this.result.details.firstChangedLine;
         if (firstChangedLine) {
-          text = `${theme.fg("toolTitle", theme.bold("edit_file"))} ${theme.fg("accent", path30 || rawPath)}${theme.fg("warning", `:${firstChangedLine}`)}`;
+          text = `${theme.fg("toolTitle", theme.bold("edit_file"))} ${theme.fg("accent", path31 || rawPath)}${theme.fg("warning", `:${firstChangedLine}`)}`;
         }
         const lines = diff.split("\n");
         const maxLines = this.expanded ? lines.length : 15;
@@ -62672,7 +62787,7 @@ ${theme.fg("error", errorText)}`;
         const diff = generateEditDiff(oldText, newText, rawPath);
         const firstChangedLine = findFirstChangedLine(oldText, newText);
         if (firstChangedLine) {
-          text = `${theme.fg("toolTitle", theme.bold("edit_file"))} ${theme.fg("accent", path30 || rawPath)}${theme.fg("warning", `:${firstChangedLine}`)}`;
+          text = `${theme.fg("toolTitle", theme.bold("edit_file"))} ${theme.fg("accent", path31 || rawPath)}${theme.fg("warning", `:${firstChangedLine}`)}`;
         }
         const lines = diff.split("\n");
         const maxLines = this.expanded ? lines.length : 15;
@@ -62691,9 +62806,9 @@ ${theme.fg("error", errorText)}`;
       }
     } else if (this.toolName === "list_dir") {
       const rawPath = str(this.args?.path);
-      const path30 = rawPath !== null ? shortenPath(rawPath || ".") : null;
+      const path31 = rawPath !== null ? shortenPath(rawPath || ".") : null;
       const limit = this.args?.limit;
-      text = `${theme.fg("toolTitle", theme.bold("list_dir"))} ${path30 === null ? invalidArg : theme.fg("accent", path30)}`;
+      text = `${theme.fg("toolTitle", theme.bold("list_dir"))} ${path31 === null ? invalidArg : theme.fg("accent", path31)}`;
       if (limit !== void 0) {
         text += theme.fg("toolOutput", ` (limit ${limit})`);
       }
@@ -62729,9 +62844,9 @@ ${theme.fg("warning", `[Truncated: ${warnings.join(", ")}]`)}`;
     } else if (this.toolName === "find_files") {
       const pattern = str(this.args?.pattern);
       const rawPath = str(this.args?.path);
-      const path30 = rawPath !== null ? shortenPath(rawPath || ".") : null;
+      const path31 = rawPath !== null ? shortenPath(rawPath || ".") : null;
       const limit = this.args?.limit;
-      text = theme.fg("toolTitle", theme.bold("find_files")) + " " + (pattern === null ? invalidArg : theme.fg("accent", pattern || "")) + theme.fg("toolOutput", ` in ${path30 === null ? invalidArg : path30}`);
+      text = theme.fg("toolTitle", theme.bold("find_files")) + " " + (pattern === null ? invalidArg : theme.fg("accent", pattern || "")) + theme.fg("toolOutput", ` in ${path31 === null ? invalidArg : path31}`);
       if (limit !== void 0) {
         text += theme.fg("toolOutput", ` (limit ${limit})`);
       }
@@ -62767,10 +62882,10 @@ ${theme.fg("warning", `[Truncated: ${warnings.join(", ")}]`)}`;
     } else if (this.toolName === "grep_text") {
       const pattern = str(this.args?.pattern);
       const rawPath = str(this.args?.path);
-      const path30 = rawPath !== null ? shortenPath(rawPath || ".") : null;
+      const path31 = rawPath !== null ? shortenPath(rawPath || ".") : null;
       const glob = str(this.args?.glob);
       const limit = this.args?.limit;
-      text = theme.fg("toolTitle", theme.bold("grep_text")) + " " + (pattern === null ? invalidArg : theme.fg("accent", `/${pattern || ""}/`)) + theme.fg("toolOutput", ` in ${path30 === null ? invalidArg : path30}`);
+      text = theme.fg("toolTitle", theme.bold("grep_text")) + " " + (pattern === null ? invalidArg : theme.fg("accent", `/${pattern || ""}/`)) + theme.fg("toolOutput", ` in ${path31 === null ? invalidArg : path31}`);
       if (glob) {
         text += theme.fg("toolOutput", ` (${glob})`);
       }
@@ -63224,8 +63339,8 @@ async function forkAtEntry(host, entryId) {
       host.showError("Failed to branch at entry");
       return;
     }
-    const path30 = host.sessionManager.getPathToEntry(entryId);
-    const pathNames = path30.map((e) => e.message?.role || "entry").join(" \u2192 ");
+    const path31 = host.sessionManager.getPathToEntry(entryId);
+    const pathNames = path31.map((e) => e.message?.role || "entry").join(" \u2192 ");
     const messages = host.sessionManager.getMessages();
     host.syncAgentFromActiveSession(messages);
     await host.syncSessionScopedState(messages);
@@ -63238,7 +63353,7 @@ async function forkAtEntry(host, entryId) {
     host.updatePendingMessagesDisplay();
     host.renderMessageHistory(messages);
     await host.sessionManager.save();
-    host.showStatus(`Branched at: ${pathNames} (${path30.length} messages). Continue to add to this branch.`);
+    host.showStatus(`Branched at: ${pathNames} (${path31.length} messages). Continue to add to this branch.`);
   } catch (error) {
     host.showError(
       `Failed to branch: ${error instanceof Error ? error.message : String(error)}`
@@ -63266,10 +63381,10 @@ async function navigateToEntry(host, entryId) {
     host.sessionManager.save().catch((err) => {
       console.error("[Session] Save after navigation failed:", err);
     });
-    const path30 = host.sessionManager.getPathToEntry(entryId);
+    const path31 = host.sessionManager.getPathToEntry(entryId);
     const entry = host.sessionManager.getEntry(entryId);
     const role = entry?.message?.role || "entry";
-    host.showStatus(`Switched to branch: ${role} (${path30.length} messages in path)`);
+    host.showStatus(`Switched to branch: ${role} (${path31.length} messages in path)`);
   } catch (error) {
     host.showError(
       `Failed to navigate: ${error instanceof Error ? error.message : String(error)}`
@@ -65059,7 +65174,7 @@ function setupInteractiveEditorSubmitHandler(host) {
     host.chatContainer.addChild(userMsg);
     host.editor.setText("");
     host.ui.requestRender();
-    await new Promise((resolve5) => setImmediate(resolve5));
+    await new Promise((resolve6) => setImmediate(resolve6));
     let finalContent = messageContent;
     const reminderPrefix = host.executionReminder;
     const combinedPrefix = [reminderPrefix].filter((value) => Boolean(value)).join("");
@@ -67713,11 +67828,11 @@ var HierarchicalSelectorComponent = class extends Container {
 // src/runtime/interactive-ui-helpers.ts
 function showHierarchicalMenu(host, initialPath = []) {
   const basePath = [...initialPath];
-  const showAtPath = (path30) => {
+  const showAtPath = (path31) => {
     host.showSelector((done) => {
       const selector = new HierarchicalSelectorComponent({
         tree: commandTree,
-        path: path30,
+        path: path31,
         basePath,
         onNavigate: (newPath) => {
           done();
@@ -67725,7 +67840,7 @@ function showHierarchicalMenu(host, initialPath = []) {
         },
         onSelect: async (selectedPath, node, searchArgs) => {
           if (node.handler) {
-            const args = searchArgs || (selectedPath.length > path30.length ? selectedPath.slice(path30.length).join(" ") : void 0);
+            const args = searchArgs || (selectedPath.length > path31.length ? selectedPath.slice(path31.length).join(" ") : void 0);
             const commandPath = "/" + selectedPath.join("/");
             if (!args && host.isInteractiveCommand(commandPath)) {
               done();
@@ -68404,7 +68519,7 @@ async function handleDirectBash(host, command) {
   child.stderr.on("data", (data) => {
     output.append(data.toString());
   });
-  return new Promise((resolve5) => {
+  return new Promise((resolve6) => {
     let settled = false;
     const finish = (code) => {
       if (settled) return;
@@ -68417,7 +68532,7 @@ async function handleDirectBash(host, command) {
       }
       host.chatContainer.addChild(new Spacer(1));
       host.ui.requestRender();
-      resolve5();
+      resolve6();
     };
     child.on("error", (error) => {
       output.append(error.message);
@@ -68460,11 +68575,11 @@ function installInteractiveInteractionHandler(host) {
       if (!("timeoutMs" in request) || !request.timeoutMs || request.timeoutMs <= 0) {
         return { value: await promise, timedOut: false };
       }
-      return await new Promise((resolve5, reject) => {
-        const timer = setTimeout(() => resolve5({ timedOut: true }), request.timeoutMs);
+      return await new Promise((resolve6, reject) => {
+        const timer = setTimeout(() => resolve6({ timedOut: true }), request.timeoutMs);
         promise.then((value) => {
           clearTimeout(timer);
-          resolve5({ value, timedOut: false });
+          resolve6({ value, timedOut: false });
         }).catch((error) => {
           clearTimeout(timer);
           reject(error);
@@ -68564,15 +68679,15 @@ function showExtensionNotification(host, message, type = "info") {
   host.ui.requestRender();
 }
 function showExtensionSelector2(host, title, options, opts) {
-  return new Promise((resolve5) => {
+  return new Promise((resolve6) => {
     host.showStatus(`Waiting for selection: ${title}`);
     if (opts?.signal?.aborted) {
-      resolve5(void 0);
+      resolve6(void 0);
       return;
     }
     const onAbort = () => {
       host.restoreEditor();
-      resolve5(void 0);
+      resolve6(void 0);
     };
     opts?.signal?.addEventListener("abort", onAbort, { once: true });
     const selector = new ExtensionSelectorComponent(
@@ -68581,12 +68696,12 @@ function showExtensionSelector2(host, title, options, opts) {
       (option) => {
         opts?.signal?.removeEventListener("abort", onAbort);
         host.restoreEditor();
-        resolve5(option);
+        resolve6(option);
       },
       () => {
         opts?.signal?.removeEventListener("abort", onAbort);
         host.restoreEditor();
-        resolve5(void 0);
+        resolve6(void 0);
       }
     );
     host.editorContainer.clear();
@@ -68602,15 +68717,15 @@ ${message}`, ["Yes", "No"], opts);
   return result === "Yes";
 }
 function showExtensionInput(host, title, placeholder, opts) {
-  return new Promise((resolve5) => {
+  return new Promise((resolve6) => {
     host.showStatus(`Waiting for input: ${title}`);
     if (opts?.signal?.aborted) {
-      resolve5(void 0);
+      resolve6(void 0);
       return;
     }
     const onAbort = () => {
       host.restoreEditor();
-      resolve5(void 0);
+      resolve6(void 0);
     };
     opts?.signal?.addEventListener("abort", onAbort, { once: true });
     const input = new ExtensionInputComponent(
@@ -68619,12 +68734,12 @@ function showExtensionInput(host, title, placeholder, opts) {
       (value) => {
         opts?.signal?.removeEventListener("abort", onAbort);
         host.restoreEditor();
-        resolve5(value);
+        resolve6(value);
       },
       () => {
         opts?.signal?.removeEventListener("abort", onAbort);
         host.restoreEditor();
-        resolve5(void 0);
+        resolve6(void 0);
       }
     );
     host.editorContainer.clear();
@@ -68635,7 +68750,7 @@ function showExtensionInput(host, title, placeholder, opts) {
   });
 }
 function showExtensionEditor(host, title, prefill) {
-  return new Promise((resolve5) => {
+  return new Promise((resolve6) => {
     host.showStatus(`Waiting for input: ${title}`);
     const container = new Container();
     container.addChild(new Text(theme.bold(theme.fg("accent", title)), 0, 0));
@@ -68657,12 +68772,12 @@ function showExtensionEditor(host, title, prefill) {
         preview: value.slice(0, 120)
       });
       host.restoreEditor();
-      resolve5(value);
+      resolve6(value);
     };
     editor.onEscape = () => {
       host.logDebug("extension:editor:cancel", { title });
       host.restoreEditor();
-      resolve5(void 0);
+      resolve6(void 0);
     };
     container.addChild(editor);
     container.addChild(new Spacer(1));
@@ -68676,14 +68791,14 @@ function showExtensionEditor(host, title, prefill) {
 }
 function showExtensionCustom(host, factory, options) {
   const savedText = host.editor.getText();
-  return new Promise((resolve5, reject) => {
+  return new Promise((resolve6, reject) => {
     let closed = false;
     const close = (result) => {
       if (closed) return;
       closed = true;
       host.restoreEditor();
       host.editor.setText(savedText);
-      resolve5(result);
+      resolve6(result);
     };
     Promise.resolve(factory(host.ui, theme, close)).then((component) => {
       if (closed) return;
@@ -68895,8 +69010,8 @@ async function loadInteractiveExtensions(host) {
   );
   host.extensionRunner.setUIContext(host.extensionUIContext);
   if (process.env.PIE_VERBOSE) {
-    for (const { path: path30, error } of errors) {
-      console.error(`[Extension] Failed to load ${path30}: ${error}`);
+    for (const { path: path31, error } of errors) {
+      console.error(`[Extension] Failed to load ${path31}: ${error}`);
     }
   }
   const extensionTools = convertExtensionTools(extensions);
@@ -70224,6 +70339,26 @@ function parseInput(line) {
       reason: typeof parsed.reason === "string" ? parsed.reason : void 0
     };
   }
+  if (parsed.type === "session.rewind") {
+    return {
+      type: "session.rewind",
+      sessionId: typeof parsed.sessionId === "string" ? parsed.sessionId : void 0,
+      requestId: typeof parsed.requestId === "string" ? parsed.requestId : void 0,
+      entryId: typeof parsed.entryId === "string" ? parsed.entryId : void 0,
+      checkpointId: typeof parsed.checkpointId === "string" ? parsed.checkpointId : void 0
+    };
+  }
+  if (parsed.type === "session.fork") {
+    return {
+      type: "session.fork",
+      sessionId: typeof parsed.sessionId === "string" ? parsed.sessionId : void 0,
+      requestId: typeof parsed.requestId === "string" ? parsed.requestId : void 0,
+      fromEntryId: typeof parsed.fromEntryId === "string" ? parsed.fromEntryId : void 0,
+      targetSessionId: typeof parsed.targetSessionId === "string" ? parsed.targetSessionId : void 0,
+      name: typeof parsed.name === "string" ? parsed.name : void 0,
+      cwd: typeof parsed.cwd === "string" ? parsed.cwd : void 0
+    };
+  }
   if ((parsed.type === "turn.request" || parsed.type === "turn.input") && typeof parsed.turnId === "string" && typeof parsed.prompt === "string") {
     const streamingBehavior = parsed.streamingBehavior;
     if (streamingBehavior !== void 0 && streamingBehavior !== "steer" && streamingBehavior !== "followUp") {
@@ -70386,6 +70521,7 @@ async function runJsonEventsMode(params) {
   let thinkingLevel = "off";
   let defaultRuntime;
   let defaultModelState;
+  const completedSessionControlRequests = /* @__PURE__ */ new Map();
   const noProgressTimeoutMs = Number(process.env.PIE_JSON_EVENTS_NO_PROGRESS_MS || 6e5);
   const mockResponseDelayMs = Number(process.env.PIE_TEST_MOCK_RESPONSE_DELAY_MS || 0);
   writeEvent({ type: "agent.ready", sessionId });
@@ -70396,7 +70532,7 @@ async function runJsonEventsMode(params) {
     return typeof message.sessionId === "string" && message.sessionId !== sessionId;
   }
   function delay(ms) {
-    return new Promise((resolve5) => setTimeout(resolve5, Math.max(0, ms)));
+    return new Promise((resolve6) => setTimeout(resolve6, Math.max(0, ms)));
   }
   async function waitForActiveController(timeoutMs = 1e3) {
     const deadline = Date.now() + timeoutMs;
@@ -70534,6 +70670,148 @@ async function runJsonEventsMode(params) {
     }
     return error instanceof Error ? error.message : String(error);
   }
+  function sessionControlStore() {
+    return new FileSessionStore(runtime?.paths.sessionsDir ?? getSessionsDir());
+  }
+  function invalidSessionControl(message) {
+    return new SessionControlError("invalid_request", message);
+  }
+  function requireSessionControlString(value, field) {
+    const normalized = value?.trim();
+    if (!normalized) {
+      throw invalidSessionControl(`${field} is required`);
+    }
+    return normalized;
+  }
+  function requireSessionControlBase(message) {
+    const requestedSessionId = requireSessionControlString(message.sessionId, "sessionId");
+    const requestId = requireSessionControlString(message.requestId, "requestId");
+    if (requestedSessionId !== sessionId) {
+      throw new SessionControlError("session_mismatch", sessionMismatchError(requestedSessionId), false);
+    }
+    if (activeTurn && !activeTurn.finalized) {
+      throw new SessionControlError("session_busy", `Cannot ${message.type.slice("session.".length)} session while a turn is active`);
+    }
+    return { sessionId: requestedSessionId, requestId };
+  }
+  function resolveRewindEntryId(message) {
+    const entryId = message.entryId?.trim();
+    const checkpointId = message.checkpointId?.trim();
+    if (entryId && checkpointId && entryId !== checkpointId) {
+      throw invalidSessionControl("entryId and checkpointId must match when both are provided");
+    }
+    const resolved = entryId || checkpointId;
+    if (!resolved) {
+      throw invalidSessionControl("entryId or checkpointId is required");
+    }
+    return resolved;
+  }
+  function writeSessionControlFailure(message, operation, error) {
+    const detail = error instanceof SessionControlError ? error : new SessionControlError("session_io_error", error instanceof Error ? error.message : String(error));
+    writeEvent({
+      type: "session.failed",
+      sessionId: message.sessionId || sessionId,
+      requestId: message.requestId,
+      operation,
+      error: detail.message,
+      code: detail.code,
+      recoverable: detail.recoverable
+    });
+  }
+  async function saveRuntimeSessionForControl() {
+    if (!runtime?.sessionManager.getActiveSession()) return;
+    try {
+      await runtime.sessionManager.save();
+    } catch (error) {
+      throw new SessionControlError("session_io_error", error instanceof Error ? error.message : String(error));
+    }
+  }
+  async function syncRuntimeAfterRewind(controlSessionId) {
+    if (params.mockResponse !== void 0) return;
+    if (runtime?.sessionManager.getActiveSessionId() !== controlSessionId) return;
+    const loaded = await runtime.sessionManager.loadSession(controlSessionId, { warnIfMissing: false });
+    if (!loaded) {
+      const exists = await runtime.sessionManager.hasSession(controlSessionId);
+      throw new SessionControlError(
+        exists ? "session_unrecoverable" : "session_not_found",
+        exists ? `Session could not be recovered: ${controlSessionId}` : `Session not found: ${controlSessionId}`,
+        !exists
+      );
+    }
+    controller?.syncFromActiveSession();
+  }
+  async function handleSessionRewind(message) {
+    try {
+      const { sessionId: controlSessionId, requestId } = requireSessionControlBase(message);
+      const cached = completedSessionControlRequests.get(requestId);
+      if (cached) {
+        writeEvent(cached);
+        return;
+      }
+      const entryId = resolveRewindEntryId(message);
+      await saveRuntimeSessionForControl();
+      const result = await rewindStoredSession({
+        store: sessionControlStore(),
+        sessionId: controlSessionId,
+        entryId
+      });
+      await syncRuntimeAfterRewind(controlSessionId);
+      mockActiveEntryId = result.headEntryId;
+      const event = {
+        type: "session.rewound",
+        sessionId: controlSessionId,
+        requestId,
+        entryId: result.entryId,
+        checkpointId: result.checkpointId,
+        headEntryId: result.headEntryId,
+        activeEntryId: result.activeEntryId
+      };
+      completedSessionControlRequests.set(requestId, event);
+      writeEvent(event);
+    } catch (error) {
+      writeSessionControlFailure(message, "rewind", error);
+    }
+  }
+  async function handleSessionFork(message) {
+    try {
+      const { sessionId: controlSessionId, requestId } = requireSessionControlBase(message);
+      const sourceEntryId = requireSessionControlString(message.fromEntryId, "fromEntryId");
+      const targetSessionId = requireSessionControlString(message.targetSessionId, "targetSessionId");
+      const name = requireSessionControlString(message.name, "name");
+      const forkCwd = message.cwd?.trim() || void 0;
+      const cached = completedSessionControlRequests.get(requestId);
+      if (cached) {
+        writeEvent(cached);
+        return;
+      }
+      await saveRuntimeSessionForControl();
+      const result = await forkStoredSession({
+        store: sessionControlStore(),
+        sourceSessionId: controlSessionId,
+        sourceEntryId,
+        targetSessionId,
+        name,
+        cwd: forkCwd,
+        requestId
+      });
+      const event = {
+        type: "session.forked",
+        sessionId: controlSessionId,
+        requestId,
+        sourceSessionId: result.sourceSessionId,
+        sourceEntryId: result.sourceEntryId,
+        sourceCheckpointId: result.sourceCheckpointId,
+        targetSessionId: result.targetSessionId,
+        targetHeadEntryId: result.targetHeadEntryId,
+        targetActiveEntryId: result.targetActiveEntryId,
+        headEntryId: result.headEntryId
+      };
+      completedSessionControlRequests.set(requestId, event);
+      writeEvent(event);
+    } catch (error) {
+      writeSessionControlFailure(message, "fork", error);
+    }
+  }
   function finalize(kind, detail) {
     const turn = activeTurn;
     if (!turn || turn.finalized) return;
@@ -70783,6 +71061,7 @@ async function runJsonEventsMode(params) {
       cwd: runtime.cwd,
       skillsSection: runtime.skillsSection,
       knowledgeSection: runtime.knowledgeSection,
+      appendSystemPrompt: params.developerInstructions,
       tools: tools.map((tool) => ({ name: tool.name, description: tool.description }))
     });
     agent = new AgentClass({
@@ -71168,6 +71447,14 @@ async function runJsonEventsMode(params) {
       await interrupt(message);
       continue;
     }
+    if (message.type === "session.rewind") {
+      await handleSessionRewind(message);
+      continue;
+    }
+    if (message.type === "session.fork") {
+      await handleSessionFork(message);
+      continue;
+    }
     const shouldTrackTurn = !activeTurn || activeTurn.finalized;
     const turnPromise = runTurn(message).catch((error) => {
       writeEvent({
@@ -71189,20 +71476,44 @@ async function runJsonEventsMode(params) {
   await disposeRuntime();
 }
 
-// src/cli.ts
-enableEarlyLogBuffer();
-var logError = (msg, err) => {
-  const logPath = getRuntimeLogPath();
-  const timestamp = (/* @__PURE__ */ new Date()).toISOString();
-  const stack = err instanceof Error ? err.stack || "" : "";
-  fs26.mkdirSync(path29.dirname(logPath), { recursive: true });
-  fs26.appendFileSync(logPath, `[${timestamp}] ${msg}
-${stack}
+// src/developer-instructions.ts
+import * as fs26 from "fs";
+import * as path29 from "path";
+var MAX_DEVELOPER_INSTRUCTIONS_CHARS = 64e3;
+function readTextFileBounded(filePath) {
+  const resolved = path29.resolve(filePath);
+  const stat2 = fs26.statSync(resolved);
+  if (!stat2.isFile()) {
+    throw new Error(`Developer instructions file is not a regular file: ${filePath}`);
+  }
+  if (stat2.size > MAX_DEVELOPER_INSTRUCTIONS_CHARS * 4) {
+    throw new Error(`Developer instructions file is too large: ${filePath}`);
+  }
+  return fs26.readFileSync(resolved, "utf8");
+}
+function collectFlagValues(args, flag) {
+  const values = [];
+  for (let i = 0; i < args.length; i += 1) {
+    if (args[i] === flag && args[i + 1]) {
+      values.push(args[i + 1]);
+      i += 1;
+    }
+  }
+  return values;
+}
+function resolveDeveloperInstructionsFromArgs(args) {
+  const direct = collectFlagValues(args, "--developer-instructions");
+  const files = collectFlagValues(args, "--developer-instructions-file").map(readTextFileBounded);
+  const parts = [...direct, ...files].map((part) => part.trim()).filter(Boolean);
+  if (parts.length === 0) return void 0;
+  const combined = parts.join("\n\n");
+  if (combined.length > MAX_DEVELOPER_INSTRUCTIONS_CHARS) {
+    throw new Error(`Developer instructions exceed ${MAX_DEVELOPER_INSTRUCTIONS_CHARS} characters`);
+  }
+  return combined;
+}
 
-`);
-};
-setupGlobalErrorHandlers(logError);
-migrateConfigFromAgentDir();
+// src/cli-help.ts
 function showHelp() {
   console.log(`
 Pie AI Agent CLI
@@ -71242,11 +71553,36 @@ Print Mode Options:
   --json-events    Run JSONL protocol mode over stdin/stdout
   --session-id     Reuse or create a specific session in non-interactive mode
   --resume-required  In JSON-events mode, fail if --session-id cannot be resumed
+  --developer-instructions <text>  Append stable host/developer instructions in JSON-events mode
+  --developer-instructions-file <path>  Read stable host/developer instructions from a file
   --extension-path Add an extra extension search directory (repeatable)
   --no-builtin-extensions  Skip built-in extensions (keep user/project ones)
   --no-extensions    Skip all discovered extensions (keeps --extension-path)
 `);
 }
+
+// src/cli.ts
+enableEarlyLogBuffer();
+var logError = (msg, err) => {
+  const logPath = getRuntimeLogPath();
+  const timestamp = (/* @__PURE__ */ new Date()).toISOString();
+  const stack = err instanceof Error ? err.stack || "" : "";
+  fs27.mkdirSync(path30.dirname(logPath), { recursive: true });
+  fs27.appendFileSync(logPath, `[${timestamp}] ${msg}
+${stack}
+
+`);
+};
+setupGlobalErrorHandlers(logError);
+migrateConfigFromAgentDir();
+var STABLE_CLI_COMMANDS = {
+  chat: "chat",
+  doctor: "doctor",
+  models: "models",
+  sessions: "sessions",
+  extensions: "extensions",
+  permissions: "permissions"
+};
 async function runDoctorCommand(args) {
   const json = args.includes("--json");
   const report = await runDoctor();
@@ -71339,7 +71675,7 @@ async function runWithJsonEventsConsoleIsolation(fn) {
 }
 async function createCliTestStreamFnFromEnv() {
   if (!process.env.PIE_TEST_MOCK_STREAM_SEQUENCE) return void 0;
-  return (await import("./chunks/test-stream-A7JSM2UM.js")).createTestStreamFnFromSequenceEnv();
+  return (await import("./chunks/test-stream-L4PUYWQQ.js")).createTestStreamFnFromSequenceEnv();
 }
 async function startChat(initialPrompt, testCommand) {
   const rawOutput = process.argv.includes("--raw-output");
@@ -71351,11 +71687,19 @@ async function startChat(initialPrompt, testCommand) {
   const extensionPaths = parseRepeatedFlag(process.argv, "--extension-path");
   const extensionFlags = parseExtensionFlags(process.argv);
   if (jsonEvents) {
+    let developerInstructions;
+    try {
+      developerInstructions = resolveDeveloperInstructionsFromArgs(process.argv);
+    } catch (error) {
+      console.error(error instanceof Error ? `Error: ${error.message}` : String(error));
+      process.exit(1);
+    }
     await runWithJsonEventsConsoleIsolation(async () => {
       if (process.env.PIE_TEST_MOCK_RESPONSE !== void 0) {
         await runJsonEventsMode({
           explicitSessionId,
           resumeRequired,
+          developerInstructions,
           mockResponse: process.env.PIE_TEST_MOCK_RESPONSE
         });
         return;
@@ -71363,6 +71707,7 @@ async function startChat(initialPrompt, testCommand) {
       await runJsonEventsMode({
         explicitSessionId,
         resumeRequired,
+        developerInstructions,
         streamFn: await createCliTestStreamFnFromEnv(),
         createRuntime: async ({ cwd, sessionId }) => composeCliRuntime({
           explicitSessionId: explicitSessionId ?? sessionId,
@@ -71425,9 +71770,9 @@ async function startChat(initialPrompt, testCommand) {
     flushEarlyLogs();
     if (testCommand) {
       console.log(`[TEST] Auto-executing command: ${testCommand}`);
-      await new Promise((resolve5) => setTimeout(resolve5, 500));
+      await new Promise((resolve6) => setTimeout(resolve6, 500));
       await interactive.executeCommand(testCommand);
-      await new Promise((resolve5) => setTimeout(resolve5, 2e3));
+      await new Promise((resolve6) => setTimeout(resolve6, 2e3));
       console.log("[TEST] Command executed, exiting...");
       process.exit(0);
       return;
@@ -71448,11 +71793,11 @@ async function main() {
     console.log(VERSION);
     return;
   }
-  if (args[0] === "doctor") {
+  if (args[0] === STABLE_CLI_COMMANDS.doctor) {
     await runDoctorCommand(args.slice(1));
     return;
   }
-  if (args[0] === "models") {
+  if (args[0] === STABLE_CLI_COMMANDS.models) {
     try {
       await runModelsCommand(args.slice(1));
     } catch (error) {
@@ -71461,15 +71806,15 @@ async function main() {
     }
     return;
   }
-  if (args[0] === "sessions") {
+  if (args[0] === STABLE_CLI_COMMANDS.sessions) {
     await runSessionsCommand(args.slice(1));
     return;
   }
-  if (args[0] === "extensions") {
+  if (args[0] === STABLE_CLI_COMMANDS.extensions) {
     await runExtensionsCommand(args.slice(1));
     return;
   }
-  if (args[0] === "permissions") {
+  if (args[0] === STABLE_CLI_COMMANDS.permissions) {
     console.log(formatPermissionsHelp());
     return;
   }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@cydm/pie",
-	"version": "1.0.35",
+	"version": "1.0.37",
 	"description": "Pie AI Agent CLI",
 	"type": "module",
 	"bin": {