Answer mentions with Codex, and give each task its own worktree

.surface

@@ -671,6 +671,9 @@ CMD basecamp config untrust
 CMD basecamp connect
 CMD basecamp connect setup
 CMD basecamp connect show
+CMD basecamp connect worktrees
+CMD basecamp connect worktrees list
+CMD basecamp connect worktrees prune
 CMD basecamp docs
 CMD basecamp docs archive
 CMD basecamp docs doc
@@ -5425,6 +5428,72 @@ FLAG basecamp connect show --stats type=bool
 FLAG basecamp connect show --styled type=bool
 FLAG basecamp connect show --todolist type=string
 FLAG basecamp connect show --verbose type=count
+FLAG basecamp connect worktrees --account type=string
+FLAG basecamp connect worktrees --agent type=bool
+FLAG basecamp connect worktrees --cache-dir type=string
+FLAG basecamp connect worktrees --count type=bool
+FLAG basecamp connect worktrees --help type=bool
+FLAG basecamp connect worktrees --hints type=bool
+FLAG basecamp connect worktrees --ids-only type=bool
+FLAG basecamp connect worktrees --in type=string
+FLAG basecamp connect worktrees --jq type=string
+FLAG basecamp connect worktrees --json type=bool
+FLAG basecamp connect worktrees --markdown type=bool
+FLAG basecamp connect worktrees --md type=bool
+FLAG basecamp connect worktrees --no-hints type=bool
+FLAG basecamp connect worktrees --no-stats type=bool
+FLAG basecamp connect worktrees --profile type=string
+FLAG basecamp connect worktrees --project type=string
+FLAG basecamp connect worktrees --quiet type=bool
+FLAG basecamp connect worktrees --stats type=bool
+FLAG basecamp connect worktrees --styled type=bool
+FLAG basecamp connect worktrees --todolist type=string
+FLAG basecamp connect worktrees --verbose type=count
+FLAG basecamp connect worktrees list --account type=string
+FLAG basecamp connect worktrees list --agent type=bool
+FLAG basecamp connect worktrees list --cache-dir type=string
+FLAG basecamp connect worktrees list --count type=bool
+FLAG basecamp connect worktrees list --help type=bool
+FLAG basecamp connect worktrees list --hints type=bool
+FLAG basecamp connect worktrees list --ids-only type=bool
+FLAG basecamp connect worktrees list --in type=string
+FLAG basecamp connect worktrees list --jq type=string
+FLAG basecamp connect worktrees list --json type=bool
+FLAG basecamp connect worktrees list --markdown type=bool
+FLAG basecamp connect worktrees list --md type=bool
+FLAG basecamp connect worktrees list --no-hints type=bool
+FLAG basecamp connect worktrees list --no-stats type=bool
+FLAG basecamp connect worktrees list --profile type=string
+FLAG basecamp connect worktrees list --project type=string
+FLAG basecamp connect worktrees list --quiet type=bool
+FLAG basecamp connect worktrees list --shadow type=bool
+FLAG basecamp connect worktrees list --stats type=bool
+FLAG basecamp connect worktrees list --styled type=bool
+FLAG basecamp connect worktrees list --todolist type=string
+FLAG basecamp connect worktrees list --verbose type=count
+FLAG basecamp connect worktrees prune --account type=string
+FLAG basecamp connect worktrees prune --agent type=bool
+FLAG basecamp connect worktrees prune --cache-dir type=string
+FLAG basecamp connect worktrees prune --count type=bool
+FLAG basecamp connect worktrees prune --force type=stringArray
+FLAG basecamp connect worktrees prune --help type=bool
+FLAG basecamp connect worktrees prune --hints type=bool
+FLAG basecamp connect worktrees prune --ids-only type=bool
+FLAG basecamp connect worktrees prune --in type=string
+FLAG basecamp connect worktrees prune --jq type=string
+FLAG basecamp connect worktrees prune --json type=bool
+FLAG basecamp connect worktrees prune --markdown type=bool
+FLAG basecamp connect worktrees prune --md type=bool
+FLAG basecamp connect worktrees prune --no-hints type=bool
+FLAG basecamp connect worktrees prune --no-stats type=bool
+FLAG basecamp connect worktrees prune --profile type=string
+FLAG basecamp connect worktrees prune --project type=string
+FLAG basecamp connect worktrees prune --quiet type=bool
+FLAG basecamp connect worktrees prune --shadow type=bool
+FLAG basecamp connect worktrees prune --stats type=bool
+FLAG basecamp connect worktrees prune --styled type=bool
+FLAG basecamp connect worktrees prune --todolist type=string
+FLAG basecamp connect worktrees prune --verbose type=count
 FLAG basecamp docs --account type=string
 FLAG basecamp docs --agent type=bool
 FLAG basecamp docs --cache-dir type=string
@@ -18606,6 +18675,9 @@ SUB basecamp config untrust
 SUB basecamp connect
 SUB basecamp connect setup
 SUB basecamp connect show
+SUB basecamp connect worktrees
+SUB basecamp connect worktrees list
+SUB basecamp connect worktrees prune
 SUB basecamp docs
 SUB basecamp docs archive
 SUB basecamp docs doc

e2e/smoke/smoke_lifecycle.bats

@@ -24,6 +24,14 @@ load smoke_helper
   mark_out_of_scope "Reads the connector policy a connected profile's setup wrote — covered by Go tests in internal/commands"
 }
 
+@test "connect worktrees list is out of scope" {
+  mark_out_of_scope "Reads a local connector's ledger — covered by Go tests in internal/commands and internal/connector"
+}
+
+@test "connect worktrees prune is out of scope" {
+  mark_out_of_scope "Removes local git worktrees a connector kept — covered by Go tests in internal/commands and internal/connector"
+}
+
 @test "auth refresh is out of scope" {
   mark_out_of_scope "Requires OAuth credentials"
 }

internal/commands/commands.go

@@ -146,7 +146,7 @@ func CommandCategories() []CommandCategory {
 				{Name: "bonfire", Category: "additional", Description: "Multi-chat orchestration", Actions: []string{"split", "layout"}, Experimental: true, DevOnly: true},
 				{Name: "api", Category: "additional", Description: "Raw API access"},
 				{Name: "mcp", Category: "additional", Description: "Serve Basecamp to MCP clients over stdio"},
-				{Name: "connect", Category: "additional", Description: "Set up a local agent connector for a Basecamp agent", Actions: []string{"setup", "show"}},
+				{Name: "connect", Category: "additional", Description: "Set up a local agent connector for a Basecamp agent", Actions: []string{"setup", "show", "worktrees"}},
 				{Name: "help", Category: "additional", Description: "Show help"},
 				{Name: "version", Category: "additional", Description: "Show version"},
 			},

internal/commands/connect.go

@@ -66,6 +66,7 @@ isolated state directory and dispatches nothing. macOS and Linux only.`,
 	cmd.AddCommand(newConnectSetupCmd())
 	cmd.AddCommand(newConnectWorkerMCPCmd())
 	cmd.AddCommand(newConnectShowCmd())
+	cmd.AddCommand(newConnectWorktreesCmd())
 	return cmd
 }
 
@@ -180,7 +181,7 @@ func connectShowDisplay(path string, f setup.File, markdown bool) map[string]any
 		"agent":    agent,
 		"operator": fmt.Sprintf("person %d", f.Trust.OperatorID),
 		"trust":    trust,
-		"workers":  fmt.Sprintf("%s, concurrency %d, deadline %s, worktrees %s", f.Driver, f.Concurrency, time.Duration(f.Deadline), worktrees),
+		"workers":  fmt.Sprintf("%s %s, concurrency %d, deadline %s, worktrees %s", f.Driver, f.WorkerName(), f.Concurrency, time.Duration(f.Deadline), worktrees),
 		"projects": strconv.Itoa(len(f.Projects)) + " routed",
 	}
 	for id, r := range f.Projects {

internal/commands/connect_run.go

@@ -88,13 +88,29 @@ func connectStateDir(file setup.File, shadow bool) (string, error) {
 	if err != nil {
 		return "", err
 	}
-	group := "connect"
+	group, dir := connectStateParts(file, shadow)
+	return ensurePrivateChain(stateHome, "basecamp", group, dir)
+}
+
+// connectStateDirPath is the same directory, named and not created: what
+// reads a connector's state resolves.
+func connectStateDirPath(file setup.File, shadow bool) (string, error) {
+	stateHome, err := connectStateHome()
+	if err != nil {
+		return "", err
+	}
+	group, dir := connectStateParts(file, shadow)
+	return filepath.Join(stateHome, "basecamp", group, dir), nil
+}
+
+func connectStateParts(file setup.File, shadow bool) (group, dir string) {
+	group = "connect"
 	if shadow {
 		// An isolated ledger, lock and checkpoint: a shadow never shares a
 		// position or a record with the connector it watches beside.
 		group = "connect-shadow"
 	}
-	return ensurePrivateChain(stateHome, "basecamp", group, connector.StateDirName(file.AccountID, file.Agent.PersonID))
+	return group, connector.StateDirName(file.AccountID, file.Agent.PersonID)
 }
 
 // connectSessionsDir is where a session's short-lived files go — the MCP
@@ -156,11 +172,6 @@ func runConnect(cmd *cobra.Command, f *connectRunFlags) error {
 	case err != nil:
 		return output.ErrUsage("connect.json cannot be used: " + err.Error())
 	}
-	if file.Worktrees && !f.shadow {
-		// Refused rather than ignored: workers would share the route's
-		// checkout while connect.json says each task gets its own.
-		return output.ErrUsage("connect.json asks for worktrees, which this basecamp does not support yet; run setup with --worktrees=false")
-	}
 	driverName := file.Driver
 	if f.driver != "" {
 		driverName = f.driver
@@ -274,12 +285,27 @@ func runConnect(cmd *cobra.Command, f *connectRunFlags) error {
 		if err != nil {
 			return output.ErrUsage(err.Error())
 		}
-		dispatcher, err = connector.NewDispatcher(connectDispatcherOptions(connectDispatch{
+		// Built with worktrees off too, so the ones made while they were on
+		// are still settled and recovered.
+		worktreesRoot, err := ensurePrivateChain(stateDir, connectWorktreesDir)
+		if err != nil {
+			return err
+		}
+		workspaces, err := connector.NewWorktrees(connector.WorktreesOptions{
+			Ledger: ledger, Root: worktreesRoot, Logger: logger, Off: !file.Worktrees,
+			Redaction: driver.Redaction{Dirs: []string{stateDir}},
+		})
+		if err != nil {
+			return err
+		}
+		options := connectDispatcherOptions(connectDispatch{
 			File: file, Buckets: buckets, Ledger: ledger, Driver: worker, Routes: routes.Current,
 			Profile: name, Executable: exe, StateDir: stateDir, SessionsDir: sessions,
 			Replies: connector.SDKReplies{Client: accountClient, AgentID: agentID},
 			Lines:   lines, Logger: logger,
-		}))
+		})
+		options.Workspaces = workspaces
+		dispatcher, err = connector.NewDispatcher(options)
 		if err != nil {
 			return err
 		}