zelari-code 1.8.2 → 1.9.2

package/dist/cli/desktopConfig.js

@@ -0,0 +1,281 @@
+/**
+ * desktopConfig — non-interactive config dump/set for Zelari Desktop
+ * and scripts. Never prints API keys.
+ *
+ * Flags (handled in main.ts before TUI):
+ *   --print-config
+ *   --set-config [--provider] [--model] [--endpoint] [--endpoint-clear]
+ *   --set-key --provider <id> --key <secret>
+ *   --discover-models [--provider <id>]
+ */
+import { PROVIDERS, resolveApiKey, getKeyStorePath, setApiKey, maskKey, } from './keyStore.js';
+import { getProviderConfig, getProviderConfigPath, setActiveProviderId, setModelForProvider, setCustomEndpoint, clearCustomEndpoint, getCustomEndpoint, } from './providerConfig.js';
+import { getCachedModels, discoverModelsForProvider, } from './modelDiscovery.js';
+import { getCurrentVersion } from './updater.js';
+/** True when argv requests --print-config. */
+export function wantsPrintConfig(argv) {
+    return argv.includes('--print-config');
+}
+export function wantsSetKey(argv) {
+    return argv.includes('--set-key');
+}
+export function wantsDiscoverModels(argv) {
+    return argv.includes('--discover-models');
+}
+/**
+ * Parse --set-config [--provider id] [--model name] [--endpoint url] [--endpoint-clear].
+ */
+export function parseSetConfigFlags(argv) {
+    if (!argv.includes('--set-config')) {
+        return { request: null };
+    }
+    let provider;
+    let model;
+    let endpoint;
+    let endpointClear = false;
+    for (let i = 0; i < argv.length; i++) {
+        const arg = argv[i];
+        if (arg === '--provider') {
+            provider = argv[i + 1];
+            i++;
+        }
+        else if (arg === '--model') {
+            model = argv[i + 1];
+            i++;
+        }
+        else if (arg === '--endpoint') {
+            endpoint = argv[i + 1];
+            i++;
+        }
+        else if (arg === '--endpoint-clear') {
+            endpointClear = true;
+        }
+    }
+    if (!provider && !model && !endpoint && !endpointClear) {
+        return {
+            request: null,
+            error: '--set-config requires --provider, --model, --endpoint, and/or --endpoint-clear',
+        };
+    }
+    if (provider !== undefined && provider.trim().length === 0) {
+        return { request: null, error: '--provider cannot be empty' };
+    }
+    if (model !== undefined && model.trim().length === 0) {
+        return { request: null, error: '--model cannot be empty' };
+    }
+    if (endpoint !== undefined && endpoint.trim().length === 0) {
+        return { request: null, error: '--endpoint cannot be empty' };
+    }
+    if (endpoint && endpointClear) {
+        return { request: null, error: '--endpoint and --endpoint-clear conflict' };
+    }
+    return {
+        request: {
+            provider: provider?.trim(),
+            model: model?.trim(),
+            endpoint: endpoint?.trim(),
+            endpointClear: endpointClear || undefined,
+        },
+    };
+}
+export function parseSetKeyFlags(argv) {
+    if (!argv.includes('--set-key')) {
+        return { request: null };
+    }
+    let provider;
+    let key;
+    for (let i = 0; i < argv.length; i++) {
+        const arg = argv[i];
+        if (arg === '--provider') {
+            provider = argv[i + 1];
+            i++;
+        }
+        else if (arg === '--key') {
+            key = argv[i + 1];
+            i++;
+        }
+    }
+    if (!provider || provider.trim().length === 0) {
+        return { request: null, error: '--set-key requires --provider <id>' };
+    }
+    if (!key || key.trim().length === 0) {
+        return { request: null, error: '--set-key requires --key <secret>' };
+    }
+    return {
+        request: {
+            provider: provider.trim(),
+            key: key.trim(),
+        },
+    };
+}
+export function parseDiscoverModelsFlags(argv) {
+    if (!argv.includes('--discover-models')) {
+        return { provider: null, present: false };
+    }
+    let provider;
+    for (let i = 0; i < argv.length; i++) {
+        if (argv[i] === '--provider') {
+            provider = argv[i + 1];
+            i++;
+        }
+    }
+    return {
+        present: true,
+        provider: provider?.trim() || null,
+    };
+}
+/** Build config snapshot for desktop/settings (no secrets). */
+export function buildDesktopConfigSnapshot() {
+    const config = getProviderConfig();
+    const providers = PROVIDERS.map((p) => {
+        const cached = getCachedModels(p.id);
+        const models = cached?.models.map((m) => m.id) ?? [];
+        const defaultModel = config.modelByProvider[p.id] ?? '';
+        if (defaultModel && !models.includes(defaultModel)) {
+            models.unshift(defaultModel);
+        }
+        const custom = getCustomEndpoint(p.id);
+        const builtin = p.baseUrl ?? null;
+        return {
+            id: p.id,
+            displayName: p.displayName,
+            hasKey: !!resolveApiKey(p.id),
+            envVar: p.envVar,
+            models,
+            defaultModel,
+            endpoint: custom ?? null,
+            baseUrl: custom ?? builtin,
+        };
+    });
+    return {
+        activeProviderId: config.activeProviderId,
+        modelByProvider: { ...config.modelByProvider },
+        providers,
+        cliVersion: getCurrentVersion(),
+        configPaths: {
+            provider: getProviderConfigPath(),
+            keys: getKeyStorePath(),
+        },
+    };
+}
+/** Write one JSON object to stdout (pretty for humans, still single payload). */
+export function printDesktopConfig() {
+    const snap = buildDesktopConfigSnapshot();
+    process.stdout.write(JSON.stringify(snap, null, 2) + '\n');
+}
+/**
+ * Persist provider, model, and/or custom endpoint.
+ */
+export function applySetConfig(req) {
+    try {
+        const config = getProviderConfig();
+        let targetProvider = (req.provider ?? config.activeProviderId);
+        if (req.provider) {
+            const exists = PROVIDERS.some((p) => p.id === req.provider);
+            if (!exists) {
+                return {
+                    ok: false,
+                    error: `unknown provider '${req.provider}'. Available: ${PROVIDERS.map((p) => p.id).join(', ')}`,
+                };
+            }
+            setActiveProviderId(req.provider);
+            targetProvider = req.provider;
+        }
+        // Endpoint ops target explicit provider or active; for endpoint-only
+        // without --provider, prefer openai-compatible when clearing/setting
+        // and user is not targeting a specific provider... actually use targetProvider.
+        if (req.endpointClear) {
+            clearCustomEndpoint(targetProvider);
+        }
+        if (req.endpoint) {
+            setCustomEndpoint(targetProvider, req.endpoint);
+        }
+        if (req.model) {
+            setModelForProvider(targetProvider, req.model);
+        }
+        const after = getProviderConfig();
+        const ep = getCustomEndpoint(after.activeProviderId);
+        return {
+            ok: true,
+            message: `activeProvider=${after.activeProviderId} ` +
+                `model=${after.modelByProvider[after.activeProviderId]}` +
+                (ep ? ` endpoint=${ep}` : ''),
+        };
+    }
+    catch (err) {
+        return {
+            ok: false,
+            error: err instanceof Error ? err.message : String(err),
+        };
+    }
+}
+/** Store API key (never echoes the secret). */
+export function applySetKey(req) {
+    try {
+        const exists = PROVIDERS.some((p) => p.id === req.provider);
+        if (!exists) {
+            return {
+                ok: false,
+                error: `unknown provider '${req.provider}'. Available: ${PROVIDERS.map((p) => p.id).join(', ')}`,
+            };
+        }
+        setApiKey(req.provider, req.key);
+        setActiveProviderId(req.provider);
+        return {
+            ok: true,
+            provider: req.provider,
+            masked: maskKey(req.key),
+        };
+    }
+    catch (err) {
+        return {
+            ok: false,
+            error: err instanceof Error ? err.message : String(err),
+        };
+    }
+}
+const DISCOVERABLE = [
+    'grok',
+    'glm',
+    'minimax',
+    'deepseek',
+    'openai-compatible',
+];
+/** Fetch and cache models; print JSON result. */
+export async function runDiscoverModels(providerArg) {
+    const config = getProviderConfig();
+    const providerId = (providerArg ?? config.activeProviderId).trim();
+    if (!DISCOVERABLE.includes(providerId)) {
+        // custom may still work via openai-compatible discovery if mapped — try openai-compatible path
+        if (providerId === 'custom') {
+            // Fall through using openai-compatible discovery with custom endpoint if set
+        }
+        else {
+            return {
+                ok: false,
+                error: `provider '${providerId}' is not discoverable. Use: ${DISCOVERABLE.join(', ')}`,
+            };
+        }
+    }
+    const discoveryId = (providerId === 'custom' ? 'openai-compatible' : providerId);
+    try {
+        const entry = await discoverModelsForProvider(discoveryId);
+        return {
+            ok: true,
+            payload: {
+                ok: true,
+                provider: providerId,
+                models: entry.models.map((m) => m.id),
+                fetchedAt: entry.fetchedAt,
+                baseUrl: entry.baseUrl,
+            },
+        };
+    }
+    catch (err) {
+        return {
+            ok: false,
+            error: err instanceof Error ? err.message : String(err),
+        };
+    }
+}
+//# sourceMappingURL=desktopConfig.js.map

package/dist/cli/desktopConfig.js.map

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

package/dist/cli/headless.js

@@ -1,5 +1,5 @@
 /**
- * headless — non-interactive CLI mode for CI/CD and scripting.
+ * headless — non-interactive CLI mode for CI/CD, scripting, and Zelari Desktop.
  *
  * Bypasses Ink entirely. Reads `--task <prompt>`, runs the prompt
  * through the same dispatch path the TUI uses, and serializes the
@@ -17,11 +17,22 @@
 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>]
+import { parsePhase } from './phase.js';
+import { parseMode } from './mode.js';
+const HELP_TEXT = `zelari-code --headless --task <prompt> [options]
 
 Non-interactive mode. Streams BrainEvents as NDJSON to stdout (one JSON
 object per line) or as plain text (just the assistant message text).
 
+Options:
+  --task <text>              Task prompt (required)
+  --output json|plain        Output format (default: json)
+  --mode agent|council|zelari  Dispatch mode (default: agent)
+  --council                  Alias for --mode council
+  --phase plan|build         Work phase (default: build)
+  --provider <id>            Provider override (default: active)
+  --model <name>             Model override (default: provider default)
+
 Exit codes:
   0  completed
   1  user error (bad flags, missing API key, ...)
@@ -38,7 +49,10 @@ export function parseHeadlessFlags(argv) {
     }
     let task;
     let output = 'json';
-    let useCouncil = false;
+    let mode = 'agent';
+    let phase = 'build';
+    let modeExplicit = false;
+    let councilFlag = false;
     let provider;
     let model;
     for (let i = 0; i < argv.length; i++) {
@@ -63,7 +77,32 @@ export function parseHeadlessFlags(argv) {
             i++;
         }
         else if (arg === '--council') {
-            useCouncil = true;
+            councilFlag = true;
+        }
+        else if (arg === '--mode') {
+            const next = argv[i + 1];
+            const parsed = next ? parseMode(next) : null;
+            if (!parsed) {
+                return {
+                    options: null,
+                    error: `--mode requires 'agent', 'council', or 'zelari', got '${next ?? '(missing)'}'`,
+                };
+            }
+            mode = parsed;
+            modeExplicit = true;
+            i++;
+        }
+        else if (arg === '--phase') {
+            const next = argv[i + 1];
+            const parsed = next ? parsePhase(next) : null;
+            if (!parsed) {
+                return {
+                    options: null,
+                    error: `--phase requires 'plan' or 'build', got '${next ?? '(missing)'}'`,
+                };
+            }
+            phase = parsed;
+            i++;
         }
         else if (arg === '--provider') {
             provider = argv[i + 1];
@@ -74,11 +113,29 @@ export function parseHeadlessFlags(argv) {
             i++;
         }
     }
+    // --council is an alias for --mode council when --mode was not set.
+    if (councilFlag && !modeExplicit) {
+        mode = 'council';
+    }
+    else if (councilFlag && modeExplicit && mode !== 'council') {
+        return {
+            options: null,
+            error: `--council conflicts with --mode ${mode}`,
+        };
+    }
     if (!task || task.trim().length === 0) {
         return { options: null, error: '--headless requires --task <prompt>' };
     }
     return {
-        options: { task, output, useCouncil, provider, model },
+        options: {
+            task,
+            output,
+            mode,
+            phase,
+            useCouncil: mode === 'council',
+            provider,
+            model,
+        },
     };
 }
 /**

package/dist/cli/headless.js.map

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

package/dist/cli/hooks/chatStats.js

@@ -23,10 +23,17 @@ export function computeSessionStatsDelta(realUsage, userText, assistantContent,
     // char/4 fallback can't distinguish them, so assume 0 there.
     const cachedPromptTokens = realUsage?.cachedPromptTokens ?? 0;
     const turnCost = calculateCost(model, promptTokens, completionTokens, cachedPromptTokens);
+    // Context meter = this turn's prompt+completion (provider context window
+    // occupancy proxy), NOT the session cumulative total (which always grows
+    // and produced absurd "474k/200k" displays).
+    const contextTokens = realUsage
+        ? realUsage.totalTokens || promptTokens + completionTokens
+        : promptTokens + completionTokens;
     return {
         totalTokens: prev.totalTokens + promptTokens + completionTokens,
         totalCostUsd: prev.totalCostUsd + turnCost,
         cachedTokens: (prev.cachedTokens ?? 0) + cachedPromptTokens,
+        contextTokens,
     };
 }
 //# sourceMappingURL=chatStats.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"chatStats.js","sourceRoot":"","sources":["../../../src/cli/hooks/chatStats.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAEnD;;;;;;;;;;;;;;GAcG;AACH,MAAM,UAAU,wBAAwB,CACtC,SAKQ,EACR,QAAgB,EAChB,gBAAwB,EACxB,KAAa,EACb,IAA0E;IAE1E,MAAM,YAAY,GAAG,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;IACzF,MAAM,gBAAgB,GAAG,SAAS;QAChC,CAAC,CAAC,SAAS,CAAC,gBAAgB;QAC5B,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,gBAAgB,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;IAC3C,oEAAoE;IACpE,6DAA6D;IAC7D,MAAM,kBAAkB,GAAG,SAAS,EAAE,kBAAkB,IAAI,CAAC,CAAC;IAC9D,MAAM,QAAQ,GAAG,aAAa,CAAC,KAAK,EAAE,YAAY,EAAE,gBAAgB,EAAE,kBAAkB,CAAC,CAAC;IAC1F,OAAO;QACL,WAAW,EAAE,IAAI,CAAC,WAAW,GAAG,YAAY,GAAG,gBAAgB;QAC/D,YAAY,EAAE,IAAI,CAAC,YAAY,GAAG,QAAQ;QAC1C,YAAY,EAAE,CAAC,IAAI,CAAC,YAAY,IAAI,CAAC,CAAC,GAAG,kBAAkB;KAC5D,CAAC;AACJ,CAAC"}
+{"version":3,"file":"chatStats.js","sourceRoot":"","sources":["../../../src/cli/hooks/chatStats.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAEnD;;;;;;;;;;;;;;GAcG;AACH,MAAM,UAAU,wBAAwB,CACtC,SAKQ,EACR,QAAgB,EAChB,gBAAwB,EACxB,KAAa,EACb,IAMC;IAOD,MAAM,YAAY,GAAG,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;IACzF,MAAM,gBAAgB,GAAG,SAAS;QAChC,CAAC,CAAC,SAAS,CAAC,gBAAgB;QAC5B,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,gBAAgB,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;IAC3C,oEAAoE;IACpE,6DAA6D;IAC7D,MAAM,kBAAkB,GAAG,SAAS,EAAE,kBAAkB,IAAI,CAAC,CAAC;IAC9D,MAAM,QAAQ,GAAG,aAAa,CAAC,KAAK,EAAE,YAAY,EAAE,gBAAgB,EAAE,kBAAkB,CAAC,CAAC;IAC1F,yEAAyE;IACzE,yEAAyE;IACzE,6CAA6C;IAC7C,MAAM,aAAa,GAAG,SAAS;QAC7B,CAAC,CAAC,SAAS,CAAC,WAAW,IAAI,YAAY,GAAG,gBAAgB;QAC1D,CAAC,CAAC,YAAY,GAAG,gBAAgB,CAAC;IACpC,OAAO;QACL,WAAW,EAAE,IAAI,CAAC,WAAW,GAAG,YAAY,GAAG,gBAAgB;QAC/D,YAAY,EAAE,IAAI,CAAC,YAAY,GAAG,QAAQ;QAC1C,YAAY,EAAE,CAAC,IAAI,CAAC,YAAY,IAAI,CAAC,CAAC,GAAG,kBAAkB;QAC3D,aAAa;KACd,CAAC;AACJ,CAAC"}

package/dist/cli/hooks/useChatTurn.js

@@ -311,9 +311,13 @@ export function useChatTurn(params) {
                 default: 25,
                 min: 1,
             });
-            // v1.5.2 / v1.8.0: tool-loop cap — budget policy may lower under
-            // context pressure; env still wins as the ceiling via applyBudgetPolicy.
+            // v1.5.2 / v1.8.0 / v1.8.3: soft tool-loop + optional hard ceiling.
+            // Soft can auto-extend until hard so multi-step work finishes.
             const maxToolLoopIterations = budget.maxToolLoopIterations;
+            const maxToolLoopHardCap = envNumber(process.env.ZELARI_MAX_TOOL_LOOP_HARD, {
+                default: 0, // 0 → harness default (soft×3, min soft+60)
+                min: 0,
+            });
             const harness = new AgentHarness({
                 model: envConfig.model,
                 provider: "openai-compatible",
@@ -335,6 +339,7 @@ export function useChatTurn(params) {
                 cwd,
                 maxToolCallsPerTurn,
                 maxToolLoopIterations,
+                ...(maxToolLoopHardCap > 0 ? { maxToolLoopHardCap } : {}),
             });
             harnessRef.current = harness;
             setQueueCount(harness.queueLength);
@@ -429,7 +434,13 @@ export function useChatTurn(params) {
                     }
                     else if (event.type === "error") {
                         flushStreaming();
-                        appendSystem(setMessages, `[error] ${event.message}`, Date.now());
+                        // Budget extension is informational, not a hard error.
+                        if (event.code === "tool_budget_extended") {
+                            appendSystem(setMessages, `[budget] ${event.message}`, Date.now());
+                        }
+                        else {
+                            appendSystem(setMessages, `[error] ${event.message}`, Date.now());
+                        }
                     }
                     else if (event.type === "tool_execution_start") {
                         toolNameById.set(event.toolCallId, event.toolName);