dsh-cc-permissions 0.4.0 → 0.4.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-cc-permissions",
-  "version": "0.4.0",
+  "version": "0.4.2",
   "description": "Enforce Claude Code permission rules (.claude/settings.json allow/deny/ask, deny>ask>allow) in DSH via a tools/pre-execute gate; CC allow rules auto-answer the approval/request seam (incl. sandbox escalation). Reads CC settings as a read-only source; DSH-side approvals never write back to .claude.",
   "type": "module",
   "main": "src/index.js",
@@ -26,7 +26,7 @@
   ],
   "license": "MIT",
   "dependencies": {
-    "dsh-cc-loader": "^0.3.0"
+    "dsh-cc-loader": "^0.3.2"
   },
   "devDependencies": {
     "@deepseek-ai/cordis": "4.0.2",

package/src/index.js

@@ -153,58 +153,66 @@ export function apply(ctx, config = {}) {
     }, { prepend: true })
   }
 
-  // ── bare-name deny → hide the tool from the model ─────────────────────────
-  if (config.hideDeniedTools !== false) {
+  // ── agent registration: hide denied tools + apply defaultMode ─────────────
+  // Both concerns are registration-time — they configure the agent's tool
+  // registry and its approval policy before the first prompt — so they share
+  // one `agent/created` listener. DSH 0.2.0 removed `agent/session-start`,
+  // which the defaultMode half used to ride; `agent/created` carries the same
+  // `{ agent }` on both host generations, so neither needs the source-aware
+  // `onSessionStart` boundary.
+  const hideDenied = config.hideDeniedTools !== false
+  const applyDefaultMode = config.enableDefaultMode !== false
+  if (hideDenied || applyDefaultMode) {
     ctx.on('agent/created', ({ agent }) => {
-      const cwd = agent.session?.header?.cwd
+      // `agent` itself must be guarded: 0.2.0 dispatches this event SERIALLY,
+      // so a synchronous throw here vetoes session publication outright.
+      const cwd = agent?.session?.header?.cwd
       if (cwd === undefined) return
-      void (async () => {
-        try {
-          const loaded = await permissionsFor(cwd)
-          const perm = loaded.permissions
-          if (perm === undefined || perm.status !== 'DIRECT') return
-          const { names } = perm.removed
-          if (names.length === 0) return
-          const tools = agent.ctx.tools
+
+      if (hideDenied) {
+        void (async () => {
           try {
-            tools.restrict({ deny: names })
-          } catch {
-            // Some names may not be in the registry yet / never registered —
-            // restrict per name so the known ones still hide.
-            for (const name of names) {
-              try { tools.restrict({ deny: [name] }) } catch { /* unknown tool: pre-execute still denies */ }
+            const loaded = await permissionsFor(cwd)
+            const perm = loaded.permissions
+            if (perm === undefined || perm.status !== 'DIRECT') return
+            const { names } = perm.removed
+            if (names.length === 0) return
+            const tools = agent.ctx.tools
+            try {
+              tools.restrict({ deny: names })
+            } catch {
+              // Some names may not be in the registry yet / never registered —
+              // restrict per name so the known ones still hide.
+              for (const name of names) {
+                try { tools.restrict({ deny: [name] }) } catch { /* unknown tool: pre-execute still denies */ }
+              }
             }
+          } catch (error) {
+            ctx.logger.warn(`cc-permissions: restrict failed: ${String(error)}`)
           }
-        } catch (error) {
-          ctx.logger.warn(`cc-permissions: restrict failed: ${String(error)}`)
-        }
-      })()
-    })
-  }
+        })()
+      }
 
-  // ── defaultMode → approval policy / guidance ──────────────────────────────
-  if (config.enableDefaultMode !== false) {
-    ctx.on('agent/session-start', ({ agent }) => {
-      const cwd = agent.session.header?.cwd
-      if (cwd === undefined) return
-      void (async () => {
-        try {
-          const loaded = await permissionsFor(cwd)
-          const mode = loaded.permissions?.defaultMode
-          if (mode === undefined) return
-          const approval = ctx.get('approval')
-          if (mode === 'dontAsk' && approval !== undefined) {
-            approval.setPolicy(agent, 'never')
-            ctx.logger.info(`cc-permissions: defaultMode=dontAsk → approval policy never for session`)
-          } else if (mode === 'bypassPermissions') {
-            ctx.logger.warn(`cc-permissions: defaultMode=bypassPermissions detected — DSH does NOT auto-map this to danger-full-access; enable it explicitly if intended`)
-          } else if (mode !== 'default' && mode !== 'manual') {
-            ctx.logger.info(`cc-permissions: defaultMode=${mode} noted (no direct DSH mapping; sandbox/approval presets govern)`)
+      if (applyDefaultMode) {
+        void (async () => {
+          try {
+            const loaded = await permissionsFor(cwd)
+            const mode = loaded.permissions?.defaultMode
+            if (mode === undefined) return
+            const approval = ctx.get('approval')
+            if (mode === 'dontAsk' && approval !== undefined) {
+              approval.setPolicy(agent, 'never')
+              ctx.logger.info(`cc-permissions: defaultMode=dontAsk → approval policy never for session`)
+            } else if (mode === 'bypassPermissions') {
+              ctx.logger.warn(`cc-permissions: defaultMode=bypassPermissions detected — DSH does NOT auto-map this to danger-full-access; enable it explicitly if intended`)
+            } else if (mode !== 'default' && mode !== 'manual') {
+              ctx.logger.info(`cc-permissions: defaultMode=${mode} noted (no direct DSH mapping; sandbox/approval presets govern)`)
+            }
+          } catch (error) {
+            ctx.logger.warn(`cc-permissions: defaultMode handling failed: ${String(error)}`)
           }
-        } catch (error) {
-          ctx.logger.warn(`cc-permissions: defaultMode handling failed: ${String(error)}`)
-        }
-      })()
+        })()
+      }
     })
   }