Add pull command

Author: donnes

src/commands/pull.ts

@@ -0,0 +1,110 @@
+/**
+ * Pull agent configs from remote repository
+ */
+
+import * as p from "@clack/prompts";
+import { getConfig } from "../config/manager";
+import type { GlobalConfig } from "../config/types";
+import {
+  fetch,
+  getBehindCount,
+  getCurrentBranch,
+  getGitStatus,
+  getRemoteUrl,
+  hasChanges,
+  pull,
+} from "../utils/git";
+import { expandHome } from "../utils/paths";
+
+export async function pullCommand() {
+  p.intro("Pull from Remote");
+
+  let config: GlobalConfig;
+  try {
+    config = getConfig();
+  } catch (_error) {
+    p.cancel(
+      "Configuration not found. Run 'syncode new' or 'syncode init' first.",
+    );
+    return;
+  }
+
+  const _repoPath = expandHome(config.repoPath);
+
+  const remoteUrl = await getRemoteUrl();
+  if (!remoteUrl) {
+    p.cancel(
+      "No remote repository configured. Add a remote with: git remote add origin <url>",
+    );
+    return;
+  }
+
+  const branch = await getCurrentBranch();
+  p.log.info(`Branch: ${branch}`);
+  p.log.info(`Remote: ${remoteUrl}`);
+
+  console.log("");
+
+  // Check for uncommitted changes
+  if (await hasChanges()) {
+    p.log.warning("Uncommitted changes detected");
+
+    const gitStatus = await getGitStatus();
+    if (gitStatus) {
+      console.log(
+        gitStatus
+          .split("\n")
+          .map((l) => `   ${l}`)
+          .join("\n"),
+      );
+      console.log("");
+    }
+
+    p.log.warning(
+      "Cannot pull with uncommitted changes. Commit or stash them first.",
+    );
+    p.outro("Pull cancelled");
+    return;
+  }
+
+  // Fetch to get latest remote state
+  const fetchSpinner = p.spinner();
+  fetchSpinner.start("Fetching from remote");
+
+  const fetchResult = await fetch();
+  if (!fetchResult.success) {
+    fetchSpinner.stop("Fetch failed");
+    p.log.error(fetchResult.message);
+    p.outro("Pull cancelled");
+    return;
+  }
+
+  fetchSpinner.stop("Fetched from remote");
+
+  // Check if we're behind
+  const behindCount = await getBehindCount();
+  if (behindCount === 0) {
+    p.log.success("Already up to date");
+    p.outro("No changes to pull");
+    return;
+  }
+
+  p.log.info(`${behindCount} commit(s) behind remote`);
+
+  // Pull from remote
+  const spinner = p.spinner();
+  spinner.start(`Pulling from ${branch}`);
+
+  const result = await pull();
+
+  if (result.success) {
+    spinner.stop(`Pulled ${behindCount} commit(s) from ${branch}`);
+    p.outro("Successfully pulled from remote");
+  } else {
+    spinner.stop("Pull failed");
+    const { logError, getErrorLogFile } = require("../utils/trace");
+    const logFile = logError(new Error(result.message), "pull");
+    p.log.error(result.message);
+    p.cancel(`Failed to pull from remote\n${getErrorLogFile(logFile)}`);
+  }
+}

src/index.ts

@@ -7,6 +7,7 @@ import * as p from "@clack/prompts";
 import { initCommand } from "./commands/init";
 import { machineCommand } from "./commands/machine";
 import { newCommand } from "./commands/new";
+import { pullCommand } from "./commands/pull";
 import { pushCommand } from "./commands/push";
 import { statusCommand } from "./commands/status";
 import { syncCommand } from "./commands/sync";
@@ -29,6 +30,7 @@ const commands = {
   unsync: unsyncCommand,
   status: statusCommand,
   push: pushCommand,
+  pull: pullCommand,
 };
 
 async function main() {
@@ -114,6 +116,11 @@ async function main() {
         label: "Push to remote",
         hint: "Push config changes to git remote",
       },
+      {
+        value: "pull",
+        label: "Pull from remote",
+        hint: "Pull config changes from git remote",
+      },
     ],
   });
 
@@ -146,6 +153,7 @@ Sync Commands:
   unsync        Remove symlinks and keep local configs
   status        Show status of synced agents
   push          Push config changes to git remote
+  pull          Pull config changes from git remote
 
 Machine Commands:
   machine       Machine setup tools (deps, status)
@@ -162,6 +170,7 @@ Examples:
   syncode sync         # Sync agent configs
   syncode unsync       # Remove symlinks
   syncode push         # Push changes to remote
+  syncode pull         # Pull changes from remote
   syncode machine      # Machine setup tools
 
 Quick Start:

src/utils/git.ts

@@ -72,6 +72,40 @@ export async function push(): Promise<{ success: boolean; message: string }> {
   return { success: false, message: result.stderr || "Push failed" };
 }
 
+export async function pull(): Promise<{ success: boolean; message: string }> {
+  const repoRoot = getRepoRoot();
+  const result = await exec(`git -C "${repoRoot}" pull --rebase`);
+  if (result.success) {
+    return { success: true, message: "Pulled from remote" };
+  }
+  return { success: false, message: result.stderr || "Pull failed" };
+}
+
+export async function fetch(): Promise<{ success: boolean; message: string }> {
+  const repoRoot = getRepoRoot();
+  const result = await exec(`git -C "${repoRoot}" fetch`);
+  if (result.success) {
+    return { success: true, message: "Fetched from remote" };
+  }
+  return { success: false, message: result.stderr || "Fetch failed" };
+}
+
+export async function getAheadCount(): Promise<number> {
+  const repoRoot = getRepoRoot();
+  const result = await exec(
+    `git -C "${repoRoot}" rev-list --count @{upstream}..HEAD 2>/dev/null || echo "0"`,
+  );
+  return Number.parseInt(result.stdout, 10) || 0;
+}
+
+export async function getBehindCount(): Promise<number> {
+  const repoRoot = getRepoRoot();
+  const result = await exec(
+    `git -C "${repoRoot}" rev-list --count HEAD..@{upstream} 2>/dev/null || echo "0"`,
+  );
+  return Number.parseInt(result.stdout, 10) || 0;
+}
+
 export async function getCurrentBranch(): Promise<string> {
   const repoRoot = getRepoRoot();
   const result = await exec(`git -C "${repoRoot}" branch --show-current`);