chivgent 1.1.1 → 1.1.3

package/dist/repl.js

@@ -4,63 +4,74 @@ import { readLiveGitDiff } from "./tui/git-diff.js";
 import { terminalText } from "./tui/text.js";
 import { terminalColorEnabled } from "./tui/selection.js";
 import { PatchReviewController } from "./tui/review.js";
+import { ProviderPickerController } from "./tui/provider-picker.js";
 import { InputMenu } from "./tui/menu.js";
 import { createInterface, emitKeypressEvents } from "node:readline";
 import { formatTokens } from "./providers/usage.js";
 import { approvalPreview, commandReviewable } from "./tui/activity.js";
 import { terminalWidth } from "./tui/live.js";
 import { formatDiffPage, mostRecentSuccessfulPatch } from "./tui/diff.js";
-import { describePermissionMode, parsePermissionMode } from "./permissions.js";
+import { describePermissionMode, parsePermissionMode, WEB_SEARCH_APPROVAL_PREFIX } from "./permissions.js";
 import { HeuristicTokenEstimator } from "./context/token-estimator.js";
 export const REPL_PROMPT = "› ";
 export const BUILT_IN_COMMANDS = [
     "help",
-    "session",
     "status",
-    "compact",
-    "plan",
-    "permissions",
     "new",
     "resume",
     "rename",
-    "tools",
     "diff",
+    "clear",
+    "compact",
+    "permissions",
+    "provider",
+    "model",
+    "endpoint",
+    "login",
+    "exit",
+];
+export const LEGACY_COMMAND_ALIASES = [
+    "session",
+    "plan",
+    "tools",
     "compose",
     "editor",
     "review",
     "gitdiff",
-    "clear",
-    "exit",
     "quit",
-    "login",
     "logout",
-    "provider",
-    "model",
-    "endpoint",
 ];
+export const BUILT_IN_DESCRIPTIONS = {
+    help: "show this help",
+    status: "show session, model, tokens & permissions",
+    new: "save and start a fresh session",
+    resume: "switch to a saved session in workspace",
+    rename: "set current session title",
+    diff: "review workspace Git changes (/diff patch for patch)",
+    clear: "clear transcript in current session",
+    compact: "summarise older history for the model",
+    permissions: "inspect or change permission policy",
+    provider: "choose a Provider",
+    model: "show or change current model",
+    endpoint: "set URL for OpenAI-compatible Provider",
+    login: "store API key or sign in with subscription",
+    exit: "leave chivgent",
+};
 const HELP = `Commands:
   /help      Show this help
-  /session   Show the current session id, workspace, and size
-  /status    Show live session, model, permissions, plan state, and usage
+  /status    Show live session, model, permissions, plan state, and usage (alias: /session)
   /compact   Summarise older history for the model; keeps the full transcript
   /plan [on|off]  Toggle restricted read-only Plan Mode
-  /permissions [ask-first|workspace|unrestricted]  Inspect or change this process's policy
+  /permissions [ask-first|workspace|unrestricted|plan]  Inspect or change this process's policy
   /new [title]    Save this session and start a fresh session
   /resume [id]    Switch to a saved session in this workspace
   /rename TITLE  Set the current session title
-  /tools     List the tools available to the model
-  /diff [N]  Review the latest successful apply_patch, page N
-  /compose   Write a multi-line prompt (/send to submit, /cancel to discard)
-  /editor    Open the cursor-editable multiline composer (Ctrl+S sends)
-  /review    Browse last applied patch with arrows, q to close
-  /gitdiff [--staged]  Review actual workspace Git changes after explicit approval
+  /diff [--staged|patch]  Review workspace Git changes (or latest patch)
   /clear     Start a new transcript in the same session
   /provider  Choose a Provider (↑↓ and Enter in the TUI)
   /model     Show or change the current model: /model MODEL
   /endpoint  Set the URL for an OpenAI-compatible Provider
-  /login     Store a key for the current Provider; /login NAME switches first
-  /login oauth [openai|xai]  Sign in with a subscription
-  /logout    Sign out of the current OAuth subscription
+  /login     Store API key or sign in with subscription (/login logout to sign out)
   /exit      Leave chivgent
 
 Anything else is sent to the model. Ctrl+C stops a running answer.
@@ -95,8 +106,6 @@ export function handleSlashCommand(line, context) {
             context.write(helpText(context));
             return "handled";
         case "/session":
-            context.write(describeSession(context));
-            return "handled";
         case "/status":
             context.write(describeStatus(context));
             return "handled";
@@ -123,6 +132,12 @@ export function handleSlashCommand(line, context) {
         }
         case "/permissions": {
             const argument = trimmed.slice("/permissions".length).trim().toLowerCase();
+            if (argument === "plan" || argument === "plan on") {
+                return { kind: "plan", enabled: true };
+            }
+            if (argument === "plan off") {
+                return { kind: "plan", enabled: false };
+            }
             if (context.permissionPolicy === undefined) {
                 context.write("Named permission modes are unavailable because this session uses legacy capability flags. Start with --permission-mode to enable them.\n");
             }
@@ -134,7 +149,7 @@ export function handleSlashCommand(line, context) {
                     return { kind: "permission-mode", mode: parsePermissionMode(argument) };
                 }
                 catch {
-                    context.write("Usage: /permissions [ask-first|workspace|unrestricted]\n");
+                    context.write("Usage: /permissions [ask-first|workspace|unrestricted|plan]\n");
                 }
             }
             return "handled";
@@ -162,13 +177,28 @@ export function handleSlashCommand(line, context) {
             return "handled";
         case "/diff": {
             const argument = trimmed.slice("/diff".length).trim();
-            if (argument.length > 0 && !/^[1-9]\d*$/.test(argument)) {
-                context.write("Usage: /diff [positive page number]\n");
+            if (argument === "patch" || argument.startsWith("patch ")) {
+                const pageArg = argument.slice("patch".length).trim();
+                if (pageArg.length > 0 && !/^[1-9]\d*$/.test(pageArg)) {
+                    context.write("Usage: /diff patch [positive page number]\n");
+                    return "handled";
+                }
+                const patch = mostRecentSuccessfulPatch(context.session.messages);
+                if (patch === undefined) {
+                    context.write("No successfully applied patch found in this session.\n");
+                    return "handled";
+                }
+                const page = pageArg.length === 0 ? 1 : Number(pageArg);
+                context.write(formatDiffPage(patch, page, context.width ?? 80, context.color === true).text);
+                return "handled";
+            }
+            if (argument.length > 0 && !/^[1-9]\d*$/.test(argument) && argument !== "--staged") {
+                context.write("Usage: /diff [--staged|patch [positive page number]]\n");
                 return "handled";
             }
             const patch = mostRecentSuccessfulPatch(context.session.messages);
             if (patch === undefined) {
-                context.write("No successfully applied patch found in this session.\n");
+                context.write("No successfully applied patch found in this session. In interactive TUI, use /diff to review workspace Git changes.\n");
                 return "handled";
             }
             const page = argument.length === 0 ? 1 : Number(argument);
@@ -176,10 +206,14 @@ export function handleSlashCommand(line, context) {
             return "handled";
         }
         case "/compose":
-            context.write("Use /compose at the interactive prompt to enter multi-line mode.\n");
+            context.write(context.inlineComposer
+                ? "The multiline editor is already active in this prompt. Enter sends; Ctrl+O inserts a newline.\n"
+                : "Use /compose at the interactive prompt to enter multi-line mode.\n");
             return "handled";
         case "/editor":
-            context.write("Use /editor in the rich interactive TUI to open the multiline editor.\n");
+            context.write(context.inlineComposer
+                ? "The cursor-addressable multiline editor is already active in this prompt. Enter sends; Ctrl+O inserts a newline.\n"
+                : "Use /editor in the rich interactive TUI to open the multiline editor.\n");
             return "handled";
         case "/review":
             context.write("Use /review in an interactive TUI to browse the most recent successful patch.\n");
@@ -197,6 +231,9 @@ export function handleSlashCommand(line, context) {
                 return "handled";
             }
             if (trimmed === "/provider") {
+                if (context.interactivePicker === true) {
+                    return { kind: "provider", argument: "" };
+                }
                 context.write(context.providers.describe());
                 return "handled";
             }
@@ -221,12 +258,21 @@ export function handleSlashCommand(line, context) {
                 return "handled";
             }
             return { kind: "endpoint", argument: trimmed.slice("/endpoint".length).trim() };
-        case "/login":
+        case "/login": {
+            const argument = trimmed.slice("/login".length).trim();
+            if (argument === "logout" || argument === "--logout") {
+                if (context.signIn?.signOut === undefined) {
+                    context.write("OAuth sign-out is unavailable in this session.\n");
+                    return "handled";
+                }
+                return { kind: "login", providerArgument: "__logout__" };
+            }
             if (context.signIn === undefined) {
                 context.write("This session cannot store a key; it is attached to a server that already has one.\n");
                 return "handled";
             }
-            return { kind: "login", providerArgument: trimmed.slice("/login".length).trim() };
+            return { kind: "login", providerArgument: argument };
+        }
         case "/logout":
             if (context.signIn?.signOut === undefined) {
                 context.write("OAuth sign-out is unavailable in this session.\n");
@@ -266,20 +312,6 @@ function describeUsage(context) {
         `tokens:    ${parts.join(", ")}${usage.complete ? "" : " (a turn reported none)"}`,
     ];
 }
-function describeSession(context) {
-    const lines = [
-        `id:        ${context.session.id}`,
-        `workspace: ${context.session.cwd}`,
-        `prompts:   ${context.session.turns}`,
-        `messages:  ${context.session.messages.length}`,
-        ...describeUsage(context),
-    ];
-    const sessionFile = context.sessionFileForSession?.(context.session) ?? context.sessionFile;
-    if (sessionFile !== undefined) {
-        lines.push(`log:       ${sessionFile}`);
-    }
-    return `${lines.join("\n")}\n`;
-}
 function describeStatus(context) {
     const usage = describeUsage(context);
     let contextEstimate = "unavailable";
@@ -287,13 +319,19 @@ function describeStatus(context) {
         contextEstimate = `approximately ${new HeuristicTokenEstimator().estimateMessages(context.session.messages)} tokens (transcript only; excludes system prompt and tool schemas)`;
     }
     catch { /* inaccessible estimates are reported explicitly */ }
+    const sessionFile = context.sessionFileForSession?.(context.session) ?? context.sessionFile;
     const lines = [
         `provider:  ${context.providers?.provider ?? context.providerName ?? "unavailable"}`,
         `model:     ${context.providers === undefined ? context.modelName ?? "unavailable" : context.providers.model ?? "unavailable"}`,
-        `cwd:       ${context.session.cwd}`,
-        `session:   ${context.session.id}${context.session.title ? ` · ${context.session.title}` : ""}`,
+        `workspace: ${context.session.cwd}`,
+        `id:        ${context.session.id}${context.session.title ? ` · ${context.session.title}` : ""}`,
+        `prompts:   ${context.session.turns}`,
+        `messages:  ${context.session.messages.length}`,
         `plan:      ${context.session.planMode ? "on (writes and Shell blocked for this session)" : "off"}`,
         ...(context.permissionPolicy === undefined ? [] : [`permissions: ${context.permissionPolicy.mode} (${describePermissionMode(context.permissionPolicy.mode)})`]),
+        ...(context.webSearch === undefined ? [] : [
+            `web search: ${context.webSearch.provider}${context.permissionPolicy === undefined || context.permissionPolicy.mode === "unrestricted" ? "" : " (each query asks for approval)"}`,
+        ]),
         ...(context.permissionPolicy === undefined ? [
             `file write grant: ${context.permissions === undefined ? "unavailable" : context.permissions.includes("file-write") ? "enabled" : "disabled"}`,
             `Shell grant:      ${context.permissions === undefined ? "unavailable" : context.permissions.includes("shell") ? "enabled" : "disabled"}`,
@@ -301,6 +339,7 @@ function describeStatus(context) {
         ] : []),
         ...usage,
         `context:   ${contextEstimate}`,
+        ...(sessionFile !== undefined ? [`log:       ${sessionFile}`] : []),
     ];
     return `${lines.join("\n")}\n`;
 }
@@ -325,6 +364,25 @@ async function withoutEcho(readline, read) {
         internals._writeToOutput = original;
     }
 }
+/** Plain-REPL Provider chooser; only the API key itself is hidden. */
+async function readProviderChoice(readNextLine, write, providerIds, active) {
+    write("Select a Provider for /login:\n");
+    providerIds.forEach((id, index) => {
+        write(`  ${index + 1}. ${id}${id === active ? " (current)" : ""}\n`);
+    });
+    write("Provider (number or name, Enter cancels): ");
+    const answer = await readNextLine();
+    if (answer === undefined)
+        return undefined;
+    const choice = answer.trim();
+    if (choice.length === 0)
+        return undefined;
+    const number = Number(choice);
+    if (Number.isInteger(number) && number >= 1 && number <= providerIds.length) {
+        return providerIds[number - 1];
+    }
+    return providerIds.find((id) => id.toLowerCase() === choice.toLowerCase());
+}
 async function runSignIn(readline, readNextLine, write, signIn) {
     write(`API key for ${signIn.provider} (hidden, saved locally; Enter skips): `);
     // The key is read from the same line source the loop uses. readline's
@@ -373,7 +431,7 @@ export async function runRepl(options) {
     const menu = tuiInput === undefined ? undefined : new InputMenu(readline, options.output);
     let dismissedLine;
     let refreshQueued = false;
-    const menuPriority = ["provider", "model", "editor", "review", "help"];
+    const menuPriority = ["status", "diff", "provider", "model", "new", "resume", "help"];
     const commands = [...BUILT_IN_COMMANDS, ...(options.extensionCommands ?? []).map((command) => command.name)]
         .filter((name, index, all) => all.indexOf(name) === index)
         .sort((a, b) => {
@@ -384,10 +442,9 @@ export async function runRepl(options) {
         return rank(a) - rank(b);
     })
         .map((name) => {
-        const description = options.extensionCommands?.find(command => command.name === name)?.description;
-        const suffix = name === "provider" ? "  ·  choose a Provider"
-            : name === "model" ? "  ·  change model"
-                : description === undefined ? "" : `  ·  ${description}`;
+        const description = BUILT_IN_DESCRIPTIONS[name]
+            ?? options.extensionCommands?.find(command => command.name === name)?.description;
+        const suffix = description === undefined ? "" : `  ·  ${description}`;
         return { value: name, label: `/${name}${suffix}` };
     });
     const menuItems = (line) => {
@@ -541,8 +598,9 @@ export async function runRepl(options) {
             tuiInput?.setBusy(false);
             try {
                 const width = terminalWidth({ columns: options.output.columns });
-                write(approvalPreview(command, width, context ?? "Shell command"));
-                if (!commandReviewable(command, width)) {
+                const wraps = context?.startsWith(WEB_SEARCH_APPROVAL_PREFIX) === true;
+                write(approvalPreview(command, width, context ?? "Shell command", wraps ? { wrap: true } : {}));
+                if (!wraps && !commandReviewable(command, width)) {
                     write("  Denied: command cannot be fully reviewed at this width. Ask for a shorter command.\n");
                     return false;
                 }
@@ -637,12 +695,22 @@ export async function runRepl(options) {
             .map(message => message.content)
             .filter(message => message.length > 0)
             .slice(-100);
+        const footerIdentity = () => {
+            const provider = options.providers?.provider ?? options.providerName;
+            // A live Provider wins. Do not fall back to the startup model, and do
+            // not invent a name when the model or provider is still unset.
+            const model = options.providers === undefined ? options.modelName : options.providers.model;
+            if (provider === undefined || provider.length === 0 || model === undefined || model.length === 0)
+                return undefined;
+            return `${provider} · ${model}`;
+        };
         const editor = new EditorController(output, resolveDraft, {
             submitOnEnter: isDefault,
             history: recent,
             slashCommands: commands.map(item => ({ value: item.value, label: item.label })),
             mouse: isDefault && options.tui === true && output.isTTY === true,
             color: isDefault && terminalColorEnabled(output.isTTY === true, process.env),
+            ...(isDefault && options.tui ? { footerIdentity } : {}),
             ...(isDefault && options.tui && options.permissionPolicy !== undefined ? {
                 footerStatus: () => {
                     if (activeSession.planMode)
@@ -766,6 +834,40 @@ export async function runRepl(options) {
             write(`${error instanceof Error ? error.message : "Git diff unavailable"}\n`);
         }
     };
+    /** `/login` must name its target before any hidden key prompt. */
+    const chooseLoginProvider = async () => {
+        const providers = options.providers;
+        if (providers === undefined)
+            return undefined;
+        const ids = [...providers.providerIds()];
+        if (ids.length === 0)
+            return undefined;
+        if (tuiInput === undefined) {
+            return readProviderChoice(readNextLine, write, ids, providers.provider);
+        }
+        menu?.clear();
+        dismissedLine = undefined;
+        let resolveChoice;
+        const pending = new Promise(resolve => { resolveChoice = resolve; });
+        const output = options.output;
+        const picker = new ProviderPickerController(output, ids, providers.provider, resolveChoice);
+        const resized = () => { picker.resized(); };
+        const closed = () => { picker.cancel(); };
+        tuiInput.setRawHandler(chunk => { picker.receive(chunk); });
+        output.on("resize", resized);
+        readline.once("close", closed);
+        options.input.once("end", closed);
+        try {
+            picker.begin();
+            return await pending;
+        }
+        finally {
+            tuiInput.setRawHandler(undefined);
+            output.off("resize", resized);
+            readline.off("close", closed);
+            options.input.off("end", closed);
+        }
+    };
     const signInAfterProviderSelection = async () => {
         if (!options.tui || options.signIn === undefined)
             return;
@@ -805,21 +907,31 @@ export async function runRepl(options) {
             }
             const fromComposer = line.trim() === "/compose";
             const fromEditor = line.trim() === "/editor";
-            if (line.trim() === "/review") {
+            if (line.trim() === "/review" || line.trim() === "/diff patch") {
                 await inspectPatch();
                 if (inputClosed)
                     break;
                 showPrompt();
                 continue;
             }
-            if (line.trim().startsWith("/gitdiff")) {
-                await inspectLiveGitDiff(line.trim());
+            if (line.trim() === "/diff" || line.trim() === "/diff --staged" || line.trim().startsWith("/gitdiff")) {
+                const gitDiffLine = line.trim().startsWith("/gitdiff")
+                    ? line.trim()
+                    : `/gitdiff${line.trim().slice("/diff".length)}`;
+                await inspectLiveGitDiff(gitDiffLine);
                 if (inputClosed)
                     break;
                 showPrompt();
                 continue;
             }
             if (fromComposer || fromEditor) {
+                if (options.inlineComposer && tuiInput !== undefined) {
+                    write("The cursor-addressable multiline editor is already active in this prompt. Enter sends; Ctrl+O inserts a newline.\n");
+                    if (inputClosed)
+                        break;
+                    showPrompt();
+                    continue;
+                }
                 const draft = fromEditor ? await collectEditor() : await collectMultiline();
                 if (draft === undefined) {
                     if (inputClosed)
@@ -829,6 +941,14 @@ export async function runRepl(options) {
                 }
                 line = draft;
             }
+            if (options.inlineComposer && tuiInput !== undefined) {
+                const isOutputTTY = typeof options.output === "object" && options.output !== null && "isTTY" in options.output && options.output.isTTY === true;
+                const useColor = options.tui === true && terminalColorEnabled(isOutputTTY, process.env);
+                const prefix = useColor ? "\u001b[1m\u001b[2m›\u001b[0m " : "› ";
+                const lines = line.split("\n");
+                const formattedPrompt = lines.map((l, i) => `${i === 0 ? prefix : "  "}${terminalText(l)}`).join("\n");
+                write(`\n${formattedPrompt}\n\n`);
+            }
             const outcome = fromComposer || fromEditor ? "not-a-command" : handleSlashCommand(line, {
                 session: activeSession,
                 write,
@@ -846,9 +966,11 @@ export async function runRepl(options) {
                 ...(options.compactionEnabled === undefined ? {} : { compactionEnabled: options.compactionEnabled }),
                 ...(options.providerName === undefined ? {} : { providerName: options.providerName }),
                 ...(options.modelName === undefined ? {} : { modelName: options.modelName }),
+                ...(options.webSearch === undefined ? {} : { webSearch: options.webSearch }),
                 ...(options.permissions === undefined ? {} : { permissions: options.permissions }),
                 ...(options.permissionPolicy === undefined ? {} : { permissionPolicy: options.permissionPolicy }),
                 ...(options.inlineComposer === true ? { inlineComposer: true } : {}),
+                ...(tuiInput !== undefined ? { interactivePicker: true } : {}),
                 ...(options.sessionOptions === undefined ? {} : { sessionOptions: options.sessionOptions }),
             });
             if (outcome === "exit") {
@@ -906,6 +1028,31 @@ export async function runRepl(options) {
                         continue;
                     }
                 }
+                else if (options.providers !== undefined) {
+                    signingIn = true;
+                    let chosen;
+                    try {
+                        chosen = await chooseLoginProvider();
+                    }
+                    finally {
+                        signingIn = false;
+                    }
+                    if (chosen === undefined) {
+                        write("No Provider selected; no key was stored.\n");
+                        if (inputClosed)
+                            break;
+                        showPrompt();
+                        continue;
+                    }
+                    const selected = await options.providers.select(chosen);
+                    write(selected.message);
+                    if (!selected.ok) {
+                        if (inputClosed)
+                            break;
+                        showPrompt();
+                        continue;
+                    }
+                }
                 if (options.signIn !== undefined) {
                     signingIn = true;
                     try {
@@ -915,11 +1062,38 @@ export async function runRepl(options) {
                         signingIn = false;
                     }
                 }
+                if (inputClosed)
+                    break;
                 showPrompt();
                 continue;
             }
             if (typeof outcome === "object" && (outcome.kind === "provider" || outcome.kind === "model" || outcome.kind === "endpoint")) {
                 if (options.providers !== undefined) {
+                    if (outcome.kind === "provider" && outcome.argument.length === 0 && tuiInput !== undefined) {
+                        signingIn = true;
+                        let chosen;
+                        try {
+                            chosen = await chooseLoginProvider();
+                        }
+                        finally {
+                            signingIn = false;
+                        }
+                        if (chosen === undefined) {
+                            write("No Provider selected; current Provider retained.\n");
+                            if (inputClosed)
+                                break;
+                            showPrompt();
+                            continue;
+                        }
+                        const selected = await options.providers.select(chosen);
+                        write(selected.message);
+                        if (selected.ok)
+                            await signInAfterProviderSelection();
+                        if (inputClosed)
+                            break;
+                        showPrompt();
+                        continue;
+                    }
                     const selected = outcome.kind === "provider"
                         ? await options.providers.select(outcome.argument)
                         : outcome.kind === "model" ? await options.providers.changeModel(outcome.argument)