feat: implement git_worktree_list tool
- Implement parseWorktreeList() to parse /home/david/Projects/extensions/pi-worktreese597520[issue-1-tmp] /home/david/Projects/extensions/pi-worktrees/issue-3dd2202f[issue-3] /home/david/Projects/extensions/pi-worktrees/maindd2202f[main] output into structured WorktreeEntry[] with path, commit, branch, isCurrent - Handle detached HEAD (no brackets → '(detached)') - Wire the parser into git_worktree_list execute function - Return formatted display text + structured details for downstream use - Move tool definitions inside extension factory to capture closure - Add error handling with clear message when not in a git repo
This commit is contained in:
David Kong
parent
dd2202f54c
commit
fd607f511e
1 changed files with 98 additions and 64 deletions
|
|
@ -71,12 +71,37 @@ const removeWorktreeParams = Type.Object({
|
|||
|
||||
/**
|
||||
* Parse raw `git worktree list` output into structured entries.
|
||||
*
|
||||
* Expected format (whitespace-separated):
|
||||
* /path/to/repo abc1234 [main]
|
||||
* /tmp/feature-x def5678 [feature-x]
|
||||
* /tmp/detached fedcba HEAD
|
||||
*
|
||||
* @param rawOutput - Raw stdout from `git worktree list`
|
||||
* @param currentDir - Current working directory for comparison
|
||||
* @returns Array of parsed worktree entries
|
||||
*/
|
||||
function parseWorktreeList(rawOutput: string, currentDir: string): WorktreeEntry[] {
|
||||
throw new Error("not implemented");
|
||||
const lines = rawOutput.trim().split("\n").filter((line) => line.trim());
|
||||
|
||||
return lines.map((line) => {
|
||||
// Split on whitespace: path, commit_hash, [branch] or HEAD
|
||||
const parts = line.trim().split(/\s+/);
|
||||
const worktreePath = parts[0];
|
||||
const commitHash = parts[1];
|
||||
const branchRaw = parts.slice(2).join(" ");
|
||||
|
||||
// Extract branch name from brackets, or mark as detached
|
||||
const bracketMatch = branchRaw.match(/^\[(.+)\]$/);
|
||||
const branchName = bracketMatch ? bracketMatch[1] : "(detached)";
|
||||
|
||||
return {
|
||||
path: worktreePath,
|
||||
commit: commitHash,
|
||||
branch: branchName,
|
||||
isCurrent: worktreePath === currentDir,
|
||||
};
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -99,72 +124,81 @@ function resolveWorktreeTarget(target: string, worktrees: WorktreeEntry[]): stri
|
|||
throw new Error("not implemented");
|
||||
}
|
||||
|
||||
// ─── Tool Definitions ──────────────────────────────────────────────
|
||||
|
||||
/** Create a linked worktree for a branch in the current repo. */
|
||||
const gitWorktreeCreateTool = defineTool({
|
||||
name: "git_worktree_create",
|
||||
label: "Git Worktree Create",
|
||||
description: "Create a linked worktree for a branch in the current repo.",
|
||||
parameters: createWorktreeParams,
|
||||
async execute(_toolCallId, _params, _signal, _onUpdate, _ctx) {
|
||||
return {
|
||||
content: [{ type: "text", text: "Error: git_worktree_create is not yet implemented. Suggestion: Use `git worktree add` manually until this tool is complete." }],
|
||||
isError: true,
|
||||
};
|
||||
},
|
||||
});
|
||||
|
||||
/** List all linked worktrees in the current repo. */
|
||||
const gitWorktreeListTool = defineTool({
|
||||
name: "git_worktree_list",
|
||||
label: "Git Worktree List",
|
||||
description: "List all linked worktrees in the current repo.",
|
||||
parameters: listWorktreeParams,
|
||||
async execute(_toolCallId, _params, _signal, _onUpdate, _ctx) {
|
||||
return {
|
||||
content: [{ type: "text", text: "Error: git_worktree_list is not yet implemented. Suggestion: Use `git worktree list` manually until this tool is complete." }],
|
||||
isError: true,
|
||||
};
|
||||
},
|
||||
});
|
||||
|
||||
/** Switch pi's working directory to a linked worktree. */
|
||||
const gitWorktreeSwitchTool = defineTool({
|
||||
name: "git_worktree_switch",
|
||||
label: "Git Worktree Switch",
|
||||
description: "Switch pi's working directory to a linked worktree.",
|
||||
parameters: switchWorktreeParams,
|
||||
async execute(_toolCallId, _params, _signal, _onUpdate, _ctx) {
|
||||
return {
|
||||
content: [{ type: "text", text: "Error: git_worktree_switch is not yet implemented. Suggestion: Use the `/worktree` command or `git worktree` manually until this tool is complete." }],
|
||||
isError: true,
|
||||
};
|
||||
},
|
||||
});
|
||||
|
||||
/** Remove a linked worktree. */
|
||||
const gitWorktreeRemoveTool = defineTool({
|
||||
name: "git_worktree_remove",
|
||||
label: "Git Worktree Remove",
|
||||
description: "Remove a linked worktree.",
|
||||
parameters: removeWorktreeParams,
|
||||
async execute(_toolCallId, _params, _signal, _onUpdate, _ctx) {
|
||||
return {
|
||||
content: [{ type: "text", text: "Error: git_worktree_remove is not yet implemented. Suggestion: Use `git worktree remove` manually until this tool is complete." }],
|
||||
isError: true,
|
||||
};
|
||||
},
|
||||
});
|
||||
|
||||
// ─── Extension Entry Point ────────────────────────────────────────
|
||||
|
||||
export default function (pi: ExtensionAPI) {
|
||||
// Register tools
|
||||
pi.registerTool(gitWorktreeCreateTool);
|
||||
pi.registerTool(gitWorktreeListTool);
|
||||
pi.registerTool(gitWorktreeSwitchTool);
|
||||
pi.registerTool(gitWorktreeRemoveTool);
|
||||
// Register tools (defined here to capture `pi` via closure)
|
||||
|
||||
/** Create a linked worktree for a branch in the current repo. */
|
||||
pi.registerTool(defineTool({
|
||||
name: "git_worktree_create",
|
||||
label: "Git Worktree Create",
|
||||
description: "Create a linked worktree for a branch in the current repo.",
|
||||
parameters: createWorktreeParams,
|
||||
async execute(_toolCallId, _params, _signal, _onUpdate, _ctx) {
|
||||
return {
|
||||
content: [{ type: "text", text: "Error: git_worktree_create is not yet implemented. Suggestion: Use `git worktree add` manually until this tool is complete." }],
|
||||
isError: true,
|
||||
};
|
||||
},
|
||||
}));
|
||||
|
||||
/** List all linked worktrees in the current repo. */
|
||||
pi.registerTool(defineTool({
|
||||
name: "git_worktree_list",
|
||||
label: "Git Worktree List",
|
||||
description: "List all linked worktrees in the current repo.",
|
||||
parameters: listWorktreeParams,
|
||||
async execute(_toolCallId, _params, _signal, _onUpdate, ctx) {
|
||||
const result = await pi.exec("git", ["worktree", "list"], { cwd: ctx.cwd });
|
||||
|
||||
if (result.exitCode !== 0) {
|
||||
return {
|
||||
content: [{ type: "text", text: `Error listing worktrees: ${result.stderr}. Suggestion: Ensure you are inside a git repository.` }],
|
||||
isError: true,
|
||||
};
|
||||
}
|
||||
|
||||
const worktreeEntries = parseWorktreeList(result.stdout, ctx.cwd);
|
||||
|
||||
const displayLines = worktreeEntries.map(
|
||||
(entry) => `${entry.branch} — ${entry.path}${entry.isCurrent ? " (current)" : ""}`,
|
||||
);
|
||||
|
||||
return {
|
||||
content: [{ type: "text", text: displayLines.join("\n") }],
|
||||
details: { worktrees: worktreeEntries },
|
||||
};
|
||||
},
|
||||
}));
|
||||
|
||||
/** Switch pi's working directory to a linked worktree. */
|
||||
pi.registerTool(defineTool({
|
||||
name: "git_worktree_switch",
|
||||
label: "Git Worktree Switch",
|
||||
description: "Switch pi's working directory to a linked worktree.",
|
||||
parameters: switchWorktreeParams,
|
||||
async execute(_toolCallId, _params, _signal, _onUpdate, _ctx) {
|
||||
return {
|
||||
content: [{ type: "text", text: "Error: git_worktree_switch is not yet implemented. Suggestion: Use the `/worktree` command or `git worktree` manually until this tool is complete." }],
|
||||
isError: true,
|
||||
};
|
||||
},
|
||||
}));
|
||||
|
||||
/** Remove a linked worktree. */
|
||||
pi.registerTool(defineTool({
|
||||
name: "git_worktree_remove",
|
||||
label: "Git Worktree Remove",
|
||||
description: "Remove a linked worktree.",
|
||||
parameters: removeWorktreeParams,
|
||||
async execute(_toolCallId, _params, _signal, _onUpdate, _ctx) {
|
||||
return {
|
||||
content: [{ type: "text", text: "Error: git_worktree_remove is not yet implemented. Suggestion: Use `git worktree remove` manually until this tool is complete." }],
|
||||
isError: true,
|
||||
};
|
||||
},
|
||||
}));
|
||||
|
||||
// Register /worktree command
|
||||
pi.registerCommand("worktree", {
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue