libretto 0.6.12 → 0.6.14

package/src/cli/commands/browser.ts

@@ -11,7 +11,7 @@ import {
 } from "../core/browser.js";
 import { resolveProviderName } from "../core/providers/index.js";
 import { readLibrettoConfig } from "../core/config.js";
-import { createLoggerForSession, withSessionLogger } from "../core/context.js";
+import { createLoggerForSession } from "../core/context.js";
 import { librettoCommand } from "../../shared/package-manager.js";
 import {
   type SessionAccessMode,
@@ -20,7 +20,7 @@ import {
   validateSessionName,
 } from "../core/session.js";
 import { warnIfInstalledSkillOutOfDate } from "../core/skill-version.js";
-import { SimpleCLI } from "../framework/simple-cli.js";
+import { SimpleCLI } from "affordance";
 import {
   sessionOption,
   withAutoSession,
@@ -63,8 +63,8 @@ function resolveRequestedSessionMode(
 
 export const openInput = SimpleCLI.input({
   positionals: [
-    SimpleCLI.positional("url", z.string().optional(), {
-      help: "URL to open",
+    SimpleCLI.positional("url", z.string().default("about:blank"), {
+      help: "URL to open (defaults to about:blank)",
     }),
   ],
   named: {
@@ -92,10 +92,6 @@ export const openInput = SimpleCLI.input({
     }),
   },
 })
-  .refine(
-    (input) => Boolean(input.url),
-    `Usage: ${librettoCommand("open <url> [--headless] [--read-only|--write-access] [--auth-profile <domain>] [--viewport WxH] [--session <name>]")}`,
-  )
   .refine(
     (input) => !(input.headed && input.headless),
     "Cannot pass both --headed and --headless.",
@@ -119,7 +115,7 @@ export const openCommand = SimpleCLI.command({
     if (providerName === "local") {
       const headed = input.headed || !input.headless;
       const viewport = parseViewportArg(input.viewport);
-      await runOpen(input.url!, headed, ctx.session, ctx.logger, {
+      await runOpen(input.url, headed, ctx.session, ctx.logger, {
         viewport,
         accessMode: resolveRequestedSessionMode(
           input.readOnly,
@@ -130,7 +126,7 @@ export const openCommand = SimpleCLI.command({
       });
     } else {
       await runOpenWithProvider(
-        input.url!,
+        input.url,
         providerName,
         ctx.session,
         ctx.logger,
@@ -295,9 +291,3 @@ export const browserCommands = {
   "session-mode": sessionModeCommand,
   close: closeCommand,
 };
-
-export async function runClose(session: string): Promise<void> {
-  await withSessionLogger(session, async (logger) => {
-    await runCloseWithLogger(session, logger);
-  });
-}

package/src/cli/commands/deploy.ts

@@ -1,8 +1,12 @@
 import { randomBytes } from "node:crypto";
 import { z } from "zod";
-import { HOSTED_API_URL } from "../core/auth-fetch.js";
+import {
+  orpcCall,
+  resolveApiUrl,
+} from "../core/auth-fetch.js";
 import { buildHostedDeployTarball } from "../core/deploy-artifact.js";
-import { SimpleCLI } from "../framework/simple-cli.js";
+import { readAuthState } from "../core/auth-storage.js";
+import { SimpleCLI } from "affordance";
 
 type DeploymentStatus = "building" | "ready" | "failed";
 
@@ -19,37 +23,50 @@ function generateDeploymentName(): string {
   return `deploy-${Date.now().toString(36)}-${randomBytes(4).toString("hex")}`;
 }
 
-function getConfig() {
-  const apiKey = process.env.LIBRETTO_API_KEY;
+function deployApiKeyRequiredMessage(hasStoredSession: boolean): string {
+  if (hasStoredSession) {
+    return [
+      "LIBRETTO_API_KEY is required to deploy to Libretto Cloud.",
+      "You are logged in locally, but deploy endpoints require API-key auth.",
+      "  • Generate a key: run `libretto cloud auth api-key issue --label <label>`.",
+      "  • Add it to your project .env file: `LIBRETTO_API_KEY=<issued-key>`.",
+    ].join("\n");
+  }
+
+  return [
+    "LIBRETTO_API_KEY is required to deploy to Libretto Cloud.",
+    "No local cloud session was found.",
+    "  • New account: run `libretto cloud auth signup`, then verify your email.",
+    "  • Existing account: run `libretto cloud auth login`.",
+    "  • Generate a key: run `libretto cloud auth api-key issue --label <label>`.",
+    "  • Add it to your project .env file: `LIBRETTO_API_KEY=<issued-key>`.",
+  ].join("\n");
+}
+
+async function requireDeployApiKey() {
+  const apiKey = process.env.LIBRETTO_API_KEY?.trim();
 
   if (!apiKey) {
-    throw new Error(
-      "LIBRETTO_API_KEY environment variable is required.",
-    );
+    throw new Error(deployApiKeyRequiredMessage(await hasStoredCloudSession()));
   }
 
-  return { apiUrl: HOSTED_API_URL, apiKey };
+  return {
+    apiUrl: resolveApiUrl(null),
+    credential: { source: "env-api-key" as const, apiKey },
+  };
 }
 
-async function postJson(
-  apiUrl: string,
-  apiKey: string,
-  path: string,
-  input: Record<string, unknown> = {},
-): Promise<Response> {
-  return fetch(`${apiUrl}${path}`, {
-    method: "POST",
-    headers: {
-      "x-api-key": apiKey,
-      "Content-Type": "application/json",
-    },
-    body: JSON.stringify({ json: input }),
-  });
+async function hasStoredCloudSession(): Promise<boolean> {
+  try {
+    return Boolean((await readAuthState())?.session);
+  } catch {
+    return false;
+  }
 }
 
 async function pollDeployment(
   apiUrl: string,
-  apiKey: string,
+  credential: { source: "env-api-key"; apiKey: string },
   deploymentId: string,
   pollIntervalMs: number,
   maxWaitMs: number,
@@ -68,18 +85,14 @@ async function pollDeployment(
 
     await new Promise((r) => setTimeout(r, pollIntervalMs));
 
-    const res = await postJson(apiUrl, apiKey, "/v1/deployments/sync", {
-      id: deploymentId,
+    deployment = await orpcCall<DeploymentResponse["json"]>({
+      apiUrl,
+      path: "/v1/deployments/sync",
+      input: { id: deploymentId },
+      credential,
     });
-    const body = (await res.json()) as DeploymentResponse;
-    if (res.status !== 200) {
-      throw new Error(
-        `Failed to sync deployment status (${res.status}): ${JSON.stringify(body)}`,
-      );
-    }
-    status = body.json.status;
-    workflows = body.json.workflows;
-    deployment = body.json;
+    status = deployment.status;
+    workflows = deployment.workflows;
     if (status === "ready" && readyAt === null) readyAt = Date.now();
     process.stdout.write(".");
   }
@@ -132,11 +145,10 @@ export const deployInput = SimpleCLI.input({
 
 export const deployCommand = SimpleCLI.command({
   description: "Deploy workflows to the hosted platform",
-  experimental: true,
 })
   .input(deployInput)
   .handle(async ({ input }) => {
-    const { apiUrl, apiKey } = getConfig();
+    const { apiUrl, credential } = await requireDeployApiKey();
     const deploymentName = generateDeploymentName();
 
     // Hosted deploy uploads a generated artifact with a deploy entrypoint and
@@ -157,20 +169,14 @@ export const deployCommand = SimpleCLI.command({
     if (input.description) createPayload.description = input.description;
 
     console.log("Uploading deployment...");
-    const res = await postJson(
+    const body = await orpcCall<DeploymentResponse["json"]>({
       apiUrl,
-      apiKey,
-      "/v1/deployments/create",
-      createPayload,
-    );
-    const body = (await res.json()) as DeploymentResponse;
-    if (res.status !== 200) {
-      throw new Error(
-        `Failed to create deployment (${res.status}): ${JSON.stringify(body)}`,
-      );
-    }
+      path: "/v1/deployments/create",
+      input: createPayload,
+      credential,
+    });
 
-    const { deployment_id, status } = body.json;
+    const { deployment_id, status } = body;
     console.log(`Deployment created: ${deployment_id}`);
     console.log(`Status: ${status}`);
 
@@ -178,7 +184,7 @@ export const deployCommand = SimpleCLI.command({
       process.stdout.write("Waiting for build");
       const deployment = await pollDeployment(
         apiUrl,
-        apiKey,
+        credential,
         deployment_id,
         10_000,
         5 * 60 * 1000,

package/src/cli/commands/execution.ts

@@ -29,7 +29,10 @@ import { warnIfInstalledSkillOutOfDate } from "../core/skill-version.js";
 import { readLibrettoConfig } from "../core/config.js";
 import { librettoCommand } from "../../shared/package-manager.js";
 import { renderSnapshotDiff } from "../../shared/snapshot/diff-snapshots.js";
-import { resolveProviderName } from "../core/providers/index.js";
+import {
+  getProviderStartupTimeoutMs,
+  resolveProviderName,
+} from "../core/providers/index.js";
 import { getAbsoluteIntegrationPath } from "../core/workflow-runtime.js";
 import {
   compileExecFunction,
@@ -49,7 +52,7 @@ import {
 } from "../core/telemetry.js";
 import type { SessionAccessMode } from "../../shared/state/index.js";
 import type { Experiments } from "../core/experiments.js";
-import { SimpleCLI } from "../framework/simple-cli.js";
+import { SimpleCLI } from "affordance";
 import {
   pageOption,
   sessionOption,
@@ -609,7 +612,7 @@ async function runIntegrationFromFile(
     },
     logger,
     logPath: runLogPath,
-    startupTimeoutMs: 60_000,
+    startupTimeoutMs: getProviderStartupTimeoutMs(args.providerName),
     handlers,
   });
 

package/src/cli/commands/experiments.ts

@@ -8,7 +8,7 @@ import {
   type ExperimentName,
   type Experiments,
 } from "../core/experiments.js";
-import { SimpleCLI } from "../framework/simple-cli.js";
+import { SimpleCLI } from "affordance";
 
 const experimentNames = Object.keys(EXPERIMENTS) as ExperimentName[];
 

package/src/cli/commands/setup.ts

@@ -1,382 +1,14 @@
-import { createInterface } from "node:readline";
 import { cpSync, existsSync, readdirSync, rmSync } from "node:fs";
 import { spawnSync } from "node:child_process";
 import { basename, dirname, join } from "node:path";
 import { fileURLToPath } from "node:url";
-import { writeSnapshotModel } from "../core/config.js";
 import {
   ensureLibrettoSetup,
   LIBRETTO_CONFIG_PATH,
   REPO_ROOT,
 } from "../core/context.js";
-import {
-  type AiSetupStatus,
-  DEFAULT_SNAPSHOT_MODELS,
-  resolveAiSetupStatus,
-} from "../core/ai-model.js";
-import {
-  detectProjectPackageManager,
-  installCommand,
-  librettoCommand,
-} from "../../shared/package-manager.js";
-import type { Provider } from "../core/resolve-model.js";
-import { SimpleCLI } from "../framework/simple-cli.js";
-
-const PROVIDER_SDK_PACKAGES: Record<Provider, string> = {
-  openai: "@ai-sdk/openai",
-  anthropic: "@ai-sdk/anthropic",
-  google: "@ai-sdk/google",
-  vertex: "@ai-sdk/google-vertex",
-  openrouter: "@ai-sdk/openai",
-};
-
-function isSdkInstalled(sdkPackage: string): boolean {
-  try {
-    const result = spawnSync("node", ["-e", `require.resolve("${sdkPackage}")`], {
-      cwd: REPO_ROOT,
-      stdio: "pipe",
-    });
-    return result.status === 0;
-  } catch {
-    return false;
-  }
-}
-
-function installSdkIfNeeded(provider: Provider): void {
-  const sdkPackage = PROVIDER_SDK_PACKAGES[provider];
-  if (isSdkInstalled(sdkPackage)) return;
-
-  const pkgManager = detectProjectPackageManager();
-  const cmd = installCommand(pkgManager);
-  console.log(`\nInstalling ${sdkPackage}...`);
-  const result = spawnSync(cmd, [sdkPackage], {
-    cwd: REPO_ROOT,
-    stdio: "inherit",
-    shell: true,
-  });
-  if (result.status === 0) {
-    console.log(`✓ Installed ${sdkPackage}`);
-  } else {
-    console.error(
-      `✗ Failed to install ${sdkPackage}. Install it manually: ${cmd} ${sdkPackage}`,
-    );
-  }
-}
-
-export type ProviderChoice = {
-  key: string;
-  label: string;
-  provider: Provider;
-  envVar: string;
-  envHint: string;
-};
-
-export const PROVIDER_CHOICES: ProviderChoice[] = [
-  {
-    key: "1",
-    label: "OpenAI",
-    provider: "openai",
-    envVar: "OPENAI_API_KEY",
-    envHint: "Get your key at https://platform.openai.com/api-keys",
-  },
-  {
-    key: "2",
-    label: "Anthropic",
-    provider: "anthropic",
-    envVar: "ANTHROPIC_API_KEY",
-    envHint: "Get your key at https://console.anthropic.com/settings/keys",
-  },
-  {
-    key: "3",
-    label: "Google Gemini",
-    provider: "google",
-    envVar: "GEMINI_API_KEY",
-    envHint: "Get your key at https://aistudio.google.com/apikey",
-  },
-  {
-    key: "4",
-    label: "Google Vertex AI",
-    provider: "vertex",
-    envVar: "GOOGLE_CLOUD_PROJECT",
-    envHint:
-      "Requires `gcloud auth application-default login` and a GCP project ID",
-  },
-  {
-    key: "5",
-    label: "OpenRouter",
-    provider: "openrouter",
-    envVar: "OPENROUTER_API_KEY",
-    envHint: "Get your key at https://openrouter.ai/settings/keys",
-  },
-];
-
-function promptUser(
-  rl: ReturnType<typeof createInterface>,
-  question: string,
-): Promise<string> {
-  return new Promise((resolve) => {
-    rl.question(question, (answer) => {
-      resolve(answer.trim());
-    });
-  });
-}
-
-/** Map provider to a human-readable label for status messages. */
-function providerLabel(provider: Provider): string {
-  const choice = PROVIDER_CHOICES.find((c) => c.provider === provider);
-  return choice?.label ?? provider;
-}
-
-/** Extract the env var name from source like "env:GOOGLE_CLOUD_PROJECT". */
-function sourceEnvVar(source: string): string | null {
-  if (source.startsWith("env:")) return source.slice(4);
-  return null;
-}
-
-/**
- * If the workspace has usable credentials but no pinned model in config,
- * write the resolved default model to `.libretto/config.json`.
- */
-function ensurePinnedDefaultModel(
-  status: AiSetupStatus & { kind: "ready" },
-): AiSetupStatus & { kind: "ready" } {
-  if (status.source !== "config") {
-    writeSnapshotModel(status.model);
-    return { ...status, source: "config" as const };
-  }
-  return status;
-}
-
-function printHealthySummary(status: AiSetupStatus & { kind: "ready" }): void {
-  const envVar = sourceEnvVar(status.source);
-  if (envVar) {
-    console.log(
-      `✓ Detected ${envVar}. Using ${providerLabel(status.provider)}.`,
-    );
-  } else {
-    console.log(`✓ Using ${providerLabel(status.provider)} (${status.model}).`);
-  }
-  console.log(
-    `To change: ${librettoCommand("ai configure openai | anthropic | gemini | vertex | openrouter")}`,
-  );
-}
-
-function printInvalidAiConfigWarning(status: AiSetupStatus): void {
-  if (status.kind !== "invalid-config") return;
-  console.log("! Existing AI config is invalid:");
-  for (const line of status.message.split("\n")) {
-    console.log(`  ${line}`);
-  }
-}
-
-// ── Repair plan helpers (exported for testing) ──────────────────────────────
-
-export type RepairChoice = "switch-provider" | "skip";
-
-export type RepairPlan =
-  | {
-      kind: "repair-missing-credentials";
-      provider: Provider;
-      model: string;
-      envVar: string;
-      choices: RepairChoice[];
-    }
-  | { kind: "repair-invalid-config"; message: string }
-  | { kind: "no-repair-needed" };
-
-/**
- * Determine what repair action setup should take for the current AI status.
- * Pure function — no I/O, no prompts.
- */
-export function buildRepairPlan(status: AiSetupStatus): RepairPlan {
-  if (status.kind === "configured-missing-credentials") {
-    const choice = PROVIDER_CHOICES.find((c) => c.provider === status.provider);
-    return {
-      kind: "repair-missing-credentials",
-      provider: status.provider,
-      model: status.model,
-      envVar: choice?.envVar ?? `${status.provider.toUpperCase()}_API_KEY`,
-      choices: ["switch-provider", "skip"],
-    };
-  }
-  if (status.kind === "invalid-config") {
-    return { kind: "repair-invalid-config", message: status.message };
-  }
-  return { kind: "no-repair-needed" };
-}
-
-/**
- * Format a provider-specific explanation for missing credentials.
- */
-export function formatMissingCredentialsMessage(
-  plan: RepairPlan & { kind: "repair-missing-credentials" },
-): string {
-  return `✗ ${plan.provider} is configured (model: ${plan.model}), but ${plan.envVar} is not set.`;
-}
-
-function printSnapshotApiStatus(): boolean {
-  const status = resolveAiSetupStatus();
-
-  console.log(
-    "\nLibretto uses a sub-agent to analyze DOM snapshots. The model is determined by environment variables.",
-  );
-
-  if (status.kind === "ready") {
-    console.log();
-    printHealthySummary(status);
-    ensurePinnedDefaultModel(status);
-    return true;
-  }
-
-  // Provider-specific missing-credentials message
-  const plan = buildRepairPlan(status);
-  if (plan.kind === "repair-missing-credentials") {
-    console.log();
-    console.log(formatMissingCredentialsMessage(plan));
-    console.log(
-      `  To fix: add ${plan.envVar} to .env, or run \`${librettoCommand("setup")}\` interactively to repair.`,
-    );
-    return false;
-  }
-
-  if (plan.kind === "repair-invalid-config") {
-    printInvalidAiConfigWarning(status);
-    console.log(
-      `  Run \`${librettoCommand("setup")}\` interactively to reconfigure.`,
-    );
-    return false;
-  }
-
-  console.log();
-  console.log("✗ No snapshot API credentials detected.");
-  console.log("  Add one provider to .env:");
-  console.log("    OPENAI_API_KEY=...");
-  console.log("    ANTHROPIC_API_KEY=...");
-  console.log("    GEMINI_API_KEY=...  # or GOOGLE_GENERATIVE_AI_API_KEY");
-  console.log(
-    "    GOOGLE_CLOUD_PROJECT=...  # plus application default credentials for Vertex",
-  );
-  console.log(
-    `  Or run \`${librettoCommand("ai configure openai | anthropic | gemini | vertex | openrouter")}\` to set a specific model.`,
-  );
-  console.log(
-    `  Run \`${librettoCommand("setup")}\` interactively to set up credentials.`,
-  );
-  return false;
-}
-
-/**
- * Run the full provider selection menu.
- * Pins the selected provider's default model to config and prints
- * instructions for the user to add the credential to .env themselves.
- * Returns true if a provider was successfully configured.
- */
-async function promptProviderSelection(
-  rl: ReturnType<typeof createInterface>,
-): Promise<boolean> {
-  console.log(
-    "Which model provider would you like to use for snapshot analysis?\n",
-  );
-  for (const choice of PROVIDER_CHOICES) {
-    console.log(`  ${choice.key}) ${choice.label}`);
-  }
-  console.log("  s) Skip for now\n");
-
-  const answer = await promptUser(rl, "Choice: ");
-
-  if (answer.toLowerCase() === "s" || !answer) {
-    printSkipMessage();
-    return false;
-  }
-
-  const selected = PROVIDER_CHOICES.find((choice) => choice.key === answer);
-  if (!selected) {
-    console.log(`\nUnknown choice "${answer}". Skipping API setup.`);
-    return false;
-  }
-
-  const model = DEFAULT_SNAPSHOT_MODELS[selected.provider];
-  writeSnapshotModel(model);
-  console.log(`\n✓ ${selected.label} selected (model: ${model}).`);
-  console.log(`\nAdd ${selected.envVar} to your .env file:`);
-  console.log(`  ${selected.envHint}`);
-  installSdkIfNeeded(selected.provider);
-  return true;
-}
-
-function printSkipMessage(): void {
-  console.log(
-    `\nSkipped. You can set up API credentials later by rerunning \`${librettoCommand("setup")}\`.`,
-  );
-  console.log("Or add credentials directly to your .env file:");
-  console.log("  OPENAI_API_KEY=...");
-  console.log("  ANTHROPIC_API_KEY=...");
-  console.log("  GEMINI_API_KEY=...");
-  console.log(
-    `  Or run \`${librettoCommand("ai configure openai | anthropic | gemini | vertex | openrouter")}\` to set a specific model.`,
-  );
-}
-
-async function runInteractiveApiSetup(): Promise<void> {
-  const status = resolveAiSetupStatus();
-
-  console.log(
-    "\nLibretto uses a sub-agent to analyze DOM snapshots. The model is determined by environment variables.",
-  );
-
-  if (status.kind === "ready") {
-    console.log();
-    printHealthySummary(status);
-    ensurePinnedDefaultModel(status);
-    return;
-  }
-
-  const plan = buildRepairPlan(status);
-
-  const rl = createInterface({
-    input: process.stdin,
-    output: process.stdout,
-  });
-
-  try {
-    // ── Repair: configured provider with missing credentials ──
-    if (plan.kind === "repair-missing-credentials") {
-      console.log(formatMissingCredentialsMessage(plan));
-      console.log(`\nAdd ${plan.envVar} to your .env file to fix this.`);
-      console.log("");
-      console.log("Or switch to a different provider:\n");
-      console.log("  1) Switch to a different provider");
-      console.log("  s) Skip for now\n");
-
-      const answer = await promptUser(rl, "Choice: ");
-
-      if (answer === "1") {
-        await promptProviderSelection(rl);
-        return;
-      }
-
-      // skip or empty
-      printSkipMessage();
-      return;
-    }
-
-    // ── Repair: invalid config → let user pick a provider ──
-    if (plan.kind === "repair-invalid-config") {
-      printInvalidAiConfigWarning(status);
-      console.log(
-        "\nWould you like to reconfigure with a fresh provider selection?\n",
-      );
-      await promptProviderSelection(rl);
-      return;
-    }
-
-    // ── Unconfigured: standard first-run flow ──
-    console.log("✗ No snapshot API credentials detected.\n");
-    await promptProviderSelection(rl);
-  } finally {
-    rl.close();
-  }
-}
+import { librettoCommand } from "../../shared/package-manager.js";
+import { SimpleCLI } from "affordance";
 
 function installBrowsers(): void {
   console.log("Installing Playwright Chromium...");
@@ -486,17 +118,6 @@ export const setupCommand = SimpleCLI.command({
 
     copySkills();
 
-    if (process.stdin.isTTY) {
-      await runInteractiveApiSetup();
-    } else {
-      const ready = printSnapshotApiStatus();
-      if (!ready) {
-        console.log(
-          `\nIf you're an agent, request the user to run \`${librettoCommand("setup")}\`.`,
-        );
-      }
-    }
-
     console.log(`\nConfig set up at ${LIBRETTO_CONFIG_PATH}`);
     console.log("\n✓ libretto setup complete");
   });

package/src/cli/commands/shared.ts

@@ -14,7 +14,7 @@ import {
   type SimpleCLIMiddlewareArgs,
   type SimpleCLIContext,
   type SimpleCLIMiddleware,
-} from "../framework/simple-cli.js";
+} from "affordance";
 
 export function sessionOption(help = "Session name") {
   return SimpleCLI.option(z.string().optional(), { help });