@pentoshi/clai 3.6.0 → 3.7.3

package/dist/repl.d.ts

@@ -1,4 +1,5 @@
 import type { Mode, ProviderId } from "./types.js";
+import { type SessionPolicy } from "./modes/agent.js";
 export { slashCommands, knownModels, getKnownModels, inferProviderForModel, looksLikeSlashCommand, getSlashCommandSuggestions, isKnownSlashCommand, type SlashCommand, } from "./repl/slash-commands.js";
 export { renderSlashCommandMenu, renderFileMentionMenu, } from "./repl/prompt-line.js";
 export interface ReplOptions {
@@ -7,4 +8,8 @@ export interface ReplOptions {
     model?: string | undefined;
     noHistory?: boolean | undefined;
 }
+/** Reset process-global project routing and rotate/adopt classic session identity together. */
+export declare function resetClassicSessionContext(state: {
+    session: SessionPolicy;
+}, sessionId?: string): void;
 export declare function startRepl(options?: ReplOptions): Promise<void>;

package/dist/repl.js

@@ -3,12 +3,14 @@ import { stdin as input, stdout as output } from "node:process";
 import chalk from "chalk";
 import { confirm } from "@inquirer/prompts";
 import { runAskStream } from "./modes/ask.js";
+import { resolveTurnInput, shouldRunImageOcr } from "./attachments/service.js";
 import { runAgent, createSessionPolicy, } from "./modes/agent.js";
 import { attachClassicRenderer } from "./agent/classic-renderer.js";
+import { clearActiveProjectRoot } from "./agent/project-root.js";
 import { providerSwitcher, printProviderKeys, setKeyPicker, unsetKeyPicker, } from "./commands/providers.js";
 import { printSearchProviderKeys, useSearchProvider, } from "./commands/search-providers.js";
 import { getConfig, getProviderModel, setDefaultMode, setProviderModel, setThinking, updateConfig, } from "./store/config.js";
-import { listSessions, saveSession, upsertSession, clearAllHistory, getSession, } from "./store/history.js";
+import { listSessions, upsertSession, clearAllHistory, getSession, } from "./store/history.js";
 import { assertProvider, defaultModels, getProviderInfoText } from "./llm/provider.js";
 import { getProvider, providerAuth } from "./llm/router.js";
 import { clearTextOnlyModels } from "./llm/tool-protocol.js";
@@ -18,15 +20,16 @@ import { renderIntroCard } from "./ui/intro-card.js";
 import { clearThinking, createThinkingStreamParser, getLastThinking, rememberThinkingFromText, renderAllThinking, renderThinkingSummary, renderThinkingToggleMessage, } from "./ui/thinking.js";
 import { createMarkdownStreamWriter, renderMarkdown } from "./ui/markdown.js";
 import { startThinkingSpinner } from "./ui/spinner.js";
-import { modelSupportsThinking, modelSupportsVision, preferredVisionModel, } from "./llm/capabilities.js";
+import { modelSupportsThinking, modelSupportsVision, } from "./llm/capabilities.js";
 import { clearViewports, getLastViewport, getViewport, isPagerActive, listViewports, openPager, openViewportPager, toggleViewport, } from "./ui/output-pane.js";
 import { loadPlan, savePlan, deletePlan } from "./store/plan.js";
 import { renderPlanDocument, renderPlanChecklist } from "./ui/plan-pane.js";
 import { safeCwd, cwdIsBroken, recoverCwd } from "./os/cwd.js";
 import { compactMessages, estimateMessagesTokens, } from "./agent/context-manager.js";
 import { isCtrlC, isCtrlO, isCtrlP, isCtrlT, isEscape } from "./ui/keys.js";
-import { expandMentions, loadImageAttachments, imageAttachmentPaths, } from "./ui/mentions.js";
+import { imageAttachmentPaths, } from "./ui/mentions.js";
 import { imageOcr } from "./tools/image.js";
+import { handleDraftPlanDecision, IMPLEMENT_DIRECTIVE, } from "./agent/plan-decision.js";
 import { readPromptLine, stripAnsi, isPrintableSequence, } from "./repl/prompt-line.js";
 import { slashCommands, knownModels, looksLikeSlashCommand, slashCommandLabel, } from "./repl/slash-commands.js";
 // Re-exported so existing imports of these names from "./repl.js" keep
@@ -34,6 +37,11 @@ import { slashCommands, knownModels, looksLikeSlashCommand, slashCommandLabel, }
 // editor now live in their own modules under "./repl/".
 export { slashCommands, knownModels, getKnownModels, inferProviderForModel, looksLikeSlashCommand, getSlashCommandSuggestions, isKnownSlashCommand, } from "./repl/slash-commands.js";
 export { renderSlashCommandMenu, renderFileMentionMenu, } from "./repl/prompt-line.js";
+/** Reset process-global project routing and rotate/adopt classic session identity together. */
+export function resetClassicSessionContext(state, sessionId) {
+    clearActiveProjectRoot();
+    state.session = createSessionPolicy(sessionId);
+}
 function splitCommand(line) {
     return (line
         .match(/(?:[^\s"]+|"[^"]*")+/g)
@@ -584,11 +592,8 @@ async function offerAgentSwitch(info, state, requestModel, images) {
  * that same row instead of minting a fresh, unnamed duplicate.
  */
 async function persistSession(state, name) {
-    if (state.historyId) {
-        await upsertSession(state.historyId, state.messages, name);
-        return;
-    }
-    const record = await saveSession(state.messages, name);
+    const id = state.historyId ?? state.session.sessionId;
+    const record = await upsertSession(id, state.messages, name);
     state.historyId = record.id;
 }
 async function handleSlash(line, state) {
@@ -789,6 +794,7 @@ async function handleSlash(line, state) {
                     console.log(chalk.dim("  current session saved"));
                 }
             }
+            resetClassicSessionContext(state);
             state.messages.length = 0;
             state.resumedMessageCount = 0;
             state.historyId = undefined;
@@ -833,6 +839,7 @@ async function handleSlash(line, state) {
                 console.log(chalk.dim("  cancelled"));
                 return true;
             }
+            clearActiveProjectRoot();
             // Load the selected session
             const session = await getSession(selectedId);
             if (!session) {
@@ -845,6 +852,7 @@ async function handleSlash(line, state) {
                     await persistSession(state);
                 }
             }
+            resetClassicSessionContext(state, session.id);
             // Replay messages
             console.log(chalk.dim(`\n  ── resuming session ──\n`));
             for (const msg of session.messages) {
@@ -872,7 +880,7 @@ async function handleSlash(line, state) {
                 console.log(chalk.dim(`  saved session ${state.historyId}`));
                 return true;
             }
-            const record = await saveSession(state.messages, name);
+            const record = await upsertSession(state.session.sessionId, state.messages, name);
             state.historyId = record.id;
             console.log(chalk.dim(`  saved session ${record.id}`));
             return true;
@@ -950,20 +958,38 @@ async function handleSlash(line, state) {
             return true;
         }
         case "/plan": {
-            const plan = await loadPlan(state.session.sessionId).catch(() => undefined);
-            if (!plan) {
-                console.log(chalk.dim('  no plan yet — ask clai to plan a multi-step task (e.g. "build a react blog app")'));
+            const sub = (args[0] ?? "").toLowerCase();
+            if (!sub || sub === "mode" || sub === "on" || sub === "enter") {
+                state.mode = "plan";
+                setDefaultMode("plan");
+                console.log(renderModeSwitch("plan"));
+                console.log(chalk.dim("  plan mode on — describe the multi-step task you want to plan.\n"));
                 return true;
             }
-            if (process.stdout.isTTY && input.isTTY) {
-                await openPager({
-                    title: `plan · ${plan.goal}`,
-                    body: renderPlanDocument(plan),
-                });
+            if (sub === "off" || sub === "agent") {
+                state.mode = "agent";
+                setDefaultMode("agent");
+                console.log(renderModeSwitch("agent"));
+                return true;
             }
-            else {
-                console.log(renderPlanDocument(plan));
+            if (sub === "view" || sub === "show") {
+                const plan = await loadPlan(state.session.sessionId).catch(() => undefined);
+                if (!plan) {
+                    console.log(chalk.dim("  no active plan to view"));
+                    return true;
+                }
+                if (process.stdout.isTTY && input.isTTY) {
+                    await openPager({
+                        title: `plan · ${plan.goal}`,
+                        body: renderPlanDocument(plan),
+                    });
+                }
+                else {
+                    console.log(renderPlanDocument(plan));
+                }
+                return true;
             }
+            console.log(chalk.dim("  usage: /plan [view|off]"));
             return true;
         }
         case "/discard": {
@@ -1478,15 +1504,12 @@ export async function startRepl(options = {}) {
                 console.log(chalk.cyan("  ✦ plan approved — clai will now execute it\n"));
                 console.log(renderPlanChecklist(plan) + "\n");
                 implementApproved = true;
-                effectiveLine =
-                    "I approve the plan. Execute it now in STRICT ORDER. Task 1 (explore) is ALREADY COMPLETE from the planning phase — " +
-                        "do NOT re-list or re-read the directory. Start with the FIRST pending task that still needs implementation work. " +
-                        "For each task: call task.update {taskId, state:'in_progress'} → do the real work → VERIFY it succeeded → " +
-                        "call task.update {taskId, state:'done'}, then move to the NEXT task. " +
-                        "If a tool call FAILS, mark the task 'failed', fix the problem, and retry. Do NOT mark a task done when it failed. " +
-                        "Build the project for real with fs.writeMany (create all files in as few calls as possible). " +
-                        "Do NOT call web.search — you already know everything needed. " +
-                        "Run real commands (installs, servers, verification) — do not claim anything ran without a successful tool call.";
+                if (state.mode === "plan") {
+                    state.mode = "agent";
+                    setDefaultMode("agent");
+                    console.log(renderModeSwitch("agent"));
+                }
+                effectiveLine = IMPLEMENT_DIRECTIVE;
             }
             // Continuation detection
             // When the user types "continue" after the agent paused at a step limit,
@@ -1531,37 +1554,36 @@ export async function startRepl(options = {}) {
                 // Expand @file mentions and drag-and-dropped paths into real context.
                 // The user-visible `line` stays readable in history; the model gets
                 // the line plus an appended block of file contents / path notes.
-                let requestModel = state.model;
-                let visionCapable = modelSupportsVision(state.provider, requestModel);
-                let expansion = expandMentions(effectiveLine, safeCwd(), visionCapable);
-                const hasImageAttachment = expansion.attachments.some((att) => att.kind === "image");
-                if (hasImageAttachment && !visionCapable) {
-                    const fallbackVisionModel = preferredVisionModel(state.provider, requestModel);
-                    if (fallbackVisionModel && fallbackVisionModel !== requestModel) {
-                        const previousModel = requestModel;
-                        requestModel = fallbackVisionModel;
-                        visionCapable = true;
-                        expansion = expandMentions(effectiveLine, safeCwd(), true);
-                        console.log(chalk.dim("  ↳ vision model: ") +
-                            chalk.dim(`${requestModel} (auto for image; ${previousModel} can't view images)`));
-                    }
+                const resolvedInput = resolveTurnInput({
+                    prompt: effectiveLine,
+                    mode: state.mode,
+                    provider: state.provider,
+                    model: state.model,
+                    baseDir: safeCwd(),
+                });
+                const requestModel = resolvedInput.model;
+                const visionCapable = modelSupportsVision(state.provider, requestModel);
+                const expansion = { attachments: resolvedInput.attachments };
+                const images = [...resolvedInput.images];
+                if (resolvedInput.fallbackReason) {
+                    console.log(chalk.dim(`  ↳ ${resolvedInput.fallbackReason}`));
                 }
-                const images = visionCapable
-                    ? loadImageAttachments(effectiveLine, safeCwd())
-                    : [];
+                const hasImageAttachment = expansion.attachments.some((att) => att.kind === "image");
                 const sentImagePaths = new Set(images.map((img) => img.path).filter((p) => Boolean(p)));
-                // OCR grounding: extract text from any attached image locally and
-                // append it. This is the safety net for the case the user hit — a
-                // provider that accepts image bytes but silently ignores them, so the
-                // model otherwise hallucinates from the filename. Cheap, best-effort,
-                // and additive (vision models still get the real bytes).
-                const ocrGrounding = hasImageAttachment
+                // Vision is authoritative for visual analysis. OCR is opt-in when the
+                // selected model cannot see the image and the user specifically asks
+                // for text extraction; it is never treated as layout/color evidence.
+                const shouldOcr = shouldRunImageOcr({
+                    hasImage: hasImageAttachment,
+                    visionCapable,
+                    prompt: effectiveLine,
+                });
+                const ocrGrounding = shouldOcr
                     ? await buildImageOcrGrounding(effectiveLine, safeCwd())
                     : "";
-                const contextParts = [expansion.contextBlock, ocrGrounding].filter((part) => part.length > 0);
-                const modelInput = contextParts.length > 0
-                    ? `${effectiveLine}\n\n${contextParts.join("\n\n")}`
-                    : effectiveLine;
+                const modelInput = ocrGrounding
+                    ? `${resolvedInput.prompt}\n\n${ocrGrounding}`
+                    : resolvedInput.prompt;
                 if (expansion.attachments.length > 0) {
                     for (const att of expansion.attachments) {
                         const tag = att.kind === "text"
@@ -1612,6 +1634,7 @@ export async function startRepl(options = {}) {
                         signal,
                         session: state.session,
                         images,
+                        mode: state.mode === "plan" ? "plan" : "agent",
                         onEvent: classicRenderer.onEvent,
                     }));
                 }
@@ -1626,6 +1649,97 @@ export async function startRepl(options = {}) {
                     role: "assistant",
                     content: assistantContent,
                 });
+                // After plan mode (or any draft plan), offer Accept / Discard / View / Suggest.
+                if (state.mode === "plan" || !state.session.planApproved.value) {
+                    const draft = await loadPlan(state.session.sessionId).catch(() => undefined);
+                    if (draft && draft.status === "draft") {
+                        input.pause();
+                        if (input.isTTY)
+                            input.setRawMode(false);
+                        try {
+                            const decision = await handleDraftPlanDecision({
+                                plan: draft,
+                                sessionId: state.session.sessionId,
+                                planApproved: state.session.planApproved,
+                                setModeAgent: () => {
+                                    state.mode = "agent";
+                                    setDefaultMode("agent");
+                                    console.log(renderModeSwitch("agent"));
+                                },
+                            });
+                            if (decision.action === "implement") {
+                                const classicRenderer = attachClassicRenderer();
+                                const followUp = await withAbortableInput(async (signal) => runAgent(decision.line, {
+                                    provider: state.provider,
+                                    model: requestModel,
+                                    history: state.messages,
+                                    signal,
+                                    session: state.session,
+                                    mode: "agent",
+                                    onEvent: classicRenderer.onEvent,
+                                }));
+                                console.log();
+                                state.messages.push({ role: "user", content: decision.line }, { role: "assistant", content: followUp });
+                            }
+                            else if (decision.action === "suggest") {
+                                state.mode = "plan";
+                                setDefaultMode("plan");
+                                const classicRenderer = attachClassicRenderer();
+                                const revision = await withAbortableInput(async (signal) => runAgent(decision.line, {
+                                    provider: state.provider,
+                                    model: requestModel,
+                                    history: state.messages,
+                                    signal,
+                                    session: state.session,
+                                    mode: "plan",
+                                    onEvent: classicRenderer.onEvent,
+                                }));
+                                console.log();
+                                state.messages.push({ role: "user", content: decision.line }, { role: "assistant", content: revision });
+                                // Re-prompt if a new draft exists
+                                const revised = await loadPlan(state.session.sessionId).catch(() => undefined);
+                                if (revised && revised.status === "draft") {
+                                    const again = await handleDraftPlanDecision({
+                                        plan: revised,
+                                        sessionId: state.session.sessionId,
+                                        planApproved: state.session.planApproved,
+                                        setModeAgent: () => {
+                                            state.mode = "agent";
+                                            setDefaultMode("agent");
+                                            console.log(renderModeSwitch("agent"));
+                                        },
+                                    });
+                                    if (again.action === "implement") {
+                                        const classicRenderer2 = attachClassicRenderer();
+                                        const followUp2 = await withAbortableInput(async (signal) => runAgent(again.line, {
+                                            provider: state.provider,
+                                            model: requestModel,
+                                            history: state.messages,
+                                            signal,
+                                            session: state.session,
+                                            mode: "agent",
+                                            onEvent: classicRenderer2.onEvent,
+                                        }));
+                                        console.log();
+                                        state.messages.push({ role: "user", content: again.line }, { role: "assistant", content: followUp2 });
+                                    }
+                                    else if (again.action === "suggest") {
+                                        // Leave feedback in chat; next turn continues plan mode
+                                        state.messages.push({
+                                            role: "user",
+                                            content: again.line,
+                                        });
+                                    }
+                                }
+                            }
+                        }
+                        finally {
+                            if (input.isTTY)
+                                input.setRawMode(true);
+                            input.resume();
+                        }
+                    }
+                }
             }
             catch (error) {
                 if (error instanceof AbortRunError) {