jinzd-ai-cli 0.4.281 → 0.4.282

package/dist/{batch-237ZXBQD.js → batch-SBP6H7IK.js}

@@ -1,12 +1,12 @@
 #!/usr/bin/env node
 import {
   ConfigManager
-} from "./chunk-4XJVSMZ6.js";
+} from "./chunk-EVD6CCO2.js";
 import "./chunk-TU3L3PW7.js";
 import {
   atomicWriteFileSync
 } from "./chunk-IW3Q7AE5.js";
-import "./chunk-2FCKZ3OS.js";
+import "./chunk-JQU4GYET.js";
 
 // src/cli/batch.ts
 import Anthropic from "@anthropic-ai/sdk";

package/dist/{chunk-WUIOUJA2.js → chunk-6IRG727F.js}

@@ -1,6 +1,6 @@
 import {
   TEST_TIMEOUT
-} from "./chunk-5GYOQ7EF.js";
+} from "./chunk-TNIMHTKG.js";
 
 // src/tools/builtin/run-tests.ts
 import { execSync, spawnSync } from "child_process";

package/dist/{chunk-FHRIDE2T.js → chunk-7XKIDSJT.js}

@@ -11,7 +11,7 @@ import {
   searchPersistentMemories,
   touchMemoryReferences,
   updateMemoryEntry
-} from "./chunk-H2VE4TTN.js";
+} from "./chunk-SGUPIQYT.js";
 import {
   indexProject
 } from "./chunk-4DEMGCK4.js";
@@ -30,7 +30,7 @@ import {
   runHook,
   runLifecycleHooks,
   runTool
-} from "./chunk-L7C34TFI.js";
+} from "./chunk-LNUWIY6M.js";
 import {
   buildTruncatedArgumentsError,
   getDangerLevel,
@@ -50,14 +50,14 @@ import {
 } from "./chunk-4BKXL7SM.js";
 import {
   runTestsTool
-} from "./chunk-J3RWNQOF.js";
+} from "./chunk-HJDJAI7T.js";
 import {
   CONFIG_DIR_NAME,
   DEFAULT_MAX_TOOL_OUTPUT_CHARS_CAP,
   SUBAGENT_ALLOWED_TOOLS,
   SUBAGENT_DEFAULT_MAX_ROUNDS,
   SUBAGENT_MAX_ROUNDS_LIMIT
-} from "./chunk-2FCKZ3OS.js";
+} from "./chunk-JQU4GYET.js";
 
 // src/tools/shell-pool.ts
 import { spawn as spawn2 } from "child_process";

package/dist/{chunk-4XJVSMZ6.js → chunk-EVD6CCO2.js}

@@ -11,7 +11,7 @@ import {
   CONFIG_FILE_NAME,
   HISTORY_DIR_NAME,
   PLUGINS_DIR_NAME
-} from "./chunk-2FCKZ3OS.js";
+} from "./chunk-JQU4GYET.js";
 
 // src/config/config-manager.ts
 import { readFileSync, existsSync, mkdirSync } from "fs";

package/dist/{chunk-BVGSR3BA.js → chunk-GSGJABL6.js}

@@ -8,13 +8,13 @@ import {
   listHooks,
   listInstalledPlugins,
   resetStats
-} from "./chunk-L7C34TFI.js";
+} from "./chunk-LNUWIY6M.js";
 import {
   ProviderRegistry
 } from "./chunk-UGY5SVNX.js";
 import {
   ConfigManager
-} from "./chunk-4XJVSMZ6.js";
+} from "./chunk-EVD6CCO2.js";
 import {
   getGitRoot
 } from "./chunk-HOSJZMQS.js";
@@ -26,7 +26,7 @@ import {
   MCP_PROJECT_CONFIG_NAME,
   MEMORY_FILE_NAME,
   VERSION
-} from "./chunk-2FCKZ3OS.js";
+} from "./chunk-JQU4GYET.js";
 
 // src/diagnostics/doctor-report.ts
 import { existsSync as existsSync3, statSync as statSync2 } from "fs";

package/dist/{chunk-J3RWNQOF.js → chunk-HJDJAI7T.js}

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 import {
   TEST_TIMEOUT
-} from "./chunk-2FCKZ3OS.js";
+} from "./chunk-JQU4GYET.js";
 
 // src/tools/builtin/run-tests.ts
 import { execSync, spawnSync } from "child_process";

package/dist/{chunk-6NO5FZW6.js → chunk-IUVDZVZ4.js}

@@ -97,6 +97,24 @@ var Session = class _Session {
     this.updated = /* @__PURE__ */ new Date();
     this.dirty = true;
   }
+  /**
+   * 把对话截断到前 `count` 条（`/rewind` 用）。
+   *
+   * 存在的理由是 `dirty`：`messages` 是个普通公开字段，两端此前都直接
+   * `session.messages = session.messages.slice(0, n)`，**不会置脏**——于是 REPL 压根不存，
+   * Web 存了也被 `save()` 的 `if (!force && !dirty) return` 跳过。结果 `/rewind` 只改内存，
+   * 而它同时真的回退了磁盘上的文件：重启后文件是回退后的、对话是回退前的，
+   * 恰恰制造出 rewind 本身要消除的那种不一致（P2-02 第 6 批）。
+   *
+   * 落在截断点之后的检查点一并丢弃（它们指向已经不存在的消息）。
+   */
+  truncateTo(count) {
+    const target = Math.max(0, Math.min(count, this.messages.length));
+    this.messages = this.messages.slice(0, target);
+    this.checkpoints = this.checkpoints.filter((c) => c.messageIndex <= target);
+    this.updated = /* @__PURE__ */ new Date();
+    this.dirty = true;
+  }
   addMessage(message) {
     this.messages.push(message);
     this.updated = /* @__PURE__ */ new Date();

package/dist/{chunk-2FCKZ3OS.js → chunk-JQU4GYET.js}

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 
 // src/core/constants.ts
-var VERSION = "0.4.281";
+var VERSION = "0.4.282";
 var APP_NAME = "ai-cli";
 var CONFIG_DIR_NAME = ".aicli";
 var CONFIG_FILE_NAME = "config.json";

package/dist/{chunk-J5TXHFDO.js → chunk-KDXA7RXA.js}

@@ -5,14 +5,14 @@ import {
 import {
   estimateTokens,
   truncateForPersist
-} from "./chunk-FHRIDE2T.js";
+} from "./chunk-7XKIDSJT.js";
 import {
   isMemoryExpired,
   isMemoryStale
-} from "./chunk-H2VE4TTN.js";
+} from "./chunk-SGUPIQYT.js";
 import {
   getContentText
-} from "./chunk-6NO5FZW6.js";
+} from "./chunk-IUVDZVZ4.js";
 import {
   isCleanDocumentBody,
   stripOuterCodeFence
@@ -30,7 +30,7 @@ import {
   MCP_PROTOCOL_VERSION,
   MCP_TOOL_PREFIX,
   VERSION
-} from "./chunk-2FCKZ3OS.js";
+} from "./chunk-JQU4GYET.js";
 
 // src/mcp/client.ts
 import { spawn } from "child_process";
@@ -2014,6 +2014,67 @@ function readGitDiff(options = {}) {
   }).trim();
 }
 
+// src/core/session-history.ts
+function parseRewindArgs(args, messageCount) {
+  const sub = args[0];
+  if (!sub || sub.toLowerCase() === "list") return { kind: "list" };
+  const n = Number.parseInt(sub, 10);
+  if (Number.isNaN(n) || n < 1 || n > messageCount) {
+    return { kind: "invalid", message: `Invalid message number: ${sub}. Range: 1-${messageCount}` };
+  }
+  return { kind: "rewind", target: n };
+}
+function buildRewindList(messages, checkpointIndices, previewWidth = 70) {
+  return messages.map((m, i) => ({
+    index: i + 1,
+    role: m.role,
+    preview: getContentText(m.content).replace(/\s+/g, " ").trim().slice(0, previewWidth),
+    hasCheckpoint: checkpointIndices.includes(i)
+  }));
+}
+function formatRewindReport(report) {
+  const lines = [
+    `\u2713 Rewound to message ${report.target}`,
+    `  Messages removed: ${report.messagesRemoved}`
+  ];
+  if (report.filesRestored > 0 || report.filesDeleted > 0) {
+    lines.push(`  Files restored: ${report.filesRestored}, files deleted: ${report.filesDeleted}`);
+    for (const f of report.files) lines.push(`    ${f}`);
+  } else {
+    lines.push("  No file changes to revert.");
+  }
+  return lines;
+}
+function resolveForkPoint(session, checkpointName) {
+  const name = checkpointName?.trim();
+  if (!name) {
+    return { ok: true, messageCount: session.messages.length, fromLabel: "current position" };
+  }
+  const cp = session.checkpoints.find((c) => c.name === name);
+  if (!cp) {
+    const available = session.checkpoints.map((c) => c.name);
+    return {
+      ok: false,
+      message: available.length > 0 ? `Checkpoint "${name}" not found. Available: ${available.join(", ")}` : `Checkpoint "${name}" not found. No checkpoints saved. Use /checkpoint save <name> first.`
+    };
+  }
+  return {
+    ok: true,
+    messageCount: cp.messageIndex,
+    fromLabel: `checkpoint "${cp.name}" (${cp.messageIndex} messages)`
+  };
+}
+function formatForkReport(report) {
+  return [
+    "Session Forked",
+    `  Original: ${report.originalId.slice(0, 8)}  "${report.originalTitle}"`,
+    `  Forked:   ${report.forkedId.slice(0, 8)}  "${report.forkedTitle}"`,
+    `  From:     ${report.fromLabel}`,
+    `  Messages: ${report.messageCount} copied, ${report.checkpointCount} checkpoint(s) preserved`,
+    `  Use /session load ${report.originalId.slice(0, 8)} to switch back to the original.`
+  ];
+}
+
 // src/core/session-cost.ts
 function buildSessionCostReport(input) {
   const { usage } = input;
@@ -2072,6 +2133,11 @@ export {
   clearedSessionMessage,
   applyProfileCommand,
   readGitDiff,
+  parseRewindArgs,
+  buildRewindList,
+  formatRewindReport,
+  resolveForkPoint,
+  formatForkReport,
   scanDirTree,
   scanProject,
   buildInitPrompt,

package/dist/{chunk-L7C34TFI.js → chunk-LNUWIY6M.js}

@@ -5,7 +5,7 @@ import {
 import {
   CONFIG_DIR_NAME,
   PLUGINS_DIR_NAME
-} from "./chunk-2FCKZ3OS.js";
+} from "./chunk-JQU4GYET.js";
 
 // src/diagnostics/tool-stats.ts
 import { existsSync, readFileSync, mkdirSync } from "fs";

package/dist/{chunk-VB54ILH7.js → chunk-NUJTNH76.js}

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 import {
   SessionManager
-} from "./chunk-6NO5FZW6.js";
+} from "./chunk-IUVDZVZ4.js";
 
 // src/hub/persist.ts
 import { join } from "path";

package/dist/{chunk-IXEKDAIX.js → chunk-RHSCROLG.js}

@@ -6,7 +6,7 @@ import {
   MEMORY_FILE_NAME,
   MEMORY_MAX_CHARS,
   MEMORY_STORE_FILE_NAME
-} from "./chunk-5GYOQ7EF.js";
+} from "./chunk-TNIMHTKG.js";
 import {
   atomicWriteFileSync
 } from "./chunk-6BUTA5VW.js";

package/dist/{chunk-H2VE4TTN.js → chunk-SGUPIQYT.js}

@@ -13,7 +13,7 @@ import {
   MEMORY_FILE_NAME,
   MEMORY_MAX_CHARS,
   MEMORY_STORE_FILE_NAME
-} from "./chunk-2FCKZ3OS.js";
+} from "./chunk-JQU4GYET.js";
 
 // src/memory/persistent-memory.ts
 import { copyFileSync, existsSync, mkdirSync, readFileSync, statSync } from "fs";

package/dist/{chunk-5GYOQ7EF.js → chunk-TNIMHTKG.js}

@@ -1,5 +1,5 @@
 // src/core/constants.ts
-var VERSION = "0.4.281";
+var VERSION = "0.4.282";
 var APP_NAME = "ai-cli";
 var CONFIG_DIR_NAME = ".aicli";
 var CONFIG_FILE_NAME = "config.json";

package/dist/{chunk-UTJQXG4P.js → chunk-WMHLWCZQ.js}

@@ -2,7 +2,7 @@
 import {
   evaluateCiGate,
   normalizeCiThresholds
-} from "./chunk-JT2A2M4F.js";
+} from "./chunk-YRPL7A3S.js";
 import {
   buildReviewPrompt,
   buildSecurityReviewPrompt,
@@ -16,10 +16,10 @@ import {
 } from "./chunk-UGY5SVNX.js";
 import {
   ConfigManager
-} from "./chunk-4XJVSMZ6.js";
+} from "./chunk-EVD6CCO2.js";
 import {
   VERSION
-} from "./chunk-2FCKZ3OS.js";
+} from "./chunk-JQU4GYET.js";
 
 // src/cli/ci.ts
 import { execFileSync } from "child_process";

package/dist/{chunk-JT2A2M4F.js → chunk-YRPL7A3S.js}

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 import {
   VERSION
-} from "./chunk-2FCKZ3OS.js";
+} from "./chunk-JQU4GYET.js";
 
 // src/cli/ci-format.ts
 var DEFAULT_CI_THRESHOLDS = {

package/dist/{ci-LXRTYJ6F.js → ci-VAAMX44S.js}

@@ -3,16 +3,16 @@ import {
   CI_COMMENT_MARKER,
   countSeverity,
   runCi
-} from "./chunk-UTJQXG4P.js";
-import "./chunk-JT2A2M4F.js";
+} from "./chunk-WMHLWCZQ.js";
+import "./chunk-YRPL7A3S.js";
 import "./chunk-HLWUDRBO.js";
 import "./chunk-6YZEZFX5.js";
 import "./chunk-UGY5SVNX.js";
-import "./chunk-4XJVSMZ6.js";
+import "./chunk-EVD6CCO2.js";
 import "./chunk-TEXT4DAT.js";
 import "./chunk-TU3L3PW7.js";
 import "./chunk-IW3Q7AE5.js";
-import "./chunk-2FCKZ3OS.js";
+import "./chunk-JQU4GYET.js";
 export {
   CI_COMMENT_MARKER,
   countSeverity,

package/dist/{ci-format-II3OT2VU.js → ci-format-RMULFSB5.js}

@@ -6,8 +6,8 @@ import {
   formatCiResult,
   formatCiSarif,
   normalizeCiThresholds
-} from "./chunk-JT2A2M4F.js";
-import "./chunk-2FCKZ3OS.js";
+} from "./chunk-YRPL7A3S.js";
+import "./chunk-JQU4GYET.js";
 export {
   DEFAULT_CI_THRESHOLDS,
   detectCiGateSignals,

package/dist/{constants-X53QCUTP.js → constants-PXLMEBJY.js}

@@ -38,7 +38,7 @@ import {
   TEST_TIMEOUT,
   VERSION,
   buildUserIdentityPrompt
-} from "./chunk-2FCKZ3OS.js";
+} from "./chunk-JQU4GYET.js";
 export {
   AGENTIC_BEHAVIOR_GUIDELINE,
   APP_NAME,

package/dist/{doctor-cli-6JCJEQR4.js → doctor-cli-C2DFYU2M.js}

@@ -2,15 +2,15 @@
 import {
   formatDoctorReport,
   runDoctorCli
-} from "./chunk-BVGSR3BA.js";
-import "./chunk-L7C34TFI.js";
+} from "./chunk-GSGJABL6.js";
+import "./chunk-LNUWIY6M.js";
 import "./chunk-UGY5SVNX.js";
-import "./chunk-4XJVSMZ6.js";
+import "./chunk-EVD6CCO2.js";
 import "./chunk-TEXT4DAT.js";
 import "./chunk-TU3L3PW7.js";
 import "./chunk-HOSJZMQS.js";
 import "./chunk-IW3Q7AE5.js";
-import "./chunk-2FCKZ3OS.js";
+import "./chunk-JQU4GYET.js";
 export {
   formatDoctorReport,
   runDoctorCli

package/dist/electron-server.js

@@ -40,14 +40,14 @@ import {
   touchMemoryReferences,
   updateMemoryApproval,
   updateMemoryEntry
-} from "./chunk-IXEKDAIX.js";
+} from "./chunk-RHSCROLG.js";
 import {
   redactJson,
   scanString
 } from "./chunk-FSC6KEWU.js";
 import {
   runTestsTool
-} from "./chunk-WUIOUJA2.js";
+} from "./chunk-6IRG727F.js";
 import {
   AGENTIC_BEHAVIOR_GUIDELINE,
   APP_NAME,
@@ -80,7 +80,7 @@ import {
   SUBAGENT_MAX_ROUNDS_LIMIT,
   VERSION,
   buildUserIdentityPrompt
-} from "./chunk-5GYOQ7EF.js";
+} from "./chunk-TNIMHTKG.js";
 import {
   hasSemanticIndex,
   semanticSearch
@@ -4726,6 +4726,24 @@ var Session = class _Session {
     this.updated = /* @__PURE__ */ new Date();
     this.dirty = true;
   }
+  /**
+   * 把对话截断到前 `count` 条（`/rewind` 用）。
+   *
+   * 存在的理由是 `dirty`：`messages` 是个普通公开字段，两端此前都直接
+   * `session.messages = session.messages.slice(0, n)`，**不会置脏**——于是 REPL 压根不存，
+   * Web 存了也被 `save()` 的 `if (!force && !dirty) return` 跳过。结果 `/rewind` 只改内存，
+   * 而它同时真的回退了磁盘上的文件：重启后文件是回退后的、对话是回退前的，
+   * 恰恰制造出 rewind 本身要消除的那种不一致（P2-02 第 6 批）。
+   *
+   * 落在截断点之后的检查点一并丢弃（它们指向已经不存在的消息）。
+   */
+  truncateTo(count) {
+    const target = Math.max(0, Math.min(count, this.messages.length));
+    this.messages = this.messages.slice(0, target);
+    this.checkpoints = this.checkpoints.filter((c) => c.messageIndex <= target);
+    this.updated = /* @__PURE__ */ new Date();
+    this.dirty = true;
+  }
   addMessage(message) {
     this.messages.push(message);
     this.updated = /* @__PURE__ */ new Date();
@@ -16732,6 +16750,67 @@ function clearedSessionMessage(priorSessionId, priorMessageCount = 0) {
   return priorSessionId && priorMessageCount > 0 ? `Started a new session. Previous conversation saved as ${priorSessionId.slice(0, 8)} (${priorMessageCount} messages) \u2014 reload it with /session load ${priorSessionId.slice(0, 8)}.` : "Started a new session.";
 }
 
+// src/core/session-history.ts
+function parseRewindArgs(args, messageCount) {
+  const sub = args[0];
+  if (!sub || sub.toLowerCase() === "list") return { kind: "list" };
+  const n = Number.parseInt(sub, 10);
+  if (Number.isNaN(n) || n < 1 || n > messageCount) {
+    return { kind: "invalid", message: `Invalid message number: ${sub}. Range: 1-${messageCount}` };
+  }
+  return { kind: "rewind", target: n };
+}
+function buildRewindList(messages, checkpointIndices, previewWidth = 70) {
+  return messages.map((m, i) => ({
+    index: i + 1,
+    role: m.role,
+    preview: getContentText(m.content).replace(/\s+/g, " ").trim().slice(0, previewWidth),
+    hasCheckpoint: checkpointIndices.includes(i)
+  }));
+}
+function formatRewindReport(report) {
+  const lines = [
+    `\u2713 Rewound to message ${report.target}`,
+    `  Messages removed: ${report.messagesRemoved}`
+  ];
+  if (report.filesRestored > 0 || report.filesDeleted > 0) {
+    lines.push(`  Files restored: ${report.filesRestored}, files deleted: ${report.filesDeleted}`);
+    for (const f of report.files) lines.push(`    ${f}`);
+  } else {
+    lines.push("  No file changes to revert.");
+  }
+  return lines;
+}
+function resolveForkPoint(session, checkpointName) {
+  const name = checkpointName?.trim();
+  if (!name) {
+    return { ok: true, messageCount: session.messages.length, fromLabel: "current position" };
+  }
+  const cp = session.checkpoints.find((c) => c.name === name);
+  if (!cp) {
+    const available = session.checkpoints.map((c) => c.name);
+    return {
+      ok: false,
+      message: available.length > 0 ? `Checkpoint "${name}" not found. Available: ${available.join(", ")}` : `Checkpoint "${name}" not found. No checkpoints saved. Use /checkpoint save <name> first.`
+    };
+  }
+  return {
+    ok: true,
+    messageCount: cp.messageIndex,
+    fromLabel: `checkpoint "${cp.name}" (${cp.messageIndex} messages)`
+  };
+}
+function formatForkReport(report) {
+  return [
+    "Session Forked",
+    `  Original: ${report.originalId.slice(0, 8)}  "${report.originalTitle}"`,
+    `  Forked:   ${report.forkedId.slice(0, 8)}  "${report.forkedTitle}"`,
+    `  From:     ${report.fromLabel}`,
+    `  Messages: ${report.messageCount} copied, ${report.checkpointCount} checkpoint(s) preserved`,
+    `  Use /session load ${report.originalId.slice(0, 8)} to switch back to the original.`
+  ];
+}
+
 // src/web/commands/session-commands.ts
 async function handleClear(_args, ctx) {
   const prior = ctx.sessions.current;
@@ -16759,7 +16838,7 @@ Cache:  write=${cacheCreate} read=${cacheRead}` : "";
 Cost:   ${formatCost(cost)}` : "";
   let memoryLine = "";
   try {
-    const { countPendingMemories: countPendingMemories2 } = await import("./persistent-memory-WAKFKH2I.js");
+    const { countPendingMemories: countPendingMemories2 } = await import("./persistent-memory-TA224ZFQ.js");
     const pending = countPendingMemories2(ctx.config.getConfigDir());
     if (pending > 0) memoryLine = `
 Memory: \u26A0 ${pending} pending approval \u2014 see the Memory panel or /memory`;
@@ -17338,27 +17417,27 @@ async function handleFork(args, ctx) {
     ctx.send({ type: "info", message: "No active session to fork." });
     return;
   }
-  const sub = args.join(" ").trim();
-  let messageCount = session.messages.length;
-  let fromLabel = "current position";
-  if (sub) {
-    const cp = session.checkpoints.find((c) => c.name === sub);
-    if (!cp) {
-      const available = session.checkpoints.map((c) => c.name);
-      ctx.send({ type: "error", message: available.length > 0 ? `Checkpoint "${sub}" not found. Available: ${available.join(", ")}` : `Checkpoint "${sub}" not found. No checkpoints saved.` });
-      return;
-    }
-    messageCount = cp.messageIndex;
-    fromLabel = `checkpoint "${cp.name}" (${cp.messageIndex} messages)`;
+  const point = resolveForkPoint(session, args.join(" ").trim());
+  if (!point.ok) {
+    ctx.send({ type: "error", message: point.message });
+    return;
   }
   try {
-    const originalId = session.id.slice(0, 8);
-    const forked = await ctx.sessions.forkSession(messageCount);
-    ctx.send({ type: "info", message: `\u{1F500} Session Forked
-  Original: ${originalId}
-  Forked:   ${forked.id.slice(0, 8)} "${forked.title ?? "(untitled)"}"
-  From:     ${fromLabel}
-  Messages: ${forked.messages.length} copied` });
+    const originalId = session.id;
+    const originalTitle = session.title ?? "(untitled)";
+    const forked = await ctx.sessions.forkSession(point.messageCount);
+    ctx.send({
+      type: "info",
+      message: formatForkReport({
+        originalId,
+        originalTitle,
+        forkedId: forked.id,
+        forkedTitle: forked.title ?? "(untitled)",
+        fromLabel: point.fromLabel,
+        messageCount: forked.messages.length,
+        checkpointCount: forked.checkpoints.length
+      }).join("\n")
+    });
     ctx.sendSessionMessages();
     ctx.sendStatus();
     ctx.sendSessionList();
@@ -17372,41 +17451,42 @@ async function handleRewind(args, ctx) {
     ctx.send({ type: "info", message: "No messages to rewind." });
     return;
   }
-  const rewindSub = args[0];
-  if (rewindSub === "list" || !rewindSub) {
-    const lines = [`Conversation messages (${session.messages.length} total):
-`];
-    const cpIndices = (await import("./file-checkpoint-CGH6OJVI.js")).fileCheckpoints.getMessageIndices();
-    for (let i = 0; i < session.messages.length; i++) {
-      const m = session.messages[i];
-      const text = getContentText(m.content).replace(/\n/g, " ").slice(0, 60);
-      const pin = cpIndices.includes(i) ? " \u{1F4CC}" : "";
-      lines.push(`  [${i + 1}] ${m.role.padEnd(10)} ${text}${pin}`);
-    }
-    lines.push("", "Usage: /rewind <n> \u2014 rewind to message N", "\u{1F4CC} = file checkpoint");
-    ctx.send({ type: "info", message: lines.join("\n") });
+  const intent = parseRewindArgs(args, session.messages.length);
+  if (intent.kind === "invalid") {
+    ctx.send({ type: "error", message: intent.message });
     return;
   }
-  const rewindN = parseInt(rewindSub, 10);
-  if (isNaN(rewindN) || rewindN < 1 || rewindN > session.messages.length) {
-    ctx.send({ type: "error", message: `Invalid message number: ${rewindSub}. Range: 1-${session.messages.length}` });
+  const { fileCheckpoints: fileCheckpoints2 } = await import("./file-checkpoint-CGH6OJVI.js");
+  if (intent.kind === "list") {
+    const rows = buildRewindList(session.messages, fileCheckpoints2.getMessageIndices());
+    ctx.send({
+      type: "info",
+      message: [
+        `Conversation messages (${rows.length} total):`,
+        "",
+        ...rows.map((r) => `  [${r.index}] ${r.role.padEnd(10)} ${r.preview}${r.hasCheckpoint ? " \u{1F4CC}" : ""}`),
+        "",
+        "Usage: /rewind <n> \u2014 rewind to message N (1-based)",
+        "\u{1F4CC} = file checkpoint exists at this point"
+      ].join("\n")
+    });
     return;
   }
-  const { fileCheckpoints: fc } = await import("./file-checkpoint-CGH6OJVI.js");
-  const rewindRemoved = session.messages.length - rewindN;
-  const rewindResult = fc.restoreToMessageIndex(rewindN);
-  session.messages = session.messages.slice(0, rewindN);
-  session.checkpoints = session.checkpoints.filter((c) => c.messageIndex <= rewindN);
-  session.updated = /* @__PURE__ */ new Date();
-  ctx.sessions.save();
-  const rewindLines = [`\u2713 Rewound to message ${rewindN}`, `  Messages removed: ${rewindRemoved}`];
-  if (rewindResult.restored > 0 || rewindResult.deleted > 0) {
-    rewindLines.push(`  Files restored: ${rewindResult.restored}, deleted: ${rewindResult.deleted}`);
-    for (const f of rewindResult.files) rewindLines.push(`    ${f}`);
-  } else {
-    rewindLines.push("  No file changes to revert.");
-  }
-  ctx.send({ type: "info", message: rewindLines.join("\n") });
+  const messagesRemoved = session.messages.length - intent.target;
+  const result = fileCheckpoints2.restoreToMessageIndex(intent.target);
+  session.truncateTo(intent.target);
+  await ctx.sessions.save();
+  ctx.resetWebSessionUsage();
+  ctx.send({
+    type: "info",
+    message: formatRewindReport({
+      target: intent.target,
+      messagesRemoved,
+      filesRestored: result.restored,
+      filesDeleted: result.deleted,
+      files: result.files
+    }).join("\n")
+  });
   ctx.sendSessionMessages();
   ctx.sendStatus();
 }
@@ -17666,7 +17746,7 @@ async function handleTest(args, ctx) {
       const isCommand = argStr.includes(" ") || /^(mvn|gradle|npm|pytest|cargo|go)\b/.test(argStr);
       testArgs = isCommand ? { command: argStr } : { filter: argStr };
     }
-    const runTests = ctx.runTests ?? (await import("./run-tests-4ESYEROQ.js")).executeTests;
+    const runTests = ctx.runTests ?? (await import("./run-tests-JLZ2KIGV.js")).executeTests;
     const report = await runTests(testArgs);
     ctx.send({ type: "info", message: report });
   } catch (err) {
@@ -18002,7 +18082,7 @@ async function handleMemory(args, ctx) {
     ctx.handleMemoryManage(sub, args[1], sub === "expire" ? args[2] : void 0);
   } else if (sub === "export") {
     if (args[1] === "md") {
-      const { exportMemoryEntries: exportMemoryEntries2 } = await import("./persistent-memory-WAKFKH2I.js");
+      const { exportMemoryEntries: exportMemoryEntries2 } = await import("./persistent-memory-TA224ZFQ.js");
       ctx.send({
         type: "export_data",
         format: "md",