actoviq-agent-sdk 0.4.13 → 0.4.15

package/dist/src/tui/hadamardTui.js

@@ -18,11 +18,12 @@ import { parseCrushSessionReferenceDetails } from '../parity/crushSessionHistory
 import { readProjectMeta } from '../gui/projectMeta.js';
 import { readWorkspaceRegistry } from '../gui/workspaceRegistry.js';
 import { persistHadamardSettingsStore, resolveHadamardSettingsStore, } from '../config/hadamardSettingsStore.js';
+import { readProjectSettings, writeProjectSettings, } from '../config/projectSettings.js';
 import { createPreToolUseHookClassifier, readPreToolUseHooks, readPostToolUseHooks, runPostToolUseHooks, readSessionStartHooks, runSessionStartHooks } from '../hooks/userHooks.js';
 import { parseTypedHooks } from '../hooks/hookConfig.js';
 import { isRecord } from '../runtime/helpers.js';
 import { getLoadedJsonConfig } from '../config/loadJsonConfigFile.js';
-import { buildModelConfigurationCatalog, findModelConfiguration, resolveHadamardConfigurationModel, } from '../config/modelConfigurationCatalog.js';
+import { buildModelConfigurationCatalog, findModelConfiguration, isModelCredentialConfigured, resolveHadamardConfigurationModel, } from '../config/modelConfigurationCatalog.js';
 import { findBridgeConfig, maskApiKey, readBridgeConfigs, addBridgeConfig, removeBridgeConfig, isManagedExternalCliRuntime, } from '../parity/bridgeConfigs.js';
 import { buildRouteModelApi } from '../router/modelRouter.js';
 import { addMcpServer, readMcpServerConfig, removeMcpServer } from '../mcp/mcpServerConfig.js';
@@ -40,6 +41,7 @@ import { InputEditor } from './editor.js';
 import { discoverHadamardPlugins } from './pluginCatalog.js';
 import { TuiScreen } from './screen.js';
 import { ReasoningDisplayState } from './reasoningDisplay.js';
+import { ToolActivityDisplayState } from './toolActivityDisplay.js';
 import { recallLatestFollowUp, restoreAbandonedFollowUp, submitActiveInput, } from './pendingInput.js';
 import { filterTuiSelectionItems, moveTuiSelection, } from './selection.js';
 import { StreamFlusher, formatBanner, formatCompactNotice, formatDivider, formatEditCall, formatErrorLine, formatInfoLine, formatQueuedPrompt, formatToolCall, formatToolResult, formatUserPrompt, } from './transcript.js';
@@ -172,7 +174,7 @@ export function renderRichText(text, width, opts = {}) {
     }
     return out;
 }
-function buildSystemPrompt(workDir) {
+function buildSystemPrompt(workDir, projectSettings, hadamardHomeDir) {
     let isGit = false;
     try {
         execSync('git rev-parse --is-inside-work-tree', { cwd: workDir, stdio: 'ignore' });
@@ -181,11 +183,14 @@ function buildSystemPrompt(workDir) {
     catch {
         // not a git repo
     }
-    // Load the CLAUDE.md hierarchy (user + project, with @includes) so the agent
+    // Load Hadamard instruction files (AGENTS.md by default) so the agent
     // picks up project-specific instructions — the canonical Claude Code behavior.
-    const project = loadProjectContext(workDir);
+    const project = loadProjectContext(workDir, {
+        projectInstructionMode: projectSettings.context.instructionMode,
+        hadamardHomeDir,
+    });
     const projectSection = project.text
-        ? `\n\n# Project context (CLAUDE.md)\n\nThe following project instructions were loaded from CLAUDE.md files. Treat them as authoritative guidance for this workspace.\n\n${project.text}\n`
+        ? `\n\n# Project context (AGENTS.md)\n\nThe following instruction files are authoritative guidance for this workspace.\n\n${project.text}\n`
         : '';
     return (`You are Hadamard Agent, an interactive CLI agent. Working directory: ${workDir}\n\n` +
         `<env>\nWorking directory: ${workDir}\nIs git repo: ${isGit ? 'Yes' : 'No'}\nPlatform: ${process.platform}\nDate: ${new Date().toISOString().slice(0, 10)}\n</env>\n\n` +
@@ -237,7 +242,6 @@ async function onboardCredentials(configPath) {
 export async function runHadamardTui(options = {}) {
     const workDir = path.resolve(options.workDir ?? process.cwd());
     const permissionMode = options.permissionMode ?? 'bypassPermissions';
-    const systemPrompt = buildSystemPrompt(workDir);
     try {
         if (options.configPath) {
             await loadJsonConfigFile(options.configPath);
@@ -249,6 +253,9 @@ export async function runHadamardTui(options = {}) {
     catch {
         // Missing local config is fine; env vars may carry credentials.
     }
+    const hadamardHomeDir = resolveHadamardHome();
+    let projectSettings = await readProjectSettings(workDir, hadamardHomeDir);
+    let systemPrompt = buildSystemPrompt(workDir, projectSettings, hadamardHomeDir);
     let applyPlanPermission = null;
     let managedPluginRuntime = null;
     let tools = [];
@@ -654,6 +661,8 @@ export async function runHadamardTui(options = {}) {
     let spinnerTimer = null;
     let dynamicRenderTimer = null;
     let runStartedAt = 0;
+    let requestStartedAt = 0;
+    let providerActivitySeen = false;
     let runToolCount = 0;
     let lastTokenEstimate;
     // Running token + USD totals for /cost and /usage. Per-config breakdown
@@ -665,6 +674,11 @@ export async function runHadamardTui(options = {}) {
     function recordUsage(model, usage) {
         const inT = usage?.input_tokens ?? 0;
         const outT = usage?.output_tokens ?? 0;
+        const reportedContextTokens = inT
+            + (usage?.cache_creation_input_tokens ?? 0)
+            + (usage?.cache_read_input_tokens ?? 0);
+        if (reportedContextTokens > 0)
+            lastTokenEstimate = reportedContextTokens;
         totalInputTokens += inT;
         totalOutputTokens += outT;
         const cost = estimateCost(model, inT, outT);
@@ -690,6 +704,7 @@ export async function runHadamardTui(options = {}) {
     let ctrlCTimer = null;
     let streamedTextSeen = false;
     const reasoningDisplay = new ReasoningDisplayState();
+    const toolActivityDisplay = new ToolActivityDisplayState();
     // Track tool names by callId for PostToolUse hook context.
     const toolCallNames = new Map();
     // Live todo list (captured from TodoWrite tool calls). Rendered as a
@@ -1049,8 +1064,7 @@ export async function runHadamardTui(options = {}) {
             const selected = index === menuSelected;
             const command = `/${name}`.padEnd(commandWidth);
             const label = selected ? `${A.inverse}${command}${A.reset}` : command;
-            const commandName = name.split(/\s/u, 1)[0] ?? name;
-            const unavailable = running && interactiveCommandRunPolicy(commandName) === 'idle-only';
+            const unavailable = running && interactiveCommandRunPolicy(name) === 'idle-only';
             const summary = TUI_SLASH_COMMANDS[name] ?? SUBCOMMAND_DESCRIPTIONS[name] ?? '';
             const description = truncateToWidth(unavailable ? `${summary} · after current run` : summary, descriptionWidth);
             return `${label} ${A.dim}${description}${A.reset}`;
@@ -1068,7 +1082,7 @@ export async function runHadamardTui(options = {}) {
         const selected = matches[Math.min(menuSelected, matches.length - 1)];
         if (selected) {
             const commandName = selected.split(/\s/u, 1)[0] ?? selected;
-            const availability = interactiveCommandRunPolicy(commandName) === 'during-run'
+            const availability = interactiveCommandRunPolicy(selected) === 'during-run'
                 ? 'available while working'
                 : 'idle session';
             lines.push(`${A.dim}  ${interactiveCommandUsage(commandName)} · ${availability}${A.reset}`);
@@ -1472,13 +1486,21 @@ export async function runHadamardTui(options = {}) {
         }
         running = true;
         runStartedAt = Date.now();
+        requestStartedAt = 0;
+        providerActivitySeen = false;
         runToolCount = 0;
-        statusNote = '';
+        toolActivityDisplay.reset();
+        toolCallNames.clear();
+        statusNote = 'preparing locally';
         streamedTextSeen = false;
         lastTokenEstimate = undefined;
         abortCtrl = new AbortController();
         spinnerTimer = setInterval(() => {
             spinnerFrame += 1;
+            if (requestStartedAt > 0 && !providerActivitySeen) {
+                const waitingSeconds = Math.max(Math.round((Date.now() - requestStartedAt) / 1000), 0);
+                statusNote = `waiting for model ${waitingSeconds}s`;
+            }
             renderDynamic();
         }, 120);
         appendStatic(formatUserPrompt(text));
@@ -1630,8 +1652,13 @@ export async function runHadamardTui(options = {}) {
             case 'run.started':
                 streamedTextSeen = false;
                 reasoningDisplay.reset();
+                toolActivityDisplay.reset();
+                toolCallNames.clear();
                 return;
             case 'request.started':
+                requestStartedAt = Date.now();
+                providerActivitySeen = false;
+                statusNote = 'waiting for model 0s';
                 lastTokenEstimate = typeof data.requestTokenEstimate === 'number'
                     ? data.requestTokenEstimate
                     : undefined;
@@ -1641,6 +1668,7 @@ export async function runHadamardTui(options = {}) {
                 const delta = typeof data.delta === 'string' ? data.delta : '';
                 if (!delta)
                     return;
+                providerActivitySeen = true;
                 collapseReasoning();
                 streamedTextSeen = true;
                 const flushed = flusher.push(delta);
@@ -1653,11 +1681,13 @@ export async function runHadamardTui(options = {}) {
                 const delta = typeof data.delta === 'string' ? data.delta : '';
                 if (!delta)
                     return;
+                providerActivitySeen = true;
                 reasoningDisplay.append(delta);
                 scheduleDynamicRender();
                 return;
             }
             case 'tool.input.delta': {
+                providerActivitySeen = true;
                 const name = typeof data.name === 'string' && data.name ? data.name : 'tool';
                 const snapshot = typeof data.snapshot === 'string'
                     ? data.snapshot.trim().replace(/\s+/g, ' ')
@@ -1668,6 +1698,7 @@ export async function runHadamardTui(options = {}) {
                 return;
             }
             case 'model.content': {
+                providerActivitySeen = true;
                 const content = isRecord(data.content) ? data.content : undefined;
                 if (data.kind === 'content' && content?.type === 'thinking' && !reasoningDisplay.hasStreamedContent) {
                     const thinking = typeof content.thinking === 'string' ? content.thinking : '';
@@ -1677,8 +1708,11 @@ export async function runHadamardTui(options = {}) {
                 return;
             }
             case 'tool.started': {
-                collapseReasoning();
                 const callId = typeof data.callId === 'string' ? data.callId : '';
+                if (!toolActivityDisplay.markStarted(callId))
+                    return;
+                providerActivitySeen = true;
+                collapseReasoning();
                 const publicName = typeof data.publicName === 'string'
                     ? data.publicName
                     : typeof data.name === 'string' ? data.name : 'tool';
@@ -1727,6 +1761,8 @@ export async function runHadamardTui(options = {}) {
             case 'tool.failed':
             case 'tool.rejected': {
                 const callId = typeof data.callId === 'string' ? data.callId : '';
+                if (!toolActivityDisplay.markTerminal(callId))
+                    return;
                 const outputText = typeof data.outputText === 'string' ? data.outputText : '';
                 statusNote = '';
                 appendStatic(formatToolResult({
@@ -1739,6 +1775,8 @@ export async function runHadamardTui(options = {}) {
                 if (toolName) {
                     runPostToolUseHooks(() => readPostToolUseHooks(getLoadedJsonConfig()?.raw), toolName, null, outputText, sdk.config.workDir);
                 }
+                if (callId)
+                    toolCallNames.delete(callId);
                 renderDynamic();
                 return;
             }
@@ -1813,6 +1851,43 @@ export async function runHadamardTui(options = {}) {
         if (selected)
             await resumeSession(selected);
     }
+    async function configureContextSettings(requestedMode = '') {
+        const normalized = requestedMode.trim().toLowerCase();
+        let instructionMode;
+        if (normalized === 'agents' || normalized === 'claude' || normalized === 'both') {
+            instructionMode = normalized;
+        }
+        else if (normalized) {
+            appendStatic([...formatErrorLine('usage: /context settings [agents|claude|both]'), '']);
+            return;
+        }
+        else {
+            const selected = await selectItem({
+                title: 'Context settings',
+                subtitle: `Current project mode: ${projectSettings.context.instructionMode}`,
+                searchable: false,
+                items: [
+                    { id: 'agents', label: 'AGENTS.md', description: 'Recommended Hadamard default' },
+                    { id: 'claude', label: 'CLAUDE.md', description: 'Project-level Claude compatibility' },
+                    { id: 'both', label: 'AGENTS.md + CLAUDE.md', description: 'Load both project instruction formats' },
+                ],
+            });
+            if (selected === 'agents' || selected === 'claude' || selected === 'both') {
+                instructionMode = selected;
+            }
+        }
+        if (!instructionMode)
+            return;
+        projectSettings = await writeProjectSettings(workDir, hadamardHomeDir, {
+            context: { instructionMode },
+        });
+        systemPrompt = buildSystemPrompt(workDir, projectSettings, hadamardHomeDir);
+        appendStatic([
+            ...formatInfoLine(`context instructions: ${instructionMode}`),
+            ...formatInfoLine('Global rules remain ~/.hadamard/AGENTS.md.'),
+            '',
+        ]);
+    }
     async function chooseModel() {
         const catalog = buildModelConfigurationCatalog({
             model: sdk.config.model,
@@ -1923,7 +1998,7 @@ export async function runHadamardTui(options = {}) {
                     {
                         id: 'api-key',
                         label: 'API key',
-                        description: env.HADAMARD_API_KEY || env.HADAMARD_AUTH_TOKEN ? 'configured' : 'not configured',
+                        description: isModelCredentialConfigured(env, sdk.config) ? 'configured' : 'not configured',
                     },
                     {
                         id: 'base-url',
@@ -3517,7 +3592,7 @@ export async function runHadamardTui(options = {}) {
         const spaceIndex = raw.indexOf(' ');
         const name = (spaceIndex === -1 ? raw.slice(1) : raw.slice(1, spaceIndex)).toLowerCase();
         const args = spaceIndex === -1 ? '' : raw.slice(spaceIndex + 1).trim();
-        if (!canRunInteractiveCommand(name, running)) {
+        if (!canRunInteractiveCommand(raw.slice(1), running)) {
             appendStatic(formatInfoLine(`/${name} requires an idle session; it will be available after this run`));
             return;
         }
@@ -3551,10 +3626,10 @@ export async function runHadamardTui(options = {}) {
                     renderDynamic();
                     return;
                 case 'init': {
-                    // Bootstrap a CLAUDE.md by having the agent explore the repo and
-                    // write concise guidance — complements the CLAUDE.md loader (the
+                    // Bootstrap AGENTS.md by having the agent explore the repo and
+                    // write concise guidance for subsequent Hadamard sessions.
                     // generated file is then injected into every system prompt).
-                    await startRun('Create or update a CLAUDE.md at the repo root with concise guidance for AI coding assistants: the build/test/lint/run commands, a short architecture overview, key conventions, and non-obvious gotchas. Explore with Glob, Grep, and Read first (package.json, README, existing CLAUDE.md, key source dirs). If a CLAUDE.md already exists, improve it without discarding user-authored sections. Keep it focused — no filler.');
+                    await startRun('Create or update an AGENTS.md at the repo root with concise guidance for AI coding assistants: build/test/lint/run commands, a short architecture overview, key conventions, and non-obvious gotchas. Explore with Glob, Grep, and Read first (package.json, README, existing AGENTS.md, key source dirs). If AGENTS.md already exists, improve it without discarding user-authored sections. Keep it focused and avoid filler.');
                     return;
                 }
                 case 'exit':
@@ -3927,9 +4002,22 @@ export async function runHadamardTui(options = {}) {
                     return;
                 }
                 case 'context': {
+                    const contextArgs = args.trim();
+                    if (contextArgs === 'setting' || contextArgs === 'settings') {
+                        await configureContextSettings();
+                        return;
+                    }
+                    if (contextArgs.startsWith('setting ') || contextArgs.startsWith('settings ')) {
+                        await configureContextSettings(contextArgs.replace(/^settings?\s+/u, ''));
+                        return;
+                    }
+                    if (contextArgs) {
+                        appendStatic([...formatErrorLine('usage: /context [settings [agents|claude|both]]'), '']);
+                        return;
+                    }
                     // Break down what is consuming the context window (gap #9 vs
                     // claude-code's /context) — usage, messages, system prompt, tools,
-                    // the loaded CLAUDE.md sources, and the active config.
+                    // the loaded project instruction sources, and the active config.
                     const { resolveHadamardCompactBudget } = await import('../runtime/hadamardCompact.js');
                     const compactBudget = resolveHadamardCompactBudget(sdk.config.compact);
                     const window = compactBudget.effectiveContextWindowTokens;
@@ -3941,7 +4029,10 @@ export async function runHadamardTui(options = {}) {
                     const messages = session.messages.length;
                     const sysChars = systemPrompt.length;
                     const mcpCount = toolMetadata.filter(t => t.provider === 'mcp').length;
-                    const project = loadProjectContext(sdk.config.workDir);
+                    const project = loadProjectContext(sdk.config.workDir, {
+                        projectInstructionMode: projectSettings.context.instructionMode,
+                        hadamardHomeDir,
+                    });
                     const team = activeTeamName ?? 'none';
                     const router = activeRouter ? activeRouter.name : 'off';
                     const bridge = bridgeMode && activeBridgeConfig ? activeBridgeConfig.name : 'off';
@@ -3953,7 +4044,7 @@ export async function runHadamardTui(options = {}) {
                         `  ${A.dim}messages${A.reset}        ${messages}`,
                         `  ${A.dim}system prompt${A.reset}   ~${sysChars} chars`,
                         `  ${A.dim}tools${A.reset}           ${toolMetadata.length}${mcpCount > 0 ? ` (${mcpCount} MCP)` : ''}`,
-                        `  ${A.dim}CLAUDE.md${A.reset}       ${project.sources.length ? project.sources.join(', ') : '(none loaded)'}`,
+                        `  ${A.dim}instruction files${A.reset} ${project.sources.length ? project.sources.join(', ') : '(none loaded)'}`,
                         `  ${A.dim}active${A.reset}         model=${session.model} · effort=${currentEffort() ?? 'auto'} · team=${team} · router=${router} · bridge=${bridge}`,
                         '',
                     ]);
@@ -4015,8 +4106,11 @@ export async function runHadamardTui(options = {}) {
                     lines.push(`  ${ok(true)} permission mode ${A.dim}${currentPermissionMode()}${A.reset}`);
                     lines.push(`  ${ok(toolMetadata.length > 0)} tools ${A.dim}${toolMetadata.length}${A.reset}`);
                     // Context memory
-                    const project = loadProjectContext(cfg.workDir);
-                    lines.push(`  ${ok(project.sources.length > 0)} CLAUDE.md ${A.dim}${project.sources.length ? project.sources.join(', ') : '(none)'}${A.reset}`);
+                    const project = loadProjectContext(cfg.workDir, {
+                        projectInstructionMode: projectSettings.context.instructionMode,
+                        hadamardHomeDir,
+                    });
+                    lines.push(`  ${ok(project.sources.length > 0)} instruction files ${A.dim}${project.sources.length ? project.sources.join(', ') : '(none)'}${A.reset}`);
                     // Bridge runtimes
                     const detections = await withSpinner('detecting runtimes', detectBridgeProviders);
                     const avail = detections.filter(d => d.available);
@@ -4106,7 +4200,7 @@ export async function runHadamardTui(options = {}) {
                 case 'compact': {
                     try {
                         const summaryInstructions = args || undefined;
-                        const result = await session.compact({ force: true, summaryInstructions });
+                        const result = await session.compact({ summaryInstructions });
                         if (!result.compacted) {
                             appendStatic([
                                 ...formatErrorLine(result.error ?? `compact skipped: ${result.reason}`),
@@ -4969,9 +5063,12 @@ export async function runHadamardTui(options = {}) {
                             __hadamardUseDefaultTools: false,
                             __hadamardAllowedTools: tools.map(item => item.name),
                         });
+                        const assistantToolDisplay = new ToolActivityDisplayState();
                         for await (const event of stream) {
-                            if (event.type === 'tool.call')
+                            if (event.type === 'tool.call'
+                                && assistantToolDisplay.markStarted(event.call.id)) {
                                 appendStatic([`${A.dim}  ⚙ ${event.call.name}${A.reset}`]);
+                            }
                         }
                         const result = await stream.result;
                         if (result.text)
@@ -5321,9 +5418,12 @@ export async function runHadamardTui(options = {}) {
                                 __hadamardAllowedTools: managerTools.map((tool) => tool.name),
                             };
                             const stream = managerTuiSession.stream(prompt, runOptions);
+                            const managerToolDisplay = new ToolActivityDisplayState();
                             for await (const event of stream) {
-                                if (event.type === 'tool.call')
+                                if (event.type === 'tool.call'
+                                    && managerToolDisplay.markStarted(event.call.id)) {
                                     appendStatic([`${A.dim}  ⚡ ${event.call.name}${A.reset}`]);
+                                }
                             }
                             const result = await stream.result;
                             if (result.text)
@@ -5416,7 +5516,7 @@ export async function runHadamardTui(options = {}) {
             recalledFollowUp = null;
             editor.clear();
             menuSelected = 0;
-            if (running && !canRunInteractiveCommand(selectedName, true)) {
+            if (running && !canRunInteractiveCommand(selectedCommand.slice(1), true)) {
                 appendStatic(formatInfoLine(`/${selectedName} requires an idle session; it will be available after this run`));
                 renderDynamic();
                 return;
@@ -5445,7 +5545,7 @@ export async function runHadamardTui(options = {}) {
                 restoreAbandonedFollowUp(session, recalledFollowUp);
                 recalledFollowUp = null;
                 const command = text.slice(1).trim().split(/\s/u, 1)[0]?.toLowerCase() ?? '';
-                if (!canRunInteractiveCommand(command, true)) {
+                if (!canRunInteractiveCommand(text.slice(1), true)) {
                     appendStatic(formatInfoLine(`/${command} requires an idle session; it will be available after this run`));
                     renderDynamic();
                     return;