@probelabs/probe 0.6.0-rc256 → 0.6.0-rc258

package/src/agent/bashPermissions.js

@@ -79,9 +79,19 @@ function matchesAnyPattern(parsedCommand, patterns) {
 export class BashPermissionChecker {
   /**
    * Create a permission checker
+   *
+   * Priority order (highest to lowest):
+   *   1. Custom deny  — always blocks (user explicitly blocked it)
+   *   2. Custom allow — overrides default deny (user explicitly allowed it)
+   *   3. Default deny — blocks by default
+   *   4. Allow list   — allows recognized safe commands
+   *
+   * This means `--bash-allow "git:push"` overrides the default deny for git:push
+   * without requiring `--no-default-bash-deny`.
+   *
    * @param {Object} config - Configuration options
-   * @param {string[]} [config.allow] - Additional allow patterns
-   * @param {string[]} [config.deny] - Additional deny patterns
+   * @param {string[]} [config.allow] - Additional allow patterns (override default deny)
+   * @param {string[]} [config.deny] - Additional deny patterns (always win)
    * @param {boolean} [config.disableDefaultAllow] - Disable default allow list
    * @param {boolean} [config.disableDefaultDeny] - Disable default deny list
    * @param {boolean} [config.debug] - Enable debug logging
@@ -90,38 +100,19 @@ export class BashPermissionChecker {
   constructor(config = {}) {
     this.debug = config.debug || false;
     this.tracer = config.tracer || null;
-    
-    // Build allow patterns
-    this.allowPatterns = [];
-    if (!config.disableDefaultAllow) {
-      this.allowPatterns.push(...DEFAULT_ALLOW_PATTERNS);
-      if (this.debug) {
-        console.log(`[BashPermissions] Added ${DEFAULT_ALLOW_PATTERNS.length} default allow patterns`);
-      }
-    }
-    if (config.allow && Array.isArray(config.allow)) {
-      this.allowPatterns.push(...config.allow);
-      if (this.debug) {
-        console.log(`[BashPermissions] Added ${config.allow.length} custom allow patterns:`, config.allow);
-      }
-    }
 
-    // Build deny patterns
-    this.denyPatterns = [];
-    if (!config.disableDefaultDeny) {
-      this.denyPatterns.push(...DEFAULT_DENY_PATTERNS);
-      if (this.debug) {
-        console.log(`[BashPermissions] Added ${DEFAULT_DENY_PATTERNS.length} default deny patterns`);
-      }
-    }
-    if (config.deny && Array.isArray(config.deny)) {
-      this.denyPatterns.push(...config.deny);
-      if (this.debug) {
-        console.log(`[BashPermissions] Added ${config.deny.length} custom deny patterns:`, config.deny);
-      }
-    }
+    // Separate default and custom patterns for priority-based resolution
+    this.defaultAllowPatterns = config.disableDefaultAllow ? [] : [...DEFAULT_ALLOW_PATTERNS];
+    this.customAllowPatterns = (config.allow && Array.isArray(config.allow)) ? [...config.allow] : [];
+    this.allowPatterns = [...this.defaultAllowPatterns, ...this.customAllowPatterns];
+
+    this.defaultDenyPatterns = config.disableDefaultDeny ? [] : [...DEFAULT_DENY_PATTERNS];
+    this.customDenyPatterns = (config.deny && Array.isArray(config.deny)) ? [...config.deny] : [];
+    this.denyPatterns = [...this.defaultDenyPatterns, ...this.customDenyPatterns];
 
     if (this.debug) {
+      console.log(`[BashPermissions] Default allow: ${this.defaultAllowPatterns.length}, Custom allow: ${this.customAllowPatterns.length}`);
+      console.log(`[BashPermissions] Default deny: ${this.defaultDenyPatterns.length}, Custom deny: ${this.customDenyPatterns.length}`);
       console.log(`[BashPermissions] Total patterns - Allow: ${this.allowPatterns.length}, Deny: ${this.denyPatterns.length}`);
     }
 
@@ -129,8 +120,8 @@ export class BashPermissionChecker {
     this.recordBashEvent('permissions.initialized', {
       allowPatternCount: this.allowPatterns.length,
       denyPatternCount: this.denyPatterns.length,
-      hasCustomAllowPatterns: !!(config.allow && config.allow.length > 0),
-      hasCustomDenyPatterns: !!(config.deny && config.deny.length > 0),
+      hasCustomAllowPatterns: this.customAllowPatterns.length > 0,
+      hasCustomDenyPatterns: this.customDenyPatterns.length > 0,
       disableDefaultAllow: !!config.disableDefaultAllow,
       disableDefaultDeny: !!config.disableDefaultDeny
     });
@@ -212,9 +203,18 @@ export class BashPermissionChecker {
       console.log(`[BashPermissions] Parsed: ${parsed.command} with args: [${parsed.args.join(', ')}]`);
     }
 
-    // Check deny patterns first (deny takes precedence)
-    if (matchesAnyPattern(parsed, this.denyPatterns)) {
-      const matchedPatterns = this.denyPatterns.filter(pattern => matchesPattern(parsed, pattern));
+    // Priority-based permission check:
+    // 1. Custom deny always wins
+    // 2. Custom allow overrides default deny
+    // 3. Default deny blocks
+    // 4. Allow list permits
+
+    // Step 1: Custom deny always wins
+    if (matchesAnyPattern(parsed, this.customDenyPatterns)) {
+      const matchedPatterns = this.customDenyPatterns.filter(pattern => matchesPattern(parsed, pattern));
+      if (this.debug) {
+        console.log(`[BashPermissions] DENIED - matches custom deny pattern: ${matchedPatterns[0]}`);
+      }
       const result = {
         allowed: false,
         reason: `Command matches deny pattern: ${matchedPatterns[0]}`,
@@ -227,12 +227,40 @@ export class BashPermissionChecker {
         parsedCommand: parsed.command,
         reason: 'matches_deny_pattern',
         matchedPattern: matchedPatterns[0],
-        isComplex: false
+        isComplex: false,
+        isCustomDeny: true
       });
       return result;
     }
 
-    // Check allow patterns
+    // Step 2: Custom allow overrides default deny
+    const matchesCustomAllow = matchesAnyPattern(parsed, this.customAllowPatterns);
+
+    // Step 3: Default deny (skipped if custom allow matches)
+    if (!matchesCustomAllow && matchesAnyPattern(parsed, this.defaultDenyPatterns)) {
+      const matchedPatterns = this.defaultDenyPatterns.filter(pattern => matchesPattern(parsed, pattern));
+      if (this.debug) {
+        console.log(`[BashPermissions] DENIED - matches default deny pattern: ${matchedPatterns[0]}`);
+      }
+      const result = {
+        allowed: false,
+        reason: `Command matches deny pattern: ${matchedPatterns[0]}`,
+        command: command,
+        parsed: parsed,
+        matchedPatterns: matchedPatterns
+      };
+      this.recordBashEvent('permission.denied', {
+        command,
+        parsedCommand: parsed.command,
+        reason: 'matches_deny_pattern',
+        matchedPattern: matchedPatterns[0],
+        isComplex: false,
+        isCustomDeny: false
+      });
+      return result;
+    }
+
+    // Step 4: Check allow patterns
     if (this.allowPatterns.length > 0) {
       if (!matchesAnyPattern(parsed, this.allowPatterns)) {
         const result = {
@@ -256,17 +284,23 @@ export class BashPermissionChecker {
       allowed: true,
       command: command,
       parsed: parsed,
-      isComplex: false
+      isComplex: false,
+      overriddenDeny: matchesCustomAllow && matchesAnyPattern(parsed, this.defaultDenyPatterns)
     };
 
     if (this.debug) {
-      console.log(`[BashPermissions] ALLOWED - command passed all checks`);
+      if (result.overriddenDeny) {
+        console.log(`[BashPermissions] ALLOWED - custom allow overrides default deny`);
+      } else {
+        console.log(`[BashPermissions] ALLOWED - command passed all checks`);
+      }
     }
 
     this.recordBashEvent('permission.allowed', {
       command,
       parsedCommand: parsed.command,
-      isComplex: false
+      isComplex: false,
+      overriddenDeny: result.overriddenDeny || false
     });
 
     return result;
@@ -477,10 +511,25 @@ export class BashPermissionChecker {
           break;
         }
 
-        // Check against deny patterns
-        if (matchesAnyPattern(parsed, this.denyPatterns)) {
+        // Check using same priority logic as simple commands:
+        // 1. Custom deny always wins
+        if (matchesAnyPattern(parsed, this.customDenyPatterns)) {
+          if (this.debug) {
+            console.log(`[BashPermissions] Component "${component}" matches custom deny pattern`);
+          }
+          allAllowed = false;
+          deniedComponent = component;
+          deniedReason = 'Component matches deny pattern';
+          break;
+        }
+
+        // 2. Custom allow overrides default deny
+        const componentMatchesCustomAllow = matchesAnyPattern(parsed, this.customAllowPatterns);
+
+        // 3. Default deny (skipped if custom allow matches)
+        if (!componentMatchesCustomAllow && matchesAnyPattern(parsed, this.defaultDenyPatterns)) {
           if (this.debug) {
-            console.log(`[BashPermissions] Component "${component}" matches deny pattern`);
+            console.log(`[BashPermissions] Component "${component}" matches default deny pattern`);
           }
           allAllowed = false;
           deniedComponent = component;
@@ -488,7 +537,7 @@ export class BashPermissionChecker {
           break;
         }
 
-        // Check against allow patterns
+        // 4. Check allow patterns
         if (!matchesAnyPattern(parsed, this.allowPatterns)) {
           if (this.debug) {
             console.log(`[BashPermissions] Component "${component}" not in allow list`);
@@ -567,6 +616,10 @@ export class BashPermissionChecker {
     return {
       allowPatterns: this.allowPatterns.length,
       denyPatterns: this.denyPatterns.length,
+      customAllowPatterns: this.customAllowPatterns.length,
+      customDenyPatterns: this.customDenyPatterns.length,
+      defaultAllowPatterns: this.defaultAllowPatterns.length,
+      defaultDenyPatterns: this.defaultDenyPatterns.length,
       totalPatterns: this.allowPatterns.length + this.denyPatterns.length
     };
   }

package/src/agent/shared/prompts.js

@@ -56,20 +56,52 @@ When reviewing code:
 
   'code-review-template': `You are going to perform code review according to provided user rules. Ensure to review only code provided in diff and latest commit, if provided. However you still need to fully understand how modified code works, and read dependencies if something is not clear.`,
 
-  'engineer': `You are senior engineer focused on software architecture and design.
-Before jumping on the task you first, in details analyse user request, and try to provide elegant and concise solution.
-If solution is clear, you can jump to implementation right away, if not, you can ask user a clarification question, by calling attempt_completion tool, with required details.
+  'engineer': `You are a senior engineer focused on software architecture and design.
+Before jumping on the task you first analyse the user request in detail, and try to provide an elegant and concise solution.
+If the solution is clear, you can jump to implementation right away. If not, ask the user a clarification question by calling the attempt_completion tool with the required details.
 
-Before jumping to implementation:
+# Tone and Style
+- Be concise and direct. Explain your approach briefly before implementing, then let the code speak for itself.
+- Do not add unnecessary preamble or postamble. Skip "Here is what I will do" or "Here is a summary of changes" unless the user asks.
+- Do not add code comments unless the logic is genuinely complex and non-obvious.
+
+# Before Implementation
 - Focus on high-level design patterns and system organization
 - Identify architectural patterns and component relationships
 - Evaluate system structure and suggest architectural improvements
-- Focus on backward compatibility.
+- Focus on backward compatibility
 - Consider scalability, maintainability, and extensibility in your analysis
 
-During the implementation:
-- Avoid implementing special cases
-- Do not forget to add the tests`,
+# Following Conventions
+- NEVER assume a library or dependency is available. Before using any library, check the project's dependency file (package.json, Cargo.toml, go.mod, requirements.txt, etc.) to confirm it exists in the project.
+- Before writing new code, look at neighboring files and existing implementations to understand the project's code style, naming conventions, and patterns. Mimic them.
+- Check imports and existing utilities before creating new helpers — the project may already have what you need.
+
+# Task Planning
+- If the task tool is available, use it to break complex work into milestones before starting implementation.
+- Stay flexible — if your understanding changes mid-task, add, remove, or reorganize tasks as needed. The plan should serve you, not constrain you.
+
+# During Implementation
+- Always create a new branch before making changes to the codebase.
+- Fix problems at the root cause, not with surface-level patches. Prefer general solutions over special cases.
+- Avoid implementing special cases when a general approach works
+- Never expose secrets, API keys, or credentials in generated code. Never log sensitive information.
+- Do not surprise the user with unrequested changes. Do what was asked, including reasonable follow-up actions, but do not refactor surrounding code or add features that were not requested.
+- After every significant change, verify the project still builds and passes linting. Do not wait until the end to discover breakage.
+
+# After Implementation
+- Always run the project's tests before considering the task complete. If tests fail, fix them.
+- Run lint and typecheck commands if known for the project.
+- If a build, lint, or test fails, fix the issue before finishing.
+- When the task is done, respond to the user with a concise summary of what was implemented, what files were changed, and any relevant details. Include links (e.g. pull request URL) so the user has everything they need.
+
+# GitHub Integration
+- Use the \`gh\` CLI for all GitHub operations: issues, pull requests, checks, releases.
+- To create a pull request: commit your changes, push the branch, then use \`gh pr create --title "..." --body "..."\`.
+- To view issues or PRs: \`gh issue view <number>\`, \`gh pr view <number>\`.
+- If given a GitHub URL, use \`gh\` to fetch the relevant information rather than guessing.
+- Always return the pull request URL to the user after creating one.
+- When checking GitHub Actions, only read logs of failed jobs — do not waste time on successful ones. Use \`gh run view <run-id> --log-failed\` to fetch only the relevant output.`,
 
   'support': `You are ProbeChat Support, a specialized AI assistant focused on helping developers troubleshoot issues and solve problems. Your primary function is to help users diagnose errors, understand unexpected behaviors, and find solutions using the provided code analysis tools.
 

package/src/tools/bash.js

@@ -146,8 +146,8 @@ Common reasons:
 2. The command is not in the allow list (not a recognized safe command)
 
 If you believe this command should be allowed, you can:
-- Use the --bash-allow option to add specific patterns
-- Use the --no-default-bash-deny flag to remove default restrictions (not recommended)
+- Use the --bash-allow option to add specific patterns (overrides default deny list)
+  Example: --bash-allow "git:push" allows git push while keeping all other deny rules
 
 For code exploration, try these safe alternatives:
 - ls, cat, head, tail for file operations