@pushary/agent-hooks 0.89.9 → 0.89.11

package/dist/bin/pushary-upgrade.js

@@ -1,15 +1,15 @@
 #!/usr/bin/env node
 import {
   reapplyAllAgents
-} from "../chunk-EA3E74P2.js";
-import "../chunk-J2JZJZKB.js";
-import "../chunk-BAE45YLP.js";
+} from "../chunk-PZRWFWSR.js";
+import "../chunk-KVE5RCQL.js";
+import "../chunk-FZ73G2RO.js";
 import {
   waitForMachineReadiness
-} from "../chunk-U5TQCQ25.js";
-import "../chunk-VA7VUNRD.js";
-import "../chunk-ATBKJNWS.js";
-import "../chunk-AIGDBRIJ.js";
+} from "../chunk-TY5HVMXT.js";
+import "../chunk-Q223OM5J.js";
+import "../chunk-6EKQZA6R.js";
+import "../chunk-SYUIXXQW.js";
 import {
   daemonHasRemoteProof,
   daemonServiceManagerAvailable,
@@ -20,12 +20,12 @@ import {
   replaceDaemonService,
   stopDaemonService,
   waitForDaemonRemoteProof
-} from "../chunk-543KNJKC.js";
+} from "../chunk-3SQYKLBW.js";
 import {
   detectProviderLiveCapabilities,
   hasSpawnProvider,
   resolveControlPolicy
-} from "../chunk-NKHEHEUM.js";
+} from "../chunk-6XUABEX2.js";
 import {
   needsShell
 } from "../chunk-XHKBHWLX.js";
@@ -33,18 +33,18 @@ import {
   execNpm,
   npmErrorMessage,
   resolveGlobalBinary
-} from "../chunk-PZA7G4CN.js";
-import "../chunk-DKDDLF5P.js";
+} from "../chunk-X4ZUUFKV.js";
+import "../chunk-DKWM5T3P.js";
 import {
   claudeJson,
   codexConfigToml,
   cursorPluginDir,
   geminiSettings,
   vscodePluginDir
-} from "../chunk-GMI5QZLG.js";
+} from "../chunk-QA72MKIT.js";
 import {
   readControlMode
-} from "../chunk-V6N4Q223.js";
+} from "../chunk-3CUDMTL4.js";
 import {
   exitOnHelpFlag
 } from "../chunk-LURY4WNF.js";
@@ -53,13 +53,13 @@ import "../chunk-BC3VCZ3E.js";
 import {
   isNewerVersion
 } from "../chunk-DINDL2CF.js";
-import "../chunk-OFRNZWC4.js";
+import "../chunk-IUWRVTQK.js";
 import "../chunk-KZERVKTD.js";
 import "../chunk-XX2V4QS5.js";
 import {
   getApiKey
 } from "../chunk-2UMNXADU.js";
-import "../chunk-L4C2JXJS.js";
+import "../chunk-X6RXX2NF.js";
 
 // bin/pushary-upgrade.ts
 import { existsSync } from "fs";

package/dist/bin/pushary-wait.js

@@ -4,8 +4,8 @@ import {
 } from "../chunk-IIENZE2J.js";
 import {
   exitOnFailedResponse
-} from "../chunk-SS72Z7FV.js";
-import "../chunk-I5L6SK5V.js";
+} from "../chunk-253WC6O5.js";
+import "../chunk-BLODMQKJ.js";
 import {
   createIo
 } from "../chunk-5RUIFDTP.js";
@@ -28,7 +28,7 @@ import {
   getApiKey,
   getBaseUrl
 } from "../chunk-2UMNXADU.js";
-import "../chunk-L4C2JXJS.js";
+import "../chunk-X6RXX2NF.js";
 
 // bin/pushary-wait.ts
 exitOnHelpFlag("wait");

package/dist/{chunk-SS72Z7FV.js → chunk-253WC6O5.js}

@@ -1,7 +1,7 @@
 import {
   describeKeyCheck,
   keyCheckFromResponse
-} from "./chunk-I5L6SK5V.js";
+} from "./chunk-BLODMQKJ.js";
 import {
   createIo
 } from "./chunk-5RUIFDTP.js";

package/dist/{chunk-T3LRWZKI.js → chunk-2LPEZYMC.js}

@@ -11,7 +11,7 @@ import {
 } from "./chunk-BSZYIAZL.js";
 import {
   reportedInstallSource
-} from "./chunk-OFRNZWC4.js";
+} from "./chunk-IUWRVTQK.js";
 
 // src/reach.ts
 var reachVerdict = (channels) => {

package/dist/{chunk-O5B7EK5U.js → chunk-34GN3IPX.js}

@@ -1,7 +1,7 @@
 import {
   HOOK_BUDGETS,
   OPENCODE_APPROVAL_EVENT
-} from "./chunk-L4C2JXJS.js";
+} from "./chunk-X6RXX2NF.js";
 
 // src/opencode-plugin.ts
 var OPENCODE_PLUGIN_MARKER = "pushary-opencode-plugin w1";

package/dist/{chunk-V6N4Q223.js → chunk-3CUDMTL4.js}

@@ -3,7 +3,7 @@ import {
 } from "./chunk-BC3VCZ3E.js";
 import {
   resolveInstallSourceFor
-} from "./chunk-OFRNZWC4.js";
+} from "./chunk-IUWRVTQK.js";
 import {
   backupFile,
   readJsonSafe,

package/dist/{chunk-VZKXBFUA.js → chunk-3HFK3UXM.js}

@@ -1,6 +1,6 @@
 import {
   isSafeReadOnlyCommand
-} from "./chunk-L4C2JXJS.js";
+} from "./chunk-X6RXX2NF.js";
 
 // src/ledger.ts
 import { appendFileSync, existsSync, mkdirSync, readFileSync, renameSync, rmSync, statSync } from "fs";

package/dist/{chunk-543KNJKC.js → chunk-3SQYKLBW.js}

@@ -4,13 +4,13 @@ import {
 } from "./chunk-XHKBHWLX.js";
 import {
   resolveGlobalBinary
-} from "./chunk-PZA7G4CN.js";
+} from "./chunk-X4ZUUFKV.js";
 import {
   getMachineId
-} from "./chunk-DKDDLF5P.js";
+} from "./chunk-DKWM5T3P.js";
 import {
   pusharyDir
-} from "./chunk-GMI5QZLG.js";
+} from "./chunk-QA72MKIT.js";
 import {
   getPackageVersion
 } from "./chunk-DINDL2CF.js";

package/dist/{chunk-ATBKJNWS.js → chunk-6EKQZA6R.js}

@@ -1,3 +1,7 @@
+import {
+  ASKED_IN_EVERY_MODE_TOOLS
+} from "./chunk-X6RXX2NF.js";
+
 // src/claude-tools.ts
 var PRETOOLUSE_GATED_TOOLS = [
   "Bash",
@@ -8,7 +12,7 @@ var PRETOOLUSE_GATED_TOOLS = [
   "PowerShell",
   "Monitor"
 ];
-var PRETOOLUSE_PHONE_ANSWERED_TOOLS = ["AskUserQuestion", "ExitPlanMode"];
+var PRETOOLUSE_PHONE_ANSWERED_TOOLS = ASKED_IN_EVERY_MODE_TOOLS;
 var POSTTOOLUSE_MIRRORED_TOOLS = [...PRETOOLUSE_GATED_TOOLS, "TodoWrite"];
 var PRETOOLUSE_HANDLED_TOOLS = /* @__PURE__ */ new Set([...PRETOOLUSE_GATED_TOOLS, ...PRETOOLUSE_PHONE_ANSWERED_TOOLS]);
 

package/dist/{chunk-NKHEHEUM.js → chunk-6XUABEX2.js}

@@ -2,7 +2,7 @@ import {
   resolveBinary,
   resolveGlobalPackageVersion,
   resolvePackageVersionFromBinary
-} from "./chunk-PZA7G4CN.js";
+} from "./chunk-X4ZUUFKV.js";
 
 // src/live-capabilities.ts
 var CLAUDE_BRIDGE_CAPABILITY = "claude-bridge";

package/dist/{chunk-I5L6SK5V.js → chunk-BLODMQKJ.js}

@@ -12,7 +12,7 @@ import {
 } from "./chunk-2UMNXADU.js";
 import {
   isValidApiKey
-} from "./chunk-L4C2JXJS.js";
+} from "./chunk-X6RXX2NF.js";
 
 // src/session.ts
 var IDENTITY_PATH = "/api/v1/server/identity";

package/dist/{chunk-DKDDLF5P.js → chunk-DKWM5T3P.js}

@@ -1,6 +1,6 @@
 import {
   pusharyDir
-} from "./chunk-GMI5QZLG.js";
+} from "./chunk-QA72MKIT.js";
 import {
   writeFileAtomic
 } from "./chunk-XX2V4QS5.js";

package/dist/{chunk-4XZCDSNG.js → chunk-FXIL7RCL.js}

@@ -12,7 +12,7 @@ import {
   savePendingCommand,
   sendNotification,
   waitForAnswer
-} from "./chunk-GKAKAOKC.js";
+} from "./chunk-JHJHCMAF.js";
 import {
   AGENT_IDENTITIES,
   deriveReceiptMeta,
@@ -26,16 +26,16 @@ import {
   summarizeStop,
   taskTitleFrom,
   toolResultErrorText
-} from "./chunk-KOPUTJQC.js";
+} from "./chunk-TG3T3M4K.js";
 import {
   getMachineId
-} from "./chunk-DKDDLF5P.js";
+} from "./chunk-DKWM5T3P.js";
 import {
   withRetry
 } from "./chunk-BSZYIAZL.js";
 import {
   reportedInstallSource
-} from "./chunk-OFRNZWC4.js";
+} from "./chunk-IUWRVTQK.js";
 import {
   getApiKey,
   getBaseUrl
@@ -51,7 +51,7 @@ import {
   pendingCommandEvents,
   resolveAutoResolveOrigin,
   resolvePolicy
-} from "./chunk-L4C2JXJS.js";
+} from "./chunk-X6RXX2NF.js";
 
 // src/policy.ts
 import { createHash } from "crypto";

package/dist/{chunk-BAE45YLP.js → chunk-FZ73G2RO.js}

@@ -1,12 +1,12 @@
 import {
   hasGeminiHooks
-} from "./chunk-VA7VUNRD.js";
+} from "./chunk-Q223OM5J.js";
 import {
   hasCodexHooks
-} from "./chunk-GMI5QZLG.js";
+} from "./chunk-QA72MKIT.js";
 import {
   HOOK_LOCATOR_BINARY
-} from "./chunk-L4C2JXJS.js";
+} from "./chunk-X6RXX2NF.js";
 
 // src/diagnostics/wiring.ts
 var record = (value) => value && typeof value === "object" && !Array.isArray(value) ? value : null;

package/dist/{chunk-PMHTCDEO.js → chunk-IUN6VOKV.js}

@@ -3,7 +3,7 @@ import {
 } from "./chunk-2UMNXADU.js";
 import {
   redactSecrets
-} from "./chunk-L4C2JXJS.js";
+} from "./chunk-X6RXX2NF.js";
 
 // src/crypto.ts
 import nacl from "tweetnacl";

package/dist/{chunk-OFRNZWC4.js → chunk-IUWRVTQK.js}

@@ -3,7 +3,7 @@ import {
 } from "./chunk-2UMNXADU.js";
 import {
   normalizeInstallSource
-} from "./chunk-L4C2JXJS.js";
+} from "./chunk-X6RXX2NF.js";
 
 // src/install-source.ts
 import { readFileSync } from "fs";

package/dist/{chunk-EJT2ER6G.js → chunk-J4K75V4D.js}

@@ -1,11 +1,14 @@
 import {
   PRETOOLUSE_HANDLED_TOOLS,
   PRETOOLUSE_PHONE_ANSWERED_TOOLS
-} from "./chunk-ATBKJNWS.js";
+} from "./chunk-6EKQZA6R.js";
+import {
+  defersToNativeMode
+} from "./chunk-NCVIWGVA.js";
 import {
   isGatingMoment,
   recordKeylessMoment
-} from "./chunk-VZKXBFUA.js";
+} from "./chunk-3HFK3UXM.js";
 import {
   denyReasonFrom,
   isDeferAnswer
@@ -17,7 +20,7 @@ import {
   readLastUserPrompt,
   repoKeyFor,
   throttlePass
-} from "./chunk-4XZCDSNG.js";
+} from "./chunk-FXIL7RCL.js";
 import {
   DEFAULT_SESSION,
   askUser,
@@ -25,7 +28,7 @@ import {
   pollForAnswer,
   savePendingQuestion,
   sendNotification
-} from "./chunk-GKAKAOKC.js";
+} from "./chunk-JHJHCMAF.js";
 import {
   deriveAction,
   deriveActionBody,
@@ -33,10 +36,10 @@ import {
   deriveToolTarget,
   describeToolCall,
   scopePathFor
-} from "./chunk-KOPUTJQC.js";
+} from "./chunk-TG3T3M4K.js";
 import {
   getMachineId
-} from "./chunk-DKDDLF5P.js";
+} from "./chunk-DKWM5T3P.js";
 import {
   getApiKey,
   getBaseUrl
@@ -50,9 +53,8 @@ import {
   hookWaitDeadline,
   parseAgentQuestionAnswers,
   parseAgentQuestions,
-  resolveGate,
-  shouldDeferToNativeMode
-} from "./chunk-L4C2JXJS.js";
+  resolveGate
+} from "./chunk-X6RXX2NF.js";
 
 // src/decision-episode.ts
 var EPISODE_PATH = "/api/agent/decision-episode";
@@ -85,7 +87,16 @@ var allow = () => claudePreToolUseOutput("allow");
 var deny = (reason) => claudePreToolUseOutput("deny", reason);
 var allowWithInput = (updatedInput) => claudePreToolUseOutput("allow", void 0, updatedInput);
 var ask = (reason) => claudePreToolUseOutput("ask", reason);
+var storedWaitDeadline = (result, requestedDeadline) => {
+  const stored = result.waitEndsAt ? Date.parse(result.waitEndsAt) : Number.NaN;
+  return Number.isFinite(stored) ? Math.min(stored, requestedDeadline) : requestedDeadline;
+};
+var returnedAnswer = (result) => result.answered === true ? { answered: true, value: result.value, note: result.note } : null;
 var handlePushOnly = async (apiKey, description, projectName, timeoutSeconds, timeoutAction, sessionId, machineId, toolName, toolTarget, decision, signals) => {
+  const effectiveWait = effectiveWaitSeconds(timeoutAction, timeoutSeconds, "claude");
+  const now = Date.now();
+  const requestedDeadline = hookWaitDeadline(START_MS, effectiveWait, "claude", now);
+  const clampCut = hookWaitClamped(START_MS, effectiveWait, "claude", now);
   let result;
   try {
     result = await askUser(apiKey, {
@@ -97,6 +108,7 @@ var handlePushOnly = async (apiKey, description, projectName, timeoutSeconds, ti
       machineId,
       toolName,
       toolTarget,
+      waitEndsAt: timeoutAction !== "approve" && timeoutAction !== "deny" || clampCut ? new Date(requestedDeadline).toISOString() : void 0,
       ...decision
     });
   } catch {
@@ -115,6 +127,8 @@ var handlePushOnly = async (apiKey, description, projectName, timeoutSeconds, ti
     return ask(result.suppressed ? "You are at the keyboard, approve here." : "Delivery mode is Terminal, approve here.");
   }
   if (result.noDevices) {
+    await cancelQuestion(apiKey, result.correlationId).catch(() => {
+    });
     switch (timeoutAction) {
       case "approve":
         return allow();
@@ -124,12 +138,9 @@ var handlePushOnly = async (apiKey, description, projectName, timeoutSeconds, ti
         return void 0;
     }
   }
-  const effectiveWait = effectiveWaitSeconds(timeoutAction, timeoutSeconds, "claude");
-  const now = Date.now();
-  const deadline = hookWaitDeadline(START_MS, effectiveWait, "claude", now);
-  const clampCut = hookWaitClamped(START_MS, effectiveWait, "claude", now);
+  const deadline = storedWaitDeadline(result, requestedDeadline);
   announceWait(effectiveWait, result.answerUrl, sessionId);
-  const answer = await pollForAnswer(apiKey, result.correlationId, deadline);
+  const answer = returnedAnswer(result) ?? await pollForAnswer(apiKey, result.correlationId, deadline);
   if (answer.answered) {
     if (isDeferAnswer(answer.value)) return ask("Handling on your machine");
     signals.humanDecision = true;
@@ -145,6 +156,7 @@ var handlePushOnly = async (apiKey, description, projectName, timeoutSeconds, ti
     case "deny":
       return deny("No response within timeout");
     default:
+      savePendingQuestion(sessionId || DEFAULT_SESSION, result.correlationId);
       return ask("No push response, asking in terminal");
   }
 };
@@ -152,6 +164,7 @@ var handleTerminalOnly = () => {
   return ask();
 };
 var handlePushFirst = async (apiKey, description, projectName, pushFirstSeconds, sessionId, machineId, toolName, toolTarget, decision, signals) => {
+  const requestedDeadline = hookWaitDeadline(START_MS, pushFirstSeconds, "claude", Date.now());
   let result;
   try {
     result = await askUser(apiKey, {
@@ -163,6 +176,7 @@ var handlePushFirst = async (apiKey, description, projectName, pushFirstSeconds,
       machineId,
       toolName,
       toolTarget,
+      waitEndsAt: new Date(requestedDeadline).toISOString(),
       ...decision
     });
   } catch {
@@ -174,11 +188,13 @@ var handlePushFirst = async (apiKey, description, projectName, pushFirstSeconds,
     return ask("You are at the keyboard, approve here.");
   }
   if (result.noDevices) {
+    await cancelQuestion(apiKey, result.correlationId).catch(() => {
+    });
     return void 0;
   }
   announceWait(pushFirstSeconds, result.answerUrl, sessionId);
-  const deadline = hookWaitDeadline(START_MS, pushFirstSeconds, "claude", Date.now());
-  const answer = await pollForAnswer(apiKey, result.correlationId, deadline, 1500);
+  const deadline = storedWaitDeadline(result, requestedDeadline);
+  const answer = returnedAnswer(result) ?? await pollForAnswer(apiKey, result.correlationId, deadline, 1500);
   if (answer.answered) {
     if (isDeferAnswer(answer.value)) return ask("Handling on your machine");
     signals.humanDecision = true;
@@ -302,15 +318,7 @@ var keylessNoticeOnce = (sessionId) => {
   } catch {
   }
 };
-var nativeDeferOptions = () => {
-  const respect = process.env.PUSHARY_RESPECT_PERMISSION_MODE;
-  const bypass = process.env.PUSHARY_DEFER_BYPASS;
-  return {
-    respectPermissionMode: !(respect === "0" || respect === "false"),
-    deferBypass: bypass === "1" || bypass === "true"
-  };
-};
-var shouldDeferToNativeMode2 = (permissionMode, toolName) => shouldDeferToNativeMode(permissionMode, toolName, nativeDeferOptions());
+var shouldDeferToNativeMode = defersToNativeMode;
 var handedToTerminal = (result) => result.suppressed === true || result.noDevices === true || result.status === "terminal";
 var withLabels = (question) => ({
   ...question,
@@ -336,7 +344,8 @@ var askAsOneCard = async (apiKey, input, parsed, projectName, deadline) => {
       sessionId: input.session_id,
       machineId: getMachineId(),
       toolName: "AskUserQuestion",
-      toolUseId: input.tool_use_id
+      toolUseId: input.tool_use_id,
+      waitEndsAt: new Date(deadline).toISOString()
     });
   } catch {
     return void 0;
@@ -346,7 +355,7 @@ var askAsOneCard = async (apiKey, input, parsed, projectName, deadline) => {
     });
     return void 0;
   }
-  const answer = await pollForAnswer(apiKey, result.correlationId, deadline);
+  const answer = returnedAnswer(result) ?? await pollForAnswer(apiKey, result.correlationId, storedWaitDeadline(result, deadline));
   const values = answer.answered && answer.value ? parseAgentQuestionAnswers(parsed, answer.value) : null;
   if (!values || isDeferAnswer(answer.value)) {
     savePendingQuestion(input.session_id || DEFAULT_SESSION, result.correlationId);
@@ -372,7 +381,8 @@ var askQuestionByQuestion = async (apiKey, input, parsed, projectName, deadline)
         // One AskUserQuestion call raises several questions, and their payload
         // fingerprints are identical (same tool, no target, no body). Without the
         // index they would all collapse onto the first decision.
-        toolUseId: input.tool_use_id ? `${input.tool_use_id}#q${index}` : void 0
+        toolUseId: input.tool_use_id ? `${input.tool_use_id}#q${index}` : void 0,
+        waitEndsAt: new Date(deadline).toISOString()
       });
     } catch {
       return void 0;
@@ -382,7 +392,7 @@ var askQuestionByQuestion = async (apiKey, input, parsed, projectName, deadline)
       });
       return void 0;
     }
-    const answer = await pollForAnswer(apiKey, result.correlationId, deadline);
+    const answer = returnedAnswer(result) ?? await pollForAnswer(apiKey, result.correlationId, storedWaitDeadline(result, deadline));
     const legacyValue = answer.answered ? answer.value?.trim() : void 0;
     const values = legacyValue ? parseAgentQuestionAnswers([question], legacyValue) ?? parseAgentQuestionAnswers([question], JSON.stringify({
       [question.question]: question.multiSelect ? JSON.stringify([legacyValue]) : legacyValue
@@ -410,6 +420,7 @@ var PLAN_KEEP_PLANNING = "Keep planning";
 var handleExitPlanMode = async (apiKey, input) => {
   const toolInput = input.tool_input ?? {};
   const projectName = basename(input.cwd ?? process.cwd());
+  const deadline = hookWaitDeadline(START_MS, effectiveWaitSeconds("wait", 0, "claude"), "claude", Date.now());
   let result;
   try {
     result = await askUser(apiKey, {
@@ -426,7 +437,8 @@ var handleExitPlanMode = async (apiKey, input) => {
       // so approving from a lock screen is a real decision and not a blind yes.
       actionBody: deriveActionBody("ExitPlanMode", toolInput),
       intent: readLastPrompt(input.session_id ?? DEFAULT_SESSION) ?? (input.transcript_path ? readLastUserPrompt(input.transcript_path) : void 0),
-      blocker: "Waiting for you to approve the plan"
+      blocker: "Waiting for you to approve the plan",
+      waitEndsAt: new Date(deadline).toISOString()
     });
   } catch {
     return void 0;
@@ -436,8 +448,7 @@ var handleExitPlanMode = async (apiKey, input) => {
     });
     return void 0;
   }
-  const deadline = hookWaitDeadline(START_MS, effectiveWaitSeconds("wait", 0, "claude"), "claude", Date.now());
-  const answer = await pollForAnswer(apiKey, result.correlationId, deadline);
+  const answer = returnedAnswer(result) ?? await pollForAnswer(apiKey, result.correlationId, storedWaitDeadline(result, deadline));
   const value = answer.answered ? (answer.value ?? "").trim() : "";
   if (!value || isDeferAnswer(answer.value)) {
     savePendingQuestion(input.session_id || DEFAULT_SESSION, result.correlationId);
@@ -487,14 +498,14 @@ var handlePreToolUse = async (input) => {
     const policy = await getPolicy(apiKey, modeState.policyVersion, "claude_code", true, input.session_id);
     const verdict = resolveGate(claudeGateInput(modeState, policy, input));
     if (verdict.kind === "kill") return deny(verdict.reason);
+    if (verdict.kind === "deny") return deny(verdict.reason);
     if (input.tool_name === "AskUserQuestion") {
       return handleAskUserQuestion(apiKey, input);
     }
-    if (verdict.kind === "deny") return deny(verdict.reason);
     if (input.tool_name === "ExitPlanMode") {
       return handleExitPlanMode(apiKey, input);
     }
-    if (shouldDeferToNativeMode2(input.permission_mode, input.tool_name)) {
+    if (shouldDeferToNativeMode(input.permission_mode, input.tool_name)) {
       return void 0;
     }
     switch (verdict.kind) {
@@ -525,7 +536,7 @@ var toPermissionRequestOutput = (hookOutput) => {
 };
 var handlePermissionRequest = async (input) => {
   if (PRETOOLUSE_HANDLED_TOOLS.has(input.tool_name)) {
-    const reclaimDeferredExec = !PRETOOLUSE_PHONE_ANSWERED_TOOLS.includes(input.tool_name) && shouldDeferToNativeMode2(input.permission_mode, input.tool_name);
+    const reclaimDeferredExec = !PRETOOLUSE_PHONE_ANSWERED_TOOLS.includes(input.tool_name) && shouldDeferToNativeMode(input.permission_mode, input.tool_name);
     if (!reclaimDeferredExec) return void 0;
   }
   if (input.tool_name.startsWith("mcp__pushary__")) return void 0;

package/dist/{chunk-GKAKAOKC.js → chunk-JHJHCMAF.js}

@@ -17,7 +17,7 @@ var isPolicyConfig = (data) => {
 var isAskUserResponse = (data) => {
   if (!data || typeof data !== "object") return false;
   const d = data;
-  return typeof d.correlationId === "string" && typeof d.status === "string";
+  return typeof d.correlationId === "string" && typeof d.status === "string" && (d.answered === void 0 || typeof d.answered === "boolean") && (d.value === void 0 || typeof d.value === "string") && (d.note === void 0 || typeof d.note === "string") && (d.waitEndsAt === void 0 || typeof d.waitEndsAt === "string");
 };
 var isWaitForAnswerResponse = (data) => {
   if (!data || typeof data !== "object") return false;
@@ -82,13 +82,14 @@ var commandDirFor = (sessionId, namespace = "") => join(
   createHash("sha256").update(namespace).digest("hex").slice(0, 16),
   sanitize(sessionId)
 );
-var commandFile = (sessionId, namespace = "") => join(commandDirFor(sessionId, namespace), "command.json");
-var readPendingCommand = (sessionId, namespace = "") => {
+var legacyCommandFile = (sessionId, namespace = "") => join(commandDirFor(sessionId, namespace), "command.json");
+var commandFile = (sessionId, id, namespace = "") => join(commandDirFor(sessionId, namespace), `${createHash("sha256").update(id).digest("hex")}.json`);
+var readCommandFile = (file) => {
   try {
-    const value = JSON.parse(readFileSync(commandFile(sessionId, namespace), "utf-8"));
+    const value = JSON.parse(readFileSync(file, "utf-8"));
     if (typeof value.id !== "string" || typeof value.text !== "string" || typeof value.expiresAtMs !== "number") return null;
     if (value.expiresAtMs <= Date.now()) {
-      unlinkSync(commandFile(sessionId, namespace));
+      unlinkSync(file);
       return null;
     }
     return {
@@ -100,23 +101,68 @@ var readPendingCommand = (sessionId, namespace = "") => {
     return null;
   }
 };
+var readPendingCommandById = (sessionId, id, namespace = "") => {
+  const current = readCommandFile(commandFile(sessionId, id, namespace));
+  if (current?.id === id) return current;
+  const legacy = readCommandFile(legacyCommandFile(sessionId, namespace));
+  return legacy?.id === id ? legacy : null;
+};
+var pruneExpiredCommands = (dir) => {
+  let files;
+  try {
+    files = readdirSync(dir).filter((file) => file.endsWith(".json"));
+  } catch {
+    return [];
+  }
+  return files.flatMap((file) => {
+    const command = readCommandFile(join(dir, file));
+    return command ? [command] : [];
+  });
+};
+var pruneExpiredCommandStore = () => {
+  let namespaces;
+  try {
+    namespaces = readdirSync(COMMAND_DIR, { withFileTypes: true });
+  } catch {
+    return;
+  }
+  for (const namespace of namespaces.filter((entry) => entry.isDirectory())) {
+    const namespaceDir = join(COMMAND_DIR, namespace.name);
+    let sessions;
+    try {
+      sessions = readdirSync(namespaceDir, { withFileTypes: true });
+    } catch {
+      continue;
+    }
+    for (const session of sessions.filter((entry) => entry.isDirectory())) {
+      pruneExpiredCommands(join(namespaceDir, session.name));
+    }
+  }
+};
+var readPendingCommand = (sessionId, namespace = "") => {
+  const commands = pruneExpiredCommands(commandDirFor(sessionId, namespace));
+  return commands.find((command) => !command.delivered && !command.failed) ?? commands[0] ?? null;
+};
 var savePendingCommand = (sessionId, command, namespace = "") => {
   const dir = commandDirFor(sessionId, namespace);
   try {
     mkdirSync(dir, { recursive: true, mode: 448 });
-    writeFileSync(commandFile(sessionId, namespace), JSON.stringify(command), { encoding: "utf-8", mode: 384, flag: "wx" });
+    pruneExpiredCommandStore();
+    if (readPendingCommandById(sessionId, command.id, namespace)) return false;
+    writeFileSync(commandFile(sessionId, command.id, namespace), JSON.stringify(command), { encoding: "utf-8", mode: 384, flag: "wx" });
     return true;
   } catch {
     return false;
   }
 };
 var updatePendingCommand = (sessionId, id, update, namespace = "") => {
-  const command = readPendingCommand(sessionId, namespace);
-  if (!command || command.id !== id) return false;
-  const file = commandFile(sessionId, namespace);
+  const command = readPendingCommandById(sessionId, id, namespace);
+  if (!command) return false;
+  const currentFile = commandFile(sessionId, id, namespace);
+  const file = existsSync(currentFile) ? currentFile : legacyCommandFile(sessionId, namespace);
   const temporary = `${file}.${process.pid}.tmp`;
   try {
-    writeFileSync(temporary, JSON.stringify({ ...command, ...update }), { encoding: "utf-8", mode: 384 });
+    writeFileSync(temporary, JSON.stringify({ ...command, ...update, text: "" }), { encoding: "utf-8", mode: 384 });
     renameSync(temporary, file);
     return true;
   } catch {
@@ -130,9 +176,15 @@ var updatePendingCommand = (sessionId, id, update, namespace = "") => {
 var markPendingCommandDelivered = (sessionId, id, namespace = "") => updatePendingCommand(sessionId, id, { delivered: true, failed: void 0 }, namespace);
 var markPendingCommandFailed = (sessionId, id, namespace = "") => updatePendingCommand(sessionId, id, { delivered: false, failed: true }, namespace);
 var removePendingCommand = (sessionId, id, namespace = "") => {
-  if (readPendingCommand(sessionId, namespace)?.id !== id) return;
+  if (!readPendingCommandById(sessionId, id, namespace)) return;
+  try {
+    unlinkSync(commandFile(sessionId, id, namespace));
+  } catch {
+  }
   try {
-    unlinkSync(commandFile(sessionId, namespace));
+    if (readCommandFile(legacyCommandFile(sessionId, namespace))?.id === id) {
+      unlinkSync(legacyCommandFile(sessionId, namespace));
+    }
   } catch {
   }
 };
@@ -181,6 +233,7 @@ export {
   cancelQuestion,
   sendNotification,
   DEFAULT_SESSION,
+  readPendingCommandById,
   readPendingCommand,
   savePendingCommand,
   markPendingCommandDelivered,