@raegent/earshot 0.3.0 → 0.3.2

package/dist/main.js

@@ -18381,7 +18381,7 @@ class ShadowGit {
 }
 
 // packages/core/src/version.ts
-var VERSION = "0.3.0";
+var VERSION = "0.3.2";
 
 // packages/core/src/session/repair.ts
 var REPAIR_TEXT = "No result was recorded for this call: earshot exited before the tool finished. " + "The call may or may not have run, so treat its effect as unknown and check " + "the current state rather than assuming either outcome.";
@@ -22006,53 +22006,63 @@ function Onboarding({ onDone, ...rest }) {
     onDone(result);
     exit();
   }, [exit, onDone]);
-  const verify2 = useCallback2(async (provider) => {
-    setScreen({ name: "probing", provider });
-    const result = await options.current.probe(provider.id);
+  const verify2 = useCallback2(async (provider, model2) => {
+    setScreen({ name: "probing", provider, model: model2 });
+    const result = await options.current.probe(provider.id, model2.id);
     if (result.ok) {
-      setScreen({ name: "ready", provider });
+      setScreen({ name: "ready", provider, model: model2 });
       return;
     }
     if (result.reason === "rejected")
       await options.current.forgetKey(provider.id).catch(() => {});
-    setScreen({ name: "failed", provider, result });
+    setScreen({ name: "failed", provider, model: model2, result });
   }, []);
   const submitKey = useCallback2(async () => {
-    const provider = screen.name === "key" ? screen.provider : undefined;
+    const selected = screen.name === "key" ? screen : undefined;
     const key2 = secret.current;
     secret.current = "";
     setInput("");
-    if (!provider)
+    if (!selected)
       return;
     if (key2.trim() === "") {
       setError("a key is needed, or press esc to go back");
       return;
     }
     setError(undefined);
-    await options.current.storeKey(provider.id, key2.trim());
-    await verify2(provider);
+    await options.current.storeKey(selected.provider.id, key2.trim());
+    await verify2(selected.provider, selected.model);
   }, [screen, verify2]);
-  const startSignIn = useCallback2(async (provider) => {
-    setScreen({ name: "oauth", provider });
+  const startSignIn = useCallback2(async (provider, model2) => {
+    setScreen({ name: "oauth", provider, model: model2 });
     try {
-      await options.current.signIn(provider.id, (url) => setScreen({ name: "oauth", provider, url }));
+      await options.current.signIn(provider.id, (url) => setScreen({ name: "oauth", provider, model: model2, url }));
     } catch (failure) {
       setScreen({
         name: "failed",
         provider,
+        model: model2,
         result: { ok: false, reason: "other", message: failure.message }
       });
       return;
     }
-    await verify2(provider);
+    await verify2(provider, model2);
   }, [verify2]);
-  const choose = useCallback2((provider) => {
+  const chooseModel = useCallback2((provider, model2) => {
+    setInput("");
     setError(undefined);
-    if (provider.kind === "oauth")
-      startSignIn(provider);
+    if (provider.configured)
+      verify2(provider, model2);
+    else if (provider.kind === "oauth")
+      startSignIn(provider, model2);
     else
-      setScreen({ name: "key", provider });
-  }, [startSignIn]);
+      setScreen({ name: "key", provider, model: model2 });
+  }, [startSignIn, verify2]);
+  const chooseProvider = useCallback2((provider) => {
+    setInput("");
+    setError(undefined);
+    setCursor(preferredModelIndex(provider.models, rest.wantedModel));
+    setScreen({ name: "model", provider });
+  }, [rest.wantedModel]);
   useInput5((key2, meta) => {
     if (meta.ctrl && key2 === "c") {
       finish({ outcome: "quit" });
@@ -22070,8 +22080,23 @@ function Onboarding({ onDone, ...rest }) {
       if (meta.return) {
         const provider = providers[cursor];
         if (provider)
-          choose(provider);
+          chooseProvider(provider);
+      }
+      return;
+    }
+    if (screen.name === "model") {
+      if (meta.escape) {
+        setInput("");
+        setError(undefined);
+        setCursor(0);
+        setScreen({ name: "choose" });
+        return;
       }
+      const matches3 = matchingModels(screen.provider.models, input);
+      if (meta.upArrow)
+        setCursor((c) => c <= 0 ? Math.max(0, matches3.length - 1) : c - 1);
+      if (meta.downArrow)
+        setCursor((c) => c >= matches3.length - 1 ? 0 : c + 1);
       return;
     }
     if (screen.name === "key" && !meta.escape) {
@@ -22096,11 +22121,11 @@ function Onboarding({ onDone, ...rest }) {
       secret.current = "";
       setInput("");
       setError(undefined);
-      setScreen({ name: "choose" });
+      setScreen(screen.name === "key" || screen.name === "oauth" || screen.name === "failed" ? { name: "model", provider: screen.provider } : { name: "choose" });
       return;
     }
     if (screen.name === "failed" && key2 === "k" && screen.result.reason === "unreachable") {
-      setScreen({ name: "ready", provider: screen.provider });
+      setScreen({ name: "ready", provider: screen.provider, model: screen.model });
     }
   });
   if (screen.name === "choose") {
@@ -22138,6 +22163,79 @@ function Onboarding({ onDone, ...rest }) {
       ]
     }, undefined, true, undefined, this);
   }
+  if (screen.name === "model") {
+    const matches3 = matchingModels(screen.provider.models, input);
+    const selected = matches3[cursor];
+    const start = Math.max(0, Math.min(cursor - 3, matches3.length - 8));
+    return /* @__PURE__ */ jsxDEV11(Box10, {
+      flexDirection: "column",
+      children: [
+        /* @__PURE__ */ jsxDEV11(Header, {}, undefined, false, undefined, this),
+        /* @__PURE__ */ jsxDEV11(Text11, {
+          children: [
+            "choose a model from ",
+            screen.provider.id,
+            " (",
+            matches3.length,
+            " matching)"
+          ]
+        }, undefined, true, undefined, this),
+        /* @__PURE__ */ jsxDEV11(Box10, {
+          children: [
+            /* @__PURE__ */ jsxDEV11(Text11, {
+              color: theme.user,
+              children: "> "
+            }, undefined, false, undefined, this),
+            /* @__PURE__ */ jsxDEV11(TextInput, {
+              value: input,
+              onChange: (value) => {
+                setInput(value);
+                setCursor(0);
+                setError(undefined);
+              },
+              onSubmit: () => {
+                if (selected)
+                  chooseModel(screen.provider, selected);
+                else
+                  setError("no model matches that search");
+              },
+              placeholder: "type to filter models"
+            }, undefined, false, undefined, this)
+          ]
+        }, undefined, true, undefined, this),
+        /* @__PURE__ */ jsxDEV11(Box10, {
+          flexDirection: "column",
+          marginTop: 1,
+          children: [
+            matches3.slice(start, start + 8).map((model2) => /* @__PURE__ */ jsxDEV11(Text11, {
+              color: model2 === selected ? theme.user : theme.muted,
+              children: [
+                model2 === selected ? "› " : "  ",
+                model2.id,
+                " · ",
+                model2.name
+              ]
+            }, model2.id, true, undefined, this)),
+            matches3.length === 0 ? /* @__PURE__ */ jsxDEV11(Text11, {
+              color: theme.muted,
+              children: "no matching models"
+            }, undefined, false, undefined, this) : null
+          ]
+        }, undefined, true, undefined, this),
+        /* @__PURE__ */ jsxDEV11(Box10, {
+          marginTop: 1,
+          children: /* @__PURE__ */ jsxDEV11(Text11, {
+            color: theme.muted,
+            children: "type filter · ↑↓ choose · enter select · esc back"
+          }, undefined, false, undefined, this)
+        }, undefined, false, undefined, this),
+        error ? /* @__PURE__ */ jsxDEV11(Text11, {
+          color: theme.warning,
+          children: error
+        }, undefined, false, undefined, this) : null
+      ]
+    }, undefined, true, undefined, this);
+  }
   if (screen.name === "key") {
     return /* @__PURE__ */ jsxDEV11(Box10, {
       flexDirection: "column",
@@ -22271,7 +22369,9 @@ function Onboarding({ onDone, ...rest }) {
         color: theme.user,
         children: [
           "ready: ",
-          screen.provider.id
+          screen.provider.id,
+          "/",
+          screen.model.id
         ]
       }, undefined, true, undefined, this),
       /* @__PURE__ */ jsxDEV11(Box10, {
@@ -22290,7 +22390,12 @@ function Onboarding({ onDone, ...rest }) {
           /* @__PURE__ */ jsxDEV11(TextInput, {
             value: input,
             onChange: setInput,
-            onSubmit: (text2) => finish({ outcome: "ready", providerId: screen.provider.id, firstPrompt: text2.trim() })
+            onSubmit: (text2) => finish({
+              outcome: "ready",
+              providerId: screen.provider.id,
+              model: `${screen.provider.id}/${screen.model.id}`,
+              firstPrompt: text2.trim()
+            })
           }, undefined, false, undefined, this)
         ]
       }, undefined, true, undefined, this)
@@ -22313,6 +22418,19 @@ function hint(provider) {
     return "sign in with a browser - no key to paste";
   return provider.envVars?.length ? provider.envVars.join(" or ") : "api key";
 }
+function matchingModels(models, query) {
+  const wanted = query.trim().toLowerCase();
+  if (!wanted)
+    return models;
+  return models.filter((model2) => model2.id.toLowerCase().includes(wanted) || model2.name.toLowerCase().includes(wanted));
+}
+function preferredModelIndex(models, wanted) {
+  if (!wanted)
+    return 0;
+  const modelId = wanted.includes("/") ? wanted.slice(wanted.indexOf("/") + 1) : wanted;
+  const index = models.findIndex((model2) => model2.id === wanted || model2.id === modelId);
+  return Math.max(0, index);
+}
 function order(providers, wanted) {
   if (!wanted)
     return providers;
@@ -22361,7 +22479,7 @@ async function runOnboarding(options) {
   return result;
 }
 // packages/cli/src/onboard.ts
-async function buildOnboardingOptions(wanted) {
+async function buildOnboardingOptions(wanted, wantedModel) {
   const registry2 = buildRegistry();
   const store3 = new AuthStore;
   const providers = [];
@@ -22374,13 +22492,14 @@ async function buildOnboardingOptions(wanted) {
   return {
     providers,
     ...wanted ? { wanted } : {},
+    ...wantedModel ? { wantedModel } : {},
     storeKey: (providerId, key2) => store3.set(providerId, { type: "api-key", apiKey: key2 }),
     forgetKey: (providerId) => store3.remove(providerId),
     signIn: async (providerId, onUrl) => {
       const credentials = await loginToOpenRouter({ onUrl });
       await store3.set(providerId, credentials);
     },
-    probe: (providerId) => probe(registry2, providerId)
+    probe: (providerId, modelId) => probe(registry2, providerId, modelId)
   };
 }
 async function describe3(provider, store3) {
@@ -22389,6 +22508,7 @@ async function describe3(provider, store3) {
   });
   return {
     id: provider.id,
+    models: provider.models().map((model2) => ({ id: model2.id, name: model2.name })),
     kind: provider.auth.kind === "oauth" ? "oauth" : "api-key",
     ...envVarsOf2(provider.auth).length ? { envVars: envVarsOf2(provider.auth) } : {},
     ...configured ? { configured: describeConfigured(configured.type) } : {}
@@ -22400,16 +22520,16 @@ function envVarsOf2(auth2) {
 function describeConfigured(kind) {
   return kind === "ambient" ? "ambient credentials" : kind === "oauth" ? "signed in" : "api key set";
 }
-async function probe(registry2, providerId) {
+async function probe(registry2, providerId, modelId) {
   const listed = registry2.list().find((provider) => provider.id === providerId);
   if (!listed)
     return { ok: false, reason: "other", message: `unknown provider "${providerId}"` };
-  const model2 = listed.models()[0];
+  const model2 = listed.models().find((candidate) => candidate.id === modelId);
   if (!model2) {
     return {
       ok: false,
       reason: "other",
-      message: `${providerId} publishes no models to check against`
+      message: `${providerId} does not publish model "${modelId}"`
     };
   }
   let resolved;
@@ -22485,7 +22605,7 @@ async function interactiveCommand(args) {
     return 2;
   }
   const extensions = await startExtensions(process.cwd());
-  const model2 = typeof flags.model === "string" ? flags.model : DEFAULT_MODEL3;
+  let model2 = typeof flags.model === "string" ? flags.model : DEFAULT_MODEL3;
   const onboardingAllowed = flags["no-onboarding"] !== true;
   let firstPrompt = initialPrompt;
   let attempted = false;
@@ -22513,12 +22633,14 @@ async function interactiveCommand(args) {
     } catch (error) {
       if (error instanceof MissingCredentialsError && onboardingAllowed && !attempted) {
         attempted = true;
-        const result = await runOnboarding(await buildOnboardingOptions(error.provider.id));
+        const result = await runOnboarding(await buildOnboardingOptions(error.provider.id, model2));
         if (result.outcome === "quit") {
           process.stdout.write("nothing was stored. run `earshot auth login <provider>` when you are ready.\n");
           await extensions.close();
           return 0;
         }
+        if (result.model)
+          model2 = result.model;
         firstPrompt = result.firstPrompt ?? firstPrompt;
         continue;
       }
@@ -22757,23 +22879,38 @@ function compareVersions(a, b) {
     return -1;
   return left.pre < right.pre ? -1 : 1;
 }
-async function resolveLatest(kind, fetchImpl) {
-  if (kind === "npm") {
-    const response2 = await fetchImpl(REGISTRY);
-    if (!response2.ok)
-      throw new Error(`npm registry returned ${response2.status}`);
-    const body2 = await response2.json();
-    if (!body2.version)
-      throw new Error("npm registry returned no version");
-    return body2.version;
-  }
-  const response = await fetchImpl(RELEASE);
+function releaseAuth(env) {
+  const token = env.EARSHOT_GITHUB_TOKEN ?? env.GITHUB_TOKEN ?? env.GH_TOKEN;
+  return token ? { headers: { authorization: `Bearer ${token}` } } : {};
+}
+function releaseNotFound(env) {
+  return releaseAuth(env).headers === undefined ? "GitHub returned 404. The releases are not public, so this needs a token: " + "set GITHUB_TOKEN (or GH_TOKEN) to one that can read the repository." : "GitHub returned 404 for the token in GITHUB_TOKEN; it may not have access " + "to this repository.";
+}
+async function fetchRelease(fetchImpl, env) {
+  const response = await fetchImpl(RELEASE, releaseAuth(env));
+  if (response.status === 404)
+    throw new Error(releaseNotFound(env));
   if (!response.ok)
     throw new Error(`GitHub releases returned ${response.status}`);
   const body = await response.json();
   if (!body.tag_name)
     throw new Error("GitHub returned a release with no tag");
-  return body.tag_name.replace(/^v/, "");
+  const assets = {};
+  for (const asset of body.assets ?? [])
+    assets[asset.name] = asset.url;
+  return { version: body.tag_name.replace(/^v/, ""), assets };
+}
+async function resolveLatest(kind, fetchImpl, env = process.env) {
+  if (kind === "npm") {
+    const response = await fetchImpl(REGISTRY);
+    if (!response.ok)
+      throw new Error(`npm registry returned ${response.status}`);
+    const body = await response.json();
+    if (!body.version)
+      throw new Error("npm registry returned no version");
+    return body.version;
+  }
+  return (await fetchRelease(fetchImpl, env)).version;
 }
 function findChecksum(sums, asset) {
   for (const line of sums.split(`
@@ -22811,7 +22948,7 @@ async function runUpdate(options = {}) {
     },
     isProjectRoot: (dir) => existsSync2(join19(dir, "package.json"))
   });
-  const fetchImpl = options.fetch ?? ((url) => fetch(url));
+  const fetchImpl = options.fetch ?? ((url, init) => fetch(url, init));
   if (install.kind === "source" || install.kind === "unknown") {
     err(`earshot update: ${install.reason}
 `);
@@ -22826,8 +22963,14 @@ async function runUpdate(options = {}) {
     return 2;
   }
   let latest;
+  let release2;
   try {
-    latest = await resolveLatest(install.kind, fetchImpl);
+    if (install.kind === "binary") {
+      release2 = await fetchRelease(fetchImpl, options.env ?? process.env);
+      latest = release2.version;
+    } else {
+      latest = await resolveLatest(install.kind, fetchImpl, options.env ?? process.env);
+    }
   } catch (error) {
     err(`earshot update: ${error.message}
 `);
@@ -22871,7 +23014,7 @@ async function runUpdate(options = {}) {
 `);
     return 0;
   }
-  return await updateBinary(install, latest, options, out, err);
+  return await updateBinary(install, release2, options, out, err);
 }
 function runCommand2(command, args) {
   const result = spawnSync2(command, args, { stdio: "inherit", windowsHide: true, shell: false });
@@ -22894,11 +23037,12 @@ async function defaultConfirm(question) {
     rl.close();
   }
 }
-async function updateBinary(install, latest, options, out, err) {
+async function updateBinary(install, release2, options, out, err) {
   const target = install.path;
   const asset = install.asset;
   const dir = dirname9(target);
-  const fetchImpl = options.fetch ?? ((url) => fetch(url));
+  const latest = release2.version;
+  const fetchImpl = options.fetch ?? ((url, init) => fetch(url, init));
   await sweepStale(dir, target);
   out(`  ${target}   ${asset}
 `);
@@ -22919,16 +23063,29 @@ async function updateBinary(install, latest, options, out, err) {
 `);
     return 0;
   }
-  const base = `https://github.com/${REPO}/releases/download/v${latest}`;
+  const assetUrl = release2.assets[asset];
+  const sumsUrl = release2.assets.SHA256SUMS;
+  if (assetUrl === undefined || sumsUrl === undefined) {
+    err(`earshot update: release v${latest} does not publish ${assetUrl ? "SHA256SUMS" : asset}
+`);
+    return 1;
+  }
   const temp = join19(dir, `.earshot-update-${process.pid}.tmp`);
   try {
+    const auth2 = releaseAuth(options.env ?? process.env);
+    const octet = {
+      ...auth2,
+      headers: { ...auth2.headers, accept: "application/octet-stream" }
+    };
     out("  downloading… ");
-    const download = await fetchImpl(`${base}/${asset}`);
+    const download = await fetchImpl(assetUrl, octet);
+    if (download.status === 404)
+      throw new Error(releaseNotFound(options.env ?? process.env));
     if (!download.ok)
       throw new Error(`downloading ${asset} returned ${download.status}`);
     const bytes = new Uint8Array(await download.arrayBuffer());
     out("verifying SHA256… ");
-    const sumsResponse = await fetchImpl(`${base}/SHA256SUMS`);
+    const sumsResponse = await fetchImpl(sumsUrl, octet);
     if (!sumsResponse.ok)
       throw new Error(`SHA256SUMS returned ${sumsResponse.status}`);
     const expected = findChecksum(await sumsResponse.text(), asset);
@@ -23068,5 +23225,5 @@ async function main(argv = process.argv.slice(2)) {
 var code = await main();
 process.exitCode = code;
 
-//# debugId=8F9F015F9221906F64756E2164756E21
+//# debugId=50400322D722C83B64756E2164756E21
 //# sourceMappingURL=main.js.map