@markjaquith/agency 3.9.2 → 3.9.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@markjaquith/agency",
-  "version": "3.9.2",
+  "version": "3.9.3",
   "description": "Manage agentic work across repositories with durable workbases",
   "keywords": [
     "agents",

package/src/services/PushService.ts

@@ -5,6 +5,7 @@ import { PhaseService } from "./PhaseService"
 import { TaskService } from "./TaskService"
 import { WorkbaseService } from "./WorkbaseService"
 import { parseGitCommits, type PushCommitMetadata } from "./push-validation"
+import { isDirtyGitStatus } from "./VersionControlService"
 
 type PushCategory =
 	| "precondition"
@@ -374,11 +375,11 @@ const publishGit = (
 		const status = yield* git(
 			fs,
 			checkout,
-			["status", "--porcelain=v1"],
+			["status", "--porcelain=v1", "-z", "--untracked-files=all"],
 			"Failed to inspect Git status",
 			"inspect",
 		)
-		if (status.stdout.length > 0) {
+		if (isDirtyGitStatus(status.stdout)) {
 			return yield* pushError(
 				"Cannot publish a dirty Git worktree; commit or discard changes first",
 				"precondition",

package/src/services/VersionControlService.ts

@@ -58,6 +58,17 @@ export interface VersionControlBackend {
 	) => Effect.Effect<void, unknown, any>
 }
 
+const ignoredUntrackedGitPath = /^(?:.*\/)?\.DS_Store$/
+
+export const isDirtyGitStatus = (output: string): boolean =>
+	(output.includes("\0") ? output.split("\0") : output.split(/\r?\n/)).some(
+		(line) => {
+			if (!line) return false
+			if (!line.startsWith("?? ")) return true
+			return !ignoredUntrackedGitPath.test(line.slice(3))
+		},
+	)
+
 class VersionControlError extends Data.TaggedError("VersionControlError")<{
 	readonly message: string
 }> {}
@@ -267,10 +278,20 @@ export class GitVersionControlService extends Effect.Service<GitVersionControlSe
 					Effect.gen(function* () {
 						const fs = yield* FileSystemService
 						const result = yield* fs.runCommand(
-							["git", "-C", workspacePath, "status", "--porcelain"],
+							[
+								"git",
+								"-C",
+								workspacePath,
+								"status",
+								"--porcelain=v1",
+								"-z",
+								"--untracked-files=all",
+							],
 							{ captureOutput: true },
 						)
-						return result.exitCode === 0 ? result.stdout.length > 0 : null
+						return result.exitCode === 0
+							? isDirtyGitStatus(result.stdout)
+							: null
 					}),
 				fetch: (repositoryPath, remote = "origin", branch) =>
 					Effect.gen(function* () {

package/src/services/WorktreeService.ts

@@ -18,7 +18,10 @@ import type { BaseCommandOptions } from "../utils/command"
 import { createLoggers } from "../utils/effect"
 import { createProgress } from "../utils/progress"
 import { withWorktreeLocks } from "./WorktreeLock"
-import { VersionControlService } from "./VersionControlService"
+import {
+	isDirtyGitStatus,
+	VersionControlService,
+} from "./VersionControlService"
 import type {
 	RegisteredWorkspace,
 	VersionControlBackend,
@@ -75,7 +78,7 @@ interface GitWorktree {
 	readonly branch?: string
 }
 
-const managedWorktreeIgnorePatterns = ["/.worktree.lock"] as const
+const managedWorktreeIgnorePatterns = ["/.worktree.lock", ".DS_Store"] as const
 const vcs = "git" as const
 
 interface WorktreeOwner {
@@ -550,13 +553,21 @@ const inspectExecution = (
 			const status =
 				actual && actualExists
 					? yield* fs.runCommand(
-							["git", "-C", actual.path, "status", "--porcelain"],
+							[
+								"git",
+								"-C",
+								actual.path,
+								"status",
+								"--porcelain=v1",
+								"-z",
+								"--untracked-files=all",
+							],
 							{ captureOutput: true },
 						)
 					: null
 			const dirty = status
 				? status.exitCode === 0
-					? status.stdout.length > 0
+					? isDirtyGitStatus(status.stdout)
 					: null
 				: null
 			const expectedRef = "branch" in checkout ? checkout.branch : checkout.ref
@@ -2076,7 +2087,15 @@ export class WorktreeService extends Effect.Service<WorktreeService>()(
 							}
 							if (checkoutExists) {
 								const status = yield* fs.runCommand(
-									["git", "-C", checkoutPath, "status", "--porcelain"],
+									[
+										"git",
+										"-C",
+										checkoutPath,
+										"status",
+										"--porcelain=v1",
+										"-z",
+										"--untracked-files=all",
+									],
 									{ captureOutput: true },
 								)
 								if (status.exitCode !== 0) {
@@ -2084,7 +2103,7 @@ export class WorktreeService extends Effect.Service<WorktreeService>()(
 										message: `Failed to remove worktree for '${alias}': checkout cleanliness could not be verified: ${status.stderr.trim() || `git status exited with code ${status.exitCode}`}`,
 									})
 								}
-								if (status.stdout.trim()) {
+								if (isDirtyGitStatus(status.stdout)) {
 									return yield* new WorktreeError({
 										message: `Failed to remove worktree for '${alias}': checkout has uncommitted changes`,
 									})