getmyenv 0.9.6 → 0.9.8

package/README.md

@@ -35,7 +35,7 @@ Prompts and status lines go to stderr, so `export --stdout > .env` stays clean.
 Commit `.getmyenv/project.json`. `token.json` and `claim.json` stay local and are gitignored.
 
 <!-- cli:help -->
-Output of `npx getmyenv --help` (0.9.6):
+Output of `npx getmyenv --help` (0.9.8):
 
 ```text
 Usage: getmyenv [options] [command]

package/dist/commands/guest.d.ts

@@ -13,4 +13,6 @@ export declare function createGuestProject(opts?: GuestOpts): Promise<{
     projectName: string;
     guestExpiresAt: string;
 }>;
+/** The steps printed after guest, in plain text. Runtime first, export only as an alternative. */
+export declare function guestNextLines(): string[];
 export declare function guestCommand(opts?: GuestOpts): Promise<void>;

package/dist/commands/guest.js

@@ -2,6 +2,7 @@ import { randomBytes } from "node:crypto";
 import path from "node:path";
 import pc from "picocolors";
 import { createUserKeys, wipe } from "@getmyenv/crypto";
+import { FACTS } from "@getmyenv/shared";
 import { ensureGitignoreHasEnv, readProjectMeta, writeClaimFile, writeProjectMeta, } from "../lib/fs.js";
 import { readFolderToken, writeFolderToken } from "../lib/credentials.js";
 import { ApiClient, resolveApiUrl } from "../lib/api.js";
@@ -56,17 +57,38 @@ export async function createGuestProject(opts = {}) {
         console.error(`  ${pc.dim("Guest passphrase:")} ${passphrase}\n`);
     }
     else {
-        console.error(pc.dim("claim.json holds the claim code and guest passphrase. It is the only copy. Keep it private.\n"));
+        console.error(pc.dim(`claim.json holds the claim code and guest passphrase. It is the only copy. Keep it private. ${FACTS.claimLoss}\n`));
     }
     return created;
 }
+/** The steps printed after guest, in plain text. Runtime first, export only as an alternative. */
+export function guestNextLines() {
+    return [
+        "Next:",
+        "  npx getmyenv import            # from .env",
+        "  npx getmyenv set API_KEY       # or one at a time",
+        "  npx getmyenv run -- npm start  # your start command, no .env file on disk",
+        "  npx getmyenv claim             # keep it, with an account",
+        "",
+        "Only if a tool needs a .env file:",
+        "  npx getmyenv export            # writes a plaintext .env",
+        "",
+        `For AI agents: ${FACTS.agentRunOrExport}`,
+    ];
+}
+function colorNextLine(line) {
+    const hash = line.indexOf("# ");
+    if (line.startsWith("  npx ") && hash > 0) {
+        return pc.cyan(line.slice(0, hash)) + pc.dim(line.slice(hash));
+    }
+    if (line.startsWith("For AI agents:"))
+        return pc.dim(line);
+    return line;
+}
 export async function guestCommand(opts = {}) {
     console.error(pc.bold("\ngetmyenv guest\n"));
     await createGuestProject(opts);
-    console.error("Next:");
-    console.error(pc.cyan("  npx getmyenv import            ") + pc.dim("# from .env"));
-    console.error(pc.cyan("  npx getmyenv set API_KEY       ") + pc.dim("# or one at a time"));
-    console.error(pc.cyan("  npx getmyenv run -- npm start  ") + pc.dim("# your start command"));
-    console.error(pc.cyan("  npx getmyenv claim             ") + pc.dim("# keep it, with an account"));
+    for (const line of guestNextLines())
+        console.error(colorNextLine(line));
     console.error("");
 }

package/dist/lib/api.d.ts

@@ -5,6 +5,7 @@ import type { NewMachinePolicy } from "@getmyenv/shared";
 /** From package.json, which ships with the package: src/lib and dist/lib are both two levels down. */
 export declare const CLI_VERSION: string;
 export { isDefaultApiUrl, parseSafeUrl } from "./api-url.js";
+export declare const API_TIMEOUT_MS = 30000;
 export type Protection = "open" | "locked";
 export type ValueStatus = "set" | "expiring_soon" | "expired" | "missing";
 export type ContextInfo = {

package/dist/lib/api.js

@@ -7,6 +7,7 @@ import { pickApiUrl } from "./api-url.js";
 /** From package.json, which ships with the package: src/lib and dist/lib are both two levels down. */
 export const CLI_VERSION = createRequire(import.meta.url)("../../package.json").version;
 export { isDefaultApiUrl, parseSafeUrl } from "./api-url.js";
+export const API_TIMEOUT_MS = 30_000;
 export class ApiError extends Error {
     status;
     constructor(message, status) {
@@ -49,10 +50,11 @@ export class ApiClient {
                 body: body === undefined ? undefined : JSON.stringify(body),
                 // The token must never follow a redirect to another host.
                 redirect: "error",
+                signal: AbortSignal.timeout(API_TIMEOUT_MS),
             });
         }
-        catch {
-            throw new ApiError(`Could not reach ${this.baseUrl}`, 0);
+        catch (err) {
+            throw networkError(err, `Could not reach ${this.baseUrl}`);
         }
         if (!res.ok) {
             let serverMessage;
@@ -70,8 +72,19 @@ export class ApiClient {
         }
         if (res.status === 204)
             return undefined;
-        return (await res.json());
+        try {
+            return (await res.json());
+        }
+        catch (err) {
+            throw networkError(err, `The connection to ${this.baseUrl} closed before the answer arrived. Try again in a moment.`);
+        }
+    }
+}
+function networkError(err, fallback) {
+    if (err instanceof Error && err.name === "TimeoutError") {
+        return new ApiError(`The getmyenv server did not answer within ${API_TIMEOUT_MS / 1000} seconds. Try again in a moment.`, 0);
     }
+    return new ApiError(fallback, 0);
 }
 /**
  * Env / folder token only, no prompt. A server token is `auth.privateKey`:

package/dist/lib/bootstrap.js

@@ -35,8 +35,8 @@ export async function fetchWhoami(client) {
         }
         if (err instanceof ApiError && err.status === 401) {
             throw new Error(process.env.GETMYENV_TOKEN?.trim()
-                ? `${err.message}\nGETMYENV_TOKEN no longer works. Create a new token in Project settings, Tokens.`
-                : `${err.message}\nThis folder's token no longer works. Run: npx getmyenv unlink, then npx getmyenv`);
+                ? "GETMYENV_TOKEN no longer works. It was revoked or expired. Create a new token in Project settings, Tokens."
+                : "This folder's token no longer works. It was revoked or expired. Run: npx getmyenv unlink, then npx getmyenv");
         }
         throw err;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "getmyenv",
-  "version": "0.9.6",
+  "version": "0.9.8",
   "description": "CLI for getmyenv, an encrypted store for environment variables and secrets. We store ciphertext only.",
   "type": "module",
   "bin": {
@@ -34,7 +34,7 @@
   },
   "dependencies": {
     "@getmyenv/crypto": "0.4.1",
-    "@getmyenv/shared": "0.8.2",
+    "@getmyenv/shared": "0.8.4",
     "@napi-rs/keyring": "^2.1.0",
     "commander": "^15.0.0",
     "dotenv": "^16.4.7",