@tduyng/pi-guard 0.0.1 → 0.0.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tduyng/pi-guard",
-  "version": "0.0.1",
+  "version": "0.0.2",
   "description": "Four guards: keep parallel pi sessions off each other's files, redact secrets out of read results, keep a stray rejected promise from killing the session, and stop git from hanging on an editor or skipping hooks.",
   "keywords": [
     "pi",

package/src/cloak.ts

@@ -111,7 +111,6 @@ function readConfigFile(path: string): CloakConfig {
 export function mergeCloakConfig(base: CloakConfig, project: CloakConfig): CloakConfig {
     return {
         ...base,
-        ...project,
         patterns: [
             ...(Array.isArray(base.patterns) ? base.patterns : []),
             ...(Array.isArray(project.patterns) ? project.patterns : [])

package/src/git-interceptor.ts

@@ -2,8 +2,6 @@ import type { ExtensionAPI } from '@earendil-works/pi-coding-agent'
 import { Validator } from 'ata-validator'
 import { t } from 'ata-validator/t'
 
-const NO_VERIFY_RE = /--no-verify\b|\bgit\b[^;\n]*\bcommit\b[^;\n]*(?:^|\s)-[A-Za-z]*n[A-Za-z]*(?:\s|=|$)/
-
 const SENSITIVE_COMMAND_RE =
     /(?:^|[\s"'=:~]|\/)\.env(?:\.[A-Za-z0-9_-]+)?(?=$|[\s"';&|),\]} ])|(?:^|[\s"'=:~]|\/)(?:[^\s"';&|]*\/)?(?:id_rsa|id_dsa|id_ecdsa|id_ed25519)(?=$|[\s"';&|),\]} ])|(?:^|[\s"'=:~]|\/)[^\s"';&|]*\.(?:pem|key|p12|pfx)(?=$|[\s"';&|),\]} ])/i
 
@@ -24,6 +22,41 @@ const isCommandInput = new Validator(CommandInput).isValidObject
 const isThenRunCommand = new Validator(t.object({ command: t.string() })).isValidObject
 const isThenRunText = new Validator(t.string()).isValidObject
 
+function words(segment: string): string[] {
+    const found = segment.match(/"(?:[^"\\]|\\.)*"|'[^']*'|[^\s]+/g) ?? []
+    return found.map((word) => word.replace(/^(["'])(.*)\1$/, '$2'))
+}
+
+function blocksHooks(command: string): boolean {
+    if (!/\bgit\b/.test(command)) return false
+    for (const segment of command.split(/[;&|\n]+/)) {
+        const tokens = words(segment)
+        const git = tokens.findIndex((token) => token === 'git' || token.endsWith('/git'))
+        if (git === -1) continue
+        const args = tokens.slice(git + 1)
+        const commit = args.findIndex((token) => token === 'commit')
+        if (commit === -1) continue
+        if (args.includes('--no-verify')) return true
+        if (args.some((token, index) => token === '-c' && (args[index + 1]?.startsWith('core.hooksPath=') ?? false)))
+            return true
+        const after = args.slice(commit + 1)
+        const message = after.findIndex(
+            (token) => token === '-m' || token === '--message' || token.startsWith('--message=')
+        )
+        const flags = message === -1 ? after : after.slice(0, message)
+        if (flags.some((token) => /^-[A-Za-z]*n[A-Za-z]*$/.test(token))) return true
+    }
+    return false
+}
+
+function commands(input: { command?: string; then_run?: string | { command: string } }): string[] {
+    const found: string[] = []
+    if (input.command !== undefined) found.push(input.command)
+    if (isThenRunCommand(input.then_run)) found.push(input.then_run.command)
+    else if (isThenRunText(input.then_run)) found.push(input.then_run)
+    return found
+}
+
 export default function (pi: ExtensionAPI) {
     process.env['GIT_EDITOR'] = 'true'
     process.env['GIT_SEQUENCE_EDITOR'] = 'true'
@@ -31,20 +64,10 @@ export default function (pi: ExtensionAPI) {
 
     pi.on('tool_call', (event) => {
         if (!isCommandInput(event.input)) return
-        const input = event.input
-        let command = input.command
-        if (command === undefined && input.then_run !== undefined) {
-            if (isThenRunCommand(input.then_run)) command = input.then_run.command
-            else if (isThenRunText(input.then_run)) command = input.then_run
-            else return
-        }
-        if (!command) return
-
-        if (/\bgit\b/.test(command) && NO_VERIFY_RE.test(command)) {
-            return { block: true, reason: BLOCK_REASON }
-        }
-        if (SENSITIVE_COMMAND_RE.test(command)) {
-            return { block: true, reason: SENSITIVE_REASON }
+        for (const command of commands(event.input)) {
+            if (command.trim() === '') continue
+            if (blocksHooks(command)) return { block: true, reason: BLOCK_REASON }
+            if (SENSITIVE_COMMAND_RE.test(command)) return { block: true, reason: SENSITIVE_REASON }
         }
     })
 }

package/src/reserve.ts

@@ -119,12 +119,14 @@ function stripQuotes(token: string): string {
  */
 function writtenPaths(command: string): string[] {
     const redirects = [...command.matchAll(REDIRECT)].map((match) => stripQuotes(match[1] ?? ''))
-    if (redirects.length > 0) return redirects
-    if (!SHELL_MUTATIONS.test(command)) return []
-    return command
+    const mutates = SHELL_MUTATIONS.test(command)
+    if (redirects.length > 0 && !mutates) return redirects
+    if (!mutates) return []
+    const tokens = command
         .split(/[\s;&|<>()]+/)
         .map(stripQuotes)
         .filter((token) => token !== '' && !token.startsWith('-'))
+    return [...new Set([...redirects, ...tokens])]
 }
 
 export function commandConflicts(cwd: string, session: string, command: string): Conflict[] {