getmyenv 0.3.2 → 0.3.4

package/dist/commands/token.js

@@ -1,8 +1,8 @@
+import { exec } from "node:child_process";
 import pc from "picocolors";
-import { promptConfirm, promptHidden, readProjectMeta } from "../lib/fs.js";
-import { clearAllCredentials, credentialsFilePath, findTokenByNameOrId, readCredentialsV1, readCredentialsV2, removeTokenEntry, setDefaultProject, upsertTokenEntry, } from "../lib/credentials.js";
-import { clearWrappedKey } from "../lib/pek.js";
-import { ApiClient, resolveApiUrl } from "../lib/api.js";
+import { readLine, readProjectMeta } from "../lib/fs.js";
+import { clearFolderToken, readFolderToken, tokenFilePath, writeFolderToken, } from "../lib/credentials.js";
+import { ApiClient, resolveApiUrl, } from "../lib/api.js";
 import { linkCommand } from "./link.js";
 function maskToken(token) {
     const t = token.trim();
@@ -10,65 +10,19 @@ function maskToken(token) {
         return "****";
     return `${t.slice(0, 4)}…${t.slice(-4)}`;
 }
-export function tokenListCommand() {
-    const store = readCredentialsV2();
-    const v1 = readCredentialsV1();
-    console.log(pc.bold("\ngetmyenv token list\n"));
-    console.log(pc.dim(`File: ${credentialsFilePath()}\n`));
-    if (!store || Object.keys(store.tokens).length === 0) {
-        if (v1) {
-            console.log(pc.yellow("Legacy credentials (v1) present. Run token or any command to migrate via whoami.\n"));
-            console.log(`  Token: ${maskToken(v1.token)}`);
-            if (v1.apiUrl)
-                console.log(`  API:   ${v1.apiUrl}`);
-            console.log("");
-            return;
-        }
-        console.log(pc.dim("No saved tokens. Run: npx getmyenv token\n"));
-        return;
-    }
-    const defaultId = store.default != null ? String(store.default) : undefined;
-    for (const [id, entry] of Object.entries(store.tokens)) {
-        const mark = defaultId === id ? "*" : " ";
-        console.log(`${mark} ${id}  ${entry.projectName}  ${entry.cliScope}  ${maskToken(entry.token)}`);
-        if (entry.apiUrl)
-            console.log(pc.dim(`    API: ${entry.apiUrl}`));
-    }
-    console.log("");
-    if (defaultId) {
-        console.log(pc.dim(`Default: ${defaultId} (*). Use: token use <name|id>\n`));
-    }
+function openBrowser(url) {
+    const platform = process.platform;
+    const cmd = platform === "win32"
+        ? `start "" "${url}"`
+        : platform === "darwin"
+            ? `open "${url}"`
+            : `xdg-open "${url}"`;
+    exec(cmd, () => undefined);
 }
-export function tokenUseCommand(nameOrId) {
-    console.log(pc.bold("\ngetmyenv token use\n"));
-    const match = findTokenByNameOrId(nameOrId.trim());
-    if (!match) {
-        throw new Error(`No saved token matches "${nameOrId}". Run: npx getmyenv token list`);
-    }
-    setDefaultProject(match.projectId);
-    console.log(`${pc.green("✓")} Default token: ${match.entry.projectName} (${match.projectId}, ${match.entry.cliScope})\n`);
+function sleep(ms) {
+    return new Promise((resolve) => setTimeout(resolve, ms));
 }
-/**
- * Paste and save a per-project CLI token. Not a full account login.
- */
-export async function tokenCommand(opts = {}) {
-    console.log(pc.bold("\ngetmyenv token\n"));
-    console.log(pc.dim("Saves a per-project CLI token on this machine. Not a full account login.\n"));
-    const store = readCredentialsV2();
-    const count = store ? Object.keys(store.tokens).length : 0;
-    if (count > 0) {
-        console.log(pc.dim(`${count} token(s) already saved. New token will be added.\n`));
-        console.log(pc.dim("Use token list / token use to switch. token remove --project to remove.\n"));
-    }
-    console.log(pc.dim("Create a per-project token on the dashboard CLI page (Development or Production), then paste it here."));
-    console.log("");
-    const token = (await promptHidden("Paste per-project CLI token: ")).trim();
-    if (!token) {
-        throw new Error("No token entered.");
-    }
-    const apiUrl = opts.apiUrl?.trim() ||
-        process.env.GETMYENV_API_URL?.trim() ||
-        resolveApiUrl(opts.apiUrl);
+async function saveVerifiedToken(token, apiUrl, opts) {
     const client = new ApiClient(apiUrl, token);
     let who;
     try {
@@ -79,110 +33,117 @@ export async function tokenCommand(opts = {}) {
         throw new Error(`Could not verify token: ${msg}`);
     }
     const scope = who.cliScope === "production" ? "production" : "development";
-    const file = upsertTokenEntry(who.projectId, {
+    const file = writeFolderToken({
         token,
         apiUrl,
-        projectName: who.projectName,
         cliScope: scope,
-    }, { setDefault: true });
-    console.log(`\n${pc.green("✓")} Saved to ${file}`);
+        projectId: who.projectId,
+        projectName: who.projectName,
+        label: who.label ?? undefined,
+    });
+    console.log(`\n${pc.green("✓")} Authorized this folder: ${file}`);
     console.log(pc.dim(`Token: ${who.label ?? scope} · ${who.projectName} · ${scope}`));
     console.log(pc.dim(`API: ${apiUrl}`));
     console.log(pc.dim(`Project: ${who.projectId}\n`));
     const meta = readProjectMeta();
-    if (!opts.skipLinkOffer && process.stdin.isTTY && !meta?.projectId) {
-        try {
-            const doLink = await promptConfirm("Link this folder to the token project?", {
-                defaultYes: true,
-            });
-            if (doLink) {
-                await linkCommand(undefined, { apiUrl });
-                return;
-            }
-        }
-        catch {
-            console.log(pc.dim("Run: npx getmyenv link\n"));
-        }
+    if (!opts.skipLinkOffer && !meta?.projectId) {
+        // First-time in this folder: link now so verbs work without another prompt.
+        await linkCommand(undefined, { apiUrl, skipPushOffer: true, force: true });
+        return;
     }
-    if (!opts.skipLinkOffer) {
-        console.log("Next: npx getmyenv link   then   npx getmyenv run -- <cmd>\n");
+    console.log("Next: npx getmyenv run -- <cmd>\n");
+}
+async function tokenViaPaste(opts, apiUrl) {
+    const cliPage = `${apiUrl.replace(/\/$/, "")}/cli`;
+    console.log(pc.dim(`Create or copy a token: ${cliPage}`));
+    console.log("");
+    const token = (await readLine("Paste per-project CLI token: ")).trim();
+    if (!token) {
+        throw new Error("No token entered.");
     }
+    await saveVerifiedToken(token, apiUrl, opts);
 }
-export async function tokenRemoveCommand(opts = {}) {
-    console.log(pc.bold("\ngetmyenv token remove\n"));
-    if (opts.all) {
-        if (process.stdin.isTTY) {
-            const ok = await promptConfirm("Remove all saved CLI tokens?", {
-                defaultYes: false,
-            });
-            if (!ok) {
-                console.log(pc.dim("Kept credentials.\n"));
-                return;
-            }
-        }
-        const path = credentialsFilePath();
-        if (clearAllCredentials()) {
-            console.log(`${pc.green("✓")} Cleared all credentials at ${path}`);
-        }
-        else {
-            console.log(pc.dim(`No credentials file at ${path}`));
-        }
-        if (opts.fresh) {
-            clearWrappedKey();
-            console.log(`${pc.green("✓")} Cleared local wrapped-key.json`);
-        }
-        console.log("");
-        return;
+async function tokenViaBrowser(opts, apiUrl) {
+    const client = new ApiClient(apiUrl);
+    let start;
+    try {
+        start = await client.request("POST", "/api/cli-auth/start");
     }
-    const meta = readProjectMeta();
-    let projectId;
-    if (opts.project?.trim()) {
-        const match = findTokenByNameOrId(opts.project.trim());
-        if (!match) {
-            throw new Error(`No saved token matches "${opts.project}". Run: npx getmyenv token list`);
-        }
-        projectId = match.projectId;
+    catch (err) {
+        const msg = err instanceof Error ? err.message : String(err);
+        console.log(pc.yellow(`Browser sign-in unavailable (${msg}).`));
+        console.log(pc.dim("Falling back to paste.\n"));
+        await tokenViaPaste(opts, apiUrl);
+        return;
     }
-    else if (meta?.projectId) {
-        projectId = String(meta.projectId);
+    console.log("Open this URL to authorize the CLI (sign in, pick a project):\n");
+    console.log(`  ${start.verifyUrl}\n`);
+    if (process.stdin.isTTY) {
+        openBrowser(start.verifyUrl);
+        console.log(pc.dim("Opened in your browser. Waiting...\n"));
     }
     else {
-        const store = readCredentialsV2();
-        const ids = store ? Object.keys(store.tokens) : [];
-        if (ids.length === 1) {
-            projectId = ids[0];
-        }
-        else if (store?.default != null && store.tokens[String(store.default)]) {
-            projectId = String(store.default);
+        console.log(pc.dim("Waiting for approval...\n"));
+    }
+    const deadline = new Date(start.expiresAt).getTime();
+    while (Date.now() < deadline) {
+        let poll;
+        try {
+            poll = await client.request("GET", `/api/cli-auth/poll?sessionId=${encodeURIComponent(start.sessionId)}`);
         }
-        else {
-            throw new Error("Specify which token to remove: token remove --project <name|id>, or token remove --all");
+        catch (err) {
+            const msg = err instanceof Error ? err.message : String(err);
+            throw new Error(`Could not poll CLI auth: ${msg}`);
         }
-    }
-    const store = readCredentialsV2();
-    const entry = store?.tokens[projectId];
-    const label = entry ? `${entry.projectName} (${projectId})` : projectId;
-    if (process.stdin.isTTY && !opts.project && meta?.projectId) {
-        const ok = await promptConfirm(`Remove saved token for ${label}?`, {
-            defaultYes: true,
-        });
-        if (!ok) {
-            console.log(pc.dim("Kept credentials.\n"));
+        if (poll.status === "approved" && poll.token) {
+            process.stdout.write("\n");
+            await saveVerifiedToken(poll.token, apiUrl, opts);
             return;
         }
+        if (poll.status === "denied") {
+            throw new Error("CLI authorization was denied in the browser.");
+        }
+        if (poll.status === "expired") {
+            throw new Error("CLI authorization expired. Run: npx getmyenv token");
+        }
+        const remaining = Math.max(0, Math.ceil((deadline - Date.now()) / 1000));
+        process.stdout.write(`\r${pc.dim(`Waiting... ${String(remaining).padStart(2, "0")}s`)}   `);
+        await sleep(2000);
     }
-    if (removeTokenEntry(projectId)) {
-        console.log(`${pc.green("✓")} Removed token for ${label}`);
+    process.stdout.write("\n");
+    throw new Error("CLI authorization timed out. Run: npx getmyenv token");
+}
+/**
+ * Authorize a per-project CLI token in this folder. Not a full account login.
+ * Default: browser flow. Use --paste to type/paste a token from /cli.
+ * Re-running overwrites the existing token in `.getmyenv/token.json`.
+ */
+export async function tokenCommand(opts = {}) {
+    console.log(pc.bold("\ngetmyenv token\n"));
+    console.log(pc.dim("Authorizes this folder with a per-project CLI token. Not a full account login.\n"));
+    const existing = readFolderToken();
+    if (existing) {
+        console.log(pc.dim(`Replacing existing token: ${existing.projectName} (${existing.cliScope}, ${maskToken(existing.token)}) at ${tokenFilePath()}\n`));
     }
-    else {
-        console.log(pc.dim(`No saved token for ${label}`));
+    const apiUrl = opts.apiUrl?.trim() ||
+        process.env.GETMYENV_API_URL?.trim() ||
+        resolveApiUrl(opts.apiUrl);
+    if (opts.paste || !process.stdin.isTTY) {
+        await tokenViaPaste(opts, apiUrl);
+        return;
     }
-    const linkedId = meta?.projectId != null ? String(meta.projectId) : null;
-    if (opts.fresh || (linkedId && linkedId === String(projectId))) {
-        if (clearWrappedKey()) {
-            console.log(`${pc.green("✓")} Cleared local wrapped-key.json`);
-        }
+    await tokenViaBrowser(opts, apiUrl);
+}
+/**
+ * Remove the token for this folder. Convenience alias for `link --clear`.
+ * Kept as a courtesy; the underlying store is one folder = one token.
+ */
+export async function tokenClearCommand() {
+    console.log(pc.bold("\ngetmyenv token clear\n"));
+    if (clearFolderToken()) {
+        console.log(`${pc.green("✓")} Removed ${tokenFilePath()}\n`);
+        return;
     }
-    console.log("");
+    console.log(pc.dim("No token in this folder.\n"));
 }
 //# sourceMappingURL=token.js.map

package/dist/commands/token.js.map

@@ -1 +1 @@
-{"version":3,"file":"token.js","sourceRoot":"","sources":["../../src/commands/token.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"token.js","sourceRoot":"","sources":["../../src/commands/token.ts"],"names":[],"mappings":"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"}

package/dist/commands/whoami.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"whoami.d.ts","sourceRoot":"","sources":["../../src/commands/whoami.ts"],"names":[],"mappings":"AAeA,KAAK,UAAU,GAAG;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB,CAAC;AAQF,wBAAsB,aAAa,CAAC,IAAI,GAAE,UAAe,GAAG,OAAO,CAAC,IAAI,CAAC,CAsDxE"}
+{"version":3,"file":"whoami.d.ts","sourceRoot":"","sources":["../../src/commands/whoami.ts"],"names":[],"mappings":"AAaA,KAAK,UAAU,GAAG;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB,CAAC;AAQF,wBAAsB,aAAa,CAAC,IAAI,GAAE,UAAe,GAAG,OAAO,CAAC,IAAI,CAAC,CAmCxE"}

package/dist/commands/whoami.js

@@ -1,5 +1,5 @@
 import pc from "picocolors";
-import { credentialsFilePath, readCredentialsV1, readCredentialsV2, resolveStoredToken, } from "../lib/credentials.js";
+import { readFolderToken, tokenFilePath, } from "../lib/credentials.js";
 import { readProjectMeta } from "../lib/fs.js";
 import { ApiClient, ensureSessionToken, resolveApiUrl, } from "../lib/api.js";
 function maskToken(token) {
@@ -10,14 +10,12 @@ function maskToken(token) {
 }
 export async function whoamiCommand(opts = {}) {
     console.log(pc.bold("\ngetmyenv whoami\n"));
-    const meta = readProjectMeta();
-    const token = await ensureSessionToken(meta?.projectId);
-    const apiUrl = resolveApiUrl(opts.apiUrl, meta?.projectId);
+    const token = await ensureSessionToken();
+    const apiUrl = resolveApiUrl(opts.apiUrl);
     const client = new ApiClient(apiUrl, token);
     const who = await client.request("GET", "/api/cli/whoami");
-    const resolved = resolveStoredToken(meta?.projectId);
-    const store = readCredentialsV2();
-    const v1 = readCredentialsV1();
+    const folder = readFolderToken();
+    const meta = readProjectMeta();
     console.log(`Token label:  ${who.label ?? who.cliScope}`);
     console.log(`Token scope:  ${who.cliScope}`);
     console.log(`Project:      ${who.projectName} (${who.projectId})`);
@@ -29,22 +27,13 @@ export async function whoamiCommand(opts = {}) {
     }
     console.log(`defaultEnv:   ${meta?.defaultEnv ?? who.cliScope}`);
     console.log(`API:          ${apiUrl}`);
-    console.log(`Credentials:  ${credentialsFilePath()}`);
+    console.log(`Auth:         ${tokenFilePath()}`);
     if (process.env.GETMYENV_TOKEN?.trim()) {
         console.log(pc.dim("Source:       GETMYENV_TOKEN"));
     }
-    else if (resolved) {
-        console.log(pc.dim(`Source:       ${resolved.source}${resolved.projectId ? ` (${resolved.projectId})` : ""}`));
-        if (resolved.token) {
-            console.log(pc.dim(`Token:        ${maskToken(resolved.token)}`));
-        }
-    }
-    if (store) {
-        const n = Object.keys(store.tokens).length;
-        console.log(pc.dim(`Saved tokens: ${n}`));
-    }
-    else if (v1) {
-        console.log(pc.dim("Saved tokens: legacy v1 (migrate on next token)"));
+    else if (folder) {
+        console.log(pc.dim(`Source:       folder token`));
+        console.log(pc.dim(`Token:        ${maskToken(folder.token)}`));
     }
     console.log("");
 }

package/dist/commands/whoami.js.map

@@ -1 +1 @@
-{"version":3,"file":"whoami.js","sourceRoot":"","sources":["../../src/commands/whoami.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"whoami.js","sourceRoot":"","sources":["../../src/commands/whoami.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,YAAY,CAAC;AAC5B,OAAO,EACL,eAAe,EACf,aAAa,GACd,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAC/C,OAAO,EACL,SAAS,EACT,kBAAkB,EAClB,aAAa,GAEd,MAAM,eAAe,CAAC;AAMvB,SAAS,SAAS,CAAC,KAAa;IAC9B,MAAM,CAAC,GAAG,KAAK,CAAC,IAAI,EAAE,CAAC;IACvB,IAAI,CAAC,CAAC,MAAM,IAAI,CAAC;QAAE,OAAO,MAAM,CAAC;IACjC,OAAO,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;AAC3C,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,aAAa,CAAC,OAAmB,EAAE;IACvD,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAC,CAAC;IAE5C,MAAM,KAAK,GAAG,MAAM,kBAAkB,EAAE,CAAC;IACzC,MAAM,MAAM,GAAG,aAAa,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAC1C,MAAM,MAAM,GAAG,IAAI,SAAS,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;IAC5C,MAAM,GAAG,GAAG,MAAM,MAAM,CAAC,OAAO,CAAiB,KAAK,EAAE,iBAAiB,CAAC,CAAC;IAE3E,MAAM,MAAM,GAAG,eAAe,EAAE,CAAC;IACjC,MAAM,IAAI,GAAG,eAAe,EAAE,CAAC;IAE/B,OAAO,CAAC,GAAG,CAAC,iBAAiB,GAAG,CAAC,KAAK,IAAI,GAAG,CAAC,QAAQ,EAAE,CAAC,CAAC;IAC1D,OAAO,CAAC,GAAG,CAAC,iBAAiB,GAAG,CAAC,QAAQ,EAAE,CAAC,CAAC;IAC7C,OAAO,CAAC,GAAG,CAAC,iBAAiB,GAAG,CAAC,WAAW,KAAK,GAAG,CAAC,SAAS,GAAG,CAAC,CAAC;IACnE,IAAI,IAAI,EAAE,SAAS,EAAE,CAAC;QACpB,OAAO,CAAC,GAAG,CACT,iBAAiB,IAAI,CAAC,WAAW,IAAI,IAAI,CAAC,SAAS,GACjD,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,MAAM,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,aAC1D,EAAE,CACH,CAAC;IACJ,CAAC;SAAM,CAAC;QACN,OAAO,CAAC,GAAG,CAAC,sBAAsB,CAAC,CAAC;IACtC,CAAC;IACD,OAAO,CAAC,GAAG,CAAC,iBAAiB,IAAI,EAAE,UAAU,IAAI,GAAG,CAAC,QAAQ,EAAE,CAAC,CAAC;IACjE,OAAO,CAAC,GAAG,CAAC,iBAAiB,MAAM,EAAE,CAAC,CAAC;IACvC,OAAO,CAAC,GAAG,CAAC,iBAAiB,aAAa,EAAE,EAAE,CAAC,CAAC;IAEhD,IAAI,OAAO,CAAC,GAAG,CAAC,cAAc,EAAE,IAAI,EAAE,EAAE,CAAC;QACvC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,8BAA8B,CAAC,CAAC,CAAC;IACtD,CAAC;SAAM,IAAI,MAAM,EAAE,CAAC;QAClB,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,4BAA4B,CAAC,CAAC,CAAC;QAClD,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,iBAAiB,SAAS,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,CAAC;IAClE,CAAC;IAED,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;AAClB,CAAC"}

package/dist/lib/api.d.ts

@@ -2,9 +2,9 @@
  * CLI API client. Never logs response bodies that may contain ciphertext details
  * beyond what is needed; never prints secret plaintext.
  */
-import { clearAllCredentials, credentialsFilePath, readCredentialsV2, resolveStoredToken, upsertTokenEntry, type CliScope } from "./credentials.js";
+import { type CliScope } from "./credentials.js";
 /** Keep in sync with packages/cli/package.json version. */
-export declare const CLI_VERSION = "0.3.0";
+export declare const CLI_VERSION = "0.3.4";
 export type WhoamiResponse = {
     projectId: string;
     projectName: string;
@@ -12,10 +12,8 @@ export type WhoamiResponse = {
     label: string | null;
     allowedCidrs?: string[];
 };
-/** Resolve API base: env → CLI override → selected token → production. */
-export declare function resolveApiUrl(cliOverride?: string, preferredProjectId?: string | number | null): string;
-/** @deprecated Use resolveApiUrl() - kept for callers that read at module load. */
-export declare const API_URL_DEFAULT: string;
+/** Resolve API base: CLI override → env var → folder token/meta → production. */
+export declare function resolveApiUrl(cliOverride?: string, _hint?: unknown): string;
 export declare class ApiClient {
     private baseUrl;
     private token?;
@@ -23,12 +21,14 @@ export declare class ApiClient {
     private headers;
     request<T>(method: string, path: string, body?: unknown, extraHeaders?: Record<string, string>): Promise<T>;
 }
-/** Env / store only (no prompt). Prefer ensureSessionToken for interactive commands. */
-export declare function getSessionToken(preferredProjectId?: string | number | null): string | undefined;
+/** Env / folder token only (no prompt). Prefer ensureSessionToken for interactive commands. */
+export declare function getSessionToken(): string | undefined;
+/** True when the folder is already authorized (env or .getmyenv/token.json). */
+export declare function hasSessionToken(): boolean;
 /**
- * Env → credentials map (linked / default) → migrate v1 → interactive paste (TTY).
- * Non-TTY without a token throws with token instructions.
+ * Env → folder token. When missing, TTY runs the browser auth flow (via tokenCommand)
+ * and writes `.getmyenv/token.json`. Non-TTY throws.
  */
-export declare function ensureSessionToken(preferredProjectId?: string | number | null): Promise<string>;
-export { clearAllCredentials as clearCredentials, credentialsFilePath, readCredentialsV2, resolveStoredToken, upsertTokenEntry, };
+export declare function ensureSessionToken(_hint?: unknown): Promise<string>;
+export { readFolderToken, writeFolderToken, tokenFilePath, } from "./credentials.js";
 //# sourceMappingURL=api.d.ts.map

package/dist/lib/api.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"api.d.ts","sourceRoot":"","sources":["../../src/lib/api.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAIH,OAAO,EACL,mBAAmB,EACnB,mBAAmB,EAGnB,iBAAiB,EACjB,kBAAkB,EAClB,gBAAgB,EAChB,KAAK,QAAQ,EACd,MAAM,kBAAkB,CAAC;AAE1B,2DAA2D;AAC3D,eAAO,MAAM,WAAW,UAAU,CAAC;AAInC,MAAM,MAAM,cAAc,GAAG;IAC3B,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,MAAM,CAAC;IACpB,QAAQ,EAAE,QAAQ,CAAC;IACnB,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IACrB,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC;CACzB,CAAC;AAEF,0EAA0E;AAC1E,wBAAgB,aAAa,CAC3B,WAAW,CAAC,EAAE,MAAM,EACpB,kBAAkB,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,GAC1C,MAAM,CAUR;AAED,mFAAmF;AACnF,eAAO,MAAM,eAAe,QAAkB,CAAC;AAE/C,qBAAa,SAAS;IAElB,OAAO,CAAC,OAAO;IACf,OAAO,CAAC,KAAK,CAAC;gBADN,OAAO,EAAE,MAAM,EACf,KAAK,CAAC,EAAE,MAAM,YAAA;IAGxB,OAAO,CAAC,OAAO;IAWT,OAAO,CAAC,CAAC,EACb,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,MAAM,EACZ,IAAI,CAAC,EAAE,OAAO,EACd,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GACpC,OAAO,CAAC,CAAC,CAAC;CAmBd;AA6BD,wFAAwF;AACxF,wBAAgB,eAAe,CAC7B,kBAAkB,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,GAC1C,MAAM,GAAG,SAAS,CAIpB;AAED;;;GAGG;AACH,wBAAsB,kBAAkB,CACtC,kBAAkB,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,GAC1C,OAAO,CAAC,MAAM,CAAC,CAoDjB;AAED,OAAO,EACL,mBAAmB,IAAI,gBAAgB,EACvC,mBAAmB,EACnB,iBAAiB,EACjB,kBAAkB,EAClB,gBAAgB,GACjB,CAAC"}
+{"version":3,"file":"api.d.ts","sourceRoot":"","sources":["../../src/lib/api.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAIH,OAAO,EAGL,KAAK,QAAQ,EAEd,MAAM,kBAAkB,CAAC;AAE1B,2DAA2D;AAC3D,eAAO,MAAM,WAAW,UAAU,CAAC;AAInC,MAAM,MAAM,cAAc,GAAG;IAC3B,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,MAAM,CAAC;IACpB,QAAQ,EAAE,QAAQ,CAAC;IACnB,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IACrB,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC;CACzB,CAAC;AAEF,iFAAiF;AACjF,wBAAgB,aAAa,CAAC,WAAW,CAAC,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,OAAO,GAAG,MAAM,CAU3E;AAED,qBAAa,SAAS;IAElB,OAAO,CAAC,OAAO;IACf,OAAO,CAAC,KAAK,CAAC;gBADN,OAAO,EAAE,MAAM,EACf,KAAK,CAAC,EAAE,MAAM,YAAA;IAGxB,OAAO,CAAC,OAAO;IAWT,OAAO,CAAC,CAAC,EACb,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,MAAM,EACZ,IAAI,CAAC,EAAE,OAAO,EACd,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GACpC,OAAO,CAAC,CAAC,CAAC;CAmBd;AAED,+FAA+F;AAC/F,wBAAgB,eAAe,IAAI,MAAM,GAAG,SAAS,CAIpD;AAED,gFAAgF;AAChF,wBAAgB,eAAe,IAAI,OAAO,CAEzC;AAED;;;GAGG;AACH,wBAAsB,kBAAkB,CACtC,KAAK,CAAC,EAAE,OAAO,GACd,OAAO,CAAC,MAAM,CAAC,CAsBjB;AAED,OAAO,EACL,eAAe,EACf,gBAAgB,EAChB,aAAa,GACd,MAAM,kBAAkB,CAAC"}

package/dist/lib/api.js

@@ -3,26 +3,26 @@
  * beyond what is needed; never prints secret plaintext.
  */
 import pc from "picocolors";
-import { promptHidden, readProjectMeta } from "./fs.js";
-import { clearAllCredentials, credentialsFilePath, migrateV1ToV2, readCredentialsV1, readCredentialsV2, resolveStoredToken, upsertTokenEntry, } from "./credentials.js";
+import { readProjectMeta } from "./fs.js";
+import { readFolderToken, } from "./credentials.js";
 /** Keep in sync with packages/cli/package.json version. */
-export const CLI_VERSION = "0.3.0";
+export const CLI_VERSION = "0.3.4";
 const PRODUCTION_API = "https://getmyenv.com";
-/** Resolve API base: env → CLI override → selected token → production. */
-export function resolveApiUrl(cliOverride, preferredProjectId) {
+/** Resolve API base: CLI override → env var → folder token/meta → production. */
+export function resolveApiUrl(cliOverride, _hint) {
     if (cliOverride?.trim())
         return cliOverride.trim();
     if (process.env.GETMYENV_API_URL?.trim()) {
         return process.env.GETMYENV_API_URL.trim();
     }
-    const linked = preferredProjectId ?? readProjectMeta()?.projectId ?? null;
-    const resolved = resolveStoredToken(linked);
-    if (resolved?.apiUrl)
-        return resolved.apiUrl;
+    const token = readFolderToken();
+    if (token?.apiUrl)
+        return token.apiUrl;
+    const meta = readProjectMeta();
+    if (meta?.apiUrl)
+        return meta.apiUrl;
     return PRODUCTION_API;
 }
-/** @deprecated Use resolveApiUrl() - kept for callers that read at module load. */
-export const API_URL_DEFAULT = resolveApiUrl();
 export class ApiClient {
     baseUrl;
     token;
@@ -64,83 +64,42 @@ export class ApiClient {
         return (await res.json());
     }
 }
-/**
- * Try to upgrade a leftover v1 credentials file via whoami.
- * Leaves v1 in place (and returns its token) if whoami fails.
- */
-async function tryMigrateV1(apiUrlHint) {
-    const v1 = readCredentialsV1();
-    if (!v1)
-        return undefined;
-    const apiUrl = apiUrlHint?.trim() ||
-        process.env.GETMYENV_API_URL?.trim() ||
-        v1.apiUrl ||
-        PRODUCTION_API;
-    try {
-        const client = new ApiClient(apiUrl, v1.token);
-        const who = await client.request("GET", "/api/cli/whoami");
-        migrateV1ToV2({
-            projectId: who.projectId,
-            projectName: who.projectName,
-            cliScope: who.cliScope,
-            apiUrl,
-        });
-        return v1.token;
-    }
-    catch {
-        return v1.token;
-    }
+/** Env / folder token only (no prompt). Prefer ensureSessionToken for interactive commands. */
+export function getSessionToken() {
+    const env = process.env.GETMYENV_TOKEN?.trim();
+    if (env)
+        return env;
+    return readFolderToken()?.token;
 }
-/** Env / store only (no prompt). Prefer ensureSessionToken for interactive commands. */
-export function getSessionToken(preferredProjectId) {
-    const linked = preferredProjectId ?? readProjectMeta()?.projectId ?? null;
-    return resolveStoredToken(linked)?.token;
+/** True when the folder is already authorized (env or .getmyenv/token.json). */
+export function hasSessionToken() {
+    return !!getSessionToken();
 }
 /**
- * Env → credentials map (linked / default) → migrate v1 → interactive paste (TTY).
- * Non-TTY without a token throws with token instructions.
+ * Env → folder token. When missing, TTY runs the browser auth flow (via tokenCommand)
+ * and writes `.getmyenv/token.json`. Non-TTY throws.
  */
-export async function ensureSessionToken(preferredProjectId) {
-    const linked = preferredProjectId ?? readProjectMeta()?.projectId ?? null;
-    const existing = resolveStoredToken(linked);
-    if (existing?.source === "v1") {
-        const migrated = await tryMigrateV1(existing.apiUrl);
-        if (migrated)
-            return migrated;
-    }
-    if (existing && existing.source !== "v1") {
+export async function ensureSessionToken(_hint) {
+    const env = process.env.GETMYENV_TOKEN?.trim();
+    if (env)
+        return env;
+    const existing = readFolderToken();
+    if (existing)
         return existing.token;
-    }
-    // v1 file with no resolve (shouldn't happen) or empty store
-    if (readCredentialsV1() && !readCredentialsV2()) {
-        const migrated = await tryMigrateV1();
-        if (migrated)
-            return migrated;
-    }
     if (!process.stdin.isTTY) {
-        throw new Error("No CLI token. Run: npx getmyenv token  (or set GETMYENV_TOKEN for CI)");
-    }
-    console.log(pc.dim("Create a token at https://getmyenv.com/cli (or your local /cli), then paste it."));
-    const token = (await promptHidden("Paste CLI token: ")).trim();
-    if (!token) {
-        throw new Error("No token entered. Run: npx getmyenv token");
-    }
-    const apiUrl = resolveApiUrl(undefined, linked);
-    try {
-        const client = new ApiClient(apiUrl, token);
-        const who = await client.request("GET", "/api/cli/whoami");
-        const file = upsertTokenEntry(who.projectId, {
-            token,
-            apiUrl,
-            projectName: who.projectName,
-            cliScope: who.cliScope,
-        });
-        console.log(`${pc.green("✓")} Saved CLI token to ${file}\n`);
+        throw new Error("No CLI token in this folder. Run: npx getmyenv token  (or set GETMYENV_TOKEN for CI)");
     }
-    catch {
-        throw new Error("Could not verify token. Check the token and API URL, then run: npx getmyenv token");
+    // Lazy import to avoid a cycle (token → link → api).
+    const { tokenCommand } = await import("../commands/token.js");
+    await tokenCommand({ skipLinkOffer: true });
+    const after = readFolderToken();
+    if (!after) {
+        throw new Error("Authorization did not complete. Run: npx getmyenv token");
     }
-    return token;
+    return after.token;
 }
-export { clearAllCredentials as clearCredentials, credentialsFilePath, readCredentialsV2, resolveStoredToken, upsertTokenEntry, };
+export { readFolderToken, writeFolderToken, tokenFilePath, } from "./credentials.js";
+// picocolors is referenced by callers; re-export nothing here.
+void pc;
+void {};
 //# sourceMappingURL=api.js.map