jinzd-ai-cli 0.4.278 → 0.4.280

package/dist/index.js

@@ -11,6 +11,11 @@ import {
   autoTrimSessionIfNeeded,
   buildInitPrompt,
   buildSessionCostReport,
+  buildSessionExport,
+  checkpointDeletedMessage,
+  checkpointNotFoundMessage,
+  checkpointRestoredMessage,
+  checkpointSavedMessage,
   clearDevState,
   costSourceNote,
   decideDeferredSave,
@@ -19,24 +24,36 @@ import {
   estimateConversationTokens,
   evaluateContextPressure,
   filterMemoryEntries,
+  formatCheckpointList,
+  formatSessionSummaryLine,
   loadDevState,
+  parseBatchDeleteArgs,
+  parseCheckpointCommand,
+  parseCleanArgs,
+  parseExportArgs,
   parseMemoryShowFilters,
   parseModelCommand,
   parseRouteCommand,
+  parseSessionListArgs,
   parseSimpleYaml,
   persistToolRound,
   readGitDiff,
   resolveModelSwitch,
   resolveProviderSwitch,
+  resolveSessionRef,
   routeDecisionRows,
   routingEmptyRulesNote,
   saveDevState,
   scanProject,
+  selectSessions,
+  selectStaleSessions,
   sessionHasMeaningfulContent,
+  sessionListJsonRow,
+  sessionListSummary,
   setupProxy,
   snapshotFile,
   stripRoutingTags
-} from "./chunk-JJCNNQTU.js";
+} from "./chunk-IIO2SMEJ.js";
 import {
   CostTracker,
   computeCost,
@@ -66,7 +83,7 @@ import {
   setMaxOutputCap,
   spawnAgentContext,
   undoStack
-} from "./chunk-WOXIKQRI.js";
+} from "./chunk-CP5LAA52.js";
 import {
   buildReviewPrompt,
   buildSecurityReviewPrompt
@@ -107,7 +124,7 @@ import {
   touchMemoryReferences,
   updateMemoryApproval,
   updateMemoryEntry
-} from "./chunk-RFSKPCYC.js";
+} from "./chunk-V7EZ4SDC.js";
 import "./chunk-4DEMGCK4.js";
 import "./chunk-UUSRWSSX.js";
 import "./chunk-CKH4KQ4E.js";
@@ -131,7 +148,7 @@ import {
   formatDoctorReport,
   loadContextFiles,
   writeCrashLog
-} from "./chunk-LTZFUYBT.js";
+} from "./chunk-B3FHA6IN.js";
 import {
   describePlugin,
   getActivePluginAssets,
@@ -148,14 +165,14 @@ import {
   trustHook,
   trustPlugin,
   untrustHook
-} from "./chunk-L3CPM472.js";
+} from "./chunk-UMWDNNPS.js";
 import {
   ProviderRegistry,
   listBuiltInProviderMetadata
 } from "./chunk-UGY5SVNX.js";
 import {
   ConfigManager
-} from "./chunk-2BYQP6JX.js";
+} from "./chunk-EOP775JU.js";
 import {
   CONTENT_ONLY_STREAM_REMINDER,
   TEE_FINAL_USER_NUDGE,
@@ -193,7 +210,7 @@ import {
 import {
   fileCheckpoints
 } from "./chunk-4BKXL7SM.js";
-import "./chunk-SB4XONS4.js";
+import "./chunk-VQCFEA4Z.js";
 import {
   AGENTIC_BEHAVIOR_GUIDELINE,
   AUTHOR,
@@ -211,7 +228,7 @@ import {
   SKILLS_DIR_NAME,
   VERSION,
   buildUserIdentityPrompt
-} from "./chunk-X3722RFA.js";
+} from "./chunk-UBPRUSAF.js";
 
 // src/index.ts
 import { program } from "commander";
@@ -730,7 +747,6 @@ import { platform } from "os";
 
 // src/repl/commands/constants.ts
 var SESSION_PAGE_SIZE = 20;
-var DEFAULT_SESSION_LIST_LIMIT = 50;
 var MAX_TITLE_WIDTH = 40;
 
 // src/repl/commands/utils.ts
@@ -809,73 +825,6 @@ function formatSessionDate(date) {
   if (diffDays < 7) return `${abs}  (${diffDays} days ago)`;
   return abs;
 }
-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 renderTranscriptMessage(msg, renderer) {
   if (msg.role === "user") {
     const text = getContentText(msg.content);
@@ -1397,7 +1346,7 @@ No tools match "${filter}".
           const { join: join6 } = await import("path");
           const { existsSync: existsSync6 } = await import("fs");
           const { getGitRoot: getGitRoot2 } = await import("./git-context-EXOEHQSF.js");
-          const { MCP_PROJECT_CONFIG_NAME: MCP_PROJECT_CONFIG_NAME2 } = await import("./constants-DC3TNLTL.js");
+          const { MCP_PROJECT_CONFIG_NAME: MCP_PROJECT_CONFIG_NAME2 } = await import("./constants-6LCZOBJC.js");
           const { approveProject, hashMcpFile } = await import("./project-trust-NKYHL3VZ.js");
           const cwd = process.cwd();
           const projectRoot = getGitRoot2(cwd) ?? cwd;
@@ -2317,7 +2266,7 @@ function createReviewCommands() {
       usage: "/test [command|filter]",
       async execute(args, ctx) {
         try {
-          const { executeTests } = await import("./run-tests-R4IQS6IF.js");
+          const { executeTests } = await import("./run-tests-YPJDOEJA.js");
           const argStr = args.join(" ").trim();
           let testArgs = {};
           if (argStr) {
@@ -3081,7 +3030,7 @@ function createSessionCommands() {
     {
       name: "session",
       description: "Session management",
-      usage: "/session new|list [--limit N|--all] [--filter provider=|model=|messages=N] [--search kw] [--days N|--stale N] [--sort f[:o]] [--json] [--verbose]|load <id>|show <id> [page]|page <n>|remove <id>|clean --stale N [--dry-run]",
+      usage: "/session new|list [--limit N|--all] [--filter provider=|model=|messages=N] [--search kw] [--days N|--stale N] [--sort f[:o]] [--json] [--verbose]|load <id>|show <id> [page]|page <n>|rename <id> <title>|remove <id>|clean --stale N [--dry-run]",
       async execute(args, ctx) {
         const sub = args[0];
         if (sub === "new") {
@@ -3093,139 +3042,44 @@ function createSessionCommands() {
           ctx.renderer.printSuccess("New session started.");
         } else if (sub === "list") {
           const opts = parseSessionListArgs(args);
-          for (const w of opts.warnings) {
-            ctx.renderer.printInfo(`\u26A0 ${w}`);
-          }
-          const needFileSize = opts.verbose || opts.sort.field === "size";
-          let allSessions = ctx.sessions.listSessions({ includeFileSize: needFileSize });
-          if (allSessions.length === 0) {
+          for (const w of opts.warnings) ctx.renderer.printInfo(`\u26A0 ${w}`);
+          const all = ctx.sessions.listSessions({ includeFileSize: opts.verbose || opts.sort.field === "size" });
+          if (all.length === 0) {
             ctx.renderer.printInfo("No saved sessions.");
             return;
           }
-          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;
-            allSessions = allSessions.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();
-            allSessions = allSessions.filter(
-              (s) => (s.title ?? "").toLowerCase().includes(q) || s.id.toLowerCase().includes(q)
-            );
-          }
-          if (hasTimeFilter) {
-            const now = Date.now();
-            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 (!isNaN(cutoff)) {
-              allSessions = allSessions.filter((s) => s.updated.getTime() >= cutoff);
-            }
-          }
-          const staleCutoff = hasStale ? Date.now() - opts.stale * 24 * 60 * 60 * 1e3 : 0;
-          if (hasStale) {
-            allSessions = allSessions.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;
-            allSessions = [...allSessions].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 totalCount = allSessions.length;
-          if (totalCount === 0) {
+          const view = selectSessions(all, opts);
+          if (view.totalCount === 0) {
             ctx.renderer.printInfo("No sessions match the filter criteria.");
             return;
           }
           if (opts.json) {
-            const sliced2 = opts.limit > 0 ? allSessions.slice(0, opts.limit) : allSessions;
-            const payload = sliced2.map((s) => ({
-              id: s.id,
-              title: s.title ?? null,
-              provider: s.provider,
-              model: s.model,
-              messageCount: s.messageCount,
-              created: s.created.toISOString(),
-              updated: s.updated.toISOString(),
-              ...needFileSize ? { fileSize: s.fileSize } : {},
-              ...s.branchCount !== void 0 ? { branchCount: s.branchCount, activeBranch: s.activeBranch } : {}
-            }));
-            console.log(JSON.stringify(payload, null, 2));
-            if (opts.limit > 0 && totalCount > opts.limit) {
+            console.log(JSON.stringify(view.shown.map((s) => sessionListJsonRow(s, view.needsFileSize)), null, 2));
+            if (view.shown.length < view.totalCount) {
               console.error(
                 `
-(truncated: ${opts.limit} of ${totalCount} sessions shown; use --all for full list)`
+(truncated: ${view.shown.length} of ${view.totalCount} sessions shown; use --all for full list)`
               );
             }
             return;
           }
-          const sliced = opts.limit > 0 ? allSessions.slice(0, opts.limit) : allSessions;
           const headers = ["ID (short)", "Provider", "Model", "Messages"];
-          if (opts.verbose) {
-            headers.push("Size");
-            headers.push("Br");
-          }
+          if (opts.verbose) headers.push("Size", "Br");
           headers.push("Date", "Title");
-          const rows = sliced.map((s) => {
-            const isStale = hasStale ? s.updated.getTime() < staleCutoff : false;
+          const rows = view.shown.map((s) => {
+            const isStale = view.staleCutoff !== null && s.updated.getTime() < view.staleCutoff;
             const dim = isStale ? theme.dim : (x) => String(x);
-            const row = [
-              dim(s.id.slice(0, 8)),
-              dim(s.provider),
-              dim(s.model),
-              s.messageCount
-            ];
+            const row = [dim(s.id.slice(0, 8)), dim(s.provider), dim(s.model), s.messageCount];
             if (opts.verbose) {
-              row.push(
-                s.fileSize !== void 0 ? formatFileSize(s.fileSize) : "\u2014",
-                s.branchCount ?? 1
-              );
+              row.push(s.fileSize !== void 0 ? formatFileSize(s.fileSize) : "\u2014", s.branchCount ?? 1);
             }
-            row.push(
-              formatSessionDate(s.updated),
-              dim(truncateTitle(s.title ?? "(untitled)", MAX_TITLE_WIDTH))
-            );
+            row.push(formatSessionDate(s.updated), dim(truncateTitle(s.title ?? "(untitled)", MAX_TITLE_WIDTH)));
             return row;
           });
           console.log();
           ctx.renderer.printTable(headers, rows);
-          const totalMessages = allSessions.reduce((sum, s) => sum + s.messageCount, 0);
-          const shown = sliced.length;
-          const filterHints = [];
-          if (hasFilters) filterHints.push("filtered");
-          if (hasSearch) filterHints.push("searched");
-          if (hasTimeFilter) filterHints.push("time-limited");
-          if (hasStale) filterHints.push(`stale >${opts.stale}d`);
-          const filterTag = filterHints.length > 0 ? ` (${filterHints.join(", ")})` : "";
-          console.log(
-            theme.dim(
-              `  \u2500\u2500 ${shown} of ${totalCount} sessions${filterTag} \xB7 ${totalMessages} messages total`
-            )
-          );
-          if (shown < totalCount) {
+          console.log(theme.dim(`  \u2500\u2500 ${sessionListSummary(view)}`));
+          if (view.shown.length < view.totalCount) {
             console.log(theme.dim(`       Use --all to show all, or --limit N to change count.`));
           }
         } else if (sub === "load" || sub === "show") {
@@ -3234,19 +3088,18 @@ function createSessionCommands() {
             ctx.renderer.renderError(`Usage: /session ${sub} <id>${sub === "show" ? " [page]" : ""}`);
             return;
           }
-          const sessions = ctx.sessions.listSessions();
-          const matches = sessions.filter((s) => s.id.startsWith(id));
-          if (matches.length === 0) {
-            ctx.renderer.renderError(`Session '${id}' not found.`);
+          const ref = resolveSessionRef(ctx.sessions.listSessions(), id, "most-recent");
+          if (ref.status !== "ok") {
+            ctx.renderer.renderError(ref.message);
             return;
           }
-          if (matches.length > 1) {
-            console.log(theme.warning(`  \u26A0 Ambiguous prefix '${id}' matches ${matches.length} sessions \u2014 loading most recent:`));
-            for (const m of matches.slice(0, 5)) {
+          if (ref.message) {
+            console.log(theme.warning(`  ${ref.message}`));
+            for (const m of ref.ambiguousWith.slice(0, 5)) {
               console.log(theme.dim(`    ${m.id.slice(0, 12)}  ${m.title ?? "(untitled)"}`));
             }
           }
-          const match = matches[0];
+          const match = ref.match;
           ctx.sessions.loadSession(match.id);
           ctx.setProvider(match.provider, match.model);
           ctx.resetSessionTokenUsage();
@@ -3270,70 +3123,54 @@ function createSessionCommands() {
             return;
           }
           renderTranscriptPage(cur.messages, ctx.renderer, n);
+        } else if (sub === "rename") {
+          const id = args[1];
+          const newTitle = args.slice(2).join(" ").trim();
+          if (!id || !newTitle) {
+            ctx.renderer.renderError("Usage: /session rename <id> <new title>");
+            return;
+          }
+          const ref = resolveSessionRef(ctx.sessions.listSessions(), id, "strict");
+          if (ref.status !== "ok") {
+            ctx.renderer.renderError(ref.message);
+            if (ref.status === "ambiguous") {
+              for (const m of ref.matches.slice(0, 10)) console.log(theme.dim(`    ${formatSessionSummaryLine(m)}`));
+            }
+            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;
+          await ctx.sessions.save();
+          if (!isCurrent && priorId) {
+            ctx.sessions.loadSession(priorId);
+          }
+          ctx.renderer.printSuccess(`Renamed session ${ref.match.id.slice(0, 8)}: "${newTitle}"`);
         } else if (sub === "remove" || sub === "delete") {
           if (args[1] === "--filter") {
-            let filterMessages;
-            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) {
-                  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;
-                    else {
-                      ctx.renderer.renderError(`Invalid filter value for "messages": expected a non-negative integer, got "${vals[0]}"`);
-                      return;
-                    }
-                  } else {
-                    ctx.renderer.renderError(`Unsupported filter key for remove: "${key}". Only "messages" is supported.`);
-                    return;
-                  }
-                } else {
-                  ctx.renderer.renderError(`Invalid --filter syntax: "${val}". Expected key=value (e.g., messages=0)`);
-                  return;
-                }
-              } else if (args[i] === "--dry-run") {
-                dryRun = true;
-              }
-            }
-            if (filterMessages === void 0) {
-              ctx.renderer.renderError("Usage: /session remove --filter messages=N [--dry-run]");
+            const opts = parseBatchDeleteArgs(args);
+            if (opts.error) {
+              ctx.renderer.renderError(opts.error);
               return;
             }
-            const allSessions = ctx.sessions.listSessions();
-            const matches2 = allSessions.filter((s) => s.messageCount === filterMessages);
-            if (matches2.length === 0) {
-              ctx.renderer.printInfo(`No sessions with ${filterMessages} message(s) found.`);
+            const matches = ctx.sessions.listSessions().filter((s) => s.messageCount === opts.messages);
+            if (matches.length === 0) {
+              ctx.renderer.printInfo(`No sessions with ${opts.messages} message(s) found.`);
               return;
             }
             console.log();
-            console.log(
-              theme.warning(`  Found ${matches2.length} session(s) with ${filterMessages} message(s):`)
-            );
-            for (const s of matches2.slice(0, 20)) {
-              console.log(
-                theme.dim(
-                  `    ${s.id.slice(0, 12)}  ${s.provider}/${s.model}  ${String(s.messageCount).padStart(4)} msgs  ${s.updated.toISOString().slice(0, 10)}  ${truncateTitle(s.title ?? "(untitled)", 60)}`
-                )
-              );
-            }
-            if (matches2.length > 20) {
-              console.log(theme.dim(`    ... and ${matches2.length - 20} more`));
-            }
-            if (dryRun) {
-              console.log(
-                theme.info(`
-  --dry-run: no sessions were deleted. Remove --dry-run to actually delete.`)
-              );
+            console.log(theme.warning(`  Found ${matches.length} session(s) with ${opts.messages} message(s):`));
+            for (const s of matches.slice(0, 20)) console.log(theme.dim(`    ${formatSessionSummaryLine(s)}`));
+            if (matches.length > 20) console.log(theme.dim(`    ... and ${matches.length - 20} more`));
+            if (opts.dryRun) {
+              console.log(theme.info(`
+  --dry-run: no sessions were deleted. Remove --dry-run to actually delete.`));
               return;
             }
             console.log();
             const choice2 = await ctx.select(
-              `Delete all ${matches2.length} matching sessions?`,
+              `Delete all ${matches.length} matching sessions?`,
               [
                 { label: "No \u2014 keep them", value: "no" },
                 { label: "Yes \u2014 delete permanently", value: "yes", hint: "unlinks all matching history files" }
@@ -3345,17 +3182,12 @@ function createSessionCommands() {
             }
             let deleted = 0;
             let failed = 0;
-            for (const s of matches2) {
-              if (ctx.sessions.deleteSession(s.id)) {
-                deleted++;
-              } else {
-                failed++;
-              }
+            for (const s of matches) {
+              if (ctx.sessions.deleteSession(s.id)) deleted++;
+              else failed++;
             }
             const currentStillExists = ctx.sessions.current !== null;
-            ctx.renderer.printSuccess(
-              `Removed: ${deleted} deleted${failed > 0 ? `, ${failed} failed` : ""}.`
-            );
+            ctx.renderer.printSuccess(`Removed: ${deleted} deleted${failed > 0 ? `, ${failed} failed` : ""}.`);
             if (!currentStillExists) {
               ctx.sessions.createSession(ctx.getCurrentProvider(), ctx.getCurrentModel());
               ctx.resetSessionTokenUsage();
@@ -3369,20 +3201,15 @@ function createSessionCommands() {
             ctx.renderer.renderError("Usage: /session remove <id>  |  /session remove --filter messages=N [--dry-run]");
             return;
           }
-          const sessions = ctx.sessions.listSessions();
-          const matches = sessions.filter((s) => s.id.startsWith(id));
-          if (matches.length === 0) {
-            ctx.renderer.renderError(`Session '${id}' not found.`);
-            return;
-          }
-          if (matches.length > 1) {
-            ctx.renderer.renderError(`Ambiguous prefix '${id}' matches ${matches.length} sessions \u2014 be more specific:`);
-            for (const m of matches.slice(0, 10)) {
-              console.log(theme.dim(`    ${m.id.slice(0, 12)}  ${String(m.messageCount).padStart(4)} msgs  ${m.updated.toLocaleDateString()}  ${m.title ?? "(untitled)"}`));
+          const ref = resolveSessionRef(ctx.sessions.listSessions(), id, "strict");
+          if (ref.status !== "ok") {
+            ctx.renderer.renderError(ref.message);
+            if (ref.status === "ambiguous") {
+              for (const m of ref.matches.slice(0, 10)) console.log(theme.dim(`    ${formatSessionSummaryLine(m)}`));
             }
             return;
           }
-          const match = matches[0];
+          const match = ref.match;
           const isCurrent = ctx.sessions.current?.id === match.id;
           console.log();
           console.log(theme.warning("  About to permanently delete session (no undo):"));
@@ -3409,44 +3236,19 @@ function createSessionCommands() {
             ctx.renderer.printInfo("Current session was deleted \u2014 started a fresh session.");
           }
         } else if (sub === "clean") {
-          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;
-            }
-          }
-          const cutoff = Date.now() - staleDays * 24 * 60 * 60 * 1e3;
-          const allSessions = ctx.sessions.listSessions();
-          const stale = allSessions.filter((s) => s.updated.getTime() < cutoff);
+          const opts = parseCleanArgs(args);
+          const stale = selectStaleSessions(ctx.sessions.listSessions(), opts.staleDays);
           if (stale.length === 0) {
-            ctx.renderer.printInfo(`No sessions older than ${staleDays} days found.`);
+            ctx.renderer.printInfo(`No sessions older than ${opts.staleDays} days found.`);
             return;
           }
           console.log();
-          console.log(
-            theme.warning(
-              `  Found ${stale.length} session(s) not updated in ${staleDays}+ days:`
-            )
-          );
-          for (const s of stale.slice(0, 20)) {
-            console.log(
-              theme.dim(
-                `    ${s.id.slice(0, 12)}  ${String(s.messageCount).padStart(4)} msgs  ${s.updated.toISOString().slice(0, 10)}  ${truncateTitle(s.title ?? "(untitled)", 60)}`
-              )
-            );
-          }
-          if (stale.length > 20) {
-            console.log(theme.dim(`    ... and ${stale.length - 20} more`));
-          }
-          if (dryRun) {
-            console.log(
-              theme.info(`
-  --dry-run: no sessions were deleted. Remove --dry-run to actually delete.`)
-            );
+          console.log(theme.warning(`  Found ${stale.length} session(s) not updated in ${opts.staleDays}+ days:`));
+          for (const s of stale.slice(0, 20)) console.log(theme.dim(`    ${formatSessionSummaryLine(s)}`));
+          if (stale.length > 20) console.log(theme.dim(`    ... and ${stale.length - 20} more`));
+          if (opts.dryRun) {
+            console.log(theme.info(`
+  --dry-run: no sessions were deleted. Remove --dry-run to actually delete.`));
             return;
           }
           console.log();
@@ -3464,17 +3266,12 @@ function createSessionCommands() {
           let deleted = 0;
           let failed = 0;
           for (const s of stale) {
-            if (ctx.sessions.deleteSession(s.id)) {
-              deleted++;
-            } else {
-              failed++;
-            }
+            if (ctx.sessions.deleteSession(s.id)) deleted++;
+            else failed++;
           }
-          ctx.renderer.printSuccess(
-            `Cleaned up: ${deleted} deleted${failed > 0 ? `, ${failed} failed` : ""}.`
-          );
+          ctx.renderer.printSuccess(`Cleaned up: ${deleted} deleted${failed > 0 ? `, ${failed} failed` : ""}.`);
         } else {
-          ctx.renderer.renderError("Usage: /session new|list|load <id>|show <id> [page]|page <n>|remove <id>|remove --filter messages=N [--dry-run]|clean --stale N [--dry-run]");
+          ctx.renderer.renderError("Usage: /session new|list|load <id>|show <id> [page]|page <n>|rename <id> <title>|remove <id>|remove --filter messages=N [--dry-run]|clean --stale N [--dry-run]");
         }
       }
     },
@@ -3492,76 +3289,20 @@ function createSessionCommands() {
       description: "Export current session to file or stdout",
       usage: "/export [md|json] [filename]",
       execute(args, ctx) {
-        let format = "md";
-        let outFile = null;
-        for (const arg of args) {
-          if (arg === "md" || arg === "json") {
-            format = arg;
-          } else if (arg) {
-            outFile = arg;
-          }
-        }
+        const { format, outFile } = parseExportArgs(args);
         const session = ctx.sessions.current;
         if (!session || session.messages.length === 0) {
           ctx.renderer.printInfo("No messages to export.");
           return;
         }
-        let output;
-        if (format === "json") {
-          output = JSON.stringify(session.toJSON(), null, 2);
-        } else {
-          const dateStr = session.created.toISOString().replace("T", " ").slice(0, 19);
-          let md = `# 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 role = msg.role === "user" ? "## \u{1F464} You" : "## \u{1F916} Assistant";
-            const text = getContentText(msg.content);
-            md += `${role}
-
-${text}
-
----
-
-`;
-          }
-          output = md;
-        }
-        if (outFile) {
-          const absPath = resolve(process.cwd(), outFile);
-          try {
-            mkdirSync2(dirname2(absPath), { recursive: true });
-            writeFileSync2(absPath, output, "utf-8");
-            ctx.renderer.printSuccess(`Exported ${session.messages.length} messages \u2192 ${absPath}`);
-          } catch (err) {
-            ctx.renderer.renderError(`Failed to write file: ${err instanceof Error ? err.message : String(err)}`);
-          }
-        } else {
-          const shortId = session.id.slice(0, 8);
-          const dateTag = session.created.toISOString().slice(0, 10);
-          const ext = format === "json" ? "json" : "md";
-          const autoName = `session-${dateTag}-${shortId}.${ext}`;
-          const absPath = resolve(process.cwd(), autoName);
-          try {
-            writeFileSync2(absPath, output, "utf-8");
-            ctx.renderer.printSuccess(`Exported ${session.messages.length} messages \u2192 ${absPath}`);
-          } catch (err) {
-            ctx.renderer.renderError(`Failed to write file: ${err instanceof Error ? err.message : String(err)}`);
-          }
+        const exported = buildSessionExport(session, format, outFile);
+        const absPath = resolve(process.cwd(), exported.filename);
+        try {
+          mkdirSync2(dirname2(absPath), { recursive: true });
+          writeFileSync2(absPath, exported.content, "utf-8");
+          ctx.renderer.printSuccess(`Exported ${exported.messageCount} messages \u2192 ${absPath}`);
+        } catch (err) {
+          ctx.renderer.renderError(`Failed to write file: ${err instanceof Error ? err.message : String(err)}`);
         }
       }
     },
@@ -3575,59 +3316,40 @@ ${text}
           ctx.renderer.renderError("No active session.");
           return;
         }
-        const sub = args[0]?.toLowerCase();
-        if (!sub || sub === "list") {
-          const cps = ctx.listCheckpoints();
-          if (cps.length === 0) {
-            console.log(theme.dim("  No checkpoints. Use /checkpoint save <name> to create one."));
-            return;
-          }
-          console.log(theme.dim(`  Checkpoints (${cps.length}):`));
-          for (const cp of cps) {
-            const ts = cp.timestamp.toLocaleString();
-            console.log(theme.accent(`    ${cp.name.padEnd(20)} `) + theme.dim(`msg #${cp.messageIndex}  ${ts}`));
+        const intent = parseCheckpointCommand(args);
+        if (intent.kind === "list") {
+          const lines = formatCheckpointList(ctx.listCheckpoints());
+          console.log(theme.dim(`  ${lines[0]}`));
+          for (const line of lines.slice(1)) {
+            const [name, rest] = [line.slice(0, 24), line.slice(24)];
+            console.log(theme.accent(`  ${name}`) + theme.dim(rest));
           }
           console.log();
           return;
         }
-        const name = args.slice(1).join(" ").trim();
-        if (sub === "save") {
-          if (!name) {
-            ctx.renderer.renderError("Usage: /checkpoint save <name>");
-            return;
-          }
-          ctx.createCheckpoint(name);
-          console.log(theme.success(`  \u2713 Checkpoint "${name}" saved at message #${session.messages.length}`));
+        if (intent.kind === "usage" || intent.kind === "unknown") {
+          ctx.renderer.renderError(intent.message);
           return;
         }
-        if (sub === "restore") {
-          if (!name) {
-            ctx.renderer.renderError("Usage: /checkpoint restore <name>");
-            return;
-          }
-          const ok = ctx.restoreCheckpoint(name);
-          if (ok) {
-            ctx.resetSessionTokenUsage();
-            console.log(theme.success(`  \u2713 Restored to checkpoint "${name}" (${session.messages.length} messages, token usage reset)`));
-          } else {
-            ctx.renderer.renderError(`Checkpoint "${name}" not found.`);
-          }
+        if (intent.kind === "save") {
+          ctx.createCheckpoint(intent.name);
+          console.log(theme.success(`  ${checkpointSavedMessage(intent.name, session.messages.length)}`));
           return;
         }
-        if (sub === "delete") {
-          if (!name) {
-            ctx.renderer.renderError("Usage: /checkpoint delete <name>");
+        if (intent.kind === "restore") {
+          if (!ctx.restoreCheckpoint(intent.name)) {
+            ctx.renderer.renderError(checkpointNotFoundMessage(intent.name));
             return;
           }
-          const ok = ctx.deleteCheckpoint(name);
-          if (ok) {
-            console.log(theme.success(`  \u2713 Deleted checkpoint "${name}"`));
-          } else {
-            ctx.renderer.renderError(`Checkpoint "${name}" not found.`);
-          }
+          ctx.resetSessionTokenUsage();
+          console.log(theme.success(`  ${checkpointRestoredMessage(intent.name, session.messages.length)}`));
+          return;
+        }
+        if (!ctx.deleteCheckpoint(intent.name)) {
+          ctx.renderer.renderError(checkpointNotFoundMessage(intent.name));
           return;
         }
-        ctx.renderer.renderError(`Unknown subcommand: ${sub}. Use save/restore/list/delete.`);
+        console.log(theme.success(`  ${checkpointDeletedMessage(intent.name)}`));
       }
     },
     // ── /review ──────────────────────────────────────────────────
@@ -7547,7 +7269,7 @@ program.command("web").description("Start Web UI server with browser-based chat
     console.error("Error: Invalid port number. Must be between 1 and 65535.");
     process.exit(1);
   }
-  const { startWebServer } = await import("./server-KAURBKFI.js");
+  const { startWebServer } = await import("./server-CXXYIPMU.js");
   await startWebServer({ port, host: options.host });
 });
 program.command("user [action] [username]").description("Manage Web UI users (list | create <name> | delete <name> | reset-password <name> | logout-all <name> | migrate <name>)").action(async (action, username) => {
@@ -7714,11 +7436,11 @@ program.command("sessions").description("List recent conversation sessions").opt
   console.log(footer + "\n");
 });
 program.command("usage").description("Show token + cost usage grouped by provider/model (cross-session)").option("--days <n>", "Only the last N days (inclusive of today)").option("--month <ym>", "Only a specific month, format YYYY-MM (e.g. 2026-06)").option("--json", "Output as JSON (for scripting)").action(async (options) => {
-  const { runUsageCli } = await import("./usage-V3R7DA7M.js");
+  const { runUsageCli } = await import("./usage-CJUHQDT2.js");
   await runUsageCli(options);
 });
 program.command("doctor").description("Health check: API keys, config, MCP, recent crashes, tool usage, disk usage").option("--json", "Output as JSON (for scripting)").option("--reset-stats", "Reset accumulated tool usage statistics").action(async (options) => {
-  const { runDoctorCli } = await import("./doctor-cli-CDDG5XOY.js");
+  const { runDoctorCli } = await import("./doctor-cli-7JGPC5G4.js");
   const argv = process.argv.slice(2);
   await runDoctorCli({
     json: !!options.json || argv.includes("--json"),
@@ -7727,7 +7449,7 @@ program.command("doctor").description("Health check: API keys, config, MCP, rece
 });
 program.command("batch <action> [arg] [arg2]").description("Anthropic Message Batches: submit | list | status <id> | results <id> [out] | cancel <id>").option("--dry-run", "Parse and validate input without submitting (submit only)").action(async (action, arg, arg2, options) => {
   try {
-    const batch = await import("./batch-7Y4NAA6N.js");
+    const batch = await import("./batch-F27NOTWC.js");
     switch (action) {
       case "submit":
         if (!arg) {
@@ -7770,7 +7492,7 @@ program.command("batch <action> [arg] [arg2]").description("Anthropic Message Ba
   }
 });
 program.command("mcp-serve").description("Start an MCP server over STDIO, exposing aicli's built-in tools to Claude Desktop / Cursor / other MCP clients").option("--allow-destructive", "Allow bash / run_interactive / task_create (always destructive in MCP mode)").option("--allow-outside-cwd", "Allow tool path arguments to escape the sandbox root \u2014 disabled by default").option("--tools <list>", "Comma-separated whitelist of tools to expose (default: all eligible tools)").option("--cwd <path>", "Working directory AND sandbox root (default: current directory)").action(async (options) => {
-  const { startMcpServer } = await import("./server-WXLE53HG.js");
+  const { startMcpServer } = await import("./server-P6DI27CY.js");
   await startMcpServer({
     allowDestructive: !!options.allowDestructive,
     allowOutsideCwd: !!options.allowOutsideCwd,
@@ -7783,7 +7505,7 @@ program.command("pr <action> [target]").description("PR review helpers: review |
     console.error(`Unknown pr action: ${action}. Use review | security-review | summarize.`);
     process.exit(1);
   }
-  const { runPrCli } = await import("./pr-GVSZYX6I.js");
+  const { runPrCli } = await import("./pr-GLUFBQLI.js");
   const result = await runPrCli({
     action,
     target,
@@ -7803,8 +7525,8 @@ program.command("pr <action> [target]").description("PR review helpers: review |
   process.exit(result.exitCode);
 });
 program.command("ci").description("Headless PR review (code + security) \u2014 reads git/gh diff, optionally posts to PR. Designed for GitHub Actions.").option("--pr <num>", "PR number or URL; diff fetched via gh pr diff <value>", (v) => /^#?\d+$/.test(v) ? parseInt(v.replace(/^#/, ""), 10) : v).option("--base <ref>", "Base ref for git diff <ref>...HEAD (ignored when --pr set)").option("--post", "Post review as a PR comment (requires gh CLI + GH_TOKEN, needs --pr)").option("--no-update", "Always create a new comment instead of updating the previous aicli review").option("--skip-code", "Skip the code review section").option("--skip-security", "Skip the security review section").option("--detailed", "Use the detailed code-review prompt").option("--max-diff <n>", "Max diff chars sent to the model (default 30000)", (v) => parseInt(v, 10)).option("--provider <id>", "Override provider (default: config.defaultProvider)").option("--model <id>", "Override model").option("--dry-run", "Print result to stdout instead of posting (overrides --post)").option("--json", "Output a structured JSON report").option("--markdown", "Output Markdown report (default)").option("--sarif", "Output SARIF 2.1.0 for code scanning artifacts").option("--fail-on-security-high", "Fail when the security review contains HIGH/CRITICAL findings (default)").option("--no-fail-on-security-high", "Do not fail on security HIGH/CRITICAL findings").option("--fail-on-test-failure", "Fail when the report mentions test failures (default)").option("--no-fail-on-test-failure", "Do not fail on test failure findings").option("--fail-on-lint-failure", "Fail when the report mentions lint/typecheck failures (default)").option("--no-fail-on-lint-failure", "Do not fail on lint/typecheck failure findings").action(async (options) => {
-  const { runCi } = await import("./ci-WDF2CYR4.js");
-  const { formatCiResult } = await import("./ci-format-7B5VAZGA.js");
+  const { runCi } = await import("./ci-HJ4OVHCM.js");
+  const { formatCiResult } = await import("./ci-format-NKJRZ3QI.js");
   const formats = [options.json, options.markdown, options.sarif].filter(Boolean).length;
   if (formats > 1) {
     console.error("Choose only one output format: --json, --markdown, or --sarif.");
@@ -7962,7 +7684,7 @@ program.command("hub [topic]").description("Start multi-agent hub (discuss / bra
     config.get("customProviders"),
     config.getConfigDir()
   );
-  const { startHub } = await import("./hub-TO7ODOIA.js");
+  const { startHub } = await import("./hub-NX7HYN7V.js");
   await startHub(
     {
       topic: topic ?? "",