@aria_asi/cli 0.2.40 → 0.2.41

package/src/chat.ts

@@ -4,7 +4,8 @@ import type { AriaConfig, ModelConfig } from './config.js';
 import type { ProviderName, Message, ChatOptions, ChatResult } from './providers/types.js';
 import { loadPersona, buildPersonaBlock } from './persona.js';
 import type { PersonaContext } from './persona.js';
-import { fetchHarness, combineHarnessContext, checkHarnessHealth, validateOutput, getRecentTurns } from './harness-client.js';
+import { fetchHarness, combineHarnessContext, checkHarnessHealth, getRecentTurns } from './harness-client.js';
+import { GovernedSurfaceRunner } from './governed-surface-runner.js';
 import { gardenTurnCycle } from './garden-control-plane.js';
 import {
   emitRuntimeProofMetric,
@@ -168,8 +169,10 @@ export class AriaChat {
       //   warn  — show response + surface violations to user
       //   block — surface violations + use rewritten response if provided
       // Recorded to garden as gateViolations for evolution-engine signal.
-      const gateVerdict = await validateOutput({
+      const outputRunner = new GovernedSurfaceRunner({ sessionId: this.sessionId });
+      const gateVerdict = await outputRunner.validateOutput({
         text: ariaResponse,
+        surfaceId: 'aria-chat',
         sessionId: this.sessionId,
       });
 
@@ -181,10 +184,6 @@ export class AriaChat {
           (violations ? `\n    violations: ${violations}` : '') +
           '\n',
         );
-        if (gateVerdict.severity === 'block' && gateVerdict.rewritten) {
-          process.stdout.write(`    rewritten: ${gateVerdict.rewritten}\n`);
-          displayResponse = gateVerdict.rewritten;
-        }
       }
 
       const runtimeProof = await enrichRuntimeProof(

package/src/codebase-scanner.ts

@@ -19,4 +19,6 @@ export type {
   WatchHandle,
   WatchOptions,
   WatchMode,
+  WatchChangeMetadata,
+  WatchChange,
 } from '../../aria-web/src/lib/codebase-scanner.js';

package/src/connectors/claude-code.ts

@@ -2,10 +2,12 @@ import { existsSync, readFileSync, writeFileSync, copyFileSync, chmodSync, mkdir
 import { homedir } from 'os';
 import * as path from 'path';
 import { fileURLToPath } from 'node:url';
+import { spawnSync } from 'node:child_process';
 import type { AriaConfig } from '../config.js';
 import { syncDoctrineTriggerMap } from './doctrine-trigger-map.js';
 import { buildMustReadGuide } from './must-read.js';
 import { connectShell } from './shell.js';
+import { requireGovernedConnectorMutation } from './governed-adapter.js';
 
 // ── Hooks shipped with this package ──────────────────────────────────
 // The connector installs these into ~/.claude/hooks/ so Claude Code's
@@ -25,6 +27,15 @@ import { connectShell } from './shell.js';
 // Replaces the duplicate src/install-hooks.ts I had built in parallel
 // — one canonical install path now.
 const HOOK_FILES = [
+  // Pre-emit substrate autoload (AI-11803-LOOP1, 2026-05-12). Reads
+  // per-turn user prompt, classifies required skills, recursively
+  // cascades through each loaded skill body's Load First / Mode
+  // Selection / Load Order / Ta'aqqul Autofire Pattern sections, and
+  // injects all collected skill bodies as UserPromptSubmit
+  // additionalContext BEFORE the harness packet binds. Depends on
+  // lib/skill-autoload-gate-impl.mjs (cascade parser) + lib/aria-gate-ledger.mjs.
+  'aria-universal-turn-packet.mjs',
+  'aria-pre-emit-autoload.mjs',
   'aria-harness-via-sdk.mjs',
   'aria-pre-tool-gate.mjs',
   'aria-preturn-memory-gate.mjs',
@@ -111,6 +122,28 @@ const HOOKS_BLOCK = {
   }],
   UserPromptSubmit: [{
     hooks: [
+      {
+        type: 'command',
+        command: 'ARIA_SURFACE_ID=claude-code HOOK_EVENT_NAME=UserPromptSubmit node $HOME/.claude/hooks/aria-universal-turn-packet.mjs',
+        timeout: 8,
+        statusMessage: 'Building Aria universal turn packet...',
+      },
+      {
+        // Pre-emit substrate autoload (AI-11803-LOOP1, 2026-05-12). Runs
+        // FIRST in the UserPromptSubmit chain so the cascade-loaded skill
+        // bodies are present in additionalContext before the harness
+        // packet binds at hook 2. Reads the prompt, classifies required
+        // skills via keyword + baseline (aria-cognition-autofire), then
+        // cascades through each loaded body's Load First / Mode Selection
+        // / Load Order / Ta'aqqul Autofire Pattern sections (BFS, cycle-
+        // safe, byte-capped at 25KB). Failure is non-blocking — emits a
+        // skip envelope so the rest of the chain still fires. Timeout 6s
+        // covers cold-cache cascades that read 8-15 skill bodies.
+        type: 'command',
+        command: 'node $HOME/.claude/hooks/aria-pre-emit-autoload.mjs',
+        timeout: 6,
+        statusMessage: 'Loading skill substrate (cascade)...',
+      },
       {
         type: 'command',
         command: 'HOOK_EVENT_NAME=UserPromptSubmit node $HOME/.claude/hooks/aria-harness-via-sdk.mjs --mode turn',
@@ -247,6 +280,20 @@ const HOOKS_BLOCK = {
           command: 'node $HOME/.claude/hooks/aria-outcome-record.mjs',
           timeout: 3,
         },
+        {
+          // AI-11803-IMPORT-RESOLUTION-WIRE (2026-05-12) — informational
+          // PostToolUse scan. Catches the consciousness.ts-class bug at the
+          // edit surface: an import resolves to a file that compiles under
+          // tsc but exports nothing the importer asked for. Hook exits 0
+          // (advisory) so the model sees the violation message in the next
+          // turn's context without blocking the tool pipeline. Pre-deploy
+          // mode is the structural enforcer (exit 13 in deploy-service.sh).
+          // Timeout 8s — scan-time grows with file size + import count;
+          // generous-but-bounded to avoid bricking PostToolUse on slow scans.
+          type: 'command',
+          command: 'node $HOME/.claude/hooks/aria-import-resolution-gate.mjs',
+          timeout: 8,
+        },
         {
           type: 'command',
           command: 'ARIA_COACH_PLATFORM=claude HOOK_EVENT_NAME=PostToolUse node $HOME/.claude/hooks/aria-first-class-coach.mjs',
@@ -312,17 +359,26 @@ function installHookHelpersToRoot(sourceDir: string, targetRoot: string, logs: s
     if (!existsSync(dstDir)) {
       mkdirSync(dstDir, { recursive: true, mode: 0o700 });
     }
-    for (const child of readdirSync(srcDir)) {
-      const src = path.join(srcDir, child);
-      const stat = statSync(src);
-      if (!stat.isFile()) continue;
-      const dst = path.join(dstDir, child);
-      copyFileSync(src, dst);
-      if (child.endsWith('.mjs') || child.endsWith('.js')) {
-        try { chmodSync(dst, 0o755); } catch {}
-      }
-      logs.push(`Installed hook helper: ${path.relative(targetRoot, dst)}`);
+    copyHelperTreeRecursive(srcDir, dstDir, targetRoot, logs);
+  }
+}
+
+function copyHelperTreeRecursive(srcDir: string, dstDir: string, targetRoot: string, logs: string[]): void {
+  for (const child of readdirSync(srcDir)) {
+    const src = path.join(srcDir, child);
+    const dst = path.join(dstDir, child);
+    const stat = statSync(src);
+    if (stat.isDirectory()) {
+      if (!existsSync(dst)) mkdirSync(dst, { recursive: true, mode: 0o700 });
+      copyHelperTreeRecursive(src, dst, targetRoot, logs);
+      continue;
     }
+    if (!stat.isFile()) continue;
+    copyFileSync(src, dst);
+    if (child.endsWith('.mjs') || child.endsWith('.js')) {
+      try { chmodSync(dst, 0o755); } catch {}
+    }
+    logs.push(`Installed hook helper: ${path.relative(targetRoot, dst)}`);
   }
 }
 
@@ -389,6 +445,54 @@ function installHooks(claudeDir: string, logs: string[], opts: { force?: boolean
   const mustReadPath = path.join(claudeDir, 'ARIA_MUST_READ.md');
   writeFileSync(mustReadPath, buildMustReadGuide('claude'), { mode: 0o644 });
   logs.push(`Installed Claude must-read guide → ${mustReadPath}`);
+
+  // AI-12107 — verify codex-native mirror integrity after install.
+  // The verifier walks the import closure across canonical/packages/deploy/
+  // codex roots + runs live-readback on every hook entrypoint. Catches the
+  // class of regression that shipped via commit a893f60db (synced runtime-
+  // client without carrying its sensitive-shape-detector + hive-wal-consumer
+  // deps → 4/4 Codex hooks crashed ERR_MODULE_NOT_FOUND silently for 15min).
+  runMirrorVerifierPostInstall(logs);
+}
+
+function runMirrorVerifierPostInstall(logs: string[]): void {
+  try {
+    const verifierPath = resolveVerifierScript();
+    if (!verifierPath) {
+      logs.push('⚠ codex-native mirror verifier script not found; skipping post-install check');
+      return;
+    }
+    const result = spawnSync('node', [verifierPath], {
+      encoding: 'utf8',
+      timeout: 60000,
+    });
+    if (result.status === 0) {
+      logs.push('✓ codex-native mirror verifier: both gates pass (closure + live-readback)');
+    } else {
+      logs.push(`⚠ codex-native mirror verifier FAILED (exit=${result.status})`);
+      const tail = (result.stdout || '').split('\n').slice(-20).join('\n');
+      if (tail.trim()) logs.push(tail);
+      const stderr = (result.stderr || '').split('\n').slice(-5).join('\n');
+      if (stderr.trim()) logs.push(`stderr: ${stderr}`);
+    }
+  } catch (err: unknown) {
+    const msg = err instanceof Error ? err.message : String(err);
+    logs.push(`⚠ codex-native mirror verifier crashed during post-install: ${msg}`);
+  }
+}
+
+function resolveVerifierScript(): string | null {
+  // The verifier lives in the source tree at packages/aria-connector/scripts/
+  // and is bundled in the npm package under dist/scripts/ on publish. Try the
+  // dev path first (running from monorepo), then the installed-package path.
+  const candidates = [
+    path.resolve(__dirname, '..', '..', 'scripts', 'verify-codex-native-mirror.mjs'),
+    path.resolve(__dirname, '..', '..', '..', '..', 'packages', 'aria-connector', 'scripts', 'verify-codex-native-mirror.mjs'),
+  ];
+  for (const candidate of candidates) {
+    if (existsSync(candidate)) return candidate;
+  }
+  return null;
 }
 
 // Install bundled SDK to ~/.claude/aria-sdk/. Hooks dynamic-import from this
@@ -540,6 +644,27 @@ For every non-trivial response or action:
 10. Before long or risky final prose, dry-run the draft with the Claude pre-emit validator when available.
 [/ARIA_STRUCTURAL_COGNITION_CONTRACT]`;
 
+const ARIA_AUTOFIRE_QUALITY_CONTINUATION_CONTRACT = `[ARIA_AUTOFIRE_QUALITY_CONTINUATION_CONTRACT — NON-NEGOTIABLE]
+Actual goal: wire extracted books, doctrines, skills, runtimes, primitives, mappings, CLIs, connectors, and agent surfaces into the operating system so output improves automatically.
+
+Receipts, gates, ledgers, and canaries are evidence, not the product. They pass only when they prove corpus-backed behavior changed the next action, QA, correction, verification, or learning loop.
+
+For continuation work, name the next highest-quality, highest-impact step by default. Do not make the owner ask for the obvious next action.
+
+Forced QA is the ordinary gate: compare expected vs observed, name findings or explicit pass criteria, correct low-risk misses, verify with real evidence, and record Dalio-style lesson plus Reflexion-style next action.
+
+Hard stops are reserved for secrets, destructive actions, deploy/publication boundaries, owner-contradicted actions, and proven false completion risk.
+
+Final owner-facing output must be readable: status, evidence, QA/correction result, and next action. Do not dump lifecycle receipts or raw JSON unless the owner explicitly asks for raw receipt/debug evidence.
+
+By-turn goal injection:
+- At turn start, treat the active goal as the default context unless the owner explicitly changes projects.
+- Selected high-impact corpus skills for continuation: Ghazali KCA repair, rights settlement, delay-risk audit, knowledge-condition-action-patience, cause/means/tawakkal mizan, ultimate cause-chain trace, necessity-vs-attachment, attachment audit, acquaintance-before-love, knowledge-will-action, means/end integrity, six-register truthfulness, breath-capital day contract, and two-premise action transduction.
+- Required runtime pressure: Tafakkur transduction, six-stage self-accounting, mortality accounting, fear/hope regulation, intention-to-action integrity, love/contentment, patience/gratitude mizan, tauba-rights repair, tawakkal cause mizan, and zuhd necessity/attachment.
+- QA packet must include QIYAS, Tadabbur, Mizan, Ghazali 8-lens, Tafakkur, and Fitrah. Collapse the method into the work; do not dump method blocks unless a debug gate asks.
+- If support mechanisms dominate the answer, repair the answer by returning to corpus-to-runtime wiring and behavioral output improvement.
+[/ARIA_AUTOFIRE_QUALITY_CONTINUATION_CONTRACT]`;
+
 function buildAriaSystemBlock(config: AriaConfig): string {
   const repoList = config.repositories.map((r) => `- ${r.name} (${r.path})`).join('\n');
   const schemaText = Object.entries(config.schemaImages)
@@ -555,6 +680,7 @@ You are augmented with Aria's cognitive harness. This provides:
 ${ARIA_HARNESS_BINDING_PREFIX}
 ${ARIA_GATE_PHASE_DIRECTIVE}
 ${ARIA_STRUCTURAL_COGNITION_CONTRACT}
+${ARIA_AUTOFIRE_QUALITY_CONTINUATION_CONTRACT}
 
 [SELF-GATE PROTOCOL]
 Before emitting any claim, verify against these hard constraints:
@@ -580,11 +706,18 @@ ${schemaText || '(no schema images yet — run `aria repo scan`)'}
 
 export async function connectClaudeCode(
   config: AriaConfig,
-  opts: { force?: boolean } = {},
+  opts: { force?: boolean; installWrapper?: boolean } = {},
 ): Promise<string[]> {
   const logs: string[] = [];
   const claudeDir = path.join(homedir(), '.claude');
 
+  await requireGovernedConnectorMutation({
+    surfaceId: 'claude-code',
+    action: 'install',
+    targetPath: claudeDir,
+    reason: 'install Claude Code harness surface',
+  });
+
   if (!existsSync(claudeDir)) {
     const { mkdirSync } = await import('fs');
     mkdirSync(claudeDir, { recursive: true });
@@ -646,7 +779,11 @@ export async function connectClaudeCode(
     }
   }
 
-  logs.push(...await connectShell('claude', config));
+  if (opts.installWrapper === true) {
+    logs.push(...await connectShell('claude', config));
+  } else {
+    logs.push('Skipped Claude shell wrapper install; Claude direct Anthropic login/provider path remains untouched. Use aria connect --with-wrappers only when explicitly desired.');
+  }
 
   return logs;
 }