@di-code/coding-agent 0.1.6 → 0.1.8

package/dist/modes/interactive.d.ts

@@ -1,29 +1,34 @@
+import type { CommandRegistry, InteractiveContextService } from "@di-code/builtins";
 import { type TUI } from "@di-code/tui";
 import type { AgentSession, AgentSessionEvent } from "../core/session.ts";
-import type { ExtensionHost } from "../extensions/runtime.ts";
 import { type Locale } from "../i18n.ts";
 import { type InteractiveProviderOnboardingOptions } from "../provider-onboarding.ts";
+import type { SessionHostUi } from "../runtime/session-host.ts";
 export type { AgentSessionEvent };
 export type { InteractiveMessage, InteractiveProcessItem, InteractiveState } from "./interactive-state.ts";
 export { InteractiveProjection } from "./interactive-state.ts";
 export interface InteractiveModeOptions {
-    readonly session: AgentSession;
+    readonly session: InteractiveSessionHandle;
     readonly tui: TUI;
     readonly onExit?: () => void;
     readonly sessions?: readonly InteractiveSessionChoice[];
-    readonly extensionHost?: ExtensionHost;
     readonly providerOnboarding?: Omit<InteractiveProviderOnboardingOptions, "tui">;
     /** User data directory that owns clipboard image temporaries. */
     readonly agentDir?: string;
     readonly readClipboardImagePath?: (directory?: string) => Promise<string | null>;
     readonly locale?: Locale;
+    /** Command contributions are resolved through the composition registry. */
+    readonly commandRegistry?: CommandRegistry;
+    /** Session controls and preferences are supplied by the active Context. */
+    readonly context?: InteractiveContextService;
 }
 export interface InteractiveSessionChoice {
     readonly id: string;
     readonly label: string;
     readonly description?: string;
-    open(): AgentSession | Promise<AgentSession>;
+    open(): InteractiveSessionHandle | Promise<InteractiveSessionHandle>;
 }
+export type InteractiveSessionHandle = AgentSession | SessionHostUi;
 export declare class InteractiveMode {
     private readonly projection;
     private readonly root;
@@ -31,7 +36,6 @@ export declare class InteractiveMode {
     private session;
     private readonly tui;
     private readonly sessionChoices;
-    private readonly extensionHost?;
     private readonly providerOnboarding?;
     private readonly agentDir;
     private readonly readClipboardImagePath;
@@ -51,12 +55,17 @@ export declare class InteractiveMode {
     private overlay?;
     private autocompleteOverlay?;
     private spinnerTimer?;
-    private shutdownEmitted;
     private preserveClipboardFiles;
     private locale;
+    private readonly commandRegistry?;
+    private readonly context?;
     constructor(options: InteractiveModeOptions);
     start(initialPrompt?: string): void;
     stop(): void;
+    /** Cancels the active prompt without changing Session history. */
+    cancelActivePrompt(): void;
+    /** Re-submits the last failed prompt when the mode is idle. */
+    retryLastPrompt(): void;
     private exit;
     private handleCommand;
     private attachClipboardImage;
@@ -82,6 +91,7 @@ export declare class InteractiveMode {
     private cleanupUnreferencedClipboardFiles;
     private cleanupClipboardFiles;
     private handleSlashCommand;
+    private runRegisteredCommand;
     private openProviderLogin;
     private logoutProvider;
     private listSlashCommands;

package/dist/modes/interactive.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"interactive.d.ts","sourceRoot":"","sources":["../../src/modes/interactive.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"interactive.d.ts","sourceRoot":"","sources":["../../src/modes/interactive.ts"],"names":[],"mappings":"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"}

package/dist/modes/interactive.js

@@ -6,7 +6,7 @@ import { cleanupStaleClipboardImages, clipboardImageDirectory, isClipboardImageP
 import { extractImageAttachments } from "../core/image-input.js";
 import { DEFAULT_LOCALE, translate } from "../i18n.js";
 import { showInteractiveProviderOnboarding, } from "../provider-onboarding.js";
-import { removeGlobalProviderApiKey, saveGlobalLocale } from "../startup.js";
+import { removeGlobalProviderApiKey, saveGlobalLocale, saveGlobalModelSelection, saveGlobalThinkingLevel, } from "../startup.js";
 import { AutocompleteMenu, InteractiveChat, InteractiveComposer, InteractiveFooter, InteractiveHeader, } from "./interactive-components.js";
 import { InteractiveLayout } from "./interactive-layout.js";
 import { InteractiveProjection } from "./interactive-state.js";
@@ -64,6 +64,16 @@ function steeringCommandArgument(prompt) {
     const match = /^\/steer(?:\s+([\s\S]*))?$/i.exec(prompt);
     return match ? (match[1] ?? "").trim() : undefined;
 }
+function isContextSessionChoice(value) {
+    return (typeof value === "object" &&
+        value !== null &&
+        "id" in value &&
+        typeof value.id === "string" &&
+        "label" in value &&
+        typeof value.label === "string" &&
+        "open" in value &&
+        typeof value.open === "function");
+}
 export class InteractiveMode {
     projection = new InteractiveProjection();
     root;
@@ -71,7 +81,6 @@ export class InteractiveMode {
     session;
     tui;
     sessionChoices;
-    extensionHost;
     providerOnboarding;
     agentDir;
     readClipboardImagePath;
@@ -91,19 +100,32 @@ export class InteractiveMode {
     overlay;
     autocompleteOverlay;
     spinnerTimer;
-    shutdownEmitted = false;
     preserveClipboardFiles = false;
     locale;
+    commandRegistry;
+    context;
     constructor(options) {
         this.session = options.session;
         this.projection.configureFilePreview(this.session.allowedRoot, () => this.refresh());
         this.tui = options.tui;
         this.onExit = options.onExit;
-        this.sessionChoices = [...(options.sessions ?? [])];
-        this.extensionHost = options.extensionHost;
+        const contextChoices = (options.context?.sessionChoices() ?? []).filter(isContextSessionChoice).map((choice) => ({
+            ...choice,
+            open: async () => {
+                const session = await choice.open();
+                if (typeof session !== "object" || session === null)
+                    throw new Error(`Session choice ${choice.id} is invalid`);
+                return session;
+            },
+        }));
+        this.sessionChoices = [...(options.sessions ?? contextChoices)];
         this.providerOnboarding = options.providerOnboarding;
         this.agentDir = resolve(options.agentDir ?? join(homedir(), ".di-code"));
         this.locale = options.locale ?? DEFAULT_LOCALE;
+        this.commandRegistry = options.commandRegistry;
+        this.context = options.context;
+        if (this.context?.theme() === "light")
+            this.theme = "light";
         this.readClipboardImagePath = options.readClipboardImagePath ?? readClipboardImagePath;
         this.clipboardDirectory = clipboardImageDirectory(this.agentDir, this.session.allowedRoot);
         const autocomplete = {
@@ -113,9 +135,19 @@ export class InteractiveMode {
         this.editor = new Editor({
             maxHeight: 3,
             autocomplete,
+            submitAutocomplete: (context) => /^\/[^\s/]*$/.test(context.text.slice(0, context.cursor)),
         });
         this.editor.onSubmit = (text) => void this.submit(text);
-        this.editor.onEscape = () => this.activeAbort?.abort();
+        this.editor.onEscape = () => {
+            if (!this.activeAbort) {
+                this.context?.cancel();
+                return;
+            }
+            this.projection.setStatus(translate(this.locale, "cancelled"));
+            this.context?.cancel();
+            this.activeAbort.abort();
+            this.refresh();
+        };
         this.editor.onCommand = (data) => this.handleCommand(data);
         this.editor.onInterrupt = () => this.exit();
         this.editor.onChange = () => {
@@ -148,8 +180,6 @@ export class InteractiveMode {
         if (this.started)
             throw new Error("Interactive mode is already started");
         this.started = true;
-        this.shutdownEmitted = false;
-        void this.extensionHost?.emit({ type: "session_start", cwd: this.session.allowedRoot });
         this.projection.replaceTranscript(this.session.transcript);
         this.projection.setUsage(this.session.usage);
         this.subscribeToSession();
@@ -184,16 +214,22 @@ export class InteractiveMode {
         this.unsubscribeSession = undefined;
         void this.cleanupClipboardFiles();
         this.tui.stop({ finalLines: this.root.renderTranscript(this.tui.columns) });
-        if (!this.shutdownEmitted) {
-            this.shutdownEmitted = true;
-            void this.extensionHost?.emit({ type: "session_shutdown", reason: "user" });
-        }
+    }
+    /** Cancels the active prompt without changing Session history. */
+    cancelActivePrompt() {
+        this.activeAbort?.abort();
+    }
+    /** Re-submits the last failed prompt when the mode is idle. */
+    retryLastPrompt() {
+        if (this.lastFailedPrompt && !this.promptInFlight)
+            void this.submit(this.lastFailedPrompt, true);
     }
     exit() {
         this.stop();
         this.onExit?.();
     }
     handleCommand(data) {
+        this.context?.keybindings();
         if (matchesKey(data, Key.alt("s"))) {
             void this.submitSteering(this.editor.getValue());
             return true;
@@ -202,6 +238,12 @@ export class InteractiveMode {
             try {
                 const level = this.session.cycleThinkingLevel();
                 this.projection.setStatus(level ? `thinking=${level}` : "Current model does not support thinking levels.");
+                if (level) {
+                    void saveGlobalThinkingLevel(this.agentDir, this.session.providerId, this.session.modelId, level).catch((cause) => {
+                        this.projection.setError(cause instanceof Error ? cause.message : String(cause));
+                        this.refresh();
+                    });
+                }
             }
             catch (cause) {
                 this.projection.setError(cause instanceof Error ? cause.message : String(cause));
@@ -260,6 +302,7 @@ export class InteractiveMode {
         ]);
         list.onSelect = (item) => {
             this.theme = item.value === "light" ? "light" : "dark";
+            this.context?.setTheme(this.theme);
             this.projection.setStatus(`theme=${this.theme}`);
             this.closeOverlay();
             this.refresh();
@@ -277,6 +320,10 @@ export class InteractiveMode {
             try {
                 this.session.setModel(item.value);
                 this.projection.setStatus(`model=${item.value}`);
+                void saveGlobalModelSelection(this.agentDir, this.session.providerId, this.session.modelId).catch((cause) => {
+                    this.projection.setError(cause instanceof Error ? cause.message : String(cause));
+                    this.refresh();
+                });
                 this.closeOverlay();
                 this.refresh();
             }
@@ -602,7 +649,9 @@ export class InteractiveMode {
             const input = await extractImageAttachments(normalizeDroppedImagePrompt(prompt, this.session.allowedRoot), this.session.allowedRoot);
             this.preserveClipboardFiles = true;
             this.editor.setValue("");
-            const result = await this.session.promptWithImages(input.text, input.images, this.activeAbort.signal);
+            const result = retry && "retry" in this.session
+                ? await this.session.retry(this.activeAbort.signal)
+                : await this.session.promptWithImages(input.text, input.images, this.activeAbort.signal);
             if (result.stopReason === "error" || result.stopReason === "aborted")
                 this.lastFailedPrompt = prompt;
             else {
@@ -689,6 +738,22 @@ export class InteractiveMode {
         const [rawCommand = "", ...argParts] = trimmed.split(/\s+/);
         const command = rawCommand.toLowerCase();
         const args = argParts.join(" ");
+        if (this.commandRegistry?.list().some((entry) => entry.name === command)) {
+            void this.commandRegistry
+                .execute(command, {
+                host: { runCommand: (name, value) => this.runRegisteredCommand(name, value) },
+                args,
+            })
+                .catch((cause) => {
+                this.projection.setError(cause instanceof Error ? cause.message : String(cause));
+                this.refresh();
+            });
+            this.refresh();
+            return;
+        }
+        this.runRegisteredCommand(command, args);
+    }
+    runRegisteredCommand(command, _args) {
         switch (command) {
             case "help":
                 this.projection.setStatus(`commands: ${this.listSlashCommands()
@@ -701,49 +766,46 @@ export class InteractiveMode {
                 break;
             case "model":
                 this.openModelSelector();
-                return;
+                return 0;
             case "session":
                 this.openSessionSelector();
-                return;
+                return 0;
             case "tree":
                 this.openTreeSelector();
-                return;
+                return 0;
             case "theme":
                 this.openThemeSelector();
-                return;
+                return 0;
             case "settings":
                 this.openSettingsSelector();
-                return;
+                return 0;
             case "login":
                 this.openProviderLogin();
-                return;
+                return 0;
             case "logout":
                 void this.logoutProvider();
-                return;
+                return 0;
             case "compact":
                 void this.runManualCompaction();
-                return;
+                return 0;
             case "usage":
                 this.projection.setStatus(this.formatUsage());
                 break;
             case "retry":
-                if (this.lastFailedPrompt && !this.promptInFlight)
-                    void this.submit(this.lastFailedPrompt, true);
+                if (this.lastFailedPrompt && !this.promptInFlight) {
+                    if (this.context)
+                        void this.context.retry();
+                    else
+                        void this.submit(this.lastFailedPrompt, true);
+                }
                 else
                     this.projection.setStatus(translate(this.locale, "nothingToRetry"));
                 break;
-            default: {
-                if (this.extensionHost?.listCommands().some((entry) => entry.name === command)) {
-                    void this.extensionHost.runCommand(command, args).catch((cause) => {
-                        this.projection.setError(cause instanceof Error ? cause.message : String(cause));
-                        this.refresh();
-                    });
-                    break;
-                }
+            default:
                 this.projection.setError(`Unknown command: /${command}`);
-            }
         }
         this.refresh();
+        return 0;
     }
     openProviderLogin() {
         if (!this.providerOnboarding) {
@@ -813,7 +875,11 @@ export class InteractiveMode {
             name: `skill:${skill.name}`,
             description: skill.description,
         }));
-        return [...builtinSlashCommands(this.locale), ...(this.extensionHost?.listCommands() ?? []), ...skills];
+        const registryCommands = this.commandRegistry?.list().map((command) => ({
+            name: command.name,
+            description: typeof command.description === "function" ? command.description(this.locale) : command.description,
+        }));
+        return [...(registryCommands ?? builtinSlashCommands(this.locale)), ...skills];
     }
     isLoadedSkillCommand(input) {
         const name = /^\/skill:([a-z0-9]+(?:-[a-z0-9]+)*)(?:\s|$)/.exec(input)?.[1];