getmyenv 0.7.0 → 0.8.0

package/dist/commands/template.js

@@ -0,0 +1,75 @@
+import pc from "picocolors";
+import { knownKey, knownKeyFormatHint, linkDomain, parseTemplateRef, } from "@getmyenv/shared";
+import { promptHidden } from "../lib/fs.js";
+import { ApiClient, getSessionToken, resolveApiUrl } from "../lib/api.js";
+import { ensureTokenAndLink } from "../lib/bootstrap.js";
+import { resolveContext } from "../lib/context.js";
+import { assertWritable, uploadValues } from "../lib/upload.js";
+/** Load a public template by id or URL. No token needed. */
+export async function fetchTemplate(ref, apiUrl) {
+    const publicId = parseTemplateRef(ref);
+    if (!publicId) {
+        throw new Error(`Not a template id or link: ${ref}`);
+    }
+    const res = await new ApiClient(resolveApiUrl(apiUrl)).request("GET", `/api/templates/public/${publicId}`);
+    return res.template;
+}
+export function printTemplate(template) {
+    const n = template.keys.length;
+    console.error(`Template ${pc.bold(template.name)} ${pc.dim(`(${n} variable${n === 1 ? "" : "s"})`)}`);
+    if (template.description)
+        console.error(pc.dim(template.description));
+    console.error("");
+}
+/**
+ * Add the template's names to the linked project, then ask for each value
+ * that is still missing in the folder's default context. Enter skips one.
+ */
+export async function applyTemplate(template, opts) {
+    if (!getSessionToken())
+        throw new Error("Link this folder first: npx getmyenv start");
+    const apiUrl = resolveApiUrl(opts.apiUrl);
+    await new ApiClient(apiUrl, getSessionToken()).request("POST", "/api/cli/template", {
+        publicId: template.publicId,
+    });
+    const linked = await ensureTokenAndLink({ apiUrl, quiet: true });
+    const ctx = resolveContext(linked.who, linked.meta, undefined);
+    assertWritable(linked, ctx);
+    const status = new Map(linked.who.keys.map((k) => [k.name, k.status[ctx.slug] ?? "missing"]));
+    const todo = template.keys.filter((k) => (status.get(k.name) ?? "missing") === "missing");
+    if (todo.length === 0) {
+        console.error(`${pc.green("✓")} Every template variable has a value in ${ctx.slug}.`);
+        return { context: ctx.slug };
+    }
+    console.error(`Values for ${pc.bold(ctx.slug)}. Hidden as you type. Enter skips one.\n`);
+    const pairs = {};
+    for (const key of todo) {
+        const known = knownKey(key.name);
+        const description = key.description || known?.description;
+        const link = key.link || known?.docsUrl;
+        console.error(`${pc.bold(key.name)}${key.optional ? pc.dim(" (optional)") : ""}`);
+        if (description)
+            console.error(pc.dim(`  ${description}`));
+        if (link)
+            console.error(pc.dim(`  Get it on ${linkDomain(link) ?? link}: ${link}`));
+        const value = await promptHidden(`  ${key.name}: `);
+        if (value) {
+            const hint = knownKeyFormatHint(key.name, value);
+            if (hint)
+                console.error(pc.yellow(`  ${hint}`));
+            pairs[key.name] = value;
+        }
+        console.error("");
+    }
+    if (Object.keys(pairs).length > 0) {
+        const res = await uploadValues({ linked, context: ctx, pairs });
+        for (const name of res.set)
+            console.error(`${pc.green("✓")} ${name} ${pc.dim(`set in ${ctx.slug}`)}`);
+    }
+    const skipped = todo.filter((k) => !pairs[k.name]).map((k) => k.name);
+    if (skipped.length > 0) {
+        console.error(pc.dim(`No value yet: ${skipped.join(", ")}. Set later with npx getmyenv set NAME`));
+    }
+    console.error("");
+    return { context: ctx.slug };
+}

package/dist/commands/unlink.d.ts

@@ -6,4 +6,3 @@ export declare function unlinkCommand(opts: {
     apiUrl?: string;
     yes?: boolean;
 }): Promise<void>;
-//# sourceMappingURL=unlink.d.ts.map

package/dist/commands/unlink.js

@@ -3,8 +3,7 @@ import path from "node:path";
 import pc from "picocolors";
 import { getLocalDir, promptConfirm, readClaimFile, readProjectMeta } from "../lib/fs.js";
 import { clearFolderToken, readFolderToken } from "../lib/credentials.js";
-import { clearCachedKey } from "../lib/pek.js";
-import { clearCachedPek, keychainAccount } from "../lib/keychain.js";
+import { clearCachedKeys, keychainAccount } from "../lib/keychain.js";
 import { ApiClient, ApiError, resolveApiUrl } from "../lib/api.js";
 /**
  * Unlink this folder: revoke its token and remove local getmyenv files.
@@ -44,19 +43,17 @@ export async function unlinkCommand(opts) {
         }
     }
     const projectId = meta?.projectId ?? folder?.projectId;
-    if (projectId && (await clearCachedPek(keychainAccount(resolveApiUrl(opts.apiUrl), projectId)))) {
-        console.log(`${pc.green("✓")} Removed the unlocked key from the OS keychain`);
+    if (projectId && (await clearCachedKeys(keychainAccount(resolveApiUrl(opts.apiUrl), projectId)))) {
+        console.log(`${pc.green("✓")} Removed the unlocked keys from the OS keychain`);
     }
     if (clearFolderToken())
         console.log(`${pc.green("✓")} Removed token.json`);
-    if (clearCachedKey())
-        console.log(`${pc.green("✓")} Removed key.json`);
     if (fs.existsSync(projectFile)) {
         fs.unlinkSync(projectFile);
         console.log(`${pc.green("✓")} Removed project.json`);
     }
     if (readClaimFile()) {
-        console.log(pc.yellow("Kept claim.json. It is the only way to claim this guest project. Delete it if you do not need the project."));
+        console.log(pc.yellow("Kept claim.json. It holds the claim code and guest passphrase. Delete it if you do not need the project."));
     }
     try {
         const dir = getLocalDir();
@@ -67,4 +64,3 @@ export async function unlinkCommand(opts) {
         /* ignore */
     }
 }
-//# sourceMappingURL=unlink.js.map

package/dist/lib/api-url.d.ts

@@ -17,4 +17,3 @@ export declare function pickApiUrl(sources: {
     env?: string;
     tokenFile?: string;
 }): string;
-//# sourceMappingURL=api-url.d.ts.map

package/dist/lib/api-url.js

@@ -47,4 +47,3 @@ export function pickApiUrl(sources) {
     }
     return normalizeApiBase(raw);
 }
-//# sourceMappingURL=api-url.js.map

package/dist/lib/api.d.ts

@@ -2,8 +2,8 @@
  * CLI API client. Never prints plaintext values.
  */
 import type { NewMachinePolicy } from "@getmyenv/shared";
-/** Keep in sync with packages/cli/package.json version. */
-export declare const CLI_VERSION = "0.7.0";
+/** 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 type Protection = "open" | "locked";
 export type ValueStatus = "set" | "expiring_soon" | "expired" | "missing";
@@ -17,16 +17,19 @@ export type WhoamiResponse = {
     project: {
         id: string;
         name: string;
-        hasKey: boolean;
     };
+    /** A Vault password (or guest passphrase) is set for this token's holder. */
+    vaultSet: boolean;
     token: {
         kind: "folder" | "guest" | "server";
         label: string | null;
-        /** Server tokens: the one locked context they read. */
+        /** Server tokens: the one read-only context they read. */
         context: string | null;
         allowedCidrs: string[];
-        /** Server tokens: what happens when an untrusted machine reads. Missing on older servers. */
-        newMachinePolicy?: NewMachinePolicy | null;
+        /** Server tokens: what happens when an untrusted machine reads. Null for other tokens. */
+        newMachinePolicy: NewMachinePolicy | null;
+        /** Folder token of a member on a shared project. Sees only the contexts shared with them. */
+        member?: boolean;
     };
     user: {
         email: string;
@@ -51,6 +54,8 @@ export declare class ApiClient {
     private headers;
     request<T>(method: string, path: string, body?: unknown, extraHeaders?: Record<string, string>): Promise<T>;
 }
-/** Env / folder token only, no prompt. */
+/**
+ * Env / folder token only, no prompt. A server token is `auth.privateKey`:
+ * only the auth part is sent. The private key never leaves this machine.
+ */
 export declare function getSessionToken(): string | undefined;
-//# sourceMappingURL=api.d.ts.map

package/dist/lib/api.js

@@ -1,10 +1,11 @@
 /**
  * CLI API client. Never prints plaintext values.
  */
+import { createRequire } from "node:module";
 import { readFolderToken } from "./credentials.js";
 import { pickApiUrl } from "./api-url.js";
-/** Keep in sync with packages/cli/package.json version. */
-export const CLI_VERSION = "0.7.0";
+/** 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 class ApiError extends Error {
     status;
@@ -46,6 +47,8 @@ export class ApiClient {
                 method,
                 headers: this.headers(extraHeaders),
                 body: body === undefined ? undefined : JSON.stringify(body),
+                // The token must never follow a redirect to another host.
+                redirect: "error",
             });
         }
         catch {
@@ -68,11 +71,13 @@ export class ApiClient {
         return (await res.json());
     }
 }
-/** Env / folder token only, no prompt. */
+/**
+ * Env / folder token only, no prompt. A server token is `auth.privateKey`:
+ * only the auth part is sent. The private key never leaves this machine.
+ */
 export function getSessionToken() {
     const env = process.env.GETMYENV_TOKEN?.trim();
     if (env)
-        return env;
+        return env.split(".")[0];
     return readFolderToken()?.token;
 }
-//# sourceMappingURL=api.js.map

package/dist/lib/authorize.d.ts

@@ -13,4 +13,3 @@ export declare function sleep(ms: number): Promise<void>;
 export declare function authorizeFolder(opts?: {
     apiUrl?: string;
 }): Promise<WhoamiResponse>;
-//# sourceMappingURL=authorize.d.ts.map

package/dist/lib/authorize.js

@@ -62,7 +62,7 @@ async function saveVerifiedToken(token, apiUrl) {
 async function authorizeViaPaste(apiUrl) {
     const cliPage = `${apiUrl.replace(/\/$/, "")}/cli`;
     console.error(pc.dim(`Create or copy a folder token: ${cliPage}\n`));
-    const token = (await readLine("Paste CLI token: ")).trim();
+    const token = (await readLine("Paste the folder token: ")).trim();
     if (!token) {
         throw new Error("No token entered.");
     }
@@ -122,8 +122,7 @@ async function authorizeViaBrowser(apiUrl) {
  */
 export async function authorizeFolder(opts = {}) {
     if (!process.stdin.isTTY) {
-        throw new Error("No CLI token in this folder. Set GETMYENV_TOKEN for CI, or run in a terminal.");
+        throw new Error("No token in this folder. Run in a terminal to sign in, or set GETMYENV_TOKEN to a server token.");
     }
     return authorizeViaBrowser(resolveApiUrl(opts.apiUrl));
 }
-//# sourceMappingURL=authorize.js.map

package/dist/lib/bootstrap.d.ts

@@ -19,4 +19,3 @@ export declare function ensureTokenAndLink(opts?: {
     apiUrl?: string;
     quiet?: boolean;
 }): Promise<Linked>;
-//# sourceMappingURL=bootstrap.d.ts.map

package/dist/lib/bootstrap.js

@@ -1,6 +1,7 @@
 import pc from "picocolors";
 import { ensureGitignoreHasEnv, readClaimFile, readProjectMeta, writeProjectMeta, } from "./fs.js";
 import { ApiClient, ApiError, getSessionToken, resolveApiUrl, } from "./api.js";
+import { assertTokenNotCommitted } from "./credentials.js";
 export const NOT_LINKED_STEPS = [
     "This folder is not linked to a getmyenv project.",
     "Start in a terminal: npx getmyenv",
@@ -12,11 +13,11 @@ export function printGuestBanner(who) {
         return;
     const DAY = 24 * 60 * 60 * 1000;
     const expires = who.guestExpiresAt ? new Date(who.guestExpiresAt).getTime() : NaN;
-    const needClaim = readClaimFile() ? "" : " Needs .getmyenv/claim.json.";
+    const needClaim = readClaimFile() ? "" : " Needs the claim code and guest passphrase shown at creation.";
     const plural = (n) => (n === 1 ? "1 day" : `${n} days`);
     if (Number.isFinite(expires) && expires <= Date.now()) {
         const graceLeft = Math.max(0, Math.ceil((expires + 30 * DAY - Date.now()) / DAY));
-        console.error(pc.yellow(`Guest project expired. Read-only for ${plural(graceLeft)}. Export or claim it: npx getmyenv claim.${needClaim}\n`));
+        console.error(pc.yellow(`Guest project expired. Values can't change. run works for ${plural(graceLeft)} more. Export or claim it: npx getmyenv claim.${needClaim}\n`));
         return;
     }
     const daysLeft = Number.isFinite(expires) ? Math.max(0, Math.ceil((expires - Date.now()) / DAY)) : null;
@@ -55,6 +56,8 @@ export async function ensureTokenAndLink(opts = {}) {
     const token = getSessionToken();
     if (!token)
         throw new Error(NOT_LINKED_STEPS);
+    if (!process.env.GETMYENV_TOKEN?.trim())
+        assertTokenNotCommitted();
     const apiUrl = resolveApiUrl(opts.apiUrl);
     const client = new ApiClient(apiUrl, token);
     const who = await fetchWhoami(client);
@@ -79,4 +82,3 @@ export async function ensureTokenAndLink(opts = {}) {
     }
     return { who, apiUrl, token, client, meta };
 }
-//# sourceMappingURL=bootstrap.js.map

package/dist/lib/confirm.d.ts

@@ -14,4 +14,3 @@ export declare function confirmDiff(opts: {
     /** Skip the prompt when true (still returns false if conflicts and non-TTY without yes). */
     yes?: boolean;
 }): Promise<boolean>;
-//# sourceMappingURL=confirm.d.ts.map

package/dist/lib/confirm.js

@@ -23,4 +23,3 @@ export async function confirmDiff(opts) {
     }
     return promptConfirm(`${action}?`, { defaultYes: false });
 }
-//# sourceMappingURL=confirm.js.map

package/dist/lib/context.d.ts

@@ -8,5 +8,6 @@ export declare function defaultContextSlug(who: Pick<WhoamiResponse, "token" | "
 /** Find a context by slug, or by name ("Customer Acme" finds customer-acme). */
 export declare function findContext(contexts: ContextInfo[], input: string): ContextInfo | null;
 /** The context a command acts on. Throws with the available slugs when unknown. */
-export declare function resolveContext(who: Pick<WhoamiResponse, "token" | "contexts">, meta: ProjectMeta | null, explicit?: string): ContextInfo;
-//# sourceMappingURL=context.d.ts.map
+export declare function resolveContext(who: Pick<WhoamiResponse, "token" | "contexts"> & {
+    isGuest?: boolean;
+}, meta: ProjectMeta | null, explicit?: string): ContextInfo;

package/dist/lib/context.js

@@ -38,6 +38,8 @@ export function resolveContext(who, meta, explicit) {
         throw new Error(`This server token reads ${who.token.context ?? "one read-only context"} only.`);
     }
     const available = who.contexts.map((c) => c.slug).join(", ") || "none";
-    throw new Error(`No context "${wanted}". Available: ${available}\nCreate one: npx getmyenv context create "${wanted}"`);
+    const next = who.isGuest
+        ? "Guest projects have Development only. Claim it to add contexts: npx getmyenv claim"
+        : `Create one: npx getmyenv context create "${wanted}"`;
+    throw new Error(`No context "${wanted}". Available: ${available}\n${next}`);
 }
-//# sourceMappingURL=context.js.map

package/dist/lib/credentials.d.ts

@@ -1,3 +1,7 @@
+/** True when git tracks this file. False without git or outside a repo. */
+export declare function isTrackedByGit(file: string, cwd?: string): boolean;
+/** A committed token.json is readable by anyone with the repo. Refuse to use it. */
+export declare function assertTokenNotCommitted(cwd?: string): void;
 /**
  * Per-folder token stored in `.getmyenv/token.json` (gitignored).
  * One folder = one project = one token. What the token can reach is decided
@@ -19,4 +23,3 @@ export declare function writeFolderToken(entry: {
     addedAt?: string;
 }, cwd?: string): string;
 export declare function clearFolderToken(cwd?: string): boolean;
-//# sourceMappingURL=credentials.d.ts.map

package/dist/lib/credentials.js

@@ -1,7 +1,33 @@
+import { spawnSync } from "node:child_process";
 import fs from "node:fs";
 import path from "node:path";
-import { getLocalDir } from "./fs.js";
+import { getLocalDir, getProjectRoot } from "./fs.js";
 import { apiUrlForDisk } from "./api-url.js";
+/** True when git tracks this file. False without git or outside a repo. */
+export function isTrackedByGit(file, cwd = process.cwd()) {
+    try {
+        const res = spawnSync("git", ["ls-files", "--error-unmatch", "--", file], {
+            cwd: getProjectRoot(cwd),
+            stdio: "ignore",
+            timeout: 5000,
+        });
+        return res.status === 0;
+    }
+    catch {
+        return false;
+    }
+}
+/** A committed token.json is readable by anyone with the repo. Refuse to use it. */
+export function assertTokenNotCommitted(cwd = process.cwd()) {
+    const file = tokenFilePath(cwd);
+    if (fs.existsSync(file) && isTrackedByGit(file, cwd)) {
+        throw new Error([
+            ".getmyenv/token.json is committed to git. Anyone with the repo can use it.",
+            "Revoke it on the CLI page, then: git rm --cached .getmyenv/token.json",
+            "Then run: npx getmyenv unlink, and npx getmyenv",
+        ].join("\n"));
+    }
+}
 export function tokenFilePath(cwd = process.cwd()) {
     return path.join(getLocalDir(cwd), "token.json");
 }
@@ -51,6 +77,7 @@ export function writeFolderToken(entry, cwd = process.cwd()) {
     fs.writeFileSync(file, JSON.stringify(payload, null, 2) + "\n", {
         mode: 0o600,
     });
+    fs.chmodSync(file, 0o600);
     return file;
 }
 export function clearFolderToken(cwd = process.cwd()) {
@@ -60,4 +87,3 @@ export function clearFolderToken(cwd = process.cwd()) {
     fs.unlinkSync(file);
     return true;
 }
-//# sourceMappingURL=credentials.js.map

package/dist/lib/fs.d.ts

@@ -16,6 +16,13 @@ export declare function getProjectRoot(cwd?: string): string;
 export declare function getLocalDir(cwd?: string): string;
 export declare function readProjectMeta(cwd?: string): ProjectMeta | null;
 export declare function writeProjectMeta(meta: ProjectMeta, cwd?: string): void;
+/**
+ * Write a file only this user can read. Never through a symlink. A new file
+ * is created with `wx`; an existing one is replaced only when `overwrite`.
+ */
+export declare function writePrivateFile(file: string, content: string, opts: {
+    overwrite: boolean;
+}): void;
 /** OS user config for machine identity - never in the repo. */
 export declare function getConfigDir(): string;
 /**
@@ -24,13 +31,10 @@ export declare function getConfigDir(): string;
  */
 export declare function readLine(question: string): Promise<string>;
 /**
- * Read a secret from stdin (TTY-hidden, or piped via --vault-password-stdin).
- * Refuses to echo secrets on a non-TTY unless allowStdin is true.
+ * Read a secret at a terminal without echo. Refuses without a terminal.
  * Always restores stdin so a later promptConfirm / promptChoice can run.
  */
-export declare function promptHidden(question: string, opts?: {
-    allowStdin?: boolean;
-}): Promise<string>;
+export declare function promptHidden(question: string): Promise<string>;
 /** Yes/no on a TTY. Empty input picks the default, which is No unless `defaultYes`. */
 export declare function promptConfirm(question: string, opts?: {
     defaultYes?: boolean;
@@ -43,7 +47,7 @@ export declare function ensureGitignoreHas(file: string, cwd?: string): void;
 export type ClaimFile = {
     version: 1;
     claimCode: string;
-    /** Guest wrapping passphrase. Lives in the repo until claim. */
+    /** Guest wrapping passphrase. Local and gitignored until claim. */
     passphrase: string;
     projectId: string;
     projectName: string;
@@ -73,4 +77,3 @@ export declare function rootEnvFiles(cwd?: string): string[];
  * Sample files map to null too.
  */
 export declare function contextSlugFromEnvFile(filePath: string): string | null;
-//# sourceMappingURL=fs.d.ts.map

package/dist/lib/fs.js

@@ -67,6 +67,27 @@ export function writeProjectMeta(meta, cwd = process.cwd()) {
     };
     fs.writeFileSync(path.join(dir, "project.json"), JSON.stringify(payload, null, 2) + "\n", { mode: 0o600 });
 }
+/**
+ * Write a file only this user can read. Never through a symlink. A new file
+ * is created with `wx`; an existing one is replaced only when `overwrite`.
+ */
+export function writePrivateFile(file, content, opts) {
+    let stat = null;
+    try {
+        stat = fs.lstatSync(file);
+    }
+    catch {
+        /* does not exist */
+    }
+    if (stat?.isSymbolicLink())
+        throw new Error(`${file} is a symlink. Refusing to write through it.`);
+    if (stat && !stat.isFile())
+        throw new Error(`${file} is not a regular file.`);
+    if (stat && !opts.overwrite)
+        throw new Error(`${file} already exists. Pick another name with -o.`);
+    fs.writeFileSync(file, content, { mode: 0o600, flag: stat ? "w" : "wx" });
+    fs.chmodSync(file, 0o600);
+}
 /** OS user config for machine identity - never in the repo. */
 export function getConfigDir() {
     const base = process.env.GETMYENV_CONFIG_DIR?.trim() ||
@@ -75,11 +96,12 @@ export function getConfigDir() {
     return base;
 }
 /**
- * Leave stdin as we found it after raw-mode secret input: cooked mode, no
- * listeners, paused. A flowing stdin keeps the process alive and, in `run`,
- * reads keystrokes meant for the child. readline resumes it when needed.
+ * Leave stdin as we found it after raw-mode secret input: cooked mode, paused.
+ * A flowing stdin keeps the process alive and, in `run`, reads keystrokes meant
+ * for the child. readline resumes it when needed. Remove only our own listener:
+ * readline adds its keypress listener once per stream and never again.
  */
-function restoreStdinAfterRaw() {
+function restoreStdinAfterRaw(onData) {
     const stdin = process.stdin;
     try {
         stdin.setRawMode?.(false);
@@ -87,7 +109,8 @@ function restoreStdinAfterRaw() {
     catch {
         /* ignore */
     }
-    stdin.removeAllListeners("data");
+    if (onData)
+        stdin.removeListener("data", onData);
     stdin.pause();
 }
 /**
@@ -113,21 +136,13 @@ export function readLine(question) {
     });
 }
 /**
- * Read a secret from stdin (TTY-hidden, or piped via --vault-password-stdin).
- * Refuses to echo secrets on a non-TTY unless allowStdin is true.
+ * Read a secret at a terminal without echo. Refuses without a terminal.
  * Always restores stdin so a later promptConfirm / promptChoice can run.
  */
-export async function promptHidden(question, opts) {
+export async function promptHidden(question) {
     const stdin = process.stdin;
     if (!stdin.isTTY) {
-        if (!opts?.allowStdin) {
-            throw new Error("No terminal to ask for the Vault password. Unlock once in a terminal (open contexts stay unlocked for 8 hours), or pipe it with --vault-password-stdin. With set --stdin, send the password on the first line and the value after it.");
-        }
-        const chunks = [];
-        for await (const chunk of stdin) {
-            chunks.push(Buffer.isBuffer(chunk) ? chunk : Buffer.from(chunk));
-        }
-        return Buffer.concat(chunks).toString("utf8").replace(/\r?\n$/, "");
+        throw new Error("No terminal to ask for the Vault password. Unlock once in a terminal: open contexts stay unlocked for 8 hours. On servers and in CI, use a server token.");
     }
     // Prompts go to stderr so stdout stays clean for `export --stdout > .env` and pipes.
     const out = process.stderr;
@@ -141,13 +156,13 @@ export async function promptHidden(question, opts) {
                 return;
             for (const c of text) {
                 if (c === "\n" || c === "\r" || c === "\u0004") {
-                    restoreStdinAfterRaw();
+                    restoreStdinAfterRaw(onData);
                     out.write("\n");
                     resolve(value);
                     return;
                 }
                 if (c === "\u0003") {
-                    restoreStdinAfterRaw();
+                    restoreStdinAfterRaw(onData);
                     out.write("\n");
                     process.exitCode = 130;
                     reject(new Error("Cancelled."));
@@ -205,14 +220,14 @@ export async function promptChoice(question, options, defaultIndex = 0) {
 }
 export function ensureGitignoreHasEnv(cwd = process.cwd()) {
     const gi = path.join(getProjectRoot(cwd), ".gitignore");
-    // Ignore bearer + cached key only. project.json and claim.json are committed for handoff.
-    // claim.json holds the guest wrapping passphrase until claim - prefer private repos until then.
+    // project.json is committed so a clone knows its project. The token and the
+    // guest passphrase in claim.json stay on this machine.
     const entries = [
         ".env",
         ".env.local",
         ".env.*.local",
         ".getmyenv/token.json",
-        ".getmyenv/key.json",
+        ".getmyenv/claim.json",
     ];
     let content = fs.existsSync(gi) ? fs.readFileSync(gi, "utf8") : "";
     let changed = false;
@@ -276,6 +291,7 @@ export function writeClaimFile(data, cwd = process.cwd()) {
     fs.writeFileSync(file, JSON.stringify(payload, null, 2) + "\n", {
         mode: 0o600,
     });
+    fs.chmodSync(file, 0o600);
     return file;
 }
 export function clearClaimFile(cwd = process.cwd()) {
@@ -418,4 +434,3 @@ export function contextSlugFromEnvFile(filePath) {
     const slug = slugify(m[1]);
     return isValidContextSlug(slug) ? slug : null;
 }
-//# sourceMappingURL=fs.js.map

package/dist/lib/guest-key.d.ts

@@ -1,7 +1,8 @@
+/** Ask for a new Vault password twice. Same rule as the dashboard. */
+export declare function promptNewVaultPassword(): Promise<string>;
 export type ResolveVaultPasswordOpts = {
     /** From whoami / ensureTokenAndLink. */
     isGuest?: boolean;
-    vaultPasswordStdin?: boolean;
     /** Prompt label when a password is needed (unlock path). */
     prompt?: string;
     /**
@@ -10,7 +11,9 @@ export type ResolveVaultPasswordOpts = {
      */
     create?: boolean;
 };
-/** Password already read from stdin by the command (for example `set --stdin`). */
-export declare function presetVaultPassword(password: string): void;
+/**
+ * Guest projects wrap the guest private key with the passphrase in claim.json.
+ * Use that silently so guest, set and run need no Vault password prompt.
+ * Claimed projects prompt for the Vault password in a terminal.
+ */
 export declare function resolveVaultPassword(opts: ResolveVaultPasswordOpts): Promise<string>;
-//# sourceMappingURL=guest-key.d.ts.map

package/dist/lib/guest-key.js

@@ -1,46 +1,38 @@
+import { VAULT_PASSWORD_HELP, validateVaultPassword } from "@getmyenv/shared";
 import { promptHidden, readClaimFile } from "./fs.js";
+/** Ask for a new Vault password twice. Same rule as the dashboard. */
+export async function promptNewVaultPassword() {
+    if (process.stdin.isTTY)
+        console.error(VAULT_PASSWORD_HELP);
+    const password = await promptHidden("New Vault password (hidden): ");
+    if (!password)
+        throw new Error("Vault password required.");
+    const check = validateVaultPassword(password);
+    if (!check.ok)
+        throw new Error(check.error ?? VAULT_PASSWORD_HELP);
+    const confirm = await promptHidden("Confirm Vault password (hidden): ");
+    if (password !== confirm)
+        throw new Error("Passwords did not match.");
+    return password;
+}
 /**
- * Guest projects wrap the PEK with the passphrase in claim.json.
+ * Guest projects wrap the guest private key with the passphrase in claim.json.
  * Use that silently so guest, set and run need no Vault password prompt.
- * Claimed / human projects still prompt for the Vault password.
+ * Claimed projects prompt for the Vault password in a terminal.
  */
-let presetPassword = null;
-/** Password already read from stdin by the command (for example `set --stdin`). */
-export function presetVaultPassword(password) {
-    presetPassword = password;
-}
 export async function resolveVaultPassword(opts) {
-    if (!opts.isGuest && presetPassword)
-        return presetPassword;
     if (opts.isGuest) {
         const claim = readClaimFile();
         if (claim?.passphrase) {
             return claim.passphrase;
         }
-        throw new Error("Guest project is missing .getmyenv/claim.json. Restore it from your repo or a copy.");
-    }
-    if (opts.create) {
-        const password = await promptHidden("New Vault password (hidden): ", {
-            allowStdin: opts.vaultPasswordStdin,
-        });
-        if (!password) {
-            throw new Error("Vault password required.");
-        }
-        if (opts.vaultPasswordStdin) {
-            return password;
-        }
-        const confirm = await promptHidden("Confirm Vault password (hidden): ");
-        if (password !== confirm) {
-            throw new Error("Passwords did not match.");
-        }
-        return password;
+        throw new Error("Guest project is missing .getmyenv/claim.json. Run it from the folder that created the project, or run: npx getmyenv claim");
     }
-    const password = await promptHidden(opts.prompt ?? "Vault password (hidden): ", {
-        allowStdin: opts.vaultPasswordStdin,
-    });
+    if (opts.create)
+        return promptNewVaultPassword();
+    const password = await promptHidden(opts.prompt ?? "Vault password (hidden): ");
     if (!password) {
         throw new Error("Vault password required.");
     }
     return password;
 }
-//# sourceMappingURL=guest-key.js.map