pi-cc-loop 0.7.4 → 0.7.6

package/README.md

@@ -96,7 +96,7 @@ Ctrl+O 展开后多一行元信息（任务 id、节奏）。`compactMessages`
   "footer": true,            // 底部摘要：loop 的一行和 Monitor 的 `monitor N`
   "draft": true,             // pi-cc-plugins：Ctrl+C 找回
   "turnSummary": true,       // pi-cc-plugins：回合摘要一行
-  "ccKeys": true,            // pi-cc-plugins：Enter 排队、Ctrl+Enter 直发
+  "ccKeys": true,            // pi-cc-plugins：Enter 排队、↑ 取回待发消息
   "compaction": true,        // pi-cc-compaction：Claude Code 的压缩
   "idleCompaction": true     // pi-cc-compaction：空闲压缩
 }
@@ -177,6 +177,8 @@ npx --yes -p typescript@5.9.3 tsc --noEmit -p tsconfig.json
 node scripts/cache-check.mjs    # 真实 provider 的缓存检查，默认用免费模型，发版前跑
 ```
 
+四个仓库共同使用的 `config.ts`、`settings.ts`（以及 loop/monitor 的 `render.ts`）以本仓库为维护源。修改后在本仓库运行 `node scripts/sync-shared.mjs` 同步到同级仓库；`node scripts/sync-shared.mjs --check` 只检查，不改文件。各仓库的 `tests/shared.test.mjs` 也会检查副本一致。
+
 ### 缓存约束
 
 提示缓存按前缀匹配（工具 → system prompt → 消息），扩展只能往对话末尾追加：

package/config.ts

@@ -35,7 +35,9 @@
  */
 
 import { getAgentDir } from "@earendil-works/pi-coding-agent";
+import { randomUUID } from "node:crypto";
 import fs from "node:fs";
+import os from "node:os";
 import path from "node:path";
 
 export interface PiCcConfig {
@@ -50,7 +52,7 @@ export interface PiCcConfig {
 	draft: boolean;
 	/** pi-cc-plugins: one line closes every agent run. */
 	turnSummary: boolean;
-	/** pi-cc-plugins: Claude Code's Enter queues, Ctrl+Enter sends now. */
+	/** pi-cc-plugins: Enter queues while Pi works; no Ctrl+Enter shortcut. */
 	ccKeys: boolean;
 	/** pi-cc-compaction: Claude Code's compaction replaces Pi's summary request. */
 	compaction: boolean;
@@ -132,6 +134,70 @@ export function invalidateConfig(): void {
 	cached = undefined;
 }
 
+const LOCK_WAIT_MS = 5000;
+const LOCK_STALE_MS = 60_000;
+const sleep = new Int32Array(new SharedArrayBuffer(4));
+
+function removeStaleLock(lock: string): void {
+	try {
+		const stat = fs.statSync(lock);
+		const age = Date.now() - stat.mtimeMs;
+		if (age < 100) return; // A new writer may not have filled it yet.
+		let stale = age > LOCK_STALE_MS;
+		if (!stale) {
+			const holder = JSON.parse(fs.readFileSync(lock, "utf8")) as { pid?: number; hostname?: string };
+			if (holder.hostname === os.hostname() && typeof holder.pid === "number") {
+				try { process.kill(holder.pid, 0); } catch (error) {
+					stale = (error as NodeJS.ErrnoException).code === "ESRCH";
+				}
+			}
+		}
+		// Do not unlink a lock that another process replaced while we inspected it.
+		const current = fs.statSync(lock);
+		if (stale && current.ino === stat.ino && current.mtimeMs === stat.mtimeMs) fs.rmSync(lock);
+	} catch {
+		// A writer may still be filling it, or another process removed it.
+	}
+}
+
+/** Serialize a short read-modify-write across Pi processes, not just modules in one process. */
+export function withFileLock<T>(file: string, change: () => T): T {
+	const lock = `${file}.write.lock`;
+	const token = randomUUID();
+	const started = Date.now();
+	for (;;) {
+		let fd: number;
+		try {
+			fd = fs.openSync(lock, "wx", 0o600);
+		} catch (error) {
+			if ((error as NodeJS.ErrnoException).code !== "EEXIST") throw error;
+			removeStaleLock(lock);
+			if (Date.now() - started > LOCK_WAIT_MS) throw new Error(`Timed out waiting for ${lock}`);
+			Atomics.wait(sleep, 0, 0, 20);
+			continue;
+		}
+		try {
+			fs.writeSync(fd, JSON.stringify({ pid: process.pid, hostname: os.hostname(), token }));
+		} catch (error) {
+			fs.rmSync(lock, { force: true });
+			throw error;
+		} finally {
+			fs.closeSync(fd);
+		}
+		break;
+	}
+	try {
+		return change();
+	} finally {
+		try {
+			const holder = JSON.parse(fs.readFileSync(lock, "utf8")) as { token?: string };
+			if (holder.token === token) fs.rmSync(lock);
+		} catch {
+			// A stale lock may have been replaced; never remove a new owner's lock.
+		}
+	}
+}
+
 /**
  * Write the changed keys to the settings file and return the settings now in
  * effect. Only the patch is written: every other key stays as the user left
@@ -142,17 +208,23 @@ export function invalidateConfig(): void {
 export function saveConfig(patch: Partial<PiCcConfig>): PiCcConfig {
 	const file = configPath();
 	fs.mkdirSync(path.dirname(file), { recursive: true });
-	// Keep keys this version does not know about: the file is the user's.
-	let raw: Record<string, unknown> = {};
-	try {
-		const parsed = JSON.parse(fs.readFileSync(file, "utf8")) as unknown;
-		if (parsed && typeof parsed === "object" && !Array.isArray(parsed)) raw = parsed as Record<string, unknown>;
-	} catch {
-		// A missing or malformed file is rewritten from scratch.
-	}
-	const temp = `${file}.tmp`;
-	fs.writeFileSync(temp, `${JSON.stringify({ ...raw, ...patch }, null, 2)}\n`, "utf8");
-	fs.renameSync(temp, file);
+	withFileLock(file, () => {
+		// Keep keys this version does not know about: the file is the user's.
+		let raw: Record<string, unknown> = {};
+		try {
+			const parsed = JSON.parse(fs.readFileSync(file, "utf8")) as unknown;
+			if (parsed && typeof parsed === "object" && !Array.isArray(parsed)) raw = parsed as Record<string, unknown>;
+		} catch {
+			// A missing or malformed file is rewritten from scratch.
+		}
+		const temp = `${file}.${process.pid}.${randomUUID()}.tmp`;
+		try {
+			fs.writeFileSync(temp, `${JSON.stringify({ ...raw, ...patch }, null, 2)}\n`, "utf8");
+			fs.renameSync(temp, file);
+		} finally {
+			fs.rmSync(temp, { force: true });
+		}
+	});
 	cached = undefined;
 	return loadConfig();
 }

package/durable.ts

@@ -20,9 +20,11 @@
  *   - The runtime files are added to `.git/info/exclude`.
  */
 
+import { randomUUID } from "node:crypto";
 import fs from "node:fs";
 import os from "node:os";
 import path from "node:path";
+import { withFileLock } from "./config.ts";
 import { nextRunTime, storedJob, type LoopJob, type LoopScheduler, type TimingConfig } from "./schedule.ts";
 
 export const DURABLE_FILE = path.join(".pi", "scheduled_tasks.json");
@@ -37,9 +39,13 @@ interface DurableFileData {
 }
 
 function writeAtomic(file: string, text: string): void {
-	const temp = `${file}.${process.pid}.tmp`;
-	fs.writeFileSync(temp, text, "utf8");
-	fs.renameSync(temp, file);
+	const temp = `${file}.${process.pid}.${randomUUID()}.tmp`;
+	try {
+		fs.writeFileSync(temp, text, "utf8");
+		fs.renameSync(temp, file);
+	} finally {
+		fs.rmSync(temp, { force: true });
+	}
 }
 
 function isSymlink(file: string): boolean {
@@ -94,17 +100,26 @@ export class DurableStore {
 	/** Insert or replace one job, keeping every other job in the file. */
 	upsert(job: LoopJob): void {
 		this.assertWritable();
-		const jobs = this.read().filter((other) => other.id !== job.id);
-		jobs.push(storedJob(job));
-		this.write(jobs);
+		fs.mkdirSync(this.dir, { recursive: true });
+		withFileLock(this.file, () => {
+			this.assertWritable();
+			const jobs = this.read().filter((other) => other.id !== job.id);
+			jobs.push(storedJob(job));
+			this.write(jobs);
+		});
 	}
 
 	remove(id: string): boolean {
-		const jobs = this.read();
-		const kept = jobs.filter((job) => job.id !== id);
-		if (kept.length === jobs.length) return false;
-		this.write(kept);
-		return true;
+		this.assertWritable();
+		if (!this.exists()) return false;
+		return withFileLock(this.file, () => {
+			this.assertWritable();
+			const jobs = this.read();
+			const kept = jobs.filter((job) => job.id !== id);
+			if (kept.length === jobs.length) return false;
+			this.write(kept);
+			return true;
+		});
 	}
 
 	private write(jobs: LoopJob[]): void {
@@ -257,7 +272,7 @@ export function ensureGitExclude(cwd: string): void {
 		const file = path.join(common, "info", "exclude");
 		const current = fs.existsSync(file) ? fs.readFileSync(file, "utf8") : "";
 		const lines = current.split("\n").map((line) => line.trim());
-		const wanted = ["**/.pi/scheduled_tasks.json", "**/.pi/scheduled_tasks.lock"];
+		const wanted = ["**/.pi/scheduled_tasks.json", "**/.pi/scheduled_tasks.lock", "**/.pi/scheduled_tasks.json.write.lock"];
 		const missing = wanted.filter((entry) => !lines.includes(entry));
 		if (!missing.length) return;
 		fs.mkdirSync(path.dirname(file), { recursive: true });
@@ -310,7 +325,10 @@ export class DurableRuntime {
 
 	/** Take the lock if the project has durable jobs, then load them. */
 	start(now = Date.now()): void {
-		if (this.store.exists()) this.acquireAndLoad(now);
+		if (this.store.exists()) {
+			this.store.assertWritable();
+			this.acquireAndLoad(now);
+		}
 	}
 
 	stop(): void {
@@ -321,6 +339,7 @@ export class DurableRuntime {
 	maintain(now = Date.now()): void {
 		if (now - this.lastMaintenance < this.options.syncMs()) return;
 		this.lastMaintenance = now;
+		this.store.assertWritable();
 		if (!this.owner) {
 			if (this.store.exists()) this.acquireAndLoad(now);
 			return;

package/index.ts

@@ -1135,7 +1135,13 @@ export default function piCcLoopExtension(pi: ExtensionAPI): void {
 		durable?.stop();
 		restoreState(ctx, (event as { reason?: string } | undefined)?.reason);
 		durable = createDurable(ctx.cwd);
-		durable.start();
+		try {
+			durable.start();
+		} catch (error) {
+			// Refusing a symlinked or unreadable durable store must not disable
+			// this session's ordinary (non-durable) scheduled jobs.
+			notify(ctx, `Durable jobs unavailable: ${error instanceof Error ? error.message : String(error)}`, "warning");
+		}
 		scheduler.start();
 	});
 

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "pi-cc-loop",
-	"version": "0.7.4",
+	"version": "0.7.6",
 	"description": "Claude Code compatible /loop for the Pi coding agent: cron-scheduled fixed intervals, self-paced chains, and the same dispatch semantics as Claude Code.",
 	"author": "tarnish233",
 	"type": "module",

package/settings.ts

@@ -106,7 +106,7 @@ const PAGES: SettingsPage[] = [
 				on: "on",
 				off: "off",
 				description:
-					"Enter queues while Pi works and Ctrl+Enter sends now, as in Claude Code. off: Pi's keys (Enter sends, Alt+Enter queues).",
+					"Enter queues while Pi works; Ctrl+Enter is not bound by this feature. off: Pi's keys (Enter sends, Alt+Enter queues).",
 			},
 		],
 	},