@oh-my-pi/pi-coding-agent 14.0.4 → 14.1.0

package/src/dap/session.ts

@@ -1,5 +1,6 @@
 import * as path from "node:path";
-import { logger, ptree } from "@oh-my-pi/pi-utils";
+import * as timers from "node:timers/promises";
+import { logger, ptree, untilAborted } from "@oh-my-pi/pi-utils";
 import { NON_INTERACTIVE_ENV } from "../exec/non-interactive-env";
 import { DapClient } from "./client";
 import type {
@@ -154,27 +155,10 @@ function buildSummary(session: DapSession): DapSessionSummary {
 	};
 }
 
-async function raceAbort<T>(promise: Promise<T>, signal?: AbortSignal): Promise<T> {
-	if (!signal) return promise;
-	if (signal.aborted) {
-		throw signal.reason instanceof Error ? signal.reason : new Error("Operation aborted");
-	}
-	const { promise: abortPromise, reject } = Promise.withResolvers<never>();
-	const onAbort = () => {
-		reject(signal.reason instanceof Error ? signal.reason : new Error("Operation aborted"));
-	};
-	signal.addEventListener("abort", onAbort, { once: true });
-	try {
-		return await Promise.race([promise, abortPromise]);
-	} finally {
-		signal.removeEventListener("abort", onAbort);
-	}
-}
-
 export class DapSessionManager {
 	#sessions = new Map<string, DapSession>();
 	#activeSessionId: string | null = null;
-	#cleanupTimer?: NodeJS.Timeout;
+	#cleanupLoopPromise?: Promise<void>;
 	#nextId = 0;
 
 	constructor() {
@@ -235,7 +219,7 @@ export class DapSessionManager {
 			// Try to capture initial stopped state (e.g. stopOnEntry).
 			// Timeout is acceptable — the program may simply be running.
 			try {
-				await raceAbort(initialStopPromise, signal);
+				await untilAborted(signal, initialStopPromise);
 				if (session.status === "stopped") {
 					await this.#fetchTopFrame(session, signal, Math.min(timeoutMs, STOP_CAPTURE_TIMEOUT_MS));
 				}
@@ -283,7 +267,7 @@ export class DapSessionManager {
 			await this.#completeConfigurationHandshake(session, signal, timeoutMs);
 			await attachPromise;
 			try {
-				await raceAbort(initialStopPromise, signal);
+				await untilAborted(signal, initialStopPromise);
 				if (session.status === "stopped") {
 					await this.#fetchTopFrame(session, signal, Math.min(timeoutMs, STOP_CAPTURE_TIMEOUT_MS));
 				}
@@ -696,9 +680,9 @@ export class DapSessionManager {
 		// between the request and here. Wait for it, but tolerate timeout if the
 		// session already transitioned.
 		try {
-			await raceAbort(
-				session.client.waitForEvent<DapStoppedEventBody>("stopped", undefined, signal, timeoutMs),
+			await untilAborted(
 				signal,
+				session.client.waitForEvent<DapStoppedEventBody>("stopped", undefined, signal, timeoutMs),
 			);
 		} catch {
 			// Timeout or abort — report current state regardless
@@ -833,16 +817,16 @@ export class DapSessionManager {
 		session.lastUsedAt = Date.now();
 		if (session.status !== "terminated") {
 			if (session.capabilities?.supportsTerminateRequest) {
-				await raceAbort(
-					session.client.sendRequest("terminate", undefined, signal, timeoutMs).catch(() => undefined),
+				await untilAborted(
 					signal,
+					session.client.sendRequest("terminate", undefined, signal, timeoutMs).catch(() => undefined),
 				);
 			}
-			await raceAbort(
+			await untilAborted(
+				signal,
 				session.client
 					.sendRequest("disconnect", { terminateDebuggee: true }, signal, timeoutMs)
 					.catch(() => undefined),
-				signal,
 			);
 		}
 		session.status = "terminated";
@@ -852,22 +836,30 @@ export class DapSessionManager {
 	}
 
 	#startCleanupTimer(): void {
-		if (this.#cleanupTimer) return;
-		this.#cleanupTimer = setInterval(() => {
-			void this.#cleanupIdleSessions();
-		}, CLEANUP_INTERVAL_MS);
-		this.#cleanupTimer.unref?.();
+		if (this.#cleanupLoopPromise) return;
+		this.#cleanupLoopPromise = this.#runCleanupLoop();
+	}
+
+	async #runCleanupLoop(): Promise<void> {
+		for await (const _ of timers.setInterval(CLEANUP_INTERVAL_MS, null, { ref: false })) {
+			try {
+				this.#cleanupIdleSessions();
+			} catch (error) {
+				logger.error("DAP idle session cleanup failed", { error: toErrorMessage(error) });
+			}
+		}
 	}
 
-	async #cleanupIdleSessions(): Promise<void> {
+	#cleanupIdleSessions(): void {
+		if (this.#sessions.size === 0) return;
 		const now = Date.now();
-		for (const session of Array.from(this.#sessions.values())) {
+		for (const session of this.#sessions.values()) {
 			if (
 				session.status === "terminated" ||
 				now - session.lastUsedAt > IDLE_TIMEOUT_MS ||
 				!session.client.isAlive()
 			) {
-				await this.#disposeSession(session);
+				this.#disposeSession(session);
 			}
 		}
 	}
@@ -1006,7 +998,7 @@ export class DapSessionManager {
 		// Wait for the initialized event if we haven't seen it yet.
 		if (!session.initializedSeen) {
 			try {
-				await raceAbort(session.client.waitForEvent("initialized", undefined, signal, timeoutMs), signal);
+				await untilAborted(signal, session.client.waitForEvent("initialized", undefined, signal, timeoutMs));
 			} catch {
 				// Adapter may not send initialized (e.g. it already terminated).
 				// Proceed anyway — the launch/attach response will surface any real error.
@@ -1100,7 +1092,7 @@ export class DapSessionManager {
 		timeoutMs: number = 30_000,
 	): Promise<DapContinueOutcome> {
 		try {
-			await raceAbort(outcomePromise, signal);
+			await untilAborted(signal, outcomePromise);
 			if (session.status === "stopped") {
 				await this.#fetchTopFrame(session, signal, Math.min(timeoutMs, 5_000));
 			}
@@ -1243,12 +1235,12 @@ export class DapSessionManager {
 		return session;
 	}
 
-	async #disposeSession(session: DapSession): Promise<void> {
+	#disposeSession(session: DapSession) {
 		if (this.#activeSessionId === session.id) {
 			this.#activeSessionId = null;
 		}
 		this.#sessions.delete(session.id);
-		await session.client.dispose().catch(() => {});
+		void session.client.dispose().catch(() => {});
 	}
 }
 

package/src/debug/log-formatting.ts

@@ -1,5 +1,5 @@
-import { sanitizeText, wrapTextWithAnsi } from "@oh-my-pi/pi-natives";
-import { replaceTabs, truncateToWidth } from "../tools/render-utils";
+import { sanitizeText } from "@oh-my-pi/pi-natives";
+import { replaceTabs, truncateToWidth, wrapTextWithAnsi } from "../tools/render-utils";
 
 export function formatDebugLogLine(line: string, maxWidth: number): string {
 	const sanitized = sanitizeText(line);

package/src/edit/modes/chunk.ts

@@ -332,7 +332,7 @@ export const chunkToolEditSchema = Type.Object({
 	op: StringEnum(CHUNK_OP_VALUES),
 	sel: Type.String({
 		description:
-			"Chunk selector. Format: 'path@region' for insertions, 'path#CRC@region' for replace. Omit @region to target the full chunk. Valid regions: head, body, tail, decl.",
+			"Chunk selector. Use 'path~' or 'path^' for insertions, 'path#CRC~' or 'path#CRC^' for replace, or omit the suffix to target the full chunk.",
 	}),
 	content: Type.String({
 		description:
@@ -443,6 +443,12 @@ export async function executeChunkMode(
 	}
 	const normalizedOperations = normalizeChunkEditOperations(edits);
 
+	if (!sourceExists && normalizedOperations.some(op => op.sel)) {
+		throw new Error(
+			`File does not exist: ${path}. Cannot resolve chunk selectors on a non-existent file. Use the write tool to create a new file, or check the path for typos.`,
+		);
+	}
+
 	const chunkResult = applyChunkEdits({
 		source: rawContent,
 		language: chunkLanguage,
@@ -453,9 +459,8 @@ export async function executeChunkMode(
 	});
 
 	if (!chunkResult.changed) {
-		const responseText = `[No changes needed — content already matches.]\n\n${chunkResult.responseText}`;
 		return {
-			content: [{ type: "text", text: responseText }],
+			content: [{ type: "text", text: "[No changes needed \u2014 content already matches.]" }],
 			details: {
 				diff: "",
 				op: sourceExists ? "update" : "create",

package/src/export/html/template.css

@@ -705,6 +705,88 @@
       color: var(--error);
     }
 
+    /* Tool renderer extras */
+    .tool-meta {
+      margin-top: 4px;
+    }
+
+    .tool-badge {
+      display: inline-block;
+      padding: 0 6px;
+      margin-right: 4px;
+      border-radius: 3px;
+      background: rgba(255, 255, 255, 0.06);
+      color: var(--dim);
+      font-size: 11px;
+      font-weight: normal;
+      vertical-align: baseline;
+    }
+
+    .tool-pattern {
+      color: var(--warning);
+    }
+
+    .tool-args {
+      margin-top: 4px;
+      color: var(--toolOutput);
+    }
+
+    .tool-arg {
+      display: block;
+      line-height: var(--line-height);
+      white-space: pre-wrap;
+      word-break: break-word;
+    }
+
+    .tool-arg-key {
+      color: var(--dim);
+    }
+
+    .tool-arg-val {
+      color: var(--text);
+    }
+
+    .tool-cell {
+      margin-top: var(--line-height);
+    }
+
+    .tool-cell-title {
+      color: var(--dim);
+      font-size: 11px;
+      margin-bottom: 2px;
+    }
+
+    /* Todo write tree */
+    .todo-tree {
+      margin-top: var(--line-height);
+    }
+
+    .todo-phase {
+      margin-top: 6px;
+      color: var(--accent);
+      font-weight: bold;
+    }
+
+    .todo-task {
+      padding-left: 12px;
+      line-height: var(--line-height);
+    }
+
+    .todo-icon {
+      display: inline-block;
+      width: 14px;
+      text-align: center;
+      color: var(--dim);
+    }
+
+    .todo-completed { color: var(--toolDiffAdded); }
+    .todo-completed .todo-icon { color: var(--toolDiffAdded); }
+    .todo-in_progress { color: var(--warning); }
+    .todo-in_progress .todo-icon { color: var(--warning); }
+    .todo-abandoned { color: var(--toolDiffRemoved); }
+    .todo-abandoned .todo-icon { color: var(--toolDiffRemoved); }
+    .todo-pending { color: var(--toolOutput); }
+
     /* Images */
     .message-images {
       margin-bottom: 12px;