libretto 0.6.30 → 0.6.32

package/src/cli/commands/deploy.ts

@@ -1,15 +1,13 @@
 import { randomBytes } from "node:crypto";
 import { z } from "zod";
-import {
-  orpcCall,
-  resolveApiUrl,
-} from "../core/auth-fetch.js";
+import { orpcCall } from "../core/auth-fetch.js";
 import {
   buildHostedDeployTarball,
   type WorkflowDeployMetadata,
 } from "../core/deploy-artifact.js";
 import { readAuthState } from "../core/auth-storage.js";
 import { SimpleCLI } from "affordance";
+import { withCloudApiKey } from "./shared.js";
 
 type DeploymentStatus = "building" | "ready" | "failed";
 
@@ -53,19 +51,6 @@ function deployApiKeyRequiredMessage(hasStoredSession: boolean): string {
   ].join("\n");
 }
 
-async function requireDeployApiKey() {
-  const apiKey = process.env.LIBRETTO_API_KEY?.trim();
-
-  if (!apiKey) {
-    throw new Error(deployApiKeyRequiredMessage(await hasStoredCloudSession()));
-  }
-
-  return {
-    apiUrl: resolveApiUrl(null),
-    credential: { source: "env-api-key" as const, apiKey },
-  };
-}
-
 async function hasStoredCloudSession(): Promise<boolean> {
   try {
     return Boolean((await readAuthState())?.session);
@@ -188,8 +173,12 @@ export const deployCommand = SimpleCLI.command({
   description: "Deploy workflows to the hosted platform",
 })
   .input(deployInput)
-  .handle(async ({ input }) => {
-    const { apiUrl, credential } = await requireDeployApiKey();
+  .use(withCloudApiKey(
+    "deploy to Libretto Cloud",
+    async () => deployApiKeyRequiredMessage(await hasStoredCloudSession()),
+  ))
+  .handle(async ({ input, ctx }) => {
+    const { apiUrl, credential } = ctx;
     const deploymentName = generateDeploymentName();
 
     // Hosted deploy uploads a generated artifact with a deploy entrypoint and

package/src/cli/commands/profiles.ts

@@ -1,7 +1,8 @@
 import { z } from "zod";
 import { SimpleCLI } from "affordance";
-import { orpcCall, resolveApiUrl } from "../core/auth-fetch.js";
+import { orpcCall } from "../core/auth-fetch.js";
 import { normalizeProfileName } from "../core/profiles.js";
+import { withCloudApiKey } from "./shared.js";
 
 type ListProfilesResponse = {
   profiles: Array<{
@@ -17,30 +18,17 @@ type DeleteProfileResponse = {
   deleted_count: number;
 };
 
-function requireApiKeyCredential() {
-  const apiKey = process.env.LIBRETTO_API_KEY?.trim();
-  if (!apiKey) {
-    throw new Error(
-      "LIBRETTO_API_KEY is required to manage Libretto Cloud profiles. Issue one with `libretto cloud auth api-key issue --label <label>`.",
-    );
-  }
-  return {
-    apiUrl: resolveApiUrl(null),
-    credential: { source: "env-api-key" as const, apiKey },
-  };
-}
-
 export const listProfilesCommand = SimpleCLI.command({
   description: "List Libretto Cloud auth profiles",
 })
   .input(SimpleCLI.input({ positionals: [], named: {} }))
-  .handle(async () => {
-    const { apiUrl, credential } = requireApiKeyCredential();
+  .use(withCloudApiKey("manage Libretto Cloud profiles"))
+  .handle(async ({ ctx }) => {
     const response = await orpcCall<ListProfilesResponse>({
-      apiUrl,
+      apiUrl: ctx.apiUrl,
       path: "/v1/browserProfiles/list",
       input: {},
-      credential,
+      credential: ctx.credential,
     });
     if (response.profiles.length === 0) {
       console.log("No cloud profiles found.");
@@ -65,14 +53,14 @@ export const deleteProfileCommand = SimpleCLI.command({
     ],
     named: {},
   }))
-  .handle(async ({ input }) => {
+  .use(withCloudApiKey("manage Libretto Cloud profiles"))
+  .handle(async ({ input, ctx }) => {
     const profileName = normalizeProfileName(input.profileName);
-    const { apiUrl, credential } = requireApiKeyCredential();
     const response = await orpcCall<DeleteProfileResponse>({
-      apiUrl,
+      apiUrl: ctx.apiUrl,
       path: "/v1/browserProfiles/delete",
       input: { name: profileName },
-      credential,
+      credential: ctx.credential,
     });
     if (!response.success || response.deleted_count === 0) {
       console.log(`No cloud profile found for ${profileName}.`);

package/src/cli/commands/shared.ts

@@ -9,6 +9,7 @@ import {
   type SessionState,
   validateSessionName,
 } from "../core/session.js";
+import { resolveApiUrl } from "../core/auth-fetch.js";
 import {
   SimpleCLI,
   type SimpleCLIContext,
@@ -40,6 +41,11 @@ export type ExperimentsContext = {
   experiments: Experiments;
 };
 
+export type CloudApiKeyContext = {
+  apiUrl: string;
+  credential: { source: "env-api-key"; apiKey: string };
+};
+
 export function withExperiments<
   TContext extends SimpleCLIContext,
 >(): SimpleCLIMiddleware<unknown, TContext, TContext & ExperimentsContext> {
@@ -49,6 +55,29 @@ export function withExperiments<
   });
 }
 
+export function withCloudApiKey<
+  TContext extends SimpleCLIContext,
+>(
+  action: string,
+  formatMissingMessage?: () => string | Promise<string>,
+): SimpleCLIMiddleware<unknown, TContext, TContext & CloudApiKeyContext> {
+  return async ({ ctx }) => {
+    const apiKey = process.env.LIBRETTO_API_KEY?.trim();
+    if (!apiKey) {
+      throw new Error(
+        formatMissingMessage
+          ? await formatMissingMessage()
+          : `LIBRETTO_API_KEY is required to ${action}. Issue one with \`libretto cloud auth api-key issue --label <label>\`.`,
+      );
+    }
+    return {
+      ...ctx,
+      apiUrl: resolveApiUrl(null),
+      credential: { source: "env-api-key", apiKey },
+    };
+  };
+}
+
 export function withRequiredSession(): SimpleCLIMiddleware<
   { session?: string },
   {},

package/src/cli/core/daemon/ipc.ts

@@ -2,7 +2,7 @@ import { createHash } from "node:crypto";
 import type { ChildProcess } from "node:child_process";
 import { spawn } from "node:child_process";
 import { openSync, closeSync } from "node:fs";
-import { createRequire } from "node:module";
+import * as moduleBuiltin from "node:module";
 import { homedir, userInfo } from "node:os";
 import { fileURLToPath } from "node:url";
 import { createIpcPeer, type IpcPeer } from "../../../shared/ipc/ipc.js";
@@ -246,25 +246,34 @@ export class DaemonClient {
     const daemonEntryPath = fileURLToPath(
       new URL("./daemon.js", import.meta.url),
     );
-    const require = createRequire(import.meta.url);
-    const tsxCliPath = require.resolve("tsx/cli");
+    const childArgs = [daemonEntryPath, JSON.stringify(config)];
+    const childEnv: NodeJS.ProcessEnv = { ...process.env };
+
+    if (config.workflow) {
+      const tsxPreflightPath = fileURLToPath(
+        import.meta.resolve("tsx/preflight"),
+      );
+      const tsxLoaderFlag =
+        typeof moduleBuiltin.register === "function" ? "--import" : "--loader";
+
+      childArgs.unshift(
+        "--require",
+        tsxPreflightPath,
+        tsxLoaderFlag,
+        import.meta.resolve("tsx"),
+      );
+
+      if (config.workflow.tsconfigPath) {
+        childEnv.TSX_TSCONFIG_PATH = config.workflow.tsconfigPath;
+      }
+    }
 
     const childStderrFd = openSync(logPath, "a");
-    const child = spawn(
-      process.execPath,
-      [
-        tsxCliPath,
-        ...(config.workflow?.tsconfigPath
-          ? ["--tsconfig", config.workflow.tsconfigPath]
-          : []),
-        daemonEntryPath,
-        JSON.stringify(config),
-      ],
-      {
-        detached: true,
-        stdio: ["ignore", "ignore", childStderrFd, "ipc"],
-      },
-    );
+    const child = spawn(process.execPath, childArgs, {
+      detached: true,
+      stdio: ["ignore", "ignore", childStderrFd, "ipc"],
+      env: childEnv,
+    });
     closeSync(childStderrFd);
 
     const pid = child.pid!;

package/src/cli/core/deploy-artifact.ts

@@ -692,6 +692,10 @@ function toPortableRelativePath(args: {
   return relPath;
 }
 
+function isShareableSourceRelPath(relPath: string): boolean {
+  return !relPath.split("/").includes("node_modules");
+}
+
 function writeShareableSourceFiles(args: {
   absSourceDir: string;
   absSourcePaths: readonly string[];
@@ -702,7 +706,7 @@ function writeShareableSourceFiles(args: {
       absPath,
       absSourceDir: args.absSourceDir,
     }),
-  ))].sort();
+  ))].filter(isShareableSourceRelPath).sort();
 
   for (const relPath of relPaths) {
     const targetPath = join(args.outputDir, ".libretto-share", "source", relPath);
@@ -1209,7 +1213,8 @@ async function writeBundledDeployEntrypoint(args: {
           relPath !== "" &&
           !relPath.startsWith("../") &&
           relPath !== ".." &&
-          !isAbsolute(relPath)
+          !isAbsolute(relPath) &&
+          isShareableSourceRelPath(relPath.replaceAll("\\", "/"))
         );
       });
     return { shareableSourceFiles, workflows };

package/src/cli/router.ts

@@ -2,6 +2,9 @@ import { authCommands } from "./commands/auth.js";
 import { billingCommands } from "./commands/billing.js";
 import { browserCommands } from "./commands/browser.js";
 import { cloudCredentialCommands } from "./commands/cloud-credentials.js";
+import { cloudJobCommands } from "./commands/cloud-jobs.js";
+import { cloudScheduleCommands } from "./commands/cloud-schedules.js";
+import { settingsCommands } from "./commands/cloud-settings.js";
 import { codeSharingCommands, shareWorkflowCommand } from "./commands/cloud-sharing.js";
 import { deployCommand } from "./commands/deploy.js";
 import { executionCommands } from "./commands/execution.js";
@@ -25,7 +28,10 @@ export const cliRoutes = {
       auth: authCommands,
       billing: billingCommands,
       credentials: cloudCredentialCommands,
+      jobs: cloudJobCommands,
       profiles: profileCommands,
+      schedules: cloudScheduleCommands,
+      settings: settingsCommands,
       share: shareWorkflowCommand,
       sharing: codeSharingCommands,
     },