@tokenoftrust/cli 1.4.0-rc.2 → 1.4.0-rc.21

package/src/commands/start.mjs

@@ -57,8 +57,9 @@ import { CliError, fail, formatError, exitCodeFor } from "../errors.mjs";
 import { openBrowser, waitForServer, firstFreePort } from "../open.mjs";
 import { startProgress } from "../progress.mjs";
 import { defaultLastTenantPath, readLastTenant, writeLastTenant } from "../last-tenant.mjs";
+import { readCredentials, defaultCredentialsPath } from "../token-store.mjs";
 import { collectChecks } from "./doctor.mjs";
-import { normalizeStores, storeListError, checkoutTenant } from "./checkout.mjs";
+import { normalizeStores, storeListError, checkoutTenant, noStoresGuidance } from "./clone.mjs";
 import {
   buildContainerPlan, spawnDevContainer, dockerAvailable, tryStartDocker,
   resolveDevImage, isPrivateRegistryImage, ensureRegistryLogin,
@@ -66,7 +67,7 @@ import {
   activityBridgeEnv, NativeArtifactUnavailableError,
 } from "./dev.mjs";
 import { scaffoldSample, isSampleCheckout, sampleConfig, SAMPLE_DIR_NAME } from "../sample.mjs";
-import { startHeartbeatFromEnv } from "../dev-heartbeat.mjs";
+import { startHeartbeatFromEnv, resolveEditor } from "../dev-heartbeat.mjs";
 import { streamDevLogs } from "../dev-logs.mjs";
 import { milestoneBanner, cockpitUrlFrom, DEVELOPER_COCKPIT } from "../banner.mjs";
 import { IDEAS } from "./ideas.mjs";
@@ -161,6 +162,24 @@ export function decideStartMode({ sampleFlag, hasSession }) {
   return hasSession ? "authed" : "sample";
 }
 
+/**
+ * The MCP base URL the cached session was minted on — what `tot login` stored in the
+ * credentials file (honoring TOT_PROFILE via defaultCredentialsPath). Lets `tot start`
+ * (and callers) FOLLOW wherever the developer signed in rather than defaulting to prod,
+ * which would look up a session on the wrong MCP and report "not signed in". Returns
+ * null when there's no cached session or it can't be read (falls through to the default).
+ * @param {NodeJS.ProcessEnv} env
+ * @returns {string|null}
+ */
+export function cachedMcpUrl(env) {
+  try {
+    const creds = readCredentials(defaultCredentialsPath(env));
+    return creds && typeof creds.mcpUrl === "string" && creds.mcpUrl ? creds.mcpUrl : null;
+  } catch {
+    return null;
+  }
+}
+
 /** @param {string[]} argv @param {any} ctx */
 export async function run(argv, ctx) {
   const env = process.env;
@@ -178,7 +197,11 @@ export async function run(argv, ctx) {
   }
 
   try {
-    const baseUrl = args.mcp || env.MCP_BASE_URL || env.TOT_MCP_URL || DEFAULT_MCP_URL;
+    // Resolve the MCP: an explicit flag / env wins, then the MCP the cached session was
+    // minted on (what `tot login` stored — so `start` FOLLOWS wherever you signed in
+    // instead of defaulting to prod and reporting "not signed in"), then the prod default.
+    const baseUrl =
+      args.mcp || env.MCP_BASE_URL || env.TOT_MCP_URL || cachedMcpUrl(env) || DEFAULT_MCP_URL;
     const client = createMcpClient(baseUrl);
 
     // Resolve a session, tolerating a no-session / no-network condition so we can
@@ -223,6 +246,7 @@ export async function run(argv, ctx) {
       tenant = await resolveTenant(stores, args, env, baseUrl, {
         session,
         listErr: storeListError(listResp),
+        list: listResp,
       });
     } catch (e) {
       stopEarlyHeartbeat();
@@ -238,11 +262,11 @@ export async function run(argv, ctx) {
     const dir = resolve(process.cwd(), tenant);
     // Resolve a free port so the URL we open/poll/print matches what the runner
     // binds (Vite strictPort is off → a busy port would drift). No-op if free.
-    const devArgs = {
+    const devArgs = /** @type {any} */ ({
       image: null, port: String(await firstFreePort(Number(args.port || 4321))), mcp: args.mcp,
       noLogin: false, noOpen: args.noOpen, docker: args.docker,
-    };
-    const runtime = { useDocker: args.docker, runnerDir: null };
+    });
+    const runtime = /** @type {{ useDocker: boolean, runnerDir: any }} */ ({ useDocker: args.docker, runnerDir: null });
     await Promise.all([
       ensureCheckout(client, tenant, dir, env),
       prefetchRuntime(client, devArgs, env, runtime, ctx),
@@ -294,7 +318,7 @@ export async function run(argv, ctx) {
     // (A3) so the "instant" claim is measured. The "Connect Claude" step is
     // intentionally removed for now — a blocking prompt here meant Ctrl-C'ing it
     // tore down the dev server; revisit AI-connect as a non-blocking step later.
-    printLiveEnding(tenant, url, formatElapsed(Date.now() - startedAt), cockpitUrl);
+    printLiveEnding(tenant, url, formatElapsed(Date.now() - startedAt), cockpitUrl, dir);
 
     // 7. hand the terminal to the running dev server until Ctrl-C.
     console.log("\n  Watching your store — edit content/home.html + save. Ctrl-C to stop.\n");
@@ -537,7 +561,7 @@ function mcpOrigin(baseUrl) {
  * (surface the reason — likely an auth/entitlement problem) from a genuinely empty
  * result (invite may still be propagating, or you need one). Points at `tot whoami`.
  */
-function noStoresError({ session, baseUrl, listErr }) {
+function noStoresError({ session, baseUrl, listErr, list = null }) {
   const who = describeIdentity(session);
   const origin = mcpOrigin(baseUrl);
   if (listErr) {
@@ -546,14 +570,10 @@ function noStoresError({ session, baseUrl, listErr }) {
       { next: "run `tot whoami` to check your session, or `tot login` again — then re-run `tot start`" },
     );
   }
-  return new CliError(
-    `signed in as ${who} via ${origin}, but you have no stores to build on yet`,
-    {
-      next:
-        "if you were just invited, it may still be propagating — try again in a minute; " +
-        "otherwise ask your Token of Trust contact for a store invite (see `tot whoami`)",
-    },
-  );
+  // Status-aware (card c2): an UNLINKED identity is pointed at `tot link`, not the
+  // misleading "ask for a store invite" copy; the genuine zero-grants case keeps it.
+  const g = noStoresGuidance(list);
+  return new CliError(`signed in as ${who} via ${origin}, but ${g.headline}`, { next: g.next });
 }
 
 /**
@@ -561,7 +581,11 @@ function noStoresError({ session, baseUrl, listErr }) {
  * the remembered last tenant (A4) — then remember whatever was decided so the
  * next bare `tot start` doesn't have to ask again.
  */
-async function resolveTenant(stores, args, env, baseUrl, { session = null, listErr = null } = {}) {
+/**
+ * @param {any} stores @param {any} args @param {any} env @param {string} baseUrl
+ * @param {{ session?: any, listErr?: string|null, list?: any }} [opts]
+ */
+async function resolveTenant(stores, args, env, baseUrl, { session = null, listErr = null, list = null } = {}) {
   const lastTenantPath = defaultLastTenantPath(env);
   const pick = pickTenant(stores, {
     explicit: args.tenant || null,
@@ -570,7 +594,7 @@ async function resolveTenant(stores, args, env, baseUrl, { session = null, listE
 
   let tenant;
   if (pick.kind === "none") {
-    throw noStoresError({ session, baseUrl, listErr });
+    throw noStoresError({ session, baseUrl, listErr, list });
   } else if (pick.kind === "explicit") {
     tenant = pick.tenant;
     console.log(`  → your store: ${tenant} (--tenant)`);
@@ -583,9 +607,10 @@ async function resolveTenant(stores, args, env, baseUrl, { session = null, listE
   } else {
     // Many stores, nothing remembered — choose. Non-interactive (no TTY /
     // --yes without a name) can't guess.
+    const many = /** @type {any} */ (pick);
     if (!isInteractive() || args.yes) {
       throw new CliError("you can build on several stores — pick one", {
-        next: `tot start --tenant <tenant>  (one of: ${pick.stores.map((s) => s.id).join(", ")})`,
+        next: `tot start --tenant <tenant>  (one of: ${many.stores.map((s) => s.id).join(", ")})`,
       });
     }
     // Loud + unmissable: a >1-store dev is often looking at their browser
@@ -594,11 +619,11 @@ async function resolveTenant(stores, args, env, baseUrl, { session = null, listE
     console.log("");
     console.log("  ⚑ ACTION NEEDED IN YOUR TERMINAL — you can build on several stores.");
     console.log("    Pick one here to light up your cockpit:\n");
-    pick.stores.forEach((s, i) => console.log(`    ${i + 1}. ${s.id}${s.name ? `  — ${s.name}` : ""}`));
+    many.stores.forEach((s, i) => console.log(`    ${i + 1}. ${s.id}${s.name ? `  — ${s.name}` : ""}`));
     console.log("");
-    const idx = await promptChoice(pick.stores.length);
+    const idx = await promptChoice(many.stores.length);
     console.log("");
-    tenant = pick.stores[idx].id;
+    tenant = many.stores[idx].id;
   }
 
   writeLastTenant(lastTenantPath, { mcpUrl: baseUrl, tenant });
@@ -613,7 +638,7 @@ async function ensureCheckout(client, tenant, dir, env) {
       console.log(`  ✓ reusing existing checkout ./${tenant}`);
       return;
     }
-    throw new CliError(`./${tenant} already exists and isn't a tot checkout`, {
+    throw new CliError(`./${tenant} already exists and isn't a store checkout`, {
       next: `remove it (or run \`tot start\` from an empty directory)`,
       exitCode: 2,
     });
@@ -665,6 +690,7 @@ export function formatElapsed(ms) {
  * Developer Cockpit URL, the one next step is framed as "edit a line → see it in
  * your cockpit"; otherwise it's the same edit-to-see-it-reload action.
  */
+/** @param {string} dir @param {string|null} [cockpitUrl] */
 function printCheckoutLanding(dir, cockpitUrl = null) {
   console.log("");
   console.log(`  📁 Your store code is at:  ${dir}`);
@@ -673,11 +699,38 @@ function printCheckoutLanding(dir, cockpitUrl = null) {
   console.log(`     content/home.html — you'll see it reflected in ${where}.`);
 }
 
+/**
+ * OS/editor-aware suggestions for opening the checkout, shown once at the
+ * "you're live" moment. $VISUAL/$EDITOR (same signal the cockpit's "open this
+ * file" hint uses — see dev-heartbeat.mjs#resolveEditor) wins when set;
+ * otherwise a short per-platform shortlist of common editor launch commands.
+ * Deliberately NOT probed against PATH — a spawnSync per candidate would add
+ * real latency to the crafted "aha" ending for the common case (nothing set),
+ * so this is a labeled suggestion list, not a detection result.
+ */
+function editorOpenLines(dir, { platform = process.platform, env = process.env } = {}) {
+  const configured = resolveEditor(env);
+  if (configured) return [`${configured} ${dir}`];
+  if (platform === "darwin") {
+    return [`code ${dir}      (VS Code, if installed)`, `cursor ${dir}    (Cursor, if installed)`, `open ${dir}      (Finder)`];
+  }
+  if (platform === "win32") {
+    return [`code ${dir}      (VS Code, if installed)`, `explorer ${dir}  (File Explorer)`];
+  }
+  return [`code ${dir}      (VS Code, if installed)`, `cursor ${dir}    (Cursor, if installed)`, `xdg-open ${dir}  (file manager)`];
+}
+
 /** The crafted "you're live" ending — a PROMINENT milestone banner (u2) that,
  * when we hold a Developer Cockpit URL, explicitly sends the developer BACK to
- * their cockpit as the next place to look; then the AI-wow (G), seeded with
- * IDEAS[0] (G2/G3 — one prompt list shared with `tot ideas`, no drift). */
-function printLiveEnding(tenant, url, elapsed, cockpitUrl = null) {
+ * their cockpit as the next place to look. Then: an OS-suited "open this in
+ * an editor" suggestion, and the four-pane layout tip (this terminal, cockpit,
+ * local preview, editor) so a build problem, a reload, and the code are never
+ * more than a glance apart. */
+/**
+ * @param {string} tenant @param {string} url @param {string|null} elapsed
+ * @param {string|null} [cockpitUrl] @param {string|null} [dir]
+ */
+function printLiveEnding(tenant, url, elapsed, cockpitUrl = null, dir = null) {
   const lines = [
     `✨  You're live.${elapsed ? `  (${elapsed})` : ""}`,
     `    ${url}`,
@@ -691,10 +744,19 @@ function printLiveEnding(tenant, url, elapsed, cockpitUrl = null) {
   console.log(milestoneBanner(lines));
   console.log("  " + versionStamp("native"));
   console.log("");
-  console.log("  Now try, in Claude:");
-  console.log(`     "${IDEAS[0]}"`);
+  if (dir) {
+    console.log("  Open your project in an editor (an AI coding agent like Claude works too —");
+    console.log("  same idea, different hands on the keyboard):");
+    for (const line of editorOpenLines(dir)) console.log(`     ${line}`);
+    console.log("");
+  }
+  console.log("  Keep THIS terminal open — it's your live build/status feed, the fastest way to");
+  console.log("  see a problem the moment it happens. Need the command line for something else?");
+  console.log("  Open a NEW terminal window rather than closing this one.");
   console.log("");
-  console.log("  More ideas: tot ideas");
+  console.log("  Best view: arrange this terminal, your Developer Cockpit, the local preview,");
+  console.log("  and your editor so you can see all four at once — site, cockpit, build status,");
+  console.log("  and code, together.");
   console.log("");
 }