retell-sync-cli 1.0.0 → 1.1.0

package/dist/cli.js

@@ -96621,6 +96621,9 @@ var require_dist = __commonJS((exports) => {
   exports.visitAsync = visit.visitAsync;
 });
 
+// src/cli.ts
+var {$: $13 } = globalThis.Bun;
+
 // node_modules/commander/esm.mjs
 var import__ = __toESM(require_commander(), 1);
 var {
@@ -134612,19 +134615,13 @@ var dist_default3 = createPrompt((config2, done) => {
 var {$: $11 } = globalThis.Bun;
 async function pullCommand(opts, cmd) {
   const globalOpts = cmd.optsWithGlobals();
-  const {
-    branch = globalOpts.branch,
-    draft = false,
-    yes = false,
-    merge: merge2 = false
-  } = opts;
   try {
     await pull({
       agentsDir: globalOpts.agentsDir,
-      branch,
-      draft,
-      yes,
-      merge: merge2
+      syncBranch: globalOpts.syncBranch,
+      workingBranch: opts.merge ? globalOpts.workingBranch : undefined,
+      draft: opts.draft,
+      yes: opts.yes
     });
   } catch (err) {
     if (err instanceof ExitPromptError) {
@@ -134636,10 +134633,10 @@ async function pullCommand(opts, cmd) {
 }
 async function pull({
   agentsDir = DEFAULT_AGENTS_DIR,
-  branch,
+  syncBranch,
+  workingBranch,
   draft: pullDrafts = false,
-  yes: skipConfirmations = false,
-  merge: merge2 = false
+  yes: skipConfirmations = false
 }) {
   if (pullDrafts && !skipConfirmations) {
     const proceed = await dist_default3({
@@ -134654,7 +134651,7 @@ async function pull({
   const remoteState = await getRemoteState({ draft: pullDrafts });
   spinner.stop(source_default.dim(`${pluralize("agent", remoteState.voiceAgents.length, true)}, ${pluralize("LLM", remoteState.llms.length, true)}, ${pluralize("flow", remoteState.conversationFlows.length, true)}`));
   const regressions = await checkVersionRegressions(remoteState.voiceAgents, {
-    branch,
+    syncBranch,
     agentsDir
   });
   if (regressions.length > 0 && !skipConfirmations) {
@@ -134676,40 +134673,48 @@ Warning: ${regressions.length} agent(s) would have their version regressed:`));
   const files = await serializeState(remoteState, { agentsDir });
   spinner.stop(source_default.dim(`${pluralize("file", Object.keys(files).length, true)}`));
   spinner = createSpinner("Creating git objects...");
-  const result = await createCommitFromFiles(files, branch, {
+  const result = await createCommitFromFiles(files, syncBranch, {
     agents: remoteState.voiceAgents.length,
     llms: remoteState.llms.length,
     flows: remoteState.conversationFlows.length
   });
   if (result.created) {
-    spinner.stop(source_default.green(`Updated ${source_default.bold(branch)} to ${source_default.yellow(result.commitSha.slice(0, 7))}`));
+    spinner.stop(source_default.green(`Updated ${source_default.bold(syncBranch)} to ${source_default.yellow(result.commitSha.slice(0, 7))}`));
   } else {
     spinner.stop(source_default.dim(`No changes detected`));
   }
-  if (merge2) {
-    let targetBranch;
-    if (typeof merge2 === "string") {
-      targetBranch = merge2;
+  if (workingBranch) {
+    spinner = createSpinner(`Merging ${syncBranch} into ${workingBranch}...`);
+    const { stdout: srcStdout } = await $11`git rev-parse refs/heads/${syncBranch}`.quiet();
+    const srcSha = srcStdout.toString().trim();
+    const { stdout: targetStdout, exitCode: targetExitCode } = await $11`git rev-parse refs/heads/${workingBranch} 2>/dev/null`.nothrow().quiet();
+    if (targetExitCode !== 0) {
+      await $11`git update-ref refs/heads/${workingBranch} ${srcSha}`.quiet();
+      spinner.stop(source_default.green(`Created ${source_default.bold(workingBranch)} from ${source_default.bold(syncBranch)}`));
     } else {
-      const { stdout } = await $11`git rev-parse --abbrev-ref HEAD`.quiet();
-      targetBranch = stdout.toString().trim();
-    }
-    spinner = createSpinner(`Merging ${branch} into ${targetBranch}...`);
-    const {
-      exitCode,
-      stdout: mergeOut,
-      stderr
-    } = await $11`git merge ${branch} --allow-unrelated-histories --no-edit -m "Merge ${branch}"`.nothrow().quiet();
-    if (exitCode === 0) {
-      const alreadyUpToDate = mergeOut.toString().includes("Already up to date");
-      if (alreadyUpToDate) {
+      const targetSha = targetStdout.toString().trim();
+      if (srcSha === targetSha) {
         spinner.stop(source_default.dim(`Already up to date`));
       } else {
-        spinner.stop(source_default.green(`Merged ${source_default.bold(branch)} into ${source_default.bold(targetBranch)}`));
+        const { exitCode: isAncestor } = await $11`git merge-base --is-ancestor ${targetSha} ${srcSha}`.nothrow().quiet();
+        if (isAncestor === 0) {
+          await $11`git update-ref refs/heads/${workingBranch} ${srcSha}`.quiet();
+          spinner.stop(source_default.green(`Fast-forwarded ${source_default.bold(workingBranch)} to ${source_default.bold(syncBranch)}`));
+        } else {
+          const { stdout: mergeTreeOut, exitCode: mergeTreeExit } = await $11`git merge-tree --write-tree ${targetSha} ${srcSha}`.nothrow().quiet();
+          if (mergeTreeExit !== 0) {
+            spinner.stop(source_default.red(`Merge conflict`));
+            console.error(source_default.red(`Cannot auto-merge ${syncBranch} into ${workingBranch}. Resolve conflicts manually.`));
+          } else {
+            const mergedTreeSha = mergeTreeOut.toString().trim();
+            const message = `Merge ${syncBranch} into ${workingBranch}`;
+            const { stdout: commitOut } = await $11`git commit-tree ${mergedTreeSha} -p ${targetSha} -p ${srcSha} -m ${message}`.quiet();
+            const mergeCommitSha = commitOut.toString().trim();
+            await $11`git update-ref refs/heads/${workingBranch} ${mergeCommitSha}`.quiet();
+            spinner.stop(source_default.green(`Merged ${source_default.bold(syncBranch)} into ${source_default.bold(workingBranch)}`));
+          }
+        }
       }
-    } else {
-      spinner.stop(source_default.red(`Merge failed`));
-      console.error(source_default.red(stderr.toString()));
     }
   }
 }
@@ -134774,10 +134779,12 @@ async function createCommitFromFiles(files, branch, stats) {
   await $11`git update-ref refs/heads/${branch} ${commitSha}`.quiet();
   return { created: true, commitSha };
 }
-async function checkVersionRegressions(remoteAgents, { branch, agentsDir }) {
+async function checkVersionRegressions(remoteAgents, { syncBranch, agentsDir }) {
   let branchState;
   try {
-    branchState = await getCommitState(`refs/heads/${branch}`, { agentsDir });
+    branchState = await getCommitState(`refs/heads/${syncBranch}`, {
+      agentsDir
+    });
   } catch {
     return [];
   }
@@ -134800,15 +134807,15 @@ async function checkVersionRegressions(remoteAgents, { branch, agentsDir }) {
 // src/commands/deploy.ts
 async function deployCommand(opts, cmd) {
   const globalOpts = cmd.optsWithGlobals();
-  const { dryRun = false, draft = false, yes = false, publish = false } = opts;
   try {
     await deploy({
       agentsDir: globalOpts.agentsDir,
-      branch: globalOpts.branch,
-      dryRun,
-      draft,
-      yes,
-      publish
+      syncBranch: globalOpts.syncBranch,
+      workingBranch: globalOpts.workingBranch,
+      dryRun: opts.dryRun,
+      draft: opts.draft,
+      yes: opts.yes,
+      publish: opts.publish
     });
   } catch (err) {
     if (err instanceof ExitPromptError) {
@@ -134820,7 +134827,8 @@ async function deployCommand(opts, cmd) {
 }
 async function deploy({
   agentsDir = DEFAULT_AGENTS_DIR,
-  branch,
+  syncBranch,
+  workingBranch,
   dryRun = false,
   draft = false,
   yes = false,
@@ -134828,20 +134836,20 @@ async function deploy({
 }) {
   console.log(source_default.bold("Pulling first..."));
   await pull({
-    merge: true,
+    syncBranch,
+    workingBranch,
     draft,
     yes,
-    agentsDir,
-    branch
+    agentsDir
   });
   console.log(source_default.bold("Analyzing changes..."));
-  const [{ stdout: headRef }, { stdout: syncRef }] = await Promise.all([
-    $12`git rev-parse HEAD`.quiet(),
-    $12`git rev-parse ${branch}`.quiet()
+  const [{ stdout: workingRef }, { stdout: syncRef }] = await Promise.all([
+    $12`git rev-parse refs/heads/${workingBranch}`.quiet(),
+    $12`git rev-parse refs/heads/${syncBranch}`.quiet()
   ]);
   let spinner = createSpinner("Reading state from git...");
   const [currentState, syncState] = await Promise.all([
-    getCommitState(headRef.toString().trim(), { agentsDir }),
+    getCommitState(workingRef.toString().trim(), { agentsDir }),
     getCommitState(syncRef.toString().trim(), { agentsDir })
   ]);
   spinner.stop(source_default.dim("Read state from git"));
@@ -134929,7 +134937,7 @@ async function deploy({
       draft,
       yes: true,
       agentsDir,
-      branch
+      syncBranch
     });
   }
 }
@@ -135021,8 +135029,20 @@ function printChangeSummary(changes) {
 
 // src/cli.ts
 var program2 = new Command;
-var DEFAULT_BRANCH = "retell-sync";
-program2.name("retell").description("Retell AI agent management CLI").option("-w, --agents-dir <dir>", "Directory for agent files", DEFAULT_AGENTS_DIR).option("-b, --branch <branch>", "Git branch for sync", DEFAULT_BRANCH);
-program2.command("pull").description("Pull agents from Retell API").option("-b, --branch <branch>", "Git branch for sync (overrides global)").option("-d, --draft", "Include unpublished agents").option("-y, --yes", "Skip confirmation prompts").option("-m, --merge [target]", "Merge sync branch into target (defaults to current branch)").action(pullCommand);
+var DEFAULT_SYNC_BRANCH = "retell-sync";
+async function getCurrentBranch() {
+  const { stdout, exitCode } = await $13`git rev-parse --abbrev-ref HEAD`.nothrow().quiet();
+  if (exitCode !== 0)
+    return "HEAD";
+  const branch = stdout.toString().trim();
+  return branch === "HEAD" ? "HEAD" : branch;
+}
+program2.name("retell").description("Retell AI agent management CLI").option("-w, --agents-dir <dir>", "Directory for agent files", DEFAULT_AGENTS_DIR).option("-s, --sync-branch <branch>", "Branch for storing API state", DEFAULT_SYNC_BRANCH).option("-b, --working-branch <branch>", "Branch to merge into / compare against (defaults to current branch)").hook("preAction", async (thisCommand) => {
+  const opts = thisCommand.opts();
+  if (!opts.workingBranch) {
+    opts.workingBranch = await getCurrentBranch();
+  }
+});
+program2.command("pull").description("Pull agents from Retell API and optionally merge into working branch").option("-d, --draft", "Include unpublished agents").option("-y, --yes", "Skip confirmation prompts").option("-m, --merge", "Merge sync branch into working branch after pull").action(pullCommand);
 program2.command("deploy").description("Deploy local changes to Retell API").option("-n, --dry-run", "Show changes without applying").option("-d, --draft", "Include unpublished agents when pulling").option("-y, --yes", "Skip confirmation prompts").option("-p, --publish", "Publish agents after deploying").action(deployCommand);
 program2.parse();

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "retell-sync-cli",
   "author": "zachsents",
-  "version": "1.0.0",
+  "version": "1.1.0",
   "description": "CLI tool for syncing Retell AI agents between local filesystem and API",
   "type": "module",
   "main": "cli.ts",