@oh-my-pi/pi-coding-agent 6.8.4 → 6.9.0

package/src/lib/worktree/operations.ts

@@ -1,216 +0,0 @@
-import { mkdir } from "node:fs/promises";
-import * as path from "node:path";
-import { WORKTREE_BASE } from "./constants";
-import { WorktreeError, WorktreeErrorCode } from "./errors";
-import { getRepoName, getRepoRoot, git } from "./git";
-
-export interface Worktree {
-	path: string;
-	branch: string | null;
-	head: string;
-	isMain: boolean;
-	isDetached: boolean;
-}
-
-type WorktreePartial = Partial<Worktree> & { isDetached?: boolean };
-
-function finalizeWorktree(entry: WorktreePartial, repoRoot: string): Worktree {
-	const wtPath = entry.path?.trim();
-	if (!wtPath) {
-		throw new Error("Invalid worktree entry");
-	}
-	const branch = entry.isDetached ? null : (entry.branch ?? null);
-	const isDetached = entry.isDetached ?? branch === null;
-	return {
-		path: wtPath,
-		branch,
-		head: entry.head ?? "",
-		isMain: path.resolve(wtPath) === path.resolve(repoRoot),
-		isDetached,
-	};
-}
-
-function parseWorktreeList(output: string, repoRoot: string): Worktree[] {
-	const worktrees: Worktree[] = [];
-	let current: WorktreePartial = {};
-
-	for (const line of output.split("\n")) {
-		if (line.startsWith("worktree ")) {
-			if (current.path) {
-				worktrees.push(finalizeWorktree(current, repoRoot));
-			}
-			current = { path: line.slice(9) };
-			continue;
-		}
-
-		if (line.startsWith("HEAD ")) {
-			current.head = line.slice(5);
-			continue;
-		}
-
-		if (line.startsWith("branch ")) {
-			const raw = line.slice(7);
-			current.branch = raw.startsWith("refs/heads/") ? raw.slice("refs/heads/".length) : raw;
-			continue;
-		}
-
-		if (line === "detached") {
-			current.isDetached = true;
-		}
-	}
-
-	if (current.path) {
-		worktrees.push(finalizeWorktree(current, repoRoot));
-	}
-
-	return worktrees;
-}
-
-/**
- * Create a new worktree.
- */
-export async function create(branch: string, options?: { base?: string; path?: string }): Promise<Worktree> {
-	const repoRoot = await getRepoRoot();
-	const repoName = await getRepoName();
-	const targetPath = options?.path ?? path.join(WORKTREE_BASE, repoName, branch);
-	const resolvedTarget = path.resolve(targetPath);
-
-	const existing = await list();
-	const conflict = existing.find((wt) => wt.branch === branch || path.resolve(wt.path) === resolvedTarget);
-	if (conflict) {
-		throw new WorktreeError(`Worktree already exists: ${conflict.path}`, WorktreeErrorCode.WORKTREE_EXISTS);
-	}
-
-	await mkdir(path.dirname(resolvedTarget), { recursive: true });
-
-	const branchExists = (await git(["rev-parse", "--verify", `refs/heads/${branch}`], repoRoot)).code === 0;
-
-	const args = branchExists
-		? ["worktree", "add", resolvedTarget, branch]
-		: ["worktree", "add", "-b", branch, resolvedTarget, options?.base ?? "HEAD"];
-
-	const result = await git(args, repoRoot);
-	if (result.code !== 0) {
-		const stderr = result.stderr.trim();
-		if (stderr.includes("already exists") || stderr.includes("already checked out")) {
-			throw new WorktreeError(stderr || "Worktree already exists", WorktreeErrorCode.WORKTREE_EXISTS);
-		}
-		throw new Error(stderr || "Failed to create worktree");
-	}
-
-	const updated = await list();
-	const created = updated.find((wt) => path.resolve(wt.path) === resolvedTarget);
-	if (!created) {
-		throw new Error("Worktree created but not found in list");
-	}
-
-	return created;
-}
-
-/**
- * List all worktrees for current repository.
- */
-export async function list(): Promise<Worktree[]> {
-	const repoRoot = await getRepoRoot();
-	const result = await git(["worktree", "list", "--porcelain"], repoRoot);
-	if (result.code !== 0) {
-		throw new Error(result.stderr.trim() || "Failed to list worktrees");
-	}
-	return parseWorktreeList(result.stdout, repoRoot);
-}
-
-/**
- * Find a worktree by pattern.
- */
-export async function find(pattern: string): Promise<Worktree> {
-	const worktrees = await list();
-
-	const exactBranch = worktrees.filter((wt) => wt.branch === pattern);
-	if (exactBranch.length === 1) return exactBranch[0];
-	if (exactBranch.length > 1) {
-		throw new WorktreeError(`Ambiguous worktree: ${pattern}`, WorktreeErrorCode.WORKTREE_NOT_FOUND);
-	}
-
-	const exactDir = worktrees.filter((wt) => path.basename(wt.path) === pattern);
-	if (exactDir.length === 1) return exactDir[0];
-	if (exactDir.length > 1) {
-		throw new WorktreeError(`Ambiguous worktree: ${pattern}`, WorktreeErrorCode.WORKTREE_NOT_FOUND);
-	}
-
-	const partialBranch = worktrees.filter((wt) => wt.branch?.includes(pattern));
-	if (partialBranch.length === 1) return partialBranch[0];
-	if (partialBranch.length > 1) {
-		throw new WorktreeError(`Ambiguous worktree: ${pattern}`, WorktreeErrorCode.WORKTREE_NOT_FOUND);
-	}
-
-	const partialPath = worktrees.filter((wt) => wt.path.includes(pattern));
-	if (partialPath.length === 1) return partialPath[0];
-	if (partialPath.length > 1) {
-		throw new WorktreeError(`Ambiguous worktree: ${pattern}`, WorktreeErrorCode.WORKTREE_NOT_FOUND);
-	}
-
-	throw new WorktreeError(`Worktree not found: ${pattern}`, WorktreeErrorCode.WORKTREE_NOT_FOUND);
-}
-
-/**
- * Remove a worktree.
- */
-export async function remove(nameOrPath: string, options?: { force?: boolean }): Promise<void> {
-	const wt = await find(nameOrPath);
-	if (wt.isMain) {
-		throw new WorktreeError("Cannot remove main worktree", WorktreeErrorCode.CANNOT_MODIFY_MAIN);
-	}
-
-	const repoRoot = await getRepoRoot();
-	const args = ["worktree", "remove", wt.path];
-	if (options?.force) args.push("--force");
-
-	const result = await git(args, repoRoot);
-	if (result.code !== 0) {
-		throw new Error(result.stderr.trim() || "Failed to remove worktree");
-	}
-}
-
-/**
- * Remove worktrees for branches that no longer exist.
- */
-export async function prune(): Promise<number> {
-	const repoRoot = await getRepoRoot();
-	const worktrees = await list();
-	let removed = 0;
-
-	for (const wt of worktrees) {
-		if (wt.isMain || !wt.branch) continue;
-		const existsResult = await git(["rev-parse", "--verify", `refs/heads/${wt.branch}`], repoRoot);
-		if (existsResult.code === 0) continue;
-
-		const result = await git(["worktree", "remove", wt.path], repoRoot);
-		if (result.code !== 0) {
-			throw new Error(result.stderr.trim() || `Failed to remove worktree: ${wt.path}`);
-		}
-		removed += 1;
-	}
-
-	return removed;
-}
-
-/**
- * Get the worktree containing the given path.
- * Returns null if path is not in any worktree.
- */
-export async function which(targetPath?: string): Promise<Worktree | null> {
-	const worktrees = await list();
-	const resolved = path.resolve(targetPath ?? process.cwd());
-
-	let best: Worktree | null = null;
-	for (const wt of worktrees) {
-		const wtPath = path.resolve(wt.path);
-		if (resolved === wtPath || resolved.startsWith(wtPath + path.sep)) {
-			if (!best || wtPath.length > best.path.length) {
-				best = wt;
-			}
-		}
-	}
-
-	return best;
-}

package/src/lib/worktree/session.ts

@@ -1,114 +0,0 @@
-import { mkdir } from "node:fs/promises";
-import * as path from "node:path";
-import { nanoid } from "nanoid";
-import { getRepoRoot, git } from "./git";
-
-export interface WorktreeSession {
-	id: string;
-	branch: string;
-	path: string;
-	scope?: string[];
-	agentId?: string;
-	task?: string;
-	status: SessionStatus;
-	createdAt: number;
-	completedAt?: number;
-}
-
-export type SessionStatus = "creating" | "active" | "completed" | "merging" | "merged" | "failed" | "abandoned";
-
-async function getSessionsFile(): Promise<string> {
-	const repoRoot = await getRepoRoot();
-	const result = await git(["rev-parse", "--git-common-dir"], repoRoot);
-	let gitDir = result.code === 0 ? result.stdout.trim() : "";
-	if (!gitDir) {
-		gitDir = path.join(repoRoot, ".git");
-	}
-	if (!path.isAbsolute(gitDir)) {
-		// Resolve relative git dir from repo root to keep sessions in the common dir.
-		gitDir = path.resolve(repoRoot, gitDir);
-	}
-	await mkdir(gitDir, { recursive: true });
-	return path.join(gitDir, "worktree-sessions.json");
-}
-
-async function loadSessions(): Promise<WorktreeSession[]> {
-	const filePath = await getSessionsFile();
-	const file = Bun.file(filePath);
-	if (!(await file.exists())) return [];
-	try {
-		const data = await file.json();
-		if (Array.isArray(data)) {
-			return data as WorktreeSession[];
-		}
-	} catch {
-		return [];
-	}
-	return [];
-}
-
-async function saveSessions(sessions: WorktreeSession[]): Promise<void> {
-	const filePath = await getSessionsFile();
-	await Bun.write(filePath, JSON.stringify(sessions, null, 2));
-}
-
-export async function createSession(params: {
-	branch: string;
-	path: string;
-	scope?: string[];
-	task?: string;
-}): Promise<WorktreeSession> {
-	const sessions = await loadSessions();
-	const session: WorktreeSession = {
-		id: nanoid(10),
-		branch: params.branch,
-		path: params.path,
-		scope: params.scope,
-		task: params.task,
-		status: "creating",
-		createdAt: Date.now(),
-	};
-
-	sessions.push(session);
-	await saveSessions(sessions);
-	return session;
-}
-
-export async function updateSession(id: string, updates: Partial<WorktreeSession>): Promise<void> {
-	const sessions = await loadSessions();
-	const idx = sessions.findIndex((s) => s.id === id);
-	if (idx === -1) return;
-	const current = sessions[idx];
-	sessions[idx] = { ...current, ...updates, id: current.id };
-	await saveSessions(sessions);
-}
-
-export async function getSession(id: string): Promise<WorktreeSession | null> {
-	const sessions = await loadSessions();
-	return sessions.find((s) => s.id === id) ?? null;
-}
-
-export async function listSessions(): Promise<WorktreeSession[]> {
-	return loadSessions();
-}
-
-export async function cleanupSessions(): Promise<number> {
-	const sessions = await loadSessions();
-	let removed = 0;
-
-	const remaining: WorktreeSession[] = [];
-	for (const session of sessions) {
-		const exists = await Bun.file(session.path).exists();
-		if (!exists) {
-			removed += 1;
-			continue;
-		}
-		remaining.push(session);
-	}
-
-	if (removed > 0) {
-		await saveSessions(remaining);
-	}
-
-	return removed;
-}

package/src/lib/worktree/stats.ts

@@ -1,67 +0,0 @@
-import { git } from "./git";
-
-export interface WorktreeStats {
-	additions: number;
-	deletions: number;
-	untracked: number;
-	modified: number;
-	staged: number;
-}
-
-/**
- * Get diff statistics for a worktree.
- */
-export async function getStats(worktreePath: string): Promise<WorktreeStats> {
-	const diffResult = await git(["diff", "HEAD", "--shortstat"], worktreePath);
-
-	let additions = 0;
-	let deletions = 0;
-
-	const statsLine = diffResult.stdout.trim();
-	if (statsLine) {
-		const insertMatch = statsLine.match(/(\d+) insertion/);
-		const deleteMatch = statsLine.match(/(\d+) deletion/);
-		if (insertMatch) additions = parseInt(insertMatch[1], 10);
-		if (deleteMatch) deletions = parseInt(deleteMatch[1], 10);
-	}
-
-	const untrackedResult = await git(["ls-files", "--others", "--exclude-standard"], worktreePath);
-	const untracked = untrackedResult.stdout.trim() ? untrackedResult.stdout.trim().split("\n").length : 0;
-
-	const statusResult = await git(["status", "--porcelain"], worktreePath);
-	let modified = 0;
-	let staged = 0;
-
-	for (const line of statusResult.stdout.split("\n")) {
-		if (!line) continue;
-		const index = line[0];
-		const worktree = line[1];
-		if (index !== " " && index !== "?") staged += 1;
-		if (worktree !== " " && worktree !== "?") modified += 1;
-	}
-
-	return { additions, deletions, untracked, modified, staged };
-}
-
-/**
- * Format stats for display.
- * Returns "clean" or "+N -M ?U" format.
- */
-export function formatStats(stats: WorktreeStats): string {
-	if (
-		stats.additions === 0 &&
-		stats.deletions === 0 &&
-		stats.untracked === 0 &&
-		stats.modified === 0 &&
-		stats.staged === 0
-	) {
-		return "clean";
-	}
-
-	const parts: string[] = [];
-	if (stats.additions > 0) parts.push(`+${stats.additions}`);
-	if (stats.deletions > 0) parts.push(`-${stats.deletions}`);
-	if (stats.untracked > 0) parts.push(`?${stats.untracked}`);
-
-	return parts.join(" ") || "clean";
-}

package/src/modes/interactive/utils/voice-manager.ts

@@ -1,96 +0,0 @@
-import type { InteractiveModeContext } from "../types";
-
-const VOICE_PROGRESS_DELAY_MS = 15000;
-const VOICE_PROGRESS_MIN_CHARS = 160;
-const VOICE_PROGRESS_DELTA_CHARS = 120;
-
-export class VoiceManager {
-	constructor(private ctx: InteractiveModeContext) {}
-
-	setVoiceStatus(text: string | undefined): void {
-		this.ctx.statusLine.setHookStatus("voice", text);
-		this.ctx.ui.requestRender();
-	}
-
-	async handleVoiceInterrupt(reason?: string): Promise<void> {
-		const now = Date.now();
-		if (now - this.ctx.lastVoiceInterruptAt < 200) return;
-		this.ctx.lastVoiceInterruptAt = now;
-		if (this.ctx.session.isBashRunning) {
-			this.ctx.session.abortBash();
-		}
-		if (this.ctx.session.isStreaming) {
-			await this.ctx.session.abort();
-		}
-		if (reason) {
-			this.ctx.showStatus(reason);
-		}
-	}
-
-	stopVoiceProgressTimer(): void {
-		if (this.ctx.voiceProgressTimer) {
-			clearTimeout(this.ctx.voiceProgressTimer);
-			this.ctx.voiceProgressTimer = undefined;
-		}
-	}
-
-	startVoiceProgressTimer(): void {
-		this.stopVoiceProgressTimer();
-		if (!this.ctx.settingsManager.getVoiceEnabled() || !this.ctx.voiceAutoModeEnabled) return;
-		this.ctx.voiceProgressSpoken = false;
-		this.ctx.voiceProgressLastLength = 0;
-		this.ctx.voiceProgressTimer = setTimeout(() => {
-			void this.maybeSpeakProgress();
-		}, VOICE_PROGRESS_DELAY_MS);
-	}
-
-	async maybeSpeakProgress(): Promise<void> {
-		if (!this.ctx.session.isStreaming || this.ctx.voiceProgressSpoken || !this.ctx.voiceAutoModeEnabled) return;
-		const streaming = this.ctx.streamingMessage;
-		if (!streaming) return;
-		const text = this.ctx.extractAssistantText(streaming);
-		if (!text || text.length < VOICE_PROGRESS_MIN_CHARS) {
-			if (this.ctx.session.isStreaming) {
-				this.ctx.voiceProgressTimer = setTimeout(() => {
-					void this.maybeSpeakProgress();
-				}, VOICE_PROGRESS_DELAY_MS);
-			}
-			return;
-		}
-
-		const delta = text.length - this.ctx.voiceProgressLastLength;
-		if (delta < VOICE_PROGRESS_DELTA_CHARS) {
-			if (this.ctx.session.isStreaming) {
-				this.ctx.voiceProgressTimer = setTimeout(() => {
-					void this.maybeSpeakProgress();
-				}, VOICE_PROGRESS_DELAY_MS);
-			}
-			return;
-		}
-
-		this.ctx.voiceProgressLastLength = text.length;
-		this.ctx.voiceProgressSpoken = true;
-		this.ctx.voiceSupervisor.notifyProgress(text);
-	}
-
-	async submitVoiceText(text: string): Promise<void> {
-		const cleaned = text.trim();
-		if (!cleaned) {
-			this.ctx.showWarning("No speech detected. Try again.");
-			return;
-		}
-		const toSend = cleaned;
-		this.ctx.editor.addToHistory(toSend);
-
-		if (this.ctx.session.isStreaming) {
-			await this.ctx.session.abort();
-			await this.ctx.session.steer(toSend);
-			this.ctx.updatePendingMessagesDisplay();
-			return;
-		}
-
-		if (this.ctx.onInputCallback) {
-			this.ctx.onInputCallback({ text: toSend });
-		}
-	}
-}

package/src/prompts/tools/git.md

@@ -1,9 +0,0 @@
-Structured Git operations with safety guards and typed output. Use this tool instead of raw git commands.
-
-Operations:
-- READ: status, diff, log, show, blame, branch
-- WRITE: add, restore, commit, checkout, merge, rebase, stash, cherry-pick
-- REMOTE: fetch, pull, push, tag
-- GITHUB: pr, issue, ci, release
-
-Returns structured data plus a rendered summary for display. Safety checks may block or require confirmation for destructive actions.

package/src/prompts/voice-summary.md

@@ -1,12 +0,0 @@
-You are a voice summarizer for a coding agent.
-
-Summarize the assistant response for spoken playback.
-
-Rules:
-- Output 1 to 3 sentences, maximum 50 words.
-- No markdown, no code blocks, no inline code, no URLs.
-- If the response already fits, return it unchanged.
-- Preserve the most important question if one is asked.
-- If a decision or missing info is required, ask one short question.
-
-Return only the spoken text.