@takara-ai/miru-code 1.5.2 → 1.5.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@takara-ai/miru-code",
-  "version": "1.5.2",
+  "version": "1.5.3",
   "description": "Miru (見る) — hybrid code search for agents. Bun, TypeScript, Takara embeddings.",
   "type": "module",
   "license": "MIT",

package/src/credentials.ts

@@ -61,13 +61,6 @@ export async function readStoredCredentials(): Promise<StoredCredentials | null>
   }
 }
 
-function hydrateSageMakerEnv(sagemaker: StoredSageMakerCredentials): void {
-  process.env.MIRU_SAGEMAKER_ENDPOINT_ARN = sagemaker.endpoint_arn;
-  if (sagemaker.profile && !process.env.AWS_PROFILE) {
-    process.env.AWS_PROFILE = sagemaker.profile;
-  }
-}
-
 function clearSageMakerEnv(sagemaker?: StoredSageMakerCredentials): void {
   delete process.env.MIRU_SAGEMAKER_ENDPOINT_ARN;
   delete process.env.MIRU_SAGEMAKER_ENDPOINT_NAME;
@@ -81,6 +74,36 @@ function clearTakaraEnv(): void {
   delete process.env.TAKARA_API_KEY;
 }
 
+function hydrateSageMakerEnv(sagemaker: StoredSageMakerCredentials): void {
+  process.env.MIRU_SAGEMAKER_ENDPOINT_ARN = sagemaker.endpoint_arn;
+  if (sagemaker.profile && !process.env.AWS_PROFILE) {
+    process.env.AWS_PROFILE = sagemaker.profile;
+  }
+}
+
+/** Drop the other backend from env so setup validation cannot see a stale mode. */
+export async function beginModeSwitch(to: "takara" | "sagemaker"): Promise<void> {
+  const stored = await readStoredCredentials();
+  if (to === "takara") {
+    clearSageMakerEnv(stored?.sagemaker);
+  } else {
+    clearTakaraEnv();
+  }
+}
+
+async function writeExclusive(payload: StoredCredentials): Promise<string> {
+  const dir = resolveCredentialsDir();
+  const path = resolveCredentialsPath();
+  await mkdir(dir, { recursive: true, mode: 0o700 });
+  await Bun.write(path, `${JSON.stringify(payload, null, 2)}\n`, { mode: 0o600 });
+  try {
+    await chmod(path, 0o600);
+  } catch {
+    // Windows may not support Unix mode bits on all filesystems.
+  }
+  return path;
+}
+
 /** Apply credentials.json as the sole mode — never leave Takara and SageMaker both active. */
 export async function loadStoredCredentials(): Promise<boolean> {
   normalizeTakaraApiKeyEnv();
@@ -89,8 +112,8 @@ export async function loadStoredCredentials(): Promise<boolean> {
     return false;
   }
 
-  let changed = false;
   if (stored.takara_api_key) {
+    let changed = false;
     if (!hasTakaraApiKeyInEnv()) {
       process.env.TAKARA_API_KEY = stored.takara_api_key;
       changed = true;
@@ -103,6 +126,7 @@ export async function loadStoredCredentials(): Promise<boolean> {
   }
 
   if (stored.sagemaker) {
+    let changed = false;
     if (!process.env.MIRU_SAGEMAKER_ENDPOINT_ARN?.trim()) {
       hydrateSageMakerEnv(stored.sagemaker);
       changed = true;
@@ -111,46 +135,28 @@ export async function loadStoredCredentials(): Promise<boolean> {
       clearTakaraEnv();
       changed = true;
     }
+    return changed;
   }
-  return changed;
+  return false;
 }
 
 export async function saveStoredCredentials(apiKey: string): Promise<string> {
-  const dir = resolveCredentialsDir();
-  const path = resolveCredentialsPath();
-  await mkdir(dir, { recursive: true, mode: 0o700 });
-  const previousSageMaker = (await readStoredCredentials())?.sagemaker;
-  const payload: StoredCredentials = {
-    version: CREDENTIALS_VERSION,
-    takara_api_key: apiKey,
-  };
-  await Bun.write(path, `${JSON.stringify(payload, null, 2)}\n`, { mode: 0o600 });
-  try {
-    await chmod(path, 0o600);
-  } catch {
-    // Windows may not support Unix mode bits on all filesystems.
-  }
-  clearSageMakerEnv(previousSageMaker);
+  const previous = await readStoredCredentials();
+  const path = await writeExclusive({ version: CREDENTIALS_VERSION, takara_api_key: apiKey });
+  process.env.TAKARA_API_KEY = apiKey;
+  clearSageMakerEnv(previous?.sagemaker);
   return path;
 }
 
 export async function saveStoredSageMakerCredentials(
   sagemaker: StoredSageMakerCredentials,
 ): Promise<string> {
-  const dir = resolveCredentialsDir();
-  const path = resolveCredentialsPath();
-  await mkdir(dir, { recursive: true, mode: 0o700 });
-  const payload: StoredCredentials = {
-    version: CREDENTIALS_VERSION,
-    sagemaker,
-  };
-  await Bun.write(path, `${JSON.stringify(payload, null, 2)}\n`, { mode: 0o600 });
-  try {
-    await chmod(path, 0o600);
-  } catch {
-    // Windows may not support Unix mode bits on all filesystems.
-  }
+  const path = await writeExclusive({ version: CREDENTIALS_VERSION, sagemaker });
   clearTakaraEnv();
+  process.env.MIRU_SAGEMAKER_ENDPOINT_ARN = sagemaker.endpoint_arn;
+  if (sagemaker.profile) {
+    process.env.AWS_PROFILE = sagemaker.profile;
+  }
   return path;
 }
 

package/src/embeddings/validate.ts

@@ -3,7 +3,7 @@ import {
   embeddingDimensions,
   resolveEmbeddingBaseUrl,
   resolveEmbeddingDimensions,
-  resolveEmbeddingModel,
+  resolveTakaraEmbeddingModel,
 } from "./openai.ts";
 
 export interface ValidateApiKeyResult {
@@ -19,7 +19,7 @@ export async function validateEmbeddingApiKey(options: {
   dimensions?: number;
 }): Promise<ValidateApiKeyResult> {
   const baseUrl = (options.baseUrl ?? resolveEmbeddingBaseUrl()).replace(/\/$/, "");
-  const model = options.model ?? resolveEmbeddingModel();
+  const model = options.model ?? resolveTakaraEmbeddingModel();
   const dimensions = options.dimensions ?? resolveEmbeddingDimensions(model);
   const endpoint = `${baseUrl}/embeddings`;
 

package/src/setup.ts

@@ -1,5 +1,6 @@
 import { divider, fail, hint, info, printBrandBanner, success, writeStdout } from "./cli-ui.ts";
 import {
+  beginModeSwitch,
   clearStoredCredentials,
   loadStoredCredentials,
   readStoredCredentials,
@@ -163,6 +164,7 @@ export async function runSageMakerSetup(options: RunSetupOptions = {}): Promise<
     profile = await promptAwsProfile();
   }
 
+  await beginModeSwitch("sagemaker");
   process.env.MIRU_SAGEMAKER_ENDPOINT_ARN = arnInput;
   process.env.AWS_PROFILE = profile;
 
@@ -207,14 +209,12 @@ export async function runSetup(options: RunSetupOptions = {}): Promise<RunSetupR
     const path = resolveCredentialsPath();
     const stored = await readStoredCredentials();
     if (stored?.sagemaker) {
-      const apiKey = resolveEmbeddingApiKey();
-      await saveStoredCredentials(apiKey);
-      process.env.TAKARA_API_KEY = apiKey;
+      const saved = await saveStoredCredentials(resolveEmbeddingApiKey());
       writeStdout("");
-      success(`Saved credentials to ${path}`);
+      success(`Saved credentials to ${saved}`);
       hint("Removed the stored SageMaker endpoint — Miru now embeds only via Takara.");
       writeStdout("");
-      return { path, newlySaved: true };
+      return { path: saved, newlySaved: true };
     }
     if (stored?.takara_api_key) {
       info(`API key already configured (env + ${path}). Use --force to replace stored key.`);
@@ -246,6 +246,7 @@ export async function runSetup(options: RunSetupOptions = {}): Promise<RunSetupR
 
   const apiKey = options.apiKey ?? (await promptApiKey());
 
+  await beginModeSwitch("takara");
   if (!options.skipValidation) {
     const spinner = new Spinner("Validating API key");
     spinner.start();
@@ -259,7 +260,6 @@ export async function runSetup(options: RunSetupOptions = {}): Promise<RunSetupR
 
   const hadSageMaker = Boolean((await readStoredCredentials())?.sagemaker);
   const path = await saveStoredCredentials(apiKey);
-  process.env.TAKARA_API_KEY = apiKey;
   writeStdout("");
   success(`Saved credentials to ${path}`);
   if (hadSageMaker) {