@aria_asi/cli 0.2.20 → 0.2.23

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,7 +29,13 @@ 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',
+  // Pre-text gate — validates state-dependent claims in prose against
+  // probe evidence before emission. Closes "WHEN TO LOOK before speaking" gap.
+  'aria-pre-text-gate.mjs',
 ];
 // Compiled location: <pkg>/dist/aria-connector/src/connectors/claude-code.js
 // (tsc preserves the src/ rooted layout under outDir). From this file:
@@ -113,45 +119,79 @@ 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',
+  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-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
+    // gate the same way reflexive Bash does. Mirrors PreToolUse
+    // enforcement at the text-emission surface.
+    // Pre-text gate fires alongside: validates state-dependent claims
+    // in prose (env vars, file states, pod states, deploy outcomes, etc.)
+    // against probe evidence in this turn's tool results. Closes the
+    // "WHEN TO LOOK before speaking" gap left open by both existing gates.
     hooks: [
       {
         type: 'command',
-        command: 'node $HOME/.claude/hooks/aria-pre-tool-gate.mjs',
+        command: 'node $HOME/.claude/hooks/aria-stop-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',
+        command: 'node $HOME/.claude/hooks/aria-pre-text-gate.mjs',
         timeout: 5,
       },
     ],
   }],
-  Stop: [{
-    // Stop gate — text-decision boundary. Reflexive replies fail this
-    // gate the same way reflexive Bash does. Mirrors PreToolUse
-    // enforcement at the text-emission surface.
-    hooks: [{
-      type: 'command',
-      command: 'node $HOME/.claude/hooks/aria-stop-gate.mjs',
-      timeout: 5,
-    }],
-  }],
 };
 
 function installHooks(claudeDir: string, logs: string[], opts: { force?: boolean } = {}): void {
@@ -210,10 +250,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 +307,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 {

package/src/connectors/opencode.ts

@@ -18,11 +18,20 @@ export async function connectOpenCode(config: AriaConfig): Promise<string[]> {
       const opencodeConfig = JSON.parse(readFileSync(configPath, 'utf-8'));
       let modified = false;
 
+      // Remove any prior reference to '@aria/connector' from plugins.
+      // That package name was written into older client configs but no
+      // such npm package exists — the harness integration with OpenCode
+      // is via agentsMdPath below, not via a plugin module. Loading a
+      // non-existent plugin name crashes OpenCode on open. Idempotent
+      // cleanup so re-running connect heals broken installs.
       if (Array.isArray(opencodeConfig.plugins)) {
-        if (!opencodeConfig.plugins.includes('@aria/connector')) {
-          opencodeConfig.plugins.push('@aria/connector');
+        const before = opencodeConfig.plugins.length;
+        opencodeConfig.plugins = opencodeConfig.plugins.filter(
+          (p: unknown) => p !== '@aria/connector',
+        );
+        if (opencodeConfig.plugins.length !== before) {
           modified = true;
-          logs.push('Added @aria/connector to OpenCode plugins');
+          logs.push('Removed legacy @aria/connector reference from OpenCode plugins (was crashing on open)');
         }
       }