fix(refine-skill): accept ANTHROPIC_OAUTH_TOKEN as valid claude credential; strip groq/ollama/local model prefix

- providers.js: requiredEnvVars (plural, any-of) returns [ANTHROPIC_API_KEY, ANTHROPIC_OAUTH_TOKEN] for claude-* models. validate.js accepts either; old single-required check rejected OAuth-only environments. Old requiredEnvVar() kept for back-compat (returns first element).
- refine.sh: groq/foo, ollama/foo, local/foo now strip the provider prefix before passing to pi (pi prefixes internally; double prefix produced 'Model groq/groq/foo not found').

Author: barryroodt

docker/bin/refine.sh

@@ -85,15 +85,18 @@ done
 }
 
 # --- derive provider from model (mirrors host providers.js) ---
+# For groq/ollama/local, the model id includes a "<provider>/" prefix in our
+# user-facing convention. Pi expects --provider and --model separately and
+# prefixes internally, so strip the prefix when present.
 case "$model" in
   claude-*)             provider="anthropic" ;;
   gpt-*|o1*|o3*)        provider="openai" ;;
   gemini-*)             provider="google" ;;
   grok-*)               provider="xai" ;;
   mistral-*)            provider="mistral" ;;
-  groq/*)               provider="groq" ;;
-  ollama/*)             provider="ollama" ;;
-  local/*)              provider="local" ;;
+  groq/*)               provider="groq";   model="${model#groq/}" ;;
+  ollama/*)             provider="ollama"; model="${model#ollama/}" ;;
+  local/*)              provider="local";  model="${model#local/}" ;;
   stub|stub:*)          provider="stub" ;;     # for tests
   *)                    provider="anthropic" ;; # fallback; pi will error if mismatched
 esac

src/providers.js

@@ -1,24 +1,33 @@
-// Model-prefix routing. Each entry: [regex, envVar, providerName].
-// envVar is what we forward + verify. providerName is what pi expects via --provider.
+// Model-prefix routing. Each entry: [regex, requiredEnvVars (any-of), providerName].
+// requiredEnvVars is an array — if any one is present, validation passes.
 const PREFIX_TABLE = [
-  [/^claude-/, "ANTHROPIC_API_KEY", "anthropic"],
-  [/^gpt-/, "OPENAI_API_KEY", "openai"],
-  [/^o[13](-|$)/, "OPENAI_API_KEY", "openai"],
-  [/^gemini-/, "GEMINI_API_KEY", "google"],
-  [/^grok-/, "XAI_API_KEY", "xai"],
-  [/^mistral-/, "MISTRAL_API_KEY", "mistral"],
-  [/^groq\//, "GROQ_API_KEY", "groq"],
-  [/^ollama\//, null, "ollama"],
-  [/^local\//, null, "local"],
+  [/^claude-/, ["ANTHROPIC_API_KEY", "ANTHROPIC_OAUTH_TOKEN"], "anthropic"],
+  [/^gpt-/, ["OPENAI_API_KEY"], "openai"],
+  [/^o[13](-|$)/, ["OPENAI_API_KEY"], "openai"],
+  [/^gemini-/, ["GEMINI_API_KEY"], "google"],
+  [/^grok-/, ["XAI_API_KEY"], "xai"],
+  [/^mistral-/, ["MISTRAL_API_KEY"], "mistral"],
+  [/^groq\//, ["GROQ_API_KEY"], "groq"],
+  [/^ollama\//, [], "ollama"],
+  [/^local\//, [], "local"],
 ];
 
+// Back-compat: returns the FIRST required env var, or null if none.
 export function requiredEnvVar(model) {
-  for (const [re, envVar] of PREFIX_TABLE) {
-    if (re.test(model)) return envVar;
+  for (const [re, vars] of PREFIX_TABLE) {
+    if (re.test(model)) return vars[0] ?? null;
   }
   return null;
 }
 
+// Returns full any-of list (or [] if no specific requirement).
+export function requiredEnvVars(model) {
+  for (const [re, vars] of PREFIX_TABLE) {
+    if (re.test(model)) return vars;
+  }
+  return [];
+}
+
 export function providerName(model) {
   for (const [re, , provider] of PREFIX_TABLE) {
     if (re.test(model)) return provider;

src/validate.js

@@ -1,6 +1,6 @@
 import fs from "node:fs";
 import path from "node:path";
-import { requiredEnvVar } from "./providers.js";
+import { requiredEnvVars } from "./providers.js";
 
 export function validatePath(inputPath) {
   let absPath;
@@ -43,12 +43,13 @@ const KNOWN_PROVIDER_KEYS = [
 ];
 
 export function validateModelEnv(model, env) {
-  const required = requiredEnvVar(model);
-  if (required && !env[required]) {
+  const required = requiredEnvVars(model);
+  if (required.length > 0 && !required.some((v) => env[v])) {
+    const list = required.join(" or ");
     return {
       ok: false,
       code: 3,
-      error: `--model ${model} requires ${required} in environment`,
+      error: `--model ${model} requires ${list} in environment`,
     };
   }
   const envVarsToForward = KNOWN_PROVIDER_KEYS.filter((v) => env[v]);

test/validate.test.js

@@ -48,9 +48,18 @@ test("validateModelEnv fails when required key missing", () => {
   assert.equal(result.ok, false);
   assert.equal(result.code, 3);
   assert.match(result.error, /ANTHROPIC_API_KEY/);
+  assert.match(result.error, /ANTHROPIC_OAUTH_TOKEN/);
   assert.match(result.error, /claude-/);
 });
 
+test("validateModelEnv passes when ANTHROPIC_OAUTH_TOKEN present (no API key)", () => {
+  const result = validateModelEnv("claude-sonnet-4-5", {
+    ANTHROPIC_OAUTH_TOKEN: "oat-...",
+  });
+  assert.equal(result.ok, true);
+  assert.ok(result.envVarsToForward.includes("ANTHROPIC_OAUTH_TOKEN"));
+});
+
 test("validateModelEnv forwards multiple present provider keys", () => {
   const result = validateModelEnv("claude-sonnet-4-5", {
     ANTHROPIC_API_KEY: "sk-...",