@tinycloud/cli 1.3.5-beta.7 → 1.3.5-beta.8

package/dist/courier-entry.js

@@ -899,10 +899,14 @@ import { TinyCloudNode, DelegatedAccess, NodeWasmBindings, activateValidatedRunt
 // ../courier/dist/profile.js
 import fs from "fs";
 import path from "path";
-import os from "os";
 import { randomBytes } from "crypto";
 function profileDir() {
-  return process.env.COURIER_HOME || path.join(os.homedir(), ".courier");
+  if (process.env.COURIER_HOME)
+    return process.env.COURIER_HOME;
+  const home = process.env.HOME;
+  if (!home)
+    throw new CourierError("home-unset", "HOME is not set. Set HOME or COURIER_HOME to choose where Courier stores its state.");
+  return path.join(home, ".courier");
 }
 function profilePath(name2, home = profileDir()) {
   return path.join(home, name2);
@@ -2258,7 +2262,7 @@ import path3 from "path";
 
 // ../courier/dist/guard/paths.js
 import fs2 from "fs";
-import os2 from "os";
+import os from "os";
 import path2 from "path";
 var CREDENTIAL_SUBSTRINGS = [
   ".config/gh",
@@ -2407,7 +2411,7 @@ function installRoots(entry) {
 function protectedSet(home, entry, extra = {}) {
   return {
     roots: [path2.resolve(home), ...installRoots(entry)],
-    homes: [.../* @__PURE__ */ new Set([os2.homedir(), ...extra.agentHome ? [extra.agentHome] : []])]
+    homes: [.../* @__PURE__ */ new Set([os.homedir(), ...extra.agentHome ? [extra.agentHome] : []])]
   };
 }
 function isProtectedRead(file, cwd, set) {
@@ -4943,7 +4947,7 @@ function analyzeScript(text, parent, inexact) {
 
 // ../courier/dist/guard/install.js
 import fs4 from "fs";
-import os3 from "os";
+import os2 from "os";
 import path6 from "path";
 import { createHash } from "crypto";
 var CREDENTIAL_FILES = [".config/gh/**", ".npmrc", ".netrc", ".ssh/**", ".aws/**", ".config/gcloud/**", ".docker/config.json", ".config/wrangler/**", ".config/.wrangler/**", ".git-credentials"];
@@ -4985,7 +4989,7 @@ var GATED_DENY = [
 ].map((prefix) => `Bash(${prefix}:*)`);
 var PRIVILEGE_DENY = ["sudo", "su", "doas", "pkexec", "tmux", "screen", "crontab", "systemctl", "ssh", "gh auth", "git credential", "secret-tool"].map((prefix) => `Bash(${prefix}:*)`);
 var shq = (s) => `'${s.replace(/'/g, `'\\''`)}'`;
-function hookCommand(argv, home, realHome = os3.homedir()) {
+function hookCommand(argv, home, realHome = os2.homedir()) {
   return `COURIER_HOME=${shq(home)} COURIER_REAL_HOME=${shq(realHome)} ${argv.map(shq).join(" ")} || exit 2`;
 }
 var guardDir = (home) => path6.join(home, "guard");
@@ -5008,7 +5012,7 @@ function guardSettings(options) {
   for (const f of ["key.json", "grant.json"])
     deny2.push(`Read(${rulePath(path6.join(home, f))})`);
   for (const rel of CREDENTIAL_FILES)
-    deny2.push(`Read(${rulePath(path6.join(os3.homedir(), rel))})`);
+    deny2.push(`Read(${rulePath(path6.join(os2.homedir(), rel))})`);
   for (const prog of programs)
     for (const sub2 of ["pair", "revoke", "init", "pause", "resume", "watch"])
       deny2.push(`Bash(${prog} ${sub2}:*)`);
@@ -5188,7 +5192,7 @@ function courierEnvOverrides(base, home, extra = []) {
 // ../courier/dist/wake.js
 import { spawn } from "child_process";
 import fs7 from "fs";
-import os4 from "os";
+import os3 from "os";
 import path9 from "path";
 
 // ../courier/dist/guard/cleanhome.js
@@ -5567,7 +5571,7 @@ function createWaker(config, deps) {
     if (cwd === courier || cwd.startsWith(`${courier}${path9.sep}`))
       throw new Error("agent cwd must be outside the Courier tree");
     prepareCleanHome({
-      realHome: config.realHome ?? env.HOME ?? os4.homedir(),
+      realHome: config.realHome ?? env.HOME ?? os3.homedir(),
       cleanHome: agentHome(config.home),
       claude: config.adapter !== "exec"
     });
@@ -5659,7 +5663,7 @@ ${UNGUARDED_NOTICE}.`
     }
     const existing = agents.find((a) => typeof a.id === "string" && typeof a.provider === "string" && isClaudeProvider(a.provider) && typeof a.cwd === "string" && sameDir(a.cwd, config.cwd))?.id;
     if (existing) {
-      const dir = fs7.mkdtempSync(path9.join(os4.tmpdir(), "courier-wake-"));
+      const dir = fs7.mkdtempSync(path9.join(os3.tmpdir(), "courier-wake-"));
       const file = path9.join(dir, "prompt.txt");
       try {
         fs7.writeFileSync(file, prompt(request), { mode: 384 });
@@ -5803,7 +5807,7 @@ function createNotifier(config, deps) {
 
 // ../courier/dist/commands.js
 import fs9 from "fs";
-import os5 from "os";
+import os4 from "os";
 import path11 from "path";
 import { NodeWasmBindings as NodeWasmBindings2, activateValidatedRuntimeDelegation as activateValidatedRuntimeDelegation2, deserializeDelegation as deserializeDelegation2, serializeDelegation as serializeDelegation2 } from "@tinycloud/node-sdk";
 
@@ -6273,7 +6277,7 @@ async function cmdInit(args) {
     version: 3,
     host,
     openkeyHost,
-    label: labelFlag ?? `courier \xB7 ${os5.hostname()}`,
+    label: labelFlag ?? `courier \xB7 ${os4.hostname()}`,
     ...handleFlag ? { selfHandle: handleFlag } : {},
     courierDid: bareDid(key.did),
     status: "awaiting-grant",
@@ -6847,7 +6851,7 @@ ${DEFAULT_ORDERS}`);
 
 // ../courier/dist/watch-cmd.js
 import fs13 from "fs";
-import os8 from "os";
+import os7 from "os";
 import path16 from "path";
 import { randomBytes as randomBytes2 } from "crypto";
 import { spawnSync as spawnSync4 } from "child_process";
@@ -8276,19 +8280,19 @@ var Watcher = class {
 
 // ../courier/dist/guard/command.js
 import fs11 from "fs";
-import os7 from "os";
+import os6 from "os";
 import path14 from "path";
 import { spawnSync as spawnSync3 } from "child_process";
 
 // ../courier/dist/broker-config.js
 import fs10 from "fs";
-import os6 from "os";
+import os5 from "os";
 import path12 from "path";
 var TEST_TOKEN = `ghp_${"d".repeat(36)}`;
 var ID = /^[a-f0-9]{24}$/;
 var PINNED = ["host", "openkeyHost", "spaceId", "ownerDid", "courierDid"];
 function brokerRoot(testOwnerRoot) {
-  const owner = os6.userInfo().homedir;
+  const owner = os5.userInfo().homedir;
   if (testOwnerRoot !== void 0) {
     const root = realpathBest(testOwnerRoot);
     const scratch = realpathBest(path12.join(owner, "scratch"));
@@ -8297,7 +8301,7 @@ function brokerRoot(testOwnerRoot) {
     }
     if (fs10.existsSync(root)) {
       const st = fs10.statSync(root);
-      if (st.uid !== os6.userInfo().uid || st.mode & 63)
+      if (st.uid !== os5.userInfo().uid || st.mode & 63)
         throw new CourierError("usage", "--test-owner-root must be owner-private (0700)");
     }
     const broker = realpathBest(path12.join(root, ".config/courier-broker"));
@@ -8353,7 +8357,7 @@ function loadBrokerConfig(id, testOwnerRoot) {
   try {
     for (const f of [path12.dirname(file), file]) {
       const st2 = fs10.lstatSync(f);
-      if (st2.isSymbolicLink() || st2.uid !== os6.userInfo().uid || st2.mode & 63)
+      if (st2.isSymbolicLink() || st2.uid !== os5.userInfo().uid || st2.mode & 63)
         throw Error("not owner-private");
     }
     const config = JSON.parse(fs10.readFileSync(file, "utf8"));
@@ -8506,8 +8510,8 @@ function realEnv(cwd, home = profileDir(), entry = process.argv[1] ?? "") {
     binaries: installed,
     resolveProgram: (word, dir) => binaryName(word, dir, searchPath, installed),
     literals: [...installLiterals(home, entry), brokerRoot()],
-    protectedRoots: [home, brokerRoot(), path14.join(os7.homedir(), ".courier")],
-    realHome: process.env.COURIER_REAL_HOME || os7.userInfo().homedir,
+    protectedRoots: [home, brokerRoot(), path14.join(os6.homedir(), ".courier")],
+    realHome: process.env.COURIER_REAL_HOME || os6.userInfo().homedir,
     courierEntries: installed.filter((b) => b.path === realpathBest(entry) && ["courier", "tc"].includes(b.name)).map((b) => b.path),
     readFile(file) {
       try {
@@ -8578,10 +8582,10 @@ async function cmdGuard(args) {
     const input = JSON.parse(readStdin());
     const home = profileDir();
     const entry = process.argv[1] ?? "";
-    const realHome = process.env.COURIER_REAL_HOME || os7.homedir();
+    const realHome = process.env.COURIER_REAL_HOME || os6.homedir();
     const deps = {
       env: realEnv(process.cwd(), home, entry),
-      protectedSet: { ...protectedSet(home, entry, { agentHome: os7.homedir() }), roots: [...protectedSet(home, entry).roots, brokerRoot(), path14.join(os7.homedir(), ".courier")], homes: [.../* @__PURE__ */ new Set([realHome, os7.homedir()])], realHome }
+      protectedSet: { ...protectedSet(home, entry, { agentHome: os6.homedir() }), roots: [...protectedSet(home, entry).roots, brokerRoot(), path14.join(os6.homedir(), ".courier")], homes: [.../* @__PURE__ */ new Set([realHome, os6.homedir()])], realHome }
     };
     const timeout = new Promise((_, reject) => setTimeout(() => reject(new Error("timed out")), DEADLINE_MS).unref());
     const decision = await Promise.race([decide(input, deps), timeout]);
@@ -8950,7 +8954,7 @@ async function installService(args, config) {
     logFile: path16.join(profileDir(), `watch${name2 ? `-${name2}` : ""}.log`),
     name: name2
   };
-  const plan = launchd ? launchdPlan(spec, os8.homedir(), process.getuid?.() ?? 0) : systemdPlan(spec, os8.homedir());
+  const plan = launchd ? launchdPlan(spec, os7.homedir(), process.getuid?.() ?? 0) : systemdPlan(spec, os7.homedir());
   if (dry) {
     process.stdout.write(renderPlan(plan));
     return;
@@ -10752,7 +10756,7 @@ ${targetHelp()}`);
 // ../courier/dist/broker.js
 import { execFile } from "child_process";
 import fs18 from "fs";
-import os9 from "os";
+import os8 from "os";
 import path20 from "path";
 var MAX_OUTPUT = 4e3;
 var EXEC_TIMEOUT_MS = 12e4;
@@ -10761,7 +10765,7 @@ var validToken = (token2) => TOKEN.test(token2);
 async function loadBrokerCredential(config, exec = execFileRunner) {
   if (config.testToken === TEST_TOKEN)
     return { ghBin: config.ghBin, token: TEST_TOKEN };
-  const ownerHome = os9.userInfo().homedir;
+  const ownerHome = os8.userInfo().homedir;
   const result = await exec(config.ghBin, ["auth", "token", "--hostname", "github.com"], {
     cwd: ownerHome,
     timeoutMs: 1e4,
@@ -10982,8 +10986,11 @@ import { credentialRequirementDigest } from "@tinycloud/sdk-core";
 import fs19 from "fs";
 import path21 from "path";
 import { createHash as createHash4, randomBytes as randomBytes5 } from "crypto";
-import { createStoredCredentialRecord, credentialMatchesRequirement } from "@tinycloud/sdk-core";
+import { checkSecureDir, ensureSecureDir as ensureSecureDir2 } from "@tinycloud/node-sdk/credential-pending-store";
+import { verifyStoredEmailProof } from "@tinycloud/node-sdk/credentials";
+import { createStoredCredentialRecord, EMAIL_CREDENTIAL_MAX_AGE_SECONDS } from "@tinycloud/sdk-core";
 var DIR_NAME = "credentials";
+var EXPIRY_MARGIN_MS = 6e4;
 function credentialsDir(home) {
   return path21.join(home, DIR_NAME);
 }
@@ -11015,25 +11022,6 @@ function assertOwnedByCurrentUser(st, label2) {
     throw new CourierError("credential-permissions", `${label2} is not owned by the current user.`);
   }
 }
-function ensureSecureDir2(home) {
-  const dir = credentialsDir(home);
-  mkdirOwnerOnly(dir);
-  const st = fs19.lstatSync(dir);
-  if (!st.isDirectory())
-    throw new CourierError("credential-permissions", `${dir} must be a real directory, not a symlink or file.`);
-  assertOwnedByCurrentUser(st, dir);
-  fs19.chmodSync(dir, 448);
-}
-function checkSecureDir(home) {
-  const dir = credentialsDir(home);
-  const st = lstatOrUndefined2(dir);
-  if (!st)
-    return false;
-  if (!st.isDirectory())
-    throw new CourierError("credential-permissions", `${dir} must be a real directory, not a symlink or file.`);
-  assertOwnerOnly(st, dir, "0700");
-  return true;
-}
 function writeOwnerOnly(home, file, obj) {
   ensureSecureDir2(home);
   const existing = lstatOrUndefined2(file);
@@ -11094,8 +11082,10 @@ function removeFile(file) {
 }
 var StoredCredentialSource = class {
   home;
-  constructor(home = profileDir()) {
+  verify;
+  constructor(home = profileDir(), verify = verifyStoredEmailProof) {
     this.home = home;
+    this.verify = verify;
   }
   async find(input) {
     const file = credentialFile(this.home, input.holderDid, input.requirementDigest);
@@ -11103,26 +11093,48 @@ var StoredCredentialSource = class {
     if (!record)
       return void 0;
     const now = input.now ?? /* @__PURE__ */ new Date();
-    if (!credentialMatchesRequirement(input.requirement, record, input.holderDid, now)) {
+    const authenticatedAt = Math.max(Date.parse(record.issuedAt), Date.parse(record.notBefore));
+    try {
+      if (!Number.isFinite(authenticatedAt) || !Number.isFinite(Date.parse(record.expiresAt)))
+        throw new Error("stored record has no usable dates");
+      await this.verify({ record, requirement: input.requirement, holderDid: input.holderDid, now: new Date(authenticatedAt) });
+    } catch {
+      throw new CourierError("credential-record-invalid", "Stored credential failed offline verification and was not returned. Run `credential acquire` again.");
+    }
+    const expired = Date.parse(record.expiresAt) - EXPIRY_MARGIN_MS <= now.getTime();
+    const stale = now.getTime() - Date.parse(record.issuedAt) > EMAIL_CREDENTIAL_MAX_AGE_SECONDS * 1e3;
+    if (expired || stale) {
       removeFile(file);
       return void 0;
     }
     return record;
   }
   async store(input) {
-    const record = await createStoredCredentialRecord({
-      verified: input.verified,
+    const now = input.now ?? /* @__PURE__ */ new Date();
+    const base = await createStoredCredentialRecord({
+      verified: input.result.verified,
       ownerDid: input.holderDid,
       requirement: input.requirement,
       requirementDigest: input.requirementDigest,
-      storedAt: (input.now ?? /* @__PURE__ */ new Date()).toISOString()
+      storedAt: now.toISOString()
     });
+    const record = {
+      ...base,
+      subjectDid: input.result.envelope.subjectDid,
+      descriptor: input.result.descriptor
+    };
+    try {
+      await this.verify({ record, requirement: input.requirement, holderDid: input.holderDid, now });
+    } catch {
+      throw new CourierError("credential-record-invalid", "Issued credential failed offline verification and was not stored. Request a new code.");
+    }
     writeOwnerOnly(this.home, credentialFile(this.home, input.holderDid, input.requirementDigest), record);
     return record;
   }
 };
 
 // ../courier/dist/credential.js
+var CODE_WINDOW_MS = 5 * 6e4;
 var acquireUsage = () => `Usage: ${cmd("credential acquire --email <addr> [--code-stdin]")}`;
 var showUsage = () => `Usage: ${cmd("credential show --email <addr>")}`;
 var credentialUsage = () => `${acquireUsage()}
@@ -11188,7 +11200,9 @@ async function acquire(args, deps) {
       if (older && older.requestId !== pending2.requestId)
         await store.delete(older.requestId);
     });
-    deps.out(`Verification code sent to ${address}. Run \`${cmd(`credential acquire --email ${address} --code-stdin`)}\` and enter the code within 15 minutes.
+    const codeExpiresAt = new Date(Math.min(Date.parse(pending2.expiresAt), Date.parse(pending2.createdAt) + CODE_WINDOW_MS)).toISOString();
+    deps.out(JSON.stringify({ ok: true, status: "code-sent", address, codeExpiresAt }, null, 2) + "\n");
+    deps.err(`Verification code sent to ${address}. Run \`${cmd(`credential acquire --email ${address} --code-stdin`)}\` and enter the code within 5 minutes (before ${codeExpiresAt}).
 `);
     return;
   }
@@ -11216,15 +11230,19 @@ async function acquire(args, deps) {
   }
   const requirement = emailProofRequirement(address);
   const requirementDigest = await credentialRequirementDigest(requirement);
-  await new StoredCredentialSource(deps.home).store({
-    verified: result.verified,
-    requirement,
-    requirementDigest,
-    holderDid: holder.did,
-    now: deps.now()
-  });
-  await withStoreErrors(() => store.delete(pending.requestId));
-  deps.out(`Email credential stored for ${address}. It is valid for up to 1 hour from issuance.
+  try {
+    await new StoredCredentialSource(deps.home, deps.verifyStored).store({
+      result,
+      requirement,
+      requirementDigest,
+      holderDid: holder.did,
+      now: deps.now()
+    });
+  } finally {
+    await withStoreErrors(() => store.delete(pending.requestId));
+  }
+  deps.out(JSON.stringify({ ok: true, status: "acquired", address, issuedAt: result.issuedAt, expiresAt: result.expiresAt }, null, 2) + "\n");
+  deps.err(`Email credential stored for ${address}. Valid until ${result.expiresAt}.
 `);
 }
 async function show(args, deps) {
@@ -11232,7 +11250,7 @@ async function show(args, deps) {
   const holder = holderFor(deps.loadKey(deps.home));
   const requirement = emailProofRequirement(address);
   const requirementDigest = await credentialRequirementDigest(requirement);
-  const record = await new StoredCredentialSource(deps.home).find({
+  const record = await new StoredCredentialSource(deps.home, deps.verifyStored).find({
     requirement,
     requirementDigest,
     holderDid: holder.did,
@@ -11241,14 +11259,7 @@ async function show(args, deps) {
   if (!record) {
     throw new CourierError("credential.show.NOT_FOUND", `No valid stored email credential for ${address}. Run \`${cmd(`credential acquire --email ${address}`)}\`.`);
   }
-  deps.out([
-    `email: ${record.claims.email}`,
-    `credentialId: ${record.credentialId}`,
-    `issuedAt: ${record.issuedAt}`,
-    `expiresAt: ${record.expiresAt}`,
-    `status: ${record.status.method}`,
-    ""
-  ].join("\n"));
+  deps.out(JSON.stringify({ ok: true, address, credentialId: record.credentialId, issuedAt: record.issuedAt, expiresAt: record.expiresAt, status: record.status.method }, null, 2) + "\n");
 }
 async function cmdCredential(args, deps = {}) {
   const resolved = {
@@ -11258,9 +11269,13 @@ async function cmdCredential(args, deps = {}) {
     loadKey: deps.loadKey ?? ((home) => loadKey(home)),
     requestCode: deps.requestCode ?? requestEmailProofCode,
     completeProof: deps.completeProof ?? completeEmailProof,
+    verifyStored: deps.verifyStored,
     readStdinLine: deps.readStdinLine ?? readStdinFirstLine,
     out: deps.out ?? ((text) => {
       process.stdout.write(text);
+    }),
+    err: deps.err ?? ((text) => {
+      process.stderr.write(text);
     })
   };
   switch (args.positional[0]) {
@@ -11273,6 +11288,15 @@ async function cmdCredential(args, deps = {}) {
   }
 }
 
+// ../courier/dist/version.js
+import { readFileSync } from "fs";
+function courierVersion() {
+  const pkg = JSON.parse(readFileSync(new URL("../package.json", import.meta.url), "utf8"));
+  if (typeof pkg.version !== "string" || pkg.version === "")
+    throw new Error("courier package.json has no version");
+  return pkg.version;
+}
+
 // ../courier/dist/main.js
 function usage() {
   const name2 = programName();
@@ -11391,6 +11415,11 @@ api.openkey.so for openkey.so, otherwise the OpenKey host).
 async function run(argv) {
   const args = parseArgs(argv);
   const command = args.positional[0];
+  if (!command && args.has("version")) {
+    process.stdout.write(`${courierVersion()}
+`);
+    return;
+  }
   if (command === "request" && args.has("help")) {
     process.stdout.write(requestHelp());
     return;