claudish 7.7.2 → 7.7.4

package/dist/index.js

@@ -581,7 +581,7 @@ var init_onepassword_config = __esm(() => {
 });
 
 // src/version.ts
-var VERSION = "7.7.2";
+var VERSION = "7.7.4";
 
 // src/providers/onepassword-wasm.ts
 var exports_onepassword_wasm = {};
@@ -3043,6 +3043,7 @@ __export(exports_onepassword, {
   valueTail: () => valueTail,
   resolveSecrets: () => resolveSecrets,
   resolveSdkAuth: () => resolveSdkAuth,
+  resolveGlobImportForEnvVars: () => resolveGlobImportForEnvVars,
   resolveGlobImport: () => resolveGlobImport,
   resolveDesktopAccount: () => resolveDesktopAccount,
   resetSdkClientCache: () => resetSdkClientCache,
@@ -3243,6 +3244,35 @@ async function resolveGlobImport(opPath, opts = {}) {
     env: opts.env
   });
 }
+async function resolveGlobImportForEnvVars(opPath, envNames, opts = {}) {
+  const wanted = new Set(envNames);
+  if (wanted.size === 0)
+    return {};
+  const warn = opts.warn ?? ((m) => console.error(m));
+  const glob = parseGlobImport(opPath);
+  const fields = await discoverItemFields(glob.vault, glob.item, {
+    sdkFactory: opts.sdkFactory,
+    auth: opts.auth,
+    env: opts.env,
+    warn
+  });
+  const matches = filterGlobFields(fields, glob);
+  const refMap = {};
+  for (const m of matches) {
+    if (!m.valid)
+      continue;
+    if (!wanted.has(m.envName))
+      continue;
+    refMap[m.envName] = m.field.reference;
+  }
+  if (Object.keys(refMap).length === 0)
+    return {};
+  return resolveSecrets(refMap, {
+    sdkFactory: opts.sdkFactory,
+    auth: opts.auth,
+    env: opts.env
+  });
+}
 function envNameFromOpRef(opRef) {
   if (typeof opRef !== "string" || !opRef.startsWith("op://"))
     return null;
@@ -70139,7 +70169,7 @@ async function applyOpImport() {
   }
   process.argv = [...head, ...rebuilt];
 }
-async function loadStoredApiKeys() {
+async function loadStoredApiKeys(neededEnvVars) {
   let opRefs = {};
   let globImports = [];
   let apiKeysForSeed;
@@ -70171,11 +70201,19 @@ async function loadStoredApiKeys() {
     for (const w of collected.warnings)
       console.error(w);
   } catch {}
+  if (neededEnvVars) {
+    const filteredRefs = {};
+    for (const [envVar, ref] of Object.entries(opRefs)) {
+      if (neededEnvVars.has(envVar))
+        filteredRefs[envVar] = ref;
+    }
+    opRefs = filteredRefs;
+  }
   const refKeys = Object.keys(opRefs);
   if (refKeys.length === 0 && globImports.length === 0)
     return;
   try {
-    const { resolveSecrets: resolveSecrets2, resolveGlobImport: resolveGlobImport2 } = await Promise.resolve().then(() => (init_onepassword(), exports_onepassword));
+    const { resolveSecrets: resolveSecrets2, resolveGlobImport: resolveGlobImport2, resolveGlobImportForEnvVars: resolveGlobImportForEnvVars2 } = await Promise.resolve().then(() => (init_onepassword(), exports_onepassword));
     const auth = await getSdkAuth();
     if (refKeys.length > 0) {
       const resolved = await resolveSecrets2(opRefs, { auth });
@@ -70185,7 +70223,10 @@ async function loadStoredApiKeys() {
     }
     for (const globPath of globImports) {
       try {
-        const resolved = await resolveGlobImport2(globPath, {
+        const resolved = neededEnvVars ? await resolveGlobImportForEnvVars2(globPath, neededEnvVars, {
+          auth,
+          warn: () => {}
+        }) : await resolveGlobImport2(globPath, {
           auth,
           warn: () => {}
         });
@@ -70205,7 +70246,7 @@ async function loadStoredApiKeys() {
     process.exit(1);
   }
 }
-async function applyCustomEndpointOpKeys() {
+async function applyCustomEndpointOpKeys(neededEnvVars) {
   let refs = {};
   try {
     const configPath = join29(homedir27(), ".claudish", "config.json");
@@ -70223,6 +70264,8 @@ async function applyCustomEndpointOpKeys() {
       if (typeof apiKey !== "string" || !isOpReference2(apiKey))
         continue;
       const envVar = `CUSTOM_${name.toUpperCase().replace(/[^A-Z0-9]/g, "_")}_KEY`;
+      if (neededEnvVars && !neededEnvVars.has(envVar))
+        continue;
       if (process.env[envVar])
         continue;
       refs[envVar] = apiKey;
@@ -70245,15 +70288,15 @@ async function applyCustomEndpointOpKeys() {
     process.exit(1);
   }
 }
-var earlyArgv = process.argv.slice(2);
-var hasExplicitOpFlag = earlyArgv.some((a) => a === "--op" || a === "--op-env" || a.startsWith("--op-env="));
-var earlyFirst = earlyArgv.find((a) => !a.startsWith("-"));
-var isNoSecretCommand = !hasExplicitOpFlag && (earlyArgv.includes("--help") || earlyArgv.includes("-h") || earlyArgv.includes("--help-ai") || earlyArgv.includes("--version") || earlyArgv.includes("-v") || earlyFirst === "help" || earlyFirst === "version");
-if (!isNoSecretCommand) {
-  await applyOpEnvironment();
-  await applyOpImport();
-  await loadStoredApiKeys();
-  await applyCustomEndpointOpKeys();
+await applyOpEnvironment();
+await applyOpImport();
+var opHydrated = false;
+async function hydrateOpSecrets(neededEnvVars) {
+  if (opHydrated)
+    return;
+  opHydrated = true;
+  await loadStoredApiKeys(neededEnvVars);
+  await applyCustomEndpointOpKeys(neededEnvVars);
 }
 var isMcpMode = process.argv.includes("--mcp");
 function handlePromptExit(err) {
@@ -70281,13 +70324,13 @@ var isLegacyGeminiLogout = args.includes("--gemini-logout");
 var isLegacyKimiLogin = args.includes("--kimi-login");
 var isLegacyKimiLogout = args.includes("--kimi-logout");
 if (isMcpMode) {
-  Promise.resolve().then(() => (init_mcp_server(), exports_mcp_server)).then((mcp) => mcp.startMcpServer());
+  hydrateOpSecrets().then(() => Promise.resolve().then(() => (init_mcp_server(), exports_mcp_server)).then((mcp) => mcp.startMcpServer()));
 } else if (isServeCommand) {
   const serveArgIndex = args.indexOf("serve");
-  Promise.resolve().then(() => (init_serve_command(), exports_serve_command)).then((m) => m.serveCommand(args.slice(serveArgIndex + 1)).catch((e) => {
+  hydrateOpSecrets().then(() => Promise.resolve().then(() => (init_serve_command(), exports_serve_command)).then((m) => m.serveCommand(args.slice(serveArgIndex + 1)).catch((e) => {
     console.error(`[claudish serve] ${e instanceof Error ? e.message : String(e)}`);
     process.exit(1);
-  }));
+  })));
 } else if (isProvidersCommand) {
   const json2 = args.includes("--json");
   Promise.resolve().then(() => (init_providers_command(), exports_providers_command)).then((m) => m.providersCommand({ json: json2 }).catch((e) => {
@@ -70494,7 +70537,12 @@ Team Status`);
         cliConfig.modelHaiku,
         cliConfig.modelSubagent
       ];
-      const resolutions = validateApiKeysForModels2(modelsToValidate);
+      let resolutions = validateApiKeysForModels2(modelsToValidate);
+      const neededEnvVars = new Set(getMissingKeyResolutions2(resolutions).map((r) => r.requiredApiKeyEnvVar).filter((v) => typeof v === "string" && v.length > 0));
+      if (neededEnvVars.size > 0) {
+        await hydrateOpSecrets(neededEnvVars);
+        resolutions = validateApiKeysForModels2(modelsToValidate);
+      }
       const missingKeys = getMissingKeyResolutions2(resolutions);
       if (missingKeys.length > 0) {
         if (cliConfig.interactive) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "claudish",
-  "version": "7.7.2",
+  "version": "7.7.4",
   "description": "Run Claude Code with any model - OpenRouter, Ollama, LM Studio & local models",
   "type": "module",
   "main": "./dist/index.js",
@@ -60,10 +60,10 @@
     "ai"
   ],
   "optionalDependencies": {
-    "@claudish/magmux-darwin-arm64": "7.7.2",
-    "@claudish/magmux-darwin-x64": "7.7.2",
-    "@claudish/magmux-linux-arm64": "7.7.2",
-    "@claudish/magmux-linux-x64": "7.7.2"
+    "@claudish/magmux-darwin-arm64": "7.7.4",
+    "@claudish/magmux-darwin-x64": "7.7.4",
+    "@claudish/magmux-linux-arm64": "7.7.4",
+    "@claudish/magmux-linux-x64": "7.7.4"
   },
   "author": "Jack Rudenko <i@madappgang.com>",
   "license": "MIT",