@exagent/agent 0.3.3 → 0.3.4

package/src/setup.ts

@@ -150,17 +150,15 @@ const LLM_PROVIDERS = ['openai', 'anthropic', 'google', 'deepseek', 'mistral', '
 
 async function setupLlm(
   config: RuntimeConfigFile,
-  bootstrapPayload: BootstrapPayload,
 ): Promise<{ provider: string; model: string; apiKey: string }> {
-  // D8: If bootstrap has no LLM payload AND config has no real apiKey,
-  // the config's provider/model are just wizard defaults — don't trust them.
-  const hasRealLlmConfig = !!(bootstrapPayload.llm?.apiKey || config.llm?.apiKey);
+  // LLM config is always entered locally — never pulled from bootstrap.
+  // Config file may have provider/model as defaults from the deploy wizard.
 
   // Non-interactive mode
   if (isNonInteractive()) {
-    const provider = process.env.EXAGENT_LLM_PROVIDER || bootstrapPayload.llm?.provider || (hasRealLlmConfig ? config.llm?.provider : undefined);
-    const model = process.env.EXAGENT_LLM_MODEL || bootstrapPayload.llm?.model || (hasRealLlmConfig ? config.llm?.model : undefined);
-    const apiKey = process.env.EXAGENT_LLM_KEY || bootstrapPayload.llm?.apiKey || config.llm?.apiKey;
+    const provider = process.env.EXAGENT_LLM_PROVIDER || config.llm?.provider;
+    const model = process.env.EXAGENT_LLM_MODEL || config.llm?.model;
+    const apiKey = process.env.EXAGENT_LLM_KEY;
     if (!provider) throw new Error('EXAGENT_LLM_PROVIDER required in non-interactive mode');
     if (!model) throw new Error('EXAGENT_LLM_MODEL required in non-interactive mode');
     if (!apiKey) throw new Error('EXAGENT_LLM_KEY required in non-interactive mode');
@@ -168,58 +166,36 @@ async function setupLlm(
     return { provider, model, apiKey };
   }
 
-  // Provider — only trust config value if we have a real LLM config
-  let provider = bootstrapPayload.llm?.provider || (hasRealLlmConfig ? config.llm?.provider : undefined);
-  if (provider) {
-    printInfo(`Provider: ${pc.cyan(provider)} ${pc.dim('(from dashboard)')}`);
-  } else {
-    const selected = await clack.select({
-      message: 'LLM provider:',
-      options: LLM_PROVIDERS.map(p => ({ value: p, label: p })),
-    });
-    if (clack.isCancel(selected)) cancelled();
-    provider = selected;
-  }
-
-  // Model — only trust config value if we have a real LLM config
-  let model = bootstrapPayload.llm?.model || (hasRealLlmConfig ? config.llm?.model : undefined);
-  if (model) {
-    printInfo(`Model: ${pc.cyan(model)} ${pc.dim('(from dashboard)')}`);
-  } else {
-    const entered = await clack.text({
-      message: 'LLM model:',
-      placeholder: 'gpt-4o',
-      validate: (val) => {
-        if (!val.trim()) return 'Model name is required.';
-      },
-    });
-    if (clack.isCancel(entered)) cancelled();
-    model = entered;
-  }
+  // Provider — use config as default selection if available
+  const defaultProvider = config.llm?.provider;
+  const providerOptions = LLM_PROVIDERS.map(p => ({ value: p, label: p }));
+  const selected = await clack.select({
+    message: 'LLM provider:',
+    options: providerOptions,
+    initialValue: defaultProvider || undefined,
+  });
+  if (clack.isCancel(selected)) cancelled();
+  const provider = selected;
+
+  // Model — use config as default/placeholder if available
+  const defaultModel = config.llm?.model;
+  const entered = await clack.text({
+    message: 'LLM model:',
+    placeholder: defaultModel || 'gpt-4o',
+    defaultValue: defaultModel || undefined,
+    validate: (val) => {
+      if (!val.trim()) return 'Model name is required.';
+    },
+  });
+  if (clack.isCancel(entered)) cancelled();
+  const model = entered;
 
-  // API Key
-  let apiKey: string | undefined;
-  if (bootstrapPayload.llm?.apiKey) {
-    const useBootstrap = await clack.confirm({
-      message: 'LLM API key received from dashboard. Use it?',
-      initialValue: true,
-    });
-    if (clack.isCancel(useBootstrap)) cancelled();
-    if (useBootstrap) {
-      apiKey = bootstrapPayload.llm.apiKey;
-    }
-  }
-  if (!apiKey) {
-    apiKey = config.llm?.apiKey;
-  }
-  if (!apiKey) {
-    const entered = await clack.password({
-      message: 'LLM API key:',
-      validate: (val) => validateLlmKeyFormat(provider, val),
-    });
-    if (clack.isCancel(entered)) cancelled();
-    apiKey = entered;
-  }
+  // API Key — always prompt, never from bootstrap
+  const apiKey = await clack.password({
+    message: 'LLM API key:',
+    validate: (val) => validateLlmKeyFormat(provider, val),
+  });
+  if (clack.isCancel(apiKey)) cancelled();
 
   printDone('LLM configured');
   return { provider, model, apiKey };
@@ -312,6 +288,14 @@ export async function ensureLocalSetup(configPath: string): Promise<void> {
     !config.wallet?.privateKey &&
     !config.llm.apiKey
   ) {
+    printBanner();
+    printSuccess('Already set up', [
+      `${pc.cyan('npx exagent run')}       Start the agent`,
+      `${pc.cyan('npx exagent config')}    Change LLM API key or model`,
+      `${pc.cyan('npx exagent status')}    Check agent connection`,
+      '',
+      `${pc.dim('Dashboard:')}  ${pc.cyan('https://exagent.io')}`,
+    ]);
     return;
   }
 
@@ -324,9 +308,6 @@ export async function ensureLocalSetup(configPath: string): Promise<void> {
   const bootstrapPayload = await consumeBootstrapPackage(config);
   if (config.secrets?.bootstrapToken) {
     printDone('Bootstrap package consumed');
-    if (bootstrapPayload.llm?.provider) {
-      printInfo(`LLM config received: ${pc.cyan(bootstrapPayload.llm.provider)}${bootstrapPayload.llm.model ? ` / ${pc.cyan(bootstrapPayload.llm.model)}` : ''}`);
-    }
   } else {
     printInfo('No bootstrap token — manual configuration');
   }
@@ -337,7 +318,7 @@ export async function ensureLocalSetup(configPath: string): Promise<void> {
 
   // Step 3: LLM
   printStep(3, 4, 'LLM configuration');
-  const llm = await setupLlm(config, bootstrapPayload);
+  const llm = await setupLlm(config);
 
   // Step 4: Encryption
   printStep(4, 4, 'Device encryption');
@@ -393,8 +374,9 @@ export async function ensureLocalSetup(configPath: string): Promise<void> {
   clack.outro(pc.green('Setup complete'));
 
   printSuccess('Ready', [
-    `${pc.cyan('npx exagent run')}      Start trading`,
-    `${pc.cyan('npx exagent status')}   Check connection`,
+    `${pc.cyan('npx exagent run')}       Start the agent`,
+    `${pc.cyan('npx exagent config')}    Change LLM API key or model`,
+    `${pc.cyan('npx exagent status')}    Check agent connection`,
     '',
     `${pc.dim('Dashboard:')}  ${pc.cyan('https://exagent.io')}`,
   ]);