jinzd-ai-cli 0.4.278 → 0.4.280

package/dist/electron-server.js

@@ -40,14 +40,14 @@ import {
   touchMemoryReferences,
   updateMemoryApproval,
   updateMemoryEntry
-} from "./chunk-LXXQTWT2.js";
+} from "./chunk-PUC277TH.js";
 import {
   redactJson,
   scanString
 } from "./chunk-FSC6KEWU.js";
 import {
   runTestsTool
-} from "./chunk-LOXEYWC3.js";
+} from "./chunk-NHJ4GHL4.js";
 import {
   AGENTIC_BEHAVIOR_GUIDELINE,
   APP_NAME,
@@ -80,7 +80,7 @@ import {
   SUBAGENT_MAX_ROUNDS_LIMIT,
   VERSION,
   buildUserIdentityPrompt
-} from "./chunk-SJCOE4C7.js";
+} from "./chunk-PN42JO74.js";
 import {
   hasSemanticIndex,
   semanticSearch
@@ -14370,6 +14370,101 @@ function decideModel(input) {
   return pickModel(input.userInput, input.currentModel, input.routingConfig, input.availableModels);
 }
 
+// src/core/session-export.ts
+function defaultExportFilename(session, format) {
+  const dateTag = session.created.toISOString().slice(0, 10);
+  return `session-${dateTag}-${session.id.slice(0, 8)}.${format === "json" ? "json" : "md"}`;
+}
+function markdownHeading(msg) {
+  switch (msg.role) {
+    case "user":
+      return "## \u{1F464} You";
+    case "assistant":
+      return "## \u{1F916} Assistant";
+    case "tool":
+      return `### \u{1F527} Tool result: ${msg.toolName ?? "tool"}${msg.isError ? " (error)" : ""}`;
+    default:
+      return `## \u2699 ${msg.role}`;
+  }
+}
+function buildSessionExport(session, format, outFile) {
+  const filename = outFile || defaultExportFilename(session, format);
+  if (format === "json") {
+    const payload = session.toJSON ? session.toJSON() : {
+      id: session.id,
+      title: session.title ?? null,
+      provider: session.provider,
+      model: session.model,
+      created: session.created.toISOString(),
+      messages: session.messages
+    };
+    return { filename, content: JSON.stringify(payload, null, 2), messageCount: session.messages.length };
+  }
+  const dateStr = session.created.toISOString().replace("T", " ").slice(0, 19);
+  let md = `# ${session.title ?? "Conversation Export"}
+
+`;
+  md += `| Field    | Value |
+|----------|-------|
+`;
+  md += `| Provider | ${session.provider} |
+`;
+  md += `| Model    | ${session.model} |
+`;
+  md += `| Date     | ${dateStr} |
+`;
+  md += `| Session  | ${session.id.slice(0, 8)} |
+
+---
+
+`;
+  for (const msg of session.messages) {
+    const text = getContentText(msg.content);
+    md += `${markdownHeading(msg)}
+
+`;
+    if (text.trim()) md += `${text}
+
+`;
+    if (msg.toolCalls && msg.toolCalls.length > 0) {
+      for (const tc of msg.toolCalls) {
+        md += `\`\`\`json
+${JSON.stringify({ tool: tc.name, arguments: tc.arguments ?? {} }, null, 2)}
+\`\`\`
+
+`;
+      }
+    }
+    md += `---
+
+`;
+  }
+  return { filename, content: md, messageCount: session.messages.length };
+}
+function parseCheckpointCommand(args) {
+  const sub = args[0]?.toLowerCase();
+  if (!sub || sub === "list") return { kind: "list" };
+  const name = args.slice(1).join(" ").trim();
+  if (sub === "save" || sub === "restore" || sub === "delete") {
+    if (!name) return { kind: "usage", message: `Usage: /checkpoint ${sub} <name>` };
+    return { kind: sub, name };
+  }
+  return { kind: "unknown", message: `Unknown subcommand: ${sub}. Use save/restore/list/delete.` };
+}
+function formatCheckpointList(checkpoints) {
+  if (checkpoints.length === 0) {
+    return ["No checkpoints. Use /checkpoint save <name> to create one."];
+  }
+  return [
+    `Checkpoints (${checkpoints.length}):`,
+    ...checkpoints.map((cp) => `  ${cp.name.padEnd(20)} msg #${cp.messageIndex}  ${cp.timestamp.toLocaleString()}`)
+  ];
+}
+var checkpointSavedMessage = (name, messageCount) => `\u2713 Checkpoint "${name}" saved at message #${messageCount}`;
+var checkpointRestoredMessage = (name, messageCount) => `\u2713 Restored to checkpoint "${name}" (${messageCount} messages, token usage reset)`;
+var checkpointDeletedMessage = (name) => `\u2713 Deleted checkpoint "${name}"`;
+var checkpointNotFoundMessage = (name) => `Checkpoint "${name}" not found.`;
+
 // src/core/context-files.ts
 import { existsSync as existsSync25, readFileSync as readFileSync20 } from "fs";
 import { join as join19, relative as relative4, resolve as resolve8 } from "path";
@@ -16407,6 +16502,232 @@ function lastAssistantText(messages) {
   return void 0;
 }
 
+// src/core/session-command.ts
+var DEFAULT_SESSION_LIST_LIMIT = 50;
+function parseSessionListArgs(args) {
+  let limit = DEFAULT_SESSION_LIST_LIMIT;
+  let all = false;
+  const filter = {};
+  const warnings = [];
+  let search = null;
+  let days = null;
+  let since = null;
+  let sort = { field: "updated", order: "desc" };
+  let json = false;
+  let stale = null;
+  let verbose = false;
+  for (let i = 1; i < args.length; i++) {
+    const a = args[i];
+    if (a === "--all" || a === "-a") {
+      all = true;
+    } else if ((a === "--limit" || a === "-n") && i + 1 < args.length) {
+      const n = Number(args[i + 1]);
+      if (Number.isFinite(n) && n > 0) {
+        limit = n;
+        i++;
+      }
+    } else if (a === "--filter" && i + 1 < args.length) {
+      const val = args[++i];
+      const eq = val.indexOf("=");
+      if (eq > 0) {
+        const key = val.slice(0, eq);
+        const vals = val.slice(eq + 1).split(",").map((s) => s.trim().toLowerCase());
+        if (key === "provider") filter.provider = vals;
+        else if (key === "model") filter.model = vals;
+        else if (key === "messages") {
+          const n = Number(vals[0]);
+          if (Number.isFinite(n) && n >= 0) filter.messages = n;
+          else warnings.push(`Invalid filter value for "messages": expected a non-negative integer, got "${vals[0]}"`);
+        } else {
+          warnings.push(`Unknown filter key: "${key}". Supported keys: provider, model, messages`);
+        }
+      } else {
+        warnings.push(`Invalid --filter syntax: "${val}". Expected key=value`);
+      }
+    } else if ((a === "--search" || a === "-s") && i + 1 < args.length) {
+      search = args[++i];
+    } else if (a === "--days" && i + 1 < args.length) {
+      const n = Number(args[++i]);
+      if (Number.isFinite(n) && n > 0) days = n;
+    } else if (a === "--since" && i + 1 < args.length) {
+      since = args[++i];
+    } else if (a === "--sort" && i + 1 < args.length) {
+      const sv = args[++i];
+      const colon = sv.indexOf(":");
+      const field = colon > 0 ? sv.slice(0, colon) : sv;
+      const order = colon > 0 ? sv.slice(colon + 1) : "desc";
+      if (field === "updated" || field === "created" || field === "messages" || field === "size") {
+        sort = { field, order: order === "asc" ? "asc" : "desc" };
+      }
+    } else if (a === "--json") {
+      json = true;
+    } else if (a === "--verbose" || a === "-v") {
+      verbose = true;
+    } else if (a === "--stale" && i + 1 < args.length) {
+      const n = Number(args[++i]);
+      if (Number.isFinite(n) && n > 0) stale = n;
+    }
+  }
+  if (all) limit = -1;
+  return { limit, all, filter, search, days, since, sort, json, stale, verbose, warnings };
+}
+function sessionListNeedsFileSize(opts) {
+  return opts.verbose || opts.sort.field === "size";
+}
+function selectSessions(sessions, opts, now = Date.now()) {
+  let matched = sessions;
+  const hasFilters = !!opts.filter.provider || !!opts.filter.model || opts.filter.messages !== void 0;
+  const hasSearch = !!opts.search;
+  const hasTimeFilter = opts.days !== null || opts.since !== null;
+  const hasStale = opts.stale !== null;
+  if (hasFilters) {
+    const p = opts.filter.provider;
+    const m = opts.filter.model;
+    const msg = opts.filter.messages;
+    matched = matched.filter((s) => {
+      if (p && !p.includes(s.provider.toLowerCase())) return false;
+      if (m && !m.some((kw) => s.model.toLowerCase().includes(kw))) return false;
+      if (msg !== void 0 && s.messageCount !== msg) return false;
+      return true;
+    });
+  }
+  if (hasSearch) {
+    const q = opts.search.toLowerCase();
+    matched = matched.filter(
+      (s) => (s.title ?? "").toLowerCase().includes(q) || s.id.toLowerCase().includes(q)
+    );
+  }
+  if (hasTimeFilter) {
+    let cutoff = 0;
+    if (opts.since) cutoff = new Date(opts.since).getTime();
+    else if (opts.days !== null) cutoff = now - opts.days * 24 * 60 * 60 * 1e3;
+    if (!Number.isNaN(cutoff)) {
+      matched = matched.filter((s) => s.updated.getTime() >= cutoff);
+    }
+  }
+  const staleCutoff = hasStale ? now - opts.stale * 24 * 60 * 60 * 1e3 : null;
+  if (staleCutoff !== null) {
+    matched = matched.filter((s) => s.updated.getTime() < staleCutoff);
+  }
+  const defaultSort = opts.sort.field === "updated" && opts.sort.order === "desc";
+  if (!defaultSort) {
+    const mul = opts.sort.order === "asc" ? 1 : -1;
+    matched = [...matched].sort((a, b) => {
+      switch (opts.sort.field) {
+        case "created":
+          return (a.created.getTime() - b.created.getTime()) * mul;
+        case "messages":
+          return (a.messageCount - b.messageCount) * mul;
+        case "size":
+          return ((a.fileSize ?? 0) - (b.fileSize ?? 0)) * mul;
+        default:
+          return (a.updated.getTime() - b.updated.getTime()) * mul;
+      }
+    });
+  }
+  const filterTags = [];
+  if (hasFilters) filterTags.push("filtered");
+  if (hasSearch) filterTags.push("searched");
+  if (hasTimeFilter) filterTags.push("time-limited");
+  if (hasStale) filterTags.push(`stale >${opts.stale}d`);
+  return {
+    matched,
+    shown: opts.limit > 0 ? matched.slice(0, opts.limit) : matched,
+    totalCount: matched.length,
+    totalMessages: matched.reduce((sum, s) => sum + s.messageCount, 0),
+    staleCutoff,
+    filterTags,
+    needsFileSize: sessionListNeedsFileSize(opts)
+  };
+}
+function sessionListSummary(view) {
+  const tag = view.filterTags.length > 0 ? ` (${view.filterTags.join(", ")})` : "";
+  return `${view.shown.length} of ${view.totalCount} sessions${tag} \xB7 ${view.totalMessages} messages total`;
+}
+function sessionListJsonRow(s, includeFileSize) {
+  return {
+    id: s.id,
+    title: s.title ?? null,
+    provider: s.provider,
+    model: s.model,
+    messageCount: s.messageCount,
+    created: s.created.toISOString(),
+    updated: s.updated.toISOString(),
+    ...includeFileSize ? { fileSize: s.fileSize } : {},
+    ...s.branchCount !== void 0 ? { branchCount: s.branchCount, activeBranch: s.activeBranch } : {}
+  };
+}
+function resolveSessionRef(sessions, prefix, policy) {
+  const matches2 = sessions.filter((s) => s.id.startsWith(prefix));
+  if (matches2.length === 0) {
+    return { status: "not-found", message: `Session '${prefix}' not found.` };
+  }
+  if (matches2.length > 1 && policy === "strict") {
+    return {
+      status: "ambiguous",
+      matches: matches2,
+      message: `Ambiguous prefix '${prefix}' matches ${matches2.length} sessions \u2014 be more specific:`
+    };
+  }
+  return {
+    status: "ok",
+    match: matches2[0],
+    ambiguousWith: matches2.length > 1 ? matches2 : [],
+    message: matches2.length > 1 ? `\u26A0 Ambiguous prefix '${prefix}' matches ${matches2.length} sessions \u2014 loading most recent:` : void 0
+  };
+}
+function formatSessionSummaryLine(s, titleWidth = 60) {
+  const title = s.title ?? "(untitled)";
+  const shown = title.length > titleWidth ? `${title.slice(0, titleWidth - 1)}\u2026` : title;
+  return `${s.id.slice(0, 12)}  ${s.provider}/${s.model}  ${String(s.messageCount).padStart(4)} msgs  ${s.updated.toISOString().slice(0, 10)}  ${shown}`;
+}
+function parseBatchDeleteArgs(args) {
+  let messages;
+  let dryRun = false;
+  for (let i = 1; i < args.length; i++) {
+    if (args[i] === "--filter" && i + 1 < args.length) {
+      const val = args[++i];
+      const eq = val.indexOf("=");
+      if (eq <= 0) {
+        return { dryRun, error: `Invalid --filter syntax: "${val}". Expected key=value (e.g., messages=0)` };
+      }
+      const key = val.slice(0, eq);
+      const vals = val.slice(eq + 1).split(",").map((s) => s.trim().toLowerCase());
+      if (key !== "messages") {
+        return { dryRun, error: `Unsupported filter key for delete: "${key}". Only "messages" is supported.` };
+      }
+      const n = Number(vals[0]);
+      if (!Number.isFinite(n) || n < 0) {
+        return { dryRun, error: `Invalid filter value for "messages": expected a non-negative integer, got "${vals[0]}"` };
+      }
+      messages = n;
+    } else if (args[i] === "--dry-run") {
+      dryRun = true;
+    }
+  }
+  if (messages === void 0) {
+    return { dryRun, error: "Usage: /session delete --filter messages=N [--dry-run]" };
+  }
+  return { messages, dryRun };
+}
+function parseCleanArgs(args) {
+  let staleDays = 90;
+  let dryRun = false;
+  for (let i = 1; i < args.length; i++) {
+    if (args[i] === "--stale" && i + 1 < args.length) {
+      const n = Number(args[++i]);
+      if (Number.isFinite(n) && n > 0) staleDays = n;
+    } else if (args[i] === "--dry-run") {
+      dryRun = true;
+    }
+  }
+  return { staleDays, dryRun };
+}
+function selectStaleSessions(sessions, staleDays, now = Date.now()) {
+  const cutoff = now - staleDays * 24 * 60 * 60 * 1e3;
+  return sessions.filter((s) => s.updated.getTime() < cutoff);
+}
+
 // src/web/commands/session-commands.ts
 async function handleClear(_args, ctx) {
   ctx.saveIfNeeded();
@@ -16430,7 +16751,7 @@ Cache:  write=${cacheCreate} read=${cacheRead}` : "";
 Cost:   ${formatCost(cost)}` : "";
   let memoryLine = "";
   try {
-    const { countPendingMemories: countPendingMemories2 } = await import("./persistent-memory-JCENBMCJ.js");
+    const { countPendingMemories: countPendingMemories2 } = await import("./persistent-memory-E6WECUTW.js");
     const pending = countPendingMemories2(ctx.config.getConfigDir());
     if (pending > 0) memoryLine = `
 Memory: \u26A0 ${pending} pending approval \u2014 see the Memory panel or /memory`;
@@ -16473,11 +16794,17 @@ async function handleSession(args, ctx) {
       ctx.sendSessionList();
       return;
     }
-    const list = ctx.sessions.listSessions();
-    const found = list.find((s) => s.id.startsWith(targetId));
-    if (found) {
+    const ref = resolveSessionRef(ctx.sessions.listSessions(), targetId, "most-recent");
+    if (ref.status === "ok") {
+      const found = ref.match;
       ctx.sessions.loadSession(found.id);
       ctx.resetWebSessionUsage();
+      if (ref.message) {
+        ctx.send({
+          type: "info",
+          message: [ref.message, ...ref.ambiguousWith.slice(0, 5).map((m) => `  ${formatSessionSummaryLine(m)}`)].join("\n")
+        });
+      }
       ctx.send({ type: "info", message: `Loaded session: ${found.id.slice(0, 8)} "${found.title ?? ""}" (${found.messageCount} messages)` });
       const loadedSession = ctx.sessions.current;
       if (loadedSession && loadedSession.messages.length > 0) {
@@ -16507,52 +16834,81 @@ async function handleSession(args, ctx) {
     return;
   }
   if (sub === "list") {
-    ctx.sendSessionList();
+    if (args.length <= 1) {
+      ctx.sendSessionList();
+      return;
+    }
+    const opts = parseSessionListArgs(args);
+    const all = ctx.sessions.listSessions({ includeFileSize: sessionListNeedsFileSize(opts) });
+    if (all.length === 0) {
+      ctx.send({ type: "info", message: "No saved sessions." });
+      return;
+    }
+    const view = selectSessions(all, opts);
+    if (view.totalCount === 0) {
+      ctx.send({
+        type: "info",
+        message: [...opts.warnings.map((w) => `\u26A0 ${w}`), "No sessions match the filter criteria."].join("\n")
+      });
+      return;
+    }
+    if (opts.json) {
+      ctx.send({
+        type: "info",
+        message: JSON.stringify(view.shown.map((s) => sessionListJsonRow(s, view.needsFileSize)), null, 2)
+      });
+      return;
+    }
+    const lines = [
+      ...opts.warnings.map((w) => `\u26A0 ${w}`),
+      ...view.shown.map((s) => formatSessionSummaryLine(s)),
+      `\u2500\u2500 ${sessionListSummary(view)}`
+    ];
+    if (view.shown.length < view.totalCount) lines.push("Use --all to show all, or --limit N to change count.");
+    ctx.send({ type: "info", message: lines.join("\n") });
     return;
   }
   if (sub === "delete" && args[1]) {
     const targetId = args[1];
     if (targetId === "--filter") {
-      let filterMessages;
-      for (let i = 1; i < args.length; i++) {
-        if (args[i] === "--filter" && i + 1 < args.length) {
-          const val = args[i + 1];
-          i++;
-          const eq = val.indexOf("=");
-          if (eq > 0) {
-            const key = val.slice(0, eq);
-            const vals = val.slice(eq + 1).split(",").map((s) => s.trim().toLowerCase());
-            if (key === "messages") {
-              const n = Number(vals[0]);
-              if (Number.isFinite(n) && n >= 0) filterMessages = n;
-            }
-          }
-        }
-      }
-      if (filterMessages === void 0) {
-        ctx.send({ type: "error", message: "Usage: /session delete --filter messages=N" });
+      const opts = parseBatchDeleteArgs(args);
+      if (opts.error) {
+        ctx.send({ type: "error", message: opts.error });
         return;
       }
-      const list2 = ctx.sessions.listSessions();
-      const matches2 = list2.filter((s) => s.messageCount === filterMessages);
+      const matches2 = ctx.sessions.listSessions().filter((s) => s.messageCount === opts.messages);
       if (matches2.length === 0) {
-        ctx.send({ type: "info", message: `No sessions with ${filterMessages} message(s) found.` });
+        ctx.send({ type: "info", message: `No sessions with ${opts.messages} message(s) found.` });
+        return;
+      }
+      const preview = [
+        `Found ${matches2.length} session(s) with ${opts.messages} message(s):`,
+        ...matches2.slice(0, 20).map((s) => `  ${formatSessionSummaryLine(s)}`),
+        ...matches2.length > 20 ? [`  ... and ${matches2.length - 20} more`] : []
+      ];
+      if (opts.dryRun) {
+        ctx.send({
+          type: "info",
+          message: [...preview, "--dry-run: no sessions were deleted. Remove --dry-run to actually delete."].join("\n")
+        });
         return;
       }
       let deleted = 0;
       let failed = 0;
       for (const s of matches2) {
-        if (ctx.sessions.deleteSession(s.id)) {
-          deleted++;
-        } else {
-          failed++;
-        }
+        if (ctx.sessions.deleteSession(s.id)) deleted++;
+        else failed++;
       }
       if (!ctx.sessions.current) {
-        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: `Deleted ${deleted} session(s) with ${filterMessages} message(s)${failed > 0 ? `, ${failed} failed` : ""}.` });
+      ctx.send({
+        type: "info",
+        message: [...preview, `Deleted ${deleted} session(s)${failed > 0 ? `, ${failed} failed` : ""}.`].join("\n")
+      });
+      ctx.sendStatus();
       ctx.sendSessionList();
       return;
     }
@@ -16561,20 +16917,79 @@ async function handleSession(args, ctx) {
       ctx.unsavedSessions.delete(cachedKey);
       if (ctx.sessions.current?.id === cachedKey) {
         ctx.sessions.clearCurrent();
+        const created = ctx.sessions.createSession(ctx.currentProvider, ctx.currentModel);
+        ctx.unsavedSessions.set(created.id, created);
+        ctx.resetWebSessionUsage();
+        ctx.sendStatus();
       }
       ctx.send({ type: "info", message: `Deleted session: ${cachedKey.slice(0, 8)}` });
       ctx.sendSessionList();
       return;
     }
-    const list = ctx.sessions.listSessions();
-    const found = list.find((s) => s.id.startsWith(targetId));
-    if (found) {
-      ctx.sessions.deleteSession(found.id);
-      ctx.send({ type: "info", message: `Deleted session: ${found.id.slice(0, 8)}` });
-      ctx.sendSessionList();
-    } else {
+    const ref = resolveSessionRef(ctx.sessions.listSessions(), targetId, "strict");
+    if (ref.status === "not-found") {
       ctx.send({ type: "error", message: `Session not found: ${targetId}` });
+      return;
     }
+    if (ref.status === "ambiguous") {
+      ctx.send({
+        type: "error",
+        message: [ref.message, ...ref.matches.slice(0, 10).map((m) => `  ${formatSessionSummaryLine(m)}`)].join("\n")
+      });
+      return;
+    }
+    const wasCurrent = ctx.sessions.current?.id === ref.match.id;
+    if (!ctx.sessions.deleteSession(ref.match.id)) {
+      ctx.send({ type: "error", message: "Delete failed \u2014 session file not found on disk." });
+      return;
+    }
+    ctx.send({ type: "info", message: `Deleted session: ${ref.match.id.slice(0, 8)}` });
+    if (wasCurrent) {
+      const created = ctx.sessions.createSession(ctx.currentProvider, ctx.currentModel);
+      ctx.unsavedSessions.set(created.id, created);
+      ctx.resetWebSessionUsage();
+      ctx.send({ type: "info", message: "Current session was deleted \u2014 started a fresh session." });
+      ctx.sendStatus();
+    }
+    ctx.sendSessionList();
+    return;
+  }
+  if (sub === "clean") {
+    const opts = parseCleanArgs(args);
+    const stale = selectStaleSessions(ctx.sessions.listSessions(), opts.staleDays);
+    if (stale.length === 0) {
+      ctx.send({ type: "info", message: `No sessions older than ${opts.staleDays} days found.` });
+      return;
+    }
+    const preview = [
+      `Found ${stale.length} session(s) not updated in ${opts.staleDays}+ days:`,
+      ...stale.slice(0, 20).map((s) => `  ${formatSessionSummaryLine(s)}`),
+      ...stale.length > 20 ? [`  ... and ${stale.length - 20} more`] : []
+    ];
+    if (opts.dryRun) {
+      ctx.send({
+        type: "info",
+        message: [...preview, "--dry-run: no sessions were deleted. Remove --dry-run to actually delete."].join("\n")
+      });
+      return;
+    }
+    let deleted = 0;
+    let failed = 0;
+    for (const s of stale) {
+      if (ctx.sessions.deleteSession(s.id)) deleted++;
+      else failed++;
+    }
+    if (!ctx.sessions.current) {
+      const created = ctx.sessions.createSession(ctx.currentProvider, ctx.currentModel);
+      ctx.unsavedSessions.set(created.id, created);
+      ctx.resetWebSessionUsage();
+      ctx.sendStatus();
+    }
+    ctx.send({
+      type: "info",
+      message: [...preview, `Cleaned up: ${deleted} deleted${failed > 0 ? `, ${failed} failed` : ""}.`].join("\n")
+    });
+    ctx.sendSessionList();
     return;
   }
   if (sub === "batch-delete") {
@@ -16598,6 +17013,12 @@ async function handleSession(args, ctx) {
         deleted++;
       }
     }
+    if (!ctx.sessions.current) {
+      const created = ctx.sessions.createSession(ctx.currentProvider, ctx.currentModel);
+      ctx.unsavedSessions.set(created.id, created);
+      ctx.resetWebSessionUsage();
+      ctx.sendStatus();
+    }
     ctx.send({ type: "info", message: `Deleted ${deleted} session(s).` });
     ctx.sendSessionList();
     return;
@@ -16611,26 +17032,40 @@ async function handleSession(args, ctx) {
     }
     const cachedKey = ctx.unsavedSessions.has(targetId) ? targetId : [...ctx.unsavedSessions.keys()].find((k) => k.startsWith(targetId));
     if (cachedKey) {
-      const session = ctx.unsavedSessions.get(cachedKey);
-      session.title = newTitle;
+      const session2 = ctx.unsavedSessions.get(cachedKey);
+      session2.title = newTitle;
       ctx.send({ type: "info", message: `Renamed session: "${newTitle}"` });
       ctx.sendSessionList();
       return;
     }
-    const list = ctx.sessions.listSessions();
-    const found = list.find((s) => s.id.startsWith(targetId));
-    if (found) {
-      const session = ctx.sessions.loadSession(found.id);
-      session.title = newTitle;
-      ctx.sessions.save();
-      ctx.send({ type: "info", message: `Renamed session: "${newTitle}"` });
-      ctx.sendSessionList();
-    } else {
+    const ref = resolveSessionRef(ctx.sessions.listSessions(), targetId, "strict");
+    if (ref.status === "not-found") {
       ctx.send({ type: "error", message: `Session not found: ${targetId}` });
+      return;
+    }
+    if (ref.status === "ambiguous") {
+      ctx.send({
+        type: "error",
+        message: [ref.message, ...ref.matches.slice(0, 10).map((m) => `  ${formatSessionSummaryLine(m)}`)].join("\n")
+      });
+      return;
     }
+    const priorId = ctx.sessions.current?.id ?? null;
+    const isCurrent = priorId === ref.match.id;
+    const session = isCurrent ? ctx.sessions.current : ctx.sessions.loadSession(ref.match.id);
+    session.title = newTitle;
+    ctx.sessions.save();
+    if (!isCurrent && priorId) {
+      ctx.sessions.loadSession(priorId);
+    }
+    ctx.send({ type: "info", message: `Renamed session: "${newTitle}"` });
+    ctx.sendSessionList();
     return;
   }
-  ctx.send({ type: "info", message: "Usage: /session new | list | load <id> | delete <id> | delete --filter messages=N | rename <id> <title>" });
+  ctx.send({
+    type: "info",
+    message: "Usage: /session new | list [--filter k=v] [--search kw] [--limit N|--all] [--sort f[:o]] [--json] | load <id> | delete <id> | delete --filter messages=N [--dry-run] | clean --stale N [--dry-run] | rename <id> <title>"
+  });
 }
 async function handleExport(args, ctx) {
   const format = args[0] === "json" ? "json" : "md";
@@ -16677,56 +17112,36 @@ async function handleCheckpoint(args, ctx) {
     ctx.send({ type: "error", message: "No active session." });
     return;
   }
-  const sub = args[0]?.toLowerCase();
-  if (!sub || sub === "list") {
-    const cps = session.checkpoints;
-    if (cps.length === 0) {
-      ctx.send({ type: "info", message: "No checkpoints. Use /checkpoint save <name> to create one." });
-    } else {
-      const lines = [`\u{1F4CC} Checkpoints (${cps.length}):`, ""];
-      for (const cp of cps) {
-        const ts = cp.timestamp.toLocaleString();
-        lines.push(`  ${cp.name.padEnd(20)} msg #${cp.messageIndex}  ${ts}`);
-      }
-      ctx.send({ type: "info", message: lines.join("\n") });
-    }
+  const intent = parseCheckpointCommand(args);
+  if (intent.kind === "list") {
+    ctx.send({ type: "info", message: formatCheckpointList(session.checkpoints).join("\n") });
     return;
   }
-  const cpName = args.slice(1).join(" ").trim();
-  if (sub === "save") {
-    if (!cpName) {
-      ctx.send({ type: "error", message: "Usage: /checkpoint save <name>" });
-      return;
-    }
-    session.createCheckpoint(cpName);
-    ctx.send({ type: "info", message: `\u2713 Checkpoint "${cpName}" saved at message #${session.messages.length}` });
-  } else if (sub === "restore") {
-    if (!cpName) {
-      ctx.send({ type: "error", message: "Usage: /checkpoint restore <name>" });
-      return;
-    }
-    const ok = session.restoreCheckpoint(cpName);
-    if (ok) {
-      ctx.send({ type: "info", message: `\u2713 Restored to checkpoint "${cpName}" (${session.messages.length} messages)` });
-      ctx.sendSessionMessages();
-      ctx.sendStatus();
-    } else {
-      ctx.send({ type: "error", message: `Checkpoint "${cpName}" not found.` });
-    }
-  } else if (sub === "delete") {
-    if (!cpName) {
-      ctx.send({ type: "error", message: "Usage: /checkpoint delete <name>" });
+  if (intent.kind === "usage" || intent.kind === "unknown") {
+    ctx.send({ type: "error", message: intent.message });
+    return;
+  }
+  if (intent.kind === "save") {
+    session.createCheckpoint(intent.name);
+    ctx.send({ type: "info", message: checkpointSavedMessage(intent.name, session.messages.length) });
+    return;
+  }
+  if (intent.kind === "restore") {
+    if (!session.restoreCheckpoint(intent.name)) {
+      ctx.send({ type: "error", message: checkpointNotFoundMessage(intent.name) });
       return;
     }
-    const ok = session.deleteCheckpoint(cpName);
-    if (ok) {
-      ctx.send({ type: "info", message: `\u2713 Deleted checkpoint "${cpName}"` });
-    } else {
-      ctx.send({ type: "error", message: `Checkpoint "${cpName}" not found.` });
-    }
-  } else {
-    ctx.send({ type: "error", message: `Unknown subcommand: ${sub}. Use save/restore/list/delete.` });
+    ctx.resetWebSessionUsage();
+    ctx.send({ type: "info", message: checkpointRestoredMessage(intent.name, session.messages.length) });
+    ctx.sendSessionMessages();
+    ctx.sendStatus();
+    return;
+  }
+  if (!session.deleteCheckpoint(intent.name)) {
+    ctx.send({ type: "error", message: checkpointNotFoundMessage(intent.name) });
+    return;
   }
+  ctx.send({ type: "info", message: checkpointDeletedMessage(intent.name) });
 }
 async function handleBranch(args, ctx) {
   const session = ctx.sessions.current;
@@ -17243,7 +17658,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-2Q5MJHXB.js")).executeTests;
+    const runTests = ctx.runTests ?? (await import("./run-tests-LWAFPVS3.js")).executeTests;
     const report = await runTests(testArgs);
     ctx.send({ type: "info", message: report });
   } catch (err) {
@@ -17579,7 +17994,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-JCENBMCJ.js");
+      const { exportMemoryEntries: exportMemoryEntries2 } = await import("./persistent-memory-E6WECUTW.js");
       ctx.send({
         type: "export_data",
         format: "md",
@@ -18023,7 +18438,7 @@ async function handleHelp(_args, ctx) {
       "  /think [on|off]      \u2014 Toggle extended thinking mode",
       "  /plan [execute|exit|status] \u2014 Read-only planning mode (bare /plan enters it)",
       "  /route [on|off|show|test <msg>] \u2014 Smart model routing",
-      "  /session new|list|load|delete <id> \u2014 Session management",
+      "  /session new|list [filters]|load <id>|delete <id>|delete --filter messages=N [--dry-run]|clean --stale N [--dry-run]|rename <id> <title> \u2014 Session management",
       "  /system [prompt|clear] \u2014 Set/view/reset system prompt",
       "  /context [status|reload] \u2014 Show/reload context layers",
       "  /status              \u2014 Show session info & token usage",
@@ -19424,43 +19839,13 @@ ${summaryContent}`,
       this.send({ type: "info", message: "No messages to export." });
       return;
     }
-    const title = session.title ?? "Untitled";
-    const timestamp = (/* @__PURE__ */ new Date()).toISOString().slice(0, 10);
-    if (format === "json") {
-      const data = {
-        title,
-        provider: this.currentProvider,
-        model: this.currentModel,
-        exported: (/* @__PURE__ */ new Date()).toISOString(),
-        messages: session.messages.map((m) => ({
-          role: m.role,
-          content: getContentText(m.content),
-          timestamp: m.timestamp?.toISOString()
-        }))
-      };
-      this.send({
-        type: "export_data",
-        format: "json",
-        filename: `aicli-${timestamp}.json`,
-        content: JSON.stringify(data, null, 2)
-      });
-    } else {
-      const lines = [`# ${title}`, "", `> Exported: ${(/* @__PURE__ */ new Date()).toLocaleString()} | Provider: ${this.currentProvider} | Model: ${this.currentModel}`, ""];
-      for (const m of session.messages) {
-        const text = getContentText(m.content);
-        if (m.role === "user") {
-          lines.push(`## \u{1F9D1} User`, "", text, "");
-        } else if (m.role === "assistant") {
-          lines.push(`## \u{1F916} Assistant`, "", text, "");
-        }
-      }
-      this.send({
-        type: "export_data",
-        format: "md",
-        filename: `aicli-${timestamp}.md`,
-        content: lines.join("\n")
-      });
-    }
+    const exported = buildSessionExport(session, format);
+    this.send({
+      type: "export_data",
+      format,
+      filename: exported.filename,
+      content: exported.content
+    });
   }
   memoryShow(args = []) {
     const configDir = this.config.getConfigDir();