@cjhyy/code-shell-core 0.6.0-rc.9 → 0.7.0

package/dist/tool-system/builtin/drive-claude-code.js

@@ -2,7 +2,14 @@ import { runAgentOnce } from "../../cc-orchestrator/external-agent-driver.js";
 import { claudeAdapter, codexAdapter } from "../../cc-orchestrator/agent-adapter.js";
 import { backgroundJobRegistry } from "./background-jobs.js";
 import { readExternalChangedFiles } from "../../cc-orchestrator/external-agent-changes.js";
+import { isExistingDirectory, normalizeCwdPath } from "../../cc-orchestrator/cwd-normalize.js";
 import { notificationQueue } from "./agent-notifications.js";
+import { existsSync, realpathSync, statSync } from "node:fs";
+import { extname, isAbsolute, relative, resolve, sep } from "node:path";
+import { externalAgentSessionStore, } from "../../cc-orchestrator/external-agent-session-store.js";
+import { logger } from "../../logging/logger.js";
+export const DRIVE_AGENT_FOREGROUND_HANDOFF_MS = 110_000;
+export const DRIVE_AGENT_TOOL_TIMEOUT_MS = 1_800_000;
 const CLI_ADAPTERS = {
     claude: { adapter: claudeAdapter, command: "claude" },
     codex: { adapter: codexAdapter, command: "codex" },
@@ -15,7 +22,11 @@ export const driveAgentToolDef = {
         "Runs in the BACKGROUND by default — these tasks are typically long (minutes to hours), so this " +
         "returns immediately and the result is delivered to you later via a completion notification " +
         "that wakes you. Do NOT sleep-poll for it; just continue or end your turn — you'll be woken " +
-        "with the result. For a quick task where you want the answer inline, pass background:false. " +
+        "with the result. " +
+        "Before launching writable work in a cwd, call DriveAgentJobs(action:'list', cwd) to see any " +
+        "already-running DriveAgent jobs there, their prompt summaries, owner sessions, CLI kind, and " +
+        "known changed files; use DriveAgentJobs(action:'cancel', jobId) if you must stop one. " +
+        "For a quick task where you want the answer inline, pass background:false. " +
         "It has NO time concept of its own: for 'in N minutes' / 'every N' / looping, use CronCreate " +
         "instead (never sleep). A scheduled CronCreate job runs one codeshell turn whose prompt can " +
         "instruct it to call DriveAgent; to continue a prior session across runs, have that turn pass " +
@@ -35,32 +46,380 @@ export const driveAgentToolDef = {
     inputSchema: {
         type: "object",
         properties: {
-            prompt: { type: "string", description: "The task for the agent. Make it COMPLETE and self-contained: state the goal, a concrete definition of done, and (for open-ended work) an explicit scope bound so it finishes end-to-end and verifies its own work rather than sprawling or stopping half-way." },
-            cli: { type: "string", enum: ["claude", "codex"], description: "Which external CLI to drive. 'claude' = Claude Code (default), 'codex' = OpenAI Codex. resumeSessionId is only valid against the same cli that produced it." },
-            resumeSessionId: { type: "string", description: "Existing session id to resume (keeps context). Must come from a prior run of the SAME cli. Omit for a fresh session." },
+            prompt: {
+                type: "string",
+                description: "The task for the agent. Make it COMPLETE and self-contained: state the goal, a concrete definition of done, and (for open-ended work) an explicit scope bound so it finishes end-to-end and verifies its own work rather than sprawling or stopping half-way.",
+            },
+            cli: {
+                type: "string",
+                enum: ["claude", "codex"],
+                description: "Which external CLI to drive. 'claude' = Claude Code (default), 'codex' = OpenAI Codex. resumeSessionId is only valid against the same cli that produced it.",
+            },
+            resumeSessionId: {
+                type: "string",
+                description: "Existing session id to resume (keeps context). Must come from a prior run of the SAME cli. Omit for a fresh session.",
+            },
+            model: {
+                type: "string",
+                description: "Optional model override, passed through to `claude --model` / `codex exec --model`. Omit to use the CLI default; only pass when the user explicitly requests a model.",
+            },
             cwd: { type: "string", description: "Working directory the run operates in." },
-            permissionMode: { type: "string", enum: ["default", "acceptEdits", "bypassPermissions"], description: "Permission/sandbox level. Defaults to 'bypassPermissions' (full auto — needed so the agent's tools run unattended; there is no interactive approval loop here). For codex: default→read-only sandbox, acceptEdits→workspace-write, bypassPermissions→no sandbox. Pass 'default'/'acceptEdits' to gate." },
-            background: { type: "boolean", description: "Defaults to TRUE: run in the background and notify you on completion (right for long tasks). Pass false to run in the foreground and get the result inline (only for quick tasks)." },
+            attachmentPaths: {
+                type: "array",
+                items: { type: "string" },
+                description: "Optional local file paths to hand to the driven agent. Paths must resolve inside cwd. Images are also passed to Codex with -i when the installed Codex CLI supports it; otherwise all paths are listed in the prompt.",
+            },
+            permissionMode: {
+                type: "string",
+                enum: ["default", "acceptEdits", "bypassPermissions"],
+                description: "Permission/sandbox level. Defaults to 'bypassPermissions' (full auto — needed so the agent's tools run unattended; there is no interactive approval loop here). For codex: default→read-only sandbox, acceptEdits→workspace-write, bypassPermissions→no sandbox. Pass 'default'/'acceptEdits' to gate.",
+            },
+            background: {
+                type: "boolean",
+                description: "Defaults to TRUE: run in the background and notify you on completion (right for long tasks). Pass false to run in the foreground and get the result inline (only for quick tasks).",
+            },
         },
         required: ["prompt", "cwd"],
     },
 };
 const defaultRunner = (opts) => {
     const { adapter, command } = CLI_ADAPTERS[opts.cli];
-    return runAgentOnce(adapter, { command, prompt: opts.prompt, resumeSessionId: opts.resumeSessionId, cwd: opts.cwd, permissionMode: opts.permissionMode ?? "default" });
+    return runAgentOnce(adapter, {
+        command,
+        prompt: opts.prompt,
+        resumeSessionId: opts.resumeSessionId,
+        model: opts.model,
+        cwd: opts.cwd,
+        permissionMode: opts.permissionMode ?? "default",
+        imagePaths: opts.imagePaths,
+    }, opts.signal);
 };
+function newDriveJobId() {
+    return `cc-${process.hrtime.bigint().toString(36)}`;
+}
+function summarizePrompt(prompt, max = 120) {
+    const oneLine = prompt.replace(/\s+/g, " ").trim();
+    if (oneLine.length <= max)
+        return oneLine;
+    return `${oneLine.slice(0, Math.max(0, max - 3))}...`;
+}
+function isDriveAgentJob(job) {
+    return job.kind === "drive-agent" || job.description.startsWith("DriveAgent(");
+}
+function changedFilesSummary(job) {
+    const files = job.changedFiles ?? [];
+    if (files.length === 0)
+        return "unknown";
+    if (files.length <= 4)
+        return files.join(",");
+    return `${files.slice(0, 4).join(",")} (+${files.length - 4} more)`;
+}
+/**
+ * Canonicalize external transcript paths against the DriveAgent cwd. Claude
+ * normally records absolute paths while Codex apply_patch normally records
+ * relative paths; returning a cwd-relative display path for in-workspace files
+ * gives the renderer one stable identity and removes duplicate transcript hits.
+ */
+function normalizeChangedFiles(cwd, files) {
+    const seen = new Set();
+    const out = [];
+    for (const file of files) {
+        if (typeof file !== "string" || !file.trim())
+            continue;
+        const absolute = resolve(cwd, file.trim());
+        if (seen.has(absolute))
+            continue;
+        seen.add(absolute);
+        const rel = relative(cwd, absolute);
+        out.push(rel && rel !== ".." && !rel.startsWith(`..${sep}`) ? rel : absolute);
+    }
+    return out;
+}
+function jobDurationSeconds(job) {
+    const end = job.finishedAt ?? Date.now();
+    return `${Math.max(0, (end - job.startedAt) / 1000).toFixed(1)}s`;
+}
+function formatDriveJobListLine(job) {
+    const prompt = job.promptSummary || job.description || "(no prompt summary)";
+    const cwd = job.cwd ?? "(unknown cwd)";
+    const cli = job.cli ?? "unknown";
+    return [
+        `${job.jobId}`,
+        `status=${job.status}`,
+        `cli=${cli}`,
+        `session=${job.sessionId}`,
+        `cwd=${cwd}`,
+        `startedAt=${new Date(job.startedAt).toISOString()}`,
+        `duration=${jobDurationSeconds(job)}`,
+        `changedFiles=${changedFilesSummary(job)}`,
+        `prompt="${prompt}"`,
+    ].join("  ");
+}
+function isValidSessionId(sessionId) {
+    return typeof sessionId === "string" && sessionId.length > 0;
+}
+function argSignal(args) {
+    const signal = args.__signal;
+    return signal &&
+        typeof signal === "object" &&
+        typeof signal.aborted === "boolean" &&
+        typeof signal.addEventListener === "function"
+        ? signal
+        : undefined;
+}
+function startRun(runner, opts) {
+    return Promise.resolve().then(() => runner(opts));
+}
+function resolveAttachmentPaths(raw, cwd) {
+    if (raw === undefined)
+        return { paths: [] };
+    if (!Array.isArray(raw))
+        return { paths: [], error: "attachmentPaths must be an array of strings" };
+    const cwdReal = realpathSync(cwd);
+    const paths = [];
+    for (const item of raw) {
+        if (typeof item !== "string" || !item.trim()) {
+            return { paths: [], error: "attachmentPaths must contain only non-empty strings" };
+        }
+        const candidate = isAbsolute(item) ? item : resolve(cwd, item);
+        if (!existsSync(candidate))
+            return { paths: [], error: `attachment path not found: ${item}` };
+        const real = realpathSync(candidate);
+        const rel = relative(cwdReal, real);
+        if (rel === "" || rel === ".." || rel.startsWith(`..${sep}`)) {
+            return { paths: [], error: `attachment path is outside cwd: ${item}` };
+        }
+        const info = statSync(real);
+        if (!info.isFile())
+            return { paths: [], error: `attachment path is not a file: ${item}` };
+        paths.push(real);
+    }
+    return { paths };
+}
+const DRIVE_IMAGE_EXTS = new Set([".png", ".jpg", ".jpeg", ".gif", ".webp"]);
+function appendAttachmentPrompt(prompt, paths) {
+    if (paths.length === 0)
+        return prompt;
+    const lines = ["", "Attached files:"];
+    for (const path of paths) {
+        const kind = DRIVE_IMAGE_EXTS.has(extname(path).toLowerCase()) ? "image" : "file";
+        lines.push(`- ${path} (${kind})`);
+    }
+    return `${prompt}\n${lines.join("\n")}`;
+}
+function recordSuccessfulSession(store, cli, cwd, result, includeErroredSession = false) {
+    if ((!includeErroredSession && result.isError) || !result.sessionId)
+        return;
+    try {
+        store.record({ cli, sessionId: result.sessionId, cwd });
+    }
+    catch (err) {
+        logger.warn("drive_agent.session_binding_record_failed", {
+            cat: "cc",
+            cli,
+            sessionId: result.sessionId,
+            cwd,
+            error: err instanceof Error ? err.message : String(err),
+        });
+    }
+}
+function duplicateCwdWarning(cwd, writable) {
+    if (!writable)
+        return undefined;
+    const running = backgroundJobRegistry.listRunningByCwd(cwd).filter(isDriveAgentJob);
+    if (running.length === 0)
+        return undefined;
+    const jobs = running.map(formatDriveJobListLine).join("; ");
+    return (`Warning: another DriveAgent job is already running in cwd ${cwd}. ` +
+        "Concurrent writable agents in the same directory can overwrite each other's work. " +
+        `Run DriveAgentJobs(action:"list", cwd:"${cwd}") before dispatching parallel work for details/cancellation. ` +
+        `Running: ${jobs}`);
+}
+function attachDriveCompletion(params) {
+    const { jobId, sessionId, label, cli, cwd, run, sessionStore, readChangedFiles, recordExternalFileChanges, originClientMessageId, } = params;
+    void run
+        .then((r) => {
+        const jobStatus = backgroundJobRegistry.get(jobId)?.status;
+        if (jobStatus !== "running" && jobStatus !== "cancelling")
+            return;
+        const cancelling = jobStatus === "cancelling";
+        recordSuccessfulSession(sessionStore, cli, cwd, r, cancelling);
+        // Attribute external changes BEFORE publishing completion. Previously the
+        // notification event was emitted first and carried no files; changedFiles
+        // only reached the background-work registry/panel, so the chat turn card
+        // could never count DriveAgent edits.
+        const rawChangedFiles = r.sessionId ? readChangedFiles(cli, cwd, r.sessionId) : [];
+        const changedFiles = normalizeChangedFiles(cwd, rawChangedFiles);
+        if (changedFiles.length > 0) {
+            recordExternalFileChanges?.({
+                jobId,
+                description: label,
+                cli,
+                cwd,
+                status: cancelling ? "cancelled" : r.isError ? "failed" : "completed",
+                changedFiles,
+                ...(originClientMessageId ? { originClientMessageId } : {}),
+            });
+        }
+        logger.debug("changed_files.drive_completion", {
+            cat: "changed_files",
+            jobId,
+            sessionId,
+            externalSessionId: r.sessionId || undefined,
+            cli,
+            cwd,
+            originClientMessageId,
+            rawSize: rawChangedFiles.length,
+            size: changedFiles.length,
+            files: changedFiles,
+        });
+        if (cancelling) {
+            backgroundJobRegistry.recordArtifacts(jobId, {
+                ccSessionId: r.sessionId || undefined,
+                changedFiles,
+            });
+            return;
+        }
+        // Deliver the result back so the woken agent actually sees the answer
+        // (not just "a job finished"). Mirrors the video/sub-agent completion
+        // path — enqueue lands in the same notificationQueue the wakeup drains.
+        notificationQueue.enqueue(r.isError
+            ? {
+                agentId: jobId,
+                description: label,
+                status: "failed",
+                workKind: "cc",
+                error: r.finalText || "(no output)",
+                ccSessionId: r.sessionId || undefined,
+                ...(changedFiles.length ? { changedFiles, cwd } : {}),
+                ...(originClientMessageId ? { originClientMessageId } : {}),
+                enqueuedAt: Date.now(),
+            }
+            : {
+                agentId: jobId,
+                description: label,
+                status: "completed",
+                workKind: "cc",
+                finalText: r.finalText,
+                ccSessionId: r.sessionId || undefined,
+                ...(changedFiles.length ? { changedFiles, cwd } : {}),
+                ...(originClientMessageId ? { originClientMessageId } : {}),
+                enqueuedAt: Date.now(),
+            }, sessionId);
+        // Retain the job in the panel with its result + the external CLI
+        // session id + changed files.
+        backgroundJobRegistry.finish(jobId, {
+            status: r.isError ? "failed" : "completed",
+            finalText: r.finalText || undefined,
+            ccSessionId: r.sessionId || undefined,
+            ...(changedFiles.length ? { changedFiles } : {}),
+        });
+    })
+        .catch((err) => {
+        if (backgroundJobRegistry.get(jobId)?.status !== "running")
+            return;
+        const msg = err?.message ?? String(err);
+        notificationQueue.enqueue({
+            agentId: jobId,
+            description: label,
+            status: "failed",
+            workKind: "cc",
+            error: msg,
+            enqueuedAt: Date.now(),
+        }, sessionId);
+        backgroundJobRegistry.finish(jobId, { status: "failed", finalText: msg });
+    });
+}
+function trackBackgroundRun(params) {
+    const warning = duplicateCwdWarning(params.cwd, params.writable);
+    const jobId = newDriveJobId();
+    const run = params.start();
+    backgroundJobRegistry.start(jobId, params.sessionId, params.label, {
+        kind: "drive-agent",
+        cwd: params.cwd,
+        cli: params.cli,
+        promptSummary: params.promptSummary,
+        originClientMessageId: params.originClientMessageId,
+        abort: async () => {
+            params.abort();
+            await run.catch(() => undefined);
+        },
+    });
+    attachDriveCompletion({ ...params, jobId, run });
+    return { jobId, ...(warning ? { warning } : {}) };
+}
+async function waitForForegroundOrHandoff(run, handoffMs) {
+    if (handoffMs < 0) {
+        return { kind: "completed", result: await run };
+    }
+    let timer;
+    try {
+        return await Promise.race([
+            run.then((result) => ({ kind: "completed", result })),
+            new Promise((resolve) => {
+                timer = setTimeout(() => resolve({ kind: "handoff" }), handoffMs);
+            }),
+        ]);
+    }
+    finally {
+        if (timer)
+            clearTimeout(timer);
+    }
+}
+function makeAbortController(parent, linkParent = false) {
+    const controller = new AbortController();
+    if (!parent)
+        return controller;
+    if (parent.aborted) {
+        controller.abort(parent.reason);
+    }
+    else if (linkParent) {
+        parent.addEventListener("abort", () => controller.abort(parent.reason), { once: true });
+    }
+    return controller;
+}
 /** Factory so tests can inject a fake runner. `fixedCli` (back-compat) forces a
  *  cli and hides the `cli` arg — that's how DriveClaudeCode stays a thin alias. */
-export function makeDriveAgentTool(runner = defaultRunner, fixedCli) {
+export function makeDriveAgentTool(runner = defaultRunner, fixedCli, options = {}) {
     return async (args, ctx) => {
         const prompt = typeof args.prompt === "string" ? args.prompt : "";
-        const cwd = typeof args.cwd === "string" ? args.cwd : process.cwd();
+        const rawRequestedCwd = typeof args.cwd === "string" ? args.cwd : process.cwd();
+        const requestedCwd = normalizeCwdPath(rawRequestedCwd);
         if (!prompt)
             return "Error: prompt is required";
-        const cli = fixedCli ?? (args.cli === "codex" ? "codex" : args.cli === "claude" || args.cli === undefined ? "claude" : "invalid");
+        const cli = fixedCli ??
+            (args.cli === "codex"
+                ? "codex"
+                : args.cli === "claude" || args.cli === undefined
+                    ? "claude"
+                    : "invalid");
         if (cli === "invalid")
             return `Error: unknown cli "${String(args.cli)}" (expected "claude" or "codex")`;
         const resumeSessionId = typeof args.resumeSessionId === "string" ? args.resumeSessionId : undefined;
+        const model = typeof args.model === "string" && args.model.trim() ? args.model : undefined;
+        const sessionStore = options.sessionStore ?? externalAgentSessionStore;
+        let cwd = requestedCwd;
+        let resumeNote = "";
+        if (resumeSessionId) {
+            const binding = sessionStore.get(cli, resumeSessionId);
+            if (binding) {
+                const storedCwd = normalizeCwdPath(binding.cwd);
+                if (!isExistingDirectory(storedCwd)) {
+                    return `Error: cannot resume ${cli} session ${resumeSessionId}: stored cwd no longer exists or is not a directory: ${storedCwd}`;
+                }
+                if (storedCwd !== requestedCwd) {
+                    cwd = storedCwd;
+                    resumeNote = `Note: resume session ${resumeSessionId} is bound to stored cwd ${storedCwd}; ignoring requested cwd ${requestedCwd}.`;
+                    logger.info("drive_agent.resume_forced_stored_cwd", {
+                        cat: "cc",
+                        cli,
+                        sessionId: resumeSessionId,
+                        requestedCwd,
+                        storedCwd,
+                    });
+                }
+            }
+        }
         // Default to bypassPermissions: this tool is a fire-one-turn delegation to
         // an external CLI with nobody watching for approvals, and there is no
         // interactive approval loop here — so under "default" a tool that needs
@@ -73,8 +432,29 @@ export function makeDriveAgentTool(runner = defaultRunner, fixedCli) {
             args.permissionMode === "bypassPermissions"
             ? args.permissionMode
             : "bypassPermissions";
+        const resolvedAttachmentPaths = resolveAttachmentPaths(args.attachmentPaths, cwd);
+        if (resolvedAttachmentPaths.error)
+            return `Error: ${resolvedAttachmentPaths.error}`;
+        const attachmentPaths = resolvedAttachmentPaths.paths;
+        const promptWithAttachments = appendAttachmentPrompt(prompt, attachmentPaths);
+        const imagePaths = cli === "codex"
+            ? attachmentPaths.filter((path) => DRIVE_IMAGE_EXTS.has(extname(path).toLowerCase()))
+            : [];
         const cliName = cli === "codex" ? "Codex" : "Claude Code";
         const label = `DriveAgent(${cli}): ${prompt.slice(0, 40)}`;
+        const promptSummary = summarizePrompt(prompt);
+        const callerSignal = ctx?.signal ?? argSignal(args);
+        const runOptsBase = {
+            cli,
+            prompt: promptWithAttachments,
+            resumeSessionId,
+            model,
+            cwd,
+            permissionMode,
+            imagePaths,
+        };
+        const foregroundHandoffMs = options.foregroundHandoffMs ?? DRIVE_AGENT_FOREGROUND_HANDOFF_MS;
+        const isWritableRun = permissionMode !== "default";
         // Background by default (these tasks are typically long). Only an explicit
         // background:false runs in the foreground and returns the result inline.
         const background = args.background !== false;
@@ -87,45 +467,200 @@ export function makeDriveAgentTool(runner = defaultRunner, fixedCli) {
             if (typeof sessionId !== "string" || sessionId.length === 0) {
                 return `Error: cannot start a background ${cliName} job without a session — its result notification would be dropped. Retry with background:false, or ensure the tool runs inside a session.`;
             }
-            const jobId = `cc-${process.hrtime.bigint().toString(36)}`;
-            backgroundJobRegistry.start(jobId, sessionId, label);
-            void runner({ cli, prompt, resumeSessionId, cwd, permissionMode })
-                .then((r) => {
-                // Deliver the result back so the woken agent actually sees the answer
-                // (not just "a job finished"). Mirrors the video/sub-agent completion
-                // path — enqueue lands in the same notificationQueue the wakeup drains.
-                notificationQueue.enqueue(r.isError
-                    ? { agentId: jobId, description: label, status: "failed", workKind: "cc", error: r.finalText || "(no output)", ccSessionId: r.sessionId || undefined, enqueuedAt: Date.now() }
-                    : { agentId: jobId, description: label, status: "completed", workKind: "cc", finalText: r.finalText, ccSessionId: r.sessionId || undefined, enqueuedAt: Date.now() }, sessionId);
-                // Attribute the files the external agent changed by parsing its own
-                // transcript (#6) — those Edit/Write calls are invisible to the host's
-                // in-session aggregator. Best-effort; [] on any failure.
-                const changedFiles = r.sessionId
-                    ? readExternalChangedFiles(cli, cwd, r.sessionId)
-                    : [];
-                // Retain the job in the panel with its result + the external CLI
-                // session id + changed files.
-                backgroundJobRegistry.finish(jobId, {
-                    status: r.isError ? "failed" : "completed",
-                    finalText: r.finalText || undefined,
-                    ccSessionId: r.sessionId || undefined,
-                    ...(changedFiles.length ? { changedFiles } : {}),
-                });
-            })
-                .catch((err) => {
-                const msg = err?.message ?? String(err);
-                notificationQueue.enqueue({ agentId: jobId, description: label, status: "failed", workKind: "cc", error: msg, enqueuedAt: Date.now() }, sessionId);
-                backgroundJobRegistry.finish(jobId, { status: "failed", finalText: msg });
+            const abortController = makeAbortController(callerSignal, false);
+            const tracked = trackBackgroundRun({
+                sessionId,
+                label,
+                cli,
+                cwd,
+                promptSummary,
+                start: () => startRun(runner, { ...runOptsBase, signal: abortController.signal }),
+                abort: () => abortController.abort(),
+                sessionStore,
+                writable: isWritableRun,
+                readChangedFiles: options.readChangedFiles ?? readExternalChangedFiles,
+                recordExternalFileChanges: ctx?.recordExternalFileChanges,
+                originClientMessageId: ctx?.originClientMessageId,
             });
-            return `已在后台启动 ${cliName}（jobId ${jobId}）。完成后会通知你结果，无需轮询。`;
+            return [
+                resumeNote,
+                `已在后台启动 ${cliName}（jobId ${tracked.jobId}）。完成后会通知你结果，无需轮询。`,
+                tracked.warning,
+            ]
+                .filter(Boolean)
+                .join("\n");
         }
-        const r = await runner({ cli, prompt, resumeSessionId, cwd, permissionMode });
+        const foregroundAbort = makeAbortController(callerSignal, true);
+        const run = startRun(runner, { ...runOptsBase, signal: foregroundAbort.signal });
+        const result = await waitForForegroundOrHandoff(run, foregroundHandoffMs);
+        if (result.kind === "handoff" && isValidSessionId(ctx?.sessionId)) {
+            const tracked = trackBackgroundRun({
+                sessionId: ctx.sessionId,
+                label,
+                cli,
+                cwd,
+                promptSummary,
+                start: () => run,
+                abort: () => foregroundAbort.abort(),
+                sessionStore,
+                writable: isWritableRun,
+                readChangedFiles: options.readChangedFiles ?? readExternalChangedFiles,
+                recordExternalFileChanges: ctx?.recordExternalFileChanges,
+                originClientMessageId: ctx?.originClientMessageId,
+            });
+            return [
+                resumeNote,
+                `${cliName} foreground run exceeded ${foregroundHandoffMs}ms; moved it to background (jobId ${tracked.jobId}). Completion will notify this session, so do not poll.`,
+                tracked.warning,
+            ]
+                .filter(Boolean)
+                .join("\n");
+        }
+        const r = result.kind === "completed" ? result.result : await run;
+        recordSuccessfulSession(sessionStore, cli, cwd, r);
+        const prefix = resumeNote ? `${resumeNote}\n` : "";
         if (r.isError)
-            return `${cliName} 运行出错（session ${r.sessionId}）：\n${r.finalText}`;
-        return `${cliName} 完成（session ${r.sessionId}）：\n${r.finalText}`;
+            return `${prefix}${cliName} 运行出错（session ${r.sessionId}）：\n${r.finalText}`;
+        return `${prefix}${cliName} 完成（session ${r.sessionId}）：\n${r.finalText}`;
     };
 }
 export const driveAgentTool = makeDriveAgentTool();
+export const driveAgentJobsToolDef = {
+    name: "DriveAgentJobs",
+    description: "List, inspect, or cancel background DriveAgent jobs. Use action:'list' before launching " +
+        "writable DriveAgent work in a cwd to see already-running jobs there, including prompt " +
+        "summary, owner session, cwd, CLI kind, status, start time, and known changed files. " +
+        "Use action:'inspect' with jobId for full details, or action:'cancel' with jobId to abort " +
+        "a running DriveAgent external CLI process and deliver a cancellation notification.",
+    inputSchema: {
+        type: "object",
+        properties: {
+            action: {
+                type: "string",
+                enum: ["list", "inspect", "cancel"],
+                description: "What to do. Defaults to list.",
+            },
+            jobId: {
+                type: "string",
+                description: "DriveAgent jobId for inspect or cancel.",
+            },
+            cwd: {
+                type: "string",
+                description: "When listing, restrict to DriveAgent jobs in this cwd. This is cross-session so it can catch same-directory write conflicts before dispatch.",
+            },
+            status: {
+                type: "string",
+                enum: ["running", "all"],
+                description: "When listing: running (default) or all retained DriveAgent jobs.",
+            },
+            all: {
+                type: "boolean",
+                description: "When listing without cwd: true lists DriveAgent jobs from every session; default lists only this session when session context exists.",
+            },
+        },
+    },
+};
+function jobIdArg(args) {
+    const camel = typeof args.jobId === "string" ? args.jobId.trim() : "";
+    if (camel)
+        return camel;
+    const snake = typeof args.job_id === "string" ? args.job_id.trim() : "";
+    return snake || undefined;
+}
+function listDriveAgentJobs(args, ctx) {
+    const rawCwd = typeof args.cwd === "string" && args.cwd.trim() ? args.cwd : undefined;
+    const cwd = rawCwd ? normalizeCwdPath(rawCwd) : undefined;
+    const sessionId = ctx?.sessionId;
+    const listAllSessions = args.all === true || !!cwd || !sessionId;
+    const status = args.status === "all" ? "all" : "running";
+    let jobs = listAllSessions || !sessionId
+        ? backgroundJobRegistry.list()
+        : backgroundJobRegistry.listForSession(sessionId);
+    jobs = jobs.filter(isDriveAgentJob);
+    if (cwd)
+        jobs = jobs.filter((job) => job.cwd === cwd);
+    if (status === "running") {
+        jobs = jobs.filter((job) => job.status === "running" || job.status === "cancelling");
+    }
+    if (jobs.length === 0) {
+        if (cwd)
+            return `No ${status} DriveAgent jobs in cwd ${cwd}.`;
+        if (listAllSessions)
+            return `No ${status} DriveAgent jobs in this process.`;
+        return `No ${status} DriveAgent jobs in this session.`;
+    }
+    return jobs.map(formatDriveJobListLine).join("\n");
+}
+function inspectDriveAgentJob(jobId) {
+    if (!jobId)
+        return "Error: jobId is required.";
+    const job = backgroundJobRegistry.get(jobId);
+    if (!job || !isDriveAgentJob(job))
+        return `Error: DriveAgent jobId "${jobId}" not found.`;
+    const lines = [
+        `jobId: ${job.jobId}`,
+        `status: ${job.status}`,
+        `cli: ${job.cli ?? "unknown"}`,
+        `session: ${job.sessionId}`,
+        `cwd: ${job.cwd ?? "(unknown cwd)"}`,
+        `startedAt: ${new Date(job.startedAt).toISOString()}`,
+        `duration: ${jobDurationSeconds(job)}`,
+        `prompt: ${job.promptSummary || job.description || "(no prompt summary)"}`,
+        `description: ${job.description}`,
+    ];
+    if (job.finishedAt !== undefined)
+        lines.push(`finishedAt: ${new Date(job.finishedAt).toISOString()}`);
+    if (job.ccSessionId)
+        lines.push(`ccSessionId: ${job.ccSessionId}`);
+    if (job.changedFiles && job.changedFiles.length > 0) {
+        lines.push("changedFiles:", ...job.changedFiles.map((file) => `- ${file}`));
+    }
+    else {
+        lines.push("changedFiles: unknown");
+    }
+    if (job.finalText)
+        lines.push("finalText:", job.finalText);
+    return lines.join("\n");
+}
+async function cancelDriveAgentJob(jobId) {
+    if (!jobId)
+        return "Error: jobId is required.";
+    const job = backgroundJobRegistry.get(jobId);
+    if (!job || !isDriveAgentJob(job))
+        return `Error: DriveAgent jobId "${jobId}" not found.`;
+    if (job.status !== "running") {
+        return `DriveAgent job ${jobId} is already ${job.status}; nothing to cancel.`;
+    }
+    if (!job.abort) {
+        return `Error: DriveAgent job ${jobId} has no cancellation handle recorded.`;
+    }
+    const finalText = `DriveAgent job ${jobId} cancelled by DriveAgentJobs.`;
+    const ok = await backgroundJobRegistry.cancel(jobId, { finalText });
+    if (!ok)
+        return `Failed to cancel DriveAgent job ${jobId}.`;
+    notificationQueue.enqueue({
+        agentId: jobId,
+        description: job.description,
+        status: "cancelled",
+        workKind: "cc",
+        error: finalText,
+        ccSessionId: job.ccSessionId,
+        ...(job.changedFiles?.length ? { changedFiles: job.changedFiles, cwd: job.cwd } : {}),
+        ...(job.originClientMessageId ? { originClientMessageId: job.originClientMessageId } : {}),
+        enqueuedAt: Date.now(),
+    }, job.sessionId);
+    return `DriveAgent job ${jobId} cancelled.`;
+}
+export async function driveAgentJobsTool(args, ctx) {
+    const action = args.action === "inspect" || args.action === "cancel" || args.action === "list"
+        ? args.action
+        : "list";
+    if (action === "inspect")
+        return inspectDriveAgentJob(jobIdArg(args));
+    if (action === "cancel")
+        return await cancelDriveAgentJob(jobIdArg(args));
+    return listDriveAgentJobs(args, ctx);
+}
 // ── Back-compat: DriveClaudeCode = DriveAgent pinned to cli:"claude" ──────────
 // Kept so old prompts / memories / call sites that reference DriveClaudeCode
 // keep working. It's a thin alias over the same machinery (fixedCli "claude").
@@ -134,24 +669,30 @@ export const driveClaudeCodeToolDef = {
     name: "DriveClaudeCode",
     description: "(Alias of DriveAgent with cli:claude.) Delegate a task to the external Claude Code CLI " +
         "(drives `claude` for one turn). Prefer DriveAgent for new calls; this name is kept for " +
-        "compatibility. " + driveAgentToolDef.description,
+        "compatibility. " +
+        driveAgentToolDef.description,
     inputSchema: {
         type: "object",
         properties: {
             // intentionally omit `cli` — this alias is always claude
             prompt: driveAgentToolDef.inputSchema.properties.prompt,
-            resumeSessionId: { type: "string", description: "Existing CC session id to resume (keeps context). Omit for a fresh session." },
+            resumeSessionId: {
+                type: "string",
+                description: "Existing CC session id to resume (keeps context). Omit for a fresh session.",
+            },
+            model: driveAgentToolDef.inputSchema.properties.model,
             cwd: driveAgentToolDef.inputSchema.properties.cwd,
+            attachmentPaths: driveAgentToolDef.inputSchema.properties.attachmentPaths,
             permissionMode: driveAgentToolDef.inputSchema.properties.permissionMode,
             background: driveAgentToolDef.inputSchema.properties.background,
         },
         required: ["prompt", "cwd"],
     },
 };
-export function makeDriveClaudeCodeTool(runner) {
+export function makeDriveClaudeCodeTool(runner, options) {
     const generic = runner
-        ? ({ prompt, resumeSessionId, cwd, permissionMode }) => runner({ prompt, resumeSessionId, cwd, permissionMode })
+        ? ({ prompt, resumeSessionId, model, cwd, permissionMode, signal }) => runner({ prompt, resumeSessionId, model, cwd, permissionMode, signal })
         : undefined;
-    return makeDriveAgentTool(generic ?? defaultRunner, "claude");
+    return makeDriveAgentTool(generic ?? defaultRunner, "claude", options);
 }
 export const driveClaudeCodeTool = makeDriveClaudeCodeTool();