v2.2-paseo-providers: Paseo provider stack + v2.2.1 pane-scoped chat fixes
Ship Paseo-equivalent provider snapshot, AgentComposerBar, ACP dispatch rewrite with streaming/persist, permission prompts, and agent commands. Follow-up: pane-scoped chat resolution, CoderMessageList tool timeline, WS user-delta replace, and inference orphan tool_call stripping. Archive openspec v2-2; update CHANGELOG and CURRENT. Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
@@ -6,7 +6,7 @@
|
||||
* After the agent completes, we diff the worktree against HEAD and
|
||||
* queue the diff into pending_changes.
|
||||
*/
|
||||
import { sshExec } from './ssh.js';
|
||||
import { hostExec } from './host-exec.js';
|
||||
|
||||
const WORKTREE_BASE = '/tmp/booworktrees';
|
||||
|
||||
@@ -23,10 +23,10 @@ export async function createWorktree(
|
||||
const branchName = `task-${taskId}`;
|
||||
|
||||
// Ensure the base directory exists
|
||||
await sshExec(`mkdir -p ${WORKTREE_BASE}`, { signal: opts?.signal });
|
||||
await hostExec(`mkdir -p ${WORKTREE_BASE}`, { signal: opts?.signal });
|
||||
|
||||
// Create the worktree with a new branch from HEAD
|
||||
const result = await sshExec(
|
||||
const result = await hostExec(
|
||||
`git -C ${shellEscape(projectPath)} worktree add ${shellEscape(worktreePath)} -b ${shellEscape(branchName)} HEAD`,
|
||||
{ signal: opts?.signal, timeoutMs: 30_000 },
|
||||
);
|
||||
@@ -49,7 +49,7 @@ export async function diffWorktree(
|
||||
): Promise<string> {
|
||||
// First, commit any uncommitted changes in the worktree so we can diff branches
|
||||
// Stage all changes
|
||||
const addResult = await sshExec(
|
||||
const addResult = await hostExec(
|
||||
`cd ${shellEscape(worktreePath)} && git add -A`,
|
||||
{ signal: opts?.signal, timeoutMs: 30_000 },
|
||||
);
|
||||
@@ -58,7 +58,7 @@ export async function diffWorktree(
|
||||
}
|
||||
|
||||
// Check if there are staged changes
|
||||
const statusResult = await sshExec(
|
||||
const statusResult = await hostExec(
|
||||
`cd ${shellEscape(worktreePath)} && git diff --cached --quiet`,
|
||||
{ signal: opts?.signal, timeoutMs: 10_000 },
|
||||
);
|
||||
@@ -69,13 +69,13 @@ export async function diffWorktree(
|
||||
}
|
||||
|
||||
// Commit staged changes (needed to produce a clean branch diff)
|
||||
await sshExec(
|
||||
await hostExec(
|
||||
`cd ${shellEscape(worktreePath)} && git -c user.email=boocoder@local -c user.name=BooCoder commit -m "task changes" --allow-empty`,
|
||||
{ signal: opts?.signal, timeoutMs: 15_000 },
|
||||
);
|
||||
|
||||
// Diff the worktree branch against the parent commit (HEAD of main tree)
|
||||
const diffResult = await sshExec(
|
||||
const diffResult = await hostExec(
|
||||
`git -C ${shellEscape(projectPath)} diff HEAD...$(git -C ${shellEscape(worktreePath)} rev-parse HEAD)`,
|
||||
{ signal: opts?.signal, timeoutMs: 60_000 },
|
||||
);
|
||||
@@ -99,13 +99,13 @@ export async function cleanupWorktree(
|
||||
const branchName = `task-${taskId}`;
|
||||
|
||||
// Remove the worktree (--force handles dirty state)
|
||||
await sshExec(
|
||||
await hostExec(
|
||||
`git -C ${shellEscape(projectPath)} worktree remove ${shellEscape(worktreePath)} --force`,
|
||||
{ timeoutMs: 15_000 },
|
||||
).catch(() => {});
|
||||
|
||||
// Delete the task branch
|
||||
await sshExec(
|
||||
await hostExec(
|
||||
`git -C ${shellEscape(projectPath)} branch -D ${shellEscape(branchName)}`,
|
||||
{ timeoutMs: 10_000 },
|
||||
).catch(() => {});
|
||||
|
||||
Reference in New Issue
Block a user