amicus 3.0.0 → 3.1.0

package/src/utils/start-helpers.js

@@ -6,71 +6,124 @@
  */
 
 /**
- * Resolve model from args: resolve alias or config default.
- * Returns { model, alias } or calls process.exit(1) on error.
+ * Derive the alias used for resolution (needed downstream by the budget gate,
+ * which reports `alias || args.model` as the pricing lookup's modelInput).
+ * Per the #61 Task 4.5 design, only ever returns a no-slash token: an
+ * explicit `--model` containing '/' or a slash-bearing config default both
+ * resolve to undefined here.
  * @param {object} args - Parsed CLI arguments
- * @returns {{ model: string, alias: string|undefined }}
+ * @returns {string|undefined}
  */
-function resolveModelFromArgs(args) {
-  const { resolveModel, loadConfig } = require('./config');
-  const rawAlias = args.model;
-  let model;
-  try {
-    model = resolveModel(args.model);
-  } catch (err) {
-    console.error(err.message);
-    process.exit(1);
+function deriveAlias(args) {
+  const raw = args.model;
+  if (raw !== undefined && raw !== null && !raw.includes('/')) {
+    return raw;
   }
-
-  // Determine the alias used (explicit or config default)
-  let alias = rawAlias;
-  if (alias === undefined) {
+  if (raw === undefined || raw === null) {
+    const { loadConfig } = require('./config');
     const cfg = loadConfig();
     if (cfg && cfg.default && !cfg.default.includes('/')) {
-      alias = cfg.default;
+      return cfg.default;
     }
   }
-  return { model, alias };
+  return undefined;
 }
 
 /**
- * Validate models before launch (F3 #18: default-on).
- * --no-validate-model opts out; the old opt-in --validate-model is a no-op kept for back-compat.
- * Returns the (possibly corrected) model string.
+ * Resolve the model for a launch through the Foundation gateway router (#61
+ * Task 4.5), used by every launch path — start, continue (Task 7.3), and the
+ * MCP amicus_start handler (via the same router, Task 6.2). This replaced the
+ * legacy resolveModelFromArgs + validateFallbackModel pair, which was retired
+ * once no launch path depended on it (#61 Task 4.7).
+ *
+ * On `resolved`, returns `{ model, alias, gateway, provenance }` (and prints
+ * any advisory `notice` to stderr). On `error` or `selection_required`,
+ * renders the appropriate message to stderr and exits(1) — this never
+ * returns in that case.
  * @param {object} args - Parsed CLI arguments
- * @param {string|undefined} alias - The alias used for resolution
- * @returns {Promise<string>} Validated model string
+ * @returns {Promise<{model: string, alias: string|undefined, gateway: string, provenance: object}>}
  */
-async function validateFallbackModel(args, alias) {
-  // F3 #18: validation is default-on. --no-validate-model opts out; the old
-  // opt-in --validate-model is now a no-op kept for back-compat.
-  if (args['no-validate-model']) { return args.model; }
+async function resolveLaunchModel(args) {
+  const { resolveGatewayMode } = require('./config');
+  const { resolveRouteForLaunch } = require('./route-launch');
+  const { toCliMessage, toStructuredError } = require('./route-error');
+  const { resolveModelInputOrDefault } = require('./model-input-default');
 
-  const headless = args['no-ui'] || !process.stdin.isTTY;
-  const { detectFallback } = require('./config');
+  const gatewayMode = resolveGatewayMode(args.gateway);
+  const validateModel = !args['no-validate-model'];
+  // Interactive alternatives picker (#61 Task 6.3): only offered on a real
+  // interactive TTY session that hasn't opted out with --no-ui. A headless/
+  // non-TTY run (CI, piped output, --no-ui) keeps allowSelection false, so a
+  // direct miss there still produces the structured error/selection_required
+  // rendered below rather than an unhandled prompt.
+  const allowSelection = !args['no-ui'] && !!process.stdin.isTTY;
+
+  // No --model given: the parser does not inject a default, so resolve the
+  // configured default here before handing off to the router. Without this, `undefined`
+  // would reach resolveRouteForLaunch -> parseDescriptor(undefined) -> an
+  // `invalid` result, breaking the common `amicus start` (no --model) case.
+  // Shared with the MCP amicus_start handler (mcp-server.js, #61 Task 6.2)
+  // via model-input-default.js, so this lookup lives in exactly one place.
+  const modelInput = resolveModelInputOrDefault(args.model);
+  if (modelInput === undefined) {
+    process.stderr.write(
+      'No model specified and no default configured. Run \'amicus setup\' to set a default model.\n'
+    );
+    process.exit(1);
+  }
 
-  // Direct-API fallback path: keep the provider-API existence check.
-  if (alias && detectFallback(alias, args.model)) {
-    const { validateDirectModel } = require('./model-validator');
+  const result = await resolveRouteForLaunch({
+    model: modelInput,
+    gatewayMode,
+    source: 'cli',
+    allowSelection,
+    validateModel,
+  });
+
+  if (result.kind === 'resolved') {
+    if (result.notice) {
+      process.stderr.write(`${result.notice}\n`);
+    }
+    return {
+      model: result.executableId,
+      alias: deriveAlias(args),
+      gateway: result.gateway,
+      provenance: result.provenance,
+    };
+  }
+
+  // Interactive alternatives picker (#61 Task 6.3): only reachable when
+  // allowSelection was true above (real TTY, no --no-ui), so the router only
+  // ever hands back selection_required here in that same interactive case.
+  if (result.kind === 'selection_required') {
+    const { promptRouteSelection } = require('./model-validator');
     try {
-      return await validateDirectModel(args.model, alias, { headless });
+      const chosen = await promptRouteSelection(result, deriveAlias(args));
+      return {
+        model: chosen.model,
+        alias: deriveAlias(args),
+        gateway: chosen.gateway,
+        provenance: result.provenance || {},
+      };
     } catch (err) {
-      console.error(err.message);
+      process.stderr.write(`${err.message || 'Model selection cancelled.'}\n`);
       process.exit(1);
     }
   }
 
-  // OpenRouter (and any) resolved model: validate against the live catalog.
-  const { validateAgainstCatalog } = require('./model-validator');
-  try {
-    return await validateAgainstCatalog(args.model, alias);
-  } catch (err) {
-    console.error(err.message);
-    process.exit(1);
+  // 'error': render and exit. (A non-interactive run never reaches
+  // kind:'selection_required' — allowSelection is false there, so the router
+  // resolves a catalog miss straight to kind:'error' with reason
+  // 'model_not_found' instead; see gateway-router.js's catalogGate.)
+  if (args.json) {
+    process.stderr.write(`${JSON.stringify(toStructuredError(result))}\n`);
+  } else {
+    process.stderr.write(`${toCliMessage(result)}\n`);
   }
+  process.exit(1);
 }
 
 module.exports = {
-  resolveModelFromArgs,
-  validateFallbackModel,
+  resolveLaunchModel,
+  deriveAlias,
 };

package/src/utils/validators.js

@@ -19,13 +19,7 @@ const VALID_AGENT_MODES = OPENCODE_AGENTS;
 /**
  * Provider to API key mapping
  */
-const PROVIDER_KEY_MAP = {
-  'openrouter': { key: 'OPENROUTER_API_KEY', name: 'OpenRouter' },
-  'google': { key: 'GOOGLE_GENERATIVE_AI_API_KEY', name: 'Google Gemini' },
-  'openai': { key: 'OPENAI_API_KEY', name: 'OpenAI' },
-  'anthropic': { key: 'ANTHROPIC_API_KEY', name: 'Anthropic' },
-  'deepseek': { key: 'DEEPSEEK_API_KEY', name: 'DeepSeek' },
-};
+const { PROVIDER_KEY_MAP } = require('./provider-registry');
 
 /** Task ID format: alphanumeric, hyphens, underscores, 1-64 chars */
 const TASK_ID_PATTERN = /^[a-zA-Z0-9_-]{1,64}$/;
@@ -272,5 +266,4 @@ module.exports = {
   findSessionInProjectDirs,
   // Re-exported from input-validators.js
   validateStartInputs: require('./input-validators').validateStartInputs,
-  findSimilar: require('./input-validators').findSimilar,
 };