@stratusagent/cli 0.11.3 → 0.11.5

package/dist/commands/setup.js

@@ -4,7 +4,7 @@ import { preflightPlugin, readPluginManifest, PluginConfigError, PluginManifestE
 import { DEFAULT_ANTHROPIC_MODEL } from '@stratusagent/provider-anthropic';
 import { DEFAULT_CODEX_MODEL } from '@stratusagent/provider-codex';
 import { formatSoul, parseSoul } from '@stratusagent/agents';
-import { claimSoulFile, collectAvailableModels as collectModels, credentialsPath, defaultApiKeyEnvName, DEFAULT_ANTHROPIC_BASE_URL, DEFAULT_OPENAI_BASE_URL, DEFAULT_OPENAI_MODEL, DEFAULT_STRATUS_AGENT, globalConfigPath, loadChannelCredentials, loadCredentials, loadRosterSouls, loadSoulFile, readNonEmptyString, readProcessEnv, readWorkingDirectory, resolveAgentApprovals, DEFAULT_CONFIG_FILENAME, loadConfigFile, saveChannelCredentials, saveConfigFile, saveCredentials, CREDENTIAL_PROVIDER_NAMES, verifyProviderKey, workspacesDirPath, } from '@stratusagent/state';
+import { claimSoulFile, collectAvailableModels as collectModels, credentialsPath, defaultApiKeyEnvName, DEFAULT_ANTHROPIC_BASE_URL, DEFAULT_OPENAI_BASE_URL, DEFAULT_OPENAI_MODEL, DEFAULT_STRATUS_AGENT, globalConfigPath, loadChannelCredentials, loadCredentials, loadRosterSouls, loadSoulFile, isRegisteredProviderName, readNonEmptyString, registeredProviderNameOf, readProcessEnv, readWorkingDirectory, resolveAgentApprovals, DEFAULT_CONFIG_FILENAME, loadConfigFile, saveChannelCredentials, saveConfigFile, saveCredentials, CREDENTIAL_PROVIDER_NAMES, verifyProviderKey, } from '@stratusagent/state';
 import { installService, readServiceStatus, servicePlatform, serviceUnitPath, uninstallService, } from "../service.js";
 import { classifyApprovalReach, unattendedReachParts } from "../approvals.js";
 import { serviceEnvFor } from "../daemon.js";
@@ -101,6 +101,17 @@ export const runSetup = async (command, streams, env = {}) => {
         ...(existing.approvals !== undefined ? { approvals: existing.approvals } : {}),
         ...(existing.api !== undefined ? { api: existing.api } : {}),
         ...(existing.principals !== undefined ? { principals: existing.principals } : {}),
+        ...(existing.slack !== undefined ? { slack: existing.slack } : {}),
+        // Settings setup has no menu for, carried through a save untouched: a
+        // re-run that dropped them would put the operator's agents back on the
+        // host and the file store without a word — and, for the two bounds,
+        // back on defaults their model cannot serve. A `maxTokens` set because
+        // a proxy's ceiling is under 16000 would silently return to 16000 and
+        // fail every request; a raised `maxTurns` would return to 8.
+        ...(existing.executor !== undefined ? { executor: existing.executor } : {}),
+        ...(existing.memoryStore !== undefined ? { memoryStore: existing.memoryStore } : {}),
+        ...(existing.maxTokens !== undefined ? { maxTokens: existing.maxTokens } : {}),
+        ...(existing.maxTurns !== undefined ? { maxTurns: existing.maxTurns } : {}),
         credentials: await loadCredentials(env),
         credentialsDirty: false,
         channels: await loadChannelCredentials(env),
@@ -126,14 +137,24 @@ export const runSetup = async (command, streams, env = {}) => {
         header: stratusHeaderLines,
         consumeNotices: () => recentNotices.splice(0),
     });
-    const defaultModelFor = (provider) => provider === 'openai'
+    const builtInDefaultModel = (provider) => provider === 'openai'
         ? DEFAULT_OPENAI_MODEL
         : provider === 'codex'
             ? DEFAULT_CODEX_MODEL
             : DEFAULT_ANTHROPIC_MODEL;
+    // A contributed provider's default is its own, so setup has none to
+    // name for it — and none to write into a config or a soul.
+    const defaultModelFor = (provider) => isRegisteredProviderName(provider) ? undefined : builtInDefaultModel(provider);
     // Widened to CliProviderName only so setup can ask about the provider it
     // currently has selected, `demo` included; the rule itself is the shared one.
-    const defaultKeyEnvFor = (provider) => defaultApiKeyEnvName(provider === 'demo' ? 'anthropic' : provider);
+    const defaultKeyEnvFor = (provider) => defaultApiKeyEnvName(credentialProviderOf(provider) ?? 'anthropic');
+    /**
+     * The sign-in a selection is stored under, or nothing: the demo provider
+     * has none, and a provider a plugin registered brings its own through
+     * its plugin's config and credentials — setup neither stores nor checks
+     * one for it.
+     */
+    const credentialProviderOf = (provider) => provider === 'demo' || isRegisteredProviderName(provider) ? undefined : provider;
     const credentialLabel = (provider, credential) => credential.type === 'oauth_token'
         ? (provider === 'codex' ? 'ChatGPT sign-in' : 'Claude subscription')
         : 'API key';
@@ -177,6 +198,9 @@ export const runSetup = async (command, streams, env = {}) => {
         if (state.provider === 'demo') {
             return 'no account needed';
         }
+        if (isRegisteredProviderName(state.provider)) {
+            return `served by the plugin that registers ${registeredProviderNameOf(state.provider)}, on its own sign-in`;
+        }
         const credential = state.credentials[state.provider];
         if (credential) {
             return credential.type === 'oauth_token'
@@ -412,7 +436,13 @@ export const runSetup = async (command, streams, env = {}) => {
             ? readNonEmptyString(processEnv.STRATUS_API_KEY_ENV)
                 ?? state.apiKeyEnv
             : undefined;
-        return state.credentials[provider] !== undefined
+        const stored = credentialProviderOf(provider);
+        // A contributed provider brings its own sign-in; setup cannot check
+        // it and does not claim to.
+        if (stored === undefined) {
+            return isRegisteredProviderName(provider);
+        }
+        return state.credentials[stored] !== undefined
             || readNonEmptyString(processEnv.STRATUS_API_KEY) !== undefined
             || (keyEnvSelector ? readNonEmptyString(processEnv[String(keyEnvSelector)]) !== undefined : false)
             || readNonEmptyString(processEnv[defaultKeyEnvFor(provider)]) !== undefined;
@@ -503,7 +533,8 @@ export const runSetup = async (command, streams, env = {}) => {
             // provider, wherever the default currently points.
             const listed = available.find((entry) => entry.id === typed);
             const inferred = listed?.provider
-                ?? (state.provider !== 'demo' ? state.provider : available[0].provider);
+                ?? credentialProviderOf(state.provider)
+                ?? available[0].provider;
             return { provider: inferred, id: typed };
         };
         let choice;
@@ -611,8 +642,9 @@ export const runSetup = async (command, streams, env = {}) => {
         const name = await prompter.ask('Name your agent (Enter to have one generated): ');
         const instructions = await prompter.ask('Describe their personality in a sentence or two (Enter for a starter you can edit later): ');
         const persona = instructions || DEFAULT_SOUL_STARTER;
+        const pinnedModel = state.model ?? defaultModelFor(state.provider);
         const pin = state.provider !== 'demo'
-            ? { provider: state.provider, model: state.model ?? defaultModelFor(state.provider) }
+            ? { provider: state.provider, ...(pinnedModel !== undefined ? { model: pinnedModel } : {}) }
             : {};
         const claimed = await claimSoulFile(env, { ...(name ? { name } : {}), instructions: persona }, (agent) => formatSoul({ agent, ...pin }), (message) => writeLine(streams.stdout, message));
         const { agent, soulPath } = claimed;
@@ -626,7 +658,13 @@ export const runSetup = async (command, streams, env = {}) => {
         if (!state.fallbackModel || state.provider === 'demo') {
             return undefined;
         }
-        const fallbackProvider = (state.fallbackProvider ?? state.provider);
+        const selectedFallback = state.fallbackProvider ?? state.provider;
+        if (isRegisteredProviderName(selectedFallback)) {
+            // A contributed fallback brings its own sign-in, as a contributed
+            // primary does; the test run selects it by name and no more.
+            return { provider: selectedFallback, model: state.fallbackModel };
+        }
+        const fallbackProvider = selectedFallback;
         const envKey = (fallbackProvider === state.provider
             ? readNonEmptyString(processEnv.STRATUS_API_KEY)
             : undefined)
@@ -689,9 +727,25 @@ export const runSetup = async (command, streams, env = {}) => {
             ?? defaultKeyEnvFor(state.provider);
         const envKey = readNonEmptyString(processEnv.STRATUS_API_KEY)
             ?? readNonEmptyString(processEnv[String(keyEnv)]);
-        const credential = envKey ? undefined : state.credentials[state.provider];
+        const storedFor = credentialProviderOf(state.provider);
+        const credential = envKey || storedFor === undefined ? undefined : state.credentials[storedFor];
         const boundUrl = credential?.type === 'api_key' ? credential.baseUrl : undefined;
-        const model = state.model ?? defaultModelFor(state.provider);
+        if (isRegisteredProviderName(state.provider)) {
+            // A contributed provider brings its own sign-in and its own default
+            // model; the test run selects it and no more, exactly as a real run
+            // resolves it — the configured fallback included, so the test
+            // exercises the failover the saved config would perform.
+            const fallback = buildTestFallback();
+            return {
+                provider: state.provider,
+                ...(state.model ? { model: state.model } : {}),
+                ...(state.systemPrompt ? { systemPrompt: state.systemPrompt } : {}),
+                ...(env.fetch ? { fetch: env.fetch } : {}),
+                ...(soul ? { soul } : {}),
+                ...(fallback ? { fallback } : {}),
+            };
+        }
+        const model = state.model ?? builtInDefaultModel(state.provider);
         if (state.provider === 'anthropic') {
             const apiKey = envKey ?? (credential?.type === 'api_key' ? credential.value : undefined);
             const authToken = credential?.type === 'oauth_token' ? credential.value : undefined;
@@ -1039,7 +1093,7 @@ export const runSetup = async (command, streams, env = {}) => {
             const { manifest, directory } = await readPluginManifest(name, {
                 resolve: (target) => import.meta.resolve(target),
             });
-            await preflightPlugin(manifest, directory, block, workspacesDirPath(env));
+            await preflightPlugin(manifest, directory, block);
             return undefined;
         }
         catch (error) {
@@ -2135,8 +2189,9 @@ export const runSetup = async (command, streams, env = {}) => {
         // below are objects, and a `Record<string, string | boolean>` was what
         // made dropping them the path of least resistance.
         const config = { provider: state.provider };
-        if (state.provider !== 'demo') {
-            config.model = state.model ?? defaultModelFor(state.provider);
+        const savedModel = state.model ?? defaultModelFor(state.provider);
+        if (state.provider !== 'demo' && savedModel !== undefined) {
+            config.model = savedModel;
         }
         if (state.provider === 'openai') {
             config.baseUrl = state.baseUrl ?? state.credentials.openai?.baseUrl ?? DEFAULT_OPENAI_BASE_URL;
@@ -2171,8 +2226,8 @@ export const runSetup = async (command, streams, env = {}) => {
         if (state.promptCacheTtl !== undefined) {
             config.promptCacheTtl = state.promptCacheTtl;
         }
-        // `plugins` and `approvals` have menus above; `api` and `principals`
-        // do not and are written back exactly as they were read. Both cases
+        // `plugins` and `approvals` have menus above; `api`, `principals`, and
+        // `slack` do not and are written back exactly as they were read. Both cases
         // land here the same way, because the menus edit this state rather
         // than the file — so there is nothing to merge, only to not lose.
         if (state.plugins !== undefined) {
@@ -2187,6 +2242,21 @@ export const runSetup = async (command, streams, env = {}) => {
         if (state.principals !== undefined) {
             config.principals = state.principals;
         }
+        if (state.slack !== undefined) {
+            config.slack = state.slack;
+        }
+        if (state.executor !== undefined) {
+            config.executor = state.executor;
+        }
+        if (state.memoryStore !== undefined) {
+            config.memoryStore = state.memoryStore;
+        }
+        if (state.maxTokens !== undefined) {
+            config.maxTokens = state.maxTokens;
+        }
+        if (state.maxTurns !== undefined) {
+            config.maxTurns = state.maxTurns;
+        }
         await saveConfigFile(configPath, config);
         writeLine(streams.stdout);
         writeLine(streams.stdout, `Wrote ${configPath}`);
@@ -2287,8 +2357,8 @@ export const runSetup = async (command, streams, env = {}) => {
         // would make `stratus run` behave differently from what was just saved.
         const conflicts = [
             detectEnvOverride('STRATUS_PROVIDER', state.provider, '--provider'),
-            ...(state.provider !== 'demo'
-                ? [detectEnvOverride('STRATUS_MODEL', state.model ?? defaultModelFor(state.provider), '--model')]
+            ...(state.provider !== 'demo' && (state.model ?? defaultModelFor(state.provider)) !== undefined
+                ? [detectEnvOverride('STRATUS_MODEL', String(state.model ?? defaultModelFor(state.provider)), '--model')]
                 : []),
             ...(state.provider === 'openai'
                 ? [detectEnvOverride('STRATUS_BASE_URL', state.baseUrl ?? DEFAULT_OPENAI_BASE_URL, '--base-url')]
@@ -2311,7 +2381,7 @@ export const runSetup = async (command, streams, env = {}) => {
         else if (readNonEmptyString(processEnv.STRATUS_API_KEY)) {
             writeLine(streams.stdout, 'STRATUS_API_KEY is exported and takes precedence over your saved sign-in. You are ready to go. Try:');
         }
-        else if (state.credentials[state.provider]) {
+        else if (isRegisteredProviderName(state.provider) || state.credentials[credentialProviderOf(state.provider) ?? 'anthropic']) {
             writeLine(streams.stdout, `You are ${signInSummary()} — ready to go. Try:`);
         }
         else {