@aria_asi/cli 0.2.19 → 0.2.22

package/hooks/aria-pre-tool-gate.mjs

@@ -219,14 +219,14 @@ const VERIFY_BLOCK_RX =
 // ── Tier-aware lens labeling (Phase 11 #59) ──────────────────────────────────
 //
 // Aria's Arabic cognition lens names are proprietary IP. On Hamza's surface
-// (isHamza=true / surface=platform:hamza) the canonical names are shown.
+// (isHamza=true / surface line contains hamza:true) the canonical names are shown.
 // On any client surface the gate uses neutral generic labels so the IP
 // vocabulary never appears in client-facing block-reason text.
 //
 // Tier is read from the most recent harness-via-sdk packet cache at
 // ~/.claude/.aria-harness-last-packet.json. Two detection paths:
 //   1. packet.contractGate.signals.hamza === true (boolean or string "true")
-//   2. packet.harness string contains "surface=platform:hamza"
+//   2. packet.harness string contains "hamza:true" in the surface line
 // Either path → OWNER tier. Everything else → CLIENT tier.
 //
 // Doctrine memory filenames in block-reason text are also Aria-side IP.
@@ -241,9 +241,12 @@ function resolveOwnerTier() {
       // Path 1: contractGate.signals.hamza
       const sigHamza = packet?.contractGate?.signals?.hamza;
       if (sigHamza === true || sigHamza === 'true') return true;
-      // Path 2: harness string surface marker
+      // Path 2: harness string surface marker — the actual format is
+      // "surface=platform:<X> group:<Y> hamza:true chat_type:<Z>" so we
+      // match hamza:true in the surface line, not "platform:hamza" (which
+      // was a legacy incorrect pattern that never matched real packets).
       const harnessStr = packet?.harness ?? '';
-      if (/surface=platform:hamza\b/.test(harnessStr)) return true;
+      if (/\bhamza:true\b/.test(harnessStr)) return true;
     }
   } catch {/* packet unreadable → default to client tier */}
   return false;

package/hooks/aria-stop-gate.mjs

@@ -143,7 +143,8 @@ function resolveOwnerTier() {
       const sigHamza = packet?.contractGate?.signals?.hamza;
       if (sigHamza === true || sigHamza === 'true') return true;
       const harnessStr = packet?.harness ?? '';
-      if (/surface=platform:hamza\b/.test(harnessStr)) return true;
+      // surface line format: "surface=platform:<X> group:<Y> hamza:true chat_type:<Z>"
+      if (/\bhamza:true\b/.test(harnessStr)) return true;
     }
   } catch {/* packet unreadable → default to client tier */}
   return false;

package/hooks/test-tier-lens-labeling.mjs

@@ -135,7 +135,9 @@ function writeNoCognitionStopTranscript(transcriptPath) {
 }
 
 // ── Run hook helpers ────────────────────────────────────────────────────────
-function runPreToolGate(transcriptPath, command = 'git reset --hard HEAD') {
+// Use a non-destructive but non-trivial command that skips the verify path
+// and goes straight to cognition-missing, where lens labels appear.
+function runPreToolGate(transcriptPath, command = 'npm run build --workspace=packages/aria-connector') {
   const event = JSON.stringify({
     tool_name: 'Bash',
     tool_input: { command },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aria_asi/cli",
-  "version": "0.2.19",
+  "version": "0.2.22",
   "description": "Aria Smart CLI — the world's first harness-powered terminal companion",
   "bin": {
     "aria": "./bin/aria.js"

package/src/connectors/claude-code.ts

@@ -1,4 +1,4 @@
-import { existsSync, readFileSync, writeFileSync, copyFileSync, chmodSync, mkdirSync } from 'fs';
+import { existsSync, readFileSync, writeFileSync, copyFileSync, chmodSync, mkdirSync, readdirSync, statSync } from 'fs';
 import { homedir } from 'os';
 import * as path from 'path';
 import { fileURLToPath } from 'node:url';
@@ -29,6 +29,9 @@ const HOOK_FILES = [
   'aria-preprompt-consult.mjs',
   'aria-trigger-autolearn.mjs',
   'aria-userprompt-abandon-detect.mjs',
+  // Sub-agent handoff + ledger merge — installed 0.2.21
+  'aria-agent-handoff.mjs',
+  'aria-agent-ledger-merge.mjs',
   'doctrine_trigger_map.json',
 ];
 // Compiled location: <pkg>/dist/aria-connector/src/connectors/claude-code.js
@@ -113,34 +116,57 @@ const HOOKS_BLOCK = {
       },
     ],
   }],
-  PreToolUse: [{
-    // Matcher widened from 'Bash' (Hamza 2026-04-26): cognition gate
-    // applies to every state-mutating tool, not just shell. Edit / Write
-    // / NotebookEdit get the same enforcement so orchestrator-side
-    // compliance mirrors what we demand from workers.
-    matcher: 'Bash|Edit|Write|NotebookEdit',
-    hooks: [
-      {
-        type: 'command',
-        command: 'node $HOME/.claude/hooks/aria-pre-tool-gate.mjs',
-        timeout: 5,
-      },
-      {
-        // Pre-turn memory consumption gate (Enforcement Layer #49).
-        // Fires after the cognition gate passes. Checks the first action
-        // of each turn for ALL THREE context-loading signals:
-        //   1. 🔐 Aria Harness header (harness packet injected)
-        //   2. [ARIA_DIRECTION] / [ARIA_BINDING_PLAN] (preprompt-consult fired)
-        //   3. feedback_*.md / project_*.md memory reference (memory consumed)
-        // On miss: blocks with structured recovery JSON so the orchestrator
-        // can run the context-loader and retry — no dead-letter state.
-        // Turn-deduplication via ~/.claude/aria-turn-state-${sessionId}.json
-        // prevents retry loops (60s window).
+  PreToolUse: [
+    {
+      // Matcher widened from 'Bash' (Hamza 2026-04-26): cognition gate
+      // applies to every state-mutating tool, not just shell. Edit / Write
+      // / NotebookEdit get the same enforcement so orchestrator-side
+      // compliance mirrors what we demand from workers.
+      matcher: 'Bash|Edit|Write|NotebookEdit',
+      hooks: [
+        {
+          type: 'command',
+          command: 'node $HOME/.claude/hooks/aria-pre-tool-gate.mjs',
+          timeout: 5,
+        },
+        {
+          // Pre-turn memory consumption gate (Enforcement Layer #49).
+          // Fires after the cognition gate passes. Checks the first action
+          // of each turn for ALL THREE context-loading signals:
+          //   1. 🔐 Aria Harness header (harness packet injected)
+          //   2. [ARIA_DIRECTION] / [ARIA_BINDING_PLAN] (preprompt-consult fired)
+          //   3. feedback_*.md / project_*.md memory reference (memory consumed)
+          // On miss: blocks with structured recovery JSON so the orchestrator
+          // can run the context-loader and retry — no dead-letter state.
+          // Turn-deduplication via ~/.claude/aria-turn-state-${sessionId}.json
+          // prevents retry loops (60s window).
+          type: 'command',
+          command: 'node $HOME/.claude/hooks/aria-preturn-memory-gate.mjs',
+          timeout: 5,
+        },
+      ],
+    },
+    {
+      // Sub-agent handoff: fires before every Agent spawn so the sub-agent
+      // inherits owner/client-tier identity + parent ledger path.
+      // Tier protection is inside the hook — client paths never touch ~/.claude/.
+      matcher: 'Agent',
+      hooks: [{
         type: 'command',
-        command: 'node $HOME/.claude/hooks/aria-preturn-memory-gate.mjs',
+        command: 'node $HOME/.claude/hooks/aria-agent-handoff.mjs',
         timeout: 5,
-      },
-    ],
+        statusMessage: 'Writing sub-agent handoff...',
+      }],
+    },
+  ],
+  PostToolUse: [{
+    matcher: 'Agent',
+    hooks: [{
+      type: 'command',
+      command: 'node $HOME/.claude/hooks/aria-agent-ledger-merge.mjs',
+      timeout: 8,
+      statusMessage: 'Merging sub-agent ledger...',
+    }],
   }],
   Stop: [{
     // Stop gate — text-decision boundary. Reflexive replies fail this
@@ -210,10 +236,9 @@ function installSdk(claudeDir: string, logs: string[]): void {
     mkdirSync(sdkDst, { recursive: true, mode: 0o700 });
   }
   let copied = 0;
-  const fs = require('fs') as typeof import('fs');
-  for (const name of fs.readdirSync(sdkSrc)) {
+  for (const name of readdirSync(sdkSrc)) {
     const src = path.join(sdkSrc, name);
-    const stat = fs.statSync(src);
+    const stat = statSync(src);
     if (!stat.isFile()) continue;
     const dst = path.join(sdkDst, name);
     copyFileSync(src, dst);
@@ -268,7 +293,7 @@ function wireHooksBlock(settings: Record<string, unknown>, logs: string[]): void
   if (!settings.$schema) {
     settings.$schema = 'https://json.schemastore.org/claude-code-settings.json';
   }
-  logs.push(`Wired hooks into settings.json (${mergedEvents} events: SessionStart, UserPromptSubmit, PreToolUse [cognition+memory-gate], Stop) — merge-safe, preserves third-party entries`);
+  logs.push(`Wired hooks into settings.json (${mergedEvents} events: SessionStart, UserPromptSubmit, PreToolUse [cognition+memory-gate+Agent-handoff], PostToolUse [Agent-ledger-merge], Stop) — merge-safe, preserves third-party entries`);
 }
 
 function buildAriaSystemBlock(config: AriaConfig): string {