@agimon-ai/po-git 0.0.0-alpha.28 → 0.0.0-alpha.29

package/README.md

@@ -15,7 +15,7 @@ Add `@agimon-ai/po-git` to a selected layer in `.po/modes.yaml`, then run `po sy
 
 ## Use
 
-Use the browser worktree controls or the native worktree tool.
+Use the browser worktree controls, or an agent session. In code mode the `worktrees` namespace (`list`, `status`, `spawn`, `close`, `merge`, `prune`, `send`, `messages`) returns structured records and the `run_worktree` tool is withdrawn from the model for that session; without code mode `run_worktree` stays. The `po-use-git` skill carries the usage rules.
 
 ### New-session dialog
 

package/dist/extensions/server.cjs

@@ -11,6 +11,7 @@ let node_os = require("node:os");
 node_os = require_worktreeOperations.__toESM(node_os, 1);
 let _agimon_ai_po_core_serverPlugin = require("@agimon-ai/po-core/serverPlugin");
 let _agimon_ai_po_core_extensionFile = require("@agimon-ai/po-core/extensionFile");
+let _agimon_ai_po_core_codemode = require("@agimon-ai/po-core/codemode");
 let _agimon_ai_po_session = require("@agimon-ai/po-session");
 let typebox = require("typebox");
 //#region src/schemas/runWorktreeTool.ts
@@ -254,7 +255,8 @@ async function executeRunWorktreeTool(params, operations, context, options = {})
 				content: text(describe(record, context.sessionId), `Session: ${record.sessionId}`, dirtyFiles.length === 0 ? "Clean." : `${String(dirtyFiles.length)} uncommitted file(s): ${dirtyFiles.slice(0, 20).join(", ")}`),
 				details: {
 					action: params.action,
-					records: [record]
+					records: [record],
+					dirtyFiles
 				}
 			};
 		}
@@ -278,7 +280,10 @@ async function executeRunWorktreeTool(params, operations, context, options = {})
 			const waiting = await operations.messages(context, params.id);
 			return {
 				content: waiting.length === 0 ? text("No messages.") : text(`${String(waiting.length)} message(s):`, ...waiting.map((entry) => `[${entry.sentAt}] ${entry.from}: ${entry.text}`)),
-				details: { action: params.action }
+				details: {
+					action: params.action,
+					messages: waiting
+				}
 			};
 		}
 		case WORKTREE_ACTIONS.prune: {
@@ -293,12 +298,172 @@ async function executeRunWorktreeTool(params, operations, context, options = {})
 					`Untracked directories, left alone: ${plan.untracked.length === 0 ? "none" : plan.untracked.join(", ")}`,
 					...plan.keptBranches.length === 0 ? [] : [`Branches kept, they hold commits: ${plan.keptBranches.join(", ")}`]
 				]),
-				details: { action: params.action }
+				details: {
+					action: params.action,
+					plan
+				}
 			};
 		}
 	}
 }
 //#endregion
+//#region src/services/worktreeNamespace/index.ts
+const DECLARATIONS = `type WorktreeStatus = 'spawning' | 'running' | 'closing' | 'orphaned';
+
+interface Worktree {
+  id: string;
+  branch: string;
+  baseRef: string;
+  /** Absolute path of the checkout, under ~/.po/git/worktrees. */
+  path: string;
+  repositoryRoot: string;
+  /** The session running inside the worktree. */
+  sessionId: string;
+  parentSessionId?: string;
+  status: WorktreeStatus;
+  createdAt: string;
+  /** How your session relates to it: 'parent' spawned it, 'child' runs inside it, 'other' is neither. */
+  relationship: 'parent' | 'child' | 'other';
+}
+
+interface WorktreeMessage {
+  worktreeId: string;
+  fromSessionId: string;
+  from: 'parent' | 'child';
+  text: string;
+  sentAt: string;
+}
+
+interface PrunePlan {
+  remove: Worktree[];
+  forget: Worktree[];
+  /** Kept because they hold uncommitted work. */
+  keptDirty: Worktree[];
+  untracked: string[];
+  /** Branches kept because they hold commits. */
+  keptBranches: string[];
+}
+
+declare const worktrees: {
+  /** Every worktree for this repository. */
+  list(): Promise<Worktree[]>;
+  /** One worktree and its uncommitted files. */
+  status(id: string): Promise<{ worktree: Worktree; dirtyFiles: string[] }>;
+  /**
+   * Create a worktree on a new branch and start a Po session in it, nested under this one. baseRef defaults to
+   * the current branch's remote-tracking ref, then the remote default branch; name labels it in the rail; task is
+   * the new session's first message. Setup can be slow, so give exec a larger timeoutMs.
+   */
+  spawn(request: { branch: string; baseRef?: string; name?: string; task?: string }): Promise<Worktree>;
+  /** Stop the worktree's session and delete its checkout. Refused on a dirty tree unless force is true. */
+  close(id: string, options?: { force?: boolean }): Promise<Worktree>;
+  /** Merge the worktree's branch into this checkout. Refused when this checkout is dirty. */
+  merge(id: string, options?: { message?: string }): Promise<Worktree>;
+  /** Remove orphaned worktrees. With dryRun, only return the plan. */
+  prune(options?: { dryRun?: boolean }): Promise<PrunePlan>;
+  /**
+   * Message the other side of a worktree. Use the record with relationship 'child' to report to your parent,
+   * and 'parent' to reach your own children. 'other' records are not communication edges.
+   */
+  send(id: string, message: string): Promise<void>;
+  /** Messages waiting for you from a worktree. */
+  messages(id: string): Promise<WorktreeMessage[]>;
+};`;
+const json = (value) => JSON.parse(JSON.stringify(value));
+/** Git worktrees for code mode: the actions of `run_worktree` as methods, returning records instead of text. */
+function createWorktreeNamespace(options) {
+	return {
+		name: "worktrees",
+		summary: "Git worktrees, each with its own Po session nested under this one: worktrees.list, status, spawn, close, merge, prune, send and messages.",
+		declarations: DECLARATIONS,
+		bind(run) {
+			if (run.sessionId !== options.execution.sessionId) throw new Error("Worktrees namespace belongs to another session.");
+			let disposed = false;
+			run.onDispose(() => {
+				disposed = true;
+			});
+			const view = (record) => ({
+				...record,
+				relationship: record.parentSessionId === options.execution.sessionId ? "parent" : record.sessionId === options.execution.sessionId ? "child" : "other"
+			});
+			/** One `run_worktree` action through the tool's own code, so the tool and the namespace cannot drift. */
+			const act = async (name, action, input) => {
+				run.signal.throwIfAborted();
+				if (disposed) throw new Error("Worktrees namespace run is disposed.");
+				options.assertAvailable();
+				const params = validateParams({
+					action,
+					...typeof input === "object" && input !== null ? input : {}
+				});
+				const context = {
+					cwd: options.execution.cwd,
+					sessionId: options.execution.sessionId
+				};
+				const started = Date.now();
+				try {
+					const result = await executeRunWorktreeTool(params, options.operations, context, { signal: run.signal });
+					options.assertAvailable();
+					run.record?.({
+						name: `worktrees.${name}`,
+						tool: RUN_WORKTREE_TOOL_NAME,
+						args: params,
+						ok: true,
+						ms: Date.now() - started,
+						result
+					});
+					return result;
+				} catch (error) {
+					run.record?.({
+						name: `worktrees.${name}`,
+						tool: RUN_WORKTREE_TOOL_NAME,
+						args: params,
+						ok: false,
+						ms: Date.now() - started,
+						error: error instanceof Error ? error.message : String(error)
+					});
+					throw error;
+				}
+			};
+			const record = (result) => view(result.details.records[0]);
+			const members = Object.create(null);
+			members.list = async () => json((await act("list", "list", {})).details.records.map(view));
+			members.status = async (id) => {
+				const { details } = await act("status", "status", { id });
+				return json({
+					worktree: view(details.records[0]),
+					dirtyFiles: details.dirtyFiles ?? []
+				});
+			};
+			members.spawn = async (request) => json(record(await act("spawn", "spawn_worktree", request)));
+			members.close = async (id, settings) => json(record(await act("close", "close_worktree", {
+				...settings,
+				id
+			})));
+			members.merge = async (id, settings) => json(record(await act("merge", "merge", {
+				...settings,
+				id
+			})));
+			members.prune = async (settings) => {
+				const { plan } = (await act("prune", "prune", settings)).details;
+				return json({
+					...plan,
+					remove: plan.remove.map(view),
+					forget: plan.forget.map(view),
+					keptDirty: plan.keptDirty.map(view)
+				});
+			};
+			members.send = async (id, message) => {
+				await act("send", "send", {
+					id,
+					message
+				});
+			};
+			members.messages = async (id) => json((await act("messages", "messages", { id })).details.messages);
+			return members;
+		}
+	};
+}
+//#endregion
 //#region src/extensions/workspaces/sessions/(backend)/_lib/root.server.ts
 function progressResult(action, label) {
 	return {
@@ -309,7 +474,7 @@ function progressResult(action, label) {
 		details: { action }
 	};
 }
-function createGitSession({ context, host: serverHost }) {
+function createGitSession({ context, host: serverHost, agent, signal }) {
 	if (serverHost.context.directEvents === void 0) throw new Error("Git server plugin requires the session direct event bus.");
 	if (serverHost.context.sessionId === void 0) throw new Error("Git server plugin requires a session identity.");
 	const sessionId = serverHost.context.sessionId;
@@ -322,17 +487,6 @@ function createGitSession({ context, host: serverHost }) {
 		sessionDelivery: () => (0, _agimon_ai_po_session.readPoSessionDelivery)(context)
 	});
 	const resources = [{
-		when: {
-			state: { "minor-mode": "help" },
-			attribution: {
-				kind: "minor",
-				mode: "help"
-			}
-		},
-		name: "po-git",
-		kind: "context",
-		read: () => (0, _agimon_ai_po_core_serverPlugin.readPackageResource)(require("url").pathToFileURL(__filename).href, "llms.txt")
-	}, {
 		name: "po-use-git",
 		kind: "skill",
 		read: () => (0, _agimon_ai_po_core_serverPlugin.readPackageResource)(require("url").pathToFileURL(__filename).href, "src/prompts/po-use-git/SKILL.md")
@@ -355,17 +509,37 @@ function createGitSession({ context, host: serverHost }) {
 	const changed = (_event, execution) => {
 		directEvents.publish(require_worktreeOperations.GIT_SESSION_CHANGED_EVENT, execution.sessionId, { version: 1 });
 	};
+	const hooks = [{
+		event: "tool_execution_end",
+		handle: changed
+	}, {
+		event: "agent_settled",
+		handle: changed
+	}];
+	if (agent) {
+		const namespace = createWorktreeNamespace({
+			operations,
+			execution: agent.context,
+			assertAvailable: () => {
+				if (signal?.aborted) throw new Error("Git session is unavailable.");
+			}
+		});
+		context.inject([_agimon_ai_po_core_codemode.PO_CODEMODE_SERVICE], (scoped) => {
+			const codemode = (0, _agimon_ai_po_core_codemode.readPoCodemode)(scoped);
+			if (!codemode) return void 0;
+			const registration = codemode.register("@agimon-ai/po-git", namespace);
+			const restriction = agent.registerToolRestriction({ excludedTools: [RUN_WORKTREE_TOOL_NAME] });
+			return () => {
+				restriction.dispose();
+				registration.dispose();
+			};
+		});
+	}
 	return {
 		value: {
 			resources,
 			tool,
-			hooks: [{
-				event: "tool_execution_end",
-				handle: changed
-			}, {
-				event: "agent_settled",
-				handle: changed
-			}]
+			hooks
 		},
 		onDispose: () => messageInbox.close()
 	};
@@ -2039,20 +2213,8 @@ var agent_settled_server_default = (0, _agimon_ai_po_core_extensionFile.defineHo
 //#region src/extensions/workspaces/sessions/(backend)/hook/tool-execution-end.server.ts
 var tool_execution_end_server_default = (0, _agimon_ai_po_core_extensionFile.defineHook)((context) => context.root.hooks[0]);
 //#endregion
-//#region src/extensions/workspaces/sessions/(backend)/resource/_lib/poGit.server.ts
-var poGit_server_default$1 = (context) => context.root.resources[0];
-//#endregion
-//#region src/extensions/workspaces/sessions/(backend)/resource/poGit.server.ts
-var poGit_server_default = (0, _agimon_ai_po_core_extensionFile.defineResource)(poGit_server_default$1);
-//#endregion
-//#region src/extensions/workspaces/sessions/(backend)/resource/_lib/poGitReadme.server.ts
-var poGitReadme_server_default$1 = (context) => context.root.resources[2];
-//#endregion
-//#region src/extensions/workspaces/sessions/(backend)/resource/poGitReadme.server.ts
-var poGitReadme_server_default = (0, _agimon_ai_po_core_extensionFile.defineResource)(poGitReadme_server_default$1);
-//#endregion
 //#region src/extensions/workspaces/sessions/(backend)/resource/_lib/poUseGit.server.ts
-var poUseGit_server_default$1 = (context) => context.root.resources[1];
+var poUseGit_server_default$1 = (context) => context.root.resources[0];
 //#endregion
 //#region src/extensions/workspaces/sessions/(backend)/resource/poUseGit.server.ts
 var poUseGit_server_default = (0, _agimon_ai_po_core_extensionFile.defineResource)(poUseGit_server_default$1);
@@ -2077,7 +2239,7 @@ const serverPlugin = (0, _agimon_ai_po_core_serverPlugin.defineServerPlugin)({
 			return [at(route_server_default, context)];
 		},
 		get channels() {
-			return [() => via({ frameType: "git_changes" }, git_changes_server_default()), () => via({ frameType: "git_worktrees" }, git_worktrees_server_default())];
+			return [() => via({ frameType: "git_changes" }, at(git_changes_server_default, context)), () => via({ frameType: "git_worktrees" }, at(git_worktrees_server_default, context))];
 		}
 	}),
 	workspace: (context) => ({
@@ -2085,7 +2247,7 @@ const serverPlugin = (0, _agimon_ai_po_core_serverPlugin.defineServerPlugin)({
 			return [at(route_server_default, context)];
 		},
 		get channels() {
-			return defined([context.hosted("global") ? void 0 : () => via({ frameType: "git_changes" }, git_changes_server_default()), context.hosted("global") ? void 0 : () => via({ frameType: "git_worktrees" }, git_worktrees_server_default())]);
+			return defined([context.hosted("global") ? void 0 : () => via({ frameType: "git_changes" }, at(git_changes_server_default, context)), context.hosted("global") ? void 0 : () => via({ frameType: "git_worktrees" }, at(git_worktrees_server_default, context))]);
 		}
 	}),
 	session: async (context) => {
@@ -2100,17 +2262,13 @@ const serverPlugin = (0, _agimon_ai_po_core_serverPlugin.defineServerPlugin)({
 				return [at(route_server_default, context)];
 			},
 			get channels() {
-				return defined([context.hosted("global") ? void 0 : () => via({ frameType: "git_changes" }, git_changes_server_default()), context.hosted("global") ? void 0 : () => via({ frameType: "git_worktrees" }, git_worktrees_server_default())]);
+				return defined([context.hosted("global") ? void 0 : () => via({ frameType: "git_changes" }, at(git_changes_server_default, context)), context.hosted("global") ? void 0 : () => via({ frameType: "git_worktrees" }, at(git_worktrees_server_default, context))]);
 			},
 			get hooks() {
 				return [via({ event: "agent_settled" }, at(agent_settled_server_default, contextSession)), via({ event: "tool_execution_end" }, at(tool_execution_end_server_default, contextSession))];
 			},
 			get resources() {
-				return [
-					at(poGit_server_default, contextSession),
-					at(poGitReadme_server_default, contextSession),
-					at(poUseGit_server_default, contextSession)
-				];
+				return [at(poUseGit_server_default, contextSession)];
 			},
 			get tools() {
 				return [via({ name: "run_worktree" }, at(runWorktree_server_default, contextSession))];