neoctl 0.2.53 → 0.2.55

package/dist/repl/index.js

@@ -1,4 +1,7 @@
 #!/usr/bin/env node
+import { trackSettingsGateway } from "../model/settings-sync.js";
+import { ModelSettingsStore, compositionModelConfig } from "../model/settings-store.js";
+import { registerCompositionTools } from "../model/composition-runtime.js";
 import fs from "node:fs/promises";
 import { existsSync, readFileSync } from "node:fs";
 import path from "node:path";
@@ -12,7 +15,7 @@ import { getUserDotEnvPath, loadDefaultDotEnvFiles } from "../model/env.js";
 import { readModelProviderConfig } from "../model/config.js";
 import { findModelMetadata, loadModelCatalog, reasoningEffortsForModel, resolveContextWindowTokens } from "../model/context-window.js";
 import { CommunicationLogger, LoggingModelGateway } from "../model/communication-logger.js";
-import { createModelGatewayFromConfig, createModelGatewayFromProcessEnv } from "../model/provider-factory.js";
+import { createModelGatewayFromConfig } from "../model/provider-factory.js";
 import { ToolRegistry } from "../tools/registry.js";
 import { editTool, writeTool } from "../tools/builtins/edit-tool.js";
 import { createExecTool, createWriteStdinTool } from "../tools/builtins/exec-tool.js";
@@ -233,9 +236,13 @@ async function buildSkillCatalogPromptSection(catalog) {
 }
 async function createRuntime(options = {}) {
     const envLoad = loadDefaultDotEnvFiles({ override: true });
-    const modelConfig = readModelProviderConfig(process.env);
+    loadModelCatalog();
+    const settingsStore = new ModelSettingsStore();
+    const appliedSettings = settingsStore.read()?.applied;
+    const settingsRevisions = new WeakMap();
+    const modelConfig = appliedSettings ? compositionModelConfig(appliedSettings.composition, appliedSettings.connections) : readModelProviderConfig(process.env);
     const communicationLogger = new CommunicationLogger();
-    const modelGateway = new LoggingModelGateway(createModelGatewayFromProcessEnv(process.env), communicationLogger);
+    const modelGateway = trackSettingsGateway(new LoggingModelGateway(createModelGatewayFromConfig(modelConfig), communicationLogger), appliedSettings?.revision, appliedSettings ? [appliedSettings.composition.main.api, appliedSettings.composition.image.api, appliedSettings.composition.search.api] : []);
     const taskStore = new TaskStore();
     const agentActivityStore = new AgentActivityStore();
     const secretStore = await SecretStore.open();
@@ -261,6 +268,8 @@ async function createRuntime(options = {}) {
     tools.register(createLoadImageTool());
     if (modelConfig?.provider === "openai")
         tools.register(createOpenAIImageGenerationTool());
+    if (appliedSettings)
+        registerCompositionTools(tools, appliedSettings.composition, appliedSettings.connections);
     tools.register(planTool);
     tools.register(createFrameworkFeedbackTool());
     for (const tool of createSecretTools())
@@ -289,6 +298,22 @@ async function createRuntime(options = {}) {
         reasoning: modelConfig?.defaultReasoning,
         modelGateway,
         tools,
+        beforeQuery: (engine) => {
+            const applied = settingsStore.read()?.applied;
+            if (!applied)
+                return;
+            const revision = applied.revision;
+            if (settingsRevisions.get(engine) === revision)
+                return;
+            const config = compositionModelConfig(applied.composition, applied.connections);
+            const gateway = trackSettingsGateway(new LoggingModelGateway(createModelGatewayFromConfig(config), communicationLogger), revision, [applied.composition.main.api, applied.composition.image.api, applied.composition.search.api]);
+            engine.setModelProvider({ modelGateway: gateway, model: config?.model, reasoning: config?.defaultReasoning });
+            registerCompositionTools(tools, applied.composition, applied.connections);
+            runtime.modelGateway = gateway;
+            runtime.agentRuntime.modelGateway = gateway;
+            runtime.defaultReasoning = config?.defaultReasoning;
+            settingsRevisions.set(engine, revision);
+        },
         contextManager: new SkillCatalogContextManager(skills),
         canUseTool: createSkillAwareCanUseTool(skills),
         secrets: secretStore,
@@ -882,7 +907,7 @@ function InkRepl({ runtime, initialCommandLine }) {
     };
     const handleEvent = (event) => {
         setStatus((current) => reduceStatus(current, event));
-        if (event.type === "usage")
+        if (event.type === "usage" && !event.provisional)
             runtime.usage.add(event.usage);
         if (event.type === "state")
             return;
@@ -2661,7 +2686,7 @@ async function handleModelCommand(command, runtime) {
                         reasoning: config.defaultReasoning,
                     });
                     syncImageGenerationTool(runtime, config.provider);
-                    runtime.defaultReasoning = config.defaultReasoning;
+                    runtime.defaultReasoning = config?.defaultReasoning;
                 }
             }
         }
@@ -2712,10 +2737,10 @@ async function persistModelCommandSettings(runtime, command, reasoningUpdate) {
     return { providerChanged: targetProvider !== currentProvider };
 }
 function currentModelProvider() {
-    return "openai";
+    return parseLoginProvider(process.env.MODEL_PROVIDER) ?? "openai";
 }
-function modelEnvKeyForProvider(_provider) {
-    return "OPENAI_MODEL";
+function modelEnvKeyForProvider(provider) {
+    return provider === "anthropic" ? "ANTHROPIC_MODEL" : "OPENAI_MODEL";
 }
 function envValueForReasoning(reasoning) {
     if (reasoning === null)
@@ -3055,21 +3080,25 @@ function restoredHistoryLines(runtime) {
     }
     return lines;
 }
-const LOGIN_PROVIDERS = ["openai"];
+const LOGIN_PROVIDERS = ["openai", "anthropic"];
 const SHARED_LOGIN_FIELDS = [
     { key: "reasoningEffort", label: "Reasoning effort", envKey: "MODEL_REASONING_EFFORT", scope: "shared", options: ["", "off", "none", "minimal", "low", "medium", "high", "xhigh", "max"] },
-    { key: "reasoningSummary", label: "Reasoning summary", envKey: "MODEL_REASONING_SUMMARY", scope: "shared", options: ["", "auto", "concise", "detailed"] },
-    { key: "maxOutputTokens", label: "Max output tokens", envKey: "MODEL_MAX_OUTPUT_TOKENS", scope: "shared" },
+    { key: "maxOutputTokens", label: "Max output tokens", envKey: "MODEL_MAX_OUTPUT_TOKENS", scope: "shared", placeholder: "Leave empty for server default" },
     { key: "timeoutMs", label: "Timeout ms", envKey: "MODEL_TIMEOUT_MS", scope: "shared", placeholder: "120000" },
     { key: "streamIdleTimeoutMs", label: "Stream idle timeout ms", envKey: "MODEL_STREAM_IDLE_TIMEOUT_MS", scope: "shared", placeholder: "120000" },
     { key: "maxRetries", label: "Max retries", envKey: "MODEL_MAX_RETRIES", scope: "shared", placeholder: "2" },
 ];
 const LOGIN_FIELD_DEFINITIONS = {
+    anthropic: [
+        { key: "apiKey", label: "API / CPA key", envKey: "ANTHROPIC_API_KEY", scope: "provider", required: true, secret: true },
+        { key: "baseUrl", label: "Base URL", envKey: "ANTHROPIC_BASE_URL", scope: "provider", placeholder: "https://api.anthropic.com" },
+        { key: "model", label: "Model", envKey: "ANTHROPIC_MODEL", scope: "provider", required: true, placeholder: "claude-sonnet-4-6" },
+        ...SHARED_LOGIN_FIELDS.map(field => field.key === "reasoningEffort" ? { ...field, options: ["", "off", "none", "low", "medium", "high", "xhigh", "max"] } : field.key === "maxOutputTokens" ? { ...field, placeholder: "8192" } : field),
+    ],
     openai: [
         { key: "apiKey", label: "API key", envKey: "OPENAI_API_KEY", scope: "provider", required: true, secret: true, placeholder: "sk-..." },
         { key: "baseUrl", label: "Base URL", envKey: "OPENAI_BASE_URL", scope: "provider", placeholder: "https://api.openai.com" },
         { key: "model", label: "Model", envKey: "OPENAI_MODEL", scope: "provider", required: true, placeholder: "gpt-5.6" },
-        { key: "endpoint", label: "Endpoint", envKey: "OPENAI_ENDPOINT", scope: "provider", placeholder: "auto", options: ["auto", "responses", "chat"] },
         ...SHARED_LOGIN_FIELDS,
     ],
 };
@@ -3314,7 +3343,7 @@ async function submitLoginForm(state, runtime, append, setLoginFormState, setSta
             reasoning: config.defaultReasoning,
         });
         syncImageGenerationTool(runtime, config.provider);
-        runtime.defaultReasoning = config.defaultReasoning;
+        runtime.defaultReasoning = config?.defaultReasoning;
         const metrics = await runtime.engine.contextMetrics();
         setStatus((current) => ({
             ...current,
@@ -3341,9 +3370,6 @@ function validateLoginForm(state) {
         if (value && !Number.isFinite(Number(value)))
             return `${fieldKey} must be a number.`;
     }
-    if (state.provider === "openai" && state.values.endpoint === "chat" && state.values.reasoningSummary?.trim()) {
-        return "Reasoning summary requires the Responses API endpoint.";
-    }
     return undefined;
 }
 function createLoginFormState(envPath = getUserDotEnvPath()) {
@@ -3373,23 +3399,21 @@ function loginValuesForProvider(provider, env) {
         values.baseUrl = defaultBaseUrlForLoginProvider(provider);
     if (!values.model)
         values.model = defaultModelForLoginProvider(provider);
-    if (provider === "openai" && !values.endpoint)
-        values.endpoint = "auto";
     return values;
 }
 function parseLoginProvider(value) {
-    if (value === "openai")
+    if (value === "openai" || value === "anthropic")
         return value;
     return undefined;
 }
-function guessLoginProvider(_env) {
-    return "openai";
+function guessLoginProvider(env) {
+    return env.ANTHROPIC_API_KEY && !env.OPENAI_API_KEY ? "anthropic" : currentModelProvider();
 }
-function defaultBaseUrlForLoginProvider(_provider) {
-    return "https://api.openai.com";
+function defaultBaseUrlForLoginProvider(provider) {
+    return provider === "anthropic" ? "https://api.anthropic.com" : "https://api.openai.com";
 }
-function defaultModelForLoginProvider(_provider) {
-    return "gpt-5.6";
+function defaultModelForLoginProvider(provider) {
+    return provider === "anthropic" ? "claude-sonnet-4-6" : "gpt-5.6";
 }
 function loginFormViewHeight(state) {
     return state.step === "provider" ? state.providers.length + 3 : LOGIN_FIELD_DEFINITIONS[state.provider].length + 4;
@@ -3459,6 +3483,7 @@ function updateEnvContent(content, updates, removeKeys = []) {
         const grouped = groupLoginEnvEntries(missing);
         appendEnvGroup(updatedLines, "# Neo active provider", grouped.active);
         appendEnvGroup(updatedLines, "# OpenAI provider settings", grouped.openai);
+        appendEnvGroup(updatedLines, "# Anthropic provider settings", grouped.anthropic);
         appendEnvGroup(updatedLines, "# Shared model runtime settings", grouped.shared);
     }
     return `${updatedLines.join("\n").replace(/\n*$/u, "")}\n`;
@@ -3467,6 +3492,7 @@ function groupLoginEnvEntries(entries) {
     return {
         active: entries.filter(([key]) => key === "MODEL_PROVIDER"),
         openai: entries.filter(([key]) => key.startsWith("OPENAI_")),
+        anthropic: entries.filter(([key]) => key.startsWith("ANTHROPIC_")),
         shared: entries.filter(([key]) => key.startsWith("MODEL_") && key !== "MODEL_PROVIDER"),
     };
 }