@asteroidai/cli 1.9.98 → 1.9.99

package/dist/asteroid.js

@@ -1907,7 +1907,7 @@ var COMMANDS = [
     command: "portal-skills add",
     tool: "portal_skills_add",
     title: "Add portal skills",
-    description: "Add a portal's skills to an organization, by portal id. It is general knowledge about how a portal works. Needs a Startup plan or above. Astro loads the portal's skills once it is added. Adding one the organization already has is a no-op.",
+    description: "Add a portal's skills to an organization, by a `portalId` from `portal_skills_list`. Needs a Startup plan or above. Astro loads the portal's skills once it is added. Adding one the organization already has is a no-op.",
     method: "POST",
     path: "/agents/v2/portal-skills/{portalId}",
     args: [
@@ -1923,6 +1923,27 @@ var COMMANDS = [
     readOnly: false,
     destructive: false
   },
+  {
+    command: "portal-skills list",
+    tool: "portal_skills_list",
+    title: "List portal skills",
+    description: "List the skills for third-party portals, or only for the portals matching a portal name or task, such as `caloptima eligibility`. A portal skill is general knowledge about how a portal works: sign-in, page quirks, field mappings. Each portal comes with its skill names, and whether the organization has added it. Add one with `portal_skills_add`.",
+    method: "GET",
+    path: "/astro/v2/portal-skills",
+    args: [],
+    query: [
+      {
+        name: "query",
+        flag: "query",
+        type: "string",
+        required: false,
+        description: "A portal name or task, at least three characters. Omit to list every portal with skills."
+      }
+    ],
+    binary: false,
+    readOnly: true,
+    destructive: false
+  },
   {
     command: "profile clear-cache",
     tool: "profile_clear_browser_cache",
@@ -4441,7 +4462,7 @@ var COMMANDS = [
     command: "workflow head publish",
     tool: "workflow_head_publish",
     title: "Publish workflow head",
-    description: "Publish the workflow's editable head, assigning it the next version number and making it the default for `workflow_execute_post`. Use after `workflow_files_patch`; `workflow_version_publish` does the same for a version you already have the ID of.",
+    description: "Publish the workflow's editable head, assigning it the next version number and making it the default for `workflow_execute_post`. Use after `workflow_files_patch`; `workflow_version_publish` does the same for a version you already have the ID of. `schemaChanges` lists the input and output schema changes against the version published before, which can break callers that send inputs or read outputs by name.",
     method: "POST",
     path: "/agents/v2/workflows/{workflowId}/head/publish",
     args: [
@@ -5378,7 +5399,7 @@ var COMMANDS = [
     command: "workflow version publish",
     tool: "workflow_version_publish",
     title: "Publish workflow version",
-    description: "Publish a workflow version, assigning it a permanent version number and making it the default for `workflow_execute_post`.",
+    description: "Publish a workflow version, assigning it a permanent version number and making it the default for `workflow_execute_post`. This also publishes an older version again. `schemaChanges` lists the input and output schema changes against the version published before, which can break callers that send inputs or read outputs by name.",
     method: "POST",
     path: "/agents/v2/workflows/{workflowId}/versions/{versionId}/publish",
     args: [
@@ -6033,16 +6054,26 @@ function leafOptions(leaf, command) {
   for (const file of command.body?.files ?? []) {
     leaf.option(`--${file} <path>`, "File to upload. Repeatable.", collect);
   }
-  if (command.files === "pull")
+  if (command.files === "pull") {
     leaf.option(
       "--out <dir>",
       "Write here instead of ./<workflow-name>/head (a version: ./<workflow-name>/.versions/...). --json prints the file listing instead."
     );
-  if (command.files === "push")
+    leaf.option(
+      "--keep-edits",
+      "Into a folder pulled before: keep every file you edited since that pull and refresh the rest. From a head, a later push sends those edits on top of the new revision."
+    );
+  }
+  if (command.files === "push") {
     leaf.option(
       "--from <dir>",
       "The pulled head folder to push. Defaults to the current folder."
     );
+    leaf.option(
+      "--rebase",
+      "When the head moved since your pull, pull it with --keep-edits and push again, twice at most."
+    );
+  }
 }
 function toParsed(leaf, positionals, dotted2) {
   const globals = leaf.optsWithGlobals();
@@ -6649,7 +6680,7 @@ var ApiError = class extends Error {
   status;
   body;
 };
-var VERSION = "1.9.98";
+var VERSION = "1.9.99";
 function problem(status, body, fallback) {
   if (body && typeof body === "object") {
     const record2 = body;
@@ -7749,6 +7780,18 @@ function nodeFiles(cwd) {
   };
 }
 
+// src/sync/manifest.ts
+async function loadManifest(sync, dir) {
+  const bytes = await sync.files.read(join3(dir, MANIFEST));
+  if (!bytes) return void 0;
+  return JSON.parse(Buffer.from(bytes).toString("utf8"));
+}
+async function writeManifest(sync, dir, manifest) {
+  const text3 = `${JSON.stringify(manifest, null, 2)}
+`;
+  await sync.files.write(join3(dir, MANIFEST), Buffer.from(text3, "utf8"));
+}
+
 // src/sync/workflow-pull.ts
 var CONCURRENCY = 16;
 function pullDir(root, tree, head) {
@@ -7756,6 +7799,9 @@ function pullDir(root, tree, head) {
   if (head) return join3(base, "head");
   return join3(base, ".versions", workflowDirName(tree.versionId, tree.version));
 }
+function headFilesRequest(workflowId) {
+  return get(`/agents/v2/workflows/${workflowId}/head/files`);
+}
 async function agentFileBytes(sync, workflowId, tree, entry) {
   const path = `/agents/v2/workflows/${workflowId}/versions/${tree.versionId}/files/${entry.fileId}/signed-url`;
   const { url } = await sync.remote.json(get(path));
@@ -7768,29 +7814,100 @@ async function entryBytes(sync, workflowId, tree, entry) {
   if (!entry.fileId) return void 0;
   return agentFileBytes(sync, workflowId, tree, entry);
 }
-async function writeEntries(sync, options, tree, dir) {
-  const hashes = {};
-  const skipped = [];
-  let shared = 0;
-  const wanted = tree.files.filter((entry) => {
+function inlineBytes(entry) {
+  if (entry.contentBase64 !== void 0)
+    return Buffer.from(entry.contentBase64, "base64");
+  if (entry.content !== void 0) return Buffer.from(entry.content, "utf8");
+  return void 0;
+}
+function wantedEntries(options, tree, skipped) {
+  return tree.files.filter((entry) => {
     if (!isContained(entry.path)) skipped.push(`${entry.path} (unsafe path)`);
     else if (options.maxFileBytes !== void 0 && entry.size > options.maxFileBytes)
       skipped.push(`${entry.path} (${entry.size} bytes, over the size limit)`);
     else return true;
     return false;
   });
-  for (let i = 0; i < wanted.length; i += CONCURRENCY) {
-    await Promise.all(
-      wanted.slice(i, i + CONCURRENCY).map(async (entry) => {
-        const bytes = await entryBytes(sync, options.workflowId, tree, entry);
-        if (!bytes) return void skipped.push(`${entry.path} (no content)`);
-        await sync.files.write(join3(dir, entry.path), bytes);
-        hashes[entry.path] = sha256(bytes);
-        if (entry.kind === "agent_file") shared++;
-      })
-    );
+}
+async function inBatches(items, each) {
+  for (let i = 0; i < items.length; i += CONCURRENCY) {
+    await Promise.all(items.slice(i, i + CONCURRENCY).map(each));
   }
-  return { hashes, skipped, shared };
+}
+async function writeEntries(sync, options, tree, dir) {
+  const hashes = {};
+  const skipped = [];
+  let shared = 0;
+  let written = 0;
+  await inBatches(wantedEntries(options, tree, skipped), async (entry) => {
+    const bytes = await entryBytes(sync, options.workflowId, tree, entry);
+    if (!bytes) return void skipped.push(`${entry.path} (no content)`);
+    await sync.files.write(join3(dir, entry.path), bytes);
+    hashes[entry.path] = sha256(bytes);
+    written++;
+    if (entry.kind === "agent_file") shared++;
+  });
+  return { hashes, skipped, shared, kept: [], written };
+}
+async function mergeEntry(sync, options, tree, dir, previous, entry, out) {
+  const local2 = await sync.files.read(join3(dir, entry.path));
+  const localHash = local2 ? sha256(local2) : void 0;
+  const baseline = previous.files[entry.path];
+  const edited = baseline === void 0 ? local2 !== void 0 : localHash !== baseline;
+  let bytes = inlineBytes(entry);
+  let serverHash = bytes ? sha256(bytes) : entry.checksum;
+  if (edited) {
+    if (serverHash === void 0) {
+      bytes = await entryBytes(sync, options.workflowId, tree, entry);
+      if (!bytes) return void out.skipped.push(`${entry.path} (no content)`);
+      serverHash = sha256(bytes);
+    }
+    out.hashes[entry.path] = serverHash;
+    out.kept.push(entry.path);
+    return;
+  }
+  if (serverHash !== void 0 && serverHash === localHash) {
+    out.hashes[entry.path] = serverHash;
+    return;
+  }
+  bytes ??= await entryBytes(sync, options.workflowId, tree, entry);
+  if (!bytes) return void out.skipped.push(`${entry.path} (no content)`);
+  serverHash = sha256(bytes);
+  if (serverHash !== localHash) {
+    await sync.files.write(join3(dir, entry.path), bytes);
+    out.written++;
+    if (entry.kind === "agent_file") out.shared++;
+  }
+  out.hashes[entry.path] = serverHash;
+}
+async function mergeEntries(sync, options, tree, dir, previous) {
+  const out = {
+    hashes: {},
+    skipped: [],
+    shared: 0,
+    kept: [],
+    written: 0
+  };
+  const wanted = wantedEntries(options, tree, out.skipped);
+  await inBatches(
+    wanted,
+    (entry) => mergeEntry(sync, options, tree, dir, previous, entry, out)
+  );
+  const remote = new Set(tree.files.map((entry) => entry.path));
+  for (const path of Object.keys(previous.files)) {
+    if (path in out.hashes) continue;
+    if (remote.has(path)) {
+      out.hashes[path] = previous.files[path];
+      continue;
+    }
+    const local2 = await sync.files.read(join3(dir, path));
+    if (!local2) continue;
+    if (sha256(local2) === previous.files[path])
+      await sync.files.remove(join3(dir, path));
+    else out.kept.push(path);
+  }
+  out.kept.sort();
+  return out;
 }
 async function removeStale(sync, dir, keep) {
   for (const path of await sync.files.list(dir)) {
@@ -7798,11 +7915,6 @@ async function removeStale(sync, dir, keep) {
       await sync.files.remove(join3(dir, path));
   }
 }
-async function writeManifest(sync, dir, manifest) {
-  const text3 = `${JSON.stringify(manifest, null, 2)}
-`;
-  await sync.files.write(join3(dir, MANIFEST), Buffer.from(text3, "utf8"));
-}
 async function pullWorkflow(sync, options) {
   const request = {
     ...options.request,
@@ -7812,20 +7924,22 @@ async function pullWorkflow(sync, options) {
   const tree = await sync.remote.json(request);
   const head = request.path.endsWith("/head/files");
   const dir = options.dir ?? pullDir(options.root ?? "", tree, head);
-  const { hashes, skipped, shared } = await writeEntries(
-    sync,
-    options,
-    tree,
-    dir
-  );
-  await removeStale(sync, dir, new Set(Object.keys(hashes)));
+  const previous = options.keepEdits ? await loadManifest(sync, dir) : void 0;
+  const written = previous ? await mergeEntries(sync, options, tree, dir, previous) : await writeEntries(sync, options, tree, dir);
+  if (!previous)
+    await removeStale(sync, dir, new Set(Object.keys(written.hashes)));
   if (options.manifest !== false) {
+    const variants = request.query.get("variants") ?? void 0;
     await writeManifest(sync, dir, {
       workflowId: options.workflowId,
       versionId: tree.versionId,
       head,
       rev: tree.rev,
-      files: hashes
+      files: written.hashes,
+      ...variants !== void 0 && { variants },
+      ...options.maxFileBytes !== void 0 && {
+        maxFileBytes: options.maxFileBytes
+      }
     });
   }
   return {
@@ -7836,9 +7950,11 @@ async function pullWorkflow(sync, options) {
     rev: tree.rev,
     dir,
     head,
-    written: Object.keys(hashes).length,
-    shared,
-    skipped
+    written: written.written,
+    shared: written.shared,
+    skipped: written.skipped,
+    kept: written.kept,
+    ...tree.variantKeys && { variantKeys: tree.variantKeys }
   };
 }
 function formatWorkflowPull(result) {
@@ -7849,6 +7965,8 @@ function formatWorkflowPull(result) {
     `Workflow version: ${result.versionId}${result.version ? ` (v${result.version})` : " (draft)"}`,
     `Written to: ${result.dir}/`,
     files,
+    result.kept.length > 0 ? `Kept your edits in:
+${result.kept.map((s) => `  - ${s}`).join("\n")}` : null,
     result.skipped.length > 0 ? `Skipped:
 ${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."
@@ -7856,14 +7974,14 @@ ${result.skipped.map((s) => `  - ${s}`).join("\n")}` : null,
 }
 
 // src/sync/workflow-push.ts
+var REBASE_ATTEMPTS = 3;
 async function readManifest(sync, dir) {
-  const bytes = await sync.files.read(join3(dir, MANIFEST));
-  if (!bytes) {
+  const manifest = await loadManifest(sync, dir);
+  if (!manifest) {
     throw new UsageError(
       `no pulled workflow in ${dir}. Run \`asteroid workflow pull <workflow-id>\`, then push from the head folder it writes.`
     );
   }
-  const manifest = JSON.parse(Buffer.from(bytes).toString("utf8"));
   if (!manifest.head) {
     throw new UsageError(
       `${dir} holds a pinned workflow version, which is read-only. Push from a pulled head.`
@@ -7893,25 +8011,42 @@ async function localChanges(sync, dir, manifest) {
   );
   return { writes, deletes };
 }
+function conflict(manifest) {
+  return new UsageError(
+    `the workflow head changed since your pull (rev ${manifest.rev}). Run \`asteroid workflow pull ${manifest.workflowId} --keep-edits\` to bring its changes under yours, then push again, or push with --rebase to do both.`
+  );
+}
 async function patch(sync, manifest, writes, deletes) {
   try {
     await sync.remote.json({
       method: "PATCH",
       path: `/agents/v2/workflows/${manifest.workflowId}/head/files`,
       query: new URLSearchParams(),
-      json: { baseRev: manifest.rev, writes, deletes }
+      json: {
+        baseRev: manifest.rev,
+        writes: writes.map(({ path, contentBase64 }) => ({
+          path,
+          contentBase64
+        })),
+        deletes
+      }
     });
+    return "applied";
   } catch (error) {
     if (statusOf(error) !== 409) throw error;
-    throw new UsageError(
-      `the workflow head changed since your pull (rev ${manifest.rev}). Copy your edits aside, run \`asteroid workflow pull ${manifest.workflowId}\`, reapply them, then push again.`
-    );
+    return "conflict";
   }
 }
+function headRequest(manifest) {
+  const request = headFilesRequest(manifest.workflowId);
+  if (manifest.variants !== void 0)
+    request.query.set("variants", manifest.variants);
+  if (manifest.maxFileBytes !== void 0)
+    request.query.set("maxFileBytes", String(manifest.maxFileBytes));
+  return request;
+}
 async function refresh2(sync, dir, manifest, pushed) {
-  const tree = await sync.remote.json(
-    get(`/agents/v2/workflows/${manifest.workflowId}/head/files`)
-  );
+  const tree = await sync.remote.json(headRequest(manifest));
   const files = {};
   for (const entry of tree.files) {
     if (entry.content !== void 0) {
@@ -7921,7 +8056,7 @@ async function refresh2(sync, dir, manifest, pushed) {
         await sync.files.write(join3(dir, entry.path), bytes);
     } else {
       const local2 = await sync.files.read(join3(dir, entry.path));
-      const hash = local2 ? sha256(local2) : pushed.get(entry.path) ?? entry.checksum;
+      const hash = local2 ? sha256(local2) : pushed.get(entry.path);
       if (hash) files[entry.path] = hash;
     }
   }
@@ -7933,43 +8068,57 @@ async function refresh2(sync, dir, manifest, pushed) {
   await writeManifest(sync, dir, next);
   return next;
 }
-async function pushWorkflow(sync, dir, workflowId) {
-  const manifest = await readManifest(sync, dir);
+async function rebase(sync, dir, manifest) {
+  await pullWorkflow(sync, {
+    workflowId: manifest.workflowId,
+    request: headRequest(manifest),
+    dir,
+    keepEdits: true,
+    maxFileBytes: manifest.maxFileBytes
+  });
+  return readManifest(sync, dir);
+}
+async function pushWorkflow(sync, dir, workflowId, options = {}) {
+  let manifest = await readManifest(sync, dir);
   if (workflowId !== void 0 && 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,
-    dir,
-    written: writes.map((w) => w.path),
-    deleted: deletes
-  };
-  if (writes.length === 0 && deletes.length === 0) {
-    return { ...result, rev: manifest.rev, versionId: manifest.versionId };
+  let rebasedFrom;
+  for (let attempt = 1; ; attempt++) {
+    const { writes, deletes } = await localChanges(sync, dir, manifest);
+    const result = {
+      workflowId: manifest.workflowId,
+      dir,
+      written: writes.map((w) => w.path),
+      deleted: deletes,
+      ...rebasedFrom !== void 0 && { rebasedFrom }
+    };
+    if (writes.length === 0 && deletes.length === 0) {
+      return { ...result, rev: manifest.rev, versionId: manifest.versionId };
+    }
+    if (await patch(sync, manifest, writes, deletes) === "applied") {
+      const next = await refresh2(
+        sync,
+        dir,
+        manifest,
+        new Map(writes.map((w) => [w.path, w.hash]))
+      );
+      return { ...result, rev: next.rev, versionId: next.versionId };
+    }
+    if (!options.rebase || attempt >= REBASE_ATTEMPTS) throw conflict(manifest);
+    rebasedFrom ??= manifest.rev;
+    manifest = await rebase(sync, dir, manifest);
   }
-  await patch(
-    sync,
-    manifest,
-    writes.map(({ path, contentBase64 }) => ({ path, contentBase64 })),
-    deletes
-  );
-  const next = await refresh2(
-    sync,
-    dir,
-    manifest,
-    new Map(writes.map((w) => [w.path, w.hash]))
-  );
-  return { ...result, rev: next.rev, versionId: next.versionId };
 }
 function formatWorkflowPush(result) {
+  const rebased = result.rebasedFrom !== void 0 ? ` Rebased on the head first: your pull was rev ${result.rebasedFrom}.` : "";
   if (result.written.length === 0 && result.deleted.length === 0) {
-    return `Nothing to push: ${result.dir}/ matches the head you pulled (rev ${result.rev}).`;
+    return `Nothing to push: ${result.dir}/ matches the head you pulled (rev ${result.rev}).${rebased}`;
   }
   return [
-    `Pushed to workflow ${result.workflowId}: ${result.written.length} written, ${result.deleted.length} deleted.`,
+    `Pushed to workflow ${result.workflowId}: ${result.written.length} written, ${result.deleted.length} deleted.${rebased}`,
     ...result.written.map((path) => `  + ${path}`),
     ...result.deleted.map((path) => `  - ${path}`),
     `Head is now rev ${result.rev} (version ${result.versionId}).`
@@ -8000,9 +8149,9 @@ function executionOptions(parsed) {
     dir: dir ? () => dir : void 0
   };
 }
-function withoutFlag(parsed, name) {
+function withoutFlags(parsed, ...names) {
   const flags = new Map(parsed.flags);
-  flags.delete(name);
+  for (const name of names) flags.delete(name);
   return { ...parsed, flags };
 }
 function runsLocally(command, parsed) {
@@ -8023,11 +8172,16 @@ async function pull(command, parsed, sync, deps) {
   rejectPartial(parsed);
   const result = await pullWorkflow(sync, {
     workflowId: parsed.positionals[0],
-    request: await buildRequest(command, withoutFlag(parsed, "out"), {
-      io: deps.io
-    }),
+    request: await buildRequest(
+      command,
+      withoutFlags(parsed, "out", "keep-edits"),
+      {
+        io: deps.io
+      }
+    ),
     dir: flag(parsed, "out"),
     root: deps.root ?? "",
+    keepEdits: flag(parsed, "keep-edits") === "true",
     ...deps.workflowPull
   });
   return { result, text: formatWorkflowPull(result) };
@@ -8038,7 +8192,8 @@ async function execute(command, parsed, sync, deps) {
     const result2 = await pushWorkflow(
       sync,
       flag(parsed, "from") ?? ".",
-      parsed.positionals[0] || void 0
+      parsed.positionals[0] || void 0,
+      { rebase: flag(parsed, "rebase") === "true" }
     );
     return { result: result2, text: formatWorkflowPush(result2) };
   }

package/dist/core.js

@@ -1928,7 +1928,7 @@ var COMMANDS = [
     command: "portal-skills add",
     tool: "portal_skills_add",
     title: "Add portal skills",
-    description: "Add a portal's skills to an organization, by portal id. It is general knowledge about how a portal works. Needs a Startup plan or above. Astro loads the portal's skills once it is added. Adding one the organization already has is a no-op.",
+    description: "Add a portal's skills to an organization, by a `portalId` from `portal_skills_list`. Needs a Startup plan or above. Astro loads the portal's skills once it is added. Adding one the organization already has is a no-op.",
     method: "POST",
     path: "/agents/v2/portal-skills/{portalId}",
     args: [
@@ -1944,6 +1944,27 @@ var COMMANDS = [
     readOnly: false,
     destructive: false
   },
+  {
+    command: "portal-skills list",
+    tool: "portal_skills_list",
+    title: "List portal skills",
+    description: "List the skills for third-party portals, or only for the portals matching a portal name or task, such as `caloptima eligibility`. A portal skill is general knowledge about how a portal works: sign-in, page quirks, field mappings. Each portal comes with its skill names, and whether the organization has added it. Add one with `portal_skills_add`.",
+    method: "GET",
+    path: "/astro/v2/portal-skills",
+    args: [],
+    query: [
+      {
+        name: "query",
+        flag: "query",
+        type: "string",
+        required: false,
+        description: "A portal name or task, at least three characters. Omit to list every portal with skills."
+      }
+    ],
+    binary: false,
+    readOnly: true,
+    destructive: false
+  },
   {
     command: "profile clear-cache",
     tool: "profile_clear_browser_cache",
@@ -4462,7 +4483,7 @@ var COMMANDS = [
     command: "workflow head publish",
     tool: "workflow_head_publish",
     title: "Publish workflow head",
-    description: "Publish the workflow's editable head, assigning it the next version number and making it the default for `workflow_execute_post`. Use after `workflow_files_patch`; `workflow_version_publish` does the same for a version you already have the ID of.",
+    description: "Publish the workflow's editable head, assigning it the next version number and making it the default for `workflow_execute_post`. Use after `workflow_files_patch`; `workflow_version_publish` does the same for a version you already have the ID of. `schemaChanges` lists the input and output schema changes against the version published before, which can break callers that send inputs or read outputs by name.",
     method: "POST",
     path: "/agents/v2/workflows/{workflowId}/head/publish",
     args: [
@@ -5399,7 +5420,7 @@ var COMMANDS = [
     command: "workflow version publish",
     tool: "workflow_version_publish",
     title: "Publish workflow version",
-    description: "Publish a workflow version, assigning it a permanent version number and making it the default for `workflow_execute_post`.",
+    description: "Publish a workflow version, assigning it a permanent version number and making it the default for `workflow_execute_post`. This also publishes an older version again. `schemaChanges` lists the input and output schema changes against the version published before, which can break callers that send inputs or read outputs by name.",
     method: "POST",
     path: "/agents/v2/workflows/{workflowId}/versions/{versionId}/publish",
     args: [
@@ -5903,16 +5924,26 @@ function leafOptions(leaf, command) {
   for (const file of command.body?.files ?? []) {
     leaf.option(`--${file} <path>`, "File to upload. Repeatable.", collect);
   }
-  if (command.files === "pull")
+  if (command.files === "pull") {
     leaf.option(
       "--out <dir>",
       "Write here instead of ./<workflow-name>/head (a version: ./<workflow-name>/.versions/...). --json prints the file listing instead."
     );
-  if (command.files === "push")
+    leaf.option(
+      "--keep-edits",
+      "Into a folder pulled before: keep every file you edited since that pull and refresh the rest. From a head, a later push sends those edits on top of the new revision."
+    );
+  }
+  if (command.files === "push") {
     leaf.option(
       "--from <dir>",
       "The pulled head folder to push. Defaults to the current folder."
     );
+    leaf.option(
+      "--rebase",
+      "When the head moved since your pull, pull it with --keep-edits and push again, twice at most."
+    );
+  }
 }
 function toParsed(leaf, positionals, dotted2) {
   const globals = leaf.optsWithGlobals();
@@ -6703,6 +6734,18 @@ ${result.skipped.map((s) => `  - ${s}`).join("\n")}` : null,
   ].filter(Boolean).join("\n");
 }
 
+// src/sync/manifest.ts
+async function loadManifest(sync, dir) {
+  const bytes = await sync.files.read(join(dir, MANIFEST));
+  if (!bytes) return void 0;
+  return JSON.parse(Buffer.from(bytes).toString("utf8"));
+}
+async function writeManifest(sync, dir, manifest) {
+  const text2 = `${JSON.stringify(manifest, null, 2)}
+`;
+  await sync.files.write(join(dir, MANIFEST), Buffer.from(text2, "utf8"));
+}
+
 // src/sync/node-files.ts
 import { mkdir, readdir, readFile, rm, writeFile } from "node:fs/promises";
 import { dirname, relative, resolve, sep } from "node:path";
@@ -6754,6 +6797,9 @@ function pullDir(root, tree, head) {
   if (head) return join(base, "head");
   return join(base, ".versions", workflowDirName(tree.versionId, tree.version));
 }
+function headFilesRequest(workflowId) {
+  return get(`/agents/v2/workflows/${workflowId}/head/files`);
+}
 async function agentFileBytes(sync, workflowId, tree, entry) {
   const path = `/agents/v2/workflows/${workflowId}/versions/${tree.versionId}/files/${entry.fileId}/signed-url`;
   const { url } = await sync.remote.json(get(path));
@@ -6766,29 +6812,100 @@ async function entryBytes(sync, workflowId, tree, entry) {
   if (!entry.fileId) return void 0;
   return agentFileBytes(sync, workflowId, tree, entry);
 }
-async function writeEntries(sync, options, tree, dir) {
-  const hashes = {};
-  const skipped = [];
-  let shared = 0;
-  const wanted = tree.files.filter((entry) => {
+function inlineBytes(entry) {
+  if (entry.contentBase64 !== void 0)
+    return Buffer.from(entry.contentBase64, "base64");
+  if (entry.content !== void 0) return Buffer.from(entry.content, "utf8");
+  return void 0;
+}
+function wantedEntries(options, tree, skipped) {
+  return tree.files.filter((entry) => {
     if (!isContained(entry.path)) skipped.push(`${entry.path} (unsafe path)`);
     else if (options.maxFileBytes !== void 0 && entry.size > options.maxFileBytes)
       skipped.push(`${entry.path} (${entry.size} bytes, over the size limit)`);
     else return true;
     return false;
   });
-  for (let i = 0; i < wanted.length; i += CONCURRENCY) {
-    await Promise.all(
-      wanted.slice(i, i + CONCURRENCY).map(async (entry) => {
-        const bytes = await entryBytes(sync, options.workflowId, tree, entry);
-        if (!bytes) return void skipped.push(`${entry.path} (no content)`);
-        await sync.files.write(join(dir, entry.path), bytes);
-        hashes[entry.path] = sha256(bytes);
-        if (entry.kind === "agent_file") shared++;
-      })
-    );
+}
+async function inBatches(items, each) {
+  for (let i = 0; i < items.length; i += CONCURRENCY) {
+    await Promise.all(items.slice(i, i + CONCURRENCY).map(each));
   }
-  return { hashes, skipped, shared };
+}
+async function writeEntries(sync, options, tree, dir) {
+  const hashes = {};
+  const skipped = [];
+  let shared = 0;
+  let written = 0;
+  await inBatches(wantedEntries(options, tree, skipped), async (entry) => {
+    const bytes = await entryBytes(sync, options.workflowId, tree, entry);
+    if (!bytes) return void skipped.push(`${entry.path} (no content)`);
+    await sync.files.write(join(dir, entry.path), bytes);
+    hashes[entry.path] = sha256(bytes);
+    written++;
+    if (entry.kind === "agent_file") shared++;
+  });
+  return { hashes, skipped, shared, kept: [], written };
+}
+async function mergeEntry(sync, options, tree, dir, previous, entry, out) {
+  const local2 = await sync.files.read(join(dir, entry.path));
+  const localHash = local2 ? sha256(local2) : void 0;
+  const baseline = previous.files[entry.path];
+  const edited = baseline === void 0 ? local2 !== void 0 : localHash !== baseline;
+  let bytes = inlineBytes(entry);
+  let serverHash = bytes ? sha256(bytes) : entry.checksum;
+  if (edited) {
+    if (serverHash === void 0) {
+      bytes = await entryBytes(sync, options.workflowId, tree, entry);
+      if (!bytes) return void out.skipped.push(`${entry.path} (no content)`);
+      serverHash = sha256(bytes);
+    }
+    out.hashes[entry.path] = serverHash;
+    out.kept.push(entry.path);
+    return;
+  }
+  if (serverHash !== void 0 && serverHash === localHash) {
+    out.hashes[entry.path] = serverHash;
+    return;
+  }
+  bytes ??= await entryBytes(sync, options.workflowId, tree, entry);
+  if (!bytes) return void out.skipped.push(`${entry.path} (no content)`);
+  serverHash = sha256(bytes);
+  if (serverHash !== localHash) {
+    await sync.files.write(join(dir, entry.path), bytes);
+    out.written++;
+    if (entry.kind === "agent_file") out.shared++;
+  }
+  out.hashes[entry.path] = serverHash;
+}
+async function mergeEntries(sync, options, tree, dir, previous) {
+  const out = {
+    hashes: {},
+    skipped: [],
+    shared: 0,
+    kept: [],
+    written: 0
+  };
+  const wanted = wantedEntries(options, tree, out.skipped);
+  await inBatches(
+    wanted,
+    (entry) => mergeEntry(sync, options, tree, dir, previous, entry, out)
+  );
+  const remote = new Set(tree.files.map((entry) => entry.path));
+  for (const path of Object.keys(previous.files)) {
+    if (path in out.hashes) continue;
+    if (remote.has(path)) {
+      out.hashes[path] = previous.files[path];
+      continue;
+    }
+    const local2 = await sync.files.read(join(dir, path));
+    if (!local2) continue;
+    if (sha256(local2) === previous.files[path])
+      await sync.files.remove(join(dir, path));
+    else out.kept.push(path);
+  }
+  out.kept.sort();
+  return out;
 }
 async function removeStale(sync, dir, keep) {
   for (const path of await sync.files.list(dir)) {
@@ -6796,11 +6913,6 @@ async function removeStale(sync, dir, keep) {
       await sync.files.remove(join(dir, path));
   }
 }
-async function writeManifest(sync, dir, manifest) {
-  const text2 = `${JSON.stringify(manifest, null, 2)}
-`;
-  await sync.files.write(join(dir, MANIFEST), Buffer.from(text2, "utf8"));
-}
 async function pullWorkflow(sync, options) {
   const request = {
     ...options.request,
@@ -6810,20 +6922,22 @@ async function pullWorkflow(sync, options) {
   const tree = await sync.remote.json(request);
   const head = request.path.endsWith("/head/files");
   const dir = options.dir ?? pullDir(options.root ?? "", tree, head);
-  const { hashes, skipped, shared } = await writeEntries(
-    sync,
-    options,
-    tree,
-    dir
-  );
-  await removeStale(sync, dir, new Set(Object.keys(hashes)));
+  const previous = options.keepEdits ? await loadManifest(sync, dir) : void 0;
+  const written = previous ? await mergeEntries(sync, options, tree, dir, previous) : await writeEntries(sync, options, tree, dir);
+  if (!previous)
+    await removeStale(sync, dir, new Set(Object.keys(written.hashes)));
   if (options.manifest !== false) {
+    const variants = request.query.get("variants") ?? void 0;
     await writeManifest(sync, dir, {
       workflowId: options.workflowId,
       versionId: tree.versionId,
       head,
       rev: tree.rev,
-      files: hashes
+      files: written.hashes,
+      ...variants !== void 0 && { variants },
+      ...options.maxFileBytes !== void 0 && {
+        maxFileBytes: options.maxFileBytes
+      }
     });
   }
   return {
@@ -6834,9 +6948,11 @@ async function pullWorkflow(sync, options) {
     rev: tree.rev,
     dir,
     head,
-    written: Object.keys(hashes).length,
-    shared,
-    skipped
+    written: written.written,
+    shared: written.shared,
+    skipped: written.skipped,
+    kept: written.kept,
+    ...tree.variantKeys && { variantKeys: tree.variantKeys }
   };
 }
 function formatWorkflowPull(result) {
@@ -6847,6 +6963,8 @@ function formatWorkflowPull(result) {
     `Workflow version: ${result.versionId}${result.version ? ` (v${result.version})` : " (draft)"}`,
     `Written to: ${result.dir}/`,
     files,
+    result.kept.length > 0 ? `Kept your edits in:
+${result.kept.map((s) => `  - ${s}`).join("\n")}` : null,
     result.skipped.length > 0 ? `Skipped:
 ${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."
@@ -6854,14 +6972,14 @@ ${result.skipped.map((s) => `  - ${s}`).join("\n")}` : null,
 }
 
 // src/sync/workflow-push.ts
+var REBASE_ATTEMPTS = 3;
 async function readManifest(sync, dir) {
-  const bytes = await sync.files.read(join(dir, MANIFEST));
-  if (!bytes) {
+  const manifest = await loadManifest(sync, dir);
+  if (!manifest) {
     throw new UsageError(
       `no pulled workflow in ${dir}. Run \`asteroid workflow pull <workflow-id>\`, then push from the head folder it writes.`
     );
   }
-  const manifest = JSON.parse(Buffer.from(bytes).toString("utf8"));
   if (!manifest.head) {
     throw new UsageError(
       `${dir} holds a pinned workflow version, which is read-only. Push from a pulled head.`
@@ -6891,25 +7009,42 @@ async function localChanges(sync, dir, manifest) {
   );
   return { writes, deletes };
 }
+function conflict(manifest) {
+  return new UsageError(
+    `the workflow head changed since your pull (rev ${manifest.rev}). Run \`asteroid workflow pull ${manifest.workflowId} --keep-edits\` to bring its changes under yours, then push again, or push with --rebase to do both.`
+  );
+}
 async function patch(sync, manifest, writes, deletes) {
   try {
     await sync.remote.json({
       method: "PATCH",
       path: `/agents/v2/workflows/${manifest.workflowId}/head/files`,
       query: new URLSearchParams(),
-      json: { baseRev: manifest.rev, writes, deletes }
+      json: {
+        baseRev: manifest.rev,
+        writes: writes.map(({ path, contentBase64 }) => ({
+          path,
+          contentBase64
+        })),
+        deletes
+      }
     });
+    return "applied";
   } catch (error) {
     if (statusOf(error) !== 409) throw error;
-    throw new UsageError(
-      `the workflow head changed since your pull (rev ${manifest.rev}). Copy your edits aside, run \`asteroid workflow pull ${manifest.workflowId}\`, reapply them, then push again.`
-    );
+    return "conflict";
   }
 }
+function headRequest(manifest) {
+  const request = headFilesRequest(manifest.workflowId);
+  if (manifest.variants !== void 0)
+    request.query.set("variants", manifest.variants);
+  if (manifest.maxFileBytes !== void 0)
+    request.query.set("maxFileBytes", String(manifest.maxFileBytes));
+  return request;
+}
 async function refresh(sync, dir, manifest, pushed) {
-  const tree = await sync.remote.json(
-    get(`/agents/v2/workflows/${manifest.workflowId}/head/files`)
-  );
+  const tree = await sync.remote.json(headRequest(manifest));
   const files = {};
   for (const entry of tree.files) {
     if (entry.content !== void 0) {
@@ -6919,7 +7054,7 @@ async function refresh(sync, dir, manifest, pushed) {
         await sync.files.write(join(dir, entry.path), bytes);
     } else {
       const local2 = await sync.files.read(join(dir, entry.path));
-      const hash = local2 ? sha256(local2) : pushed.get(entry.path) ?? entry.checksum;
+      const hash = local2 ? sha256(local2) : pushed.get(entry.path);
       if (hash) files[entry.path] = hash;
     }
   }
@@ -6931,43 +7066,57 @@ async function refresh(sync, dir, manifest, pushed) {
   await writeManifest(sync, dir, next);
   return next;
 }
-async function pushWorkflow(sync, dir, workflowId) {
-  const manifest = await readManifest(sync, dir);
+async function rebase(sync, dir, manifest) {
+  await pullWorkflow(sync, {
+    workflowId: manifest.workflowId,
+    request: headRequest(manifest),
+    dir,
+    keepEdits: true,
+    maxFileBytes: manifest.maxFileBytes
+  });
+  return readManifest(sync, dir);
+}
+async function pushWorkflow(sync, dir, workflowId, options = {}) {
+  let manifest = await readManifest(sync, dir);
   if (workflowId !== void 0 && 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,
-    dir,
-    written: writes.map((w) => w.path),
-    deleted: deletes
-  };
-  if (writes.length === 0 && deletes.length === 0) {
-    return { ...result, rev: manifest.rev, versionId: manifest.versionId };
+  let rebasedFrom;
+  for (let attempt = 1; ; attempt++) {
+    const { writes, deletes } = await localChanges(sync, dir, manifest);
+    const result = {
+      workflowId: manifest.workflowId,
+      dir,
+      written: writes.map((w) => w.path),
+      deleted: deletes,
+      ...rebasedFrom !== void 0 && { rebasedFrom }
+    };
+    if (writes.length === 0 && deletes.length === 0) {
+      return { ...result, rev: manifest.rev, versionId: manifest.versionId };
+    }
+    if (await patch(sync, manifest, writes, deletes) === "applied") {
+      const next = await refresh(
+        sync,
+        dir,
+        manifest,
+        new Map(writes.map((w) => [w.path, w.hash]))
+      );
+      return { ...result, rev: next.rev, versionId: next.versionId };
+    }
+    if (!options.rebase || attempt >= REBASE_ATTEMPTS) throw conflict(manifest);
+    rebasedFrom ??= manifest.rev;
+    manifest = await rebase(sync, dir, manifest);
   }
-  await patch(
-    sync,
-    manifest,
-    writes.map(({ path, contentBase64 }) => ({ path, contentBase64 })),
-    deletes
-  );
-  const next = await refresh(
-    sync,
-    dir,
-    manifest,
-    new Map(writes.map((w) => [w.path, w.hash]))
-  );
-  return { ...result, rev: next.rev, versionId: next.versionId };
 }
 function formatWorkflowPush(result) {
+  const rebased = result.rebasedFrom !== void 0 ? ` Rebased on the head first: your pull was rev ${result.rebasedFrom}.` : "";
   if (result.written.length === 0 && result.deleted.length === 0) {
-    return `Nothing to push: ${result.dir}/ matches the head you pulled (rev ${result.rev}).`;
+    return `Nothing to push: ${result.dir}/ matches the head you pulled (rev ${result.rev}).${rebased}`;
   }
   return [
-    `Pushed to workflow ${result.workflowId}: ${result.written.length} written, ${result.deleted.length} deleted.`,
+    `Pushed to workflow ${result.workflowId}: ${result.written.length} written, ${result.deleted.length} deleted.${rebased}`,
     ...result.written.map((path) => `  + ${path}`),
     ...result.deleted.map((path) => `  - ${path}`),
     `Head is now rev ${result.rev} (version ${result.versionId}).`
@@ -6998,11 +7147,17 @@ function executionOptions(parsed) {
     dir: dir ? () => dir : void 0
   };
 }
-function withoutFlag(parsed, name) {
+function withoutFlags(parsed, ...names) {
   const flags = new Map(parsed.flags);
-  flags.delete(name);
+  for (const name of names) flags.delete(name);
   return { ...parsed, flags };
 }
+function runsLocally(command, parsed) {
+  if (command.local) return true;
+  if (command.files === "pull") return !parsed.json;
+  if (command.files === "push") return parsed.body === void 0;
+  return false;
+}
 var PARTIAL = ["paths", "variants"];
 function rejectPartial(parsed) {
   const used = PARTIAL.filter((name) => parsed.flags.has(name));
@@ -7015,11 +7170,16 @@ async function pull(command, parsed, sync, deps) {
   rejectPartial(parsed);
   const result = await pullWorkflow(sync, {
     workflowId: parsed.positionals[0],
-    request: await buildRequest(command, withoutFlag(parsed, "out"), {
-      io: deps.io
-    }),
+    request: await buildRequest(
+      command,
+      withoutFlags(parsed, "out", "keep-edits"),
+      {
+        io: deps.io
+      }
+    ),
     dir: flag(parsed, "out"),
     root: deps.root ?? "",
+    keepEdits: flag(parsed, "keep-edits") === "true",
     ...deps.workflowPull
   });
   return { result, text: formatWorkflowPull(result) };
@@ -7030,7 +7190,8 @@ async function execute(command, parsed, sync, deps) {
     const result2 = await pushWorkflow(
       sync,
       flag(parsed, "from") ?? ".",
-      parsed.positionals[0] || void 0
+      parsed.positionals[0] || void 0,
+      { rebase: flag(parsed, "rebase") === "true" }
     );
     return { result: result2, text: formatWorkflowPush(result2) };
   }
@@ -7064,14 +7225,20 @@ export {
   formatExecutionPull,
   formatWorkflowPull,
   formatWorkflowPush,
+  headFilesRequest,
   leadingWords,
+  loadManifest,
   matchCommand,
   matchesGlob,
   parseInvocation,
+  pullDir,
   pullExecution,
   pullWorkflow,
   pushWorkflow,
+  readManifest,
   render,
   runSync,
-  withSyncCommands
+  runsLocally,
+  withSyncCommands,
+  writeManifest
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@asteroidai/cli",
-  "version": "1.9.98",
+  "version": "1.9.99",
   "description": "The asteroid command-line interface for the Asteroid platform.",
   "type": "module",
   "license": "MIT",