@bilalimamoglu/sift 0.3.0 → 0.3.1

package/dist/cli.js

@@ -136,6 +136,78 @@ var defaultConfig = {
   }
 };
 
+// src/config/native-provider.ts
+function getNativeProviderDefaults(provider) {
+  if (provider === "openrouter") {
+    return {
+      provider,
+      model: "openrouter/free",
+      baseUrl: "https://openrouter.ai/api/v1"
+    };
+  }
+  return {
+    provider,
+    model: defaultConfig.provider.model,
+    baseUrl: defaultConfig.provider.baseUrl
+  };
+}
+function getProfileProviderState(provider, profile) {
+  const defaults = getNativeProviderDefaults(provider);
+  return {
+    provider,
+    model: profile?.model ?? defaults.model,
+    baseUrl: profile?.baseUrl ?? defaults.baseUrl
+  };
+}
+function getStoredProviderProfile(config, provider) {
+  const existingProfile = config.providerProfiles?.[provider];
+  if (existingProfile) {
+    return existingProfile;
+  }
+  if (config.provider.provider !== provider) {
+    return void 0;
+  }
+  return {
+    model: config.provider.model,
+    baseUrl: config.provider.baseUrl,
+    apiKey: config.provider.apiKey || void 0
+  };
+}
+function setStoredProviderProfile(config, provider, profile) {
+  const providerProfiles = {
+    ...config.providerProfiles ?? {},
+    [provider]: profile
+  };
+  return {
+    ...config,
+    providerProfiles
+  };
+}
+function preserveActiveNativeProviderProfile(config) {
+  const provider = config.provider.provider;
+  if (provider !== "openai" && provider !== "openrouter") {
+    return config;
+  }
+  if (config.providerProfiles?.[provider]) {
+    return config;
+  }
+  return setStoredProviderProfile(config, provider, {
+    model: config.provider.model,
+    baseUrl: config.provider.baseUrl,
+    apiKey: config.provider.apiKey || void 0
+  });
+}
+function applyActiveProvider(config, provider, profile, apiKey) {
+  return {
+    ...config,
+    provider: {
+      ...config.provider,
+      ...getProfileProviderState(provider, profile),
+      apiKey
+    }
+  };
+}
+
 // src/config/provider-api-key.ts
 var OPENAI_COMPATIBLE_BASE_URL_ENV = [
   { prefix: "https://api.openai.com/", envName: "OPENAI_API_KEY" },
@@ -143,13 +215,16 @@ var OPENAI_COMPATIBLE_BASE_URL_ENV = [
   { prefix: "https://api.together.xyz/", envName: "TOGETHER_API_KEY" },
   { prefix: "https://api.groq.com/openai/", envName: "GROQ_API_KEY" }
 ];
+var NATIVE_PROVIDER_API_KEY_ENV = {
+  openai: "OPENAI_API_KEY",
+  openrouter: "OPENROUTER_API_KEY"
+};
 var PROVIDER_API_KEY_ENV = {
   anthropic: "ANTHROPIC_API_KEY",
   claude: "ANTHROPIC_API_KEY",
   groq: "GROQ_API_KEY",
-  openai: "OPENAI_API_KEY",
-  openrouter: "OPENROUTER_API_KEY",
-  together: "TOGETHER_API_KEY"
+  together: "TOGETHER_API_KEY",
+  ...NATIVE_PROVIDER_API_KEY_ENV
 };
 function normalizeBaseUrl(baseUrl) {
   if (!baseUrl) {
@@ -184,6 +259,9 @@ function resolveProviderApiKey(provider, baseUrl, env) {
   }
   return env.SIFT_PROVIDER_API_KEY;
 }
+function getNativeProviderApiKeyEnvName(provider) {
+  return NATIVE_PROVIDER_API_KEY_ENV[provider];
+}
 function getProviderApiKeyEnvNames(provider, baseUrl) {
   const envNames = ["SIFT_PROVIDER_API_KEY"];
   if (provider === "openai-compatible") {
@@ -205,7 +283,11 @@ function getProviderApiKeyEnvNames(provider, baseUrl) {
 
 // src/config/schema.ts
 import { z } from "zod";
-var providerNameSchema = z.enum(["openai", "openai-compatible"]);
+var providerNameSchema = z.enum([
+  "openai",
+  "openai-compatible",
+  "openrouter"
+]);
 var outputFormatSchema = z.enum([
   "brief",
   "bullets",
@@ -234,6 +316,15 @@ var providerConfigSchema = z.object({
   temperature: z.number().min(0).max(2),
   maxOutputTokens: z.number().int().positive()
 });
+var providerProfileSchema = z.object({
+  model: z.string().min(1).optional(),
+  baseUrl: z.string().url().optional(),
+  apiKey: z.string().optional()
+});
+var providerProfilesSchema = z.object({
+  openai: providerProfileSchema.optional(),
+  openrouter: providerProfileSchema.optional()
+}).optional();
 var inputConfigSchema = z.object({
   stripAnsi: z.boolean(),
   redact: z.boolean(),
@@ -258,10 +349,19 @@ var siftConfigSchema = z.object({
   provider: providerConfigSchema,
   input: inputConfigSchema,
   runtime: runtimeConfigSchema,
-  presets: z.record(presetDefinitionSchema)
+  presets: z.record(presetDefinitionSchema),
+  providerProfiles: providerProfilesSchema
 });
 
 // src/config/resolve.ts
+var PROVIDER_DEFAULT_OVERRIDES = {
+  openrouter: {
+    provider: {
+      model: "openrouter/free",
+      baseUrl: "https://openrouter.ai/api/v1"
+    }
+  }
+};
 function isRecord(value) {
   return Boolean(value) && typeof value === "object" && !Array.isArray(value);
 }
@@ -324,13 +424,32 @@ function buildCredentialEnvOverrides(env, context) {
     }
   };
 }
+function getBaseConfigForProvider(provider) {
+  return mergeDefined(defaultConfig, provider ? PROVIDER_DEFAULT_OVERRIDES[provider] : {});
+}
+function resolveProvisionalProvider(args) {
+  const provisional = mergeDefined(
+    mergeDefined(
+      mergeDefined(defaultConfig, args.fileConfig),
+      args.nonCredentialEnvConfig
+    ),
+    stripApiKey(args.cliOverrides) ?? {}
+  );
+  return provisional.provider.provider;
+}
 function resolveConfig(options = {}) {
   const env = options.env ?? process.env;
   const fileConfig = loadRawConfig(options.configPath);
   const nonCredentialEnvConfig = buildNonCredentialEnvOverrides(env);
+  const provisionalProvider = resolveProvisionalProvider({
+    fileConfig,
+    nonCredentialEnvConfig,
+    cliOverrides: options.cliOverrides
+  });
+  const baseConfig = getBaseConfigForProvider(provisionalProvider);
   const contextConfig = mergeDefined(
     mergeDefined(
-      mergeDefined(defaultConfig, fileConfig),
+      mergeDefined(baseConfig, fileConfig),
       nonCredentialEnvConfig
     ),
     stripApiKey(options.cliOverrides) ?? {}
@@ -342,7 +461,7 @@ function resolveConfig(options = {}) {
   const merged = mergeDefined(
     mergeDefined(
       mergeDefined(
-        mergeDefined(defaultConfig, fileConfig),
+        mergeDefined(baseConfig, fileConfig),
         nonCredentialEnvConfig
       ),
       credentialEnvConfig
@@ -387,6 +506,32 @@ function writeConfigFile(options) {
   return resolved;
 }
 
+// src/config/editable.ts
+import fs3 from "fs";
+import path4 from "path";
+function isRecord2(value) {
+  return Boolean(value) && typeof value === "object" && !Array.isArray(value);
+}
+function resolveEditableConfigPath(explicitPath) {
+  if (explicitPath) {
+    return path4.resolve(explicitPath);
+  }
+  return findConfigPath() ?? getDefaultGlobalConfigPath();
+}
+function loadEditableConfig(explicitPath) {
+  const resolvedPath = resolveEditableConfigPath(explicitPath);
+  const existed = fs3.existsSync(resolvedPath);
+  const rawConfig = existed ? loadRawConfig(resolvedPath) : {};
+  const config = siftConfigSchema.parse(
+    mergeDefined(defaultConfig, isRecord2(rawConfig) ? rawConfig : {})
+  );
+  return {
+    config,
+    existed,
+    resolvedPath
+  };
+}
+
 // src/ui/presentation.ts
 import pc from "picocolors";
 function applyColor(enabled, formatter, value) {
@@ -437,8 +582,7 @@ ${tagline}`;
 }
 
 // src/commands/config-setup.ts
-import fs3 from "fs";
-import path4 from "path";
+import path5 from "path";
 import { emitKeypressEvents } from "readline";
 import { createInterface } from "readline/promises";
 import { stderr as defaultStderr, stdin as defaultStdin2, stdout as defaultStdout } from "process";
@@ -636,59 +780,102 @@ function createTerminalIO() {
   };
 }
 function resolveSetupPath(targetPath) {
-  return targetPath ? path4.resolve(targetPath) : getDefaultGlobalConfigPath();
-}
-function buildOpenAISetupConfig(apiKey) {
-  return {
-    ...defaultConfig,
-    provider: {
-      ...defaultConfig.provider,
-      provider: "openai",
-      model: "gpt-5-nano",
-      baseUrl: "https://api.openai.com/v1",
-      apiKey
-    }
-  };
+  return targetPath ? path5.resolve(targetPath) : getDefaultGlobalConfigPath();
 }
 function getSetupPresenter(io) {
   return createPresentation(io.stdoutIsTTY);
 }
+function getProviderLabel(provider) {
+  return provider === "openrouter" ? "OpenRouter" : "OpenAI";
+}
 async function promptForProvider(io) {
   if (io.select) {
-    const choice = await io.select("Select provider for this machine", ["OpenAI"]);
+    const choice = await io.select("Select provider for this machine", [
+      "OpenAI",
+      "OpenRouter"
+    ]);
     if (choice === "OpenAI") {
       return "openai";
     }
+    if (choice === "OpenRouter") {
+      return "openrouter";
+    }
   }
   while (true) {
-    const answer = (await io.ask("Provider [OpenAI]: ")).trim().toLowerCase();
+    const answer = (await io.ask("Provider [OpenAI/OpenRouter]: ")).trim().toLowerCase();
     if (answer === "" || answer === "openai") {
       return "openai";
     }
-    io.error("Only OpenAI is supported in guided setup right now.\n");
+    if (answer === "openrouter") {
+      return "openrouter";
+    }
+    io.error("Only OpenAI and OpenRouter are supported in guided setup right now.\n");
   }
 }
-async function promptForApiKey(io) {
+async function promptForApiKey(io, provider) {
+  const providerLabel = getProviderLabel(provider);
+  const promptText = `Enter your ${providerLabel} API key (input hidden): `;
+  const visiblePromptText = `Enter your ${providerLabel} API key: `;
   while (true) {
-    const answer = (await (io.secret ? io.secret("Enter your OpenAI API key (input hidden): ") : io.ask("Enter your OpenAI API key: "))).trim();
+    const answer = (await (io.secret ? io.secret(promptText) : io.ask(visiblePromptText))).trim();
     if (answer.length > 0) {
       return answer;
     }
     io.error("API key cannot be empty.\n");
   }
 }
-async function promptForOverwrite(io, targetPath) {
+async function promptForApiKeyChoice(args) {
+  const providerLabel = getProviderLabel(args.provider);
+  if (!args.hasSavedKey && !args.hasEnvKey) {
+    return "override";
+  }
+  if (args.hasSavedKey && args.hasEnvKey) {
+    if (args.io.select) {
+      const choice = await args.io.select(
+        `Found both a saved ${providerLabel} API key and ${args.envName} in your environment`,
+        ["Use saved key", "Use env key", "Override"]
+      );
+      if (choice === "Use saved key") {
+        return "saved";
+      }
+      if (choice === "Use env key") {
+        return "env";
+      }
+    }
+    while (true) {
+      const answer = (await args.io.ask("API key choice [saved/env/override]: ")).trim().toLowerCase();
+      if (answer === "" || answer === "saved") {
+        return "saved";
+      }
+      if (answer === "env") {
+        return "env";
+      }
+      if (answer === "override") {
+        return "override";
+      }
+      args.io.error("Please answer saved, env, or override.\n");
+    }
+  }
+  const sourceLabel = args.hasSavedKey ? "saved key" : `${args.envName} from your environment`;
+  if (args.io.select) {
+    const choice = await args.io.select(
+      `Found an existing ${providerLabel} API key via ${sourceLabel}`,
+      ["Use existing key", "Override"]
+    );
+    if (choice === "Override") {
+      return "override";
+    }
+    return args.hasSavedKey ? "saved" : "env";
+  }
   while (true) {
-    const answer = (await io.ask(
-      `Config file already exists at ${targetPath}. Overwrite? [y/N]: `
-    )).trim().toLowerCase();
-    if (answer === "" || answer === "n" || answer === "no") {
-      return false;
+    const answer = (await args.io.ask("API key choice [existing/override]: ")).trim().toLowerCase();
+    if (answer === "" || answer === "existing") {
+      return args.hasSavedKey ? "saved" : "env";
     }
-    if (answer === "y" || answer === "yes") {
-      return true;
+    if (answer === "override") {
+      return "override";
     }
-    io.error("Please answer y or n.\n");
+    args.io.error("Please answer existing or override.\n");
   }
 }
 function writeSetupSuccess(io, writtenPath) {
@@ -722,10 +909,86 @@ ${ui.section("Try next")}
   io.write(`  ${ui.command("sift exec --preset test-status -- npm test")}
 `);
 }
+function writeProviderDefaults(io, provider) {
+  const ui = getSetupPresenter(io);
+  if (provider === "openrouter") {
+    io.write(`${ui.info("Using OpenRouter defaults for your first run.")}
+`);
+    io.write(`${ui.labelValue("Default model", "openrouter/free")}
+`);
+    io.write(`${ui.labelValue("Default base URL", "https://openrouter.ai/api/v1")}
+`);
+  } else {
+    io.write(`${ui.info("Using OpenAI defaults for your first run.")}
+`);
+    io.write(`${ui.labelValue("Default model", "gpt-5-nano")}
+`);
+    io.write(`${ui.labelValue("Default base URL", "https://api.openai.com/v1")}
+`);
+  }
+  io.write(
+    `${ui.note("Want to switch providers later? Run 'sift config use openai' or 'sift config use openrouter'.")}
+`
+  );
+  io.write(
+    `${ui.note("Want to inspect the active values first? Run 'sift config show --show-secrets'.")}
+`
+  );
+}
+function materializeProfile(provider, profile, apiKey) {
+  return {
+    ...getProfileProviderState(provider, profile),
+    ...apiKey !== void 0 ? { apiKey } : {}
+  };
+}
+function buildSetupConfig(args) {
+  const preservedConfig = preserveActiveNativeProviderProfile(args.config);
+  const storedProfile = getStoredProviderProfile(preservedConfig, args.provider);
+  if (args.apiKeyChoice === "saved") {
+    const profile2 = materializeProfile(
+      args.provider,
+      storedProfile,
+      storedProfile?.apiKey ?? ""
+    );
+    const configWithProfile2 = setStoredProviderProfile(
+      preservedConfig,
+      args.provider,
+      profile2
+    );
+    return applyActiveProvider(
+      configWithProfile2,
+      args.provider,
+      profile2,
+      profile2.apiKey ?? ""
+    );
+  }
+  if (args.apiKeyChoice === "env") {
+    const profile2 = storedProfile ? storedProfile : materializeProfile(args.provider, void 0);
+    const configWithProfile2 = storedProfile ? preservedConfig : setStoredProviderProfile(preservedConfig, args.provider, profile2);
+    return applyActiveProvider(configWithProfile2, args.provider, profile2, "");
+  }
+  const profile = materializeProfile(
+    args.provider,
+    storedProfile,
+    args.nextApiKey ?? ""
+  );
+  const configWithProfile = setStoredProviderProfile(
+    preservedConfig,
+    args.provider,
+    profile
+  );
+  return applyActiveProvider(
+    configWithProfile,
+    args.provider,
+    profile,
+    args.nextApiKey ?? ""
+  );
+}
 async function configSetup(options = {}) {
   void options.global;
   const io = options.io ?? createTerminalIO();
   const ui = getSetupPresenter(io);
+  const env = options.env ?? process.env;
   try {
     if (!io.stdinIsTTY || !io.stdoutIsTTY) {
       io.error(
@@ -736,39 +999,43 @@ async function configSetup(options = {}) {
     io.write(`${ui.welcome("Let's keep the expensive model for the interesting bits.")}
 `);
     const resolvedPath = resolveSetupPath(options.targetPath);
-    if (fs3.existsSync(resolvedPath)) {
-      const shouldOverwrite = await promptForOverwrite(io, resolvedPath);
-      if (!shouldOverwrite) {
-        io.write(`${ui.note("Aborted.")}
+    const { config: existingConfig, existed } = loadEditableConfig(resolvedPath);
+    if (existed) {
+      io.write(`${ui.info(`Updating existing config at ${resolvedPath}.`)}
 `);
-        return 1;
-      }
     }
-    await promptForProvider(io);
-    io.write(`${ui.info("Using OpenAI defaults for your first run.")}
-`);
-    io.write(`${ui.labelValue("Default model", "gpt-5-nano")}
-`);
-    io.write(`${ui.labelValue("Default base URL", "https://api.openai.com/v1")}
-`);
-    io.write(
-      `${ui.note(`Want to switch providers or tweak defaults later? Edit ${resolvedPath}.`)}
-`
-    );
-    io.write(
-      `${ui.note("Want to inspect the active values first? Run 'sift config show --show-secrets'.")}
-`
-    );
-    const apiKey = await promptForApiKey(io);
-    const config = buildOpenAISetupConfig(apiKey);
+    const provider = await promptForProvider(io);
+    writeProviderDefaults(io, provider);
+    const storedProfile = getStoredProviderProfile(existingConfig, provider);
+    const envName = getNativeProviderApiKeyEnvName(provider);
+    const apiKeyChoice = await promptForApiKeyChoice({
+      io,
+      provider,
+      envName,
+      hasSavedKey: Boolean(storedProfile?.apiKey),
+      hasEnvKey: Boolean(env[envName])
+    });
+    const nextApiKey = apiKeyChoice === "override" ? await promptForApiKey(io, provider) : void 0;
+    const config = buildSetupConfig({
+      config: existingConfig,
+      provider,
+      apiKeyChoice,
+      nextApiKey
+    });
     const writtenPath = writeConfigFile({
       targetPath: resolvedPath,
       config,
-      overwrite: true
+      overwrite: existed
     });
+    if (apiKeyChoice === "env") {
+      io.write(
+        `${ui.note(`Using ${envName} from the environment. No API key was written to config.`)}
+`
+      );
+    }
     writeSetupSuccess(io, writtenPath);
     const activeConfigPath = findConfigPath();
-    if (activeConfigPath && path4.resolve(activeConfigPath) !== path4.resolve(writtenPath)) {
+    if (activeConfigPath && path5.resolve(activeConfigPath) !== path5.resolve(writtenPath)) {
       writeOverrideWarning(io, activeConfigPath);
     }
     writeNextSteps(io);
@@ -798,18 +1065,18 @@ function maskConfigSecrets(value) {
   return output;
 }
 function configInit(targetPath, global = false) {
-  const path7 = writeExampleConfig({
+  const path8 = writeExampleConfig({
     targetPath,
     global
   });
   if (!process.stdout.isTTY) {
-    process.stdout.write(`${path7}
+    process.stdout.write(`${path8}
 `);
     return;
   }
   const ui = createPresentation(true);
   process.stdout.write(
-    `${ui.success(`${global ? "Machine-wide" : "Template"} config written to ${path7}`)}
+    `${ui.success(`${global ? "Machine-wide" : "Template"} config written to ${path8}`)}
 `
   );
 }
@@ -838,11 +1105,61 @@ function configValidate(configPath) {
   process.stdout.write(`${ui.success(message)}
 `);
 }
+function isNativeProviderName(value) {
+  return value === "openai" || value === "openrouter";
+}
+function configUse(provider, configPath, env = process.env) {
+  if (!isNativeProviderName(provider)) {
+    throw new Error(`Unsupported config provider: ${provider}`);
+  }
+  const { config, existed, resolvedPath } = loadEditableConfig(configPath);
+  const preservedConfig = preserveActiveNativeProviderProfile(config);
+  const storedProfile = getStoredProviderProfile(preservedConfig, provider);
+  const envName = getNativeProviderApiKeyEnvName(provider);
+  const envKey = env[envName];
+  if (!storedProfile?.apiKey && !envKey) {
+    throw new Error(
+      `No saved ${provider} API key or ${envName} found. Run 'sift config setup' first.`
+    );
+  }
+  const nextConfig = applyActiveProvider(
+    preservedConfig,
+    provider,
+    storedProfile,
+    storedProfile?.apiKey ?? ""
+  );
+  writeConfigFile({
+    targetPath: resolvedPath,
+    config: nextConfig,
+    overwrite: existed
+  });
+  const message = `Switched active provider to ${provider} (${resolvedPath}).`;
+  if (!process.stdout.isTTY) {
+    process.stdout.write(`${message}
+`);
+    if (!storedProfile?.apiKey && envKey) {
+      process.stdout.write(
+        `Using ${envName} from the environment. No API key was written to config.
+`
+      );
+    }
+    return;
+  }
+  const ui = createPresentation(true);
+  process.stdout.write(`${ui.success(message)}
+`);
+  if (!storedProfile?.apiKey && envKey) {
+    process.stdout.write(
+      `${ui.note(`Using ${envName} from the environment. No API key was written to config.`)}
+`
+    );
+  }
+}
 
 // src/commands/agent.ts
 import fs4 from "fs";
 import os2 from "os";
-import path5 from "path";
+import path6 from "path";
 import { createInterface as createInterface2 } from "readline/promises";
 import { stderr as defaultStderr2, stdin as defaultStdin3, stdout as defaultStdout2 } from "process";
 var AGENT_FILENAMES = {
@@ -907,14 +1224,14 @@ function normalizeAgentScope(value) {
 }
 function resolveAgentTargetPath(args) {
   if (args.targetPath) {
-    return path5.resolve(args.cwd ?? process.cwd(), args.targetPath);
+    return path6.resolve(args.cwd ?? process.cwd(), args.targetPath);
   }
   const scope = args.scope ?? "repo";
   if (scope === "global") {
     const homeDir = args.homeDir ?? os2.homedir();
     return args.agent === "codex" ? getDefaultCodexGlobalInstructionsPath(homeDir) : getDefaultClaudeGlobalInstructionsPath(homeDir);
   }
-  return path5.resolve(args.cwd ?? process.cwd(), AGENT_FILENAMES[args.agent]);
+  return path6.resolve(args.cwd ?? process.cwd(), AGENT_FILENAMES[args.agent]);
 }
 function getManagedBlockMarkers(agent) {
   return {
@@ -949,6 +1266,7 @@ function renderInstructionBody() {
     "- Start with `standard` text. Use diagnose JSON only when automation or machine branching truly needs it.",
     "- If `standard` already shows bucket-level root cause, anchor, and fix lines, trust it and report from it directly.",
     "- In that case, do not re-verify the same bucket with raw pytest; at most do one targeted source read before you edit.",
+    "- If `standard` still contains an unknown bucket or ends with `Decision: zoom`, do one deeper sift pass before raw traceback.",
     "- If you need a machine-readable diagnosis, use `sift exec --preset test-status --goal diagnose --format json -- <test command>` or the same shape with `sift rerun` / `sift watch --preset test-status`.",
     "- Diagnose JSON is summary-first by default. Add `--include-test-ids` only when you truly need the raw failing test IDs.",
     "- If diagnose JSON returns `read_targets.context_hint.start_line/end_line`, read only that small line range first.",
@@ -1478,7 +1796,7 @@ function readOptionalFile(targetPath) {
   return fs4.readFileSync(targetPath, "utf8");
 }
 function writeTextFileAtomic(targetPath, content) {
-  fs4.mkdirSync(path5.dirname(targetPath), { recursive: true });
+  fs4.mkdirSync(path6.dirname(targetPath), { recursive: true });
   const tempPath = `${targetPath}.tmp-${process.pid}-${Date.now()}`;
   fs4.writeFileSync(tempPath, content, "utf8");
   fs4.renameSync(tempPath, targetPath);
@@ -1512,7 +1830,7 @@ function runDoctor(config, configPath) {
   if (!config.provider.model) {
     problems.push("Missing provider.model");
   }
-  if ((config.provider.provider === "openai" || config.provider.provider === "openai-compatible") && !config.provider.apiKey) {
+  if ((config.provider.provider === "openai" || config.provider.provider === "openai-compatible" || config.provider.provider === "openrouter") && !config.provider.apiKey) {
     problems.push("Missing provider.apiKey");
     problems.push(
       `Set one of: ${getProviderApiKeyEnvNames(
@@ -1714,10 +2032,11 @@ async function buildOpenAICompatibleError(response) {
   return new Error(detail);
 }
 var OpenAICompatibleProvider = class {
-  name = "openai-compatible";
+  name;
   baseUrl;
   apiKey;
   constructor(options) {
+    this.name = options.name ?? "openai-compatible";
     this.baseUrl = options.baseUrl.replace(/\/$/, "");
     this.apiKey = options.apiKey;
   }
@@ -1793,13 +2112,20 @@ function createProvider(config) {
       apiKey: config.provider.apiKey
     });
   }
+  if (config.provider.provider === "openrouter") {
+    return new OpenAICompatibleProvider({
+      baseUrl: config.provider.baseUrl,
+      apiKey: config.provider.apiKey,
+      name: "openrouter"
+    });
+  }
   throw new Error(`Unsupported provider: ${config.provider.provider}`);
 }
 
 // src/core/testStatusDecision.ts
 import { z as z2 } from "zod";
 var TEST_STATUS_DIAGNOSE_JSON_CONTRACT = '{"status":"ok|insufficient","diagnosis_complete":boolean,"raw_needed":boolean,"additional_source_read_likely_low_value":boolean,"read_raw_only_if":string|null,"decision":"stop|zoom|read_source|read_raw","dominant_blocker_bucket_index":number|null,"provider_used":boolean,"provider_confidence":number|null,"provider_failed":boolean,"raw_slice_used":boolean,"raw_slice_strategy":"none|bucket_evidence|traceback_window|head_tail","resolved_summary":{"count":number,"families":[{"prefix":string,"count":number}]},"remaining_summary":{"count":number,"families":[{"prefix":string,"count":number}]},"remaining_subset_available":boolean,"main_buckets":[{"bucket_index":number,"label":string,"count":number,"root_cause":string,"evidence":string[],"bucket_confidence":number,"root_cause_confidence":number,"dominant":boolean,"secondary_visible_despite_blocker":boolean,"mini_diff":{"added_paths"?:number,"removed_models"?:number,"changed_task_mappings"?:number}|null}],"read_targets":[{"file":string,"line":number|null,"why":string,"bucket_index":number,"context_hint":{"start_line":number|null,"end_line":number|null,"search_hint":string|null}}],"next_best_action":{"code":"fix_dominant_blocker|read_source_for_bucket|read_raw_for_exact_traceback|insufficient_signal","bucket_index":number|null,"note":string},"resolved_tests"?:string[],"remaining_tests"?:string[]}';
-var TEST_STATUS_PROVIDER_SUPPLEMENT_JSON_CONTRACT = '{"diagnosis_complete":boolean,"raw_needed":boolean,"additional_source_read_likely_low_value":boolean,"read_raw_only_if":string|null,"decision":"stop|zoom|read_source|read_raw","provider_confidence":number|null,"next_best_action":{"code":"fix_dominant_blocker|read_source_for_bucket|read_raw_for_exact_traceback|insufficient_signal","bucket_index":number|null,"note":string}}';
+var TEST_STATUS_PROVIDER_SUPPLEMENT_JSON_CONTRACT = '{"diagnosis_complete":boolean,"raw_needed":boolean,"additional_source_read_likely_low_value":boolean,"read_raw_only_if":string|null,"decision":"stop|zoom|read_source|read_raw","provider_confidence":number|null,"bucket_supplements":[{"label":string,"count":number,"root_cause":string,"anchor":{"file":string|null,"line":number|null,"search_hint":string|null},"fix_hint":string|null,"confidence":number}],"next_best_action":{"code":"fix_dominant_blocker|read_source_for_bucket|read_raw_for_exact_traceback|insufficient_signal","bucket_index":number|null,"note":string}}';
 var nextBestActionSchema = z2.object({
   code: z2.enum([
     "fix_dominant_blocker",
@@ -1817,6 +2143,20 @@ var testStatusProviderSupplementSchema = z2.object({
   read_raw_only_if: z2.string().nullable(),
   decision: z2.enum(["stop", "zoom", "read_source", "read_raw"]),
   provider_confidence: z2.number().min(0).max(1).nullable(),
+  bucket_supplements: z2.array(
+    z2.object({
+      label: z2.string().min(1),
+      count: z2.number().int().positive(),
+      root_cause: z2.string().min(1),
+      anchor: z2.object({
+        file: z2.string().nullable(),
+        line: z2.number().int().nullable(),
+        search_hint: z2.string().nullable()
+      }),
+      fix_hint: z2.string().nullable(),
+      confidence: z2.number().min(0).max(1)
+    })
+  ).max(2),
   next_best_action: nextBestActionSchema
 });
 var testStatusDiagnoseContractSchema = z2.object({
@@ -1968,14 +2308,73 @@ function classifyGenericBucketType(reason) {
   }
   return "unknown_failure";
 }
+function isUnknownBucket(bucket) {
+  return bucket.source === "unknown" || bucket.reason.startsWith("unknown ");
+}
+function classifyVisibleStatusForLabel(args) {
+  const isError = args.errorLabels.has(args.label);
+  const isFailed = args.failedLabels.has(args.label);
+  if (isError && isFailed) {
+    return "mixed";
+  }
+  if (isError) {
+    return "error";
+  }
+  if (isFailed) {
+    return "failed";
+  }
+  return "unknown";
+}
+function inferCoverageFromReason(reason) {
+  if (reason.startsWith("missing test env:") || reason.startsWith("fixture guard:") || reason.startsWith("service unavailable:") || reason.startsWith("db refused:") || reason.startsWith("auth bypass absent:") || reason.startsWith("missing module:")) {
+    return "error";
+  }
+  if (reason.startsWith("assertion failed:")) {
+    return "failed";
+  }
+  return "mixed";
+}
+function buildCoverageCounts(args) {
+  if (args.coverageKind === "error") {
+    return {
+      error: args.count,
+      failed: 0
+    };
+  }
+  if (args.coverageKind === "failed") {
+    return {
+      error: 0,
+      failed: args.count
+    };
+  }
+  return {
+    error: 0,
+    failed: 0
+  };
+}
 function buildGenericBuckets(analysis) {
   const buckets = [];
   const grouped = /* @__PURE__ */ new Map();
+  const errorLabels = new Set(analysis.visibleErrorLabels);
+  const failedLabels = new Set(analysis.visibleFailedLabels);
   const push = (reason, item) => {
-    const key = `${classifyGenericBucketType(reason)}:${reason}`;
+    const coverageKind = (() => {
+      const status = classifyVisibleStatusForLabel({
+        label: item.label,
+        errorLabels,
+        failedLabels
+      });
+      return status === "unknown" ? inferCoverageFromReason(reason) : status;
+    })();
+    const key = `${classifyGenericBucketType(reason)}:${coverageKind}:${reason}`;
     const existing = grouped.get(key);
     if (existing) {
       existing.count += 1;
+      if (coverageKind === "error") {
+        existing.coverage.error += 1;
+      } else if (coverageKind === "failed") {
+        existing.coverage.failed += 1;
+      }
       if (!existing.representativeItems.some((entry) => entry.label === item.label) && existing.representativeItems.length < 6) {
         existing.representativeItems.push(item);
       }
@@ -1992,7 +2391,12 @@ function buildGenericBuckets(analysis) {
       entities: [],
       hint: void 0,
       overflowCount: 0,
-      overflowLabel: "failing tests/modules"
+      overflowLabel: "failing tests/modules",
+      coverage: buildCoverageCounts({
+        count: 1,
+        coverageKind
+      }),
+      source: "heuristic"
     });
   };
   for (const item of [...analysis.collectionItems, ...analysis.inlineItems]) {
@@ -2045,10 +2449,51 @@ function mergeBucketDetails(existing, incoming) {
       incoming.overflowCount,
       count - representativeItems.length
     ),
-    overflowLabel: existing.overflowLabel || incoming.overflowLabel
+    overflowLabel: existing.overflowLabel || incoming.overflowLabel,
+    labelOverride: existing.labelOverride ?? incoming.labelOverride,
+    coverage: {
+      error: Math.max(existing.coverage.error, incoming.coverage.error),
+      failed: Math.max(existing.coverage.failed, incoming.coverage.failed)
+    },
+    source: existing.source
+  };
+}
+function inferFailureBucketCoverage(bucket, analysis) {
+  const errorLabels = new Set(analysis.visibleErrorLabels);
+  const failedLabels = new Set(analysis.visibleFailedLabels);
+  let error = 0;
+  let failed = 0;
+  for (const item of bucket.representativeItems) {
+    const status = classifyVisibleStatusForLabel({
+      label: item.label,
+      errorLabels,
+      failedLabels
+    });
+    if (status === "error") {
+      error += 1;
+    } else if (status === "failed") {
+      failed += 1;
+    }
+  }
+  const claimed = bucket.countClaimed ?? bucket.countVisible;
+  if (bucket.type === "contract_snapshot_drift" || bucket.type === "assertion_failure") {
+    return {
+      error,
+      failed: Math.max(failed, claimed)
+    };
+  }
+  if (bucket.type === "shared_environment_blocker" || bucket.type === "import_dependency_failure" || bucket.type === "collection_failure" || bucket.type === "fixture_guard_failure" || bucket.type === "service_unavailable" || bucket.type === "db_connection_failure" || bucket.type === "auth_bypass_absent") {
+    return {
+      error: Math.max(error, claimed),
+      failed
+    };
+  }
+  return {
+    error,
+    failed
   };
 }
-function mergeBuckets(analysis) {
+function mergeBuckets(analysis, extraBuckets = []) {
   const mergedByIdentity = /* @__PURE__ */ new Map();
   const merged = [];
   const pushBucket = (bucket) => {
@@ -2077,7 +2522,9 @@ function mergeBuckets(analysis) {
     entities: [...bucket2.entities],
     hint: bucket2.hint,
     overflowCount: bucket2.overflowCount,
-    overflowLabel: bucket2.overflowLabel
+    overflowLabel: bucket2.overflowLabel,
+    coverage: inferFailureBucketCoverage(bucket2, analysis),
+    source: "heuristic"
   }))) {
     pushBucket(bucket);
   }
@@ -2101,6 +2548,9 @@ function mergeBuckets(analysis) {
       coveredLabels.add(item.label);
     }
   }
+  for (const bucket of extraBuckets) {
+    pushBucket(bucket);
+  }
   return merged;
 }
 function dominantBucketPriority(bucket) {
@@ -2116,6 +2566,9 @@ function dominantBucketPriority(bucket) {
   if (bucket.type === "collection_failure") {
     return 2;
   }
+  if (isUnknownBucket(bucket)) {
+    return 2;
+  }
   if (bucket.type === "contract_snapshot_drift") {
     return 1;
   }
@@ -2140,6 +2593,9 @@ function isDominantBlockerType(type) {
   return type === "shared_environment_blocker" || type === "import_dependency_failure" || type === "collection_failure";
 }
 function labelForBucket(bucket) {
+  if (bucket.labelOverride) {
+    return bucket.labelOverride;
+  }
   if (bucket.reason.startsWith("missing test env:")) {
     return "missing test env";
   }
@@ -2179,15 +2635,27 @@ function labelForBucket(bucket) {
   if (bucket.type === "runtime_failure") {
     return "runtime failure";
   }
+  if (bucket.reason.startsWith("unknown setup blocker:")) {
+    return "unknown setup blocker";
+  }
+  if (bucket.reason.startsWith("unknown failure family:")) {
+    return "unknown failure family";
+  }
   return "unknown failure";
 }
 function rootCauseConfidenceFor(bucket) {
+  if (isUnknownBucket(bucket)) {
+    return 0.52;
+  }
   if (bucket.reason.startsWith("missing test env:") || bucket.reason.startsWith("missing module:") || bucket.reason.startsWith("db refused:") || bucket.reason.startsWith("service unavailable:") || bucket.reason.startsWith("auth bypass absent:")) {
     return 0.95;
   }
   if (bucket.type === "contract_snapshot_drift") {
     return bucket.entities.length > 0 ? 0.92 : 0.76;
   }
+  if (bucket.source === "provider") {
+    return Math.max(0.6, Math.min(bucket.confidence, 0.82));
+  }
   return Math.max(0.6, Math.min(bucket.confidence, 0.88));
 }
 function buildBucketEvidence(bucket) {
@@ -2231,6 +2699,12 @@ function buildReadTargetWhy(args) {
   if (args.bucket.reason.startsWith("auth bypass absent:")) {
     return "it contains the auth bypass setup behind this bucket";
   }
+  if (args.bucket.reason.startsWith("unknown setup blocker:")) {
+    return "it is the first anchored setup failure in this unknown bucket";
+  }
+  if (args.bucket.reason.startsWith("unknown failure family:")) {
+    return "it is the first anchored failing test in this unknown bucket";
+  }
   if (args.bucket.type === "contract_snapshot_drift") {
     if (args.bucketLabel === "route drift") {
       return "it maps to the visible route drift bucket";
@@ -2280,6 +2754,9 @@ function buildReadTargetSearchHint(bucket, anchor) {
   if (assertionText) {
     return assertionText;
   }
+  if (bucket.reason.startsWith("unknown ")) {
+    return anchor.reason;
+  }
   const fallbackLabel = anchor.label.split("::")[1]?.trim();
   return fallbackLabel || null;
 }
@@ -2339,6 +2816,12 @@ function buildConcreteNextNote(args) {
   if (args.nextBestAction.code === "read_source_for_bucket") {
     return lead;
   }
+  if (args.nextBestAction.code === "insufficient_signal") {
+    if (args.nextBestAction.note.startsWith("Provider follow-up failed")) {
+      return args.nextBestAction.note;
+    }
+    return `${lead} Then take one deeper sift pass before raw traceback.`;
+  }
   return args.nextBestAction.note;
 }
 function extractMiniDiff(input, bucket) {
@@ -2363,6 +2846,152 @@ function extractMiniDiff(input, bucket) {
     ...changedTaskMappings > 0 ? { changed_task_mappings: changedTaskMappings } : {}
   };
 }
+function inferSupplementCoverageKind(args) {
+  const normalized = `${args.label} ${args.rootCause}`.toLowerCase();
+  if (/env|setup|fixture|import|dependency|service|db|database|auth bypass|collection|connection refused/.test(
+    normalized
+  )) {
+    return "error";
+  }
+  if (/snapshot|contract|drift|assertion|expected|actual|golden/.test(normalized)) {
+    return "failed";
+  }
+  if (args.remainingErrors > 0 && args.remainingFailed === 0) {
+    return "error";
+  }
+  return "failed";
+}
+function buildProviderSupplementBuckets(args) {
+  let remainingErrors = args.remainingErrors;
+  let remainingFailed = args.remainingFailed;
+  return args.supplements.flatMap((supplement) => {
+    const coverageKind = inferSupplementCoverageKind({
+      label: supplement.label,
+      rootCause: supplement.root_cause,
+      remainingErrors,
+      remainingFailed
+    });
+    const budget = coverageKind === "error" ? remainingErrors : remainingFailed;
+    const count = Math.max(0, Math.min(supplement.count, budget));
+    if (count === 0) {
+      return [];
+    }
+    if (coverageKind === "error") {
+      remainingErrors -= count;
+    } else {
+      remainingFailed -= count;
+    }
+    const representativeLabel = supplement.anchor.file ?? `${supplement.label} supplement`;
+    const representativeItem = {
+      label: representativeLabel,
+      reason: supplement.root_cause,
+      group: supplement.label,
+      file: supplement.anchor.file,
+      line: supplement.anchor.line,
+      anchor_kind: supplement.anchor.file && supplement.anchor.line !== null ? "traceback" : supplement.anchor.file ? "test_label" : supplement.anchor.search_hint ? "entity" : "none",
+      anchor_confidence: Math.max(0.4, Math.min(supplement.confidence, 0.82))
+    };
+    return [
+      {
+        type: classifyGenericBucketType(supplement.root_cause),
+        headline: `${supplement.label}: ${formatCount(count, "visible failure")} share ${supplement.root_cause}.`,
+        summaryLines: [
+          `${supplement.label}: ${formatCount(count, "visible failure")} share ${supplement.root_cause}.`
+        ],
+        reason: supplement.root_cause,
+        count,
+        confidence: Math.max(0.4, Math.min(supplement.confidence, 0.82)),
+        representativeItems: [representativeItem],
+        entities: supplement.anchor.search_hint ? [supplement.anchor.search_hint] : [],
+        hint: supplement.fix_hint ?? void 0,
+        overflowCount: Math.max(count - 1, 0),
+        overflowLabel: "failing tests/modules",
+        labelOverride: supplement.label,
+        coverage: buildCoverageCounts({
+          count,
+          coverageKind
+        }),
+        source: "provider"
+      }
+    ];
+  });
+}
+function pickUnknownAnchor(args) {
+  const fromStatusItems = args.kind === "error" ? args.analysis.visibleErrorItems[0] : null;
+  if (fromStatusItems) {
+    return {
+      label: fromStatusItems.label,
+      reason: fromStatusItems.reason,
+      group: fromStatusItems.group,
+      file: fromStatusItems.file,
+      line: fromStatusItems.line,
+      anchor_kind: fromStatusItems.anchor_kind,
+      anchor_confidence: fromStatusItems.anchor_confidence
+    };
+  }
+  const label = args.kind === "error" ? args.analysis.visibleErrorLabels[0] : args.analysis.visibleFailedLabels[0];
+  if (label) {
+    const normalizedLabel = normalizeTestId(label);
+    const fileMatch = normalizedLabel.match(/^([A-Za-z0-9_./-]+\.[A-Za-z0-9]+)\b/);
+    const file = fileMatch?.[1] ?? normalizedLabel.split("::")[0] ?? null;
+    return {
+      label,
+      reason: args.kind === "error" ? "setup failures share a repeated but unclassified pattern" : "failing tests share a repeated but unclassified pattern",
+      group: args.kind === "error" ? "unknown setup blocker" : "unknown failure family",
+      file: file && file !== label ? file : null,
+      line: null,
+      anchor_kind: file && file !== label ? "test_label" : "none",
+      anchor_confidence: file && file !== label ? 0.6 : 0
+    };
+  }
+  return null;
+}
+function buildUnknownBucket(args) {
+  if (args.count <= 0) {
+    return null;
+  }
+  const anchor = pickUnknownAnchor(args);
+  const isError = args.kind === "error";
+  const label = isError ? "unknown setup blocker" : "unknown failure family";
+  const reason = isError ? "unknown setup blocker: setup failures share a repeated but unclassified pattern" : "unknown failure family: failing tests share a repeated but unclassified pattern";
+  return {
+    type: "unknown_failure",
+    headline: `${label}: ${formatCount(args.count, "visible failure")} share a repeated but unclassified pattern.`,
+    summaryLines: [
+      `${label}: ${formatCount(args.count, "visible failure")} share a repeated but unclassified pattern.`
+    ],
+    reason,
+    count: args.count,
+    confidence: 0.45,
+    representativeItems: anchor ? [anchor] : [],
+    entities: [],
+    hint: isError ? "Take one deeper sift pass or inspect the first anchored setup failure." : "Take one deeper sift pass or inspect the first anchored failing test.",
+    overflowCount: Math.max(args.count - (anchor ? 1 : 0), 0),
+    overflowLabel: "failing tests/modules",
+    labelOverride: label,
+    coverage: buildCoverageCounts({
+      count: args.count,
+      coverageKind: isError ? "error" : "failed"
+    }),
+    source: "unknown"
+  };
+}
+function buildCoverageResiduals(args) {
+  const covered = args.buckets.reduce(
+    (totals, bucket) => ({
+      error: totals.error + bucket.coverage.error,
+      failed: totals.failed + bucket.coverage.failed
+    }),
+    {
+      error: 0,
+      failed: 0
+    }
+  );
+  return {
+    remainingErrors: Math.max(args.analysis.errors - Math.min(args.analysis.errors, covered.error), 0),
+    remainingFailed: Math.max(args.analysis.failed - Math.min(args.analysis.failed, covered.failed), 0)
+  };
+}
 function buildOutcomeLines(analysis) {
   if (analysis.noTestsCollected) {
     return ["- Tests did not run.", "- Collected 0 items."];
@@ -2481,6 +3110,12 @@ function buildStandardFixText(args) {
   if (args.bucket.reason.startsWith("auth bypass absent:")) {
     return "Restore the test auth bypass setup and rerun the full suite at standard.";
   }
+  if (args.bucket.reason.startsWith("unknown setup blocker:")) {
+    return "Take one deeper sift pass or inspect the first anchored setup failure before rerunning.";
+  }
+  if (args.bucket.reason.startsWith("unknown failure family:")) {
+    return "Take one deeper sift pass or inspect the first anchored failing test before rerunning.";
+  }
   if (args.bucket.type === "contract_snapshot_drift") {
     return "Review the visible drift and regenerate the contract snapshots if the changes are intentional.";
   }
@@ -2577,7 +3212,35 @@ function renderVerbose(args) {
   return lines.join("\n");
 }
 function buildTestStatusDiagnoseContract(args) {
-  const buckets = prioritizeBuckets(mergeBuckets(args.analysis)).slice(0, 3);
+  const heuristicBuckets = mergeBuckets(args.analysis);
+  const preUnknownSimpleCollectionFailure = args.analysis.collectionErrorCount !== void 0 && args.analysis.collectionItems.length === 0 && heuristicBuckets.length === 0 && (args.providerBucketSupplements?.length ?? 0) === 0;
+  const heuristicResiduals = buildCoverageResiduals({
+    analysis: args.analysis,
+    buckets: heuristicBuckets
+  });
+  const providerSupplementBuckets = buildProviderSupplementBuckets({
+    supplements: args.providerBucketSupplements ?? [],
+    remainingErrors: heuristicResiduals.remainingErrors,
+    remainingFailed: heuristicResiduals.remainingFailed
+  });
+  const combinedBuckets = mergeBuckets(args.analysis, providerSupplementBuckets);
+  const residuals = buildCoverageResiduals({
+    analysis: args.analysis,
+    buckets: combinedBuckets
+  });
+  const unknownBuckets = preUnknownSimpleCollectionFailure ? [] : [
+    buildUnknownBucket({
+      analysis: args.analysis,
+      kind: "error",
+      count: residuals.remainingErrors
+    }),
+    buildUnknownBucket({
+      analysis: args.analysis,
+      kind: "failed",
+      count: residuals.remainingFailed
+    })
+  ].filter((bucket) => Boolean(bucket));
+  const buckets = prioritizeBuckets([...combinedBuckets, ...unknownBuckets]).slice(0, 3);
   const simpleCollectionFailure = args.analysis.collectionErrorCount !== void 0 && args.analysis.collectionItems.length === 0 && buckets.length === 0;
   const dominantBucket = buckets.map((bucket, index) => ({
     bucket,
@@ -2588,8 +3251,10 @@ function buildTestStatusDiagnoseContract(args) {
     }
     return right.bucket.confidence - left.bucket.confidence;
   })[0] ?? null;
-  const diagnosisComplete = args.analysis.failed === 0 && args.analysis.errors === 0 && args.analysis.passed > 0 || simpleCollectionFailure || buckets.length > 0 && (dominantBucket?.bucket.confidence ?? 0) >= 0.7;
-  const rawNeeded = buckets.length > 0 ? buckets.every((bucket) => bucket.confidence < 0.7) : !(args.analysis.failed === 0 && args.analysis.errors === 0 && args.analysis.passed > 0 || simpleCollectionFailure);
+  const hasUnknownBucket = buckets.some((bucket) => isUnknownBucket(bucket));
+  const hasConcreteCoverage = args.analysis.failed === 0 && args.analysis.errors === 0 ? true : residuals.remainingErrors === 0 && residuals.remainingFailed === 0;
+  const diagnosisComplete = args.analysis.failed === 0 && args.analysis.errors === 0 && args.analysis.passed > 0 || simpleCollectionFailure || buckets.length > 0 && hasConcreteCoverage && !hasUnknownBucket && (dominantBucket?.bucket.confidence ?? 0) >= 0.6;
+  const rawNeeded = buckets.length === 0 ? !(args.analysis.failed === 0 && args.analysis.errors === 0 && args.analysis.passed > 0 || simpleCollectionFailure) : !diagnosisComplete && !hasUnknownBucket && buckets.every((bucket) => bucket.confidence < 0.7);
   const dominantBlockerBucketIndex = dominantBucket && isDominantBlockerType(dominantBucket.bucket.type) ? dominantBucket.index + 1 : null;
   const readTargets = buildReadTargets({
     buckets,
@@ -2624,6 +3289,12 @@ function buildTestStatusDiagnoseContract(args) {
       bucket_index: null,
       note: "Inspect the collection traceback or setup code next; the run failed before tests executed."
     };
+  } else if (hasUnknownBucket) {
+    nextBestAction = {
+      code: "insufficient_signal",
+      bucket_index: dominantBucket ? dominantBucket.index + 1 : null,
+      note: "Take one deeper sift pass or inspect the first anchored failure before falling back to raw traceback."
+    };
   } else if (!diagnosisComplete) {
     nextBestAction = {
       code: rawNeeded ? "read_raw_for_exact_traceback" : "insufficient_signal",
@@ -2661,11 +3332,15 @@ function buildTestStatusDiagnoseContract(args) {
     read_targets: readTargets,
     next_best_action: nextBestAction
   };
+  const effectiveDiagnosisComplete = Boolean(args.contractOverrides?.diagnosis_complete ?? diagnosisComplete) && !hasUnknownBucket;
+  const requestedDecision = args.contractOverrides?.decision;
+  const effectiveDecision = hasUnknownBucket && requestedDecision && (requestedDecision === "stop" || requestedDecision === "read_source") ? "zoom" : requestedDecision;
   const effectiveNextBestAction = args.contractOverrides?.next_best_action ?? baseContract.next_best_action;
   const mergedContractWithoutDecision = {
     ...baseContract,
     ...args.contractOverrides,
-    status: args.contractOverrides?.diagnosis_complete ?? diagnosisComplete ? "ok" : "insufficient",
+    diagnosis_complete: effectiveDiagnosisComplete,
+    status: effectiveDiagnosisComplete ? "ok" : "insufficient",
     next_best_action: {
       ...effectiveNextBestAction,
       note: buildConcreteNextNote({
@@ -2679,7 +3354,7 @@ function buildTestStatusDiagnoseContract(args) {
   };
   const contract = testStatusDiagnoseContractSchema.parse({
     ...mergedContractWithoutDecision,
-    decision: args.contractOverrides?.decision ?? deriveDecision(mergedContractWithoutDecision)
+    decision: effectiveDecision ?? deriveDecision(mergedContractWithoutDecision)
   });
   return {
     contract,
@@ -2916,9 +3591,12 @@ function resolvePromptPolicy(args) {
         "Return only valid JSON.",
         `Use this exact contract: ${args.outputContract ?? TEST_STATUS_DIAGNOSE_JSON_CONTRACT}.`,
         "Treat the heuristic context as extraction guidance, but do not invent hidden failures.",
-        "Use the heuristic extract as the bucket truth unless the visible command output clearly disproves it.",
+        "Use the heuristic extract as the base bucket truth unless the visible command output clearly disproves it.",
+        "If some visible failure or error families remain unexplained, add at most 2 bucket_supplements for the residual families only.",
+        "Do not rewrite or delete heuristic buckets; only supplement missing residual coverage.",
+        "Keep bucket_supplement counts within the unexplained residual failures or errors.",
         "Identify the dominant blocker, remaining visible failure buckets, the decision, and the next best action.",
-        "Set diagnosis_complete to true only when the visible output is already sufficient to stop and act.",
+        "Set diagnosis_complete to true only when the visible output is already sufficient to stop and act and no unknown residual family remains.",
         "Set raw_needed to true only when exact traceback lines are still required.",
         "Set provider_confidence to a number between 0 and 1, or null only when confidence cannot be estimated."
       ] : [
@@ -3229,7 +3907,25 @@ function extractEnvBlockerName(normalized) {
   const fallbackMatch = normalized.match(
     /\b([A-Z][A-Z0-9_]{2,})\b(?=[^.\n]*DB-isolated tests)/
   );
-  return fallbackMatch?.[1] ?? null;
+  if (fallbackMatch) {
+    return fallbackMatch[1];
+  }
+  const leadingEnvMatch = normalized.match(
+    /\b([A-Z][A-Z0-9_]{2,})\b(?=[^.\n]{0,80}\b(?:is\s+)?(?:missing|unset|not set|not configured|required)\b)/
+  );
+  if (leadingEnvMatch) {
+    return leadingEnvMatch[1];
+  }
+  const trailingEnvMatch = normalized.match(
+    /\b(?:missing|unset|not set|not configured|required)\b[^.\n]{0,80}\b([A-Z][A-Z0-9_]{2,})\b/
+  );
+  if (trailingEnvMatch) {
+    return trailingEnvMatch[1];
+  }
+  const validationEnvMatch = normalized.match(
+    /\bValidationError\b[^.\n]{0,120}\b([A-Z][A-Z0-9_]{2,})\b/
+  );
+  return validationEnvMatch?.[1] ?? null;
 }
 function classifyFailureReason(line, options) {
   const normalized = line.trim().replace(/^[A-Z]\s+/, "");
@@ -3250,7 +3946,7 @@ function classifyFailureReason(line, options) {
     };
   }
   const missingEnv = normalized.match(
-    /\b(?:environment variable|env(?:ironment)? var(?:iable)?|Missing required env(?:ironment)? variable)\s+([A-Z][A-Z0-9_]{2,})\b/i
+    /\b(?:environment variable|env(?:ironment)? var(?:iable)?|missing required env(?:ironment)? variable)\s+([A-Z][A-Z0-9_]{2,})\b/
   );
   if (missingEnv) {
     return {
@@ -3282,6 +3978,12 @@ function classifyFailureReason(line, options) {
       group: "database connectivity failures"
     };
   }
+  if (/(ECONNREFUSED|ConnectionRefusedError|connection refused)/i.test(normalized)) {
+    return {
+      reason: "service unavailable: dependency connection was refused",
+      group: "service availability failures"
+    };
+  }
   if (/(503\b|service unavailable|temporarily unavailable)/i.test(normalized)) {
     return {
       reason: "service unavailable: dependency service is unavailable",
@@ -3766,7 +4468,7 @@ function synthesizeImportDependencyBucket(args) {
     return null;
   }
   const allVisibleErrorsAreImportRelated = args.visibleErrorItems.length > 0 && args.visibleErrorItems.every((item) => item.reason.startsWith("missing module:"));
-  const countClaimed = allVisibleErrorsAreImportRelated && importItems.length >= 3 && args.errors >= importItems.length ? args.errors : void 0;
+  const countClaimed = allVisibleErrorsAreImportRelated && importItems.length >= 2 && args.errors >= importItems.length ? args.errors : void 0;
   const modules = Array.from(
     new Set(
       importItems.map((item) => item.reason.replace("missing module:", "").trim()).filter(Boolean)
@@ -3802,7 +4504,7 @@ function synthesizeImportDependencyBucket(args) {
   };
 }
 function isContractDriftLabel(label) {
-  return /(freeze|snapshot|contract|manifest|openapi)/i.test(label);
+  return /(freeze|snapshot|contract|manifest|openapi|golden)/i.test(label);
 }
 function looksLikeTaskKey(value) {
   return /^[a-z]+(?:_[a-z0-9]+)+$/i.test(value) && !value.startsWith("/api/");
@@ -3864,7 +4566,7 @@ function extractContractDriftEntities(input) {
 }
 function buildContractRepresentativeReason(args) {
   if (/openapi/i.test(args.label) && args.entities.apiPaths.length > 0) {
-    const nextPath = args.entities.apiPaths.find((path7) => !args.usedPaths.has(path7)) ?? args.entities.apiPaths[0];
+    const nextPath = args.entities.apiPaths.find((path8) => !args.usedPaths.has(path8)) ?? args.entities.apiPaths[0];
     args.usedPaths.add(nextPath);
     return `added path: ${nextPath}`;
   }
@@ -4495,6 +5197,7 @@ function buildGenericRawSlice(args) {
 
 // src/core/run.ts
 var RETRY_DELAY_MS = 300;
+var PROVIDER_PENDING_NOTICE_DELAY_MS = 150;
 function estimateTokenCount(text) {
   return Math.max(1, Math.ceil(text.length / 4));
 }
@@ -4515,6 +5218,8 @@ function logVerboseTestStatusTelemetry(args) {
     `${pc2.dim("sift")} diagnosis_complete_at_layer=${getDiagnosisCompleteAtLayer(args.contract)}`,
     `${pc2.dim("sift")} heuristic_short_circuit=${!args.contract.provider_used && args.contract.diagnosis_complete && !args.contract.raw_needed && !args.contract.provider_failed}`,
     `${pc2.dim("sift")} raw_input_chars=${args.request.stdin.length}`,
+    `${pc2.dim("sift")} heuristic_input_chars=${args.heuristicInputChars}`,
+    `${pc2.dim("sift")} heuristic_input_truncated=${args.heuristicInputTruncated}`,
     `${pc2.dim("sift")} prepared_input_chars=${args.prepared.meta.finalLength}`,
     `${pc2.dim("sift")} raw_slice_chars=${args.rawSliceChars ?? 0}`,
     `${pc2.dim("sift")} provider_input_chars=${args.providerInputChars ?? 0}`,
@@ -4556,6 +5261,7 @@ function buildDryRunOutput(args) {
       responseMode: args.responseMode,
       policy: args.request.policyName ?? null,
       heuristicOutput: args.heuristicOutput ?? null,
+      heuristicInput: args.heuristicInput,
       input: {
         originalLength: args.prepared.meta.originalLength,
         finalLength: args.prepared.meta.finalLength,
@@ -4572,6 +5278,25 @@ function buildDryRunOutput(args) {
 async function delay(ms) {
   await new Promise((resolve) => setTimeout(resolve, ms));
 }
+function startProviderPendingNotice() {
+  if (!process.stderr.isTTY) {
+    return () => {
+    };
+  }
+  const message = "sift waiting for provider...";
+  let shown = false;
+  const timer = setTimeout(() => {
+    shown = true;
+    process.stderr.write(`${message}\r`);
+  }, PROVIDER_PENDING_NOTICE_DELAY_MS);
+  return () => {
+    clearTimeout(timer);
+    if (!shown) {
+      return;
+    }
+    process.stderr.write(`\r${" ".repeat(message.length)}\r`);
+  };
+}
 function withInsufficientHint(args) {
   if (!isInsufficientSignalOutput(args.output)) {
     return args.output;
@@ -4592,22 +5317,27 @@ async function generateWithRetry(args) {
     responseMode: args.responseMode,
     jsonResponseFormat: args.request.config.provider.jsonResponseFormat
   });
+  const stopPendingNotice = startProviderPendingNotice();
   try {
-    return await generate();
-  } catch (error) {
-    const reason = error instanceof Error ? error.message : "unknown_error";
-    if (!isRetriableReason(reason)) {
-      throw error;
-    }
-    if (args.request.config.runtime.verbose) {
-      process.stderr.write(
-        `${pc2.dim("sift")} retry=1 reason=${reason} delay_ms=${RETRY_DELAY_MS}
+    try {
+      return await generate();
+    } catch (error) {
+      const reason = error instanceof Error ? error.message : "unknown_error";
+      if (!isRetriableReason(reason)) {
+        throw error;
+      }
+      if (args.request.config.runtime.verbose) {
+        process.stderr.write(
+          `${pc2.dim("sift")} retry=1 reason=${reason} delay_ms=${RETRY_DELAY_MS}
 `
-      );
+        );
+      }
+      await delay(RETRY_DELAY_MS);
     }
-    await delay(RETRY_DELAY_MS);
+    return await generate();
+  } finally {
+    stopPendingNotice();
   }
-  return generate();
 }
 function hasRecognizableTestStatusSignal(input) {
   const analysis = analyzeTestStatus(input);
@@ -4662,11 +5392,22 @@ function buildTestStatusProviderFailureDecision(args) {
 }
 async function runSift(request) {
   const prepared = prepareInput(request.stdin, request.config.input);
+  const heuristicInput = prepared.redacted;
+  const heuristicInputTruncated = false;
+  const heuristicPrepared = {
+    ...prepared,
+    truncated: heuristicInput,
+    meta: {
+      ...prepared.meta,
+      finalLength: heuristicInput.length,
+      truncatedApplied: heuristicInputTruncated
+    }
+  };
   const provider = createProvider(request.config);
-  const hasTestStatusSignal = request.policyName === "test-status" && hasRecognizableTestStatusSignal(prepared.truncated);
-  const testStatusAnalysis = hasTestStatusSignal ? analyzeTestStatus(prepared.truncated) : null;
+  const hasTestStatusSignal = request.policyName === "test-status" && hasRecognizableTestStatusSignal(heuristicInput);
+  const testStatusAnalysis = hasTestStatusSignal ? analyzeTestStatus(heuristicInput) : null;
   const testStatusDecision = hasTestStatusSignal && testStatusAnalysis ? buildTestStatusDiagnoseContract({
-    input: prepared.truncated,
+    input: heuristicInput,
     analysis: testStatusAnalysis,
     resolvedTests: request.testStatusContext?.resolvedTests,
     remainingTests: request.testStatusContext?.remainingTests
@@ -4681,7 +5422,7 @@ async function runSift(request) {
 `
     );
   }
-  const heuristicOutput = request.policyName === "test-status" ? testStatusDecision?.contract.diagnosis_complete ? testStatusHeuristicOutput : null : applyHeuristicPolicy(request.policyName, prepared.truncated, request.detail);
+  const heuristicOutput = request.policyName === "test-status" ? testStatusDecision?.contract.diagnosis_complete ? testStatusHeuristicOutput : null : applyHeuristicPolicy(request.policyName, heuristicInput, request.detail);
   if (heuristicOutput) {
     if (request.config.runtime.verbose) {
       process.stderr.write(`${pc2.dim("sift")} heuristic=${request.policyName}
@@ -4691,7 +5432,7 @@ async function runSift(request) {
       question: request.question,
       format: request.format,
       goal: request.goal,
-      input: prepared.truncated,
+      input: heuristicInput,
       detail: request.detail,
       policyName: request.policyName,
       outputContract: request.policyName === "test-status" && request.goal === "diagnose" && request.format === "json" ? request.outputContract ?? TEST_STATUS_DIAGNOSE_JSON_CONTRACT : request.outputContract,
@@ -4711,6 +5452,11 @@ async function runSift(request) {
         prompt: heuristicPrompt.prompt,
         responseMode: heuristicPrompt.responseMode,
         prepared,
+        heuristicInput: {
+          length: heuristicInput.length,
+          truncatedApplied: heuristicInputTruncated,
+          strategy: "full-redacted"
+        },
         heuristicOutput,
         strategy: "heuristic"
       });
@@ -4724,6 +5470,8 @@ async function runSift(request) {
       logVerboseTestStatusTelemetry({
         request,
         prepared,
+        heuristicInputChars: heuristicInput.length,
+        heuristicInputTruncated,
         contract: testStatusDecision.contract,
         finalOutput
       });
@@ -4775,6 +5523,11 @@ async function runSift(request) {
         prompt: prompt.prompt,
         responseMode: prompt.responseMode,
         prepared: providerPrepared2,
+        heuristicInput: {
+          length: heuristicInput.length,
+          truncatedApplied: heuristicInputTruncated,
+          strategy: "full-redacted"
+        },
         heuristicOutput: testStatusHeuristicOutput,
         strategy: "hybrid"
       });
@@ -4788,10 +5541,11 @@ async function runSift(request) {
       });
       const supplement = parseTestStatusProviderSupplement(result.text);
       const mergedDecision = buildTestStatusDiagnoseContract({
-        input: prepared.truncated,
+        input: heuristicInput,
         analysis: testStatusAnalysis,
         resolvedTests: request.testStatusContext?.resolvedTests,
         remainingTests: request.testStatusContext?.remainingTests,
+        providerBucketSupplements: supplement.bucket_supplements,
         contractOverrides: {
           diagnosis_complete: supplement.diagnosis_complete,
           raw_needed: supplement.raw_needed,
@@ -4813,6 +5567,8 @@ async function runSift(request) {
       logVerboseTestStatusTelemetry({
         request,
         prepared,
+        heuristicInputChars: heuristicInput.length,
+        heuristicInputTruncated,
         contract: mergedDecision.contract,
         finalOutput,
         rawSliceChars: rawSlice.text.length,
@@ -4825,7 +5581,7 @@ async function runSift(request) {
       const failureDecision = buildTestStatusProviderFailureDecision({
         request,
         baseDecision: testStatusDecision,
-        input: prepared.truncated,
+        input: heuristicInput,
         analysis: testStatusAnalysis,
         reason,
         rawSliceUsed: rawSlice.used,
@@ -4846,6 +5602,8 @@ async function runSift(request) {
       logVerboseTestStatusTelemetry({
         request,
         prepared,
+        heuristicInputChars: heuristicInput.length,
+        heuristicInputTruncated,
         contract: failureDecision.contract,
         finalOutput,
         rawSliceChars: rawSlice.text.length,
@@ -4884,6 +5642,11 @@ async function runSift(request) {
       prompt: providerPrompt.prompt,
       responseMode: providerPrompt.responseMode,
       prepared: providerPrepared,
+      heuristicInput: {
+        length: heuristicInput.length,
+        truncatedApplied: heuristicInputTruncated,
+        strategy: "full-redacted"
+      },
       heuristicOutput: testStatusDecision ? testStatusHeuristicOutput : null,
       strategy: testStatusDecision ? "hybrid" : "provider"
     });
@@ -4925,7 +5688,7 @@ async function runSift(request) {
 
 // src/core/testStatusState.ts
 import fs5 from "fs";
-import path6 from "path";
+import path7 from "path";
 import { z as z3 } from "zod";
 var detailSchema = z3.enum(["standard", "focused", "verbose"]);
 var failureBucketTypeSchema = z3.enum([
@@ -5036,7 +5799,7 @@ function buildBucketSignature(bucket) {
   ]);
 }
 function basenameMatches(value, matcher) {
-  return matcher.test(path6.basename(value));
+  return matcher.test(path7.basename(value));
 }
 function isPytestExecutable(value) {
   return basenameMatches(value, /^pytest(?:\.exe)?$/i);
@@ -5230,7 +5993,7 @@ function tryReadCachedTestStatusRun(statePath = getDefaultTestStatusStatePath())
   }
 }
 function writeCachedTestStatusRun(state, statePath = getDefaultTestStatusStatePath()) {
-  fs5.mkdirSync(path6.dirname(statePath), {
+  fs5.mkdirSync(path7.dirname(statePath), {
     recursive: true
   });
   fs5.writeFileSync(statePath, `${JSON.stringify(state, null, 2)}
@@ -6039,6 +6802,7 @@ var defaultCliDeps = {
   configInit,
   configSetup,
   configShow,
+  configUse,
   configValidate,
   runDoctor,
   listPresets,
@@ -6143,9 +6907,12 @@ function shouldKeepPresetPolicy(args) {
   return args.requestedFormat === void 0 || args.requestedFormat === args.presetFormat;
 }
 function applySharedOptions(command) {
-  return command.option("--provider <provider>", "Provider: openai | openai-compatible").option("--model <model>", "Model name").option("--base-url <url>", "Provider base URL").option(
+  return command.option(
+    "--provider <provider>",
+    "Provider: openai | openai-compatible | openrouter"
+  ).option("--model <model>", "Model name").option("--base-url <url>", "Provider base URL").option(
     "--api-key <key>",
-    "Provider API key (or set OPENAI_API_KEY for provider=openai; use SIFT_PROVIDER_API_KEY or endpoint-native envs for openai-compatible)"
+    "Provider API key (or set OPENAI_API_KEY for provider=openai, OPENROUTER_API_KEY for provider=openrouter; use SIFT_PROVIDER_API_KEY or endpoint-native envs for openai-compatible)"
   ).option(
     "--json-response-format <mode>",
     "JSON response format mode: auto | on | off"
@@ -6690,10 +7457,10 @@ function createCliApp(args = {}) {
     }
     throw new Error(`Unknown agent action: ${action}`);
   });
-  cli.command("config <action>", "Config commands: setup | init | show | validate").usage("config <setup|init|show|validate> [options]").example("config setup").example("config setup --global").example("config setup --path ~/.config/sift/config.yaml").example("config init").example("config init --global").example("config show").example("config validate --config ./sift.config.yaml").option("--path <path>", "Target config path for init or setup").option(
+  cli.command("config <action> [provider]", "Config commands: setup | init | show | validate | use").usage("config <setup|init|show|validate|use> [provider] [options]").example("config setup").example("config setup --global").example("config setup --path ~/.config/sift/config.yaml").example("config init").example("config init --global").example("config use openrouter").example("config show").example("config validate --config ./sift.config.yaml").option("--path <path>", "Target config path for init or setup").option(
     "--global",
     "Use the machine-wide config path (~/.config/sift/config.yaml) for init or setup"
-  ).option("--config <path>", "Path to config file").option("--show-secrets", "Show secret values in config show").action(async (action, options) => {
+  ).option("--config <path>", "Path to config file").option("--show-secrets", "Show secret values in config show").action(async (action, provider, options) => {
     if (action === "setup") {
       process.exitCode = await deps.configSetup({
         targetPath: options.path,
@@ -6716,6 +7483,13 @@ function createCliApp(args = {}) {
       deps.configValidate(options.config);
       return;
     }
+    if (action === "use") {
+      if (!provider) {
+        throw new Error("Missing provider name.");
+      }
+      deps.configUse(provider, options.config, env);
+      return;
+    }
     throw new Error(`Unknown config action: ${action}`);
   });
   cli.command("doctor", "Check which config is active and whether local setup looks complete").usage("doctor [options]").option("--config <path>", "Path to config file").action((options) => {