libretto 0.6.9 → 0.6.11

package/dist/cli/commands/execution.js

@@ -16,17 +16,23 @@ import {
   assertSessionAllowsCommand,
   clearSessionState,
   readSessionState,
+  readSessionStateOrThrow,
   setSessionStatus
 } from "../core/session.js";
 import { warnIfInstalledSkillOutOfDate } from "../core/skill-version.js";
+import { readLibrettoConfig } from "../core/config.js";
+import { resolveProviderName, getCloudProviderApi } from "../core/providers/index.js";
+import {
+  compileExecFunction,
+  stripEmptyCatchHandlers
+} from "../core/exec-compiler.js";
+import { DaemonClient } from "../core/daemon/index.js";
+import { createReadonlyExecHelpers } from "../core/readonly-exec.js";
 import {
   readActionLog,
   readNetworkLog,
   wrapPageForActionLogging
 } from "../core/telemetry.js";
-import { readLibrettoConfig } from "../core/config.js";
-import { resolveProviderName, getCloudProviderApi } from "../core/providers/index.js";
-import { createReadonlyExecHelpers } from "../core/readonly-exec.js";
 import { SimpleCLI } from "../framework/simple-cli.js";
 import {
   pageOption,
@@ -34,113 +40,59 @@ import {
   withAutoSession,
   withRequiredSession
 } from "./shared.js";
-const stripTypeScriptTypes = moduleBuiltin.stripTypeScriptTypes;
 const require2 = moduleBuiltin.createRequire(import.meta.url);
 const tsxCliPath = require2.resolve("tsx/cli");
-function withSuppressedStripTypeScriptWarning(action) {
-  const mutableProcess = process;
-  const originalEmitWarning = mutableProcess.emitWarning;
-  mutableProcess.emitWarning = (...args) => {
-    const warning = args[0];
-    const typeOrOptions = args[1];
-    const warningMessage = typeof warning === "string" ? warning : warning instanceof Error ? warning.message : "";
-    const warningType = typeof typeOrOptions === "string" ? typeOrOptions : typeof typeOrOptions === "object" && typeOrOptions !== null && "type" in typeOrOptions && typeof typeOrOptions.type === "string" ? typeOrOptions.type ?? "" : "";
-    if (warningType === "ExperimentalWarning" && warningMessage.includes("stripTypeScriptTypes")) {
-      return;
-    }
-    originalEmitWarning(...args);
-  };
-  try {
-    return action();
-  } finally {
-    mutableProcess.emitWarning = originalEmitWarning;
+function writeDaemonExecOutput(output) {
+  if (output?.stdout) {
+    process.stdout.write(output.stdout);
+  }
+  if (output?.stderr) {
+    process.stderr.write(output.stderr);
   }
 }
-function compileTypeScriptExecFunction(code, helperNames) {
-  if (!stripTypeScriptTypes) return null;
-  const wrappedSource = `(async function __librettoExec(${helperNames.join(", ")}) {
-${code}
-})`;
-  const jsSource = withSuppressedStripTypeScriptWarning(
-    () => stripTypeScriptTypes(wrappedSource, { mode: "strip" })
-  );
-  const createFunction = new Function(
-    `return ${jsSource}`
-  );
-  return createFunction();
-}
-function compileExecFunction(code, helperNames) {
-  const typeStripped = compileTypeScriptExecFunction(code, helperNames);
-  if (typeStripped) return typeStripped;
-  const AsyncFunction = Object.getPrototypeOf(async function() {
-  }).constructor;
-  return new AsyncFunction(...helperNames, code);
-}
-function stripEmptyCatchHandlers(code) {
-  const catchRe = /\??\s*\.catch\(\s*\(\)\s*=>\s*\{\s*\}\s*\)/g;
-  let strippedCount = 0;
-  let result = "";
-  let i = 0;
-  while (i < code.length) {
-    if (code[i] === "/" && code[i + 1] === "/") {
-      const end = code.indexOf("\n", i);
-      const slice = end === -1 ? code.slice(i) : code.slice(i, end + 1);
-      result += slice;
-      i += slice.length;
-      continue;
-    }
-    if (code[i] === "/" && code[i + 1] === "*") {
-      const end = code.indexOf("*/", i + 2);
-      const slice = end === -1 ? code.slice(i) : code.slice(i, end + 2);
-      result += slice;
-      i += slice.length;
-      continue;
-    }
-    if (code[i] === '"' || code[i] === "'" || code[i] === "`") {
-      const quote = code[i];
-      let j = i + 1;
-      while (j < code.length) {
-        if (code[j] === "\\" && quote !== "`") {
-          j += 2;
-          continue;
-        }
-        if (code[j] === "\\" && quote === "`") {
-          j += 2;
-          continue;
-        }
-        if (code[j] === quote) {
-          j++;
-          break;
-        }
-        if (quote === "`" && code[j] === "$" && code[j + 1] === "{") {
-          let depth = 1;
-          j += 2;
-          while (j < code.length && depth > 0) {
-            if (code[j] === "{") depth++;
-            else if (code[j] === "}") depth--;
-            j++;
-          }
-          continue;
-        }
-        j++;
-      }
-      result += code.slice(i, j);
-      i = j;
-      continue;
-    }
-    catchRe.lastIndex = i;
-    const match = catchRe.exec(code);
-    if (match && match.index === i) {
-      strippedCount++;
-      i += match[0].length;
-      continue;
-    }
-    result += code[i];
-    i++;
+async function execViaDaemon(code, session, daemonSocketPath, logger, options) {
+  const mode = options.mode ?? "exec";
+  const { cleaned: cleanedCode, strippedCount } = stripEmptyCatchHandlers(code);
+  if (strippedCount > 0) {
+    console.log("(Stripped `.catch(() => {})` \u2014 letting errors bubble up)");
+  }
+  logger.info(`${mode}-start`, {
+    session,
+    codeLength: cleanedCode.length,
+    codePreview: cleanedCode.slice(0, 200),
+    visualize: options.visualize,
+    pageId: options.pageId,
+    via: "daemon"
+  });
+  const client = new DaemonClient(daemonSocketPath);
+  const response = mode === "exec" ? await client.exec({
+    code: cleanedCode,
+    pageId: options.pageId,
+    visualize: options.visualize
+  }) : await client.readonlyExec({
+    code: cleanedCode,
+    pageId: options.pageId
+  });
+  if (!response.ok) {
+    writeDaemonExecOutput(response.output);
+    throw new Error(response.message);
+  }
+  const { result, output } = response.data;
+  writeDaemonExecOutput(output);
+  logger.info(`${mode}-success`, {
+    session,
+    hasResult: result !== void 0,
+    via: "daemon"
+  });
+  if (result !== void 0) {
+    console.log(
+      typeof result === "string" ? result : JSON.stringify(result, null, 2)
+    );
+  } else {
+    console.log("Executed successfully");
   }
-  return { cleaned: result, strippedCount };
 }
-async function runExec(code, session, logger, options = {}) {
+async function execViaCdpFallback(code, session, logger, options) {
   const visualize = options.visualize ?? false;
   const pageId = options.pageId;
   const mode = options.mode ?? "exec";
@@ -153,7 +105,8 @@ async function runExec(code, session, logger, options = {}) {
     codeLength: cleanedCode.length,
     codePreview: cleanedCode.slice(0, 200),
     visualize,
-    pageId
+    pageId,
+    via: "cdp-fallback"
   });
   const {
     browser,
@@ -161,8 +114,7 @@ async function runExec(code, session, logger, options = {}) {
     page,
     pageId: resolvedPageId
   } = await connect(session, logger, 1e4, {
-    pageId,
-    requireSinglePage: true
+    pageId
   });
   const STALL_THRESHOLD_MS = 6e4;
   let lastActivityTs = Date.now();
@@ -175,7 +127,8 @@ async function runExec(code, session, logger, options = {}) {
       logger.warn(`${mode}-stall-warning`, {
         session,
         silenceMs,
-        codePreview: cleanedCode.slice(0, 200)
+        codePreview: cleanedCode.slice(0, 200),
+        via: "cdp-fallback"
       });
       console.warn(
         `[stall-warning] No Playwright activity for ${Math.round(silenceMs / 1e3)}s \u2014 ${mode} may be hung (code: ${cleanedCode.slice(0, 100)}...)`
@@ -187,7 +140,8 @@ async function runExec(code, session, logger, options = {}) {
     logger.info(`${mode}-interrupted`, {
       session,
       duration: Date.now() - execStartTs,
-      codePreview: cleanedCode.slice(0, 200)
+      codePreview: cleanedCode.slice(0, 200),
+      via: "cdp-fallback"
     });
   };
   process.on("SIGINT", sigintHandler);
@@ -198,35 +152,31 @@ async function runExec(code, session, logger, options = {}) {
     await installInstrumentation(page, { visualize: true, logger });
   }
   try {
-    const helpers = mode === "readonly-exec" ? createReadonlyExecHelpers(page, { onActivity }) : (() => {
-      const execState = {};
-      const networkLog = (opts = {}) => {
-        return readNetworkLog(session, opts);
-      };
-      const actionLog = (opts = {}) => {
-        return readActionLog(session, opts);
-      };
-      return {
-        page,
-        context,
-        state: execState,
-        browser,
-        networkLog,
-        actionLog,
-        console,
-        setTimeout,
-        setInterval,
-        clearTimeout,
-        clearInterval,
-        fetch,
-        URL,
-        Buffer
-      };
-    })();
+    const execState = {};
+    const helpers = mode === "readonly-exec" ? createReadonlyExecHelpers(page, { onActivity }) : {
+      page,
+      context,
+      state: execState,
+      browser,
+      networkLog: (opts = {}) => readNetworkLog(session, opts),
+      actionLog: (opts = {}) => readActionLog(session, opts),
+      console,
+      setTimeout,
+      setInterval,
+      clearTimeout,
+      clearInterval,
+      fetch,
+      URL,
+      Buffer
+    };
     const helperNames = Object.keys(helpers);
     const fn = compileExecFunction(cleanedCode, helperNames);
     const result = await fn(...Object.values(helpers));
-    logger.info(`${mode}-success`, { session, hasResult: result !== void 0 });
+    logger.info(`${mode}-success`, {
+      session,
+      hasResult: result !== void 0,
+      via: "cdp-fallback"
+    });
     if (result !== void 0) {
       console.log(
         typeof result === "string" ? result : JSON.stringify(result, null, 2)
@@ -238,7 +188,8 @@ async function runExec(code, session, logger, options = {}) {
     logger.error(`${mode}-error`, {
       error: err,
       session,
-      codePreview: cleanedCode.slice(0, 200)
+      codePreview: cleanedCode.slice(0, 200),
+      via: "cdp-fallback"
     });
     throw err;
   } finally {
@@ -247,6 +198,18 @@ async function runExec(code, session, logger, options = {}) {
     disconnectBrowser(browser, logger, session);
   }
 }
+async function runExec(code, session, logger, options = {}) {
+  const state = readSessionStateOrThrow(session);
+  if (!state.daemonSocketPath) {
+    logger.warn(`${options.mode ?? "exec"}-daemon-socket-missing-cdp-fallback`, {
+      session,
+      hasCdpEndpoint: Boolean(state.cdpEndpoint),
+      port: state.port
+    });
+    return execViaCdpFallback(code, session, logger, options);
+  }
+  return execViaDaemon(code, session, state.daemonSocketPath, logger, options);
+}
 function parseJsonArg(label, raw) {
   try {
     return JSON.parse(raw);

package/dist/cli/commands/snapshot.js

@@ -1,7 +1,5 @@
-import { mkdirSync } from "node:fs";
+import { readFileSync, writeFileSync } 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";
@@ -9,10 +7,8 @@ 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";
 const FALLBACK_SNAPSHOT_VIEWPORT = { width: 1280, height: 800 };
-function generateSnapshotRunId() {
-  return `snapshot-${Date.now()}`;
-}
 function isZeroViewport(value) {
   return typeof value === "number" && value <= 0;
 }
@@ -67,133 +63,42 @@ async function forceSnapshotViewport(page, viewport, logger, session, pageId, re
     viewport
   });
 }
-async function captureScreenshot(session, logger, pageId) {
-  logger.info("screenshot-start", { session, pageId });
-  const snapshotRunId = generateSnapshotRunId();
-  const snapshotRunDir = getSessionSnapshotRunDir(session, snapshotRunId);
-  mkdirSync(snapshotRunDir, { recursive: true });
-  const { browser, page } = await connect(session, logger, 1e4, {
-    pageId,
-    requireSinglePage: true
-  });
-  try {
-    let title = null;
-    try {
-      title = await page.title();
-    } catch (error) {
-      logger.warn("screenshot-title-read-failed", {
-        session,
-        pageId,
-        error
-      });
-    }
-    let pageUrl = null;
-    try {
-      pageUrl = page.url();
-    } catch (error) {
-      logger.warn("screenshot-url-read-failed", {
-        session,
-        pageId,
-        error
-      });
-    }
-    const pngPath = `${snapshotRunDir}/page.png`;
-    const htmlPath = `${snapshotRunDir}/page.html`;
-    const condensedHtmlPath = `${snapshotRunDir}/page.condensed.html`;
-    const RENDER_SETTLE_TIMEOUT_MS = 1e4;
-    await Promise.race([
-      page.waitForLoadState("networkidle").catch(() => {
-      }),
-      new Promise((resolve) => setTimeout(resolve, RENDER_SETTLE_TIMEOUT_MS))
-    ]);
-    const restoreViewport = resolveSnapshotViewport(session, logger);
-    const viewportMetrics = await readSnapshotViewportMetrics(page);
-    logger.info("screenshot-viewport-metrics", {
-      session,
-      pageId,
-      restoreViewport,
-      ...viewportMetrics
-    });
-    await forceSnapshotViewport(
-      page,
-      restoreViewport,
-      logger,
-      session,
-      pageId,
-      shouldForceSnapshotViewport(viewportMetrics) ? "preflight-invalid-viewport" : "preflight-normalize-viewport"
-    );
-    try {
-      await page.screenshot({ path: pngPath });
-    } catch (error) {
-      if (!isZeroWidthScreenshotError(error)) {
-        throw error;
-      }
-      await forceSnapshotViewport(
-        page,
-        restoreViewport,
-        logger,
-        session,
-        pageId,
-        "retry-after-zero-width-screenshot-error"
-      );
-      await page.screenshot({ path: pngPath });
-    }
-    const htmlContent = await page.content();
-    const fs = await import("node:fs/promises");
-    await fs.writeFile(htmlPath, htmlContent);
-    const condenseResult = condenseDom(htmlContent);
-    await fs.writeFile(condensedHtmlPath, condenseResult.html);
-    logger.info("screenshot-success", {
-      session,
-      pageUrl,
-      title,
-      pngPath,
-      htmlPath,
-      condensedHtmlPath,
-      snapshotRunId,
-      domCondenseStats: {
-        originalLength: condenseResult.originalLength,
-        condensedLength: condenseResult.condensedLength,
-        reductions: condenseResult.reductions
-      }
-    });
-    return { pngPath, htmlPath, condensedHtmlPath, baseName: snapshotRunId };
-  } catch (err) {
-    let pageAlive = false;
-    let browserConnected = false;
-    try {
-      browserConnected = browser.isConnected();
-      pageAlive = !page.isClosed();
-    } catch {
+async function captureSnapshot(session, logger, daemonSocketPath, pageId) {
+  logger.info("snapshot-via-daemon", { session, pageId });
+  const client = new DaemonClient(daemonSocketPath);
+  const { pngPath, htmlPath, snapshotRunId, pageUrl, title } = await client.snapshot({ pageId });
+  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
     }
-    logger.error("screenshot-error", {
-      error: err,
-      session,
-      pageAlive,
-      browserConnected,
-      pageUrl: (() => {
-        try {
-          return page.url();
-        } catch {
-          return null;
-        }
-      })()
-    });
-    throw err;
-  } finally {
-    disconnectBrowser(browser, logger, session);
-  }
+  });
+  return { pngPath, htmlPath, condensedHtmlPath, baseName: snapshotRunId };
 }
 async function runSnapshot(session, logger, pageId, objective, context) {
   const normalizedObjective = objective.trim();
   const normalizedContext = context.trim();
   const snapshotModel = readSnapshotModel();
   resolveSnapshotApiModelOrThrow(snapshotModel);
-  const { pngPath, htmlPath, condensedHtmlPath } = await captureScreenshot(
-    session,
-    logger,
-    pageId
-  );
+  const state = readSessionState(session, logger);
+  if (!state?.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}`
+    );
+  }
+  const { pngPath, htmlPath, condensedHtmlPath } = await captureSnapshot(session, logger, state.daemonSocketPath, pageId);
   console.log("Screenshot saved:");
   console.log(`  PNG:             ${pngPath}`);
   console.log(`  HTML:            ${htmlPath}`);
@@ -229,6 +134,13 @@ const snapshotCommand = SimpleCLI.command({
   );
 });
 export {
+  FALLBACK_SNAPSHOT_VIEWPORT,
+  forceSnapshotViewport,
+  isZeroViewport,
+  isZeroWidthScreenshotError,
+  readSnapshotViewportMetrics,
+  resolveSnapshotViewport,
+  shouldForceSnapshotViewport,
   snapshotCommand,
   snapshotInput
 };

package/dist/cli/core/ai-model.js

@@ -4,7 +4,6 @@ import {
   hasProviderCredentials,
   parseModel
 } from "./resolve-model.js";
-import { loadEnv } from "../../shared/env/load-env.js";
 import { parseDotEnvAssignment } from "../../shared/env/load-env.js";
 const DEFAULT_SNAPSHOT_MODELS = {
   openai: "openai/gpt-5.4",
@@ -104,7 +103,6 @@ function inferAutoSnapshotModel() {
   return null;
 }
 function resolveSnapshotApiModel(snapshotModel = readSnapshotModel()) {
-  loadEnv();
   if (snapshotModel) {
     const { provider } = parseModel(snapshotModel);
     return {
@@ -141,7 +139,6 @@ function readSnapshotModelSafely(configPath) {
   }
 }
 function resolveAiSetupStatus(configPath = LIBRETTO_CONFIG_PATH) {
-  loadEnv();
   const result = readSnapshotModelSafely(configPath);
   if (!result.ok) {
     return { kind: "invalid-config", message: result.message };