agent-sh 0.14.8 → 0.14.10

package/dist/agent/tool-protocol.d.ts

@@ -11,7 +11,7 @@
  */
 import type { ChatCompletionTool } from "./llm-client.js";
 import { type ToolDefinition } from "./types.js";
-import type { ConversationState } from "./conversation-state.js";
+import type { LiveView } from "./live-view.js";
 export interface PendingToolCall {
     id: string;
     name: string;
@@ -39,9 +39,9 @@ export interface ToolProtocol {
     /** Rewrite a tool call before execution (e.g., unwrap meta-tool). */
     rewriteToolCall(tc: PendingToolCall): PendingToolCall;
     /** Record the assistant turn in conversation state. */
-    recordAssistant(conv: ConversationState, text: string, toolCalls: PendingToolCall[], extras?: Record<string, unknown>): void;
+    recordAssistant(conv: LiveView, text: string, toolCalls: PendingToolCall[], extras?: Record<string, unknown>): void;
     /** Record all tool results for a batch as conversation messages. */
-    recordResults(conv: ConversationState, results: ToolResult[]): void;
+    recordResults(conv: LiveView, results: ToolResult[]): void;
     /** Create a stream filter for stripping tool calls from display. null = pass-through. */
     createStreamFilter(toolNames: string[]): StreamFilter | null;
     /**
@@ -57,8 +57,8 @@ export declare class ApiToolProtocol implements ToolProtocol {
     getToolPrompt(): string;
     extractToolCalls(_text: string, streamedCalls: PendingToolCall[]): PendingToolCall[];
     rewriteToolCall(tc: PendingToolCall): PendingToolCall;
-    recordAssistant(conv: ConversationState, text: string, toolCalls: PendingToolCall[], extras?: Record<string, unknown>): void;
-    recordResults(conv: ConversationState, results: ToolResult[]): void;
+    recordAssistant(conv: LiveView, text: string, toolCalls: PendingToolCall[], extras?: Record<string, unknown>): void;
+    recordResults(conv: LiveView, results: ToolResult[]): void;
     createStreamFilter(): null;
 }
 export declare class InlineToolProtocol implements ToolProtocol {
@@ -68,8 +68,8 @@ export declare class InlineToolProtocol implements ToolProtocol {
     getToolPrompt(tools: ToolDefinition[]): string;
     rewriteToolCall(tc: PendingToolCall): PendingToolCall;
     extractToolCalls(text: string, _streamedCalls: PendingToolCall[]): PendingToolCall[];
-    recordAssistant(conv: ConversationState, text: string, _toolCalls: PendingToolCall[], extras?: Record<string, unknown>): void;
-    recordResults(conv: ConversationState, results: ToolResult[]): void;
+    recordAssistant(conv: LiveView, text: string, _toolCalls: PendingToolCall[], extras?: Record<string, unknown>): void;
+    recordResults(conv: LiveView, results: ToolResult[]): void;
     createStreamFilter(_toolNames: string[]): StreamFilter;
 }
 export declare class DeferredToolProtocol implements ToolProtocol {
@@ -82,8 +82,8 @@ export declare class DeferredToolProtocol implements ToolProtocol {
     getToolPrompt(): string;
     extractToolCalls(_text: string, streamedCalls: PendingToolCall[]): PendingToolCall[];
     rewriteToolCall(tc: PendingToolCall): PendingToolCall;
-    recordAssistant(conv: ConversationState, text: string, toolCalls: PendingToolCall[], extras?: Record<string, unknown>): void;
-    recordResults(conv: ConversationState, results: ToolResult[]): void;
+    recordAssistant(conv: LiveView, text: string, toolCalls: PendingToolCall[], extras?: Record<string, unknown>): void;
+    recordResults(conv: LiveView, results: ToolResult[]): void;
     createStreamFilter(): null;
 }
 export declare class DeferredLookupProtocol implements ToolProtocol {
@@ -97,8 +97,8 @@ export declare class DeferredLookupProtocol implements ToolProtocol {
     getToolPrompt(): string;
     extractToolCalls(_text: string, streamedCalls: PendingToolCall[]): PendingToolCall[];
     rewriteToolCall(tc: PendingToolCall): PendingToolCall;
-    recordAssistant(conv: ConversationState, text: string, toolCalls: PendingToolCall[], extras?: Record<string, unknown>): void;
-    recordResults(conv: ConversationState, results: ToolResult[]): void;
+    recordAssistant(conv: LiveView, text: string, toolCalls: PendingToolCall[], extras?: Record<string, unknown>): void;
+    recordResults(conv: LiveView, results: ToolResult[]): void;
     createStreamFilter(): null;
     getProtocolTools(): ToolDefinition[];
 }

package/dist/cli/args.js

@@ -53,8 +53,8 @@ export function parseArgs(argv, env = process.env) {
     let provider;
     let backend;
     let shell = env.SHELL || "/bin/bash";
-    let apiKey = env.OPENAI_API_KEY;
-    let baseURL = env.OPENAI_BASE_URL;
+    let apiKey;
+    let baseURL;
     for (let i = 0; i < argv.length; i++) {
         const arg = argv[i];
         if (arg === "--model" && argv[i + 1]) {

package/dist/cli/index.js

@@ -4,6 +4,7 @@ import { activateAgent } from "../agent/index.js";
 import { createCore } from "../core/index.js";
 import { palette as p } from "../utils/palette.js";
 import { loadBuiltinExtensions } from "../extensions/index.js";
+import activateRollingHistory from "../agent/extensions/rolling-history/index.js";
 import { loadExtensions } from "../core/extension-loader.js";
 import { getSettings } from "../core/settings.js";
 import { dispatchSubcommand } from "./subcommands.js";
@@ -95,7 +96,9 @@ async function main() {
     registerShellHandlers(extCtx);
     activateAgent(extCtx);
     // Load before spawning the shell so PS1 lands below the banner.
-    await loadBuiltinExtensions(extCtx, getSettings().disabledBuiltins);
+    const settings = getSettings();
+    await loadBuiltinExtensions(extCtx, settings.disabledBuiltins);
+    activateRollingHistory(extCtx);
     const loadExtensionsTimeoutMs = 10000;
     let loadedExtensions = [];
     await Promise.race([
@@ -124,7 +127,6 @@ async function main() {
             hint);
         process.exit(1);
     }
-    const settings = getSettings();
     if (settings.startupBanner !== false) {
         const termW = process.stdout.columns || 80;
         const bannerW = Math.min(termW, 60);

package/dist/core/index.d.ts

@@ -20,7 +20,6 @@ export type { ColorPalette } from "../utils/palette.js";
 export type { AgentBackend, ToolDefinition, ImageContent } from "../agent/types.js";
 export { runSubagent, type SubagentOptions } from "../agent/subagent.js";
 export { LlmClient } from "../agent/llm-client.js";
-export { HistoryFile, InMemoryHistory, NoopHistory, type HistoryAdapter } from "../agent/history-file.js";
 export type { NuclearEntry } from "../agent/nuclear-form.js";
 export { compileSearchRegex, matchEntry, formatNuclearLine } from "../agent/nuclear-form.js";
 export interface AgentShellCore {

package/dist/core/index.js

@@ -19,7 +19,6 @@ export { EventBus } from "./event-bus.js";
 export { palette, setPalette, resetPalette } from "../utils/palette.js";
 export { runSubagent } from "../agent/subagent.js";
 export { LlmClient } from "../agent/llm-client.js";
-export { HistoryFile, InMemoryHistory, NoopHistory } from "../agent/history-file.js";
 export { compileSearchRegex, matchEntry, formatNuclearLine } from "../agent/nuclear-form.js";
 export function createCore(config) {
     const bus = new EventBus();

package/dist/core/settings.d.ts

@@ -65,7 +65,7 @@ export interface Settings {
      * that boot agent-sh as a library against a specific working tree).
      */
     historyFilePath?: string;
-    /** Auto-compact threshold as fraction of conversation budget (0-1, default 0.5). */
+    autoCompact?: boolean;
     autoCompactThreshold?: number;
     /** Max command output lines shown inline in TUI. */
     maxCommandOutputLines?: number;
@@ -116,8 +116,12 @@ export interface Settings {
     disabledExtensions?: string[];
 }
 declare const DEFAULTS: Required<Settings>;
+export type SettingSource = "session" | "env" | "file" | "default";
 /** Load settings from disk (cached after first call). */
 export declare function getSettings(): Settings & typeof DEFAULTS;
+export declare function setSessionOverlay(patch: Partial<Settings>): void;
+export declare function clearSessionOverlay(...keys: (keyof Settings)[]): void;
+export declare function getSettingSource(key: keyof Settings): SettingSource;
 /**
  * Get settings for an extension, namespaced under its key in settings.json.
  *

package/dist/core/settings.js

@@ -28,6 +28,7 @@ const DEFAULTS = {
     historyMaxBytes: 104857600, // 100MB — history is only accessed via search/expand, never loaded wholesale
     historyStartupEntries: 100,
     historyFilePath: undefined,
+    autoCompact: true,
     autoCompactThreshold: 0.5,
     maxCommandOutputLines: 3,
     readOutputMaxLines: 10,
@@ -41,6 +42,42 @@ const DEFAULTS = {
     disabledExtensions: [],
 };
 let cached = null;
+let envOverrides = null;
+let sessionOverlay = {};
+function parseBoolEnv(raw, key) {
+    if (raw === undefined)
+        return undefined;
+    const v = raw.trim().toLowerCase();
+    if (v === "on" || v === "true" || v === "1")
+        return true;
+    if (v === "off" || v === "false" || v === "0")
+        return false;
+    console.error(`[agent-sh] Warning: ${key}="${raw}" is not a boolean (off|on|true|false|0|1); ignoring.`);
+    return undefined;
+}
+function parseUnitFloatEnv(raw, key) {
+    if (raw === undefined)
+        return undefined;
+    const n = Number(raw);
+    if (!Number.isFinite(n) || n < 0 || n > 1) {
+        console.error(`[agent-sh] Warning: ${key}="${raw}" is not a number in [0, 1]; ignoring.`);
+        return undefined;
+    }
+    return n;
+}
+function loadEnvOverrides() {
+    if (envOverrides)
+        return envOverrides;
+    const out = {};
+    const ac = parseBoolEnv(process.env.AGENT_SH_AUTO_COMPACT, "AGENT_SH_AUTO_COMPACT");
+    if (ac !== undefined)
+        out.autoCompact = ac;
+    const th = parseUnitFloatEnv(process.env.AGENT_SH_AUTO_COMPACT_THRESHOLD, "AGENT_SH_AUTO_COMPACT_THRESHOLD");
+    if (th !== undefined)
+        out.autoCompactThreshold = th;
+    envOverrides = out;
+    return envOverrides;
+}
 /** Load settings from disk (cached after first call). */
 export function getSettings() {
     if (!cached) {
@@ -55,7 +92,29 @@ export function getSettings() {
             cached = {};
         }
     }
-    return { ...DEFAULTS, ...cached };
+    return { ...DEFAULTS, ...cached, ...loadEnvOverrides(), ...sessionOverlay };
+}
+export function setSessionOverlay(patch) {
+    sessionOverlay = { ...sessionOverlay, ...patch };
+}
+export function clearSessionOverlay(...keys) {
+    if (keys.length === 0) {
+        sessionOverlay = {};
+        return;
+    }
+    const next = { ...sessionOverlay };
+    for (const k of keys)
+        delete next[k];
+    sessionOverlay = next;
+}
+export function getSettingSource(key) {
+    if (key in sessionOverlay)
+        return "session";
+    if (key in loadEnvOverrides())
+        return "env";
+    if (cached && key in cached)
+        return "file";
+    return "default";
 }
 /**
  * Get settings for an extension, namespaced under its key in settings.json.
@@ -78,6 +137,8 @@ export function getExtensionSettings(namespace, defaults) {
 /** Reset cached settings (for testing or after external edit). */
 export function reloadSettings() {
     cached = null;
+    envOverrides = null;
+    sessionOverlay = {};
 }
 /**
  * Deep-merge a patch into ~/.agent-sh/settings.json on disk.

package/dist/extensions/index.d.ts

@@ -3,6 +3,7 @@
  * Module-owned built-ins activate inline:
  *   shell-context, tui-renderer → registerShellHandlers (src/shell/)
  *   ash (a specific backend)    → activateAgent         (src/agent/)
+ *   rolling-history              → activateRollingHistory (src/cli/)
  *   backend registry             → createCore           (src/core/)
  */
 import type { ExtensionContext } from "../shell/host-types.js";

package/dist/shell/events.d.ts

@@ -67,6 +67,7 @@ declare module "../core/event-bus.js" {
             data: string;
             consumed: boolean;
         };
+        "input:redraw": Record<string, never>;
         "compositor:write": {
             stream: string;
             text: string;

package/dist/shell/input-handler.js

@@ -35,6 +35,10 @@ export class InputHandler {
             if (this.activeMode)
                 this.drawPrompt();
         });
+        this.bus.on("input:redraw", () => {
+            if (this.activeMode)
+                this.renderModeInput();
+        });
         this.bus.on("input-mode:register", (config) => {
             this.registerMode(config);
         });

package/dist/shell/tui-renderer.js

@@ -408,11 +408,14 @@ export default function activate(ctx) {
     bus.on("ui:info", (e) => {
         stopCurrentSpinner();
         showInfo(e.message);
-        // Restart spinner if agent is still processing
+        bus.emit("input:redraw", {});
         if (s.renderer)
             startThinkingSpinner();
     });
-    bus.on("ui:error", (e) => showError(e.message));
+    bus.on("ui:error", (e) => {
+        showError(e.message);
+        bus.emit("input:redraw", {});
+    });
     bus.on("ui:suggestion", (e) => {
         compositor.surface("status").writeLine(`${p.dim}💡 ${e.text}${p.reset}`);
     });

package/dist/utils/diff-renderer.js

@@ -249,13 +249,15 @@ function renderUnifiedHunk(hunk, layout) {
     const out = [];
     const pairs = findChangePairs(hunk);
     const renderedAsPartOfPair = new Set();
+    const bgWidth = Math.max(1, textWidth - noW - 3);
+    const gutter = (n) => `${p.dim}${n} │${p.reset} `;
     for (let i = 0; i < hunk.lines.length; i++) {
         const line = hunk.lines[i];
         const no = String(line.type === "removed" ? (line.oldNo ?? "") : (line.newNo ?? line.oldNo ?? "")).padStart(noW);
         if (line.type === "context") {
             const raw = truncateText(line.text, lineTextW);
             const text = lang ? highlightLine(raw, lang) : raw;
-            out.push(`  ${p.dim}${no} │${p.reset} ${p.dim}${text}${p.reset}`);
+            out.push(`${gutter(no)}  ${p.dim}${text}${p.reset}`);
             continue;
         }
         if (line.type === "removed") {
@@ -275,17 +277,17 @@ function renderUnifiedHunk(hunk, layout) {
                 removedText = lang ? highlightLine(raw, lang) : raw;
             }
             if (useTrueColor) {
-                out.push(padToWidth(`${p.errorBg}${p.error}- ${no} │ ${preserveBg(removedText, p.errorBg)}`, textWidth) + p.reset);
+                out.push(gutter(no) + padToWidth(`${p.errorBg}${p.error}- ${preserveBg(removedText, p.errorBg)}`, bgWidth) + p.reset);
             }
             else {
-                out.push(`${p.error}- ${no} │ ${removedText}${p.reset}`);
+                out.push(`${gutter(no)}${p.error}- ${removedText}${p.reset}`);
             }
             if (addedText !== null && addedNo !== null) {
                 if (useTrueColor) {
-                    out.push(padToWidth(`${p.successBg}${p.success}+ ${addedNo} │ ${preserveBg(addedText, p.successBg)}`, textWidth) + p.reset);
+                    out.push(gutter(addedNo) + padToWidth(`${p.successBg}${p.success}+ ${preserveBg(addedText, p.successBg)}`, bgWidth) + p.reset);
                 }
                 else {
-                    out.push(`${p.success}+ ${addedNo} │ ${addedText}${p.reset}`);
+                    out.push(`${gutter(addedNo)}${p.success}+ ${addedText}${p.reset}`);
                 }
             }
             continue;
@@ -296,10 +298,10 @@ function renderUnifiedHunk(hunk, layout) {
             const raw = truncateText(line.text, lineTextW);
             const text = lang ? highlightLine(raw, lang) : raw;
             if (useTrueColor) {
-                out.push(padToWidth(`${p.successBg}${p.success}+ ${no} │ ${preserveBg(text, p.successBg)}`, textWidth) + p.reset);
+                out.push(gutter(no) + padToWidth(`${p.successBg}${p.success}+ ${preserveBg(text, p.successBg)}`, bgWidth) + p.reset);
             }
             else {
-                out.push(`${p.success}+ ${no} │ ${text}${p.reset}`);
+                out.push(`${gutter(no)}${p.success}+ ${text}${p.reset}`);
             }
         }
     }