@standardagents/code 0.9.7 → 0.9.8

package/dist/index.js

@@ -7867,18 +7867,8 @@ ${c3.dim}Press Control-C again to exit${c3.reset}
     selectedAgent = picked;
   }
   if (selectedAgent === OPENSAMA_AGENT_ID) {
-    const connecting = startLoader("Checking your ChatGPT connection");
-    const hasKey = await api.openSamaStatus().catch(() => false);
-    connecting.stop();
-    if (!hasKey) {
-      stdout.write(
-        `${c3.yellow}Sama One needs your ChatGPT account connected first.${c3.reset}
-Opening ${c3.teal}https://standardcode.ai/app${c3.reset} \u2014 connect ChatGPT there, then run standardcode again.
-`
-      );
-      openUrl("https://standardcode.ai/app");
-      process.exit(0);
-    }
+    const ok = await ensureSamaAuth(tui, api);
+    if (!ok) process.exit(0);
   }
   const home = os7.homedir();
   const tildeDir = projectDir.startsWith(home) ? "~" + projectDir.slice(home.length) : projectDir;
@@ -7985,6 +7975,45 @@ Opening ${c3.teal}https://standardcode.ai/app${c3.reset} \u2014 connect ChatGPT
 function shortenPath(p, max = 38) {
   return p.length > max ? "\u2026" + p.slice(-(max - 1)) : p;
 }
+async function ensureSamaAuth(tui, api) {
+  const checking = startLoader("Checking your ChatGPT connection");
+  const already = await api.openSamaStatus().catch(() => false);
+  checking.stop();
+  if (already) return true;
+  const picked = await tui.select(
+    `${c3.bold}${gradientText("Authenticate with ChatGPT")}${c3.reset}  ${c3.dim}Sama One runs on OpenAI using your own ChatGPT Pro account${c3.reset}`,
+    [
+      {
+        label: "Continue with ChatGPT",
+        hint: "connect once \u2014 unlocks your whole account",
+        value: "continue"
+      },
+      { label: "Not now", hint: "go back", value: "cancel" }
+    ]
+  );
+  if (picked !== "continue") return false;
+  openUrl("https://standardcode.ai/app?connect=sama");
+  tui.print(
+    `${c3.dim}Finish connecting ChatGPT in the browser \u2014 waiting here for the authorization to land on your account\u2026${c3.reset}`
+  );
+  const waiting = startLoader("Waiting for your ChatGPT authorization");
+  const deadline = Date.now() + 5 * 60 * 1e3;
+  while (Date.now() < deadline) {
+    await new Promise((r) => setTimeout(r, 3e3));
+    if (await api.openSamaStatus().catch(() => false)) {
+      waiting.stop();
+      tui.print(
+        `${c3.green}\u2713${c3.reset} ChatGPT connected \u2014 Sama One is now unlocked on your account (terminal, web, and macOS app).`
+      );
+      return true;
+    }
+  }
+  waiting.stop();
+  tui.print(
+    `${c3.yellow}Still not connected.${c3.reset} Finish the flow at ${c3.teal}standardcode.ai/app${c3.reset} and pick Sama One again.`
+  );
+  return false;
+}
 async function runAgentSwitchMenu(tui, api, threadId) {
   const picked = await tui.select(
     `${c3.bold}${gradientText("Switch agent")}${c3.reset}  ${c3.dim}takes effect on the next message${c3.reset}`,
@@ -7997,14 +8026,8 @@ async function runAgentSwitchMenu(tui, api, threadId) {
   );
   if (!picked) return;
   if (picked === OPENSAMA_AGENT_ID) {
-    const hasKey = await api.openSamaStatus().catch(() => false);
-    if (!hasKey) {
-      tui.print(
-        `${c3.yellow}Sama One needs your ChatGPT account connected first \u2014 opening ${c3.teal}standardcode.ai/app${c3.reset}${c3.yellow}.${c3.reset}`
-      );
-      openUrl("https://standardcode.ai/app");
-      return;
-    }
+    const ok = await ensureSamaAuth(tui, api);
+    if (!ok) return;
   }
   const title = AGENT_CHOICES.find((choice) => choice.id === picked)?.title ?? picked;
   try {