libretto 0.6.11 → 0.6.13

package/src/cli/commands/snapshot.ts

@@ -1,18 +1,15 @@
-import { readFileSync, writeFileSync } from "node:fs";
 import { z } from "zod";
 import type { LoggerApi } from "../../shared/logger/index.js";
-import { condenseDom } from "../../shared/condense-dom/condense-dom.js";
 import { readSessionState } from "../core/session.js";
-import {
-  type InterpretArgs,
-  type ScreenshotPair,
-} from "../core/snapshot-analyzer.js";
 import { SimpleCLI } from "../framework/simple-cli.js";
-import { pageOption, sessionOption, withRequiredSession } from "./shared.js";
-import { runApiInterpret } from "../core/api-snapshot-analyzer.js";
-import { readSnapshotModel } from "../core/config.js";
-import { resolveSnapshotApiModelOrThrow } from "../core/ai-model.js";
-import { DaemonClient } from "../core/daemon/index.js";
+import {
+  pageOption,
+  sessionOption,
+  withRequiredSession,
+} from "./shared.js";
+import { DaemonClient } from "../core/daemon/ipc.js";
+import { librettoCommand } from "../../shared/package-manager.js";
+import { renderSnapshot } from "../../shared/snapshot/render-snapshot.js";
 
 export const FALLBACK_SNAPSHOT_VIEWPORT = { width: 1280, height: 800 } as const;
 
@@ -109,107 +106,70 @@ export async function forceSnapshotViewport(
   });
 }
 
-async function captureSnapshot(
-  session: string,
-  logger: LoggerApi,
-  daemonSocketPath: string,
-  pageId?: string,
-): Promise<ScreenshotPair> {
-  logger.info("snapshot-via-daemon", { session, pageId });
-  const client = new DaemonClient(daemonSocketPath);
-  const { pngPath, htmlPath, snapshotRunId, pageUrl, title } =
-    await client.snapshot({ pageId });
-
-  // condenseDom runs in the CLI process, not the daemon.
-  const htmlContent = readFileSync(htmlPath, "utf8");
-  const condenseResult = condenseDom(htmlContent);
-  const condensedHtmlPath = htmlPath.replace(/\.html$/, ".condensed.html");
-  writeFileSync(condensedHtmlPath, condenseResult.html);
-
-  logger.info("snapshot-daemon-success", {
-    session,
-    pageUrl,
-    title,
-    pngPath,
-    htmlPath,
-    condensedHtmlPath,
-    snapshotRunId,
-    domCondenseStats: {
-      originalLength: condenseResult.originalLength,
-      condensedLength: condenseResult.condensedLength,
-      reductions: condenseResult.reductions,
-    },
-  });
-
-  return { pngPath, htmlPath, condensedHtmlPath, baseName: snapshotRunId };
-}
-
-async function runSnapshot(
-  session: string,
-  logger: LoggerApi,
-  pageId: string | undefined,
-  objective: string,
-  context: string,
+async function runCompactSnapshot(
+  args: {
+    session: string;
+    daemonSocketPath?: string;
+    logger: LoggerApi;
+    pageId?: string;
+    ref?: string;
+  },
 ): Promise<void> {
-  const normalizedObjective = objective.trim();
-  const normalizedContext = context.trim();
-
-  const snapshotModel = readSnapshotModel();
-  resolveSnapshotApiModelOrThrow(snapshotModel);
-
-  const state = readSessionState(session, logger);
-  if (!state?.daemonSocketPath) {
+  if (!args.daemonSocketPath) {
     throw new Error(
-      `Session "${session}" has no daemon socket. The browser daemon may have crashed. ` +
-        `Close and reopen the session: libretto close --session ${session}`,
+      `Session "${args.session}" has no daemon socket. The browser daemon may have crashed. ` +
+        `Close and reopen the session: ${librettoCommand(`close --session ${args.session}`)}`,
     );
   }
 
-  const { pngPath, htmlPath, condensedHtmlPath } =
-    await captureSnapshot(session, logger, state.daemonSocketPath, pageId);
-
-  console.log("Screenshot saved:");
-  console.log(`  PNG:             ${pngPath}`);
-  console.log(`  HTML:            ${htmlPath}`);
-  console.log(`  Condensed HTML:  ${condensedHtmlPath}`);
-
-  const interpretArgs: InterpretArgs = {
-    objective: normalizedObjective,
-    session,
-    context: normalizedContext,
-    pngPath,
-    htmlPath,
-    condensedHtmlPath,
-  };
+  args.logger.info("compact-snapshot-via-daemon", {
+    session: args.session,
+    pageId: args.pageId,
+    ref: args.ref,
+  });
 
-  // Analysis uses direct API calls via the Vercel AI SDK (see api-snapshot-analyzer.ts).
-  // The legacy CLI-agent path (spawning codex/claude/gemini as a subprocess) is preserved
-  // in snapshot-analyzer.ts — to switch back, replace this call with:
-  //   await runInterpret(interpretArgs, logger);
-  await runApiInterpret(interpretArgs, logger, snapshotModel);
+  const client = await DaemonClient.connect(args.daemonSocketPath);
+  let result: Awaited<ReturnType<DaemonClient["snapshot"]>>;
+  try {
+    result = await client.snapshot({
+      pageId: args.pageId,
+      useCachedSnapshot: args.ref !== undefined,
+    });
+  } finally {
+    client.destroy();
+  }
+  console.log(`Screenshot at ${result.pngPath}`);
+  console.log(renderSnapshot(result.snapshot, args.ref));
+  console.log(
+    `Hint: Use ${librettoCommand(`snapshot <ref> --session ${args.session}`)} to inspect a subtree.`,
+  );
 }
 
 export const snapshotInput = SimpleCLI.input({
-  positionals: [],
+  positionals: [
+    SimpleCLI.positional("ref", z.string().optional(), {
+      help: "Optional element ref to scope output to that subtree (for example, l16 or e16)",
+    }),
+  ],
   named: {
     session: sessionOption(),
     page: pageOption(),
-    objective: SimpleCLI.option(z.string()),
-    context: SimpleCLI.option(z.string()),
+    objective: SimpleCLI.option(z.string().optional()),
+    context: SimpleCLI.option(z.string().optional()),
   },
 });
 
 export const snapshotCommand = SimpleCLI.command({
-  description: "Capture PNG + HTML and analyze with --objective and --context",
+  description: "Capture a screenshot and compact accessibility snapshot",
 })
   .input(snapshotInput)
   .use(withRequiredSession())
   .handle(async ({ input, ctx }) => {
-    await runSnapshot(
-      ctx.session,
-      ctx.logger,
-      input.page,
-      input.objective,
-      input.context,
-    );
+    await runCompactSnapshot({
+      session: ctx.session,
+      daemonSocketPath: ctx.sessionState.daemonSocketPath,
+      logger: ctx.logger,
+      pageId: input.page,
+      ref: input.ref,
+    });
   });

package/src/cli/commands/status.ts

@@ -1,50 +1,6 @@
-import { LIBRETTO_CONFIG_PATH } from "../core/context.js";
-import { type AiSetupStatus, resolveAiSetupStatus } from "../core/ai-model.js";
 import { listRunningSessions, type SessionState } from "../core/session.js";
 import { SimpleCLI } from "../framework/simple-cli.js";
 
-// ── AI status printing ──────────────────────────────────────────────────────
-
-function printAiStatus(status: AiSetupStatus): void {
-  console.log("AI configuration:");
-
-  switch (status.kind) {
-    case "ready":
-      console.log(`  ✓ Snapshot model: ${status.model}`);
-      if (status.source === "config") {
-        console.log(`  Config: ${LIBRETTO_CONFIG_PATH}`);
-      } else {
-        console.log(`  Source: ${status.source}`);
-      }
-      console.log(
-        "  To change: npx libretto ai configure openai | anthropic | gemini | vertex | openrouter",
-      );
-      break;
-
-    case "configured-missing-credentials":
-      console.log(
-        `  ✗ ${status.provider} is configured (model: ${status.model}), but credentials are missing.`,
-      );
-      console.log("  Run `npx libretto setup` to repair.");
-      break;
-
-    case "invalid-config":
-      console.log("  ✗ Config is invalid:");
-      for (const line of status.message.split("\n")) {
-        console.log(`    ${line}`);
-      }
-      console.log("  Run `npx libretto setup` to reconfigure.");
-      break;
-
-    case "unconfigured":
-      console.log("  ✗ No AI model configured.");
-      console.log(
-        "  Run `npx libretto setup` or `npx libretto ai configure` to set up.",
-      );
-      break;
-  }
-}
-
 // ── Session status printing ─────────────────────────────────────────────────
 
 function printOpenSessions(sessions: SessionState[]): void {
@@ -67,13 +23,10 @@ function printOpenSessions(sessions: SessionState[]): void {
 // ── Command ─────────────────────────────────────────────────────────────────
 
 export const statusCommand = SimpleCLI.command({
-  description: "Show workspace status: AI configuration and open sessions",
+  description: "Show workspace status and open sessions",
 })
   .input(SimpleCLI.input({ positionals: [], named: {} }))
   .handle(async () => {
-    const aiStatus = resolveAiSetupStatus();
-    printAiStatus(aiStatus);
-
     const sessions = listRunningSessions();
     printOpenSessions(sessions);
   });