contextos-agents 2.3.1 → 2.3.2

package/.agents/generated/gemini/skills/security/EXAMPLES.md

@@ -1,64 +1,28 @@
-# Application Security Examples — Anti-patterns vs ContextOS Standard
+# Security boundary examples
 
-## Example 1: Timing-Safe Secret Verification
+## Protected document mutation
 
-### Anti-pattern: Anti-pattern (Vulnerable to side-channel timing attack)
+Illustrative integration sketch: authenticate through trusted middleware, check
+the tenant role permits the action, and scope the query by document ID and trusted
+tenant ID. Return the established denied/missing response when no accessible
+document matches. Tenant membership alone may not permit deletion.
 
-```typescript
-// BAD: string comparison returns early on the first mismatched byte
-export function verifyApiKey(providedKey: string, storedKey: string): boolean {
-  return providedKey === storedKey; // Vulnerable to timing analysis!
-}
-```
-
-### Best practice: ContextOS Standard (Constant-time buffer comparison)
+Do not report a working endpoint from a sketch with assumed ORM/middleware.
+Verify another user's or tenant's document is inaccessible before persistence.
 
-```typescript
-// GOOD: crypto.timingSafeEqual executes in constant time
-import crypto from 'crypto';
+## Executable controls
 
-export function verifyApiKey(providedKey: string, storedKey: string): boolean {
-  const providedBuffer = Buffer.from(providedKey, 'utf8');
-  const storedBuffer = Buffer.from(storedKey, 'utf8');
+The original runnable HMAC and partner-fetch blocks are in [SKILL.md](SKILL.md).
+The verifier extracts these blocks rather than manually maintained copies.
+Checks cover signatures and URL scheme, credentials, host, port, transport, and
+redirect policy. Egress, DNS, and replay defenses need separate integration tests.
 
-  if (providedBuffer.length !== storedBuffer.length) {
-    return false;
-  }
+## Source-checkout scanner
 
-  return crypto.timingSafeEqual(providedBuffer, storedBuffer);
-}
+```powershell
+node bin/index.js scan --staged --enforce --placeholders
 ```
 
----
-
-## Example 2: Preventing IDOR (Insecure Direct Object Reference)
-
-### Anti-pattern: Anti-pattern (Trusting client ID without ownership check)
-
-```typescript
-// BAD: any authenticated user can delete any other user's document!
-app.delete('/api/documents/:id', requireAuth, async (req, res) => {
-  await prisma.document.delete({ where: { id: req.params.id } });
-  res.status(204).end();
-});
-```
-
-### Best practice: ContextOS Standard (Multi-tenant scoped authorization check)
-
-```typescript
-// GOOD: document deletion is strictly scoped to authenticated user or org
-app.delete('/api/documents/:id', requireAuth, async (req, res) => {
-  const deleted = await prisma.document.deleteMany({
-    where: {
-      id: req.params.id,
-      organizationId: req.user.organizationId, // Tenant isolation
-    },
-  });
-
-  if (deleted.count === 0) {
-    return res.status(404).json({ error: 'Document not found or access denied' });
-  }
-
-  return res.status(204).end();
-});
-```
+This checks staged secrets and placeholders. Supply --scope <file> with the
+actual scope JSON for write boundaries. Inspect unstaged changes separately.
+An empty index does not prove a candidate contains no unsafe code.

package/.agents/generated/gemini/skills/security/SKILL.md

@@ -1,184 +1,109 @@
 ---
 name: security
-description: >
-  Protect authentication, authorization, sensitive data, untrusted input, external integrations, and agent tool execution.
+description: "Protect authentication, authorization, sensitive data, untrusted input, external integrations, and agent tool execution."
 ---
 # security
 
 ## Overview
 
-Enforces zero-trust defense-in-depth, OWASP API Top 10 mitigation, cryptographic hardening, sensitive data leakage protection, and AI/LLM safety across all services, endpoints, and agent integrations.
+Protect application and agent trust boundaries. These instructions guide work;
+automated checkers enforce only their explicitly tested scope.
 
 ## When to Use
 
-Activate whenever writing authentication, authorization, session management, database queries, cryptography, external API integrations, user input handling, or agent tool calling.
+Authentication, authorization, protected data, inputs, cryptography, external
+requests, payments, destructive actions, and tool execution.
 
 ## Rules & Patterns
 
-### Negative Constraints (What NOT to Do)
-
-1. **NEVER use standard string comparison (`===`) for secrets/hashes**: Always use `crypto.timingSafeEqual` to prevent timing attacks.
-2. **NEVER store sensitive JWT access/refresh tokens in `localStorage`**: Store tokens in `httpOnly`, `Secure`, `SameSite=Strict` cookies.
-3. **NEVER return raw database/internal error messages or stack traces to the client**: Return standardized generic error codes (`INTERNAL_SERVER_ERROR`) and log details internally.
-4. **NEVER trust client-provided IDs for authorization without tenant/ownership checks**: Always verify `where: { id, userId: session.userId }` to prevent Broken Object Level Authorization (BOLA/IDOR).
-5. **NEVER disable CSRF protection, CORS allow-all (`*`), or TLS verification (`NODE_TLS_REJECT_UNAUTHORIZED=0`) in production**: Always enforce strict origin whitelists and HTTPS.
-6. **NEVER pass un-sanitized third-party content directly into system prompts or shell execution**: Treat all external data as potentially adversarial.
-
----
-
-### OWASP Top 10 for Modern APIs & Full-Stack
-
-#### 1. Injection (SQL, NoSQL, Command)
-
-- Always use parameterized queries - never concatenate user input into SQL or shell commands.
-- Use ORMs (Prisma, Drizzle, SQLAlchemy) with strict schema validation.
-- Validate and sanitize all user input before processing.
-
-#### 2. Broken Object Level Authorization (BOLA / IDOR)
-
-- Validate user ownership on EVERY database read, update, or delete:
-
-  ```typescript
-  // [GOOD] Scoped to authenticated user
-  const doc = await db.document.findFirst({
-    where: { id: documentId, tenantId: session.tenantId }
-  });
-  ```
-
-#### 3. Broken Authentication & Session Management
-
-- Use Argon2id or bcrypt (cost factor ≥ 12) for password hashing.
-- Short-lived access tokens (15 min) + secure HTTP-only refresh tokens.
-- Enforce rate limiting and brute-force lockouts on auth endpoints.
-
-#### 4. SSRF (Server-Side Request Forgery)
-
-- Restrict server-side URL fetching: validate URL scheme (`https:` only), resolve IP, and block private CIDR blocks (`10.0.0.0/8`, `127.0.0.0/8`, `169.254.0.0/16`, `192.168.0.0/16`).
-
-#### 5. Security Misconfiguration & Headers
-
-Enforce modern production security headers:
-
-```http
-Content-Security-Policy: default-src 'self'
-X-Content-Type-Options: nosniff
-X-Frame-Options: DENY
-Strict-Transport-Security: max-age=31536000; includeSubDomains
-Referrer-Policy: strict-origin-when-cross-origin
-Permissions-Policy: camera=(), microphone=(), geolocation=()
-```
-
----
-
-### AI Agent & LLM Security Invariants
-
-When building AI workflows, tools, or MCP servers:
-
-1. **Prompt Injection Defense**:
-   - Clearly delineate untrusted user/web content using boundary markers (e.g. `<untrusted_content>` tags).
-   - Never allow untrusted content to override system instructions or tool execution permissions.
-2. **Tool Execution Boundaries**:
-   - Destructive operations (database drops, file deletions, payment triggers) MUST require explicit user confirmation.
-   - Restrict file system tools to the workspace root - block directory traversal (`../`).
-3. **Secret Masking & Output Sanitization**:
-   - Scrub API keys (`sk-...`, `Bearer ...`), tokens, and credentials before writing to agent logs or step summaries.
-4. **Sandbox Execution & Write Isolation (Supply-Chain Defense)**:
-   - Target code is inspected strictly read-only; never execute target-controlled builds or tests with write access to the repository root.
-   - Restrict process write boundaries strictly to an isolated temporary `scratch/` directory.
-   - Enforce zero outbound external network access during security audits to prevent secret exfiltration via malicious scripts or dependencies.
-   - Promote verified non-secret results to retained `artifacts/` only via trusted parent-side inspection code.
-
----
+- Obtain identity from trusted authentication. Enforce ownership/tenant policy
+  before protected reads or mutations; client IDs are not authorization.
+- Validate boundary inputs and reject unknown privilege fields. Parameterize
+  queries and encode output for its context; avoid shell interpolation. An ORM
+  does not secure interpolated raw SQL.
+- Keep credentials out of source, logs, arguments, and client bundles. Use
+  established password/session libraries and cookie, CSRF, origin, and TLS
+  policies appropriate to the threat model.
+- Use constant-time primitives for secret comparisons. Surrounding code and
+  length handling matter; the whole flow is not necessarily constant-time.
+- External content remains untrusted data. Delimit it and preserve instruction
+  and tool authority; markers alone do not prevent prompt injection.
+- Existing authorization carries forward. For destructive actions verify it
+  covers the actual target and effect; ask only for missing authority.
+- For untrusted repositories/dependency scripts, inspect before execution,
+  isolate writes, withhold credentials, and restrict network access. Ordinary
+  authorized development uses relevant project checks. State actual sandbox
+  capabilities instead of claiming isolation the tools do not provide.
 
 ## Code Examples
 
+### Timing-safe webhook signature comparison
 
-### Timing-Safe Secret Verification
+This runnable block verifies SHA-256 hexadecimal HMAC signatures. Timestamp,
+replay protection, raw-body capture, and provider formats are separate requirements.
 
+<!-- example: security-hmac -->
 ```javascript
 import crypto from 'node:crypto';
 
 export function verifyWebhookSignature(payload, signature, secret) {
-  const hmac = crypto.createHmac('sha256', secret);
-  const digest = Buffer.from(hmac.update(payload).digest('hex'), 'utf8');
-  const sigBuffer = Buffer.from(signature, 'utf8');
-
-  if (digest.length !== sigBuffer.length) return false;
-  return crypto.timingSafeEqual(digest, sigBuffer);
+  if (typeof signature !== 'string' || !/^[a-f0-9]{64}$/i.test(signature)) return false;
+  const digest = crypto.createHmac('sha256', secret).update(payload).digest();
+  const received = Buffer.from(signature, 'hex');
+  return digest.length === received.length && crypto.timingSafeEqual(digest, received);
 }
 ```
 
-### SSRF Prevention Requirements (OWASP Compliant)
-
-Per [OWASP SSRF Prevention Cheat Sheet](https://cheatsheetseries.owasp.org/cheatsheets/Server_Side_Request_Forgery_Prevention_Cheat_Sheet.html), naive application-level DNS pre-checks followed by standard `fetch(url)` are fundamentally flawed due to DNS rebinding (TOCTOU) and unvalidated HTTP 3xx redirects.
+### Restricted partner URL fetch
 
-#### Mandatory Architectural Controls
+Follow the [OWASP SSRF guidance](https://cheatsheetseries.owasp.org/cheatsheets/Server_Side_Request_Forgery_Prevention_Cheat_Sheet.html).
+A hostname check followed by ordinary DNS resolution is not a complete SSRF
+boundary. Use a trusted egress transport/proxy that validates IPv4/IPv6 addresses
+at connection time and blocks private, loopback, link-local, and metadata targets,
+including DNS changes. Arbitrary URL fetchers need a separate network policy;
+this sample covers known partner hostnames.
 
-1. **Network-Layer Defense (Primary)**: For user-supplied arbitrary webhooks or URLs, route all outbound traffic through an isolated egress forward proxy (e.g., Smokescreen, Envoy, Squid) configured with firewall-level IP filters blocking RFC 1918, RFC 6598, link-local (`169.254.169.254`), loopback, and IPv6 local addresses at the socket handshake level.
-2. **Positive Destination Allowlist**: If fetching from known external partners, validate destination hostname against a strict positive allowlist.
-3. **Disable Automatic Redirects**: Always set `redirect: 'error'` or `'manual'`. Never follow HTTP redirects automatically without re-validating the target URL against allowlist rules.
-4. **Protocol & Credential Restrictions**: Enforce `https:` exclusively; reject embedded credentials (`user:pass@host`) and non-standard ports.
+Supply that trusted transport explicitly. This block checks URL syntax, HTTPS,
+credentials, port 443, a trusted hostname allowlist, and redirect policy. There
+is no ambient fetch fallback. Local tests inject a controlled transport; they
+do not verify production egress or DNS behavior.
 
-```typescript
-/**
- * Verified Allowlist-based HTTP Client (OWASP SSRF Prevention)
- * Enforces HTTPS, strict destination allowlist, and rejects HTTP redirects.
- */
-export async function fetchFromAllowlist(
-  urlString: string,
-  allowedHostnames: ReadonlySet<string>,
-  options: RequestInit = {}
-): Promise<Response> {
+<!-- example: security-ssrf -->
+```javascript
+export async function fetchFromAllowlist(urlString, allowedHostnames, options, transport) {
   const parsed = new URL(urlString);
-
-  // 1. Enforce HTTPS only
   if (parsed.protocol !== 'https:') {
-    throw new Error(`SSRF blocked: protocol "${parsed.protocol}" is not permitted; HTTPS required`);
+    throw new Error('SSRF blocked: protocol "' + parsed.protocol + '" is not permitted; HTTPS required');
   }
-
-  // 2. Reject credentials in URL
   if (parsed.username || parsed.password) {
     throw new Error('SSRF blocked: URL credentials (user:password@host) are prohibited');
   }
-
-  // 3. Strict positive destination allowlist (prevents internal network probing)
+  if (parsed.port && parsed.port !== '443') throw new Error('SSRF blocked: non-standard port');
   const normalizedHost = parsed.hostname.toLowerCase();
   if (!allowedHostnames.has(normalizedHost)) {
-    throw new Error(`SSRF blocked: destination host "${normalizedHost}" is not in the approved allowlist`);
+    throw new Error('SSRF blocked: destination host "' + normalizedHost + '" is not in the approved allowlist');
   }
-
-  // 4. Disable automatic redirects to prevent redirection to private IPs or metadata endpoints
-  return fetch(urlString, {
-    ...options,
-    redirect: 'error'
-  });
+  if (typeof transport !== 'function') throw new TypeError('Trusted egress transport required');
+  return transport(parsed.href, { ...options, redirect: 'error' });
 }
 ```
 
----
-
 ## Validation Checklist
 
-- [ ] All database queries parameterized or managed by type-safe ORM.
-- [ ] BOLA/IDOR prevented: all entity queries scoped by tenant/user id.
-- [ ] Cookies set with `HttpOnly`, `Secure`, and `SameSite=Strict` or `Lax`.
-- [ ] Passwords hashed with Argon2id / bcrypt.
-- [ ] Security headers active in middleware/reverse proxy.
-- [ ] No secrets or tokens checked into source control or exposed in logs.
-
----
+- [ ] Allowed and denied identity/tenant cases are checked before data access.
+- [ ] Invalid and unknown inputs never reach protected persistence.
+- [ ] Secrets and production errors preserve their boundaries.
+- [ ] External requests and tool policies are checked at the stated scope.
+- [ ] Commands, results, unrun checks, and limitations are reported.
 
 ## Common Mistakes
 
-- **Trusting client-side claims**: Checking role or permissions only on the frontend without server-side validation.
-- **Timing attacks on tokens**: Comparing tokens with `token === expectedToken` instead of `timingSafeEqual`.
-- **Exposing internal stack traces**: Returning full error objects to client in production.
-- **Unvalidated redirects / URLs**: Allowing arbitrary URLs in redirect or fetch parameters.
-
----
+Treating an allowlist as network isolation; comparing role labels instead of
+permissions; passing client payloads into persistence; interpreting a secret scan
+or document validator as a complete application security audit.
 
 ## Integration Notes
 
-- Runs in the REVIEW phase for every backend route, auth flow, and database mutation.
-- Integrates with `engineering-workflow` during Phase 5 (5-axis quality gate).
-- Pairs with `system-design` to mandate secure network boundaries and authorization layers.
+Use engineering-workflow's proportional verification and existing authority.
+The staged scanner needs --placeholders for stubs and --scope with a real scope
+JSON file for write boundaries. Validate does not replace either check.

package/.agents/generated/gemini/skills/security/TROUBLESHOOTING.md

@@ -1,19 +1,13 @@
-# security Troubleshooting & Common Mistakes
-
-## 1. Insecure Direct Object References (IDOR)
-
-- **Symptom**: User A can access User B's invoices by simply modifying the ID in the URL.
-- **Root Cause**: Querying by record ID without scoping to the authenticated `user.id` or tenant ID.
-- **Fix**: Always query with ownership predicate: `db.invoice.findFirst({ where: { id, userId: auth.user.id } })`.
-
-## 2. SQL Injection via Raw String Concatenation
-
-- **Symptom**: Database compromised through input fields.
-- **Root Cause**: String templating in raw queries (`db.query("SELECT * FROM users WHERE id = " + id)`).
-- **Fix**: Always use parameterized queries (`$1, $2`) or ORM/query-builder methods.
-
-## 3. Storing Sensitive Secrets in Git or Client Bundles
-
-- **Symptom**: API keys or JWT signing secrets exposed publicly.
-- **Root Cause**: Hardcoding secrets in source files or prefixing server secrets with NEXT_PUBLIC_.
-- **Fix**: Store all secrets in server-only environment variables; add git-secrets to pre-commit hooks.
+# Security troubleshooting
+
+- IDOR/BOLA: verify denied users/tenants before persistence and require the action
+  permission, not merely an object ID.
+- SQL/shell interpolation: use parameters or safe argument APIs. Schema checks
+  alone do not repair command interpolation.
+- SSRF: DNS prechecks followed by ambient fetch can resolve again; verify the
+  connection-time transport policy, A/AAAA results, and redirects.
+- Untrusted scripts: inspect/isolate without credentials; state actual controls.
+- Authority: confirm targets/effects against existing permission instead of
+  asking again merely because a phase changed.
+- Green scan: inspect enabled flags, staged files, scope input, and exclusions.
+  Results do not prove all security invariants or unstaged code.

package/.agents/generated/gemini/skills/security/VALIDATION.json

@@ -1,12 +1,123 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema#",
+  "x-contextos-evidence-contract": 1,
+  "title": "Scoped verification evidence",
+  "description": "Report shape and outcome consistency only; command execution and agent behavior require separate evidence.",
   "type": "object",
+  "additionalProperties": false,
+  "required": [
+    "status",
+    "checks",
+    "limitations"
+  ],
   "properties": {
-    "rules_followed": {
-      "type": "boolean"
+    "status": {
+      "enum": [
+        "verified",
+        "partial",
+        "not_run"
+      ]
+    },
+    "checks": {
+      "type": "array",
+      "items": {
+        "type": "object",
+        "additionalProperties": false,
+        "required": [
+          "command",
+          "exitCode",
+          "scope"
+        ],
+        "properties": {
+          "command": {
+            "type": "string",
+            "minLength": 1
+          },
+          "exitCode": {
+            "type": [
+              "integer",
+              "null"
+            ]
+          },
+          "scope": {
+            "type": "string",
+            "minLength": 1
+          }
+        }
+      }
+    },
+    "limitations": {
+      "type": "array",
+      "items": {
+        "type": "string",
+        "minLength": 1
+      }
     }
   },
-  "required": [
-    "rules_followed"
+  "allOf": [
+    {
+      "if": {
+        "properties": {
+          "status": {
+            "const": "verified"
+          }
+        }
+      },
+      "then": {
+        "properties": {
+          "checks": {
+            "minItems": 1,
+            "items": {
+              "properties": {
+                "exitCode": {
+                  "const": 0
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    {
+      "if": {
+        "properties": {
+          "status": {
+            "enum": [
+              "partial",
+              "not_run"
+            ]
+          }
+        }
+      },
+      "then": {
+        "properties": {
+          "limitations": {
+            "minItems": 1
+          }
+        }
+      }
+    },
+    {
+      "if": {
+        "properties": {
+          "status": {
+            "const": "not_run"
+          }
+        }
+      },
+      "then": {
+        "properties": {
+          "checks": {
+            "items": {
+              "properties": {
+                "exitCode": {
+                  "type": "null"
+                }
+              }
+            }
+          }
+        }
+      }
+    }
   ]
 }

package/.agents/resolver/canonical-resolver.js

@@ -59,10 +59,10 @@ const WORKFLOW_TEMPLATES = {
     summary: 'High-risk feature: auth, migration, public API, security, CI, concurrency',
     steps: [
       '1. SPEC: Document explicit in-scope/out-of-scope and acceptance criteria',
-      '2. APPROVED_PLAN: Atomic tasks (<2h), risk mitigation, and rollback strategy',
+      '2. PLAN: Scoped tasks, risk mitigation, and rollback strategy; carry existing authorization forward',
       '3. ISOLATED_CHANGE: Surgical implementation strictly within planned files',
-      '4. FULL_VERIFICATION: Global test suite + secret scanner + validator',
-      '5. INDEPENDENT_REVIEW: Review through security, database, and accessibility lenses',
+      '4. VERIFICATION: Behavioral regression checks and relevant integration, security, and project gates',
+      '5. REVIEW: Inspect correctness and applicable security, database, or accessibility boundaries; distinguish self-review from peer review',
     ],
   },
   destructive: {
@@ -71,7 +71,7 @@ const WORKFLOW_TEMPLATES = {
     steps: [
       '1. EXPLICIT_AUTHORITY: Confirm explicit user authorization and bounds',
       '2. ROLLBACK_REHEARSAL: Verify snapshot, backup, or rollback transaction log',
-      '3. GUARDED_CHANGE: Execute modification inside journaled transaction with project lock',
+      '3. GUARDED_CHANGE: Use supported transactional project tools or a verified backup and bounded operation',
       '4. POST_VERIFY: Confirm integrity, state consistency, and absence of data loss',
     ],
   },
@@ -391,24 +391,38 @@ function collectWorkspaceEvidence(projectRoot, registry) {
 /**
  * Evaluates task risk level according to Milestone 3 spec.
  */
+// JavaScript \\b/\\w do not delimit Cyrillic words. Use Unicode boundaries for
+// task phrases, including stem suffixes where the language requires them.
+function matchesTaskPhrase(text, pattern) {
+  return new RegExp(`(?:^|[^\\p{L}\\p{N}_])(?:${pattern})(?=$|[^\\p{L}\\p{N}_])`, 'iu').test(text);
+}
+
+const SECURITY_TASK_PATTERN = String.raw`secur\w*|auth\w*|jwt|passwords?|tokens?|secrets?|permissions?|idor|bola|ssrf|csrf|xss|login|access\s*control|rate\s*limit|безопасн[\p{L}]*|авториз[\p{L}]*|аутентифик[\p{L}]*|парол[\p{L}]*|токен[\p{L}]*|доступ(?:а|у|ом|е|ы|ов)?|прав[\p{L}]*\s+доступ[\p{L}]*`;
+
+// Bounded noun phrases allow common articles/adjectives without interpreting
+// "remove unused imports from files" as deletion of the files themselves.
+const DESTRUCTIVE_TASK_PATTERN = [
+  String.raw`(?:delete|remove|erase|purge|drop)\s+(?:(?:all|the|a|an|these|those|selected|old|stale|temporary|generated|unused|existing)\s+){0,4}(?:files?|folders?|directory|directories|tables?|databases?|rows?|records?)`,
+  String.raw`(?:удал[\p{L}]*|сотри|стереть|стирай|очист[\p{L}]*|уничтож[\p{L}]*)\s+(?:(?:все|всю|весь|всех|эти|эту|этот|стар[\p{L}]*|временн[\p{L}]*|выбранн[\p{L}]*|неиспользуем[\p{L}]*|сгенерированн[\p{L}]*)\s+){0,4}(?:баз[\p{L}]*|таблиц[\p{L}]*|диск[\p{L}]*|файл[\p{L}]*|папк[\p{L}]*)`,
+  String.raw`rm\s+-(?:rf|fr)|truncate|destroy|delete\s*from|format\s*disk|git\s+reset\s+--hard|git\s+push\s+(?:--force|-f)|git\s+clean\s+-[a-z]*f[a-z]*`,
+].join('|');
+
 function evaluateRisk(taskText, files = []) {
   const reasons = [];
   const text = (taskText || '').toLowerCase();
   let value = 'standard';
 
   // Destructive operations
-  if (/\b(drop\s*database|drop\s*table|rm\s*-rf|truncate|destroy|delete\s*from|format\s*disk)\b/i.test(text) ||
-      /\b(удали\w*\s*(?:базу|таблиц|диск|файл)|очист\w*\s*базу|уничтож\w*)\b/i.test(text)) {
+  if (matchesTaskPhrase(text, DESTRUCTIVE_TASK_PATTERN)) {
     reasons.push({ kind: 'risk_keyword', weight: 100, reason: 'Mentions destructive database or filesystem operation' });
     value = 'destructive';
-  } else if (/\b(secur\w*|auth\w*|jwt|password|token|secret|migration|schema|permission|billing|payment|credit\s*card|crypto)\b/i.test(text) ||
-      /\b(безопасн\w*|авториз\w*|аутентифик\w*|парол\w*|токен\w*|миграц\w*|платеж\w*|платёж\w*|доступ\w*)\b/i.test(text) ||
-      files.some(f => /\b(auth|security|migration|schema)\b/i.test(f))) {
+  } else if (matchesTaskPhrase(text, SECURITY_TASK_PATTERN) ||
+      matchesTaskPhrase(text, String.raw`migration|schema|billing|payments?|credit\s*card|crypto|concurr\w*|public\s*api|ci|миграц[\p{L}]*|плат[её]ж[\p{L}]*|конкурент[\p{L}]*|параллельн[\p{L}]*|публичн[\p{L}]*\s*api`) ||
+      files.some(f => /(?:auth|security|migrations?|schema|\.github\/workflows)(?:[^a-z]|$)/i.test(f))) {
     // High-risk operations
     reasons.push({ kind: 'risk_keyword', weight: 50, reason: 'Touches security, authentication, migration, or sensitive domain' });
     value = 'high';
-  } else if ((/\b(typo|readme|doc|comment|format|lint|prettier)\b/i.test(text) ||
-      /\b(опечатк\w*|документац\w*|комментар\w*|форматирован\w*)\b/i.test(text)) &&
+  } else if (matchesTaskPhrase(text, String.raw`typo|readme|docs?|comments?|format|lint|prettier|опечатк[\p{L}]*|документац[\p{L}]*|комментар[\p{L}]*|форматирован[\p{L}]*`) &&
       files.every(f => /\.(md|txt|json|ya?ml)$/i.test(f))) {
     // Routine operations
     reasons.push({ kind: 'risk_keyword', weight: 10, reason: 'Routine documentation or formatting change' });
@@ -437,19 +451,19 @@ function resolvePhaseAndRole(phaseArg, taskText, selectedSkills) {
     phaseSource = 'explicit';
   } else {
     const lower = (taskText || '').toLowerCase();
-    if (/\b(spec|requirements|user\s*story|критерии|требован)\b/i.test(lower)) {
+    if (matchesTaskPhrase(lower, String.raw`spec|requirements|user\s*story|критери[\p{L}]*|требован[\p{L}]*`)) {
       phaseValue = 'Define';
       phaseSource = 'prompt';
-    } else if (/\b(plan|architecture|design\s*the\s*system|спланируй|архитектур)\b/i.test(lower)) {
+    } else if (matchesTaskPhrase(lower, String.raw`plan|architecture|design\s*the\s*system|спланир[\p{L}]*|архитектур[\p{L}]*`)) {
       phaseValue = 'Plan';
       phaseSource = 'prompt';
-    } else if (/\b(review|audit|check\s*pr|ревью|проверь\s*код)\b/i.test(lower)) {
+    } else if (matchesTaskPhrase(lower, String.raw`review|audit|check\s*pr|ревью|провер[\p{L}]*\s*код[\p{L}]*`)) {
       phaseValue = 'Review';
       phaseSource = 'prompt';
-    } else if (/\b(test|vitest|jest|playwright|tdd|тест)\b/i.test(lower)) {
+    } else if (matchesTaskPhrase(lower, String.raw`tests?|vitest|jest|playwright|tdd|тест[\p{L}]*`)) {
       phaseValue = 'Verify';
       phaseSource = 'prompt';
-    } else if (/\b(deploy|release|ship|production|релиз|деплой)\b/i.test(lower)) {
+    } else if (matchesTaskPhrase(lower, String.raw`deploy|release|ship|production|релиз[\p{L}]*|деплой[\p{L}]*`)) {
       phaseValue = 'Ship';
       phaseSource = 'prompt';
     }
@@ -747,8 +761,7 @@ class CanonicalResolver {
       // Exact alias match
       for (const alias of signals.aliases || []) {
         const escaped = alias.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
-        const re = new RegExp(`\\b${escaped}\\b`, 'i');
-        if (re.test(taskLower)) {
+        if (matchesTaskPhrase(taskLower, escaped)) {
           addEvidence(id, 'alias', WEIGHTS.EXACT_ALIAS, `Exact alias match "${alias}" in task description`);
           break;
         }
@@ -757,8 +770,8 @@ class CanonicalResolver {
       // Keyword matches
       for (const kw of signals.keywords || []) {
         const escaped = kw.value.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
-        const re = new RegExp(`\\b${escaped}\\b`, 'i');
-        if (re.test(taskLower)) {
+        const pattern = kw.locale === 'ru' ? `${escaped}[\\p{L}]*` : escaped;
+        if (matchesTaskPhrase(taskLower, pattern)) {
           const w = kw.weight || WEIGHTS.TASK_KEYWORD_STRONG;
           addEvidence(id, 'keyword', w, `Task keyword "${kw.value}" (+${w})`);
         }
@@ -788,7 +801,7 @@ class CanonicalResolver {
       { id: 'react', re: /\b(react|reactjs|useOptimistic)\b|компонент|хук|модал\w*/i, w: 40, kw: 'react' },
       { id: 'typescript', re: /\b(typescript|type-?safe|generics?|tsconfig)\b|тайпскрипт|типизац/i, w: 40, kw: 'typescript' },
       { id: 'ui-ux-pro', re: /\b(ui|ux|tailwind|styling)\b|дизайн|верстк|макет|интерфейс|модал\w*/i, w: 35, kw: 'ui/ux' },
-      { id: 'security', re: /\b(security|auth|jwt|login|csrf|xss|rate\s*limit)\b|авториз|аутентифик|парол|безопасност/i, w: 40, kw: 'security' },
+      { id: 'security', re: { test: text => matchesTaskPhrase(text, SECURITY_TASK_PATTERN) }, w: 40, kw: 'security' },
       { id: 'database', re: /\b(database|sql|postgres|prisma|drizzle|migration|orm)\b|баз.*данн|миграц|таблиц/i, w: 40, kw: 'database' },
       { id: 'testing', re: /\b(vitest|jest|playwright|tdd|bdd|e2e)\b|тестирован|покрыти|юнит|тест/i, w: 40, kw: 'testing' },
       { id: 'performance', re: /\b(performance|latency|lcp|cls|inp|core\s*web\s*vitals)\b|производительн|ускор|быстр|throughput/i, w: 40, kw: 'performance' },