@goodandready/dsh-approval-gate 0.1.9 → 0.1.10

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 0.1.10
+
+- Policy: точное определение сессионной политики апрува в `readKnobs` через `approval.effectivePolicy(session)`, историю событий `session.eventAt` и пресет `danger-full-access` (Refs: #140).
+- Execution: корректный пропуск некритичных команд в режиме «Полный доступ» (`never`) без ложного поднятия `ask` и автоматического отказа DSH `Error: the user rejected tool` (Refs: #140).
+- Observability: форматирование `sessionTag` с получением строкового идентификатора сессии `session.id` / `session.name` вместо `[object Object]` (Refs: #140).
+
 ## 0.1.9
 
 - Inspect: декомпозиция `lib/inspect.js` с выносом `checkEnvExfiltration` в `lib/inspect-env.js`, строгое соблюдение порога 600 строк (Refs: #35).

package/lib/index.js

@@ -44,8 +44,15 @@ export function isUnattended(knobs) {
   return policies.includes(policy);
 }
 
-/** Effective permission knobs, as the harness exposes them. */
-function readKnobs(ctx) {
+/**
+ * Effective permission knobs, as the harness exposes them.
+ * Resolves session-level approval policy if an active execution carrying a session is provided.
+ *
+ * @param {any} ctx - Cordis context
+ * @param {any} [execution] - Optional tool execution carrying agent/session
+ * @returns {{ policy: string, sandbox: string }}
+ */
+export function readKnobs(ctx, execution) {
   const read = (name) => {
     try {
       return ctx && typeof ctx.get === "function" ? ctx.get(name) : undefined;
@@ -55,8 +62,84 @@ function readKnobs(ctx) {
   };
   const approval = read("approval");
   const shell = read("shell");
+
+  const agent = execution && execution.agent;
+  const session = agent && (agent.session || (typeof agent === "object" && typeof agent.eventAt === "function" ? agent : undefined));
+
+  let policy = "";
+
+  // 1. Live approval service effectivePolicy(session)
+  if (approval && session && typeof approval.effectivePolicy === "function") {
+    try {
+      policy = approval.effectivePolicy(session) || "";
+    } catch {
+      // ignore
+    }
+  }
+
+  // 2. Direct session property fallback
+  if (!policy && session && typeof session.approvalPolicy === "string") {
+    policy = session.approvalPolicy;
+  }
+
+  // 3. Fallback: inspect session events backwards for approval/policy
+  if (!policy && session && typeof session.eventAt === "function" && typeof session.seq === "number") {
+    try {
+      for (let seq = session.seq - 1; seq >= 0; seq -= 1) {
+        const event = session.eventAt(seq);
+        if (event && event.type === "approval/policy" && event.data && event.data.policy) {
+          policy = event.data.policy;
+          break;
+        }
+      }
+    } catch {
+      // ignore
+    }
+  }
+
+  // 4. Fallback: inspect session events for permission/preset === 'danger-full-access'
+  if (!policy && session && typeof session.eventAt === "function" && typeof session.seq === "number") {
+    try {
+      for (let seq = session.seq - 1; seq >= 0; seq -= 1) {
+        const event = session.eventAt(seq);
+        if (event && event.type === "permission/preset" && event.data && event.data.preset) {
+          if (event.data.preset === "danger-full-access") {
+            policy = "never";
+          }
+          break;
+        }
+      }
+    } catch {
+      // ignore
+    }
+  }
+
+  // 5. In-memory session.events array fallback (common in mocks / tests)
+  if (!policy && session && Array.isArray(session.events)) {
+    try {
+      for (let i = session.events.length - 1; i >= 0; i -= 1) {
+        const event = session.events[i];
+        if (event && event.type === "approval/policy" && event.data && event.data.policy) {
+          policy = event.data.policy;
+          break;
+        }
+        if (event && event.type === "permission/preset" && event.data && event.data.preset === "danger-full-access") {
+          policy = "never";
+          break;
+        }
+      }
+    } catch {
+      // ignore
+    }
+  }
+
+  // 6. Global static fallback from approval service config
+  if (!policy && approval && approval.config && approval.config.policy) {
+    policy = approval.config.policy;
+  }
+
   return {
-    policy: (approval && approval.config && approval.config.policy) || "",
+    policy: policy || "",
     sandbox: (shell && shell.sandboxMode) || "",
   };
 }
@@ -106,7 +189,7 @@ export function apply(ctx, config) {
   const hasPreExecute = ctx && typeof ctx.on === "function";
   if (hasPreExecute) {
     ctx.on("tools/pre-execute", function (execution, next) {
-      const knobs = readKnobs(ctx);
+      const knobs = readKnobs(ctx, execution);
       const who = sessionTag(execution);
       const sessionId = (execution && execution.agent && (execution.agent.session || execution.agent)) || "default";
       const decision = engine.decide(execution, { sessionId, knobs });

package/lib/messages.js

@@ -178,7 +178,11 @@ export const MESSAGES = Object.freeze({
 export function sessionTag(execution) {
   const agent = execution && execution.agent;
   if (typeof agent === "string") return " (session " + agent + ")";
-  if (agent && agent.session) return " (session " + String(agent.session) + ")";
+  if (agent && agent.session) {
+    const s = agent.session;
+    const sid = typeof s === "string" ? s : (s.id || s.name || s.sessionId || s.sessionKey);
+    return sid ? " (session " + String(sid) + ")" : "";
+  }
   return "";
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@goodandready/dsh-approval-gate",
-  "version": "0.1.9",
+  "version": "0.1.10",
   "description": "Host-only command safety gate for DeepSeek Harness: blocks recognized dangerous operations and requests DSH approval when a command cannot be inspected.",
   "type": "module",
   "main": "lib/index.js",