chainlesschain 0.162.49 → 0.162.60

package/src/assets/web-panel/assets/{zoom-hX-F1dT-.js → zoom-DMsur0jx.js}

@@ -1,4 +1,4 @@
-import{K as o}from"./index-CCyB-RK5.js";import{i as f}from"./motion-Dq7fiy4Y.js";const c=new o("antZoomIn",{"0%":{transform:"scale(0.2)",opacity:0},"100%":{transform:"scale(1)",opacity:1}}),y=new o("antZoomOut",{"0%":{transform:"scale(1)"},"100%":{transform:"scale(0.2)",opacity:0}}),a=new o("antZoomBigIn",{"0%":{transform:"scale(0.8)",opacity:0},"100%":{transform:"scale(1)",opacity:1}}),s=new o("antZoomBigOut",{"0%":{transform:"scale(1)"},"100%":{transform:"scale(0.8)",opacity:0}}),g=new o("antZoomUpIn",{"0%":{transform:"scale(0.8)",transformOrigin:"50% 0%",opacity:0},"100%":{transform:"scale(1)",transformOrigin:"50% 0%"}}),O=new o("antZoomUpOut",{"0%":{transform:"scale(1)",transformOrigin:"50% 0%"},"100%":{transform:"scale(0.8)",transformOrigin:"50% 0%",opacity:0}}),l=new o("antZoomLeftIn",{"0%":{transform:"scale(0.8)",transformOrigin:"0% 50%",opacity:0},"100%":{transform:"scale(1)",transformOrigin:"0% 50%"}}),u=new o("antZoomLeftOut",{"0%":{transform:"scale(1)",transformOrigin:"0% 50%"},"100%":{transform:"scale(0.8)",transformOrigin:"0% 50%",opacity:0}}),p=new o("antZoomRightIn",{"0%":{transform:"scale(0.8)",transformOrigin:"100% 50%",opacity:0},"100%":{transform:"scale(1)",transformOrigin:"100% 50%"}}),z=new o("antZoomRightOut",{"0%":{transform:"scale(1)",transformOrigin:"100% 50%"},"100%":{transform:"scale(0.8)",transformOrigin:"100% 50%",opacity:0}}),K=new o("antZoomDownIn",{"0%":{transform:"scale(0.8)",transformOrigin:"50% 100%",opacity:0},"100%":{transform:"scale(1)",transformOrigin:"50% 100%"}}),w=new o("antZoomDownOut",{"0%":{transform:"scale(1)",transformOrigin:"50% 100%"},"100%":{transform:"scale(0.8)",transformOrigin:"50% 100%",opacity:0}}),I={zoom:{inKeyframes:c,outKeyframes:y},"zoom-big":{inKeyframes:a,outKeyframes:s},"zoom-big-fast":{inKeyframes:a,outKeyframes:s},"zoom-left":{inKeyframes:l,outKeyframes:u},"zoom-right":{inKeyframes:p,outKeyframes:z},"zoom-up":{inKeyframes:g,outKeyframes:O},"zoom-down":{inKeyframes:K,outKeyframes:w}},h=(n,r)=>{const{antCls:m}=n,t=`${m}-${r}`,{inKeyframes:i,outKeyframes:e}=I[r];return[f(t,i,e,r==="zoom-big-fast"?n.motionDurationFast:n.motionDurationMid),{[`
+import{K as o}from"./index-DvUlrMy-.js";import{i as f}from"./motion-gQJEK3wO.js";const c=new o("antZoomIn",{"0%":{transform:"scale(0.2)",opacity:0},"100%":{transform:"scale(1)",opacity:1}}),y=new o("antZoomOut",{"0%":{transform:"scale(1)"},"100%":{transform:"scale(0.2)",opacity:0}}),a=new o("antZoomBigIn",{"0%":{transform:"scale(0.8)",opacity:0},"100%":{transform:"scale(1)",opacity:1}}),s=new o("antZoomBigOut",{"0%":{transform:"scale(1)"},"100%":{transform:"scale(0.8)",opacity:0}}),g=new o("antZoomUpIn",{"0%":{transform:"scale(0.8)",transformOrigin:"50% 0%",opacity:0},"100%":{transform:"scale(1)",transformOrigin:"50% 0%"}}),O=new o("antZoomUpOut",{"0%":{transform:"scale(1)",transformOrigin:"50% 0%"},"100%":{transform:"scale(0.8)",transformOrigin:"50% 0%",opacity:0}}),l=new o("antZoomLeftIn",{"0%":{transform:"scale(0.8)",transformOrigin:"0% 50%",opacity:0},"100%":{transform:"scale(1)",transformOrigin:"0% 50%"}}),u=new o("antZoomLeftOut",{"0%":{transform:"scale(1)",transformOrigin:"0% 50%"},"100%":{transform:"scale(0.8)",transformOrigin:"0% 50%",opacity:0}}),p=new o("antZoomRightIn",{"0%":{transform:"scale(0.8)",transformOrigin:"100% 50%",opacity:0},"100%":{transform:"scale(1)",transformOrigin:"100% 50%"}}),z=new o("antZoomRightOut",{"0%":{transform:"scale(1)",transformOrigin:"100% 50%"},"100%":{transform:"scale(0.8)",transformOrigin:"100% 50%",opacity:0}}),K=new o("antZoomDownIn",{"0%":{transform:"scale(0.8)",transformOrigin:"50% 100%",opacity:0},"100%":{transform:"scale(1)",transformOrigin:"50% 100%"}}),w=new o("antZoomDownOut",{"0%":{transform:"scale(1)",transformOrigin:"50% 100%"},"100%":{transform:"scale(0.8)",transformOrigin:"50% 100%",opacity:0}}),I={zoom:{inKeyframes:c,outKeyframes:y},"zoom-big":{inKeyframes:a,outKeyframes:s},"zoom-big-fast":{inKeyframes:a,outKeyframes:s},"zoom-left":{inKeyframes:l,outKeyframes:u},"zoom-right":{inKeyframes:p,outKeyframes:z},"zoom-up":{inKeyframes:g,outKeyframes:O},"zoom-down":{inKeyframes:K,outKeyframes:w}},h=(n,r)=>{const{antCls:m}=n,t=`${m}-${r}`,{inKeyframes:i,outKeyframes:e}=I[r];return[f(t,i,e,r==="zoom-big-fast"?n.motionDurationFast:n.motionDurationMid),{[`
         ${t}-enter,
         ${t}-appear
       `]:{transform:"scale(0)",opacity:0,animationTimingFunction:n.motionEaseOutCirc,"&-prepare":{transform:"none"}},[`${t}-leave`]:{animationTimingFunction:n.motionEaseInOutCirc}}]};export{h as i,c as z};

package/src/assets/web-panel/index.html

@@ -8,7 +8,7 @@
     // Injected by web-ui-server.js at serve time
     window.__CC_CONFIG__ = __CC_CONFIG_PLACEHOLDER__;
   </script>
-  <script type="module" crossorigin src="./assets/index-CCyB-RK5.js"></script>
+  <script type="module" crossorigin src="./assets/index-DvUlrMy-.js"></script>
   <link rel="modulepreload" crossorigin href="./assets/vendor-BvqAck49.js">
   <link rel="modulepreload" crossorigin href="./assets/icons-DP3uiYxy.js">
   <link rel="stylesheet" crossorigin href="./assets/index-Cq93VfoF.css">

package/src/commands/agent.js

@@ -10,7 +10,10 @@ import path from "node:path";
 import fs from "node:fs";
 import { createAgentRuntimeFactory } from "../runtime/runtime-factory.js";
 import { resolvePromptText } from "../runtime/system-prompt.js";
-import { makeFallbackChatFn } from "../runtime/fallback-model.js";
+import {
+  makeFallbackChatFn,
+  normalizeFallbackModels,
+} from "../runtime/fallback-model.js";
 import { resolveImages, resolveVisionLlm } from "../lib/image-input.js";
 import { loadConfig } from "../lib/config-manager.js";
 
@@ -56,6 +59,25 @@ export function resolveThinkingBudget(raw) {
   return Math.floor(n);
 }
 
+/**
+ * Resolve the ordered fallback-model chain for a run. The `--fallback-model`
+ * flag (repeatable / comma-separated → array) takes precedence; otherwise the
+ * configured `llm.fallbackModels` (array or comma string) or legacy
+ * `llm.fallbackModel` (single) seeds the chain so unattended runs need no flag.
+ * Pure; exported for tests. Normalization (trim / dedupe / cap-at-3) is applied.
+ *
+ * @param {string[]|string|undefined} flagValue  raw --fallback-model value
+ * @param {object} [llm]                          config.llm block
+ * @returns {string[]}
+ */
+export function resolveFallbackModels(flagValue, llm = {}) {
+  const fromFlag = normalizeFallbackModels(flagValue);
+  if (fromFlag.length) return fromFlag;
+  const configured =
+    llm && llm.fallbackModels != null ? llm.fallbackModels : llm?.fallbackModel;
+  return normalizeFallbackModels(configured);
+}
+
 /**
  * Read all of stdin as a UTF-8 string. Resolves "" immediately when stdin is a
  * TTY (nothing piped) so we never block an interactive invocation.
@@ -153,6 +175,10 @@ export function registerAgentCommand(program) {
     .option("--recall-limit <n>", "Top-K memories to inject into system prompt")
     .option("--recall-query <q>", "Query string for startup memory recall")
     .option("--no-recall-memory", "Disable startup memory recall")
+    .option(
+      "--vim",
+      "Start the interactive REPL in vim-mode line editing (toggle later with /vim; or CC_VIM=1)",
+    )
     .option("--no-stream", "Disable streamed response rendering")
     .option(
       "--no-park-on-exit",
@@ -212,7 +238,8 @@ export function registerAgentCommand(program) {
     )
     .option(
       "--fallback-model <model>",
-      "Retry once on this model when the primary fails (overload/network)",
+      "Backup model(s) to try in order when the primary fails (transient error or model-not-found). Repeatable or comma-separated; up to 3. Defaults to config llm.fallbackModels. claude-code parity.",
+      (val, prev) => (prev || []).concat([val]),
     )
     .option(
       "--include-partial-messages",
@@ -252,14 +279,18 @@ export function registerAgentCommand(program) {
       "Merge an extra .claude/settings.json-shaped file for this run: permission rules (allow/ask/deny) + native config overrides (model, env)",
     )
     .action(async (task, options, command) => {
-      // --safe-mode (Claude-Code 2.1.169 parity): flip every customization
-      // kill-switch BEFORE anything loads. Permission rules stay active.
-      if (options.safeMode) {
-        const { applySafeMode } = await import("../lib/safe-mode.js");
-        const applied = applySafeMode();
-        process.stderr.write(
-          `safe mode: customizations disabled (${applied.join(", ")}) — permission rules stay active.\n`,
-        );
+      // --safe-mode flag OR CC_SAFE_MODE / CLAUDE_CODE_SAFE_MODE env (Claude-Code
+      // 2.1.169 parity): flip every customization kill-switch BEFORE anything
+      // loads. Permission rules stay active.
+      {
+        const { applySafeMode, safeModeRequested } =
+          await import("../lib/safe-mode.js");
+        if (safeModeRequested(options)) {
+          const applied = applySafeMode();
+          process.stderr.write(
+            `safe mode: customizations disabled (${applied.join(", ")}) — permission rules stay active.\n`,
+          );
+        }
       }
       // --worktree (Claude-Code 2.1.171 parity): run THIS session in a fresh
       // git worktree — edits land on an isolated branch, the main working
@@ -268,9 +299,8 @@ export function registerAgentCommand(program) {
       let _worktree = null;
       if (options.worktree) {
         try {
-          const { setupAgentWorktree } = await import(
-            "../lib/agent-worktree.js"
-          );
+          const { setupAgentWorktree } =
+            await import("../lib/agent-worktree.js");
           _worktree = setupAgentWorktree({ cwd: process.cwd() });
           process.chdir(_worktree.path);
           process.stderr.write(
@@ -284,9 +314,8 @@ export function registerAgentCommand(program) {
       const _finishWorktree = async () => {
         if (!_worktree) return;
         try {
-          const { finishAgentWorktree } = await import(
-            "../lib/agent-worktree.js"
-          );
+          const { finishAgentWorktree } =
+            await import("../lib/agent-worktree.js");
           process.chdir(_worktree.repoRoot); // release the dir before removal
           const fin = finishAgentWorktree(_worktree);
           process.stderr.write(
@@ -301,9 +330,8 @@ export function registerAgentCommand(program) {
       // Claude-Code parity: auto-checkpoint defaults ON inside a git repo
       // (shadow-commit engine, zero working-tree touch); explicit
       // --checkpoint / --no-checkpoint always wins.
-      const { resolveAutoCheckpoint } = await import(
-        "../lib/auto-checkpoint-default.js"
-      );
+      const { resolveAutoCheckpoint } =
+        await import("../lib/auto-checkpoint-default.js");
       const autoCheckpoint = resolveAutoCheckpoint({
         flagValue: options.checkpoint,
         flagSource: command?.getOptionValueSource?.("checkpoint"),
@@ -485,16 +513,23 @@ export function registerAgentCommand(program) {
       // --think/--ultrathink and on adaptive models). undefined 鈫?engine default.
       const thinkingBudget = resolveThinkingBudget(options.thinkingBudget);
 
-      // --fallback-model: a chatFn that retries once on the backup model when
-      // the primary errors out (overload / rate-limit / network). Passed into
-      // the headless runners via options.chatFn (the agent loop's seam), so no
-      // runner changes are needed. Notice goes to stderr to keep stdout clean.
-      const fallbackChatFn = options.fallbackModel
+      // --fallback-model: an ordered chain of backup models tried in turn when
+      // the primary errors out (transient overload / rate-limit / network) or
+      // the primary model id is not found. The flag (repeatable / comma-list)
+      // wins; otherwise config llm.fallbackModels (or llm.fallbackModel) seeds
+      // the chain so unattended runs need no flag. Passed into the headless
+      // runners via options.chatFn (the agent loop's seam), so no runner
+      // changes are needed. Notice goes to stderr to keep stdout clean.
+      const fallbackModels = resolveFallbackModels(
+        options.fallbackModel,
+        loadConfig().llm || {},
+      );
+      const fallbackChatFn = fallbackModels.length
         ? makeFallbackChatFn({
-            fallbackModel: options.fallbackModel,
+            fallbackModels,
             onFallback: ({ from, to, error }) =>
               process.stderr.write(
-                `Note: model "${from}" failed (${error}); retrying with --fallback-model "${to}".\n`,
+                `Note: model "${from}" failed (${error}); retrying with fallback model "${to}".\n`,
               ),
           })
         : undefined;
@@ -719,6 +754,8 @@ export function registerAgentCommand(program) {
         bundlePath: options.bundle || null,
         additionalDirectories,
         autoCheckpoint,
+        // --vim: start the REPL in vim-mode editing (also CC_VIM=1 or /vim).
+        vimMode: options.vim === true,
         // --system-prompt / --append-system-prompt (literal or @file) also
         // apply to interactive sessions, composed in startAgentRepl.
         systemPrompt: resolvePromptText(options.systemPrompt, {
@@ -727,8 +764,9 @@ export function registerAgentCommand(program) {
         appendSystemPrompt: resolvePromptText(options.appendSystemPrompt, {
           cwd: process.cwd(),
         }),
-        // --fallback-model also applies interactively (wrapper built in the REPL)
-        fallbackModel: options.fallbackModel || null,
+        // --fallback-model also applies interactively (wrapper built in the
+        // REPL). Pass the fully resolved chain (flag + config default).
+        fallbackModels: fallbackModels.length ? fallbackModels : null,
         // --mcp-config + registered (cc mcp add) servers also apply to the
         // interactive session (the REPL resolves both via the mcp-config engine).
         mcpConfig: options.mcpConfig || null,

package/src/harness/mcp-client.js

@@ -91,12 +91,52 @@ export function isLikelyConnectionError(err) {
  * MCP Client — manages connections to MCP servers.
  */
 export class MCPClient extends EventEmitter {
-  constructor() {
+  /**
+   * @param {object} [options]
+   * @param {string|null} [options.sessionId] agent session id advertised to
+   *   spawned stdio MCP servers (CC_SESSION_ID / CLAUDE_CODE_SESSION_ID env).
+   */
+  constructor(options = {}) {
     super();
     this.servers = new Map(); // name → { process, state, tools, resources, config }
     this._nextId = 1;
     this._reconnectors = new Map(); // name → async () => config|null
     this._reconnecting = new Map(); // name → in-flight reconnect promise
+    this._sessionId =
+      options && options.sessionId != null ? String(options.sessionId) : null;
+  }
+
+  /**
+   * Set (or clear) the agent session id advertised to stdio MCP servers. Only
+   * servers connected *after* this call see the new value; already-spawned
+   * processes keep the env they were launched with.
+   * @param {string|null|undefined} id
+   */
+  setSessionId(id) {
+    this._sessionId = id != null && id !== "" ? String(id) : null;
+  }
+
+  /**
+   * Environment a spawned stdio MCP server inherits to identify the agent it
+   * runs under (Claude-Code 2.1.154 / 2.1.163 parity). `CLAUDECODE` (parity)
+   * and `CHAINLESSCHAIN` (native) mark "launched by the agent"; the session id —
+   * from the configured value or an ambient `CC_SESSION_ID` — lets a server
+   * correlate its work to the run. `CLAUDE_CODE_SESSION_ID` mirrors
+   * `CC_SESSION_ID` so servers written for Claude Code work unchanged.
+   * @returns {Record<string,string>}
+   */
+  _agentIdentityEnv() {
+    const env = { CLAUDECODE: "1", CHAINLESSCHAIN: "1" };
+    const sid =
+      this._sessionId ||
+      process.env.CC_SESSION_ID ||
+      process.env.CLAUDE_CODE_SESSION_ID ||
+      null;
+    if (sid) {
+      env.CC_SESSION_ID = String(sid);
+      env.CLAUDE_CODE_SESSION_ID = String(sid);
+    }
+    return env;
   }
 
   /**
@@ -159,7 +199,13 @@ export class MCPClient extends EventEmitter {
         }
         const proc = _deps.spawn(config.command, config.args || [], {
           stdio: ["pipe", "pipe", "pipe"],
-          env: { ...process.env, ...(config.env || {}) },
+          // process.env < agent identity (CLAUDECODE / session id) < the
+          // server's own config.env, so an explicit per-server override wins.
+          env: {
+            ...process.env,
+            ...this._agentIdentityEnv(),
+            ...(config.env || {}),
+          },
         });
 
         entry.process = proc;

package/src/lib/llm-pricing.js

@@ -35,6 +35,15 @@ export const PRICE_TABLE = Object.freeze({
     { match: "haiku", in: 1, out: 5 },
   ],
   openai: [
+    // GPT-5 family (2026). Matching is longest-pattern-first, so dated/variant
+    // ids (gpt-5.5, gpt-5.5-pro, gpt-5.5-instant, …) resolve to the most
+    // specific rate; bare "gpt-5" is the catch-all base rate.
+    { match: "gpt-5.5-pro", in: 30, out: 180 },
+    { match: "gpt-5.5", in: 5, out: 30 },
+    { match: "gpt-5.4", in: 2.5, out: 15 },
+    { match: "gpt-5-mini", in: 0.25, out: 2 },
+    { match: "gpt-5-nano", in: 0.05, out: 0.4 },
+    { match: "gpt-5", in: 1.25, out: 10 },
     { match: "gpt-4o-mini", in: 0.15, out: 0.6 },
     { match: "gpt-4o", in: 2.5, out: 10 },
     { match: "gpt-4-turbo", in: 10, out: 30 },

package/src/lib/permission-rules.cjs

@@ -14,6 +14,8 @@
  *   Edit(//etc/**)        → edit_file on an absolute path under /etc
  *   WebFetch(domain:example.com) → web_fetch of https://example.com/…
  *   Bash                  → every run_shell call
+ *   *                     → every tool call (Claude-Code deny-all idiom)
+ *   Bash(*)               → every run_shell call (lone-`*` pattern = match-all)
  *
  * Pure + self-contained (no glob dependency — `globToRegExp` is built in, the
  * repo avoids pulling minimatch/picomatch). Decision precedence is
@@ -75,6 +77,8 @@ const URL_TOOLS = new Set(["web_fetch"]);
 function toolMatches(ruleTool, actualTool) {
   const r = String(ruleTool || "").toLowerCase();
   const a = String(actualTool || "");
+  // Claude-Code `*` deny-all: a bare-`*` tool token matches every tool.
+  if (r === "*") return true;
   if (Object.prototype.hasOwnProperty.call(TOOL_GROUPS, r)) {
     return TOOL_GROUPS[r].includes(a);
   }
@@ -88,7 +92,8 @@ function toolMatches(ruleTool, actualTool) {
 function parseRule(rule) {
   const raw = String(rule || "").trim();
   if (!raw) return null;
-  const m = raw.match(/^([A-Za-z_][\w-]*)\s*(?:\(([\s\S]*)\))?$/);
+  // Tool token is an umbrella/CLI name OR a bare `*` (Claude-Code deny-all).
+  const m = raw.match(/^(\*|[A-Za-z_][\w-]*)\s*(?:\(([\s\S]*)\))?$/);
   if (!m) return null;
   const tool = m[1];
   const pattern = m[2] === undefined ? null : m[2].trim();
@@ -198,6 +203,11 @@ function matchUrl(pattern, url) {
  */
 function matchPattern(pattern, actualTool, args, cwd) {
   if (pattern === null) return true;
+  // A lone `*` / `**` pattern matches any target regardless of slashes — covers
+  // `Bash(*)`, `Read(**)`, `WebFetch(*)`, etc. Done before the glob path so a
+  // command/url/path containing `/` can't slip past a deny-all (globToRegExp's
+  // `*` → `[^/]*` otherwise excludes slashes).
+  if (pattern === "*" || pattern === "**") return true;
   const target = extractTarget(actualTool, args, cwd);
   if (target.kind === "command") {
     return target.value ? matchCommand(pattern, target.value) : false;

package/src/lib/personal-data-hub-wiring.js

@@ -54,6 +54,9 @@ const {
   LocalFilesAdapter,
   BilibiliAdapter,
   WeiboAdapter,
+  ZhihuAdapter,
+  BossZhipinAdapter,
+  CsdnAdapter,
   DouyinAdapter,
   XiaohongshuAdapter,
   ToutiaoAdapter,
@@ -68,7 +71,13 @@ const {
   QQPcAdapter,
   AppleHealthAdapter,
   NeteaseMusicAdapter,
+  KugouMusicAdapter,
+  IqiyiVideoAdapter,
+  TencentVideoAdapter,
   WeReadAdapter,
+  WpsDocAdapter,
+  TencentDocsAdapter,
+  BaiduNetdiskAdapter,
   DingTalkPcAdapter,
   FeishuPcAdapter,
   BaiduMapAdapter,
@@ -76,9 +85,12 @@ const {
   JdAdapter,
   MeituanAdapter,
   PinduoduoAdapter,
+  DianpingAdapter,
   Train12306Adapter,
   TaobaoAdapter,
   CtripAdapter,
+  TongchengAdapter,
+  DidiAdapter,
   AmapAdapter,
   TelegramAdapter,
   WhatsAppAdapter,
@@ -514,6 +526,9 @@ async function initHub() {
   // accurate.
   for (const Cls of [
     WeiboAdapter,
+    ZhihuAdapter,
+    BossZhipinAdapter,
+    CsdnAdapter,
     DouyinAdapter,
     XiaohongshuAdapter,
     ToutiaoAdapter,
@@ -528,7 +543,13 @@ async function initHub() {
     QQPcAdapter,
     AppleHealthAdapter,
     NeteaseMusicAdapter,
+    KugouMusicAdapter,
+    IqiyiVideoAdapter,
+    TencentVideoAdapter,
     WeReadAdapter,
+    WpsDocAdapter,
+    TencentDocsAdapter,
+    BaiduNetdiskAdapter,
     DingTalkPcAdapter,
     FeishuPcAdapter,
     BaiduMapAdapter,
@@ -536,9 +557,12 @@ async function initHub() {
     JdAdapter,
     MeituanAdapter,
     PinduoduoAdapter,
+    DianpingAdapter,
     Train12306Adapter,
     TaobaoAdapter,
     CtripAdapter,
+    TongchengAdapter,
+    DidiAdapter,
     AmapAdapter,
     TelegramAdapter,
     WhatsAppAdapter,

package/src/lib/repl-multiline.js

@@ -0,0 +1,64 @@
+/**
+ * Multiline REPL input via backslash continuation (Claude-Code multiline parity).
+ *
+ * Node's readline submits on every Enter, so a single prompt is one line. This
+ * pure helper lets the REPL accumulate a multi-line prompt: a physical line that
+ * ends with a continuation backslash keeps the prompt open and the next line is
+ * appended (joined with "\n"), so code blocks / multi-paragraph prompts can be
+ * entered without a turn firing per line.
+ *
+ * The rule is shell-like but Windows-path-safe: a trailing backslash continues
+ * the line ONLY when it is a lone `\` or the backslash run is preceded by
+ * whitespace, and the run length is odd (so `\\` stays a literal backslash).
+ * That keeps a stray path like `dir C:\` from being swallowed as a continuation.
+ *
+ *   analyzeContinuation("write a function \\") → { continued:true,  text:"write a function" }
+ *   analyzeContinuation("dir C:\\")            → { continued:false, text:"dir C:\\" }
+ *   analyzeContinuation("plain line")          → { continued:false, text:"plain line" }
+ *
+ * The REPL keeps an array of `text` pieces and `joinContinuation()` stitches the
+ * final submission.
+ */
+
+/** Count the run of backslashes at the very end of a string. */
+function trailingBackslashes(s) {
+  let n = 0;
+  for (let i = s.length - 1; i >= 0 && s[i] === "\\"; i--) n++;
+  return n;
+}
+
+/**
+ * Decide whether a physical input line continues onto the next one.
+ *
+ * @param {string} line  the raw line as readline delivered it
+ * @returns {{ continued:boolean, text:string }}
+ *   continued → drop the trailing backslash (+ the space before it) and wait for
+ *   more; not continued → the line stands as typed (text === line).
+ */
+export function analyzeContinuation(line) {
+  const s = typeof line === "string" ? line : "";
+  const n = trailingBackslashes(s);
+  if (n === 0 || n % 2 === 0) return { continued: false, text: s };
+  // Odd trailing backslashes: gate on what precedes the run so Windows paths
+  // (no preceding whitespace) are not treated as continuations.
+  const before = s[s.length - n - 1]; // undefined when the run is the whole line
+  const gated = before === undefined || /\s/.test(before);
+  if (!gated) return { continued: false, text: s };
+  // Strip exactly one trailing backslash, then trim the now-trailing whitespace
+  // so the join reads cleanly.
+  const text = s.slice(0, s.length - 1).replace(/\s+$/, "");
+  return { continued: true, text };
+}
+
+/**
+ * Stitch accumulated continuation pieces plus the final line into one prompt.
+ *
+ * @param {string[]} pieces  prior `text` values from continued lines
+ * @param {string} finalLine the line that ended the continuation (raw)
+ * @returns {string}
+ */
+export function joinContinuation(pieces, finalLine) {
+  const parts = Array.isArray(pieces) ? pieces.slice() : [];
+  parts.push(typeof finalLine === "string" ? finalLine : "");
+  return parts.join("\n");
+}

package/src/lib/repl-rewind.js

@@ -1,6 +1,8 @@
 /**
- * REPL conversation rewind — Claude-Code double-Esc parity (v1: conversation
- * state; file state stays on `cc checkpoint restore`, hinted alongside).
+ * REPL conversation rewind — Claude-Code double-Esc parity. Conversation state
+ * AND, when auto-checkpointing is on (git work tree), the file tree are rewound
+ * together — matching Claude Code's rewind, which restores code + conversation
+ * in one step instead of leaving files on a separate `cc checkpoint restore`.
  *
  * Pure helpers over the REPL's live `messages` array so the picker logic is
  * unit-testable without readline:
@@ -8,9 +10,19 @@
  *  - rewindToTurn(): truncate the conversation BACK TO BEFORE turn #n and
  *    return the original text so the caller can prefill the input line
  *    (edit-and-resend, like Claude Code's rewind).
+ *  - pickCheckpointForTurn(): map a rewound turn to the file checkpoint that
+ *    captured the work tree just before that turn first mutated it.
+ *  - pruneMarksAfter(): drop checkpoint marks for the turns that were dropped.
  *
  * Trigger surfaces (wired in agent-repl): `/rewind` lists, `/rewind <n>`
  * rewinds, and a double-Esc while idle prints the same list as a shortcut.
+ *
+ * Checkpoint marks: the REPL records `{ atMessageCount, id, tool }` for every
+ * `checkpoint` event the agent loop emits — `atMessageCount` is `messages.length`
+ * at the instant the snapshot was taken (always just AFTER the turn's user
+ * message was appended, so it is strictly greater than that turn's message
+ * index, and not-greater than any later turn's). That ordering is what lets a
+ * turn be matched to its pre-mutation snapshot purely from the count.
  */
 
 export const DEFAULT_LIST_LIMIT = 10;
@@ -64,10 +76,61 @@ export function rewindToTurn(messages, n) {
   messages.splice(turn.index);
   return {
     removed,
+    index: turn.index,
     text: typeof turn.content === "string" ? turn.content : null,
   };
 }
 
+/**
+ * Map a rewound turn to the checkpoint that captured the work tree right BEFORE
+ * that turn first changed a file.
+ *
+ * A turn's auto-checkpoints are all taken with `atMessageCount` strictly greater
+ * than the turn's message index (the user message is appended first), while the
+ * previous turn's checkpoints have `atMessageCount <= turnIndex`. So the snapshot
+ * representing "state before turn N" is the one with the SMALLEST atMessageCount
+ * still greater than turnIndex.
+ *
+ * @param {Array<{atMessageCount:number,id:string,tool?:string}>} marks
+ * @param {number} turnIndex  message index returned by rewindToTurn
+ * @returns {{atMessageCount:number,id:string,tool?:string}|null}
+ */
+export function pickCheckpointForTurn(marks, turnIndex) {
+  if (!Array.isArray(marks) || marks.length === 0) return null;
+  const idx = Number(turnIndex);
+  if (!Number.isFinite(idx)) return null;
+  let best = null;
+  for (const m of marks) {
+    if (!m || typeof m.id !== "string") continue;
+    const c = Number(m.atMessageCount);
+    if (!Number.isFinite(c) || c <= idx) continue;
+    if (best === null || c < Number(best.atMessageCount)) best = m;
+  }
+  return best;
+}
+
+/**
+ * Drop checkpoint marks belonging to turns that were just rewound away (those
+ * with `atMessageCount` greater than the surviving message count). Mutates the
+ * array in place so the REPL's `const` marks array keeps its identity.
+ *
+ * @returns {number} how many marks were removed
+ */
+export function pruneMarksAfter(marks, turnIndex) {
+  if (!Array.isArray(marks)) return 0;
+  const idx = Number(turnIndex);
+  if (!Number.isFinite(idx)) return 0;
+  let removed = 0;
+  for (let i = marks.length - 1; i >= 0; i--) {
+    const c = Number(marks[i]?.atMessageCount);
+    if (!Number.isFinite(c) || c > idx) {
+      marks.splice(i, 1);
+      removed += 1;
+    }
+  }
+  return removed;
+}
+
 /**
  * Offline extractive recap for a resumed conversation ("where were we") —
  * no LLM call: turn counts + last ask + last reply previews.