zelari-code 0.4.3 → 0.7.5

package/dist/cli/headless.js

@@ -0,0 +1,137 @@
+/**
+ * headless — non-interactive CLI mode for CI/CD and scripting.
+ *
+ * Bypasses Ink entirely. Reads `--task <prompt>`, runs the prompt
+ * through the same dispatch path the TUI uses, and serializes the
+ * resulting events as one JSON object per line (NDJSON) on stdout.
+ *
+ * Exit codes:
+ *   0  — task completed successfully (last `agent_end.reason === 'completed'`)
+ *   1  — user error (missing task, missing API key, invalid flag)
+ *   2  — runtime error (provider failure, council exception)
+ *   3  — task errored (the agent run itself emitted `agent_end.reason === 'error'`)
+ *
+ * @public
+ * @since 0.5.0
+ */
+import { PROVIDERS, resolveApiKeyWithMeta } from './keyStore.js';
+import { getActiveProvider, getModelForProvider } from './providerConfig.js';
+import { openaiCompatibleProvider } from './provider/openai-compatible.js';
+const HELP_TEXT = `zelari-code --headless --task <prompt> [--output json|plain] [--council] [--provider <id>] [--model <name>]
+
+Non-interactive mode. Streams BrainEvents as NDJSON to stdout (one JSON
+object per line) or as plain text (just the assistant message text).
+
+Exit codes:
+  0  completed
+  1  user error (bad flags, missing API key, ...)
+  2  runtime error (provider failure, council exception)
+  3  agent run errored
+`;
+/**
+ * Parse argv for --headless options. Returns null options when
+ * --headless is not present (caller should fall through to TUI mode).
+ */
+export function parseHeadlessFlags(argv) {
+    if (!argv.includes('--headless')) {
+        return { options: null };
+    }
+    let task;
+    let output = 'json';
+    let useCouncil = false;
+    let provider;
+    let model;
+    for (let i = 0; i < argv.length; i++) {
+        const arg = argv[i];
+        if (arg === '--headless')
+            continue;
+        if (arg === '--output') {
+            const next = argv[i + 1];
+            if (next === 'json' || next === 'plain') {
+                output = next;
+                i++;
+            }
+            else {
+                return {
+                    options: null,
+                    error: `--output requires 'json' or 'plain', got '${next ?? '(missing)'}'`,
+                };
+            }
+        }
+        else if (arg === '--task') {
+            task = argv[i + 1];
+            i++;
+        }
+        else if (arg === '--council') {
+            useCouncil = true;
+        }
+        else if (arg === '--provider') {
+            provider = argv[i + 1];
+            i++;
+        }
+        else if (arg === '--model') {
+            model = argv[i + 1];
+            i++;
+        }
+    }
+    if (!task || task.trim().length === 0) {
+        return { options: null, error: '--headless requires --task <prompt>' };
+    }
+    return {
+        options: { task, output, useCouncil, provider, model },
+    };
+}
+/**
+ * Print the headless help text to stdout (caller prints to stderr for errors).
+ */
+export function printHeadlessHelp() {
+    // eslint-disable-next-line no-console
+    console.log(HELP_TEXT);
+}
+/**
+ * Resolve the API key for a provider; returns null with a reason
+ * when the key is missing. Used to fail fast with a clear error
+ * instead of failing mid-stream.
+ */
+export async function resolveHeadlessKey(providerId) {
+    const spec = PROVIDERS.find((p) => p.id === providerId);
+    if (!spec) {
+        return { error: `unknown provider: '${providerId}'` };
+    }
+    const resolved = await resolveApiKeyWithMeta(providerId);
+    if (!resolved || !resolved.apiKey) {
+        return {
+            error: `no API key for provider '${providerId}'.\n` +
+                `Set the env var ${spec.envVar} or save a key via /login.`,
+        };
+    }
+    // baseUrl lives in providerConfig (customEndpoints) not on StoredKey.
+    // Imported lazily to avoid a circular dep at module load.
+    const { getCustomEndpoint } = await import('./providerConfig.js');
+    const customBase = getCustomEndpoint(providerId);
+    return {
+        apiKey: resolved.apiKey,
+        ...(customBase ? { baseUrl: customBase } : {}),
+    };
+}
+/**
+ * Determine the effective provider + model for a headless run.
+ * Prefers explicit --provider/--model flags, then the active
+ * provider from provider.json, then 'openai-compatible' as a
+ * last resort.
+ */
+export function resolveHeadlessProvider(opts) {
+    const provider = opts.provider ?? getActiveProvider().id;
+    const model = opts.model ?? getModelForProvider(provider);
+    return { provider, model };
+}
+/**
+ * Emit one NDJSON line to stdout. Use process.stdout.write directly
+ * to avoid the console.log trailing newline (NDJSON convention is
+ * one JSON object per line, no extra whitespace).
+ */
+export function emitEvent(event) {
+    process.stdout.write(JSON.stringify(event) + '\n');
+}
+export { openaiCompatibleProvider };
+//# sourceMappingURL=headless.js.map

package/dist/cli/headless.js.map

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

package/dist/cli/hooks/chatState.js

@@ -0,0 +1,139 @@
+import { formatToolSummary } from '../components/toolFormat.js';
+export const EMPTY_LIVE = { streaming: null, runningTools: [] };
+/**
+ * Append a finalized message (system/user/sealed-assistant/completed-tool).
+ * Pure helper — callers pass the setter they want to target (the
+ * `finalized` setter in production, a plain array setter in tests).
+ */
+export function pushFinalized(setFinalized, message) {
+    setFinalized((prev) => [...prev, message]);
+}
+/**
+ * Update or start the streaming assistant bubble in `live`.
+ *
+ * - If `live.streaming` exists and (for council) belongs to the same member,
+ *   replace its content with `fullContent` (the streaming caller always
+ *   passes full accumulated content, not a delta).
+ * - Otherwise create a new streaming bubble stamped with the member context.
+ *
+ * `setLive` accepts a functional updater so the throttle layer
+ * (`useBatchedMessages`-style) can compose multiple updates without reading
+ * stale state.
+ */
+export function setStreaming(setLive, fullContent, ts, memberContext) {
+    setLive((prev) => {
+        const cur = prev.streaming;
+        if (cur &&
+            cur.role === 'assistant' &&
+            (cur.memberId ?? null) === (memberContext?.memberId ?? null)) {
+            return { ...prev, streaming: { ...cur, content: fullContent, ts } };
+        }
+        return {
+            ...prev,
+            streaming: {
+                id: `streaming-${crypto.randomUUID()}`,
+                role: 'assistant',
+                content: fullContent,
+                ts,
+                ...(memberContext?.memberId ? { memberId: memberContext.memberId } : {}),
+                ...(memberContext?.memberName ? { memberName: memberContext.memberName } : {}),
+            },
+        };
+    });
+}
+/**
+ * Move `live.streaming` (if any) into `finalized`, sealing it. Drops the
+ * `streaming-` id prefix so the next bubble starts fresh. Idempotent: a no-op
+ * when nothing is streaming.
+ *
+ * This is the seal point fired on `message_end` and before a tool call: the
+ * bubble is complete and can be printed once into scrollback.
+ */
+export function finalizeStreaming(setFinalized, setLive) {
+    setLive((prev) => {
+        const cur = prev.streaming;
+        if (!cur || !cur.id.startsWith('streaming-'))
+            return prev;
+        const sealed = { ...cur, id: cur.id.slice('streaming-'.length) };
+        setFinalized((fin) => [...fin, sealed]);
+        return { ...prev, streaming: null };
+    });
+}
+/**
+ * Max chars of tool result kept in memory for the printed body.
+ *
+ * v0.7.3: raised from 600 to 8000. The 600-char cut happened BEFORE
+ * formatToolResult could parse the JSON envelope — truncated JSON no longer
+ * parses, so every long bash/read_file result fell back to the raw escaped
+ * envelope (the ugly boxes in the 2026-07-02 live test). Display truncation
+ * is line-based in the formatter (ZELARI_TOOL_OUTPUT_LINES); this constant is
+ * only a memory bound.
+ */
+export const TOOL_RESULT_PREVIEW_CHARS = 8000;
+/** Max chars of the JSON args preview shown on the tool summary line. */
+export const TOOL_ARGS_PREVIEW_CHARS = 120;
+/**
+ * Register a tool invocation in `live.runningTools`. The summary (args
+ * preview) is computed once; the result body is filled in by
+ * {@link completeTool} on `tool_execution_end`.
+ */
+export function startTool(setLive, toolName, toolCallId, args, ts) {
+    // v0.7.1 (B2): human-readable summary instead of raw-JSON args.
+    const argsPreview = formatToolSummary(toolName, args);
+    setLive((prev) => ({
+        ...prev,
+        runningTools: [
+            ...prev.runningTools,
+            {
+                id: crypto.randomUUID(),
+                role: 'tool',
+                content: argsPreview,
+                ts,
+                toolName,
+                toolCallId,
+                toolOk: undefined,
+                toolDurationMs: undefined,
+            },
+        ],
+    }));
+}
+/**
+ * Mark a running tool as done and move it into `finalized`. Removes it from
+ * `live.runningTools` (by `toolCallId`) and appends the completed message —
+ * with its result body — to `finalized`.
+ *
+ * v0.7.3: the previous signature took a `live` snapshot (from `liveRef`) and
+ * removed by INDEX inside the functional updater. `liveRef` only updates on
+ * render, so for fast tools (start+end within one frame) the snapshot missed
+ * the just-started tool (end event dropped → tool stuck in the live region)
+ * or, with two ends in one frame, removed the WRONG element. The lookup now
+ * happens inside the `setLive` updater against the CURRENT state, keyed by
+ * toolCallId — same cross-setter pattern as {@link finalizeStreaming}.
+ *
+ * No-op if the toolCallId is unknown (defensive against duplicate end events).
+ */
+export function completeTool(setFinalized, setLive, toolCallId, isError, durationMs, result) {
+    setLive((prev) => {
+        const tool = prev.runningTools.find((t) => t.toolCallId === toolCallId && t.toolDurationMs === undefined);
+        if (!tool)
+            return prev;
+        const completed = {
+            ...tool,
+            toolOk: !isError,
+            toolDurationMs: durationMs,
+            ...(result !== undefined
+                ? {
+                    toolResult: result.length > TOOL_RESULT_PREVIEW_CHARS
+                        ? `${result.slice(0, TOOL_RESULT_PREVIEW_CHARS)}…`
+                        : result,
+                }
+                : {}),
+        };
+        setFinalized((fin) => [...fin, completed]);
+        return {
+            ...prev,
+            runningTools: prev.runningTools.filter((t) => t !== tool),
+        };
+    });
+}
+//# sourceMappingURL=chatState.js.map

package/dist/cli/hooks/chatState.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"chatState.js","sourceRoot":"","sources":["../../../src/cli/hooks/chatState.ts"],"names":[],"mappings":"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"}

package/dist/cli/hooks/eventsToMessages.js

@@ -26,29 +26,60 @@ export function eventsToMessages(events) {
                 out.push({ id: assistantId, role: 'assistant', content: assistantBuffer, ts: e.ts });
             }
         }
+        else if (e.type === 'message_end') {
+            // Message boundary: the next streamed message gets its own bubble,
+            // matching the live UI (which finalizes on message_end).
+            assistantBuffer = '';
+            assistantId = '';
+        }
         else if (e.type === 'tool_execution_start') {
             // v0.4.3 audit fix: the v3-W event schema renamed `tool_call` →
             // `tool_execution_start` and added the `args` field. The old branches
             // here silently dropped every tool invocation during session resume.
+            // v0.6.2: restored as a `role: 'tool'` message so the resumed
+            // transcript renders the tool box, same as the live UI.
             assistantBuffer = '';
             assistantId = '';
-            const argsPreview = JSON.stringify(e.args).slice(0, 80);
+            const argsPreview = JSON.stringify(e.args)?.slice(0, 120) ?? '';
             out.push({
                 id: crypto.randomUUID(),
-                role: 'system',
-                content: `[tool_call] ${e.toolName}(${argsPreview})`,
+                role: 'tool',
+                content: argsPreview,
                 ts: e.ts,
+                toolName: e.toolName,
+                toolCallId: e.toolCallId,
             });
         }
         else if (e.type === 'tool_execution_end') {
-            // v0.4.3 audit fix: same — `tool_result` → `tool_execution_end` with
-            // `isError` / `durationMs` instead of `ok`.
-            out.push({
-                id: crypto.randomUUID(),
-                role: 'system',
-                content: `[tool_result] ${e.toolName} → ${e.isError ? 'error' : 'ok'}`,
-                ts: e.ts,
-            });
+            // v0.6.2: update the matching start message in place (the event does
+            // NOT carry toolName — the old code rendered "[tool_result] undefined").
+            const end = e;
+            let matched = false;
+            for (let i = out.length - 1; i >= 0; i--) {
+                const m = out[i];
+                if (m.role === 'tool' && m.toolCallId === end.toolCallId && m.toolDurationMs === undefined) {
+                    // v0.6.2 audit LOW-5: append `…` on truncation to match the
+                    // live path (messageHelpers.appendToolEnd behavior).
+                    const raw = typeof end.result === 'string' ? end.result : '';
+                    const truncated = raw.length > 600 ? `${raw.slice(0, 600)}…` : raw;
+                    out[i] = {
+                        ...m,
+                        toolOk: !end.isError,
+                        toolDurationMs: end.durationMs,
+                        ...(raw.length > 0 ? { toolResult: truncated } : {}),
+                    };
+                    matched = true;
+                    break;
+                }
+            }
+            if (!matched) {
+                out.push({
+                    id: crypto.randomUUID(),
+                    role: 'system',
+                    content: `[tool_result] ${end.toolCallId} → ${end.isError ? 'error' : 'ok'}`,
+                    ts: e.ts,
+                });
+            }
         }
         else if (e.type === 'agent_start') {
             out.push({

package/dist/cli/hooks/eventsToMessages.js.map

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

package/dist/cli/hooks/messageHelpers.js

@@ -1,3 +1,4 @@
+import { formatToolSummary } from '../components/toolFormat.js';
 /**
  * Helpers for building ChatMessage instances in the most common shapes.
  *
@@ -29,8 +30,12 @@ export function appendUser(setMessages, content, ts = Date.now()) {
  * Append or extend the streaming assistant message. If the last message is
  * already a streaming assistant message, append `delta` to its content;
  * otherwise create a new one with a stable streaming id.
+ *
+ * When `memberName` is set (council-sourced messages), it's stamped on
+ * the message so the visible-reasoning UI can render `🜂 Caronte: …`
+ * headers above the streamed text.
  */
-export function appendOrExtendStreamingAssistant(setMessages, fullContent, ts) {
+export function appendOrExtendStreamingAssistant(setMessages, fullContent, ts, memberContext) {
     setMessages((prev) => {
         const last = prev[prev.length - 1];
         if (last && last.role === 'assistant' && last.id.startsWith('streaming-')) {
@@ -38,23 +43,54 @@ export function appendOrExtendStreamingAssistant(setMessages, fullContent, ts) {
         }
         return [
             ...prev,
-            { id: `streaming-${crypto.randomUUID()}`, role: 'assistant', content: fullContent, ts },
+            {
+                id: `streaming-${crypto.randomUUID()}`,
+                role: 'assistant',
+                content: fullContent,
+                ts,
+                ...(memberContext?.memberId ? { memberId: memberContext.memberId } : {}),
+                ...(memberContext?.memberName ? { memberName: memberContext.memberName } : {}),
+            },
         ];
     });
 }
-/** Append a tool invocation indicator (▶ name(args) or ✓/✗ result). */
-export function appendToolStart(setMessages, toolName, args, ts) {
-    const argsPreview = JSON.stringify(args).slice(0, 120);
-    appendSystem(setMessages, `▶ ${toolName}(${argsPreview})`, ts);
-}
-/** Append a tool result indicator. */
-export function appendToolEnd(setMessages, result, isError, durationMs, ts) {
-    const preview = result.slice(0, 200);
-    const icon = isError ? '✗' : '✓';
-    appendSystem(setMessages, `${icon} ${preview}${result.length > 200 ? '…' : ''} (${durationMs}ms)`, ts);
+/**
+ * Max chars of tool result kept for the body. v0.7.3: raised 600 → 8000 to
+ * match chatState.ts — the 600-char cut chopped the JSON envelope before
+ * formatToolResult could parse it, forcing the raw-escaped fallback.
+ */
+export const TOOL_RESULT_PREVIEW_CHARS = 8000;
+/** Max chars of the JSON args preview shown on the tool summary line. */
+export const TOOL_ARGS_PREVIEW_CHARS = 120;
+/**
+ * Append a tool invocation as a `role: 'tool'` message so ChatStream renders
+ * it via the live region's tool rendering (one status line per invocation, updated in
+ * place by {@link updateToolMessageEnd}) instead of loose system lines.
+ */
+export function appendToolStart(setMessages, toolName, toolCallId, args, ts) {
+    // v0.7.1 (B2): human-readable summary instead of raw-JSON args (which cut
+    // mid-string like {"path":"…","content":"Scrivi una spiegazione estrema…").
+    const argsPreview = formatToolSummary(toolName, args);
+    setMessages((prev) => [
+        ...prev,
+        {
+            id: crypto.randomUUID(),
+            role: 'tool',
+            content: argsPreview,
+            ts,
+            toolName,
+            toolCallId,
+            toolOk: undefined,
+            toolDurationMs: undefined,
+        },
+    ]);
 }
-/** Update the matching `tool_execution_start` message with its end status. */
-export function updateToolMessageEnd(setMessages, toolCallId, isError, durationMs) {
+/**
+ * Update the matching `tool_execution_start` message with its end status.
+ * The summary (args preview) is kept; the result is stored separately as the
+ * expandable body. Failed invocations auto-expand in ChatStream.
+ */
+export function updateToolMessageEnd(setMessages, toolCallId, isError, durationMs, result) {
     setMessages((prev) => {
         for (let i = prev.length - 1; i >= 0; i--) {
             const m = prev[i];
@@ -64,7 +100,13 @@ export function updateToolMessageEnd(setMessages, toolCallId, isError, durationM
                     ...m,
                     toolOk: !isError,
                     toolDurationMs: durationMs,
-                    content: `${m.toolName ?? 'tool'}${isError ? ' → error' : ' → ok'} (${durationMs}ms)`,
+                    ...(result !== undefined
+                        ? {
+                            toolResult: result.length > TOOL_RESULT_PREVIEW_CHARS
+                                ? `${result.slice(0, TOOL_RESULT_PREVIEW_CHARS)}…`
+                                : result,
+                        }
+                        : {}),
                 };
                 return updated;
             }
@@ -72,4 +114,19 @@ export function updateToolMessageEnd(setMessages, toolCallId, isError, durationM
         return prev;
     });
 }
+/**
+ * Seal the trailing streaming assistant message (if any) by dropping its
+ * `streaming-` id prefix. Called on `message_end` so the NEXT assistant
+ * message in the same turn (e.g. after a tool call) starts a fresh bubble
+ * instead of being merged into — or duplicated over — the previous one.
+ */
+export function finalizeStreamingAssistant(setMessages) {
+    setMessages((prev) => {
+        const last = prev[prev.length - 1];
+        if (last && last.role === 'assistant' && last.id.startsWith('streaming-')) {
+            return [...prev.slice(0, -1), { ...last, id: last.id.slice('streaming-'.length) }];
+        }
+        return prev;
+    });
+}
 //# sourceMappingURL=messageHelpers.js.map

package/dist/cli/hooks/messageHelpers.js.map

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

package/dist/cli/hooks/useBatchedMessages.js

@@ -0,0 +1,71 @@
+import { useCallback, useEffect, useRef } from 'react';
+export function useBatchedMessages(state, setState, cadenceMs = 16) {
+    // Composed pending updater, or `null` when nothing is buffered.
+    const pendingRef = useRef(null);
+    // Active throttle-window timer handle, or `null` when not throttling.
+    const timerRef = useRef(null);
+    /**
+     * Apply the current pending updater to state, ignoring/clearing the timer.
+     * Used as the synchronous public drain (stream end) and internally.
+     */
+    const flush = useCallback(() => {
+        if (timerRef.current !== null) {
+            clearTimeout(timerRef.current);
+            timerRef.current = null;
+        }
+        const pending = pendingRef.current;
+        pendingRef.current = null;
+        if (pending !== null) {
+            setState(pending);
+        }
+    }, [setState]);
+    const commit = useCallback((update) => {
+        // Type guard: SetStateAction<S> = S | ((prev: S) => S). Because a generic
+        // S may itself be a function type, `typeof x === 'function'` doesn't
+        // narrow; resolve via a guarded call helper instead.
+        const apply = (action, prev) => typeof action === 'function' ? action(prev) : action;
+        // Compose this update onto any pending one, preserving arrival order.
+        const head = pendingRef.current;
+        pendingRef.current =
+            head === null
+                ? update
+                : (s) => {
+                    const intermediate = apply(head, s);
+                    return apply(update, intermediate);
+                };
+        if (timerRef.current === null) {
+            // Leading edge: not currently throttling. Flush immediately so the
+            // first token renders with no latency, then open a throttle window.
+            const leading = pendingRef.current;
+            pendingRef.current = null;
+            if (leading !== null) {
+                setState(leading);
+            }
+            timerRef.current = setTimeout(() => {
+                timerRef.current = null;
+                // Trailing edge: flush anything that accumulated during the window
+                // as a single render. Do NOT re-arm — the next commit starts a new
+                // leading edge.
+                const tail = pendingRef.current;
+                pendingRef.current = null;
+                if (tail !== null) {
+                    setState(tail);
+                }
+            }, cadenceMs);
+        }
+        // else: inside a throttle window — the trailing handler above will
+        // catch the buffered update when the window closes.
+    }, [cadenceMs, setState]);
+    // On unmount: cancel any pending timer. Do NOT flush — teardown means the
+    // display is going away, and persisted state lives in the JSONL writer.
+    useEffect(() => {
+        return () => {
+            if (timerRef.current !== null) {
+                clearTimeout(timerRef.current);
+                timerRef.current = null;
+            }
+        };
+    }, []);
+    return { state, commit, flush, setState };
+}
+//# sourceMappingURL=useBatchedMessages.js.map

package/dist/cli/hooks/useBatchedMessages.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"useBatchedMessages.js","sourceRoot":"","sources":["../../../src/cli/hooks/useBatchedMessages.ts"],"names":[],"mappings":"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"}