@orchestrator-claude/definitions 3.34.0 → 3.35.0

package/hooks/session-start.mjs

@@ -7881,7 +7881,6 @@ function readSessionSelection(stateDir, sessionId) {
 var HOOK = "SESSION-START";
 var __filename2 = fileURLToPath2(import.meta.url);
 var __dirname2 = dirname3(__filename2);
-var GRAPHRAG_TIMEOUT_MS = 2e3;
 var PROJECT_ROOT2 = resolveHookProjectRoot(process.cwd());
 var PROJECT_ID2 = process.env.ORCHESTRATOR_PROJECT_ID ?? "";
 var HOME = process.env.HOME ?? process.env.USERPROFILE ?? "/home/user";
@@ -7960,7 +7959,7 @@ function readBacklogFallback() {
     const latestSession = sessionMatches.sort((a, b) => b.num - a.num || a.idx - b.idx)[0];
     const lastSession = latestSession?.line.replace(/\*\*/g, "").slice(0, 120) || "";
     const nextLine = allLines.find((l) => /^\*\*proximo passo/i.test(l) || /^\*\*next/i.test(l));
-    const next = nextLine?.replace(/.*\*\*(proximo passo|next):?\*\*:?\s*/i, "").replace(/\s*$/, "").slice(0, 120) || "see BACKLOG.md";
+    const next = nextLine?.replace(/.*\*\*(proximo passo|next):?\*\*:?\s*/i, "").replace(/\s*$/, "").slice(0, 120) || "BACKLOG.md has no next-step line (legacy parser; see project-guidelines/project-state.yaml)";
     log(
       HOOK,
       `BACKLOG.md fallback parsed: version=${version} next=${next.slice(0, 50)} lastSession=${lastSession.slice(0, 50)}`
@@ -7968,7 +7967,12 @@ function readBacklogFallback() {
     return { version, next, status, lastSession };
   } catch (err) {
     log(HOOK, `BACKLOG read failed: ${err}`);
-    return { version: "v?.?.?", next: "see BACKLOG.md", status: "", lastSession: "" };
+    return {
+      version: "v?.?.?",
+      next: "no session state (project-guidelines/project-state.yaml missing or invalid, BACKLOG.md unreadable)",
+      status: "",
+      lastSession: ""
+    };
   }
 }
 function getBacklogSummary() {
@@ -8128,34 +8132,6 @@ function checkSprintInbox() {
     return "";
   }
 }
-async function getGraphContext(token, fetcher) {
-  if (token === null || token === "") return "";
-  const defaultFetcher = async (path, tok, timeoutMs = GRAPHRAG_TIMEOUT_MS) => {
-    const resp = await fetch(`http://localhost:3000${path}`, {
-      headers: { Authorization: `Bearer ${tok}` },
-      signal: AbortSignal.timeout(timeoutMs)
-    });
-    if (!resp.ok) return null;
-    return resp.json();
-  };
-  const fetch_ = fetcher ?? defaultFetcher;
-  try {
-    const [statsRaw, atRiskRaw] = await Promise.all([
-      fetch_("/api/v1/graphrag/stats", token, GRAPHRAG_TIMEOUT_MS),
-      fetch_("/api/v1/graphrag/at-risk", token, GRAPHRAG_TIMEOUT_MS)
-    ]);
-    const stats = statsRaw;
-    if (stats?.nodeCount === void 0) return "";
-    const atRiskData = atRiskRaw;
-    const components = String(stats.nodeCount);
-    const edges = String(stats.edgeCount ?? 0);
-    const hotPaths = (stats.hotPaths ?? []).join(",");
-    const atRisk = (atRiskData?.atRisk ?? []).join(",");
-    return `[GRAPH-CONTEXT] components=${components} edges=${edges} hot_paths=[${hotPaths}] at_risk=[${atRisk}]`;
-  } catch {
-    return "";
-  }
-}
 async function main() {
   log(HOOK, "SessionStart hook triggered");
   if (PROJECT_ROOT2 === null) {
@@ -8172,8 +8148,7 @@ async function main() {
   const tierSegment = formatTierSegment(tierInfo);
   const capabilityContext = buildCapabilityMatrixContext();
   const sprintInboxContext = checkSprintInbox();
-  const token = await getToken();
-  const graphContext = await getGraphContext(token);
+  await getToken();
   const selection = PROJECT_SELECTION_ENABLED && sessionId ? readSessionSelection(SESSION_SELECTION_STATE_DIR, sessionId) : void 0;
   const projectBinding = resolveSessionProjectBinding({
     envOverride: PROJECT_ID2,
@@ -8198,7 +8173,6 @@ async function main() {
         "Do NOT invoke /orchestrator skill for the greeting \u2014 use AskUserQuestion directly.",
         "Invoke /orchestrator skill only when the user chooses to start a workflow.",
         capabilityContext,
-        graphContext,
         sprintInboxContext,
         projectSelectionPrompt
       ].filter(Boolean).join("\n")
@@ -8216,7 +8190,6 @@ async function main() {
       "Do NOT invoke /orchestrator skill for the greeting \u2014 use AskUserQuestion directly.",
       "Invoke /orchestrator skill when the user chooses to continue the workflow.",
       capabilityContext,
-      graphContext,
       projectSelectionPrompt
     ].filter(Boolean).join("\n")
   );
@@ -8227,7 +8200,6 @@ export {
   formatProjectBindingSegment,
   formatSessionNumberSegment,
   formatTierSegment,
-  getGraphContext,
   readProjectState,
   resolveSessionProjectBinding,
   synthesizeStatus

package/hooks/session-start.ts

@@ -37,7 +37,6 @@ import { readSessionSelection } from './lib/session-selection.js';
 const HOOK = 'SESSION-START';
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = dirname(__filename);
-const GRAPHRAG_TIMEOUT_MS = 2000;
 // RFC-040 Operator Multi-Project — Slice 5 (C5), S358/S361: cwd-aware
 // resolution (walks up for the .orchestrator sentinel) replaces the
 // __dirname-hardcoded path. `null` means an unregistered cwd — deliberately
@@ -208,7 +207,8 @@ function readBacklogFallback(): BacklogSummary {
       nextLine
         ?.replace(/.*\*\*(proximo passo|next):?\*\*:?\s*/i, '')
         .replace(/\s*$/, '')
-        .slice(0, 120) || 'see BACKLOG.md';
+        .slice(0, 120) ||
+      'BACKLOG.md has no next-step line (legacy parser; see project-guidelines/project-state.yaml)';
 
     log(
       HOOK,
@@ -217,7 +217,12 @@ function readBacklogFallback(): BacklogSummary {
     return { version, next, status, lastSession };
   } catch (err) {
     log(HOOK, `BACKLOG read failed: ${err}`);
-    return { version: 'v?.?.?', next: 'see BACKLOG.md', status: '', lastSession: '' };
+    return {
+      version: 'v?.?.?',
+      next: 'no session state (project-guidelines/project-state.yaml missing or invalid, BACKLOG.md unreadable)',
+      status: '',
+      lastSession: '',
+    };
   }
 }
 
@@ -371,9 +376,9 @@ export function formatProjectBindingSegment(binding: SessionProjectBinding): str
  * registered project this session belongs to, listing every registered
  * project by name/id/rootPath.
  *
- * Fail-open (Class C benign degrade, mirrors buildCapabilityMatrixContext
- * / getGraphContext): returns "" on any error — a failed project-list
- * fetch must never block or crash the hook.
+ * Fail-open (Class C benign degrade, mirrors buildCapabilityMatrixContext):
+ * returns "" on any error — a failed project-list fetch must never block
+ * or crash the hook.
  */
 export async function buildProjectSelectionPrompt(): Promise<string> {
   try {
@@ -504,66 +509,6 @@ function checkSprintInbox(): string {
   }
 }
 
-// ─── Graph Context (RFC-021 T-G4-06) ──────────────────────────────────────────
-
-type GraphFetcher = (path: string, token: string, timeoutMs?: number) => Promise<unknown>;
-
-interface GraphStatsResponse {
-  nodeCount?: number;
-  edgeCount?: number;
-  hotPaths?: string[];
-}
-
-interface AtRiskResponse {
-  atRisk?: string[];
-}
-
-/**
- * Fetch graph stats and at-risk components from the GraphRAG API.
- * Uses Promise.all for parallel calls with a 2s AbortController timeout.
- * Fail-open: returns "" on any error so session-start never blocks.
- *
- * @param token - JWT token (null → skip API calls, return "")
- * @param fetcher - injectable fetch function (default: real HTTP via api-client pattern)
- */
-export async function getGraphContext(
-  token: string | null,
-  fetcher?: GraphFetcher
-): Promise<string> {
-  if (token === null || token === '') return '';
-
-  const defaultFetcher: GraphFetcher = async (path, tok, timeoutMs = GRAPHRAG_TIMEOUT_MS) => {
-    const resp = await fetch(`http://localhost:3000${path}`, {
-      headers: { Authorization: `Bearer ${tok}` },
-      signal: AbortSignal.timeout(timeoutMs),
-    });
-    if (!resp.ok) return null;
-    return resp.json() as Promise<unknown>;
-  };
-
-  const fetch_ = fetcher ?? defaultFetcher;
-
-  try {
-    const [statsRaw, atRiskRaw] = await Promise.all([
-      fetch_('/api/v1/graphrag/stats', token, GRAPHRAG_TIMEOUT_MS),
-      fetch_('/api/v1/graphrag/at-risk', token, GRAPHRAG_TIMEOUT_MS),
-    ]);
-
-    const stats = statsRaw as GraphStatsResponse | null;
-    if (stats?.nodeCount === undefined) return '';
-
-    const atRiskData = atRiskRaw as AtRiskResponse | null;
-    const components = String(stats.nodeCount);
-    const edges = String(stats.edgeCount ?? 0);
-    const hotPaths = (stats.hotPaths ?? []).join(',');
-    const atRisk = (atRiskData?.atRisk ?? []).join(',');
-
-    return `[GRAPH-CONTEXT] components=${components} edges=${edges} hot_paths=[${hotPaths}] at_risk=[${atRisk}]`;
-  } catch {
-    return '';
-  }
-}
-
 async function main(): Promise<void> {
   log(HOOK, 'SessionStart hook triggered');
 
@@ -586,15 +531,15 @@ async function main(): Promise<void> {
   // Sprint inbox check (RFC-027 S4 — only for sprint panes)
   const sprintInboxContext = checkSprintInbox();
 
-  // Graph context (RFC-021 T-G4-06) — fail-open, 2s timeout. RFC-040 TD-206
-  // (S372): this getToken() call MUST stay HERE, before
+  // RFC-040 TD-206 (S372): this getToken() call MUST stay HERE, before
   // resolveSessionProjectBinding() below — it is what bootstraps the
   // cwd-hint tier (getToken -> ensureProjectIdResolved ->
   // getEffectiveProjectId() reads the resolved value just below). Moving
   // getActiveWorkflow()/getNextAction() later (see below) must not remove
   // this bootstrap, or the cwd-hint tier would regress to reading '' .
-  const token = await getToken();
-  const graphContext = await getGraphContext(token);
+  // Return value no longer consumed directly (TD-211 F9 — getGraphContext,
+  // its sole prior consumer, was removed along with the graph-context surface).
+  await getToken();
 
   // RFC-040 TD-204 ⑤-C: read a previously-persisted selection for THIS
   // sessionId — feature-flagged (default OFF, kill-switch). With the flag
@@ -670,7 +615,6 @@ async function main(): Promise<void> {
         'Do NOT invoke /orchestrator skill for the greeting — use AskUserQuestion directly.',
         'Invoke /orchestrator skill only when the user chooses to start a workflow.',
         capabilityContext,
-        graphContext,
         sprintInboxContext,
         projectSelectionPrompt,
       ]
@@ -696,7 +640,6 @@ async function main(): Promise<void> {
       'Do NOT invoke /orchestrator skill for the greeting — use AskUserQuestion directly.',
       'Invoke /orchestrator skill when the user chooses to continue the workflow.',
       capabilityContext,
-      graphContext,
       projectSelectionPrompt,
     ]
       .filter(Boolean)

package/hooks/subagent-stop.mjs

@@ -7595,16 +7595,6 @@ function getField(obj, path) {
   }
   return current != null ? String(current) : "";
 }
-function outputContext(hookEvent, context) {
-  console.log(
-    JSON.stringify({
-      hookSpecificOutput: {
-        hookEventName: hookEvent,
-        additionalContext: context
-      }
-    })
-  );
-}
 
 // hooks/lib/git-checkpoint.ts
 import { execSync } from "node:child_process";
@@ -7766,14 +7756,6 @@ async function main() {
     );
   }
   const commitHash = await createCheckpointIfNeeded(workflow.id, workflow.currentPhase);
-  const parts = [
-    `[ORCHESTRATOR] Agent '${agentType}' completed for workflow ${workflow.id}.`
-  ];
-  if (commitHash) {
-    parts.push(`Checkpoint: ${commitHash}.`);
-  }
-  parts.push("Proceed to gate check via AskUserQuestion before advancing phase.");
-  outputContext("SubagentStop", parts.join(" "));
   try {
     const sessionId = getField(stdin, "session_id") || getField(stdin, "claude_session_id") || "";
     const memoryBaseDir = resolveAgentMemoryBaseDir(process.cwd());

package/hooks/subagent-stop.ts

@@ -13,7 +13,6 @@ import {
   readStdin,
   getField,
   getActiveWorkflow,
-  outputContext,
   readInvocationState,
   consumeInvocationState,
   completeAgentInvocation,
@@ -82,18 +81,35 @@ async function main(): Promise<void> {
   // 2. Git checkpoint if phase changed
   const commitHash = await createCheckpointIfNeeded(workflow.id, workflow.currentPhase);
 
-  // 3. Guide main conversation — NO ping-pong, main IS the orchestrator
-  const parts: string[] = [
-    `[ORCHESTRATOR] Agent '${agentType}' completed for workflow ${workflow.id}.`,
-  ];
-
-  if (commitHash) {
-    parts.push(`Checkpoint: ${commitHash}.`);
-  }
-
-  parts.push('Proceed to gate check via AskUserQuestion before advancing phase.');
-
-  outputContext('SubagentStop', parts.join(' '));
+  // 3. NO context emission on SubagentStop — see below.
+  //
+  // This block used to call outputContext('SubagentStop', "[ORCHESTRATOR] Agent 'X'
+  // completed... Proceed to gate check via AskUserQuestion before advancing phase.").
+  // The intent was to guide the MAIN conversation (RFC-022: main IS the orchestrator).
+  // That intent is UNREACHABLE from this event, and the attempt was actively harmful:
+  //
+  //   outputContext() emits hookSpecificOutput.additionalContext. On SubagentStop that
+  //   context is injected into the SUB-AGENT's turn, not the orchestrator's — so the
+  //   sub-agent was handed an orchestrator-addressed instruction naming a tool it does
+  //   not have (AskUserQuestion). It cannot comply and cannot decline; it replies, stops
+  //   again, the hook re-fires with the identical message, and the cycle repeats.
+  //
+  // MEASURED (S400, .orchestrator/.state/hook-debug.log): exactly 9 re-fires per dispatch,
+  // for `specifier`, `planner` AND — in logs predating this session — `implementer`. The
+  // sub-agent's final report is consumed by the loop (the orchestrator receives only the
+  // agent handle), while the real work survives because it lands via artifactStore.
+  // The planner of workflow 8f149ec6 self-reported the loop from inside it.
+  //
+  // Do NOT reintroduce an additionalContext emission here. Any payload on this event
+  // re-prompts the sub-agent — the defect is the emission itself, not its wording.
+  // The orchestrator already receives the sub-agent's result directly and owns the gate
+  // check unconditionally (orchestrator Skin, MUST #2). The RFC-034 post-implement signal
+  // is unaffected: it lives in post-implement.ts on PostToolUse[advancePhase], which fires
+  // in the MAIN conversation's context, where additionalContext is the correct mechanism.
+  //
+  // The side effects above (invocation-completion safety net, git checkpoint) and the
+  // observation below are unaffected — they are writes, not context injection.
+  // (commitHash is still consumed by the observation payload below.)
 
   // 4. Write Tier B observation (fail-open)
   try {

package/hooks/verification-before-completion.mjs

@@ -0,0 +1,105 @@
+import { createRequire as __createRequireShim } from 'node:module'; const require = __createRequireShim(import.meta.url);
+
+// hooks/lib/api-client.ts
+import { readFileSync, writeFileSync, mkdirSync, statSync, unlinkSync, readdirSync } from "node:fs";
+import { join, dirname } from "node:path";
+import { fileURLToPath } from "node:url";
+var __filename = fileURLToPath(import.meta.url);
+var __dirname = dirname(__filename);
+var PROJECT_ROOT = join(__dirname, "..", "..", "..");
+var STATE_DIR = join(PROJECT_ROOT, ".orchestrator", ".state");
+var JWT_CACHE = join(STATE_DIR, "jwt-token");
+var DEBUG_LOG = join(STATE_DIR, "hook-debug.log");
+mkdirSync(STATE_DIR, { recursive: true });
+var API_URL = process.env.ORCHESTRATOR_API_URL || "http://localhost:3001";
+var AUTH_EMAIL = process.env.ORCHESTRATOR_ADMIN_EMAIL || process.env.ORCHESTRATOR_AUTH_EMAIL || "system@orchestrator.local";
+var AUTH_PASSWORD = process.env.ORCHESTRATOR_ADMIN_PASSWORD || process.env.ORCHESTRATOR_AUTH_PASSWORD || "system123";
+var PROJECT_ID = process.env.ORCHESTRATOR_PROJECT_ID || "";
+function log(prefix, msg) {
+  const ts = (/* @__PURE__ */ new Date()).toISOString().replace(/\.\d+Z$/, "Z");
+  try {
+    const line = `[${ts}] ${prefix}: ${msg}
+`;
+    writeFileSync(DEBUG_LOG, line, { flag: "a" });
+  } catch {
+  }
+}
+var LAST_COMPLETED_FILE = join(STATE_DIR, "last-completed-workflow.json");
+var LAST_COMPLETED_TTL_MS = 60 * 60 * 1e3;
+var INVOCATIONS_DIR = join(STATE_DIR, "invocations");
+var INVOCATION_STATE_TTL_MS = 4 * 60 * 60 * 1e3;
+var DISPATCH_INTENT_DIR = join(STATE_DIR, "dispatch-intent");
+async function readStdin() {
+  const chunks = [];
+  for await (const chunk of process.stdin) {
+    chunks.push(chunk);
+  }
+  const raw = Buffer.concat(chunks).toString("utf-8").trim();
+  if (!raw) return {};
+  try {
+    return JSON.parse(raw);
+  } catch {
+    return {};
+  }
+}
+function getField(obj, path) {
+  const parts = path.split(".");
+  let current = obj;
+  for (const part of parts) {
+    if (current == null || typeof current !== "object") return "";
+    current = current[part];
+  }
+  return current != null ? String(current) : "";
+}
+function outputPreToolUse(opts) {
+  const output = {
+    hookSpecificOutput: {
+      hookEventName: "PreToolUse",
+      permissionDecision: opts.decision,
+      ...opts.reason && { permissionDecisionReason: opts.reason },
+      ...opts.context && { additionalContext: opts.context }
+    }
+  };
+  console.log(JSON.stringify(output));
+}
+
+// hooks/verification-before-completion.ts
+var HOOK = "VERIFICATION-REMINDER";
+var defaultDeps = {
+  readStdin,
+  output: outputPreToolUse,
+  log
+};
+function commandMatchesGitOp(command) {
+  return /git\s+(commit|push)/.test(command);
+}
+async function mainWithDeps(deps) {
+  const { readStdin: readStdin2, output, log: log2 } = deps;
+  const stdin = await readStdin2();
+  const command = getField(stdin, "tool_input.command") || getField(stdin, "command") || "";
+  if (!commandMatchesGitOp(command)) {
+    log2(HOOK, `PASS (no git op): ${command.slice(0, 60)}`);
+    return;
+  }
+  log2(HOOK, `REMIND git op detected: ${command.slice(0, 80)}`);
+  output({
+    decision: "allow",
+    context: [
+      "[VERIFICATION-REMINDER] You are about to run a git commit/push.",
+      "Before proceeding, confirm:",
+      "  1. Tests pass \u2014 run the test command and paste the output.",
+      "  2. Lint clean \u2014 run the lint command and confirm 0 errors.",
+      "  3. Build succeeds \u2014 run the build command and confirm exit 0.",
+      "  4. All acceptance criteria have matching test evidence.",
+      "Evidence before claims. No shortcuts for verification."
+    ].join("\n")
+  });
+}
+async function main() {
+  await mainWithDeps(defaultDeps);
+}
+main().catch(() => process.exit(0));
+export {
+  commandMatchesGitOp,
+  mainWithDeps
+};

package/hooks/verification-before-completion.ts

@@ -0,0 +1,97 @@
+/**
+ * verification-before-completion.ts — PreToolUse[Bash] hook
+ *
+ * Injects a verification reminder when the model is about to run
+ * `git commit` or `git push`. Does NOT block — only adds context.
+ *
+ * Principle: Evidence before claims, always.
+ * Source: verification-before-completion skill (superpowers 5.0.7)
+ *
+ * Flow:
+ *   1. readStdin() → extract bash command
+ *   2. commandMatchesGitOp() → check for commit/push
+ *   3. If match → output allow + context reminder
+ *   4. If no match → silent pass-through (no output)
+ */
+
+import { log, readStdin, getField, outputPreToolUse } from './lib/api-client.js';
+
+const HOOK = 'VERIFICATION-REMINDER';
+
+// ─────────────────────────────────────────────────────────────
+// Dependency injection interface (enables testing without IO)
+// ─────────────────────────────────────────────────────────────
+
+export interface HookDeps {
+  readStdin: () => Promise<Record<string, unknown>>;
+  output: (opts: { decision: 'allow' | 'deny'; reason?: string; context?: string }) => void;
+  log: (prefix: string, msg: string) => void;
+}
+
+const defaultDeps: HookDeps = {
+  readStdin,
+  output: outputPreToolUse,
+  log,
+};
+
+// ─────────────────────────────────────────────────────────────
+// Pure helpers (exported for testing)
+// ─────────────────────────────────────────────────────────────
+
+/**
+ * Returns true when the bash command string contains a git commit or git push
+ * operation. Handles common variations: `git commit`, `git push`, multi-command
+ * pipelines (`&&`, `;`), and quoted forms.
+ */
+export function commandMatchesGitOp(command: string): boolean {
+  return /git\s+(commit|push)/.test(command);
+}
+
+// ─────────────────────────────────────────────────────────────
+// Core logic (exported for testing)
+// ─────────────────────────────────────────────────────────────
+
+export async function mainWithDeps(deps: HookDeps): Promise<void> {
+  const { readStdin, output, log } = deps;
+
+  const stdin = await readStdin();
+
+  // Extract the bash command from the tool input envelope
+  const command =
+    (getField(stdin, 'tool_input.command') as string | undefined) ||
+    (getField(stdin, 'command') as string | undefined) ||
+    '';
+
+  if (!commandMatchesGitOp(command)) {
+    // Silent pass-through — not a git commit/push, nothing to do
+    log(HOOK, `PASS (no git op): ${command.slice(0, 60)}`);
+    return;
+  }
+
+  log(HOOK, `REMIND git op detected: ${command.slice(0, 80)}`);
+
+  // Allow the command but inject a verification reminder as context.
+  // This hook NEVER blocks — it only nudges the model to verify first.
+  output({
+    decision: 'allow',
+    context: [
+      '[VERIFICATION-REMINDER] You are about to run a git commit/push.',
+      'Before proceeding, confirm:',
+      '  1. Tests pass — run the test command and paste the output.',
+      '  2. Lint clean — run the lint command and confirm 0 errors.',
+      '  3. Build succeeds — run the build command and confirm exit 0.',
+      '  4. All acceptance criteria have matching test evidence.',
+      'Evidence before claims. No shortcuts for verification.',
+    ].join('\n'),
+  });
+}
+
+// ─────────────────────────────────────────────────────────────
+// Entry point (production use)
+// ─────────────────────────────────────────────────────────────
+
+async function main(): Promise<void> {
+  await mainWithDeps(defaultDeps);
+}
+
+main().catch(() => process.exit(0));

package/hooks-settings-template.json

@@ -17,23 +17,38 @@
     ],
     "PreToolUse": [
       {
-        "matcher": "mcp__orchestrator-tools__advancePhase",
+        "matcher": "mcp__(plugin_orchestrator_)?orchestrator-tools__advancePhase",
         "hooks": [{ "type": "command", "command": "hooks/gate-guardian.mjs", "timeout": 15000 }]
       },
       {
         "matcher": "Write|Edit",
         "hooks": [{ "type": "command", "command": "hooks/workflow-guard.mjs", "timeout": 10000 }]
+      },
+      {
+        "matcher": "Bash",
+        "hooks": [
+          { "type": "command", "command": "hooks/verification-before-completion.mjs", "timeout": 5000 },
+          { "type": "command", "command": "hooks/agent-git-guard.mjs", "timeout": 5000 }
+        ]
+      },
+      {
+        "matcher": "Agent",
+        "hooks": [{ "type": "command", "command": "hooks/pre-agent-dispatch.mjs", "timeout": 5000 }]
+      },
+      {
+        "matcher": "mcp__plugin_playwright_playwright__browser_take_screenshot|mcp__plugin_playwright_playwright__browser_pdf_save",
+        "hooks": [{ "type": "command", "command": "hooks/playwright-output-guard.mjs", "timeout": 5000 }]
       }
     ],
     "SubagentStart": [
       {
-        "matcher": "implementer|specifier|planner|task-generator|reviewer|researcher",
+        "matcher": "(orchestrator:)?(implementer|specifier|planner|task-generator|reviewer|researcher)",
         "hooks": [{ "type": "command", "command": "hooks/subagent-start.mjs", "timeout": 10000 }]
       }
     ],
     "SubagentStop": [
       {
-        "matcher": "implementer|specifier|planner|task-generator|reviewer|researcher",
+        "matcher": "(orchestrator:)?(implementer|specifier|planner|task-generator|reviewer|researcher)",
         "hooks": [{ "type": "command", "command": "hooks/subagent-stop.mjs", "timeout": 30000 }]
       }
     ],
@@ -49,7 +64,7 @@
         "hooks": [{ "type": "command", "command": "hooks/mailbox-listener.mjs", "timeout": 5000 }]
       },
       {
-        "matcher": "mcp__orchestrator-tools__advancePhase",
+        "matcher": "mcp__(plugin_orchestrator_)?orchestrator-tools__advancePhase",
         "hooks": [{ "type": "command", "command": "hooks/post-implement.mjs", "timeout": 15000 }]
       }
     ],