@tekmidian/pai 0.65.0 → 0.65.1

package/dist/{run-DUZRSnIT.mjs → run-uAkNItb6.mjs}

@@ -918,6 +918,10 @@ function salvageOnExit(ledger, id, label, wtDir, timeoutMs) {
 			paths: committed.join(","),
 			skipped: skipped.length
 		});
+		if (skipped.length) appendLedger(ledger, "WORKER-NOTE", {
+			id,
+			note: `salvage skipped: ${skipped.join("; ")}`
+		});
 		return committed;
 	} catch (e) {
 		try {
@@ -1007,8 +1011,10 @@ function salvageUncommitted(wtDir, label, timeoutMs) {
 		skipped: []
 	};
 	const skipped = [];
+	const missing = new Set(git(wtDir, ["ls-files", "--deleted"], timeoutMs).split("\n").filter(Boolean));
 	const toStage = [];
-	for (const p of paths) if (symlinkEscapesWorktree(wtDir, p)) skipped.push(`symlink ${p} -> ${readlinkSync(join(wtDir, p))} (points outside the worktree)`);
+	for (const p of paths) if (missing.has(p)) skipped.push(`${p} (missing, not committed)`);
+	else if (symlinkEscapesWorktree(wtDir, p)) skipped.push(`symlink ${p} -> ${readlinkSync(join(wtDir, p))} (points outside the worktree)`);
 	else toStage.push(p);
 	if (!toStage.length) return {
 		committed: [],
@@ -1017,11 +1023,21 @@ function salvageUncommitted(wtDir, label, timeoutMs) {
 	try {
 		git(wtDir, [
 			"add",
-			"-A",
+			"--ignore-removal",
 			"--",
 			".",
 			...paths.filter((p) => !toStage.includes(p)).map((p) => `:(exclude,literal)${p}`)
 		], timeoutMs);
+		const deleted = git(wtDir, [
+			"diff",
+			"--cached",
+			"--diff-filter=D",
+			"--name-only"
+		], timeoutMs).split("\n").filter(Boolean);
+		if (deleted.length > MAX_SALVAGE_DELETES) {
+			git(wtDir, ["reset", "-q"], timeoutMs);
+			throw new Error(`salvage would delete ${deleted.length} tracked files (${deleted.slice(0, 5).join(", ")}, ...), refused`);
+		}
 		git(wtDir, [
 			"commit",
 			"-m",
@@ -1035,6 +1051,8 @@ function salvageUncommitted(wtDir, label, timeoutMs) {
 		skipped
 	};
 }
+/** A salvage commit that deletes more tracked files than this is refused. */
+const MAX_SALVAGE_DELETES = 5;
 /**
 * The dirty paths of a checkout, parsed from `git status --porcelain -z`:
 * NUL-separated (a path with a newline in it cannot corrupt the parse),
@@ -3505,7 +3523,7 @@ async function runWorker(opts) {
 		if (gc?.length) process.stderr.write(`pai worker: archived ${gc.length} leftover worktree(s) (pai worker gc)\n`);
 	} catch {}
 	if (opts.className === "plan" && !opts._planner) {
-		const { runPlanner } = await import("./planner-8-shIa8t.mjs");
+		const { runPlanner } = await import("./planner-DAq4Yx-H.mjs");
 		return runPlanner(opts);
 	}
 	const parent = launchParent(opts.parent);
@@ -4673,4 +4691,4 @@ function resultFromOutput(out) {
 
 //#endregion
 export { expandMcpNames as $, ledgerSummary as A, loadStatuses as B, discardWorker as C, uncommittedPaths as D, mergeWorker as E, contextPercent as F, setWorkerLabel as G, nowStamp as H, elapsedOf as I, parseRunnerArgs as J, waitForTerminalStatus as K, isChatPane as L, ageOf as M, alive as N, worktreesDir as O, contextLabel as P, describeMcp as Q, isLive as R, workerInScope as S, git as T, ownsPid as U, newWorkerId as V, saveStatus as W, pinNotices as X, shortText as Y, projectLaunchConfig as Z, itermForClaudeSession as _, parseWorkerReport as a, sessionMapPath as b, readInbox as c, checkPaneForWorker as d, openFollowPane as f, currentTabKey as g, markControlsHeld as h, usageContextTokens as i, UNLABELED as j, appendLedger as k, sayToWorker as l, clickrControlsArgv as m, runWorker as n, renderReport as o, openPaneForWorker as p, longInlinePromptHint as q, testProvider as r, handoffFromInside as s, printResult as t, workerDepth as u, itermUuid as v, gcWorktrees as w, sessionTag as x, resolveSession as y, loadStatus as z };
-//# sourceMappingURL=run-DUZRSnIT.mjs.map
+//# sourceMappingURL=run-uAkNItb6.mjs.map