@odla-ai/cli 0.20.1 → 0.21.0

package/dist/bin.cjs

@@ -57,7 +57,7 @@ function approvalLines(prompt) {
   return lines;
 }
 function printApproval(out, prompt) {
-  for (const line of approvalLines(prompt)) out.log(line);
+  for (const line of approvalLines(prompt)) out.error(line);
 }
 function reminderLines(prompt) {
   return [
@@ -277,7 +277,7 @@ async function getDeveloperToken(cfg, options, doFetch, out) {
   }
   const cached = readJsonFile(cfg.local.tokenFile);
   if (cached?.token && cached.platform === audience && (cached.expiresAt ?? 0) > Date.now() + 6e4) {
-    out.log(`auth: using cached developer token (${displayPath(cfg.local.tokenFile, cfg.rootDir)})`);
+    out.error(`auth: using cached developer token (${displayPath(cfg.local.tokenFile, cfg.rootDir)})`);
     return cached.token;
   }
   const ctx = {
@@ -294,16 +294,16 @@ async function getDeveloperToken(cfg, options, doFetch, out) {
   const { token, expiresAt } = await resumePendingHandshake(ctx, waitMs) ?? await freshHandshake(ctx, waitMs);
   clearPendingHandshake(ctx.pendingFile);
   writePrivateJson(cfg.local.tokenFile, { platform: audience, email: ctx.email, token, expiresAt });
-  out.log(`auth: developer token cached (${displayPath(cfg.local.tokenFile, cfg.rootDir)})`);
+  out.error(`auth: developer token cached (${displayPath(cfg.local.tokenFile, cfg.rootDir)})`);
   return token;
 }
 async function resumePendingHandshake(ctx, waitMs) {
   const pending = readPendingHandshake(ctx.pendingFile, ctx.audience, ctx.email);
   if (!pending) return null;
-  ctx.out.log("");
-  ctx.out.log(`auth: resuming pending handshake \u2014 ${approvalHint(pending)}`);
+  ctx.out.error("");
+  ctx.out.error(`auth: resuming pending handshake \u2014 ${approvalHint(pending)}`);
   await launchApproval(ctx, pending.approvalUrl);
-  ctx.out.log("");
+  ctx.out.error("");
   const stopReminder = approvalReminder(ctx.out, pending);
   try {
     return await (0, import_db.collectToken)({
@@ -319,7 +319,7 @@ async function resumePendingHandshake(ctx, waitMs) {
     if (code === "handshake_pending") throw stillPending(pending, ctx.email);
     if (code === "handshake_expired" || code === "handshake_timeout") {
       clearPendingHandshake(ctx.pendingFile);
-      ctx.out.log("auth: pending handshake lapsed unapproved; starting a fresh one");
+      ctx.out.error("auth: pending handshake lapsed unapproved; starting a fresh one");
       return null;
     }
     if (code === "handshake_denied") clearPendingHandshake(ctx.pendingFile);
@@ -377,12 +377,12 @@ async function launchApproval(ctx, approvalUrl) {
   if (ctx.browser.open) {
     try {
       await (ctx.options.openApprovalUrl ?? openUrl)(approvalUrl);
-      ctx.out.log(`auth: asked the OS to open a browser${ctx.browser.mode === "auto" ? " (auto)" : ""} \u2014 if no tab appeared, use the URL above`);
+      ctx.out.error(`auth: asked the OS to open a browser${ctx.browser.mode === "auto" ? " (auto)" : ""} \u2014 if no tab appeared, use the URL above`);
     } catch (err) {
-      ctx.out.log(`auth: could not open browser (${err instanceof Error ? err.message : String(err)})`);
+      ctx.out.error(`auth: could not open browser (${err instanceof Error ? err.message : String(err)})`);
     }
   } else if (ctx.browser.reason) {
-    ctx.out.log(`auth: browser launch skipped (${ctx.browser.reason}) \u2014 show the human the URL above`);
+    ctx.out.error(`auth: browser launch skipped (${ctx.browser.reason}) \u2014 show the human the URL above`);
   }
 }
 function stillPending(pending, email) {
@@ -507,7 +507,7 @@ async function scopedToken(platform, scope, options, doFetch, out) {
   const cache = options.cache === false ? null : readJsonFile(tokenFile);
   const cached = cache?.platform === audience ? cache.tokens?.[scope] : void 0;
   if (cached?.token && (cached.expiresAt ?? 0) > Date.now() + 6e4) {
-    out.log(`auth: using cached ${scope} grant (${tokenFile})`);
+    out.error(`auth: using cached ${scope} grant (${tokenFile})`);
     return cached.token;
   }
   const email = handshakeEmail(options.email, cache?.platform === audience ? cache.email : void 0);
@@ -538,9 +538,9 @@ async function scopedToken(platform, scope, options, doFetch, out) {
     tokens[scope] = { token, expiresAt };
     if ((0, import_node_fs3.existsSync)((0, import_node_path3.join)(rootDir, ".git"))) ensureGitignore(rootDir, [tokenFile]);
     writePrivateJson(tokenFile, { platform: audience, email, tokens });
-    out.log(`auth: cached ${scope} grant (${tokenFile}; mode 0600)`);
+    out.error(`auth: cached ${scope} grant (${tokenFile}; mode 0600)`);
   } else {
-    out.log(`auth: ${scope} grant is in memory only; its credential record remains in odla-ai/db`);
+    out.error(`auth: ${scope} grant is in memory only; its credential record remains in odla-ai/db`);
   }
   return token;
 }
@@ -8711,13 +8711,11 @@ async function loadOrDefaultConfig(configPath, action, appId) {
   }
   return loadProjectConfig(configPath);
 }
-var PURE_STDOUT = /* @__PURE__ */ new Set(["get", "cat"]);
 async function buildContext2(parsed, deps, action) {
   const configPath = stringOpt(parsed.options.config) ?? "odla.config.mjs";
   const cfg = await loadOrDefaultConfig(configPath, action, stringOpt(parsed.options.app));
   const doFetch = deps.fetch ?? fetch;
   const out = deps.stdout ?? console;
-  const authOut = PURE_STDOUT.has(action) ? { log: (line) => out.error(line), error: (line) => out.error(line) } : out;
   const appId = stringOpt(parsed.options.app) ?? PLATFORM_SCOPE;
   const dryRun = parsed.options["dry-run"] === true;
   if (action === "import" && dryRun) {
@@ -8737,7 +8735,7 @@ async function buildContext2(parsed, deps, action) {
     email: stringOpt(parsed.options.email),
     label: `odla CLI (runbook ${action})`,
     fetch: doFetch,
-    stdout: authOut,
+    stdout: out,
     openApprovalUrl: deps.openUrl,
     // Anchor the grant cache to this project, not the shell's cwd.
     rootDir: cfg.rootDir
@@ -8754,7 +8752,7 @@ async function buildContext2(parsed, deps, action) {
       open: void 0
     },
     doFetch,
-    authOut
+    out
   );
   return {
     platformUrl: cfg.platformUrl,