pushary 1.9.91 → 1.9.93

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # Changelog
 
+## 1.9.93
+
+- After phone pairing, setup lets you choose an agent when automatic detection finds none and you are at an interactive terminal. Detected agents still configure automatically. Explicit automatic selection and unattended runs still stop without configuring an agent when none is detected; the paired key stays saved.
+
+## 1.9.92
+
+- Team workspaces can connect reported tool actions to the corresponding human decision when the agent supplies that evidence. Missing outcomes stay unknown.
+- Reported repository branch and commit evidence appears in the optional engineering sprint record.
+
+- In a repository with no git remote, "Always allow ... in this repository" now also covers that repository's linked git worktrees, such as the ones Claude Code creates for parallel subagents under `.claude/worktrees/`. Pushary named each worktree, or the folder inside it the agent was working in, as a repository of its own, so allowing edits for one subagent did not reach the others and they kept asking. Rules saved in the main checkout, denies included, now apply in its worktrees.
+- Existing worktree-specific denies remain enforced. Existing worktree-specific allows do not expand to the whole repository; you may be asked again. New repository grants apply across its linked worktrees.
+- A repository checked out inside a folder named `worktrees`, or itself named `worktrees`, is now identified by its git remote, so a rule saved for that repository from another checkout applies there. Existing denies saved under its folder name remain enforced; existing allows do not expand silently.
+- A submodule inside a linked worktree is identified as its own repository instead of as the superproject.
+- With no git remote, worktrees of a bare repository named like `project.git`, or of one made with `--separate-git-dir`, are still identified one by one.
+- The Cursor and VS Code gates name repositories the same way, and on Windows they now recognise the worktrees Git for Windows creates by default. An installed gate is replaced when you run `npx pushary@latest setup` again; `pushary upgrade` does not replace it.
+
 ## 1.9.91
 
 - `pushary setup` no longer fails just because Stop all agents is on. The stop used to hold back setup's test notification, so for that hour every setup said your phone was unreachable. The stop no longer holds it back. In setup and `pushary doctor --roundtrip`, the test question now says the agents are stopped and when the stop lifts, instead of saying nobody answered.

package/data/cursor-plugin/scripts/pushary-gate.mjs

@@ -104,7 +104,7 @@ const normalizeRepoRemote = (remoteUrl) => {
   return `${host}/${path}`.replace(/\.git$/i, '').toLowerCase().slice(0, REPO_KEY_MAX_LENGTH)
 }
 
-const findGitDir = (startDir) => {
+const findGitDir = (startDir, legacy = false) => {
   let current = startDir
   for (let depth = 0; depth < MAX_PARENT_WALK; depth += 1) {
     const candidate = join(current, '.git')
@@ -114,7 +114,7 @@ const findGitDir = (startDir) => {
         // A directory read throws EISDIR, which is the ordinary-clone case.
         if (pointer.startsWith('gitdir:')) {
           const target = pointer.slice('gitdir:'.length).trim()
-          return target.startsWith('/') ? target : join(current, target)
+          return (legacy ? target.startsWith('/') : isAbsolute(target)) ? target : join(current, target)
         }
       }
     } catch (error) {
@@ -127,7 +127,23 @@ const findGitDir = (startDir) => {
   return undefined
 }
 
-const deriveRepoKey = (cwd) => {
+const mainGitDirOf = (gitDir) => {
+  try {
+    const pointer = readFileSync(join(gitDir, 'commondir'), 'utf-8').trim()
+    if (!pointer) return gitDir
+    return isAbsolute(pointer) ? pointer : resolve(gitDir, pointer)
+  } catch {
+    return gitDir
+  }
+}
+
+const projectRootOf = (gitDir, cwd) => {
+  const mainGitDir = mainGitDirOf(gitDir)
+  if (basename(mainGitDir) === '.git') return dirname(mainGitDir)
+  return gitDir.endsWith('.git') ? dirname(gitDir) : cwd
+}
+
+const deriveRepoKey = (cwd, legacy = false) => {
   const override = process.env.PUSHARY_REPO_KEY
   if (typeof override === 'string') {
     const trimmed = override.trim()
@@ -136,11 +152,13 @@ const deriveRepoKey = (cwd) => {
   }
   const dir = cwd || process.cwd()
   try {
-    const gitDir = findGitDir(dir)
+    const gitDir = findGitDir(dir, legacy)
     if (gitDir) {
       // A worktree's config lives in the main git directory.
-      const wt = gitDir.replace(/\\/g, '/').indexOf('/worktrees/')
-      const configPath = wt === -1 ? join(gitDir, 'config') : join(gitDir.slice(0, wt), 'config')
+      const oldIndex = gitDir.replace(/\\/g, '/').indexOf('/worktrees/')
+      const configPath = legacy
+        ? join(oldIndex === -1 ? gitDir : gitDir.slice(0, oldIndex), 'config')
+        : join(mainGitDirOf(gitDir), 'config')
       if (existsSync(configPath)) {
         let inOrigin = false
         for (const rawLine of readFileSync(configPath, 'utf-8').split('\n')) {
@@ -154,7 +172,7 @@ const deriveRepoKey = (cwd) => {
           }
         }
       }
-      const root = gitDir.endsWith('.git') ? dirname(gitDir) : dir
+      const root = legacy ? (gitDir.endsWith('.git') ? dirname(gitDir) : dir) : projectRootOf(gitDir, dir)
       return `local/${basename(root).toLowerCase()}`.slice(0, REPO_KEY_MAX_LENGTH)
     }
     return `local/${basename(dir).toLowerCase()}`.slice(0, REPO_KEY_MAX_LENGTH)
@@ -163,6 +181,13 @@ const deriveRepoKey = (cwd) => {
   }
 }
 
+const repositoryScopeFor = (cwd) => {
+  const repoKey = deriveRepoKey(cwd, true)
+  const sharedRepoKey = deriveRepoKey(cwd)
+  return { repoKey, ...(sharedRepoKey && sharedRepoKey !== repoKey ? { sharedRepoKey } : {}) }
+}
+
+
 // Env first. CLI installs inject the key into the sibling mcp.json, so fall back to
 // that. This lets the gate work even when Cursor's GUI does not pass the shell env.
 const resolveApiKey = () => {
@@ -254,7 +279,7 @@ const decide = async (apiKey, request, cwd, sessionId) => {
         toolName: request.toolName,
         toolInputs: request.toolInputs,
         cwd,
-        repoKey: deriveRepoKey(cwd),
+        ...repositoryScopeFor(cwd),
         sessionId,
       }),
       signal: AbortSignal.timeout(GATE_TIMEOUT_MS),
@@ -720,7 +745,7 @@ setTimeout(async () => {
 
 // Exported for scripts/pushary-gate.test.mjs. main() only runs when the gate is
 // executed directly, so importing this file for a test does not read stdin.
-export { normalizeRepoRemote, deriveRepoKey, describeRequest, handlePushOnly, handlePushFirst, withdraw, approvalModeWithoutLocalPrompt, timeoutActionWithoutLocalPrompt }
+export { normalizeRepoRemote, deriveRepoKey, repositoryScopeFor, describeRequest, handlePushOnly, handlePushFirst, withdraw, approvalModeWithoutLocalPrompt, timeoutActionWithoutLocalPrompt }
 
 const isDirectRun = process.argv[1] && import.meta.url === `file://${process.argv[1]}`
 if (!isDirectRun) {

package/data/vscode-plugin/scripts/pushary-gate.mjs

@@ -227,7 +227,7 @@ const decide = async (apiKey, command, cwd, sessionId, ident = {}) => {
         source: 'vscode',
         toolName: ident.toolName ?? 'Bash',
         toolInputs: ident.toolInputs ?? [{ command }],
-        repoKey: deriveRepoKey(cwd),
+        ...repositoryScopeFor(cwd),
         cwd,
         sessionId,
       }),
@@ -267,7 +267,7 @@ const normalizeRepoRemote = (remoteUrl) => {
   return `${host}/${path}`.replace(/\.git$/i, '').toLowerCase().slice(0, REPO_KEY_MAX_LENGTH)
 }
 
-const findGitDir = (startDir) => {
+const findGitDir = (startDir, legacy = false) => {
   let current = startDir
   for (let depth = 0; depth < MAX_PARENT_WALK; depth += 1) {
     const candidate = join(current, '.git')
@@ -277,7 +277,7 @@ const findGitDir = (startDir) => {
         // A directory read throws EISDIR, which is the ordinary-clone case.
         if (pointer.startsWith('gitdir:')) {
           const target = pointer.slice('gitdir:'.length).trim()
-          return target.startsWith('/') ? target : join(current, target)
+          return (legacy ? target.startsWith('/') : isAbsolute(target)) ? target : join(current, target)
         }
       }
     } catch (error) {
@@ -290,7 +290,23 @@ const findGitDir = (startDir) => {
   return undefined
 }
 
-const deriveRepoKey = (cwd) => {
+const mainGitDirOf = (gitDir) => {
+  try {
+    const pointer = readFileSync(join(gitDir, 'commondir'), 'utf-8').trim()
+    if (!pointer) return gitDir
+    return isAbsolute(pointer) ? pointer : resolve(gitDir, pointer)
+  } catch {
+    return gitDir
+  }
+}
+
+const projectRootOf = (gitDir, cwd) => {
+  const mainGitDir = mainGitDirOf(gitDir)
+  if (basename(mainGitDir) === '.git') return dirname(mainGitDir)
+  return gitDir.endsWith('.git') ? dirname(gitDir) : cwd
+}
+
+const deriveRepoKey = (cwd, legacy = false) => {
   const override = process.env.PUSHARY_REPO_KEY
   if (typeof override === 'string') {
     const trimmed = override.trim()
@@ -299,11 +315,13 @@ const deriveRepoKey = (cwd) => {
   }
   const dir = cwd || process.cwd()
   try {
-    const gitDir = findGitDir(dir)
+    const gitDir = findGitDir(dir, legacy)
     if (gitDir) {
       // A worktree's config lives in the main git directory.
-      const wt = gitDir.replace(/\\/g, '/').indexOf('/worktrees/')
-      const configPath = wt === -1 ? join(gitDir, 'config') : join(gitDir.slice(0, wt), 'config')
+      const oldIndex = gitDir.replace(/\\/g, '/').indexOf('/worktrees/')
+      const configPath = legacy
+        ? join(oldIndex === -1 ? gitDir : gitDir.slice(0, oldIndex), 'config')
+        : join(mainGitDirOf(gitDir), 'config')
       if (existsSync(configPath)) {
         let inOrigin = false
         for (const rawLine of readFileSync(configPath, 'utf-8').split('\n')) {
@@ -317,7 +335,7 @@ const deriveRepoKey = (cwd) => {
           }
         }
       }
-      const root = gitDir.endsWith('.git') ? dirname(gitDir) : dir
+      const root = legacy ? (gitDir.endsWith('.git') ? dirname(gitDir) : dir) : projectRootOf(gitDir, dir)
       return `local/${basename(root).toLowerCase()}`.slice(0, REPO_KEY_MAX_LENGTH)
     }
     return `local/${basename(dir).toLowerCase()}`.slice(0, REPO_KEY_MAX_LENGTH)
@@ -326,6 +344,13 @@ const deriveRepoKey = (cwd) => {
   }
 }
 
+const repositoryScopeFor = (cwd) => {
+  const repoKey = deriveRepoKey(cwd, true)
+  const sharedRepoKey = deriveRepoKey(cwd)
+  return { repoKey, ...(sharedRepoKey && sharedRepoKey !== repoKey ? { sharedRepoKey } : {}) }
+}
+
+
 // ── action body capture + redaction (inlined mirror of describe.ts, since this
 // dependency-free hook cannot import the workspace) ───────────────────────────
 const ACTION_BODY_MAX = 4000
@@ -625,7 +650,7 @@ const handlePushFirst = async (apiKey, command, project, ident, pushFirstSeconds
   return ask('No answer from your phone in time, so the request was withdrawn there. Approve here.')
 }
 
-export { handlePushOnly, handlePushFirst, withdrawQuestion }
+export { handlePushOnly, handlePushFirst, withdrawQuestion, deriveRepoKey, repositoryScopeFor }
 
 // notify_only: fire an awareness notification, let VS Code's prompt decide.
 const handleNotifyOnly = async (apiKey, command, project, ident) => {

package/dist/{api-SXS2T6QU.js → api-QUARGXSY.js}

@@ -17,23 +17,23 @@ import {
   waitForQuestion,
   waitsForThePhone,
   withdrawQuestion
-} from "./chunk-2YFTIQM5.js";
+} from "./chunk-SR44ZNZF.js";
 import "./chunk-POFBE6ZY.js";
-import "./chunk-EX76IRRF.js";
-import "./chunk-GVEIAGZ5.js";
-import "./chunk-OAWIPPYH.js";
-import "./chunk-RD2WTV72.js";
-import "./chunk-LLVX57ZC.js";
-import "./chunk-D4A277IY.js";
-import "./chunk-KU2FFKWS.js";
+import "./chunk-XTNCXIYR.js";
+import "./chunk-UZRKR6NZ.js";
+import "./chunk-CO6TQ44W.js";
+import "./chunk-CSUO5YJG.js";
+import "./chunk-CHVXLS7U.js";
+import "./chunk-Y7AX6BS4.js";
+import "./chunk-NPZ5L2WQ.js";
 import "./chunk-PPY5N2E6.js";
 import "./chunk-KZERVKTD.js";
-import "./chunk-7ECQUETY.js";
+import "./chunk-NDPOESVW.js";
 import "./chunk-ZVU6WMMU.js";
 import {
   DECISION_STOP_REASON,
   UNVERIFIABLE_APPROVAL_REASON
-} from "./chunk-ABAIOLV5.js";
+} from "./chunk-OMN5UCMW.js";
 import "./chunk-MLKGABMK.js";
 export {
   ABANDONED_WAIT,

package/dist/bin/pushary-bell-hook.js

@@ -1,41 +1,41 @@
 #!/usr/bin/env node
 import {
   handleBell
-} from "../chunk-7JF57OPF.js";
+} from "../chunk-LTMMFZHG.js";
 import {
   readHookInput
-} from "../chunk-BANK74ZZ.js";
-import "../chunk-3R2FRFVO.js";
-import "../chunk-PRH7XNAT.js";
-import "../chunk-BGJ3SXTZ.js";
-import "../chunk-OBRDREJD.js";
-import "../chunk-SF3FHCJJ.js";
-import "../chunk-CPEITTYS.js";
-import "../chunk-2GSRRZ6B.js";
+} from "../chunk-CQMY74I2.js";
+import "../chunk-RFP4Q5I3.js";
+import "../chunk-OC47FGOY.js";
+import "../chunk-HALVTC2N.js";
+import "../chunk-CFD3IESN.js";
+import "../chunk-5V2YDO4U.js";
+import "../chunk-ONRA5ON4.js";
+import "../chunk-PFHU3CW4.js";
 import "../chunk-NMUI3ZWG.js";
-import "../chunk-27232B7Y.js";
+import "../chunk-4PD7FP55.js";
 import "../chunk-XMSDA5WA.js";
-import "../chunk-OGRGVEWA.js";
+import "../chunk-VMIWR724.js";
 import "../chunk-XHKBHWLX.js";
-import "../chunk-PETLGHDR.js";
-import "../chunk-Q2PKD73S.js";
-import "../chunk-KDN7AMAQ.js";
-import "../chunk-CEUWBQF2.js";
-import "../chunk-2YFTIQM5.js";
+import "../chunk-LANGH7UF.js";
+import "../chunk-OFQJHWAS.js";
+import "../chunk-2BVVMWVF.js";
+import "../chunk-RXQT5FTX.js";
+import "../chunk-SR44ZNZF.js";
 import "../chunk-POFBE6ZY.js";
-import "../chunk-EX76IRRF.js";
-import "../chunk-GVEIAGZ5.js";
-import "../chunk-OAWIPPYH.js";
-import "../chunk-RD2WTV72.js";
-import "../chunk-HEFRK3YI.js";
-import "../chunk-LLVX57ZC.js";
-import "../chunk-D4A277IY.js";
-import "../chunk-KU2FFKWS.js";
+import "../chunk-XTNCXIYR.js";
+import "../chunk-UZRKR6NZ.js";
+import "../chunk-CO6TQ44W.js";
+import "../chunk-CSUO5YJG.js";
+import "../chunk-YLCNW7YN.js";
+import "../chunk-CHVXLS7U.js";
+import "../chunk-Y7AX6BS4.js";
+import "../chunk-NPZ5L2WQ.js";
 import "../chunk-PPY5N2E6.js";
 import "../chunk-KZERVKTD.js";
-import "../chunk-7ECQUETY.js";
+import "../chunk-NDPOESVW.js";
 import "../chunk-ZVU6WMMU.js";
-import "../chunk-ABAIOLV5.js";
+import "../chunk-OMN5UCMW.js";
 import "../chunk-MLKGABMK.js";
 
 // bin/pushary-bell-hook.ts

package/dist/bin/pushary-bell.js

@@ -5,40 +5,40 @@ import {
   liveAgentCount,
   ring,
   upgradeThreshold
-} from "../chunk-7JF57OPF.js";
+} from "../chunk-LTMMFZHG.js";
 import {
   createIo
 } from "../chunk-FO3MDD26.js";
 import {
   exitOnHelpFlag
-} from "../chunk-62KQLGEP.js";
+} from "../chunk-V7TNHTHH.js";
 import {
   addBellHooks,
   bellInstalled,
   removeBellHooks
-} from "../chunk-2GSRRZ6B.js";
+} from "../chunk-PFHU3CW4.js";
 import {
   parseFlags
 } from "../chunk-NMUI3ZWG.js";
-import "../chunk-PETLGHDR.js";
-import "../chunk-HEFRK3YI.js";
+import "../chunk-LANGH7UF.js";
+import "../chunk-YLCNW7YN.js";
 import {
   claudeSettings
-} from "../chunk-LLVX57ZC.js";
+} from "../chunk-CHVXLS7U.js";
 import {
   readJsonSafe,
   writeJsonAtomic
-} from "../chunk-D4A277IY.js";
-import "../chunk-KU2FFKWS.js";
+} from "../chunk-Y7AX6BS4.js";
+import "../chunk-NPZ5L2WQ.js";
 import "../chunk-PPY5N2E6.js";
 import {
   EXIT
 } from "../chunk-KZERVKTD.js";
-import "../chunk-7ECQUETY.js";
+import "../chunk-NDPOESVW.js";
 import "../chunk-ZVU6WMMU.js";
 import {
   isRecord
-} from "../chunk-ABAIOLV5.js";
+} from "../chunk-OMN5UCMW.js";
 import "../chunk-MLKGABMK.js";
 
 // bin/pushary-bell.ts

package/dist/bin/pushary-claude.js

@@ -2,7 +2,7 @@
 import {
   WRAPPER_ACTIVE_ENV,
   findClaudeBinary
-} from "../chunk-KFJAVZQ4.js";
+} from "../chunk-2FL5PLA4.js";
 import {
   CommandReceipts,
   controllerCommandSchema
@@ -12,39 +12,39 @@ import {
   describeIdleWindow,
   startProcessOwnership,
   withSpawnProcessOwnership
-} from "../chunk-L2ZV2R56.js";
-import "../chunk-KRNY5Z6I.js";
+} from "../chunk-2BXWBKVN.js";
+import "../chunk-66VEUAN5.js";
 import {
   announceSubscriptionRequired,
   isDeferAnswer
-} from "../chunk-EJEAHC7H.js";
+} from "../chunk-V3LBQFQM.js";
 import {
   claudeTranscriptPath,
   redactDraft,
   registerTranscript,
   registeredTranscriptEnabled,
   startDraftPublisher
-} from "../chunk-3R2FRFVO.js";
-import "../chunk-PRH7XNAT.js";
+} from "../chunk-RFP4Q5I3.js";
+import "../chunk-OC47FGOY.js";
 import {
   ensureDaemonRunning
-} from "../chunk-OBRDREJD.js";
-import "../chunk-SF3FHCJJ.js";
-import "../chunk-CPEITTYS.js";
-import "../chunk-2GSRRZ6B.js";
+} from "../chunk-CFD3IESN.js";
+import "../chunk-5V2YDO4U.js";
+import "../chunk-ONRA5ON4.js";
+import "../chunk-PFHU3CW4.js";
 import "../chunk-NMUI3ZWG.js";
-import "../chunk-27232B7Y.js";
+import "../chunk-4PD7FP55.js";
 import {
   external_exports
 } from "../chunk-XMSDA5WA.js";
 import {
   transcriptsEnabled
-} from "../chunk-OGRGVEWA.js";
+} from "../chunk-VMIWR724.js";
 import {
   needsShell,
   spawnClaude
 } from "../chunk-XHKBHWLX.js";
-import "../chunk-PETLGHDR.js";
+import "../chunk-LANGH7UF.js";
 import {
   DEFAULT_SESSION,
   fetchModeState,
@@ -57,16 +57,17 @@ import {
   removePendingCommand,
   reportEvent,
   savePendingCommand
-} from "../chunk-Q2PKD73S.js";
+} from "../chunk-OFQJHWAS.js";
 import {
   UNNAMED_ACTION,
   deriveToolTarget,
   describeToolCall,
   scopePathFor
-} from "../chunk-KDN7AMAQ.js";
+} from "../chunk-2BVVMWVF.js";
 import {
-  repoKeyFor
-} from "../chunk-CEUWBQF2.js";
+  repoKeyFor,
+  repositoryScopeFor
+} from "../chunk-RXQT5FTX.js";
 import {
   askUser,
   cancelQuestion,
@@ -78,30 +79,30 @@ import {
   waitForAnswer,
   waitsForThePhone,
   withdrawQuestion
-} from "../chunk-2YFTIQM5.js";
+} from "../chunk-SR44ZNZF.js";
 import "../chunk-POFBE6ZY.js";
 import {
   SubscriptionRequiredError
-} from "../chunk-EX76IRRF.js";
-import "../chunk-GVEIAGZ5.js";
-import "../chunk-OAWIPPYH.js";
+} from "../chunk-XTNCXIYR.js";
+import "../chunk-UZRKR6NZ.js";
+import "../chunk-CO6TQ44W.js";
 import {
   getMachineId
-} from "../chunk-RD2WTV72.js";
-import "../chunk-HEFRK3YI.js";
+} from "../chunk-CSUO5YJG.js";
+import "../chunk-YLCNW7YN.js";
 import {
   claudeConfigDir
-} from "../chunk-LLVX57ZC.js";
-import "../chunk-D4A277IY.js";
+} from "../chunk-CHVXLS7U.js";
+import "../chunk-Y7AX6BS4.js";
 import {
   getApiKey,
   getBaseUrl
-} from "../chunk-KU2FFKWS.js";
+} from "../chunk-NPZ5L2WQ.js";
 import "../chunk-PPY5N2E6.js";
 import "../chunk-KZERVKTD.js";
 import {
   NPX_LATEST_COMMAND
-} from "../chunk-7ECQUETY.js";
+} from "../chunk-NDPOESVW.js";
 import "../chunk-ZVU6WMMU.js";
 import {
   DECISION_STOP_REASON,
@@ -114,7 +115,7 @@ import {
   refusesWhenUnanswered,
   resolveGate,
   timeoutActionWithoutLocalPrompt
-} from "../chunk-ABAIOLV5.js";
+} from "../chunk-OMN5UCMW.js";
 import "../chunk-MLKGABMK.js";
 
 // src/wrapper/localPassthrough.ts
@@ -547,7 +548,7 @@ var createRemoteApprover = (deps) => {
         toolInputs: [input],
         scopePaths: scopePath ? [scopePath] : [],
         cwd: deps.cwd,
-        repoKey: repoKeyFor(deps.cwd),
+        ...repositoryScopeFor(deps.cwd),
         sessionId
       });
       if (verdict.kind === "kill") return deny(KILL_REASON);