jinzd-ai-cli 0.4.280 → 0.4.282

package/dist/electron-server.js

@@ -40,14 +40,14 @@ import {
   touchMemoryReferences,
   updateMemoryApproval,
   updateMemoryEntry
-} from "./chunk-PUC277TH.js";
+} from "./chunk-RHSCROLG.js";
 import {
   redactJson,
   scanString
 } from "./chunk-FSC6KEWU.js";
 import {
   runTestsTool
-} from "./chunk-NHJ4GHL4.js";
+} from "./chunk-6IRG727F.js";
 import {
   AGENTIC_BEHAVIOR_GUIDELINE,
   APP_NAME,
@@ -80,7 +80,7 @@ import {
   SUBAGENT_MAX_ROUNDS_LIMIT,
   VERSION,
   buildUserIdentityPrompt
-} from "./chunk-PN42JO74.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();
@@ -5228,6 +5246,7 @@ var SessionManager = class {
   /** P1-PERF-03: `force` 跳过脏检查（用于进程退出、fork 等必须落盘场景） */
   async save(force = false) {
     if (!this._current) return;
+    if (this._current.messages.length === 0) return;
     if (!force && !this._current.dirty) return;
     mkdirSync3(this.historyDir, { recursive: true });
     const filePath = join4(this.historyDir, `${this._current.id}.json`);
@@ -16727,13 +16746,81 @@ function selectStaleSessions(sessions, staleDays, now = Date.now()) {
   const cutoff = now - staleDays * 24 * 60 * 60 * 1e3;
   return sessions.filter((s) => s.updated.getTime() < cutoff);
 }
+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;
+  const priorId = prior?.id ?? null;
+  const priorCount = prior?.messages.length ?? 0;
   ctx.saveIfNeeded();
-  ctx.sessions.createSession(ctx.currentProvider, ctx.currentModel);
+  const created = ctx.sessions.createSession(ctx.currentProvider, ctx.currentModel);
+  ctx.unsavedSessions.set(created.id, created);
   ctx.resetWebSessionUsage();
-  ctx.send({ type: "info", message: "Conversation cleared." });
+  ctx.send({ type: "info", message: clearedSessionMessage(priorId, priorCount) });
   ctx.sendStatus();
   ctx.sendSessionList();
 }
@@ -16751,7 +16838,7 @@ Cache:  write=${cacheCreate} read=${cacheRead}` : "";
 Cost:   ${formatCost(cost)}` : "";
   let memoryLine = "";
   try {
-    const { countPendingMemories: countPendingMemories2 } = await import("./persistent-memory-E6WECUTW.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`;
@@ -17330,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();
@@ -17364,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();
 }
@@ -17658,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-LWAFPVS3.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) {
@@ -17994,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-E6WECUTW.js");
+      const { exportMemoryEntries: exportMemoryEntries2 } = await import("./persistent-memory-TA224ZFQ.js");
       ctx.send({
         type: "export_data",
         format: "md",
@@ -18433,7 +18521,7 @@ async function handleHelp(_args, ctx) {
       "  /about               \u2014 Version & author info",
       "  /provider <id>       \u2014 Switch AI provider",
       "  /model <id>          \u2014 Switch model",
-      "  /clear               \u2014 Clear conversation & start new session",
+      "  /clear               \u2014 Start a new session (previous conversation is kept)",
       "  /compact [hint]      \u2014 Compress conversation history",
       "  /think [on|off]      \u2014 Toggle extended thinking mode",
       "  /plan [execute|exit|status] \u2014 Read-only planning mode (bare /plan enters it)",

package/dist/{hub-NX7HYN7V.js → hub-XIU3YTOE.js}

@@ -143,7 +143,7 @@ ${content}`);
       const state = await runDiscussion(config, providers, options.topic);
       if (options.save !== false && state.messages.length > 0) {
         try {
-          const { persistDiscussion } = await import("./persist-PQM4BRI4.js");
+          const { persistDiscussion } = await import("./persist-S77WRVLD.js");
           const { path } = await persistDiscussion(state, configManager, defaultProvider, defaultModel);
           console.log(chalk.dim(`
   \u{1F4BE} Saved to history \u2014 open it in the Web UI and hit \u{1F3AC} to replay.
@@ -158,7 +158,7 @@ ${content}`);
   }
 }
 async function runTaskMode(config, providers, configManager, topic) {
-  const { TaskOrchestrator } = await import("./task-orchestrator-FW4LBPTS.js");
+  const { TaskOrchestrator } = await import("./task-orchestrator-6C3R7KSK.js");
   const orchestrator = new TaskOrchestrator(config, providers, configManager);
   let interrupted = false;
   const onSigint = () => {