@heyditto/cli 2.17.0 → 2.19.0

package/README.md

@@ -410,7 +410,8 @@ heyditto codex --yellow                        # Codex, auto-accept edits
 heyditto claude --yolo --worktree fix-login    # bypass prompts in <repo>/.worktrees/fix-login
 heyditto codex -p "summarize this repo" --json # headless (codex exec)
 heyditto claude -p "list TODOs" --output-format json --max-turns 3
-heyditto claude --resume                       # reopen the last session in the same thread
+heyditto claude --resume                       # pick a session (type words to search every project)
+heyditto claude --resume "Fix login bug"       # resume by title, as `claude --resume` prints it
 heyditto claude -- --verbose                   # anything after -- goes to the agent
 ```
 
@@ -422,7 +423,7 @@ Options shared by both commands:
 | `--budget <tokens>` | spend cap for this session's key, in Ditto tokens |
 | `--expires <1h…never>` | server-side key expiry; the key is still revoked on exit unless `--keep-key` |
 | `--session <id>` | reuse a Ditto session id so traces land in an existing thread |
-| `--resume [id]` / `-c, --continue` | resume a local session (`heyditto sessions`) / the agent's most recent conversation |
+| `--resume [id]` / `-c, --continue` | resume a local session (`heyditto sessions`) / the agent's most recent conversation. Claude also takes a Claude session id or title here, including sessions started in Claude Desktop or plain `claude`, and runs in the directory that session ran in; with no value, a terminal gets a searchable picker. Claude's own `-r` / `--resume` / `-c` after `--` do the same. |
 | `--yolo` / `--yellow` / `--plan` | bypass permissions / auto-accept edits / plan mode (Claude only) |
 | `-p, --prompt <text>` | headless run: `claude -p` or `codex exec` |
 | `-m, --model <id>` | model to request (default: the agent's own model id passes through and the endpoint routes it) |

package/dist/agents/claude-resume.d.ts

@@ -0,0 +1,32 @@
+import { type ClaudeTranscript } from "./claude-transcripts.js";
+import { type SessionRecord } from "./sessions.js";
+/**
+ * What `heyditto claude --resume [value]` reopens: the Claude conversation to
+ * resume (if it has one) and the Ditto record whose thread it continues (if it
+ * was launched through Ditto before).
+ */
+export interface ClaudeResumeTarget {
+    record?: SessionRecord;
+    /** Undefined when the session never recorded a conversation (nothing was sent). */
+    transcript?: ClaudeTranscript;
+}
+export interface ResolveOptions {
+    cwd: string;
+    interactive: boolean;
+    log: (message: string) => void;
+}
+/** The directory `claude --resume` must run in to find a transcript, when it still exists. */
+export declare function transcriptCwd(t: ClaudeTranscript): Promise<string | undefined>;
+/**
+ * Numbered picker over Claude Code sessions. A number picks, Enter picks the
+ * first, and anything else is a search across every project (Claude Desktop
+ * sessions included), so "I remember what it was about" is enough to find one.
+ */
+export declare function pickTranscript(initial: ClaudeTranscript[], heading: string, cwd: string): Promise<ClaudeTranscript>;
+/**
+ * Resolves `--resume [value]` for Claude Code. A value may be a Ditto session
+ * id, a Claude session id, or a title / words from one (what `claude --resume`
+ * prints for a renamed session). With no value an interactive terminal gets a
+ * picker; a script gets the most recent session, as before.
+ */
+export declare function resolveClaudeResume(value: string | true, opts: ResolveOptions): Promise<ClaudeResumeTarget>;

package/dist/agents/claude-resume.js

@@ -0,0 +1,152 @@
+import { stat } from "node:fs/promises";
+import os from "node:os";
+import { createInterface } from "node:readline/promises";
+import { canonicalCwd } from "../teleport/harness.js";
+import { err as c } from "../ui.js";
+import { entrypointLabel, findTranscriptById, listAllTranscripts, listTranscriptsIn, relativeTime, searchTranscripts, } from "./claude-transcripts.js";
+import { latestSession, listSessions, readSession, sessionForHarnessId } from "./sessions.js";
+const PAGE = 10;
+async function isDirectory(dir) {
+    try {
+        return (await stat(dir)).isDirectory();
+    }
+    catch {
+        return false;
+    }
+}
+/** The directory `claude --resume` must run in to find a transcript, when it still exists. */
+export async function transcriptCwd(t) {
+    return t.cwd && (await isDirectory(t.cwd)) ? t.cwd : undefined;
+}
+function tildify(dir) {
+    const home = os.homedir();
+    return dir === home || dir.startsWith(`${home}/`) ? `~${dir.slice(home.length)}` : dir;
+}
+function clip(text, width) {
+    const flat = text.replace(/\s+/g, " ").trim();
+    return flat.length > width ? `${flat.slice(0, Math.max(1, width - 1))}…` : flat;
+}
+function describe(t) {
+    return t.title ?? (t.lastPrompt ? clip(t.lastPrompt, 60) : "(untitled)");
+}
+function printChoices(list, here, viaDitto) {
+    const width = Math.max(40, (process.stderr.columns ?? 100) - 8);
+    list.slice(0, PAGE).forEach((t, i) => {
+        const meta = [
+            relativeTime(t.modifiedAt),
+            entrypointLabel(t.entrypoint),
+            t.gitBranch,
+            viaDitto.has(t.id) ? "via Ditto" : undefined,
+        ].filter(Boolean).join(" · ");
+        process.stderr.write(`  ${c("cyan", `${String(i + 1).padStart(2)})`)} ${c("bold", clip(describe(t), width - meta.length - 3))}  ${c("dim", meta)}\n`);
+        const where = t.cwd && t.cwd !== here ? `${tildify(t.cwd)}  ` : "";
+        const prompt = t.title && t.lastPrompt ? `› ${t.lastPrompt}` : "";
+        const detail = `${where}${prompt}`.trim();
+        if (detail)
+            process.stderr.write(`      ${c("dim", clip(detail, width))}\n`);
+    });
+    if (list.length > PAGE)
+        process.stderr.write(c("dim", `      …and ${list.length - PAGE} more; type words to narrow\n`));
+}
+/**
+ * Numbered picker over Claude Code sessions. A number picks, Enter picks the
+ * first, and anything else is a search across every project (Claude Desktop
+ * sessions included), so "I remember what it was about" is enough to find one.
+ */
+export async function pickTranscript(initial, heading, cwd) {
+    const here = canonicalCwd(cwd);
+    const viaDitto = new Set((await listSessions()).map((s) => s.harnessSessionId).filter((id) => Boolean(id)));
+    let all;
+    let list = initial;
+    process.stderr.write(`${c("bold", heading)}\n\n`);
+    if (list.length === 0) {
+        all = await listAllTranscripts();
+        list = all;
+        process.stderr.write(`  ${c("dim", "none here yet — newest from every project:")}\n`);
+    }
+    printChoices(list, here, viaDitto);
+    const rl = createInterface({ input: process.stdin, output: process.stderr });
+    try {
+        for (;;) {
+            const range = list.length ? `a number 1-${Math.min(list.length, PAGE)}, ` : "";
+            const answer = (await rl.question(`\nResume which? [${range}words to search, Enter = 1, q = cancel] `)).trim();
+            if (answer === "q" || answer === "quit")
+                throw new Error("no session picked");
+            if (answer === "" && list.length)
+                return list[0];
+            const idx = Number(answer);
+            if (Number.isInteger(idx) && idx >= 1 && idx <= Math.min(list.length, PAGE))
+                return list[idx - 1];
+            all ??= await listAllTranscripts();
+            const hits = searchTranscripts(all, answer, cwd);
+            if (hits.length === 0) {
+                // Keep the list on screen so the numbers still mean what they did.
+                process.stderr.write(`  ${c("yellow", `no session matches "${answer}"`)} ${c("dim", "— try other words, or pick from the list above")}\n`);
+                continue;
+            }
+            list = hits;
+            process.stderr.write(`\n${c("bold", `Sessions matching "${answer}":`)}\n\n`);
+            printChoices(list, here, viaDitto);
+        }
+    }
+    finally {
+        rl.close();
+    }
+}
+function listForError(matches) {
+    return matches
+        .slice(0, 5)
+        .map((t) => `  ${t.id}  ${describe(t)}${t.cwd ? `  (${tildify(t.cwd)})` : ""}`)
+        .join("\n");
+}
+async function withRecord(transcript) {
+    return { transcript, record: await sessionForHarnessId("claude", transcript.id) };
+}
+/**
+ * Resolves `--resume [value]` for Claude Code. A value may be a Ditto session
+ * id, a Claude session id, or a title / words from one (what `claude --resume`
+ * prints for a renamed session). With no value an interactive terminal gets a
+ * picker; a script gets the most recent session, as before.
+ */
+export async function resolveClaudeResume(value, opts) {
+    if (value === true) {
+        if (opts.interactive) {
+            const here = await listTranscriptsIn(opts.cwd);
+            return withRecord(await pickTranscript(here, `Claude Code sessions in ${tildify(canonicalCwd(opts.cwd))} (newest first):`, opts.cwd));
+        }
+        // The most recent conversation: the newest transcript here, or the last
+        // Ditto launch's (it may have run in a worktree) if that one is newer. A
+        // launch that never sent anything only wins when there is nothing else.
+        const [newest] = await listTranscriptsIn(opts.cwd);
+        const record = await latestSession("claude", opts.cwd);
+        const recorded = record ? await findTranscriptById(record.harnessSessionId ?? record.id, record.worktree ?? record.cwd) : undefined;
+        if (record && recorded && (!newest || recorded.modifiedAt >= newest.modifiedAt))
+            return { record, transcript: recorded };
+        if (newest)
+            return withRecord(newest);
+        if (record)
+            return { record };
+        throw new Error("no previous claude session to resume here; see `heyditto sessions`");
+    }
+    const wanted = value.trim();
+    const record = (await readSession(wanted)) ?? (await sessionForHarnessId("claude", wanted));
+    if (record) {
+        if (record.harness !== "claude")
+            return { record };
+        return { record, transcript: await findTranscriptById(record.harnessSessionId ?? record.id, record.cwd) };
+    }
+    const byId = await findTranscriptById(wanted, opts.cwd);
+    if (byId)
+        return withRecord(byId);
+    const matches = searchTranscripts(await listAllTranscripts(), wanted, opts.cwd);
+    if (matches.length === 1)
+        return withRecord(matches[0]);
+    if (matches.length === 0) {
+        throw new Error(`no Claude Code session matches "${wanted}" (searched Ditto session ids, Claude session ids and titles).\n` +
+            "Run `heyditto claude --resume` with no value to pick from a list.");
+    }
+    if (opts.interactive)
+        return withRecord(await pickTranscript(matches, `Sessions matching "${wanted}":`, opts.cwd));
+    throw new Error(`"${wanted}" matches ${matches.length} sessions; pass one id:\n${listForError(matches)}`);
+}
+//# sourceMappingURL=claude-resume.js.map

package/dist/agents/claude-resume.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"claude-resume.js","sourceRoot":"","sources":["../../src/agents/claude-resume.ts"],"names":[],"mappings":"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"}

package/dist/agents/claude-transcripts.d.ts

@@ -0,0 +1,52 @@
+/**
+ * Claude Code's own session store (`~/.claude/projects/<cwd slug>/<id>.jsonl`),
+ * read so `heyditto claude --resume` can find a conversation the way `claude
+ * --resume` does: by session id, by title, or from a picker. Sessions started
+ * in Claude Desktop live in the same store, so they resume here too.
+ *
+ * Transcripts can be tens of megabytes; only the head and tail are read. Claude
+ * re-appends its title and last-prompt lines as the session goes, so the tail
+ * carries the current ones.
+ */
+/** Metadata of one Claude Code transcript. */
+export interface ClaudeTranscript {
+    /** Claude's session id (the file name). */
+    id: string;
+    file: string;
+    /** Directory the session ran in, when the transcript records it. */
+    cwd?: string;
+    /** `/rename` title, else the title Claude generated. */
+    title?: string;
+    lastPrompt?: string;
+    /** The opening prompt, when it falls in the part of the file that is read. */
+    firstPrompt?: string;
+    /** "cli", "claude-desktop", "sdk-ts", … */
+    entrypoint?: string;
+    gitBranch?: string;
+    modifiedAt: Date;
+}
+export declare function claudeHome(): string;
+/** The project directory Claude Code keys sessions started in `cwd` under. */
+export declare function claudeProjectDir(cwd: string): string;
+export declare function isUuid(value: string): boolean;
+/** Reads one transcript's metadata; undefined when it has no conversation in it. */
+export declare function readTranscript(file: string): Promise<ClaudeTranscript | undefined>;
+/** Conversations started in `cwd`, newest first. */
+export declare function listTranscriptsIn(cwd: string): Promise<ClaudeTranscript[]>;
+/** Every conversation Claude Code has on this machine, newest first. */
+export declare function listAllTranscripts(): Promise<ClaudeTranscript[]>;
+/**
+ * A transcript by Claude session id, looked up in `cwd`'s project first and
+ * then in every project (a session moved between worktrees keeps its id).
+ */
+export declare function findTranscriptById(id: string, cwd?: string): Promise<ClaudeTranscript | undefined>;
+/**
+ * Transcripts matching a free-text query. An exact (case-insensitive) title
+ * match wins outright, as `claude --resume "<title>"` does; otherwise every
+ * word must appear in the title, first or last prompt, directory, branch or
+ * id. Title hits come first, and within each group ones from `cwd` lead.
+ */
+export declare function searchTranscripts(all: ClaudeTranscript[], query: string, cwd?: string): ClaudeTranscript[];
+/** "3m ago", "5h ago", "2d ago", or a date for anything older than a month. */
+export declare function relativeTime(date: Date, now?: number): string;
+export declare function entrypointLabel(entrypoint: string | undefined): string | undefined;

package/dist/agents/claude-transcripts.js

@@ -0,0 +1,237 @@
+import { open, readFile, readdir, stat } from "node:fs/promises";
+import os from "node:os";
+import path from "node:path";
+import { canonicalCwd } from "../teleport/harness.js";
+import { cwdSlug } from "../teleport/types.js";
+const HEAD_BYTES = 64 * 1024;
+const TAIL_BYTES = 256 * 1024;
+const UUID = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
+export function claudeHome() {
+    return process.env.CLAUDE_CONFIG_DIR?.trim() || path.join(os.homedir(), ".claude");
+}
+function projectsDir() {
+    return path.join(claudeHome(), "projects");
+}
+/** The project directory Claude Code keys sessions started in `cwd` under. */
+export function claudeProjectDir(cwd) {
+    return path.join(projectsDir(), cwdSlug(canonicalCwd(cwd)));
+}
+export function isUuid(value) {
+    return UUID.test(value);
+}
+async function readSlice(file, size) {
+    const handle = await open(file, "r");
+    try {
+        const headLen = Math.min(size, HEAD_BYTES);
+        const head = Buffer.alloc(headLen);
+        await handle.read(head, 0, headLen, 0);
+        if (size <= HEAD_BYTES)
+            return { head: head.toString("utf8"), tail: "" };
+        const tailLen = Math.min(size - headLen, TAIL_BYTES);
+        const tail = Buffer.alloc(tailLen);
+        await handle.read(tail, 0, tailLen, size - tailLen);
+        return { head: head.toString("utf8"), tail: tail.toString("utf8") };
+    }
+    finally {
+        await handle.close();
+    }
+}
+function jsonLines(text) {
+    const out = [];
+    for (const line of text.split("\n")) {
+        if (!line.startsWith("{"))
+            continue;
+        try {
+            out.push(JSON.parse(line));
+        }
+        catch {
+            /* a line cut by the head/tail window */
+        }
+    }
+    return out;
+}
+/** Text the user typed in a transcript `user` message; injected context (`<system-reminder>`, tool results) is skipped. */
+function promptText(message) {
+    const content = message?.content;
+    const parts = typeof content === "string" ? [content] : Array.isArray(content)
+        ? content.map((p) => (p.type === "text" ? p.text : undefined))
+        : [];
+    for (const part of parts) {
+        if (typeof part !== "string")
+            continue;
+        const text = part.trim();
+        if (text && !text.startsWith("<"))
+            return text.slice(0, 500);
+    }
+    return undefined;
+}
+const str = (v) => (typeof v === "string" && v.trim() ? v.trim() : undefined);
+/** Reads one transcript's metadata; undefined when it has no conversation in it. */
+export async function readTranscript(file) {
+    let info;
+    try {
+        info = await stat(file);
+    }
+    catch {
+        return undefined;
+    }
+    if (!info.isFile())
+        return undefined;
+    const id = path.basename(file, ".jsonl");
+    const { head, tail } = await readSlice(file, info.size);
+    const lines = [...jsonLines(head), ...jsonLines(tail)];
+    let customTitle;
+    let aiTitle;
+    let lastPrompt;
+    let firstPrompt;
+    let cwd;
+    let entrypoint;
+    let gitBranch;
+    let spoke = false;
+    for (const l of lines) {
+        if (l.type === "custom-title")
+            customTitle = str(l.customTitle) ?? customTitle;
+        else if (l.type === "ai-title")
+            aiTitle = str(l.aiTitle) ?? aiTitle;
+        else if (l.type === "last-prompt")
+            lastPrompt = str(l.lastPrompt) ?? lastPrompt;
+        else if (l.type === "user" || l.type === "assistant") {
+            spoke = true;
+            if (l.type === "user" && !firstPrompt)
+                firstPrompt = promptText(l.message);
+        }
+        cwd ??= str(l.cwd);
+        entrypoint ??= str(l.entrypoint);
+        gitBranch = str(l.gitBranch) ?? gitBranch;
+    }
+    // Newer Claude builds also keep the /rename title beside the transcript.
+    try {
+        const sidecar = JSON.parse(await readFile(path.join(path.dirname(file), id, "custom-title.json"), "utf8"));
+        customTitle = str(sidecar.customTitle) ?? customTitle;
+    }
+    catch {
+        /* no sidecar */
+    }
+    if (!spoke && !lastPrompt)
+        return undefined;
+    return {
+        id,
+        file,
+        cwd,
+        title: customTitle ?? aiTitle,
+        lastPrompt,
+        firstPrompt,
+        entrypoint,
+        gitBranch,
+        modifiedAt: info.mtime,
+    };
+}
+async function jsonlFiles(dir) {
+    try {
+        return (await readdir(dir)).filter((n) => n.endsWith(".jsonl")).map((n) => path.join(dir, n));
+    }
+    catch {
+        return [];
+    }
+}
+async function projectDirs() {
+    try {
+        const entries = await readdir(projectsDir(), { withFileTypes: true });
+        return entries.filter((e) => e.isDirectory()).map((e) => path.join(projectsDir(), e.name));
+    }
+    catch {
+        return [];
+    }
+}
+/** Newest-first sort, keeping files whose metadata could not be read out. */
+async function readAll(files) {
+    // Most-recent files first so a caller that only shows the top of the list
+    // does not wait on years of history.
+    const withTimes = await Promise.all(files.map(async (f) => ({ f, t: await stat(f).then((s) => s.mtimeMs, () => 0) })));
+    withTimes.sort((a, b) => b.t - a.t);
+    const out = [];
+    for (const { f } of withTimes) {
+        const t = await readTranscript(f);
+        if (t)
+            out.push(t);
+    }
+    return out;
+}
+/** Conversations started in `cwd`, newest first. */
+export async function listTranscriptsIn(cwd) {
+    return readAll(await jsonlFiles(claudeProjectDir(cwd)));
+}
+/** Every conversation Claude Code has on this machine, newest first. */
+export async function listAllTranscripts() {
+    const files = (await Promise.all((await projectDirs()).map(jsonlFiles))).flat();
+    return readAll(files);
+}
+/**
+ * A transcript by Claude session id, looked up in `cwd`'s project first and
+ * then in every project (a session moved between worktrees keeps its id).
+ */
+export async function findTranscriptById(id, cwd) {
+    if (!isUuid(id))
+        return undefined;
+    if (cwd) {
+        const here = await readTranscript(path.join(claudeProjectDir(cwd), `${id}.jsonl`));
+        if (here)
+            return here;
+    }
+    for (const dir of await projectDirs()) {
+        const t = await readTranscript(path.join(dir, `${id}.jsonl`));
+        if (t)
+            return t;
+    }
+    return undefined;
+}
+function norm(s) {
+    return (s ?? "").toLowerCase().replace(/\s+/g, " ").trim();
+}
+/**
+ * Transcripts matching a free-text query. An exact (case-insensitive) title
+ * match wins outright, as `claude --resume "<title>"` does; otherwise every
+ * word must appear in the title, first or last prompt, directory, branch or
+ * id. Title hits come first, and within each group ones from `cwd` lead.
+ */
+export function searchTranscripts(all, query, cwd) {
+    const q = norm(query);
+    if (!q)
+        return all;
+    const here = cwd ? canonicalCwd(cwd) : undefined;
+    const byHere = (list) => [...list].sort((a, b) => Number(b.cwd === here) - Number(a.cwd === here));
+    const exact = all.filter((t) => norm(t.title) === q);
+    if (exact.length)
+        return byHere(exact);
+    const words = q.split(" ");
+    const has = (text) => {
+        const hay = norm(text);
+        return words.every((w) => hay.includes(w));
+    };
+    const inTitle = all.filter((t) => has(t.title));
+    const elsewhere = all.filter((t) => !has(t.title) && has([t.title, t.lastPrompt, t.firstPrompt, t.cwd, t.gitBranch, t.id].filter(Boolean).join(" ")));
+    return [...byHere(inTitle), ...byHere(elsewhere)];
+}
+/** "3m ago", "5h ago", "2d ago", or a date for anything older than a month. */
+export function relativeTime(date, now = Date.now()) {
+    const s = Math.max(0, Math.round((now - date.getTime()) / 1000));
+    if (s < 60)
+        return "just now";
+    if (s < 3600)
+        return `${Math.floor(s / 60)}m ago`;
+    if (s < 86400)
+        return `${Math.floor(s / 3600)}h ago`;
+    if (s < 30 * 86400)
+        return `${Math.floor(s / 86400)}d ago`;
+    return date.toISOString().slice(0, 10);
+}
+export function entrypointLabel(entrypoint) {
+    if (entrypoint === "claude-desktop")
+        return "Claude Desktop";
+    if (entrypoint === "cli")
+        return "CLI";
+    if (entrypoint?.startsWith("sdk"))
+        return "SDK";
+    return entrypoint;
+}
+//# sourceMappingURL=claude-transcripts.js.map

package/dist/agents/claude-transcripts.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"claude-transcripts.js","sourceRoot":"","sources":["../../src/agents/claude-transcripts.ts"],"names":[],"mappings":"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"}

package/dist/agents/claude.d.ts

@@ -9,3 +9,14 @@ import { type HarnessPlan, type PlanInput } from "./types.js";
  * prompt or add a stray x-api-key header.
  */
 export declare function planClaude(input: PlanInput): HarnessPlan;
+/**
+ * Claude's own resume flags typed after `--` (`heyditto claude -- -r`). Passed
+ * through they collide with the `--session-id` every launch sets ("--session-id
+ * can only be used with --continue or --resume if --fork-session is also
+ * specified"), so they are lifted out and handled as `--resume` / `--continue`.
+ */
+export declare function liftResumeFlags(args: string[]): {
+    args: string[];
+    resume?: string | true;
+    continue?: boolean;
+};

package/dist/agents/claude.js

@@ -16,11 +16,15 @@ export function planClaude(input) {
         args.push("--permission-mode", "acceptEdits");
     else if (input.plan)
         args.push("--permission-mode", "plan");
+    // A session id of our own is only for a brand-new conversation; Claude
+    // rejects it next to its other ways of picking one (--from-pr, a forwarded
+    // --session-id).
+    const picksOwn = input.passthrough.some((a) => a === "--from-pr" || a.startsWith("--from-pr=") || a === "--session-id" || a.startsWith("--session-id="));
     if (input.resumeId)
         args.push("--resume", input.resumeId);
     else if (input.resumeLast)
         args.push("--continue");
-    else
+    else if (!picksOwn)
         args.push("--session-id", input.sessionId);
     if (input.model)
         args.push("--model", input.model);
@@ -45,4 +49,34 @@ export function planClaude(input) {
         installHint: "install Claude Code: npm i -g @anthropic-ai/claude-code (or see https://code.claude.com)",
     };
 }
+/**
+ * Claude's own resume flags typed after `--` (`heyditto claude -- -r`). Passed
+ * through they collide with the `--session-id` every launch sets ("--session-id
+ * can only be used with --continue or --resume if --fork-session is also
+ * specified"), so they are lifted out and handled as `--resume` / `--continue`.
+ */
+export function liftResumeFlags(args) {
+    const out = [];
+    let resume;
+    let cont = false;
+    for (let i = 0; i < args.length; i += 1) {
+        const a = args[i];
+        if (a === "-r" || a === "--resume") {
+            const next = args[i + 1];
+            if (next !== undefined && !next.startsWith("-")) {
+                resume = next;
+                i += 1;
+            }
+            else
+                resume = true;
+        }
+        else if (a.startsWith("--resume="))
+            resume = a.slice("--resume=".length) || true;
+        else if (a === "-c" || a === "--continue")
+            cont = true;
+        else
+            out.push(a);
+    }
+    return { args: out, ...(resume !== undefined ? { resume } : {}), ...(cont ? { continue: true } : {}) };
+}
 //# sourceMappingURL=claude.js.map

package/dist/agents/claude.js.map

@@ -1 +1 @@
-{"version":3,"file":"claude.js","sourceRoot":"","sources":["../../src/agents/claude.ts"],"names":[],"mappings":"AAAA,OAAO,EAAoC,cAAc,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAEzF;;;;;;;;GAQG;AACH,MAAM,UAAU,UAAU,CAAC,KAAgB;IACzC,MAAM,IAAI,GAAa,EAAE,CAAC;IAC1B,IAAI,KAAK,CAAC,IAAI;QAAE,IAAI,CAAC,IAAI,CAAC,gCAAgC,CAAC,CAAC;SACvD,IAAI,KAAK,CAAC,MAAM;QAAE,IAAI,CAAC,IAAI,CAAC,mBAAmB,EAAE,aAAa,CAAC,CAAC;SAChE,IAAI,KAAK,CAAC,IAAI;QAAE,IAAI,CAAC,IAAI,CAAC,mBAAmB,EAAE,MAAM,CAAC,CAAC;IAE5D,IAAI,KAAK,CAAC,QAAQ;QAAE,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,KAAK,CAAC,QAAQ,CAAC,CAAC;SACrD,IAAI,KAAK,CAAC,UAAU;QAAE,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;;QAC9C,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,KAAK,CAAC,SAAS,CAAC,CAAC;IAEhD,IAAI,KAAK,CAAC,KAAK;QAAE,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC;IACnD,IAAI,KAAK,CAAC,MAAM,KAAK,SAAS;QAAE,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;IAC9D,IAAI,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC,WAAW,CAAC,CAAC;IAEhC,MAAM,OAAO,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,wBAAwB,EAAE,IAAI,EAAE,EAAE,GAAG,cAAc,KAAK,KAAK,CAAC,SAAS,EAAE,CAAC;SAClG,MAAM,CAAC,CAAC,CAAC,EAAe,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;SACtC,IAAI,CAAC,IAAI,CAAC,CAAC;IAEd,MAAM,MAAM,GAA2B;QACrC,kBAAkB,EAAE,SAAS,CAAC,KAAK,CAAC,OAAO,CAAC;QAC5C,oBAAoB,EAAE,KAAK,CAAC,MAAM;QAClC,wBAAwB,EAAE,OAAO;KAClC,CAAC;IACF,IAAI,KAAK,CAAC,KAAK;QAAE,MAAM,CAAC,eAAe,GAAG,KAAK,CAAC,KAAK,CAAC;IAEtD,OAAO;QACL,OAAO,EAAE,QAAQ;QACjB,IAAI;QACJ,MAAM;QACN,QAAQ,EAAE,CAAC,mBAAmB,CAAC;QAC/B,WAAW,EAAE,0FAA0F;KACxG,CAAC;AACJ,CAAC"}
+{"version":3,"file":"claude.js","sourceRoot":"","sources":["../../src/agents/claude.ts"],"names":[],"mappings":"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"}