@markjaquith/agency 0.5.0

package/package.json

@@ -0,0 +1,65 @@
+{
+  "name": "@markjaquith/agency",
+  "version": "0.5.0",
+  "description": "Manages personal agents files",
+  "license": "MIT",
+  "author": "Mark Jaquith",
+  "module": "index.ts",
+  "type": "module",
+  "bin": {
+    "agency": "cli.ts"
+  },
+  "scripts": {
+    "test": "bun test",
+    "format": "prettier --write .",
+    "format:check": "prettier --check .",
+    "knip": "knip --production",
+    "pushable": "./scripts/pushable",
+    "check-commit-msg": "./scripts/check-commit-msg",
+    "changeset": "changeset",
+    "version": "changeset version",
+    "release": "bun run build && changeset publish --provenance",
+    "build": "bun build cli.ts --outdir dist --target node --minify"
+  },
+  "exports": {
+    ".": {
+      "import": "./index.ts",
+      "types": "./index.ts"
+    }
+  },
+  "files": [
+    "index.ts",
+    "cli.ts",
+    "src",
+    "templates",
+    "README.md",
+    "LICENSE"
+  ],
+  "keywords": [
+    "agents",
+    "bun",
+    "typescript",
+    "personal-agents"
+  ],
+  "devDependencies": {
+    "@changesets/cli": "^2.29.8",
+    "@types/bun": "latest",
+    "knip": "^5.70.1",
+    "prettier": "^3.6.2"
+  },
+  "peerDependencies": {
+    "typescript": "^5"
+  },
+  "engines": {
+    "bun": ">=1.0.0"
+  },
+  "dependencies": {
+    "@effect/schema": "^0.75.5",
+    "effect": "^3.19.6",
+    "jsonc-parser": "^3.3.1",
+    "ora": "^8.1.1"
+  },
+  "trustedDependencies": [
+    "@triggi/native-exec"
+  ]
+}

package/src/commands/base.test.ts

@@ -0,0 +1,198 @@
+import { describe, test, expect, beforeEach, afterEach } from "bun:test"
+import { base } from "./base"
+import {
+	createTempDir,
+	cleanupTempDir,
+	initGitRepo,
+	getGitConfig,
+	runTestEffect,
+} from "../test-utils"
+import { getBaseBranchFromMetadata, writeAgencyMetadata } from "../types"
+
+describe("base", () => {
+	let testDir: string
+	let originalCwd: string
+
+	beforeEach(async () => {
+		originalCwd = process.cwd()
+		testDir = await createTempDir()
+		await initGitRepo(testDir)
+		process.chdir(testDir)
+	})
+
+	afterEach(async () => {
+		process.chdir(originalCwd)
+		await cleanupTempDir(testDir)
+	})
+
+	describe("base set", () => {
+		test("sets base branch for current branch", async () => {
+			// Create a feature branch
+			await Bun.spawn(["git", "checkout", "-b", "feature"], {
+				cwd: testDir,
+				stdout: "pipe",
+				stderr: "pipe",
+			}).exited
+
+			// Create agency.json first
+			await writeAgencyMetadata(testDir, {
+				version: 1 as const,
+				template: "test",
+				injectedFiles: [],
+				createdAt: new Date().toISOString(),
+			} as any)
+
+			// Set base branch
+			await runTestEffect(
+				base({
+					subcommand: "set",
+					args: ["main"],
+					silent: true,
+				}),
+			)
+
+			// Verify it was saved
+			const savedBase = await getBaseBranchFromMetadata(testDir)
+			expect(savedBase).toBe("main")
+		})
+
+		test("sets repository-level default base branch", async () => {
+			// Set repo-level base branch
+			await runTestEffect(
+				base({
+					subcommand: "set",
+					args: ["main"],
+					repo: true,
+					silent: true,
+				}),
+			)
+
+			// Verify it was saved to git config
+			const savedBase = await getGitConfig("agency.baseBranch", testDir)
+			expect(savedBase).toBe("main")
+		})
+
+		test("throws error if base branch does not exist", async () => {
+			await expect(
+				runTestEffect(
+					base({
+						subcommand: "set",
+						args: ["nonexistent"],
+						silent: true,
+					}),
+				),
+			).rejects.toThrow("does not exist")
+		})
+	})
+
+	describe("base get", () => {
+		test("gets base branch for current branch", async () => {
+			// Create a feature branch
+			await Bun.spawn(["git", "checkout", "-b", "feature"], {
+				cwd: testDir,
+				stdout: "pipe",
+				stderr: "pipe",
+			}).exited
+
+			// Create agency.json with base branch
+			await writeAgencyMetadata(testDir, {
+				version: 1,
+				template: "test",
+				injectedFiles: [],
+				baseBranch: "main",
+				createdAt: new Date().toISOString(),
+			} as any)
+
+			// Mock console.log to capture output
+			const logs: string[] = []
+			const originalLog = console.log
+			console.log = (...args: any[]) => logs.push(args.join(" "))
+
+			try {
+				await runTestEffect(
+					base({
+						subcommand: "get",
+						args: [],
+						silent: false,
+					}),
+				)
+				expect(logs[0]).toBe("main")
+			} finally {
+				console.log = originalLog
+			}
+		})
+
+		test("throws error if no base branch configured", async () => {
+			// Create a feature branch
+			await Bun.spawn(["git", "checkout", "-b", "feature"], {
+				cwd: testDir,
+				stdout: "pipe",
+				stderr: "pipe",
+			}).exited
+
+			// Create agency.json without base branch
+			await writeAgencyMetadata(testDir, {
+				version: 1,
+				template: "test",
+				injectedFiles: [],
+				createdAt: new Date().toISOString(),
+			} as any)
+
+			await expect(
+				runTestEffect(
+					base({
+						subcommand: "get",
+						args: [],
+						silent: true,
+					}),
+				),
+			).rejects.toThrow("No base branch configured")
+		})
+	})
+
+	describe("base command", () => {
+		test("requires subcommand", async () => {
+			await expect(
+				runTestEffect(base({ args: [], silent: true })),
+			).rejects.toThrow("Subcommand is required")
+		})
+
+		test("handles 'set' subcommand", async () => {
+			await Bun.spawn(["git", "checkout", "-b", "feature"], {
+				cwd: testDir,
+				stdout: "pipe",
+				stderr: "pipe",
+			}).exited
+
+			await writeAgencyMetadata(testDir, {
+				version: 1,
+				template: "test",
+				injectedFiles: [],
+				createdAt: new Date().toISOString(),
+			} as any)
+
+			await runTestEffect(
+				base({
+					subcommand: "set",
+					args: ["main"],
+					silent: true,
+				}),
+			)
+
+			const savedBase = await getBaseBranchFromMetadata(testDir)
+			expect(savedBase).toBe("main")
+		})
+
+		test("throws error for unknown subcommand", async () => {
+			await expect(
+				runTestEffect(
+					base({
+						subcommand: "unknown",
+						args: [],
+						silent: true,
+					}),
+				),
+			).rejects.toThrow("Unknown subcommand")
+		})
+	})
+})

package/src/commands/base.ts

@@ -0,0 +1,198 @@
+import { Effect } from "effect"
+import { GitService } from "../services/GitService"
+import { setBaseBranchInMetadata, getBaseBranchFromMetadata } from "../types"
+import highlight, { done } from "../utils/colors"
+import {
+	createLoggers,
+	ensureGitRepo,
+	ensureBranchExists,
+} from "../utils/effect"
+
+interface BaseOptions {
+	subcommand?: string
+	args: string[]
+	repo?: boolean
+	silent?: boolean
+	verbose?: boolean
+}
+
+interface BaseSetOptions {
+	baseBranch: string
+	repo?: boolean
+	silent?: boolean
+	verbose?: boolean
+}
+
+interface BaseGetOptions {
+	repo?: boolean
+	silent?: boolean
+	verbose?: boolean
+}
+
+// Effect-based implementation
+const baseSetEffect = (options: BaseSetOptions) =>
+	Effect.gen(function* () {
+		const { baseBranch, repo = false } = options
+		const { log, verboseLog } = createLoggers(options)
+
+		const git = yield* GitService
+		const gitRoot = yield* ensureGitRepo()
+
+		// Validate that the base branch exists
+		yield* ensureBranchExists(
+			gitRoot,
+			baseBranch,
+			`Base branch ${highlight.branch(baseBranch)} does not exist. Please provide a valid branch name.`,
+		)
+
+		if (repo) {
+			// Set repository-level default base branch in git config
+			yield* git.setDefaultBaseBranchConfig(baseBranch, gitRoot)
+			log(
+				done(
+					`Set repository-level default base branch to ${highlight.branch(baseBranch)}`,
+				),
+			)
+		} else {
+			// Set branch-specific base branch in agency.json
+			const currentBranch = yield* git.getCurrentBranch(gitRoot)
+			verboseLog(`Current branch: ${highlight.branch(currentBranch)}`)
+
+			// Use Effect.tryPromise for metadata functions
+			yield* Effect.tryPromise({
+				try: () => setBaseBranchInMetadata(gitRoot, baseBranch),
+				catch: (error) =>
+					new Error(`Failed to set base branch in metadata: ${error}`),
+			})
+			log(
+				done(
+					`Set base branch to ${highlight.branch(baseBranch)} for ${highlight.branch(currentBranch)}`,
+				),
+			)
+		}
+	})
+
+// Effect-based implementation
+const baseGetEffect = (options: BaseGetOptions) =>
+	Effect.gen(function* () {
+		const { repo = false } = options
+		const { log, verboseLog } = createLoggers(options)
+
+		const git = yield* GitService
+		const gitRoot = yield* ensureGitRepo()
+
+		let currentBase: string | null
+
+		if (repo) {
+			// Get repository-level default base branch from git config
+			verboseLog("Reading repository-level default base branch from git config")
+			currentBase = yield* git.getDefaultBaseBranchConfig(gitRoot)
+
+			if (!currentBase) {
+				return yield* Effect.fail(
+					new Error(
+						"No repository-level base branch configured. Use 'agency base set --repo <branch>' to set one.",
+					),
+				)
+			}
+		} else {
+			// Get current branch
+			const currentBranch = yield* git.getCurrentBranch(gitRoot)
+			verboseLog(`Current branch: ${highlight.branch(currentBranch)}`)
+
+			// Get branch-specific base branch from agency.json
+			verboseLog("Reading branch-specific base branch from agency.json")
+			currentBase = yield* Effect.tryPromise({
+				try: () => getBaseBranchFromMetadata(gitRoot),
+				catch: (error) =>
+					new Error(`Failed to get base branch from metadata: ${error}`),
+			})
+
+			if (!currentBase) {
+				return yield* Effect.fail(
+					new Error(
+						`No base branch configured for ${highlight.branch(currentBranch)}. Use 'agency base set <branch>' to set one.`,
+					),
+				)
+			}
+		}
+
+		log(currentBase)
+	})
+
+export const base = (options: BaseOptions) =>
+	Effect.gen(function* () {
+		const {
+			subcommand,
+			args,
+			repo = false,
+			silent = false,
+			verbose = false,
+		} = options
+
+		if (!subcommand) {
+			return yield* Effect.fail(
+				new Error("Subcommand is required. Usage: agency base <subcommand>"),
+			)
+		}
+
+		switch (subcommand) {
+			case "set": {
+				if (!args[0]) {
+					return yield* Effect.fail(
+						new Error(
+							"Base branch argument is required. Usage: agency base set <branch>",
+						),
+					)
+				}
+				return yield* baseSetEffect({
+					baseBranch: args[0],
+					repo,
+					silent,
+					verbose,
+				})
+			}
+			case "get": {
+				return yield* baseGetEffect({
+					repo,
+					silent,
+					verbose,
+				})
+			}
+			default:
+				return yield* Effect.fail(
+					new Error(
+						`Unknown subcommand '${subcommand}'. Available subcommands: set, get`,
+					),
+				)
+		}
+	})
+
+export const help = `
+Usage: agency base <subcommand> [options]
+
+Get or set the base branch for the current feature branch.
+
+Subcommands:
+  set <branch>      Set the base branch for the current feature branch
+  get               Get the configured base branch
+
+Options:
+  --repo            Use repository-level default instead of branch-specific
+  -h, --help        Show this help message
+  -s, --silent      Suppress output messages
+  -v, --verbose     Show verbose output
+
+Examples:
+  agency base set origin/main          # Set base branch for current branch
+  agency base set --repo origin/main   # Set repository-level default for all branches
+  agency base get                      # Get branch-specific base branch
+  agency base get --repo               # Get repository-level default base branch
+
+Notes:
+  - The base branch must exist in the repository
+  - Branch-specific base branch is saved in agency.json (committed with the branch)
+  - Repository-level default is saved in .git/config (not committed)
+  - Branch-specific settings take precedence over repository-level defaults
+  - Base branch configuration is used by 'agency emit' when creating emit branches
+`