pushary 1.9.91 → 1.9.93

package/dist/{chunk-ABAIOLV5.js → chunk-OMN5UCMW.js}

@@ -1,3 +1,67 @@
+// ../contracts/src/redaction.ts
+var CREDENTIAL_NAME = String.raw`(?:authorization|secret|token|password|passwd|api[_-]?key|access[_-]?key|client[_-]?secret|private[_-]?key)["']?`;
+var CREDENTIAL_KEY = String.raw`${CREDENTIAL_NAME}\s*[=:]\s*`;
+var DISPLAYED_CREDENTIAL_KEY = String.raw`${CREDENTIAL_NAME}(?:[ \t]*:[ \t]*|[ \t]+=[ \t]*|=)`;
+var SHELL_INERT_UNIT = String.raw`(?:[A-Za-z0-9_\-./+=:@%^!#]|\\[^\s'"])`;
+var SHELL_INERT_SINGLE_QUOTED_UNIT = String.raw`[A-Za-z0-9_\-./+=:@%^!#\\]`;
+var SHELL_INERT_URL_PASSWORD_UNIT = String.raw`(?:[A-Za-z0-9_\-.+=:%^!#]|\\[^\s'"@/])`;
+var PEM_LINE_BREAK = String.raw`(?:\r?\n|(?:\\r)?\\n)`;
+var credentialAssignmentRule = (key, doubleQuoted, singleQuoted, bare) => ({
+  pattern: new RegExp(String.raw`(${key})(?:(")${doubleQuoted}|(')${singleQuoted}|(["']?)${bare})`, "gi"),
+  replacement: "$1$2$3$4[redacted]$2$3"
+});
+var DISPLAYED_SECRET_SHAPES = {
+  separator: String.raw`[ \t]`,
+  privateKeyBody: String.raw`${PEM_LINE_BREAK}?(?:(?:Proc-Type|DEK-Info): [A-Za-z0-9,-]+${PEM_LINE_BREAK})*(?:[A-Za-z0-9+/=\r\n]|\\[rn])*?`,
+  urlPassword: `${SHELL_INERT_URL_PASSWORD_UNIT}+`,
+  authorizationValue: `${SHELL_INERT_UNIT}+`,
+  credentialAssignment: credentialAssignmentRule(
+    DISPLAYED_CREDENTIAL_KEY,
+    `${SHELL_INERT_UNIT}*"`,
+    `${SHELL_INERT_SINGLE_QUOTED_UNIT}*'`,
+    `${SHELL_INERT_UNIT}+`
+  )
+};
+var CUT_OFF_SECRET_SHAPES = {
+  separator: String.raw`\s`,
+  privateKeyBody: String.raw`[\s\S]*?`,
+  urlPassword: String.raw`[^\s@/]+`,
+  authorizationValue: String.raw`\S+`,
+  credentialAssignment: credentialAssignmentRule(
+    CREDENTIAL_KEY,
+    String.raw`(?:\\[\s\S]|[^"\\])*(?:"|\\?$)`,
+    "[^']*(?:'|$)",
+    String.raw`\S+`
+  )
+};
+var secretRedactionRules = (shapes) => [
+  { pattern: /\bpk_[A-Za-z0-9_]+\.[A-Za-z0-9_]+/g, replacement: "[redacted]" },
+  { pattern: new RegExp(String.raw`-----BEGIN[A-Z0-9 ]*PRIVATE KEY-----${shapes.privateKeyBody}-----END[A-Z0-9 ]*PRIVATE KEY-----`, "g"), replacement: "[redacted key]" },
+  { pattern: /\bsk-[A-Za-z0-9_-]{16,}\b/g, replacement: "[redacted]" },
+  { pattern: /\b[spr]k_(?:live|test)_[A-Za-z0-9]{8,}\b/g, replacement: "[redacted]" },
+  { pattern: /\bwhsec_[A-Za-z0-9]{16,}\b/g, replacement: "[redacted]" },
+  { pattern: /\b(?:ghp|gho|ghu|ghs|ghr)_[A-Za-z0-9]{36,}\b/g, replacement: "[redacted]" },
+  { pattern: /\bgithub_pat_[A-Za-z0-9_]{22,}\b/g, replacement: "[redacted]" },
+  { pattern: /\bglpat-[A-Za-z0-9_-]{20,}\b/g, replacement: "[redacted]" },
+  { pattern: /\bxox[baprs]-[A-Za-z0-9-]{10,}\b/g, replacement: "[redacted]" },
+  { pattern: /\bAIza[A-Za-z0-9_-]{35}\b/g, replacement: "[redacted]" },
+  { pattern: /\bAKIA[0-9A-Z]{16}\b/g, replacement: "[redacted]" },
+  { pattern: /\bnpm_[A-Za-z0-9]{36}\b/g, replacement: "[redacted]" },
+  { pattern: /\bxai-[A-Za-z0-9]{16,}\b/g, replacement: "[redacted]" },
+  { pattern: /\beyJ[A-Za-z0-9_-]{8,}\.[A-Za-z0-9_-]{8,}\.[A-Za-z0-9_-]{8,}\b/g, replacement: "[redacted]" },
+  { pattern: new RegExp(String.raw`\b([a-z][a-z0-9+.-]*:\/\/[^\s:/@]+:)${shapes.urlPassword}@`, "gi"), replacement: "$1[redacted]@" },
+  { pattern: new RegExp(String.raw`\bbearer${shapes.separator}+[A-Za-z0-9._~+/=-]+`, "gi"), replacement: "bearer [redacted]" },
+  { pattern: new RegExp(String.raw`\bauthorization:${shapes.separator}*${shapes.authorizationValue}`, "gi"), replacement: "authorization: [redacted]" },
+  shapes.credentialAssignment
+];
+var SECRET_REDACTION_RULES = secretRedactionRules(DISPLAYED_SECRET_SHAPES);
+var CUT_OFF_TEXT_REDACTION_RULES = secretRedactionRules(CUT_OFF_SECRET_SHAPES);
+var HIGH_ENTROPY_RULE = { pattern: /[A-Za-z0-9+/]{40,}={0,2}/g, replacement: "[redacted]" };
+var applyRedactionRules = (rules, text3) => rules.reduce((acc, rule) => acc.replace(rule.pattern, rule.replacement), text3);
+var redactSecrets = (text3) => applyRedactionRules(SECRET_REDACTION_RULES, text3);
+var redactSecretsFromContent = (text3) => applyRedactionRules(CUT_OFF_TEXT_REDACTION_RULES, text3);
+var redactSecretsDeep = (text3) => redactSecrets(text3).replace(HIGH_ENTROPY_RULE.pattern, HIGH_ENTROPY_RULE.replacement);
+
 // ../contracts/src/json-record.ts
 var isRecord = (value) => typeof value === "object" && value !== null && !Array.isArray(value);
 
@@ -139,7 +203,8 @@ var CLAUDE_CONNECTOR_STEPS = [
   "For proactive Cowork use, install the Pushary Cowork plugin/skill or paste the standing instructions into Settings > Cowork.",
   "Ask Claude to send the test question below, answer it from Pushary, and confirm Claude receives your answer."
 ];
-var CLAUDE_CONNECTOR_TEST = "Use Pushary ask_user to ask \u201CDid this setup question reach you?\u201D with type \u201Cconfirm\u201D. Use agentName \u201CClaude Cowork - Setup check\u201D in Cowork or \u201CClaude Chat - Setup check\u201D in Chat. Wait for my answer and tell me which answer you received. Do not run a command or change any files.";
+var CONNECTOR_SETUP_QUESTION = "Did this setup question reach you?";
+var CLAUDE_CONNECTOR_TEST = `Use Pushary ask_user to ask \u201C${CONNECTOR_SETUP_QUESTION}\u201D with type \u201Cconfirm\u201D. Use agentName \u201CClaude Cowork - Setup check\u201D in Cowork or \u201CClaude Chat - Setup check\u201D in Chat. Wait for my answer and tell me which answer you received. Do not run a command or change any files.`;
 var COWORK_STANDING_INSTRUCTIONS = `Pushary is connected as a connector. Use it proactively to reach me on my phone or Mac notch.
 
 - When you need a decision or clarifying answer, call ask_user. Use type "confirm", "select", or "input" as appropriate. Ask once on one channel.
@@ -930,70 +995,6 @@ var compatibleTargetFiles = (profile) => {
   return [...seen.values()];
 };
 
-// ../contracts/src/redaction.ts
-var CREDENTIAL_NAME = String.raw`(?:authorization|secret|token|password|passwd|api[_-]?key|access[_-]?key|client[_-]?secret|private[_-]?key)["']?`;
-var CREDENTIAL_KEY = String.raw`${CREDENTIAL_NAME}\s*[=:]\s*`;
-var DISPLAYED_CREDENTIAL_KEY = String.raw`${CREDENTIAL_NAME}(?:[ \t]*:[ \t]*|[ \t]+=[ \t]*|=)`;
-var SHELL_INERT_UNIT = String.raw`(?:[A-Za-z0-9_\-./+=:@%^!#]|\\[^\s'"])`;
-var SHELL_INERT_SINGLE_QUOTED_UNIT = String.raw`[A-Za-z0-9_\-./+=:@%^!#\\]`;
-var SHELL_INERT_URL_PASSWORD_UNIT = String.raw`(?:[A-Za-z0-9_\-.+=:%^!#]|\\[^\s'"@/])`;
-var PEM_LINE_BREAK = String.raw`(?:\r?\n|(?:\\r)?\\n)`;
-var credentialAssignmentRule = (key, doubleQuoted, singleQuoted, bare) => ({
-  pattern: new RegExp(String.raw`(${key})(?:(")${doubleQuoted}|(')${singleQuoted}|(["']?)${bare})`, "gi"),
-  replacement: "$1$2$3$4[redacted]$2$3"
-});
-var DISPLAYED_SECRET_SHAPES = {
-  separator: String.raw`[ \t]`,
-  privateKeyBody: String.raw`${PEM_LINE_BREAK}?(?:(?:Proc-Type|DEK-Info): [A-Za-z0-9,-]+${PEM_LINE_BREAK})*(?:[A-Za-z0-9+/=\r\n]|\\[rn])*?`,
-  urlPassword: `${SHELL_INERT_URL_PASSWORD_UNIT}+`,
-  authorizationValue: `${SHELL_INERT_UNIT}+`,
-  credentialAssignment: credentialAssignmentRule(
-    DISPLAYED_CREDENTIAL_KEY,
-    `${SHELL_INERT_UNIT}*"`,
-    `${SHELL_INERT_SINGLE_QUOTED_UNIT}*'`,
-    `${SHELL_INERT_UNIT}+`
-  )
-};
-var CUT_OFF_SECRET_SHAPES = {
-  separator: String.raw`\s`,
-  privateKeyBody: String.raw`[\s\S]*?`,
-  urlPassword: String.raw`[^\s@/]+`,
-  authorizationValue: String.raw`\S+`,
-  credentialAssignment: credentialAssignmentRule(
-    CREDENTIAL_KEY,
-    String.raw`(?:\\[\s\S]|[^"\\])*(?:"|\\?$)`,
-    "[^']*(?:'|$)",
-    String.raw`\S+`
-  )
-};
-var secretRedactionRules = (shapes) => [
-  { pattern: /\bpk_[A-Za-z0-9_]+\.[A-Za-z0-9_]+/g, replacement: "[redacted]" },
-  { pattern: new RegExp(String.raw`-----BEGIN[A-Z0-9 ]*PRIVATE KEY-----${shapes.privateKeyBody}-----END[A-Z0-9 ]*PRIVATE KEY-----`, "g"), replacement: "[redacted key]" },
-  { pattern: /\bsk-[A-Za-z0-9_-]{16,}\b/g, replacement: "[redacted]" },
-  { pattern: /\b[spr]k_(?:live|test)_[A-Za-z0-9]{8,}\b/g, replacement: "[redacted]" },
-  { pattern: /\bwhsec_[A-Za-z0-9]{16,}\b/g, replacement: "[redacted]" },
-  { pattern: /\b(?:ghp|gho|ghu|ghs|ghr)_[A-Za-z0-9]{36,}\b/g, replacement: "[redacted]" },
-  { pattern: /\bgithub_pat_[A-Za-z0-9_]{22,}\b/g, replacement: "[redacted]" },
-  { pattern: /\bglpat-[A-Za-z0-9_-]{20,}\b/g, replacement: "[redacted]" },
-  { pattern: /\bxox[baprs]-[A-Za-z0-9-]{10,}\b/g, replacement: "[redacted]" },
-  { pattern: /\bAIza[A-Za-z0-9_-]{35}\b/g, replacement: "[redacted]" },
-  { pattern: /\bAKIA[0-9A-Z]{16}\b/g, replacement: "[redacted]" },
-  { pattern: /\bnpm_[A-Za-z0-9]{36}\b/g, replacement: "[redacted]" },
-  { pattern: /\bxai-[A-Za-z0-9]{16,}\b/g, replacement: "[redacted]" },
-  { pattern: /\beyJ[A-Za-z0-9_-]{8,}\.[A-Za-z0-9_-]{8,}\.[A-Za-z0-9_-]{8,}\b/g, replacement: "[redacted]" },
-  { pattern: new RegExp(String.raw`\b([a-z][a-z0-9+.-]*:\/\/[^\s:/@]+:)${shapes.urlPassword}@`, "gi"), replacement: "$1[redacted]@" },
-  { pattern: new RegExp(String.raw`\bbearer${shapes.separator}+[A-Za-z0-9._~+/=-]+`, "gi"), replacement: "bearer [redacted]" },
-  { pattern: new RegExp(String.raw`\bauthorization:${shapes.separator}*${shapes.authorizationValue}`, "gi"), replacement: "authorization: [redacted]" },
-  shapes.credentialAssignment
-];
-var SECRET_REDACTION_RULES = secretRedactionRules(DISPLAYED_SECRET_SHAPES);
-var CUT_OFF_TEXT_REDACTION_RULES = secretRedactionRules(CUT_OFF_SECRET_SHAPES);
-var HIGH_ENTROPY_RULE = { pattern: /[A-Za-z0-9+/]{40,}={0,2}/g, replacement: "[redacted]" };
-var applyRedactionRules = (rules, text3) => rules.reduce((acc, rule) => acc.replace(rule.pattern, rule.replacement), text3);
-var redactSecrets = (text3) => applyRedactionRules(SECRET_REDACTION_RULES, text3);
-var redactSecretsFromContent = (text3) => applyRedactionRules(CUT_OFF_TEXT_REDACTION_RULES, text3);
-var redactSecretsDeep = (text3) => redactSecrets(text3).replace(HIGH_ENTROPY_RULE.pattern, HIGH_ENTROPY_RULE.replacement);
-
 // ../contracts/src/cursor.ts
 var CURSOR_GATE_EVENTS = ["beforeShellExecution", "beforeMCPExecution", "preToolUse"];
 var CURSOR_GATE_SCRIPT = "pushary-gate.mjs";
@@ -1028,6 +1029,19 @@ var toolsCoveredByGateEntry = (coverage, matcher) => {
 var toolMatches = (match, toolName) => match.kind === "named" ? match.tools.includes(toolName) : toolName.startsWith(match.prefix);
 var cursorGateOwnsToolCall = (registration, toolName) => typeof toolName === "string" && registration.some((match) => toolMatches(match, toolName));
 
+// ../contracts/src/receipt-evidence.ts
+var RECEIPT_TARGET_MAX_LENGTH = 256;
+var GIT_BRANCH_MAX_LENGTH = 256;
+function isGitBranch(value) {
+  return typeof value === "string" && value.length > 0 && value.length <= GIT_BRANCH_MAX_LENGTH && !/[\x00-\x20\x7f]/.test(value);
+}
+function parseGitBranch(value) {
+  return isGitBranch(value) && redactSecrets(value) === value ? value : void 0;
+}
+function parseCommitId(value) {
+  return typeof value === "string" && /^[a-f\d]{7,64}$/i.test(value) ? value.toLowerCase() : void 0;
+}
+
 // ../contracts/src/conversation-text.ts
 var INTERNAL_ENVELOPE = /(^|\n) {0,3}(?:<(total_tokens|task-notification)>[\s\S]*?(?:<\/\2>|$)[\t ]*)+/g;
 var INCOMPLETE_ENVELOPE = /(^|\n) {0,3}<(?:total_tokens|task-notification)$/g;
@@ -2864,6 +2878,9 @@ var shellCommandStringOf = (shell, args) => {
   return operand === void 0 || operand.expands ? UNREADABLE2 : { kind: "readable", script: operand.text };
 };
 
+// ../contracts/src/chatgpt-plugin.ts
+var CHATGPT_CONNECTOR_TEST = `@Pushary use ask_user to ask \u201C${CONNECTOR_SETUP_QUESTION}\u201D with type \u201Cconfirm\u201D and agentName \u201CChatGPT - Setup check\u201D. Wait for my answer and tell me which answer you received.`;
+
 // ../contracts/src/partner-developer-guide.ts
 var PARTNER_API_KEYS_URL = "https://pushary.com/dashboard/agent/settings";
 var PARTNER_INSTALL_COMMAND = "npm i @pushary/server";
@@ -3487,6 +3504,12 @@ var SETUP_VERIFICATION_SENDER_THROUGH_0_95_5 = {
   ...SETUP_VERIFICATION_SENDER,
   body: "Your AI agent can now reach you right here."
 };
+var ROUND_TRIP_QUESTION = "Pushary delivery test. Answer either way to test returning an answer. This does not test your agent hooks.";
+var ROUND_TRIP_SENDER_NAMES = [
+  SETUP_VERIFICATION_SENDER.agentName,
+  DOCTOR_VERIFICATION_SENDER.agentName
+];
+var roundTripAsk = (agentName) => ({ question: ROUND_TRIP_QUESTION, type: "confirm", agentName, wait: false });
 var AGENT_STOP_DEFAULT_SECONDS = 3600;
 var TIMEOUT_ACTIONS = ["approve", "deny", "escalate", "wait"];
 var isTimeoutAction = (value) => typeof value === "string" && TIMEOUT_ACTIONS.includes(value);
@@ -6638,7 +6661,8 @@ var PRETOOLUSE_HANDLED_TOOLS = /* @__PURE__ */ new Set([...PRETOOLUSE_GATED_TOOL
 var isPermissionRequestOwnedByPreToolUse = (toolName, permissionMode, defers = shouldDeferToNativeMode) => PRETOOLUSE_HANDLED_TOOLS.has(toolName) && (isAskedInEveryMode(toolName) || !defers(permissionMode, toolName));
 var CLAUDE_PRETOOLUSE_MATCHER = [...PRETOOLUSE_HANDLED_TOOLS].join("|");
 var resolveGate = (input) => {
-  const { modeState, config, toolName, toolInputs, cwd, repoKey, sessionId } = input;
+  const { modeState, config, toolName, toolInputs, cwd, sessionId } = input;
+  const repoKey = input.sharedRepoKey ?? input.repoKey;
   if (isPusharyOwnTool(toolName)) {
     return {
       kind: "defer",
@@ -6647,6 +6671,10 @@ var resolveGate = (input) => {
     };
   }
   if (modeState.kill) return { kind: "kill", reason: KILL_REASON };
+  if (input.sharedRepoKey && input.repoKey && input.sharedRepoKey !== input.repoKey) {
+    const legacyPolicy = (toolInputs.length ? toolInputs : [void 0]).map((toolInput) => resolvePolicy(config, toolName, modeState.mode, toolInput, cwd, input.repoKey, sessionId)).find((policy2) => policy2.repoKey === input.repoKey && verdictForPolicy(policy2) === "deny");
+    if (legacyPolicy) return { kind: "deny", policy: legacyPolicy, reason: `Denied by policy for ${legacyPolicy.tool}` };
+  }
   const policy = resolvePolicyAcross(config, toolName, modeState.mode, toolInputs, cwd, repoKey, sessionId);
   const verdict = verdictForPolicy(policy);
   const autoApproves = verdict === "allow";
@@ -7128,6 +7156,12 @@ var hookActivationResult = (report) => {
 };
 
 export {
+  redactSecrets,
+  redactSecretsFromContent,
+  redactSecretsDeep,
+  RECEIPT_TARGET_MAX_LENGTH,
+  parseGitBranch,
+  parseCommitId,
   conversationText,
   extractMessageText,
   NativeInputAgent,
@@ -7195,9 +7229,6 @@ export {
   hookCompatibleProfile,
   hookCompatibleProfileBySource,
   compatibleTargetFiles,
-  redactSecrets,
-  redactSecretsFromContent,
-  redactSecretsDeep,
   CURSOR_GATE_EVENTS,
   CURSOR_GATE_SCRIPT,
   CURSOR_GATE_COVERAGE,
@@ -7261,6 +7292,7 @@ export {
   timeoutActionWithoutLocalPrompt,
   SETUP_VERIFICATION_SENDER,
   DOCTOR_VERIFICATION_SENDER,
+  roundTripAsk,
   AGENT_STOP_DEFAULT_SECONDS,
   isTimeoutAction,
   plainAskOf,
@@ -7303,6 +7335,7 @@ export {
   isAnswerSource,
   denyReasonFrom,
   classifyConfirmResponse,
+  classifyDecisionRisk,
   buildDecisionEpisodeFeatures,
   resolveAutoResolveOrigin,
   resolvePolicy,

package/dist/{chunk-CPEITTYS.js → chunk-ONRA5ON4.js}

@@ -9,7 +9,7 @@ import {
   isSetupConnectMode,
   isValidApiKey,
   normalizeAgentId
-} from "./chunk-ABAIOLV5.js";
+} from "./chunk-OMN5UCMW.js";
 
 // src/setup/options.ts
 var AGENT_CHOICES = SETUP_AGENT_CHOICES;
@@ -37,7 +37,7 @@ var effectiveVerify = (options, context) => {
   if (options.verifyExplicit) return options.verify;
   return context.paired ? "push" : options.verify;
 };
-var effectiveAgentSelection = (selection, context) => context.paired && selection.kind === "ask" ? { kind: "auto" } : selection;
+var effectiveAgentSelection = (selection, context) => context.paired && context.hasDetectedAgents && selection.kind === "ask" ? { kind: "auto" } : selection;
 var SETUP_FLAGS = {
   bools: ["key-stdin", "skip-phone", "yes", "y", "json", "dry-run", "take-over-hooks", "help", "h"],
   values: ["key", "connect", "agents", "verify", "control", "transcripts"]

package/dist/{chunk-2GSRRZ6B.js → chunk-PFHU3CW4.js}

@@ -1,6 +1,6 @@
 import {
   guardBinary
-} from "./chunk-LLVX57ZC.js";
+} from "./chunk-CHVXLS7U.js";
 
 // src/bell/install.ts
 import { join } from "path";

package/dist/{chunk-4QQDACWU.js → chunk-PS2K6ZQ3.js}

@@ -4,7 +4,7 @@ import {
   postLiveSession,
   postLiveSessionUntilAccepted,
   startLiveSessionHeartbeat
-} from "./chunk-UOBUESLS.js";
+} from "./chunk-SPPMPM7F.js";
 import {
   CommandReceipts,
   controllerCommandSchema
@@ -14,24 +14,24 @@ import {
   describeIdleWindow,
   idleDeadlinePassed,
   startProcessOwnership
-} from "./chunk-L2ZV2R56.js";
+} from "./chunk-2BXWBKVN.js";
 import {
   spawnClaude
 } from "./chunk-XHKBHWLX.js";
 import {
-  repoKeyFor
-} from "./chunk-CEUWBQF2.js";
+  repositoryScopeFor
+} from "./chunk-RXQT5FTX.js";
 import {
   isAskUserResponse,
   isDecisionStopped,
   isWaitForAnswerResponse,
   withdrawQuestion,
   writeDegraded
-} from "./chunk-2YFTIQM5.js";
+} from "./chunk-SR44ZNZF.js";
 import {
   callMcpTool,
   isRetryable
-} from "./chunk-EX76IRRF.js";
+} from "./chunk-XTNCXIYR.js";
 import {
   AGENT_QUESTION_DESCRIPTION_MAX,
   AGENT_QUESTION_HEADER_MAX,
@@ -52,7 +52,7 @@ import {
   parseCodexQuestions,
   planElicitationAsk,
   readElicitationFields
-} from "./chunk-ABAIOLV5.js";
+} from "./chunk-OMN5UCMW.js";
 
 // src/codex-question-owner.ts
 import { createHash } from "crypto";
@@ -114,8 +114,8 @@ var CodexNativeApprovals = class {
     const changes = this.patches.get(this.patchKey(p));
     const approval = parseCodexNativeApproval({ method: message.method, params: p, ...changes ? { changes } : {} });
     if (!approval || approval.threadId !== threadId) return false;
-    const repoKey = repoKeyFor(approval.cwd ?? cwd);
-    const subjectHash = createHash2("sha256").update(canonicalJsonText({ request: approval.request, cwd, repoKey })).digest("hex");
+    const { repoKey, sharedRepoKey } = repositoryScopeFor(approval.cwd ?? cwd);
+    const subjectHash = createHash2("sha256").update(canonicalJsonText({ request: approval.request, cwd, repoKey, ...sharedRepoKey ? { sharedRepoKey } : {} })).digest("hex");
     const existing = this.pending.get(message.id);
     if (existing) {
       if (existing.owner.subjectHash !== subjectHash) this.retire(message.id, existing, false);
@@ -131,7 +131,7 @@ var CodexNativeApprovals = class {
       subjectHash,
       method: approval.request.method
     };
-    const pending = { owner, approval, repoKey, cwd, controller: new AbortController(), replied: false, creating: true, correlationId: randomUUID() };
+    const pending = { owner, approval, repoKey, sharedRepoKey, cwd, controller: new AbortController(), replied: false, creating: true, correlationId: randomUUID() };
     this.pending.set(message.id, pending);
     const task = this.answer(pending).finally(() => {
       this.tasks.delete(task);
@@ -191,7 +191,8 @@ var CodexNativeApprovals = class {
       localSurfaceAvailable: this.options.shared,
       acceptsAllowReply: true,
       cwd: pending.cwd,
-      repoKey: pending.repoKey
+      repoKey: pending.repoKey,
+      sharedRepoKey: pending.sharedRepoKey
     });
     const body = await response.json();
     if (!response.ok || !record(body)) throw new Error("Native approval service unavailable");

package/dist/{chunk-3R2FRFVO.js → chunk-RFP4Q5I3.js}

@@ -2,13 +2,13 @@ import {
   SESSION_HISTORY_RETENTION_DAYS,
   readOwnerOnlyJson,
   savedTranscriptReadPositions
-} from "./chunk-PRH7XNAT.js";
+} from "./chunk-OC47FGOY.js";
 import {
   ensureDaemonRunning
-} from "./chunk-OBRDREJD.js";
+} from "./chunk-CFD3IESN.js";
 import {
   hookOwnerOf
-} from "./chunk-SF3FHCJJ.js";
+} from "./chunk-5V2YDO4U.js";
 import {
   buildTranscriptRecords,
   decodePublicKey,
@@ -19,33 +19,33 @@ import {
   recordSealerFor,
   uploadTranscriptRecords,
   wrapSessionKey
-} from "./chunk-27232B7Y.js";
+} from "./chunk-4PD7FP55.js";
 import {
   external_exports
 } from "./chunk-XMSDA5WA.js";
 import {
   transcriptEnvironmentPreference,
   transcriptsEnabled
-} from "./chunk-OGRGVEWA.js";
+} from "./chunk-VMIWR724.js";
 import {
   readTranscriptPreference
-} from "./chunk-PETLGHDR.js";
+} from "./chunk-LANGH7UF.js";
 import {
   hookMeaning
-} from "./chunk-KDN7AMAQ.js";
+} from "./chunk-2BVVMWVF.js";
 import {
   claudeConfigDir,
   codexHome,
   pusharyDir
-} from "./chunk-LLVX57ZC.js";
+} from "./chunk-CHVXLS7U.js";
 import {
   writeJsonAtomic,
   writeJsonAtomicDurable
-} from "./chunk-D4A277IY.js";
+} from "./chunk-Y7AX6BS4.js";
 import {
   getApiKey,
   getBaseUrl
-} from "./chunk-KU2FFKWS.js";
+} from "./chunk-NPZ5L2WQ.js";
 import {
   PENDING_COMMAND_PREFIX,
   SESSION_HISTORY_BACKFILL_LIMIT_BYTES,
@@ -53,7 +53,7 @@ import {
   isHookSource,
   isRecord,
   redactSecretsFromContent
-} from "./chunk-ABAIOLV5.js";
+} from "./chunk-OMN5UCMW.js";
 
 // src/transcript-recipient-pin.ts
 import { createHash } from "crypto";

package/dist/{chunk-B3K3752V.js → chunk-RXAQOAZI.js}

@@ -1,12 +1,12 @@
 import {
   findNativeClaudeInstall
-} from "./chunk-KRNY5Z6I.js";
+} from "./chunk-66VEUAN5.js";
 import {
   parseVersion
-} from "./chunk-D4A277IY.js";
+} from "./chunk-Y7AX6BS4.js";
 import {
   isRecord
-} from "./chunk-ABAIOLV5.js";
+} from "./chunk-OMN5UCMW.js";
 
 // src/setup/agent-probe.ts
 import { execSync } from "child_process";

package/dist/{chunk-CEUWBQF2.js → chunk-RXQT5FTX.js}

@@ -1,17 +1,19 @@
 import {
   localRepoKey,
-  normalizeRepoRemote
-} from "./chunk-ABAIOLV5.js";
+  normalizeRepoRemote,
+  parseGitBranch
+} from "./chunk-OMN5UCMW.js";
 
 // src/repo.ts
 import { existsSync, readFileSync, statSync } from "fs";
 import { basename, dirname, isAbsolute, join, resolve } from "path";
 var MAX_PARENT_WALK = 64;
 var GIT_FILE_PREFIX = "gitdir:";
+var GIT_DIR_NAME = ".git";
 var findGitDir = (startDir) => {
   let current = resolve(startDir);
   for (let depth = 0; depth < MAX_PARENT_WALK; depth += 1) {
-    const candidate = join(current, ".git");
+    const candidate = join(current, GIT_DIR_NAME);
     try {
       if (existsSync(candidate)) {
         if (statSync(candidate).isDirectory()) return candidate;
@@ -29,16 +31,28 @@ var findGitDir = (startDir) => {
   }
   return void 0;
 };
-var configPathFor = (gitDir) => {
-  const index = gitDir.replace(/\\/g, "/").indexOf("/worktrees/");
-  return index === -1 ? join(gitDir, "config") : join(gitDir.slice(0, index), "config");
+var COMMON_DIR_FILE = "commondir";
+var mainGitDirOf = (gitDir) => {
+  try {
+    const pointer = readFileSync(join(gitDir, COMMON_DIR_FILE), "utf-8").trim();
+    if (pointer.length === 0) return gitDir;
+    return isAbsolute(pointer) ? pointer : resolve(gitDir, pointer);
+  } catch {
+    return gitDir;
+  }
+};
+var configPathFor = (gitDir) => join(mainGitDirOf(gitDir), "config");
+var GIT_DIR_SUFFIX = ".git";
+var projectRootOf = (gitDir, cwd) => {
+  const mainGitDir = mainGitDirOf(gitDir);
+  if (basename(mainGitDir) === GIT_DIR_NAME) return dirname(mainGitDir);
+  return gitDir.endsWith(GIT_DIR_SUFFIX) ? dirname(gitDir) : cwd;
 };
 var ORIGIN_SECTION = /^\[remote "origin"\]/;
 var SECTION_HEADER = /^\[/;
 var URL_LINE = /^url\s*=\s*(.+)$/;
-var readOriginRemote = (gitDir) => {
+var readConfiguredOrigin = (configPath) => {
   try {
-    const configPath = configPathFor(gitDir);
     if (!existsSync(configPath)) return void 0;
     let inOrigin = false;
     for (const rawLine of readFileSync(configPath, "utf-8").split("\n")) {
@@ -55,6 +69,7 @@ var readOriginRemote = (gitDir) => {
   }
   return void 0;
 };
+var readOriginRemote = (gitDir) => readConfiguredOrigin(configPathFor(gitDir));
 var deriveRepoKey = (cwd) => {
   const dir = cwd && cwd.length > 0 ? cwd : process.cwd();
   try {
@@ -63,8 +78,7 @@ var deriveRepoKey = (cwd) => {
       const remote = readOriginRemote(gitDir);
       const normalized = remote ? normalizeRepoRemote(remote) : void 0;
       if (normalized) return normalized;
-      const root = gitDir.endsWith(".git") ? dirname(gitDir) : dir;
-      return localRepoKey(basename(root));
+      return localRepoKey(basename(projectRootOf(gitDir, dir)));
     }
     return localRepoKey(basename(resolve(dir)));
   } catch {
@@ -86,7 +100,34 @@ var repoKeyFor = (cwd) => {
   repoKeyCache.set(dir, derived);
   return derived;
 };
+function branchFor(cwd) {
+  try {
+    const gitDir = findGitDir(cwd || process.cwd());
+    if (!gitDir) return void 0;
+    const headPath = join(gitDir, "HEAD");
+    if (statSync(headPath).size > 1024) return void 0;
+    const head = readFileSync(headPath, "utf8").trim();
+    const prefix = "ref: refs/heads/";
+    return head.startsWith(prefix) ? parseGitBranch(head.slice(prefix.length)) : void 0;
+  } catch {
+    return void 0;
+  }
+}
+var repositoryScopeFor = (cwd) => {
+  const sharedRepoKey = repoKeyFor(cwd);
+  if (process.env[REPO_KEY_ENV]?.trim()) return { repoKey: sharedRepoKey };
+  const dir = cwd || process.cwd();
+  const gitDir = findGitDir(dir);
+  if (!gitDir) return { repoKey: sharedRepoKey };
+  const index = gitDir.replace(/\\/g, "/").indexOf("/worktrees/");
+  const path = index === -1 ? join(gitDir, "config") : join(gitDir.slice(0, index), "config");
+  const remote = readConfiguredOrigin(path);
+  const repoKey = (remote ? normalizeRepoRemote(remote) : void 0) ?? localRepoKey(basename(gitDir.endsWith(".git") ? dirname(gitDir) : dir));
+  return { repoKey, ...sharedRepoKey && repoKey !== sharedRepoKey ? { sharedRepoKey } : {} };
+};
 
 export {
-  repoKeyFor
+  repoKeyFor,
+  branchFor,
+  repositoryScopeFor
 };

package/dist/{chunk-UOBUESLS.js → chunk-SPPMPM7F.js}

@@ -7,7 +7,7 @@ import {
   recordSealerFor,
   uploadTranscriptRecords,
   wrapSessionKey
-} from "./chunk-27232B7Y.js";
+} from "./chunk-4PD7FP55.js";
 
 // src/live-session.ts
 var MAX_TRANSCRIPT_QUEUE = 100;

package/dist/{chunk-2YFTIQM5.js → chunk-SR44ZNZF.js}

@@ -6,18 +6,18 @@ import {
   McpToolError,
   SubscriptionRequiredError,
   callMcpTool
-} from "./chunk-EX76IRRF.js";
+} from "./chunk-XTNCXIYR.js";
 import {
   installNetworkDefaults,
   isNetworkFailure
-} from "./chunk-OAWIPPYH.js";
+} from "./chunk-CO6TQ44W.js";
 import {
   clientReportClaims
-} from "./chunk-LLVX57ZC.js";
+} from "./chunk-CHVXLS7U.js";
 import {
   getApiKey,
   getBaseUrl
-} from "./chunk-KU2FFKWS.js";
+} from "./chunk-NPZ5L2WQ.js";
 import {
   ASK_AGENT_NAME_MAX,
   CLIENT_REPORT_PATH,
@@ -26,7 +26,7 @@ import {
   TOOL_FAILURE_CODES,
   degradedLine,
   truncateLine
-} from "./chunk-ABAIOLV5.js";
+} from "./chunk-OMN5UCMW.js";
 
 // src/api.ts
 import { randomUUID } from "crypto";

package/dist/{chunk-TJMSJDRS.js → chunk-UGGACQMD.js}

@@ -9,20 +9,20 @@ import {
   installedCodexApp,
   readCodexAppRuntime,
   shellQuoted
-} from "./chunk-B3IAV5CZ.js";
+} from "./chunk-YT3ENXBT.js";
 import {
   writeHuman
 } from "./chunk-QCGNGEGE.js";
 import {
   xml
-} from "./chunk-OBRDREJD.js";
+} from "./chunk-CFD3IESN.js";
 import {
   CODEX_APP_LAUNCH_AT_LOGIN_VERB,
   CODEX_APP_LAUNCH_VARIABLE
 } from "./chunk-E46NE7FB.js";
 import {
   writeFileAtomic
-} from "./chunk-D4A277IY.js";
+} from "./chunk-Y7AX6BS4.js";
 
 // src/codex-app-cards-switch.ts
 import { execFileSync as execFileSync2 } from "child_process";

package/dist/{chunk-YHOMFTLQ.js → chunk-UHS3JZLN.js}

@@ -1,9 +1,9 @@
 import {
   parseSseMessages
-} from "./chunk-EX76IRRF.js";
+} from "./chunk-XTNCXIYR.js";
 import {
   NPX_LATEST_COMMAND
-} from "./chunk-7ECQUETY.js";
+} from "./chunk-NDPOESVW.js";
 
 // src/mcp-stdio-bridge.ts
 var MCP_BRIDGE_BINARY = "pushary-mcp";

package/dist/{chunk-IL67TUP3.js → chunk-UNPDFIPQ.js}

@@ -1,11 +1,11 @@
 import {
   autoUpdateLock
-} from "./chunk-LLVX57ZC.js";
+} from "./chunk-CHVXLS7U.js";
 import {
   installPackageGlobally,
   npmErrorMessage,
   writeJsonAtomic
-} from "./chunk-D4A277IY.js";
+} from "./chunk-Y7AX6BS4.js";
 
 // src/upgrade-lock.ts
 import { fork } from "child_process";

package/dist/{chunk-GVEIAGZ5.js → chunk-UZRKR6NZ.js}

@@ -1,9 +1,9 @@
 import {
   pusharyFetch
-} from "./chunk-OAWIPPYH.js";
+} from "./chunk-CO6TQ44W.js";
 import {
   getBaseUrl
-} from "./chunk-KU2FFKWS.js";
+} from "./chunk-NPZ5L2WQ.js";
 import {
   NetworkError
 } from "./chunk-PPY5N2E6.js";
@@ -13,7 +13,7 @@ import {
 import {
   isValidApiKey,
   normalizeKeyScope
-} from "./chunk-ABAIOLV5.js";
+} from "./chunk-OMN5UCMW.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;