pi-adaptive-thinking 0.2.1 → 0.2.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-adaptive-thinking",
-  "version": "0.2.1",
+  "version": "0.2.2",
   "private": false,
   "description": "Pi extension for adaptive reasoning-effort control",
   "keywords": [
@@ -31,12 +31,6 @@
     "access": "public",
     "provenance": true
   },
-  "dependencies": {
-    "proper-lockfile": "^4.1.2"
-  },
-  "devDependencies": {
-    "@types/proper-lockfile": "4.1.4"
-  },
   "peerDependencies": {
     "@earendil-works/pi-ai": "*",
     "@earendil-works/pi-coding-agent": "*",

package/src/adaptive-thinking-lifecycle.ts

@@ -1,7 +1,7 @@
 import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
+import { open, rm, stat } from "node:fs/promises";
 import { homedir } from "node:os";
 import { join } from "node:path";
-import lockfile from "proper-lockfile";
 import type {
   AgentEndEvent,
   AgentToolResult,
@@ -147,20 +147,53 @@ const agentDir = () => process.env.PI_CODING_AGENT_DIR ?? join(homedir(), ".pi",
 
 const globalSettingsPath = () => join(agentDir(), "settings.json");
 
-const withSettingsLock = async <T>(settingsPath: string, fn: () => Promise<T> | T): Promise<T> => {
-  mkdirSync(join(settingsPath, ".."), { recursive: true });
-  const lockPath = `${settingsPath}.adaptive-thinking`;
-  if (!existsSync(lockPath)) writeFileSync(lockPath, "");
+// ponytail: Node's wx exclusive-create plus an asynchronous fixed-delay retry loop replaces
+// proper-lockfile; the bound matches its previous policy (99 retries at a fixed 20 ms delay).
+// The .lock suffix distinguishes owned lock files from the legacy always-present marker the
+// previous implementation pre-created next to the settings document.
+// Stale recovery assumes the critical section stays synchronous; use a heartbeat lock if it gains
+// asynchronous work.
+const SETTINGS_LOCK_RETRY_DELAY_MS = 20;
+const SETTINGS_LOCK_RETRIES = 99;
+const SETTINGS_LOCK_STALE_MS = 10_000;
+
+const sleep = (ms: number): Promise<void> =>
+  new Promise((resolveSleep) => setTimeout(resolveSleep, ms));
+
+const acquireSettingsLock = async (lockPath: string): Promise<void> => {
+  for (let attempt = 0; ; attempt += 1) {
+    try {
+      const handle = await open(lockPath, "wx");
+      await handle.close();
+      return;
+    } catch (cause) {
+      if (!(cause instanceof Error) || !("code" in cause) || cause.code !== "EEXIST") throw cause;
+      try {
+        const lock = await stat(lockPath);
+        if (lock.mtimeMs < Date.now() - SETTINGS_LOCK_STALE_MS) {
+          await rm(lockPath, { force: true });
+          continue;
+        }
+      } catch (statCause) {
+        if (!(statCause instanceof Error) || !("code" in statCause) || statCause.code !== "ENOENT")
+          throw statCause;
+        continue;
+      }
+      if (attempt >= SETTINGS_LOCK_RETRIES) throw cause;
+    }
+    await sleep(SETTINGS_LOCK_RETRY_DELAY_MS);
+  }
+};
 
-  const release = await lockfile.lock(lockPath, {
-    realpath: false,
-    retries: { retries: 99, factor: 1, minTimeout: 20, maxTimeout: 20 },
-  });
+const withSettingsLock = async <T>(settingsPath: string, fn: () => T): Promise<T> => {
+  mkdirSync(join(settingsPath, ".."), { recursive: true });
+  const lockPath = `${settingsPath}.adaptive-thinking.lock`;
+  await acquireSettingsLock(lockPath);
 
   try {
     return await fn();
   } finally {
-    await release();
+    await rm(lockPath, { force: true });
   }
 };
 
@@ -385,6 +418,8 @@ export default function adaptiveThinkingExtension(pi: ExtensionAPI) {
     onSessionStart: (handler) => pi.on("session_start", handler),
     onToolCall: (handler) => pi.on("tool_call", handler),
     onAgentEnd: (handler) => pi.on("agent_end", handler),
+    // ponytail: the branches look identical but narrow the union so registerTool's
+    // generics infer per concrete ToolDefinition instead of falling back to defaults.
     registerTool: (tool) => {
       if (isAdaptiveThinkingSetThinkingLevelTool(tool)) pi.registerTool(tool);
       else pi.registerTool(tool);

package/src/config.ts

@@ -77,7 +77,3 @@ export const parseAdaptiveThinkingConfig = (
 
   return { config, usedDeprecatedSystemPrompt: usesSystemPrompt };
 };
-
-/** Parses configuration at the public configuration seam. */
-export const parseConfig = (input: JsonValue | undefined): AdaptiveThinkingConfig =>
-  parseAdaptiveThinkingConfig(input).config;