pushary 1.9.36 → 1.9.38

package/dist/{chunk-RNRCOOQZ.js → chunk-N2I7RMC6.js}

@@ -1,20 +1,22 @@
 import {
+  askAgentQuestions,
   defersToNativeMode,
-  reportMachineDenial
-} from "./chunk-MNXHKEXB.js";
+  outcomeOfFailedAsk,
+  reportMachineDenial,
+  storedWaitDeadline
+} from "./chunk-CHRRBADC.js";
 import {
   isGatingMoment,
   recordKeylessMoment
-} from "./chunk-J36W6ARB.js";
+} from "./chunk-G3CNMCQS.js";
 import {
-  announceSubscriptionRequired,
   isDeferAnswer,
   oncePerSession
-} from "./chunk-DC6KHRVH.js";
+} from "./chunk-W2TXFM6O.js";
 import {
   activeHookSource,
   activeIdentity
-} from "./chunk-SHLLDMPM.js";
+} from "./chunk-7GSOIBVM.js";
 import {
   DEFAULT_SESSION,
   UNNAMED_ACTION,
@@ -39,7 +41,7 @@ import {
   reportEvent,
   scopePathFor,
   settleQuestionsForToolUse
-} from "./chunk-6LKIK7V2.js";
+} from "./chunk-L5WOYQT7.js";
 import {
   askUser,
   cancelQuestion,
@@ -52,22 +54,20 @@ import {
   sendNotification,
   waitForQuestion,
   waitsForThePhone
-} from "./chunk-FBKGGIFB.js";
-import {
-  SubscriptionRequiredError
-} from "./chunk-BS64ZHTB.js";
+} from "./chunk-7O5U5TED.js";
 import {
   getMachineId
-} from "./chunk-EGTVN6YV.js";
+} from "./chunk-3HUHP4A4.js";
 import {
   getApiKey,
   getBaseUrl
-} from "./chunk-PRKH662J.js";
+} from "./chunk-D322CKL2.js";
 import {
   NPX_LATEST_COMMAND
-} from "./chunk-LL256PHP.js";
+} from "./chunk-MXEDMQLC.js";
 import {
   AGENT_QUESTION_STRATEGY,
+  AGENT_QUESTION_TOOL,
   DECISION_STOP_REASON,
   GATE_BLOCK_REASON_MAX_LENGTH,
   GATE_WIRE,
@@ -104,13 +104,12 @@ import {
   isBlockedActionRequest,
   isPermissionRequestOwnedByPreToolUse,
   isPusharyOwnTool,
-  parseAgentQuestionAnswers,
   parseAgentQuestions,
   questionHandedToTheTerminal,
   resolveGate,
   timeoutActionWithoutLocalPrompt,
   unansweredRefusalReason
-} from "./chunk-2DZBIELP.js";
+} from "./chunk-QOUW57RT.js";
 
 // src/claude-permission-rules.ts
 import { readFileSync, statSync } from "fs";
@@ -191,16 +190,7 @@ var allowWithInput = (updatedInput) => claudePreToolUseOutput("allow", void 0, u
 var ask = (reason) => claudePreToolUseOutput("ask", reason);
 var halted = (reason) => claudeStoppedPreToolUseOutput(reason);
 var undecidedCall = (reason) => PUSHARY_IS_SOLE_GATE ? deny(reason) : void 0;
-var outcomeOfFailedAsk = (error, sessionId, failure) => {
-  if (!(error instanceof SubscriptionRequiredError)) return failure;
-  announceSubscriptionRequired(error.upgradeUrl, sessionId);
-  return void 0;
-};
 var outcomeOfFailedPermissionAsk = (error, sessionId) => outcomeOfFailedAsk(error, sessionId, halted(UNVERIFIABLE_APPROVAL_REASON)) ?? undecidedCall(SOLE_GATE_SUBSCRIPTION_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 handlePushOnly = async (apiKey, description, projectName, timeoutSeconds, timeoutAction, sessionId, machineId, toolName, toolTarget, decision, signals) => {
   const effectiveWait = effectiveWaitSeconds(timeoutAction, timeoutSeconds, "claude");
   const now = Date.now();
@@ -393,94 +383,29 @@ var keylessNoticeOnce = (sessionId) => {
   }
 };
 var shouldDeferToNativeMode = defersToNativeMode;
-var withLabels = (question) => ({
-  ...question,
-  labels: question.options.map((option) => option.label)
-});
-var withoutLabels = ({ labels: _, ...question }) => question;
-var parseQuestions = (toolInput) => parseAgentQuestions(toolInput)?.map(withLabels);
-var questionContext = (question, index, total, project) => {
-  const subject = question.header ? `${question.header}: your agent is asking in ${project}` : `Your agent is asking in ${project}`;
-  return total > 1 ? `${subject} (${index + 1} of ${total})` : subject;
-};
-var askAsOneCard = async (apiKey, input, parsed, projectName, deadline) => {
-  const only = parsed[0];
-  let result;
-  try {
-    result = await askUser(apiKey, {
-      question: only.question,
-      type: "select",
-      options: [...only.labels],
-      questions: parsed.map(withoutLabels),
-      context: questionContext(only, 0, 1, projectName),
-      agentName: agentNameIn(projectName),
-      sessionId: input.session_id,
-      machineId: getMachineId(),
-      toolName: "AskUserQuestion",
-      toolUseId: input.tool_use_id,
-      waitEndsAt: new Date(deadline).toISOString()
-    });
-  } catch (error) {
-    return outcomeOfFailedAsk(error, input.session_id, null);
-  }
-  if (isDecisionStopped(result)) return null;
-  const answer = await waitForQuestion(apiKey, result, storedWaitDeadline(result, deadline));
-  if (isDecisionStopped(answer)) return null;
-  const values = answer.answered && answer.value ? parseAgentQuestionAnswers(parsed, answer.value) : null;
-  if (!values || isDeferAnswer(answer.value)) {
-    return void 0;
-  }
-  return values;
-};
-var askQuestionByQuestion = async (apiKey, input, parsed, projectName, deadline) => {
-  const answers = {};
-  for (const [index, question] of parsed.entries()) {
-    let result;
-    try {
-      result = await askUser(apiKey, {
-        question: question.question,
-        type: "select",
-        options: [...question.labels],
-        questions: [withoutLabels(question)],
-        context: questionContext(question, index, parsed.length, projectName),
-        agentName: agentNameIn(projectName),
-        sessionId: input.session_id,
-        machineId: getMachineId(),
-        toolName: "AskUserQuestion",
-        // 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,
-        waitEndsAt: new Date(deadline).toISOString()
-      });
-    } catch (error) {
-      return outcomeOfFailedAsk(error, input.session_id, null);
-    }
-    if (isDecisionStopped(result)) return null;
-    const answer = await waitForQuestion(apiKey, result, storedWaitDeadline(result, deadline));
-    if (isDecisionStopped(answer)) return null;
-    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
-    })) : null;
-    const value = values?.[question.question];
-    if (!value || isDeferAnswer(answer.value)) {
-      return void 0;
-    }
-    answers[question.question] = value;
-  }
-  return answers;
-};
 var handleAskUserQuestion = async (apiKey, input, modeState) => {
   if (questionHandedToTheTerminal(input.tool_name, modeState)) return void 0;
-  const parsed = parseQuestions(input.tool_input ?? {});
-  if (!parsed) return void 0;
+  const questions = parseAgentQuestions(input.tool_input ?? {});
+  if (!questions) return void 0;
   const projectName = basename(input.cwd ?? process.cwd());
   const deadline = hookWaitDeadline(START_MS, effectiveWaitSeconds("wait", 0, "claude"), "claude", Date.now());
-  const answers = parsed.length === 1 ? await askAsOneCard(apiKey, input, parsed, projectName, deadline) : await askQuestionByQuestion(apiKey, input, parsed, projectName, deadline);
-  if (answers === null) return halted(DECISION_STOP_REASON);
-  if (!answers) return void 0;
-  return allowWithInput({ ...input.tool_input ?? {}, answers });
+  const outcome = await askAgentQuestions(apiKey, {
+    toolName: AGENT_QUESTION_TOOL,
+    agentName: agentNameIn(projectName),
+    projectName,
+    sessionId: input.session_id,
+    toolUseId: input.tool_use_id,
+    deadline
+  }, questions);
+  switch (outcome.kind) {
+    case "answered":
+      return allowWithInput({ ...input.tool_input ?? {}, answers: outcome.answers });
+    case "stopped":
+    case "unavailable":
+      return halted(DECISION_STOP_REASON);
+    case "unanswered":
+      return void 0;
+  }
 };
 var PLAN_APPROVE = "Approve, start coding";
 var PLAN_KEEP_PLANNING = "Keep planning";

package/dist/{chunk-RYXSY3RH.js → chunk-NRVZNZVE.js}

@@ -4,7 +4,7 @@ import {
   forkFinishWithUpgradeLock,
   installWithUpgradeLock,
   releaseAutoUpdateLock
-} from "./chunk-55XIK7YS.js";
+} from "./chunk-QZ4KOMFE.js";
 import {
   describeAutoUpdateCheck,
   globalInstallLocation,
@@ -14,7 +14,7 @@ import {
   readAutoUpdateState,
   updateAutoUpdateState,
   upgradeEntryFor
-} from "./chunk-HCKBZYBW.js";
+} from "./chunk-D5IAEPFA.js";
 import {
   EXIT
 } from "./chunk-KZERVKTD.js";
@@ -27,10 +27,10 @@ import {
   npmErrorMessage,
   readGlobalCliInstallAt,
   readGlobalPrefix
-} from "./chunk-K5X25GUV.js";
+} from "./chunk-4GEHVRV3.js";
 import {
   NPX_LATEST_COMMAND
-} from "./chunk-LL256PHP.js";
+} from "./chunk-MXEDMQLC.js";
 import {
   commandsPackage,
   globalUpgradeEntry,
@@ -39,7 +39,7 @@ import {
   isSameMajorVersion,
   ownPackageRoot,
   packageVersionAt
-} from "./chunk-2DZBIELP.js";
+} from "./chunk-QOUW57RT.js";
 
 // src/global-upgrade.ts
 import { existsSync } from "fs";

package/dist/{chunk-GNESC5EF.js → chunk-OLS4DTFN.js}

@@ -1,6 +1,6 @@
 import {
   pusharyFetch
-} from "./chunk-CRZ4CP7C.js";
+} from "./chunk-BMHD2NEH.js";
 import {
   NetworkError
 } from "./chunk-7QLSKOSU.js";
@@ -9,11 +9,11 @@ import {
 } from "./chunk-KZERVKTD.js";
 import {
   getBaseUrl
-} from "./chunk-PRKH662J.js";
+} from "./chunk-D322CKL2.js";
 import {
   isValidApiKey,
   normalizeKeyScope
-} from "./chunk-2DZBIELP.js";
+} from "./chunk-QOUW57RT.js";
 
 // src/session.ts
 var samePusharyAccount = (left, right) => left.kind === "ok" && right.kind === "ok" && left.identity.workspaceId !== "" && left.identity.workspaceId === right.identity.workspaceId && left.identity.siteId === right.identity.siteId;

package/dist/{chunk-L25KSDIB.js → chunk-PA3OZGIA.js}

@@ -6,38 +6,38 @@ import {
 } from "./chunk-DWQYCOPI.js";
 import {
   ensureDaemonRunning
-} from "./chunk-Y5FCB66K.js";
+} from "./chunk-AJIH4JGB.js";
 import {
   buildTranscriptRecords,
   decodePublicKey,
   generateSessionKey,
   wrapSessionKey
-} from "./chunk-H3MOTS2C.js";
+} from "./chunk-4D54LZGF.js";
 import {
   fetchTranscriptRecipients,
   uploadTranscriptRecords
-} from "./chunk-X4BPD5RD.js";
+} from "./chunk-WR3GKYKD.js";
 import {
   transcriptEnvironmentPreference,
   transcriptsEnabled
-} from "./chunk-QPUTCMAK.js";
+} from "./chunk-QC7ZNZMZ.js";
 import {
   hookOwnerOf
-} from "./chunk-4NMDFPK7.js";
+} from "./chunk-ZFJAZBBF.js";
 import {
   readTranscriptPreference
-} from "./chunk-42FTY5II.js";
+} from "./chunk-JWMCGL3P.js";
 import {
   codexHome,
   pusharyDir
-} from "./chunk-K5X25GUV.js";
+} from "./chunk-4GEHVRV3.js";
 import {
   writeJsonAtomic
 } from "./chunk-AQFEP65J.js";
 import {
   getApiKey,
   getBaseUrl
-} from "./chunk-PRKH662J.js";
+} from "./chunk-D322CKL2.js";
 
 // src/transcript-registration.ts
 import { createHash } from "crypto";

package/dist/{chunk-QPUTCMAK.js → chunk-QC7ZNZMZ.js}

@@ -1,6 +1,6 @@
 import {
   readTranscriptPreference
-} from "./chunk-42FTY5II.js";
+} from "./chunk-JWMCGL3P.js";
 
 // src/transcript-setting.ts
 var transcriptEnvironmentPreference = () => {