@markjaquith/agency 1.6.0 → 1.6.2

package/cli.ts

@@ -635,7 +635,31 @@ try {
 	await command.run(cmdPositionals, cmdValues, commandArgs)
 } catch (error) {
 	if (error instanceof Error) {
-		console.error(`ⓘ ${error.message}`)
+		let message = error.message
+
+		// Handle Effect FiberFailure errors that wrap tagged errors
+		// When the message is generic "An error has occurred", try to extract the actual error
+		if (message === "An error has occurred") {
+			// Try to extract the actual error from Effect's Cause structure
+			const causeSymbol = Object.getOwnPropertySymbols(error).find((s) =>
+				s.toString().includes("Cause"),
+			)
+			if (causeSymbol) {
+				const cause = (error as any)[causeSymbol]
+				if (cause && cause._tag === "Fail" && cause.failure) {
+					const failure = cause.failure
+					// Try common error message patterns
+					message =
+						failure.message ||
+						failure.stderr ||
+						(failure._tag
+							? `${failure._tag}: ${JSON.stringify(failure)}`
+							: JSON.stringify(failure))
+				}
+			}
+		}
+
+		console.error(`ⓘ ${message}`)
 	} else {
 		console.error("An unexpected error occurred:", error)
 	}

package/package.json

@@ -1,53 +1,65 @@
 {
   "name": "@markjaquith/agency",
-  "version": "1.6.0",
+  "version": "1.6.2",
   "description": "Manages personal agents files",
+  "keywords": [
+    "agents",
+    "bun",
+    "personal-agents",
+    "typescript"
+  ],
   "license": "MIT",
   "author": "Mark Jaquith",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/markjaquith/agency.git"
   },
-  "module": "index.ts",
-  "type": "module",
   "bin": {
     "agency": "cli.ts"
   },
+  "files": [
+    "index.ts",
+    "cli.ts",
+    "src",
+    "templates",
+    "README.md",
+    "LICENSE"
+  ],
+  "type": "module",
+  "module": "index.ts",
+  "exports": {
+    ".": {
+      "types": "./index.ts",
+      "import": "./index.ts"
+    }
+  },
+  "publishConfig": {
+    "access": "public",
+    "provenance": true,
+    "registry": "https://registry.npmjs.org/",
+    "tag": "latest"
+  },
   "scripts": {
     "test": "find src -name '*.test.ts' ! -name '*.integration.test.ts' -print0 | xargs -0 -n 1 -P 4 bun test",
     "test:integration": "find src -name '*.integration.test.ts' -print0 | xargs -0 -n 1 -P 4 bun test",
     "test:all": "find src -name '*.test.ts' -print0 | xargs -0 -n 1 -P 4 bun test",
-    "format": "prettier --write .",
-    "format:check": "prettier --check .",
+    "format": "oxfmt",
+    "format:check": "oxfmt --check",
     "knip": "knip --production",
     "pushable": "./scripts/pushable",
     "check-commit-msg": "./scripts/check-commit-msg",
     "build": "bun build cli.ts --outdir dist --target node --minify"
   },
-  "exports": {
-    ".": {
-      "import": "./index.ts",
-      "types": "./index.ts"
-    }
+  "dependencies": {
+    "@effect/schema": "^0.75.5",
+    "effect": "^3.19.15",
+    "jsonc-parser": "^3.3.1",
+    "ora": "^8.2.0"
   },
-  "files": [
-    "index.ts",
-    "cli.ts",
-    "src",
-    "templates",
-    "README.md",
-    "LICENSE"
-  ],
-  "keywords": [
-    "agents",
-    "bun",
-    "typescript",
-    "personal-agents"
-  ],
   "devDependencies": {
     "@types/bun": "^1.3.6",
     "knip": "^5.82.1",
-    "prettier": "^3.8.1"
+    "oxfmt": "^0.27.0"
   },
   "peerDependencies": {
     "typescript": "^5.9.3"
@@ -55,19 +67,7 @@
   "engines": {
     "bun": ">=1.0.0"
   },
-  "dependencies": {
-    "@effect/schema": "^0.75.5",
-    "effect": "^3.19.15",
-    "jsonc-parser": "^3.3.1",
-    "ora": "^8.2.0"
-  },
   "trustedDependencies": [
     "@triggi/native-exec"
-  ],
-  "publishConfig": {
-    "registry": "https://registry.npmjs.org/",
-    "tag": "latest",
-    "access": "public",
-    "provenance": true
-  }
+  ]
 }

package/src/commands/task.ts

@@ -422,14 +422,36 @@ export const task = (options: TaskOptions = {}) =>
 				(yield* git.findDefaultRemote(targetPath))
 
 			if (remote) {
-				log(info(`Fetching latest from ${highlight.branch(remote)}...`))
-				verboseLog(`Fetching from remote: ${remote}`)
-				yield* git.fetch(targetPath, remote).pipe(
-					Effect.catchAll((err) => {
-						verboseLog(`Failed to fetch from ${remote}: ${err}`)
-						return Effect.void
-					}),
-				)
+				// Get just the branch name (e.g., "main") to fetch only that branch
+				// This is much faster than fetching all branches in large repos
+				const mainBranchName = yield* git.getMainBranchName(targetPath)
+
+				if (mainBranchName) {
+					log(
+						info(
+							`Fetching latest from ${highlight.branch(`${remote}/${mainBranchName}`)}...`,
+						),
+					)
+					verboseLog(`Fetching ${mainBranchName} from remote: ${remote}`)
+					yield* git.fetch(targetPath, remote, mainBranchName).pipe(
+						Effect.catchAll((err) => {
+							verboseLog(
+								`Failed to fetch ${mainBranchName} from ${remote}: ${err}`,
+							)
+							return Effect.void
+						}),
+					)
+				} else {
+					// Fallback: fetch all branches if we can't determine the main branch
+					log(info(`Fetching latest from ${highlight.branch(remote)}...`))
+					verboseLog(`Fetching all branches from remote: ${remote}`)
+					yield* git.fetch(targetPath, remote).pipe(
+						Effect.catchAll((err) => {
+							verboseLog(`Failed to fetch from ${remote}: ${err}`)
+							return Effect.void
+						}),
+					)
+				}
 			}
 
 			// Now resolve the main branch (preferring remote)

package/src/services/GitService.ts

@@ -22,7 +22,14 @@ export class GitCommandError extends Data.TaggedError("GitCommandError")<{
 	command: string
 	exitCode: number
 	stderr: string
-}> {}
+}> {
+	override get message(): string {
+		return (
+			this.stderr ||
+			`Git command failed with exit code ${this.exitCode}: ${this.command}`
+		)
+	}
+}
 
 // Error mapper for git command failures
 const mapToGitCommandError = createErrorMapper(GitCommandError)
@@ -515,6 +522,72 @@ export class GitService extends Effect.Service<GitService>()("GitService", {
 				),
 			),
 
+		/**
+		 * Gets just the main branch name (e.g., "main" or "master") without any remote prefix.
+		 *
+		 * This is useful when you need to fetch a specific branch from a remote,
+		 * as `git fetch origin main` requires just the branch name, not `origin/main`.
+		 */
+		getMainBranchName: (gitRoot: string) =>
+			Effect.gen(function* () {
+				// Get the configured main branch
+				const configuredBranch = yield* getGitConfigEffect(
+					"agency.mainBranch",
+					gitRoot,
+				).pipe(Effect.catchAll(() => Effect.succeed(null)))
+
+				// If configured, strip any remote prefix and return
+				if (configuredBranch) {
+					// Strip remote prefix if present (e.g., "origin/main" -> "main")
+					return (
+						configuredBranch.match(/^[^/]+\/(.+)$/)?.[1] || configuredBranch
+					)
+				}
+
+				// Otherwise, find the main branch by checking what exists
+				// We need to check for common branch names that exist (local or remote)
+				const remotesResult = yield* runGitCommand(["git", "remote"], gitRoot)
+				const remotes =
+					remotesResult.exitCode === 0 && remotesResult.stdout.trim()
+						? remotesResult.stdout.trim().split("\n")
+						: []
+
+				// Determine the default remote
+				let defaultRemote: string | null = null
+				if (remotes.length > 0) {
+					if (remotes.includes("origin")) {
+						defaultRemote = "origin"
+					} else if (remotes.includes("upstream")) {
+						defaultRemote = "upstream"
+					} else {
+						defaultRemote = remotes[0] || null
+					}
+				}
+
+				// Check for common branch names (either remote or local)
+				for (const branchName of ["main", "master"]) {
+					// Check remote version first
+					if (defaultRemote) {
+						const remoteBranch = `${defaultRemote}/${branchName}`
+						const exists = yield* branchExistsEffect(gitRoot, remoteBranch)
+						if (exists) {
+							return branchName
+						}
+					}
+					// Check local version
+					const localExists = yield* branchExistsEffect(gitRoot, branchName)
+					if (localExists) {
+						return branchName
+					}
+				}
+
+				return null
+			}).pipe(
+				Effect.mapError(
+					() => new GitError({ message: "Failed to get main branch name" }),
+				),
+			),
+
 		getDefaultBaseBranchConfig: (gitRoot: string) =>
 			pipe(
 				getGitConfigEffect("agency.baseBranch", gitRoot),

package/src/utils/process.ts

@@ -27,7 +27,14 @@ class ProcessError extends Data.TaggedError("ProcessError")<{
 	command: string
 	exitCode: number
 	stderr: string
-}> {}
+}> {
+	override get message(): string {
+		return (
+			this.stderr ||
+			`Process failed with exit code ${this.exitCode}: ${this.command}`
+		)
+	}
+}
 
 /**
  * Spawn a process with proper error handling and typed results.