libretto 0.4.0 → 0.4.2

package/dist/cli/commands/logs.js

@@ -1,3 +1,4 @@
+import { z } from "zod";
 import { listOpenPages } from "../core/browser.js";
 import { withSessionLogger } from "../core/context.js";
 import {
@@ -8,6 +9,14 @@ import {
   readActionLog,
   readNetworkLog
 } from "../core/telemetry.js";
+import { SimpleCLI } from "../framework/simple-cli.js";
+import {
+  integerOption,
+  loadSessionStateMiddleware,
+  pageOption,
+  resolveSessionMiddleware,
+  sessionOption
+} from "./shared.js";
 async function resolvePageId(session, pageId) {
   if (!pageId) return void 0;
   const pages = await withSessionLogger(
@@ -22,72 +31,88 @@ async function resolvePageId(session, pageId) {
   }
   return pageId;
 }
-function registerLogCommands(yargs) {
-  return yargs.command(
-    "network",
-    "View captured network requests",
-    (cmd) => cmd.option("last", { type: "number" }).option("filter", { type: "string" }).option("method", { type: "string" }).option("page", { type: "string" }).option("clear", { type: "boolean", default: false }),
-    async (argv) => {
-      const session = String(argv.session);
-      if (argv.clear) {
-        clearNetworkLog(session);
-        console.log("Network log cleared.");
-        return;
-      }
-      const pageId = await resolvePageId(
-        session,
-        argv.page ? String(argv.page) : void 0
-      );
-      const entries = readNetworkLog(session, {
-        last: typeof argv.last === "number" ? argv.last : void 0,
-        filter: argv.filter,
-        method: argv.method,
-        pageId
-      });
-      if (entries.length === 0) {
-        console.log("No network requests captured.");
-        return;
-      }
-      for (const entry of entries) {
-        console.log(formatNetworkEntry(entry));
-      }
-      console.log(`
+const networkInput = SimpleCLI.input({
+  positionals: [],
+  named: {
+    session: sessionOption(),
+    last: integerOption(),
+    filter: SimpleCLI.option(z.string().optional()),
+    method: SimpleCLI.option(z.string().optional()),
+    page: pageOption(),
+    clear: SimpleCLI.flag()
+  }
+});
+const networkCommand = SimpleCLI.command({
+  description: "View captured network requests"
+}).input(networkInput).use(resolveSessionMiddleware).use(loadSessionStateMiddleware).handle(async ({ input, ctx }) => {
+  if (input.clear) {
+    clearNetworkLog(ctx.session);
+    console.log("Network log cleared.");
+    return;
+  }
+  const pageId = await resolvePageId(ctx.session, input.page);
+  const entries = readNetworkLog(ctx.session, {
+    last: input.last,
+    filter: input.filter,
+    method: input.method,
+    pageId
+  });
+  if (entries.length === 0) {
+    console.log("No network requests captured.");
+    return;
+  }
+  for (const entry of entries) {
+    console.log(formatNetworkEntry(entry));
+  }
+  console.log(`
 ${entries.length} request(s) shown.`);
-    }
-  ).command(
-    "actions",
-    "View captured actions",
-    (cmd) => cmd.option("last", { type: "number" }).option("filter", { type: "string" }).option("action", { type: "string" }).option("source", { type: "string" }).option("page", { type: "string" }).option("clear", { type: "boolean", default: false }),
-    async (argv) => {
-      const session = String(argv.session);
-      if (argv.clear) {
-        clearActionLog(session);
-        console.log("Action log cleared.");
-        return;
-      }
-      const pageId = await resolvePageId(
-        session,
-        argv.page ? String(argv.page) : void 0
-      );
-      const entries = readActionLog(session, {
-        last: typeof argv.last === "number" ? argv.last : void 0,
-        filter: argv.filter,
-        action: argv.action,
-        source: argv.source,
-        pageId
-      });
-      if (entries.length === 0) {
-        console.log("No actions captured.");
-        return;
-      }
-      for (const entry of entries) {
-        console.log(formatActionEntry(entry));
-      }
-      console.log(`
+});
+const actionsInput = SimpleCLI.input({
+  positionals: [],
+  named: {
+    session: sessionOption(),
+    last: integerOption(),
+    filter: SimpleCLI.option(z.string().optional()),
+    action: SimpleCLI.option(z.string().optional()),
+    source: SimpleCLI.option(z.string().optional()),
+    page: pageOption(),
+    clear: SimpleCLI.flag()
+  }
+});
+const actionsCommand = SimpleCLI.command({
+  description: "View captured actions"
+}).input(actionsInput).use(resolveSessionMiddleware).use(loadSessionStateMiddleware).handle(async ({ input, ctx }) => {
+  if (input.clear) {
+    clearActionLog(ctx.session);
+    console.log("Action log cleared.");
+    return;
+  }
+  const pageId = await resolvePageId(ctx.session, input.page);
+  const entries = readActionLog(ctx.session, {
+    last: input.last,
+    filter: input.filter,
+    action: input.action,
+    source: input.source,
+    pageId
+  });
+  if (entries.length === 0) {
+    console.log("No actions captured.");
+    return;
+  }
+  for (const entry of entries) {
+    console.log(formatActionEntry(entry));
+  }
+  console.log(`
 ${entries.length} action(s) shown.`);
-    }
-  );
-}
+});
+const logCommands = {
+  network: networkCommand,
+  actions: actionsCommand
+};
 export {
-  registerLogCommands
+  actionsCommand,
+  actionsInput,
+  logCommands,
+  networkCommand,
+  networkInput
 };

package/dist/cli/commands/shared.js

@@ -0,0 +1,50 @@
+import { z } from "zod";
+import {
+  SESSION_DEFAULT,
+  readSessionStateOrThrow,
+  validateSessionName
+} from "../core/session.js";
+import {
+  SimpleCLI
+} from "../framework/simple-cli.js";
+function createSessionSchema() {
+  return z.string().default(SESSION_DEFAULT).superRefine((value, ctx) => {
+    try {
+      validateSessionName(value);
+    } catch (err) {
+      ctx.addIssue({
+        code: z.ZodIssueCode.custom,
+        message: err instanceof Error ? err.message : String(err)
+      });
+    }
+  });
+}
+function sessionOption(help = "Use a named session") {
+  return SimpleCLI.option(createSessionSchema(), { help });
+}
+function pageOption(help = "Target a specific page id") {
+  return SimpleCLI.option(z.string().optional(), { help });
+}
+function integerOption(help) {
+  return SimpleCLI.option(z.coerce.number().int().optional(), { help });
+}
+const resolveSessionMiddleware = async ({ input, ctx }) => {
+  return {
+    ...ctx,
+    session: input.session
+  };
+};
+const loadSessionStateMiddleware = async ({ ctx }) => {
+  return {
+    ...ctx,
+    sessionState: readSessionStateOrThrow(ctx.session)
+  };
+};
+export {
+  createSessionSchema,
+  integerOption,
+  loadSessionStateMiddleware,
+  pageOption,
+  resolveSessionMiddleware,
+  sessionOption
+};

package/dist/cli/commands/snapshot.js

@@ -1,8 +1,16 @@
 import { mkdirSync } from "node:fs";
+import { z } from "zod";
 import { connect, disconnectBrowser } from "../core/browser.js";
 import { getSessionSnapshotRunDir } from "../core/context.js";
 import { condenseDom } from "../../shared/condense-dom/condense-dom.js";
 import { readSessionState } from "../core/session.js";
+import { SimpleCLI } from "../framework/simple-cli.js";
+import {
+  loadSessionStateMiddleware,
+  pageOption,
+  resolveSessionMiddleware,
+  sessionOption
+} from "./shared.js";
 import { runApiInterpret } from "../core/api-snapshot-analyzer.js";
 import { readAiConfig } from "../core/ai-config.js";
 const DEFAULT_SNAPSHOT_CONTEXT = "No additional user context provided.";
@@ -206,22 +214,29 @@ async function runSnapshot(session, logger, pageId, objective, context) {
   };
   await runApiInterpret(interpretArgs, logger, readAiConfig());
 }
-function registerSnapshotCommands(yargs, logger) {
-  return yargs.command(
-    "snapshot",
-    "Capture PNG + HTML; analyze when --objective is provided (--context optional)",
-    (cmd) => cmd.option("page", { type: "string" }).option("objective", { type: "string" }).option("context", { type: "string" }),
-    async (argv) => {
-      await runSnapshot(
-        String(argv.session),
-        logger,
-        argv.page ? String(argv.page) : void 0,
-        argv.objective,
-        argv.context
-      );
-    }
-  );
+const snapshotInput = SimpleCLI.input({
+  positionals: [],
+  named: {
+    session: sessionOption(),
+    page: pageOption(),
+    objective: SimpleCLI.option(z.string().optional()),
+    context: SimpleCLI.option(z.string().optional())
+  }
+});
+function createSnapshotCommand(logger) {
+  return SimpleCLI.command({
+    description: "Capture PNG + HTML; analyze when --objective is provided (--context optional)"
+  }).input(snapshotInput).use(resolveSessionMiddleware).use(loadSessionStateMiddleware).handle(async ({ input, ctx }) => {
+    await runSnapshot(
+      ctx.session,
+      logger,
+      input.page,
+      input.objective,
+      input.context
+    );
+  });
 }
 export {
-  registerSnapshotCommands
+  createSnapshotCommand,
+  snapshotInput
 };