@asteroidai/cli 1.9.11 → 1.9.12

package/src/sync/commands.ts

@@ -9,12 +9,6 @@ function option(
   return { name, flag: name, type, required: false, description, ...extra };
 }
 
-const DIR = option(
-  "dir",
-  "string",
-  "Write here instead of `<workflow-name>/...` under the current directory.",
-);
-
 const local = {
   method: "GET",
   path: "",
@@ -24,48 +18,6 @@ const local = {
 } as const;
 
 export const SYNC_COMMANDS: CliCommand[] = [
-  {
-    ...local,
-    command: "workflow pull",
-    tool: "workflow_pull",
-    title: "Pull a workflow to disk",
-    description:
-      "Write a workflow's editable head to `<workflow-name>/head/` as files: settings, per-node instructions and scripts, and the workflow's own files. Pass --version-id for a pinned version, written read-only to `<workflow-name>/.versions/`. Edit the head files, then run `asteroid workflow push` from that folder.",
-    readOnly: true,
-    args: [
-      {
-        name: "workflowId",
-        flag: "workflow-id",
-        type: "string",
-        required: true,
-      },
-    ],
-    query: [
-      option(
-        "version-id",
-        "string",
-        "A workflow version ID. Omit for the editable head.",
-      ),
-      DIR,
-    ],
-  },
-  {
-    ...local,
-    command: "workflow push",
-    tool: "workflow_push",
-    title: "Push local edits to a workflow head",
-    description:
-      "Send the edits in a pulled head folder to the workflow's editable head: changed and new files are written, removed files are deleted. Fails if the head changed since the pull; pull again and reapply. Push does not publish.",
-    readOnly: false,
-    args: [],
-    query: [
-      option(
-        "dir",
-        "string",
-        "The pulled head folder. Defaults to the current directory.",
-      ),
-    ],
-  },
   {
     ...local,
     command: "execution pull",

package/src/sync/run.ts

@@ -1,4 +1,5 @@
 import { type Parsed, UsageError } from "../args";
+import { buildRequest, type InputReader } from "../request";
 import type { CliCommand } from "../types";
 import {
   type ExecutionPullOptions,
@@ -22,6 +23,7 @@ export interface SyncDeps {
   files?: LocalFiles;
   stdout: (text: string) => void;
   root?: string;
+  io?: InputReader;
   workflowPull?: Partial<WorkflowPullOptions>;
   executionPull?: Partial<ExecutionPullOptions>;
 }
@@ -52,39 +54,71 @@ function executionOptions(parsed: Parsed): Omit<ExecutionPullOptions, "root"> {
   };
 }
 
+function withoutFlag(parsed: Parsed, name: string): Parsed {
+  const flags = new Map(parsed.flags);
+  flags.delete(name);
+  return { ...parsed, flags };
+}
+
+export function runsLocally(command: CliCommand, parsed: Parsed): boolean {
+  if (command.local) return true;
+  if (command.files === "pull") return !parsed.json;
+  if (command.files === "push") return parsed.body === undefined;
+  return false;
+}
+
+const PARTIAL = ["paths", "variants"];
+
+function rejectPartial(parsed: Parsed) {
+  const used = PARTIAL.filter((name) => parsed.flags.has(name));
+  if (used.length === 0) return;
+  throw new UsageError(
+    `pull writes the whole tree, so it cannot take ${used.map((name) => `--${name}`).join(" or ")}. Add --json to list those files instead.`,
+  );
+}
+
+async function pull(
+  command: CliCommand,
+  parsed: Parsed,
+  sync: Sync,
+  deps: SyncDeps,
+) {
+  rejectPartial(parsed);
+  const result = await pullWorkflow(sync, {
+    workflowId: parsed.positionals[0],
+    request: await buildRequest(command, withoutFlag(parsed, "out"), {
+      io: deps.io,
+    }),
+    dir: flag(parsed, "out"),
+    root: deps.root ?? "",
+    ...deps.workflowPull,
+  });
+  return { result, text: formatWorkflowPull(result) };
+}
+
 async function execute(
   command: CliCommand,
   parsed: Parsed,
   sync: Sync,
   deps: SyncDeps,
 ) {
-  const root = deps.root ?? "";
-  switch (command.command) {
-    case "workflow pull": {
-      const result = await pullWorkflow(sync, {
-        workflowId: parsed.positionals[0],
-        versionId: flag(parsed, "version-id"),
-        dir: flag(parsed, "dir"),
-        root,
-        ...deps.workflowPull,
-      });
-      return { result, text: formatWorkflowPull(result) };
-    }
-    case "workflow push": {
-      const result = await pushWorkflow(sync, flag(parsed, "dir") ?? ".");
-      return { result, text: formatWorkflowPush(result) };
-    }
-    case "execution pull": {
-      const result = await pullExecution(sync, {
-        ...executionOptions(parsed),
-        root,
-        ...deps.executionPull,
-      });
-      return { result, text: formatExecutionPull(result) };
-    }
-    default:
-      throw new UsageError(`unknown command ${command.command}`);
+  if (command.files === "pull") return pull(command, parsed, sync, deps);
+  if (command.files === "push") {
+    const result = await pushWorkflow(
+      sync,
+      flag(parsed, "from") ?? ".",
+      parsed.positionals[0] || undefined,
+    );
+    return { result, text: formatWorkflowPush(result) };
   }
+  if (command.command !== "execution pull")
+    throw new UsageError(`unknown command ${command.command}`);
+  const result = await pullExecution(sync, {
+    ...executionOptions(parsed),
+    root: deps.root ?? "",
+    ...deps.executionPull,
+  });
+  return { result, text: formatExecutionPull(result) };
 }
 
 export async function runSync(

package/src/sync/sync.test.ts

@@ -6,6 +6,7 @@ import { formatExecutionPull, pullExecution } from "./execution-pull";
 import { sha256 } from "./paths";
 import {
   type FileTree,
+  get,
   type LocalFiles,
   MANIFEST,
   type Manifest,
@@ -82,8 +83,16 @@ function tree(overrides: Partial<FileTree> = {}): FileTree {
 }
 
 const headFiles = `GET /agents/v2/workflows/${WF}/head/files`;
+const headRequest = () => get(`/agents/v2/workflows/${WF}/head/files`);
 const signedBig = `GET /agents/v2/workflows/${WF}/versions/${HEAD}/files/f-big/signed-url`;
 
+function manifestOf(
+  local: ReturnType<typeof memoryFiles>,
+  dir: string,
+): Manifest {
+  return JSON.parse(local.text(`${dir}/${MANIFEST}`)!) as Manifest;
+}
+
 describe("pullWorkflow", () => {
   function pulled(initial: Record<string, string> = {}) {
     const local = memoryFiles(initial);
@@ -95,10 +104,14 @@ describe("pullWorkflow", () => {
     return { sync, local, calls, downloads };
   }
 
-  it("writes the head under <workflow-name>/head with every file's bytes", async () => {
+  it("writes every file's bytes into the folder", async () => {
     const { sync, local, downloads } = pulled();
 
-    const result = await pullWorkflow(sync, { workflowId: WF, root: "out" });
+    const result = await pullWorkflow(sync, {
+      workflowId: WF,
+      request: headRequest(),
+      dir: "out/Fill_Form/head",
+    });
 
     expect(result.dir).toBe("out/Fill_Form/head");
     expect(local.text("out/Fill_Form/head/settings.yaml")).toBe(
@@ -114,7 +127,11 @@ describe("pullWorkflow", () => {
   it("asks for every file's contents", async () => {
     const { sync, calls } = pulled();
 
-    await pullWorkflow(sync, { workflowId: WF, root: "" });
+    await pullWorkflow(sync, {
+      workflowId: WF,
+      request: headRequest(),
+      dir: "Fill_Form/head",
+    });
 
     expect(calls[0].query.get("contents")).toBe("all");
   });
@@ -122,7 +139,11 @@ describe("pullWorkflow", () => {
   it("records the rev and each file's hash for a later push", async () => {
     const { sync, local } = pulled();
 
-    await pullWorkflow(sync, { workflowId: WF, root: "" });
+    await pullWorkflow(sync, {
+      workflowId: WF,
+      request: headRequest(),
+      dir: "Fill_Form/head",
+    });
 
     const manifest = JSON.parse(
       local.text(`Fill_Form/head/${MANIFEST}`)!,
@@ -141,7 +162,11 @@ describe("pullWorkflow", () => {
       "Fill_Form/head/nodes/Old/instructions.md": "gone",
     });
 
-    await pullWorkflow(sync, { workflowId: WF, root: "" });
+    await pullWorkflow(sync, {
+      workflowId: WF,
+      request: headRequest(),
+      dir: "Fill_Form/head",
+    });
 
     expect(local.store.has("Fill_Form/head/nodes/Old/instructions.md")).toBe(
       false,
@@ -153,7 +178,8 @@ describe("pullWorkflow", () => {
 
     const result = await pullWorkflow(sync, {
       workflowId: WF,
-      root: "",
+      request: headRequest(),
+      dir: "Fill_Form/head",
       maxFileBytes: 1000,
     });
 
@@ -164,7 +190,7 @@ describe("pullWorkflow", () => {
     ]);
   });
 
-  it("writes a pinned version under .versions/", async () => {
+  it("marks a pinned version read-only in its manifest", async () => {
     const local = memoryFiles();
     const { remote } = fakeRemote({
       [`GET /agents/v2/workflows/${WF}/versions/${HEAD}/files`]: () =>
@@ -173,10 +199,14 @@ describe("pullWorkflow", () => {
 
     const result = await pullWorkflow(
       { remote, files: local.files },
-      { workflowId: WF, versionId: HEAD, root: "" },
+      {
+        workflowId: WF,
+        request: get(`/agents/v2/workflows/${WF}/versions/${HEAD}/files`),
+        dir: "v3",
+      },
     );
 
-    expect(result.dir).toBe("Fill_Form/.versions/v3_22222222");
+    expect(manifestOf(local, "v3").head).toBe(false);
   });
 
   it("refuses an entry whose path leaves the folder", async () => {
@@ -192,7 +222,7 @@ describe("pullWorkflow", () => {
 
     const result = await pullWorkflow(
       { remote, files: local.files },
-      { workflowId: WF, root: "" },
+      { workflowId: WF, request: headRequest(), dir: "Fill_Form/head" },
     );
 
     expect(result.skipped).toEqual(["../escape (unsafe path)"]);
@@ -243,7 +273,7 @@ describe("pushWorkflow", () => {
       [headFiles]: () => tree({ rev: 8, files: [] }),
     });
 
-    const result = await pushWorkflow({ remote, files: local.files }, dir);
+    const result = await pushWorkflow({ remote, files: local.files }, dir, WF);
 
     expect(patched).toEqual({
       baseRev: 7,
@@ -283,7 +313,7 @@ describe("pushWorkflow", () => {
         }),
     });
 
-    await pushWorkflow({ remote, files: local.files }, dir);
+    await pushWorkflow({ remote, files: local.files }, dir, WF);
 
     expect(local.text(`${dir}/settings.yaml`)).toBe("start: Login\n");
     const manifest = JSON.parse(local.text(`${dir}/${MANIFEST}`)!) as Manifest;
@@ -297,7 +327,7 @@ describe("pushWorkflow", () => {
     const local = pulledHead({});
     const { remote, calls } = fakeRemote({});
 
-    const result = await pushWorkflow({ remote, files: local.files }, dir);
+    const result = await pushWorkflow({ remote, files: local.files }, dir, WF);
 
     expect(calls).toEqual([]);
     expect(result).toMatchObject({ written: [], deleted: [], rev: 7 });
@@ -311,7 +341,7 @@ describe("pushWorkflow", () => {
       },
     });
 
-    const push = pushWorkflow({ remote, files: local.files }, dir);
+    const push = pushWorkflow({ remote, files: local.files }, dir, WF);
 
     await expect(push).rejects.toThrow(UsageError);
     await expect(push).rejects.toThrow("changed since your pull");
@@ -320,11 +350,20 @@ describe("pushWorkflow", () => {
   it("refuses a folder with no pull in it", async () => {
     const { remote } = fakeRemote({});
 
-    const push = pushWorkflow({ remote, files: memoryFiles().files }, dir);
+    const push = pushWorkflow({ remote, files: memoryFiles().files }, dir, WF);
 
     await expect(push).rejects.toThrow("no pulled workflow");
   });
 
+  it("refuses a folder pulled from another workflow", async () => {
+    const local = pulledHead({});
+    const { remote } = fakeRemote({});
+
+    const push = pushWorkflow({ remote, files: local.files }, dir, "other");
+
+    await expect(push).rejects.toThrow(`holds workflow ${WF}, not other`);
+  });
+
   it("refuses a pinned version", async () => {
     const manifest = {
       workflowId: WF,
@@ -338,7 +377,7 @@ describe("pushWorkflow", () => {
     });
     const { remote } = fakeRemote({});
 
-    const push = pushWorkflow({ remote, files: local.files }, dir);
+    const push = pushWorkflow({ remote, files: local.files }, dir, WF);
 
     await expect(push).rejects.toThrow("read-only");
   });

package/src/sync/workflow-pull.ts

@@ -1,3 +1,4 @@
+import type { BuiltRequest } from "../request";
 import {
   isContained,
   join,
@@ -18,9 +19,9 @@ const CONCURRENCY = 16;
 
 export interface WorkflowPullOptions {
   workflowId: string;
-  versionId?: string;
-  root: string;
+  request: BuiltRequest;
   dir?: string;
+  root?: string;
   manifest?: boolean;
   maxFileBytes?: number;
 }
@@ -32,24 +33,16 @@ export interface WorkflowPullResult {
   version?: number;
   rev: number;
   dir: string;
+  head: boolean;
   written: number;
   shared: number;
   skipped: string[];
 }
 
-function treeRequest(options: WorkflowPullOptions) {
-  const base = `/agents/v2/workflows/${options.workflowId}`;
-  const path = options.versionId
-    ? `${base}/versions/${options.versionId}/files`
-    : `${base}/head/files`;
-  return get(path, { contents: "all" });
-}
-
-export function pullDir(options: WorkflowPullOptions, tree: FileTree): string {
-  if (options.dir) return options.dir;
-  const root = workflowRoot(options.root, tree.workflowName);
-  if (!options.versionId) return join(root, "head");
-  return join(root, ".versions", workflowDirName(tree.versionId, tree.version));
+export function pullDir(root: string, tree: FileTree, head: boolean): string {
+  const base = workflowRoot(root, tree.workflowName);
+  if (head) return join(base, "head");
+  return join(base, ".versions", workflowDirName(tree.versionId, tree.version));
 }
 
 async function agentFileBytes(
@@ -129,8 +122,14 @@ export async function pullWorkflow(
   sync: Sync,
   options: WorkflowPullOptions,
 ): Promise<WorkflowPullResult> {
-  const tree = (await sync.remote.json(treeRequest(options))) as FileTree;
-  const dir = pullDir(options, tree);
+  const request = {
+    ...options.request,
+    query: new URLSearchParams(options.request.query),
+  };
+  request.query.set("contents", "all");
+  const tree = (await sync.remote.json(request)) as FileTree;
+  const head = request.path.endsWith("/head/files");
+  const dir = options.dir ?? pullDir(options.root ?? "", tree, head);
   const { hashes, skipped, shared } = await writeEntries(
     sync,
     options,
@@ -142,7 +141,7 @@ export async function pullWorkflow(
     await writeManifest(sync, dir, {
       workflowId: options.workflowId,
       versionId: tree.versionId,
-      head: !options.versionId,
+      head,
       rev: tree.rev,
       files: hashes,
     });
@@ -154,6 +153,7 @@ export async function pullWorkflow(
     version: tree.version,
     rev: tree.rev,
     dir,
+    head,
     written: Object.keys(hashes).length,
     shared,
     skipped,
@@ -176,6 +176,9 @@ export function formatWorkflowPull(result: WorkflowPullResult): string {
     result.skipped.length > 0
       ? `Skipped:\n${result.skipped.map((s) => `  - ${s}`).join("\n")}`
       : null,
+    result.head
+      ? `Edit the files, then run \`asteroid workflow push\` from ${result.dir}/.`
+      : "This is a pinned version. It is read-only.",
   ]
     .filter(Boolean)
     .join("\n");

package/src/sync/workflow-push.ts

@@ -115,8 +115,14 @@ async function refresh(
 export async function pushWorkflow(
   sync: Sync,
   dir: string,
+  workflowId?: string,
 ): Promise<WorkflowPushResult> {
   const manifest = await readManifest(sync, dir);
+  if (workflowId !== undefined && manifest.workflowId !== workflowId) {
+    throw new UsageError(
+      `${dir} holds workflow ${manifest.workflowId}, not ${workflowId}.`,
+    );
+  }
   const { writes, deletes } = await localChanges(sync, dir, manifest);
   const result = {
     workflowId: manifest.workflowId,

package/src/types.ts

@@ -41,4 +41,6 @@ export interface CliCommand {
   readOnly: boolean;
   destructive: boolean;
   local?: boolean;
+  files?: "pull" | "push";
+  capability?: "publish" | "run_execution";
 }