@denizokcu/haze 0.0.2 → 0.0.3

package/dist/cli/commands/chat.js

@@ -2,11 +2,12 @@ import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-run
 import { useEffect, useRef, useState } from 'react';
 import { execFile as execFileCallback } from 'node:child_process';
 import { promisify } from 'node:util';
-import { Box, render, Text, useApp, useStdout } from 'ink';
+import { Box, render, Static, Text, useApp, useStdout } from 'ink';
 import Spinner from 'ink-spinner';
 import { readContextFiles } from '../../config/contextFiles.js';
 import { addInputHistoryItem, readInputHistory } from '../../config/inputHistory.js';
 import { readSettings, updateSettings } from '../../config/settings.js';
+import { activeModel, configuredProviders, DEFAULT_PROVIDER_NAME, findProvider, modelSelector, providerHasKey, resolveModelSelector, upsertProvider } from '../../config/providers.js';
 import { Header } from '../../ui/components/Header.js';
 import { TextInput } from '../../ui/components/TextInput.js';
 import { MarkdownText } from '../../ui/components/MarkdownText.js';
@@ -14,6 +15,9 @@ import { theme } from '../../ui/theme.js';
 import { handleSlashCommand } from './commands.js';
 import { runAgentTurn } from './streaming.js';
 import { loadSkillRegistry } from '../../skills/SkillRegistry.js';
+import { appendSessionEntry, createSession, formatSession, latestSession, restoreConversation } from '../../core/session/sessionStore.js';
+import { compactModelMessages, modelMessageText } from '../../core/agent/compaction.js';
+import { createSessionGoal, formatGoalStatus } from '../../core/goal/sessionGoal.js';
 const execFile = promisify(execFileCallback);
 async function currentBranchName() {
     try {
@@ -45,6 +49,19 @@ function formatTokenCount(tokens) {
         return `${(tokens / 1_000).toFixed(tokens >= 10_000 ? 0 : 1).replace(/\.0$/, '')}k`;
     return String(tokens);
 }
+function truncateWithEllipsis(text, maxLength) {
+    if (text.length <= maxLength)
+        return text;
+    return `${text.slice(0, maxLength).trimEnd()}…`;
+}
+function displayMessagesFromConversation(conversation) {
+    return conversation.flatMap(message => {
+        if (message.role !== 'user' && message.role !== 'assistant')
+            return [];
+        const text = modelMessageText(message).trim();
+        return text ? [{ role: message.role, text }] : [];
+    });
+}
 function estimateConversationTokens(messages) {
     const inputText = messages
         .filter(message => message.role === 'user' || message.role === 'tool')
@@ -59,6 +76,14 @@ function estimateConversationTokens(messages) {
         output: estimateTokens(outputText),
     };
 }
+function fullWidthLines(text, width, leftPadding = 0) {
+    const safeWidth = Math.max(1, width);
+    const prefix = ' '.repeat(leftPadding);
+    return text.replace(/\r\n|\r/g, '\n').split('\n').map(line => `${prefix}${line}`.padEnd(Math.max(safeWidth, line.length + leftPadding)));
+}
+function fullWidthBlankLine(width) {
+    return ''.padEnd(Math.max(1, width));
+}
 function ToolMessageText({ text, streaming }) {
     const lines = text.split('\n');
     return _jsx(Box, { flexDirection: "column", children: lines.map((line, index) => {
@@ -71,29 +96,40 @@ function ToolMessageText({ text, streaming }) {
             return _jsxs(Text, { color: theme.muted, children: [indent, _jsx(Text, { color: iconColor, children: icon }), " ", _jsx(Text, { color: theme.purple, children: toolName }), rest] }, `${index}-${line}`);
         }) });
 }
+function MessageView({ message, width }) {
+    if (message.role === 'user') {
+        return _jsxs(Box, { flexDirection: "column", marginBottom: 1, children: [_jsx(Text, { backgroundColor: theme.quoteBg, children: fullWidthBlankLine(width) }), _jsx(Text, { color: theme.success, bold: true, backgroundColor: theme.quoteBg, children: '  You asked'.padEnd(width) }), fullWidthLines(message.text, width, 2).map((line, lineIndex) => _jsx(Text, { color: "white", backgroundColor: theme.quoteBg, children: line }, lineIndex)), _jsx(Text, { backgroundColor: theme.quoteBg, children: fullWidthBlankLine(width) })] });
+    }
+    return _jsxs(Box, { flexDirection: "column", marginBottom: 1, children: [_jsx(Text, { color: message.role === 'assistant' ? theme.purple : message.role === 'tool' ? theme.blue : theme.muted, bold: true, children: message.role === 'assistant' ? 'haze' : message.role === 'tool' ? 'Tool' : 'Info' }), message.role === 'tool'
+                ? _jsx(ToolMessageText, { text: message.text, streaming: message.streaming })
+                : message.role === 'assistant' && !message.streaming
+                    ? _jsx(MarkdownText, { content: message.text })
+                    : _jsx(Text, { children: message.text })] });
+}
+function messageKey(message, index) {
+    return message.id ?? `${index}-${message.role}-${message.text}`;
+}
 function startupProviderInfo(settings) {
-    const model = process.env.HAZE_MODEL ?? settings.model ?? 'x-ai/grok-build-0.1';
-    const modelSource = process.env.HAZE_MODEL ? 'HAZE_MODEL env' : settings.model ? 'settings' : 'default';
-    const baseURL = process.env.OPENAI_BASE_URL ?? settings.baseURL ?? 'https://openrouter.ai/api/v1';
-    const baseURLSource = process.env.OPENAI_BASE_URL ? 'OPENAI_BASE_URL env' : settings.baseURL ? 'settings' : 'default';
-    const apiKeySource = process.env.OPENAI_API_KEY ? 'OPENAI_API_KEY env' : settings.apiKey ? '~/.haze/settings.json' : 'missing';
-    const provider = process.env.OPENAI_BASE_URL
-        ? 'OpenAI-compatible custom endpoint'
-        : settings.provider === 'openrouter' || settings.baseURL || settings.apiKey
-            ? 'OpenRouter'
-            : 'OpenRouter (not logged in)';
+    const selection = activeModel(settings);
+    const model = process.env.HAZE_MODEL ?? selection.model;
+    const modelSource = process.env.HAZE_MODEL ? 'HAZE_MODEL env' : settings.model ? 'settings' : 'provider default';
+    const baseURL = process.env.OPENAI_BASE_URL ?? selection.provider.url;
+    const baseURLSource = process.env.OPENAI_BASE_URL ? 'OPENAI_BASE_URL env' : 'settings';
+    const apiKeySource = process.env.OPENAI_API_KEY ? 'OPENAI_API_KEY env' : providerHasKey(settings, selection.provider) ? `provider ${selection.provider.name}` : 'missing';
+    const provider = process.env.OPENAI_BASE_URL ? 'OpenAI-compatible custom endpoint' : selection.provider.name;
     return [
         'Provider configuration',
         `- Provider: ${provider}`,
         `- Model: ${model} (${modelSource})`,
         `- Base URL: ${baseURL} (${baseURLSource})`,
-        `- API key: ${apiKeySource === 'missing' ? 'not configured; run /login or set OPENAI_API_KEY' : `configured via ${apiKeySource}`}`,
+        `- API key: ${apiKeySource === 'missing' ? 'not configured; local providers may not need one' : `configured via ${apiKeySource}`}`,
+        `- Configured providers: ${configuredProviders(settings).length}`,
     ].join('\n');
 }
-function ChatScreen({ debug = false, version }) {
+function ChatScreen({ debug = false, version, continueSession = false, noSession = false }) {
     const { exit } = useApp();
     const { stdout } = useStdout();
-    const height = stdout.rows ?? process.stdout.rows ?? 24;
+    const width = stdout.columns ?? process.stdout.columns ?? 80;
     const [messages, setMessages] = useState([
         { role: 'system', text: 'Welcome to Haze. Use /help for commands.' }
     ]);
@@ -101,14 +137,22 @@ function ChatScreen({ debug = false, version }) {
     const conversationRef = useRef([]);
     const lastAssistantTextRef = useRef('');
     const abortControllerRef = useRef(null);
+    const sessionRef = useRef(undefined);
+    const followUpQueueRef = useRef([]);
     const [inputHistory, setInputHistory] = useState([]);
     const [debugLogs, setDebugLogs] = useState([]);
     const [contextFiles, setContextFiles] = useState([]);
     const [mode, setMode] = useState('chat');
     const [busy, setBusy] = useState(false);
     const [busyLabel, setBusyLabel] = useState('Haze is thinking');
+    const [activeGoalStatus, setActiveGoalStatus] = useState();
+    const [sessionLabel, setSessionLabel] = useState();
+    const [queuedFollowUps, setQueuedFollowUps] = useState([]);
     const [skills, setSkills] = useState([]);
     const [branchName, setBranchName] = useState();
+    const [modelProviderFilter, setModelProviderFilter] = useState();
+    const [selectedProviderName, setSelectedProviderName] = useState();
+    const [providerDraft, setProviderDraft] = useState({});
     useEffect(() => {
         Promise.all([readSettings(), currentBranchName()]).then(([next, branch]) => {
             setSettings(next);
@@ -122,6 +166,10 @@ function ChatScreen({ debug = false, version }) {
                 setMessages(m => [...m, { role: 'system', text: startupProviderInfo({}) }]);
             });
         });
+        initializeSession().catch(error => {
+            const text = error instanceof Error ? error.message : String(error);
+            setMessages(m => [...m, { role: 'system', text: `Session disabled: ${text}` }]);
+        });
         readInputHistory().then(setInputHistory).catch(() => undefined);
         readContextFiles().then(setContextFiles).catch(() => undefined);
         refreshSkills().catch(() => undefined);
@@ -142,56 +190,329 @@ function ChatScreen({ debug = false, version }) {
     function skillInvocation(value) {
         if (!value.startsWith('/'))
             return undefined;
-        const name = value.slice(1).trim();
-        if (!name || name.includes(' '))
+        const [name, ...args] = value.slice(1).trim().split(/\s+/).filter(Boolean);
+        if (!name)
             return undefined;
-        return skills.find(skill => skill.name === name);
+        const skill = skills.find(candidate => candidate.name === name);
+        return skill ? { skill, args: args.join(' ') } : undefined;
     }
     function debugLog(line) {
         if (!debug)
             return;
         setDebugLogs(current => [...current.slice(-7), line]);
     }
+    async function startNewSession(message = 'Started a new session.') {
+        if (noSession) {
+            sessionRef.current = undefined;
+            setSessionLabel('session off');
+            return;
+        }
+        const session = await createSession({ hazeVersion: version });
+        sessionRef.current = session;
+        setSessionLabel(session.id);
+        setMessages(m => [...m, { role: 'system', text: `${message}\nSession saved: ${session.file}` }]);
+    }
+    async function initializeSession() {
+        if (noSession) {
+            setSessionLabel('session off');
+            return;
+        }
+        if (continueSession) {
+            const session = await latestSession();
+            if (session) {
+                const conversation = await restoreConversation(session);
+                sessionRef.current = session;
+                conversationRef.current = conversation;
+                setSessionLabel(session.id);
+                setMessages(m => [...m, { role: 'system', text: `Resumed session: ${formatSession(session)}` }, ...displayMessagesFromConversation(conversation)]);
+                return;
+            }
+        }
+        await startNewSession(continueSession ? 'No previous session found. Started a new session.' : 'Started a new session.');
+    }
     function clearConversation() {
         conversationRef.current = [];
         lastAssistantTextRef.current = '';
         setMessages([{ role: 'system', text: 'Cleared. The void is productive.' }]);
+        const session = sessionRef.current;
+        if (session)
+            void appendSessionEntry(session, { type: 'event', at: new Date().toISOString(), name: 'clear', text: 'Conversation cleared' }).catch(() => undefined);
+    }
+    function compactConversation(instructions) {
+        const result = compactModelMessages(conversationRef.current, { instructions });
+        if (!result.compacted) {
+            setMessages(m => [...m, { role: 'system', text: `Compaction skipped: only ${result.keptCount} model messages in context.` }]);
+            return false;
+        }
+        conversationRef.current = result.messages;
+        const session = sessionRef.current;
+        if (session) {
+            void appendSessionEntry(session, { type: 'event', at: new Date().toISOString(), name: 'compact', text: `Compacted ${result.olderCount} messages; kept ${result.keptCount}.` }).catch(() => undefined);
+            void appendSessionEntry(session, { type: 'conversation_snapshot', at: new Date().toISOString(), messages: result.messages }).catch(() => undefined);
+        }
+        setMessages(m => [...m, { role: 'system', text: `Compacted context: summarized ${result.olderCount} older model messages and kept the last ${result.keptCount}.` }]);
+        return true;
+    }
+    async function resumeLatestSession() {
+        const session = await latestSession();
+        if (!session) {
+            setMessages(m => [...m, { role: 'system', text: 'No previous session found for this workspace.' }]);
+            return;
+        }
+        const conversation = await restoreConversation(session);
+        sessionRef.current = session;
+        conversationRef.current = conversation;
+        setSessionLabel(session.id);
+        setMessages([{ role: 'system', text: `Resumed session: ${formatSession(session)}` }, ...displayMessagesFromConversation(conversation)]);
     }
     function cancelThinking() {
         if (!busy)
             return;
         abortControllerRef.current?.abort('User pressed Esc.');
+        if (followUpQueueRef.current.length > 0) {
+            followUpQueueRef.current = [];
+            setQueuedFollowUps([]);
+            setMessages(m => [...m, { role: 'system', text: 'Cleared queued follow-ups after interrupt.' }]);
+        }
         setBusy(false);
     }
-    async function submit(value) {
-        if (busy)
+    function queueFollowUp(value) {
+        const trimmed = value.trim();
+        if (!trimmed)
             return;
-        if (mode === 'apiKey') {
-            const next = await updateSettings({ provider: 'openrouter', apiKey: value, baseURL: 'https://openrouter.ai/api/v1' });
-            setSettings(next);
+        followUpQueueRef.current = [...followUpQueueRef.current, trimmed];
+        setQueuedFollowUps(followUpQueueRef.current);
+        setMessages(m => [...m, { role: 'system', text: `Queued follow-up (${followUpQueueRef.current.length}): ${trimmed}` }]);
+    }
+    function closeInputList() {
+        if (mode === 'provider' || mode === 'providerAction' || mode === 'model') {
             setMode('chat');
-            setMessages(m => [...m, { role: 'system', text: `OpenRouter login saved to ~/.haze/settings.json. Security theatre completed.\n\n${startupProviderInfo(next)}` }]);
+            setModelProviderFilter(undefined);
+            setSelectedProviderName(undefined);
+        }
+    }
+    function providerSuggestions() {
+        return [
+            ...configuredProviders(settings).map(provider => ({
+                value: provider.name,
+                description: `${provider.url} · ${provider.models.length} model${provider.models.length === 1 ? '' : 's'}`,
+                kind: 'provider',
+            })),
+            { value: 'add provider', description: 'Add a new OpenAI-compatible provider', kind: 'provider' },
+        ];
+    }
+    function providerActionSuggestions() {
+        return [
+            { value: 'use provider', description: 'Set this provider and choose a model', kind: 'provider' },
+            { value: 'add models', description: 'Append comma-separated model names to this provider', kind: 'provider' },
+        ];
+    }
+    function modelSuggestions() {
+        const providers = configuredProviders(settings).filter(provider => !modelProviderFilter || provider.name === modelProviderFilter);
+        return providers.flatMap(provider => provider.models.map(model => ({
+            value: modelProviderFilter ? model : modelSelector(provider, model),
+            description: provider.name,
+            kind: 'model',
+        })));
+    }
+    async function selectProvider(providerName) {
+        if (providerName === 'add provider') {
+            setProviderDraft({});
+            setMode('providerAddName');
+            setMessages(m => [...m, { role: 'system', text: 'Provider name? Example: openrouter, local, lmstudio.' }]);
             return;
         }
-        if (mode === 'model') {
-            const next = await updateSettings({ model: value });
-            setSettings(next);
+        const provider = findProvider(settings, providerName);
+        if (!provider) {
+            setMessages(m => [...m, { role: 'system', text: `No provider named ${providerName}. Use /provider and choose add provider.` }]);
+            setMode('chat');
+            return;
+        }
+        setSelectedProviderName(provider.name);
+        setMode('providerAction');
+        setMessages(m => [...m, { role: 'system', text: `${provider.name}: choose an action.` }]);
+    }
+    async function useProvider(providerName) {
+        const provider = findProvider(settings, providerName);
+        if (!provider) {
+            setMessages(m => [...m, { role: 'system', text: `No provider named ${providerName}.` }]);
             setMode('chat');
-            setMessages(m => [...m, { role: 'system', text: `Model set to ${value}.\n\n${startupProviderInfo(next)}` }]);
+            setSelectedProviderName(undefined);
+            return;
+        }
+        const next = await updateSettings({ provider: provider.name });
+        setSettings(next);
+        setSelectedProviderName(undefined);
+        setModelProviderFilter(provider.name);
+        setMode('model');
+        setMessages(m => [...m, { role: 'system', text: `Provider set to ${provider.name}. Choose a model.` }]);
+    }
+    async function selectProviderAction(action) {
+        if (!selectedProviderName) {
+            setMode('provider');
+            return;
+        }
+        if (action === 'use provider') {
+            await useProvider(selectedProviderName);
+            return;
+        }
+        if (action === 'add models') {
+            setMode('providerAppendModels');
+            setMessages(m => [...m, { role: 'system', text: `Comma-separated model names to add to ${selectedProviderName}?` }]);
+            return;
+        }
+        setMessages(m => [...m, { role: 'system', text: `Unknown provider action: ${action}` }]);
+    }
+    async function selectModel(selector) {
+        const scopedSelector = modelProviderFilter ? `${modelProviderFilter}:${selector}` : selector;
+        const resolved = resolveModelSelector(settings, scopedSelector);
+        if (resolved.status === 'ambiguous') {
+            setMessages(m => [...m, { role: 'system', text: `Model ${resolved.model} exists on multiple providers: ${resolved.providers.map(provider => modelSelector(provider, resolved.model)).join(', ')}` }]);
+            return;
+        }
+        if (resolved.status === 'missing') {
+            setMessages(m => [...m, { role: 'system', text: `No configured model named ${selector}. Use /provider, select a provider, then choose add models.` }]);
+            return;
+        }
+        const next = await updateSettings({ provider: resolved.provider.name, model: resolved.model });
+        setSettings(next);
+        setModelProviderFilter(undefined);
+        setMode('chat');
+        setMessages(m => [...m, { role: 'system', text: `Model set to ${resolved.model} on ${resolved.provider.name}.\n\n${startupProviderInfo(next)}` }]);
+    }
+    async function appendModelsToProvider(modelsValue) {
+        const provider = selectedProviderName ? findProvider(settings, selectedProviderName) : undefined;
+        const models = modelsValue.split(',').map(model => model.trim()).filter(Boolean);
+        if (!provider) {
+            setMessages(m => [...m, { role: 'system', text: 'No provider selected.' }]);
+            setMode('chat');
+            return;
+        }
+        if (models.length === 0) {
+            setMessages(m => [...m, { role: 'system', text: 'Enter at least one model name.' }]);
+            return;
+        }
+        const nextProvider = { ...provider, models: [...new Set([...provider.models, ...models])] };
+        const next = await updateSettings({ providers: upsertProvider(settings, nextProvider), provider: provider.name });
+        setSettings(next);
+        setSelectedProviderName(undefined);
+        setModelProviderFilter(provider.name);
+        setMode('model');
+        setMessages(m => [...m, { role: 'system', text: `Added ${models.length} model${models.length === 1 ? '' : 's'} to ${provider.name}. Choose a model.` }]);
+    }
+    async function finishProviderAdd(modelsValue) {
+        const models = modelsValue.split(',').map(model => model.trim()).filter(Boolean);
+        if (!providerDraft.name || !providerDraft.url || models.length === 0) {
+            setMessages(m => [...m, { role: 'system', text: 'Provider name, URL, and at least one model are required.' }]);
+            setMode('chat');
+            setProviderDraft({});
+            return;
+        }
+        const provider = {
+            name: providerDraft.name,
+            url: providerDraft.url,
+            ...(providerDraft.key ? { key: providerDraft.key } : {}),
+            models: [...new Set(models)],
+        };
+        const next = await updateSettings({ providers: upsertProvider(settings, provider), provider: provider.name });
+        setSettings(next);
+        setProviderDraft({});
+        setModelProviderFilter(provider.name);
+        setMode('model');
+        setMessages(m => [...m, { role: 'system', text: `Added provider ${provider.name}. Choose a model.` }]);
+    }
+    async function submit(value) {
+        if (busy) {
+            if (mode === 'chat')
+                queueFollowUp(value);
+            return;
+        }
+        if (mode === 'provider') {
+            await selectProvider(value);
+            return;
+        }
+        if (mode === 'providerAction') {
+            await selectProviderAction(value);
+            return;
+        }
+        if (mode === 'model') {
+            await selectModel(value);
+            return;
+        }
+        if (mode === 'providerAddName') {
+            const name = value.trim();
+            if (!name) {
+                setMessages(m => [...m, { role: 'system', text: 'Provider name is required.' }]);
+                return;
+            }
+            if (settings.providers?.some(provider => provider.name === name)) {
+                setMessages(m => [...m, { role: 'system', text: `Provider ${name} already exists. Choose a unique name.` }]);
+                return;
+            }
+            setProviderDraft({ name });
+            setMode('providerAddUrl');
+            setMessages(m => [...m, { role: 'system', text: 'OpenAI-compatible base URL? Example: https://openrouter.ai/api/v1 or http://localhost:1234/v1' }]);
+            return;
+        }
+        if (mode === 'providerAddUrl') {
+            try {
+                new URL(value);
+            }
+            catch {
+                setMessages(m => [...m, { role: 'system', text: 'Enter a valid URL, for example http://localhost:1234/v1.' }]);
+                return;
+            }
+            setProviderDraft(draft => ({ ...draft, url: value.trim() }));
+            setMode('providerAddKey');
+            setMessages(m => [...m, { role: 'system', text: 'API key? Leave blank for local/keyless providers.' }]);
+            return;
+        }
+        if (mode === 'providerAddKey') {
+            setProviderDraft(draft => ({ ...draft, ...(value.trim() ? { key: value.trim() } : {}) }));
+            setMode('providerAddModels');
+            setMessages(m => [...m, { role: 'system', text: 'Comma-separated model names? Example: llama3.1, qwen2.5-coder, gpt-4o' }]);
+            return;
+        }
+        if (mode === 'providerAddModels') {
+            await finishProviderAdd(value);
+            return;
+        }
+        if (mode === 'providerAppendModels') {
+            await appendModelsToProvider(value);
             return;
         }
         const invokedSkill = skillInvocation(value);
         if (invokedSkill) {
-            await doAgentTurn(`The user explicitly invoked the "${invokedSkill.name}" skill. Call skill_${invokedSkill.name.replace(/[^a-zA-Z0-9_]/g, '_')} and follow its returned instructions.`, value);
+            const argumentText = invokedSkill.args ? `\nUser-provided skill arguments: ${invokedSkill.args}` : '';
+            await doAgentTurn(`The user explicitly invoked the "${invokedSkill.skill.name}" skill. Call skill_${invokedSkill.skill.name.replace(/[^a-zA-Z0-9_]/g, '_')} and follow its returned instructions.${argumentText}`, value);
             return;
         }
-        const isSkillCreate = /^\/skills? create(?:\s|$)/.test(value);
+        const isSkillCreate = /^\/create-skill(?:\s|$)/.test(value) || /^\/skills? create(?:\s|$)/.test(value);
+        const skillCreateGoal = isSkillCreate ? createSessionGoal(value) : undefined;
+        if (skillCreateGoal) {
+            setDebugLogs([]);
+            setMessages(m => [...m, { role: 'user', text: value }]);
+            const session = sessionRef.current;
+            if (session)
+                void appendSessionEntry(session, { type: 'ui_message', at: new Date().toISOString(), role: 'user', text: value }).catch(() => undefined);
+            setActiveGoalStatus(formatGoalStatus(skillCreateGoal));
+        }
         const ctx = {
             settings,
             contextFiles,
             setMode,
+            setModelProviderFilter,
             addSystemMessage: text => setMessages(m => [...m, { role: 'system', text }]),
             clearConversation,
+            newSession: async () => {
+                conversationRef.current = [];
+                lastAssistantTextRef.current = '';
+                setMessages([{ role: 'system', text: 'Started fresh. The fog parts.' }]);
+                await startNewSession('Started a new session.');
+            },
+            resumeSession: resumeLatestSession,
+            sessionInfo: () => sessionRef.current ? formatSession(sessionRef.current) : 'Session persistence is off.',
+            compactConversation,
             runAgentTurn: (prompt, displayValue) => doAgentTurn(prompt, displayValue),
             refreshContextFiles: async () => { const files = await readContextFiles().catch(() => contextFiles); setContextFiles(files); return files; },
             updateSettings: async (patch) => {
@@ -209,12 +530,22 @@ function ChatScreen({ debug = false, version }) {
             result = await handleSlashCommand(value, ctx);
         }
         catch (error) {
+            if (skillCreateGoal) {
+                skillCreateGoal.status = 'blocked';
+                skillCreateGoal.blocker = error instanceof Error ? error.message : String(error);
+                setActiveGoalStatus(formatGoalStatus(skillCreateGoal));
+            }
             const text = error instanceof Error ? error.message : String(error);
             setMessages(m => [...m, { role: 'system', text: `Skill creation failed: ${text}` }]);
             return;
         }
         finally {
             if (isSkillCreate) {
+                if (skillCreateGoal?.status === 'active') {
+                    skillCreateGoal.phase = 'done';
+                    skillCreateGoal.status = 'complete';
+                    setActiveGoalStatus(undefined);
+                }
                 setBusy(false);
                 setBusyLabel('Haze is thinking');
             }
@@ -222,7 +553,7 @@ function ChatScreen({ debug = false, version }) {
         if (result === 'exit')
             return exit();
         if (result === 'handled') {
-            if (value === '/skill create' || value.startsWith('/skill create ') || value === '/skills create' || value.startsWith('/skills create ') || value.startsWith('/skill remove ') || value.startsWith('/skills remove ')) {
+            if (value === '/create-skill' || value.startsWith('/create-skill ') || value === '/skill create' || value.startsWith('/skill create ') || value === '/skills create' || value.startsWith('/skills create ') || value.startsWith('/remove-skill ') || value.startsWith('/skill remove ') || value.startsWith('/skills remove ')) {
                 await refreshSkills().catch(() => undefined);
             }
             return;
@@ -231,63 +562,122 @@ function ChatScreen({ debug = false, version }) {
     }
     async function doAgentTurn(value, displayValue) {
         setDebugLogs([]);
+        await runSingleAgentTurn(value, displayValue);
+        while (followUpQueueRef.current.length > 0) {
+            const next = followUpQueueRef.current[0];
+            followUpQueueRef.current = followUpQueueRef.current.slice(1);
+            setQueuedFollowUps(followUpQueueRef.current);
+            setMessages(m => [...m, { role: 'system', text: `Running queued follow-up: ${next}` }]);
+            await runSingleAgentTurn(next);
+        }
+    }
+    async function runSingleAgentTurn(value, displayValue) {
         await runAgentTurn(value, displayValue, contextFiles, {
-            addMessage: msg => setMessages(m => [...m, msg]),
+            addMessage: msg => {
+                setMessages(m => [...m, msg]);
+                const session = sessionRef.current;
+                if (session)
+                    void appendSessionEntry(session, { type: 'ui_message', at: new Date().toISOString(), role: msg.role, text: msg.text }).catch(() => undefined);
+            },
             updateMessage: (id, update) => setMessages(m => m.map(msg => msg.id === id ? { ...msg, ...update } : msg)),
-            setConversation: msgs => { conversationRef.current = msgs; },
+            setConversation: msgs => {
+                conversationRef.current = msgs;
+                const session = sessionRef.current;
+                if (session)
+                    void appendSessionEntry(session, { type: 'conversation_snapshot', at: new Date().toISOString(), messages: msgs }).catch(() => undefined);
+            },
             setBusy,
             debugLog,
             getConversation: () => conversationRef.current,
             getLastAssistantText: () => lastAssistantTextRef.current,
             setLastAssistantText: text => { lastAssistantTextRef.current = text; },
             setAbortController: controller => { abortControllerRef.current = controller; },
+            setGoalStatus: setActiveGoalStatus,
+            compactConversation,
+            onEvent: event => {
+                const session = sessionRef.current;
+                if (session)
+                    void appendSessionEntry(session, { type: 'event', at: event.at, name: event.type, text: JSON.stringify(event) }).catch(() => undefined);
+            },
         });
     }
     const visible = messages.filter(message => !message.hidden);
-    const placeholder = mode === 'apiKey' ? 'OpenRouter API key' : mode === 'model' ? 'x-ai/grok-build-0.1' : busy ? 'Thinking, allegedly' : 'Ask Haze to help build your app';
-    const activeModelName = process.env.HAZE_MODEL ?? settings.model ?? 'x-ai/grok-build-0.1';
-    const hasLogin = Boolean(process.env.OPENAI_API_KEY ?? settings.apiKey);
-    const hasChosenModel = Boolean(process.env.HAZE_MODEL ?? settings.model);
+    const transcriptItems = visible
+        .map((message, index) => ({ key: messageKey(message, index), message }))
+        .filter(item => !item.message.streaming);
+    const liveMessages = visible.filter(message => message.streaming);
+    const activeSelection = activeModel(settings);
+    const placeholder = mode === 'provider'
+        ? 'Choose provider'
+        : mode === 'providerAction'
+            ? 'Choose provider action'
+            : mode === 'model'
+                ? 'Choose model'
+                : mode === 'providerAddName'
+                    ? 'Provider name'
+                    : mode === 'providerAddUrl'
+                        ? 'https://example.com/v1'
+                        : mode === 'providerAddKey'
+                            ? 'API key, or blank for local'
+                            : mode === 'providerAddModels' || mode === 'providerAppendModels'
+                                ? 'model-a, model-b'
+                                : busy ? 'Queue a follow-up, or Esc to interrupt' : 'Ask Haze to help build your app';
+    const activeModelName = `${activeSelection.provider.name}:${process.env.HAZE_MODEL ?? activeSelection.model}`;
+    const hasLogin = Boolean(process.env.OPENAI_API_KEY ?? settings.apiKey ?? activeSelection.provider.key) || activeSelection.provider.name !== DEFAULT_PROVIDER_NAME;
+    const hasChosenModel = Boolean(process.env.HAZE_MODEL ?? settings.model ?? activeSelection.model);
     const headerSubtitle = hasLogin && hasChosenModel
         ? [
             'A minimal LLM harness for growing your own workflows while you work.',
             '',
             'Start with simple chat, then teach Haze your habits with skills:',
-            '/skill create review my branch against main  — tiny spell, useful goblin.',
+            '/create-skill review my branch against main  — tiny spell, useful goblin.',
             '',
             'The most adaptive workflow is the one you shape as you go.',
             '',
             'Guardrails are light: Haze lets the LLM work from the terminal almost like you,',
             'while trying to stay scoped to this project.',
         ].join('\n')
-        : 'First things first: run /login to add your API key, then /model x-ai/grok-build-0.1 to choose a model.';
+        : 'First things first: run /provider to choose or add a provider, then select a model.';
     const workspaceLabel = `${process.cwd()}${branchName ? ` (${branchName})` : ''}`;
     const toolsUsed = toolCallCount(messages);
     const estimatedTokens = estimateConversationTokens(messages);
-    const statusDetailLabel = `${conversationRef.current.length} messages / ${toolsUsed} tool call${toolsUsed === 1 ? '' : 's'} / ↑ ~${formatTokenCount(estimatedTokens.input)} ↓ ~${formatTokenCount(estimatedTokens.output)} / ${skills.length} skill${skills.length === 1 ? '' : 's'}`;
-    const slashSuggestions = mode === 'chat' ? [
+    const statusDetailLabel = `${conversationRef.current.length} messages / ${toolsUsed} tool call${toolsUsed === 1 ? '' : 's'} / ↑ ~${formatTokenCount(estimatedTokens.input)} ↓ ~${formatTokenCount(estimatedTokens.output)} / ${skills.length} skill${skills.length === 1 ? '' : 's'}${sessionLabel ? ` / ${sessionLabel}` : ''}`;
+    const goalText = activeGoalStatus?.replace(/^Goal:\s*/, '');
+    const [rawGoalRequest, ...goalStatusParts] = goalText?.split(' · ') ?? [];
+    const goalRequest = truncateWithEllipsis(rawGoalRequest ?? '', 120);
+    const goalStatusText = goalStatusParts.join(' · ');
+    const inputSuggestions = mode === 'provider' ? providerSuggestions() : mode === 'providerAction' ? providerActionSuggestions() : mode === 'model' ? modelSuggestions() : mode === 'chat' ? [
         { value: '/help', description: 'Show commands', kind: 'command' },
-        { value: '/login', description: 'Save an OpenRouter API key', kind: 'command' },
+        { value: '/provider', description: 'Choose a provider', kind: 'command' },
         { value: '/model', description: 'Choose a model', kind: 'command' },
         { value: '/settings', description: 'Show provider, model, API key, and context status', kind: 'command' },
-        { value: '/skill create ', description: 'Create a Markdown skill', kind: 'command' },
-        { value: '/skill list', description: 'List installed skills', kind: 'command' },
-        { value: '/skill info ', description: 'Show details for a skill', kind: 'command' },
-        { value: '/skill validate ', description: 'Validate a skill', kind: 'command' },
-        { value: '/skill remove ', description: 'Remove a skill with --yes', kind: 'command' },
+        { value: '/create-skill ', description: 'Create a Markdown skill', kind: 'command' },
+        { value: '/list-skills', description: 'List installed skills', kind: 'command' },
+        { value: '/skill-info ', description: 'Show details for a skill', kind: 'command' },
+        { value: '/validate-skill ', description: 'Validate a skill', kind: 'command' },
+        { value: '/remove-skill ', description: 'Remove a skill with --yes', kind: 'command' },
         { value: '/init', description: 'Create or update AGENTS.md project instructions', kind: 'command' },
+        { value: '/session', description: 'Show current session path', kind: 'command' },
+        { value: '/resume', description: 'Resume latest session for this workspace', kind: 'command' },
+        { value: '/new', description: 'Start a new session', kind: 'command' },
+        { value: '/compact ', description: 'Summarize older context and keep recent messages', kind: 'command' },
         { value: '/clear', description: 'Clear conversation history', kind: 'command' },
         { value: '/exit', description: 'Exit Haze', kind: 'command' },
         { value: '/quit', description: 'Exit Haze', kind: 'command' },
         ...skills.map(skill => ({ value: `/${skill.name}`, description: skill.description, kind: 'skill' })),
     ] : [];
-    return _jsxs(Box, { flexDirection: "column", minHeight: height, children: [_jsx(Box, { flexShrink: 0, children: _jsx(Header, { subtitle: headerSubtitle, version: version }) }), _jsx(Box, { flexDirection: "column", flexGrow: 1, children: visible.map((message, index) => _jsxs(Box, { flexDirection: "column", marginBottom: 1, children: [_jsx(Text, { color: message.role === 'user' ? theme.purple : message.role === 'assistant' ? theme.success : message.role === 'tool' ? theme.blue : theme.muted, bold: true, children: message.role === 'user' ? 'You' : message.role === 'assistant' ? 'Haze' : message.role === 'tool' ? 'Tool' : 'Info' }), message.role === 'tool'
-                            ? _jsx(ToolMessageText, { text: message.text, streaming: message.streaming })
-                            : message.role === 'assistant' && !message.streaming
-                                ? _jsx(MarkdownText, { content: message.text })
-                                : _jsx(Text, { children: message.text })] }, index)) }), debug && debugLogs.length > 0 && _jsxs(Box, { flexDirection: "column", flexShrink: 0, marginBottom: 1, borderStyle: "round", borderColor: theme.muted, paddingX: 1, children: [_jsx(Text, { color: theme.muted, bold: true, children: "Debug" }), debugLogs.map((line, index) => _jsxs(Text, { color: theme.muted, children: ["\u2022 ", line] }, index))] }), busy && _jsx(Box, { flexShrink: 0, marginBottom: 1, children: _jsxs(Text, { color: theme.muted, children: [_jsx(Spinner, { type: "dots" }), " ", busyLabel, _jsx(Text, { dimColor: true, children: " \u00B7 esc to interrupt" })] }) }), _jsx(Box, { borderStyle: "round", borderColor: theme.deepPurple, paddingX: 1, flexShrink: 0, children: _jsx(Box, { flexGrow: 1, minWidth: 0, children: _jsx(TextInput, { placeholder: placeholder, disabled: busy, mask: mode === 'apiKey', historyItems: inputHistory, recordHistory: mode === 'chat', suggestions: slashSuggestions, onHistoryAdd: persistInputHistory, onCancel: cancelThinking, onSubmit: submit }) }) }), _jsxs(Box, { flexShrink: 0, justifyContent: "space-between", children: [_jsxs(Box, { flexDirection: "column", flexShrink: 1, minWidth: 0, children: [_jsx(Text, { color: theme.muted, dimColor: true, wrap: "truncate-end", children: workspaceLabel }), _jsx(Text, { color: theme.muted, dimColor: true, wrap: "truncate-end", children: statusDetailLabel })] }), _jsx(Box, { flexShrink: 0, marginLeft: 2, children: _jsx(Text, { color: theme.muted, dimColor: true, wrap: "truncate-start", children: activeModelName }) })] })] });
+    const staticItems = [
+        { kind: 'header', key: `header-${activeModelName}-${hasLogin}-${hasChosenModel}`, subtitle: headerSubtitle },
+        ...transcriptItems.map(item => ({ kind: 'message', ...item })),
+    ];
+    return _jsxs(Box, { flexDirection: "column", children: [_jsx(Static, { items: staticItems, children: item => item.kind === 'header'
+                    ? _jsx(Header, { subtitle: item.subtitle, version: version }, item.key)
+                    : _jsx(MessageView, { message: item.message, width: width }, item.key) }), liveMessages.length > 0 && _jsx(Box, { flexDirection: "column", flexShrink: 0, children: liveMessages.map((message, index) => _jsx(MessageView, { message: message, width: width }, messageKey(message, index))) }), debug && debugLogs.length > 0 && _jsxs(Box, { flexDirection: "column", flexShrink: 0, marginBottom: 1, borderStyle: "round", borderColor: theme.muted, paddingX: 1, children: [_jsx(Text, { color: theme.muted, bold: true, children: "Debug" }), debugLogs.map((line, index) => _jsxs(Text, { color: theme.muted, children: ["\u2022 ", line] }, index))] }), queuedFollowUps.length > 0 && _jsxs(Box, { flexDirection: "column", flexShrink: 0, marginBottom: 1, children: [_jsx(Text, { color: theme.muted, children: "Queued follow-ups:" }), queuedFollowUps.map((item, index) => _jsxs(Text, { color: theme.muted, dimColor: true, children: ["  ", index + 1, ". ", item] }, `${index}-${item}`))] }), busy && _jsx(Box, { flexShrink: 0, marginBottom: 1, children: _jsxs(Text, { children: [_jsxs(Text, { color: theme.orange, bold: true, children: [_jsx(Spinner, { type: "dots" }), " ", busyLabel] }), _jsx(Text, { color: theme.muted, dimColor: true, children: " \u00B7 type to queue follow-up \u00B7 esc to interrupt" })] }) }), goalText && _jsx(Box, { flexShrink: 0, children: _jsxs(Text, { wrap: "truncate-end", children: [_jsx(Text, { color: theme.blue, bold: true, children: "Goal:" }), _jsxs(Text, { color: "white", children: [" ", goalRequest] }), goalStatusText ? _jsxs(Text, { color: theme.orange, children: [" \u00B7 ", goalStatusText] }) : null] }) }), _jsx(Box, { borderStyle: "round", borderColor: theme.deepPurple, paddingX: 1, flexShrink: 0, children: _jsx(Box, { flexGrow: 1, minWidth: 0, children: _jsx(TextInput, { placeholder: placeholder, disabled: busy && mode !== 'chat', mask: mode === 'providerAddKey', historyItems: inputHistory, recordHistory: mode === 'chat', suggestions: inputSuggestions, suggestionMode: mode === 'provider' || mode === 'providerAction' || mode === 'model' ? 'always' : 'slash', submitOnEmpty: mode === 'providerAddKey', onHistoryAdd: persistInputHistory, onCancel: cancelThinking, onEscape: closeInputList, onSubmit: submit }) }) }), _jsxs(Box, { flexShrink: 0, justifyContent: "space-between", children: [_jsxs(Box, { flexDirection: "column", flexShrink: 1, minWidth: 0, children: [_jsx(Text, { color: theme.muted, dimColor: true, wrap: "truncate-end", children: workspaceLabel }), _jsx(Text, { color: theme.muted, dimColor: true, wrap: "truncate-end", children: statusDetailLabel })] }), _jsx(Box, { flexShrink: 0, marginLeft: 2, children: _jsx(Text, { color: theme.muted, dimColor: true, wrap: "truncate-start", children: activeModelName }) })] })] });
 }
 export async function chatCommand(options = {}) {
-    const app = render(_jsx(ChatScreen, { debug: options.debug }));
+    if (process.stdout.isTTY) {
+        process.stdout.write('\u001B[2J\u001B[3J\u001B[H');
+    }
+    const app = render(_jsx(ChatScreen, { debug: options.debug, version: options.version, continueSession: options.continueSession, noSession: options.noSession }));
     await app.waitUntilExit();
 }