Merge pull request #205 from Fr-e-d/contrib/sync-1776718216

sync: update 4 file(s) in core/

Author: Fr-e-d

.gaai/core/adapters/claude-code/__tests__/impl-routing.test.js

@@ -54,8 +54,9 @@ describe('resolveImplRouting', () => {
     assert.ok(warnings.some(w => w.includes('GAAI_IMPL_MODEL')), 'warning must mention GAAI_IMPL_MODEL');
   });
 
-  // AC10: impl_model absent → primary, no routing warnings
-  test('AC10: impl_model absent → provider: primary, no routing log', () => {
+  // AC10 (DEC-72): impl_model absent + env MISSING → primary, no routing warnings
+  // Preserves OSS non-regression (E94 D-0 intent scoped to pre-configuration state).
+  test('AC10: impl_model absent + env missing → provider: primary, no routing log (OSS non-regression)', () => {
     clearEnv();
     const warnings = [];
     const orig = console.warn;
@@ -71,14 +72,60 @@ describe('resolveImplRouting', () => {
     assert.equal(warnings.filter(w => w.includes('IMPL_ROUTING')).length, 0, 'no IMPL_ROUTING warnings on primary path');
   });
 
-  // AC10 variant: impl_model: "primary" → same as absent
-  test('AC10b: impl_model: primary → provider: primary', () => {
+  // DEC-72: impl_model absent + env CONFIGURED → secondary (NEW default post-E94 validation)
+  test('DEC-72: impl_model absent + env configured → provider: secondary (env-driven default)', () => {
+    setValidEnv();
+    const r = resolveImplRouting(undefined);
+    assert.equal(r.provider, 'secondary');
+    assert.equal(r.implModelTag, null);
+    assert.equal(r.envMissing, null);
+    assert.equal(r.reason, null);
+  });
+
+  // DEC-72: impl_model null (explicit null) + env configured → secondary
+  test('DEC-72: impl_model null + env configured → provider: secondary', () => {
+    setValidEnv();
+    const r = resolveImplRouting(null);
+    assert.equal(r.provider, 'secondary');
+    assert.equal(r.implModelTag, null);
+  });
+
+  // DEC-72: impl_model absent + partial env → primary (no warn because no explicit opt-in)
+  test('DEC-72: impl_model absent + partial env → provider: primary, no warn (silent fallback)', () => {
+    process.env.GAAI_IMPL_BASE_URL = 'https://test.example.com';
+    // AUTH_TOKEN and MODEL not set
+    const warnings = [];
+    const orig = console.warn;
+    console.warn = (...args) => warnings.push(args.join(' '));
+
+    const r = resolveImplRouting(undefined);
+
+    console.warn = orig;
+    assert.equal(r.provider, 'primary');
+    assert.equal(r.reason, null, 'no reason when tag is absent (silent fallback, not opt-in failure)');
+    assert.equal(r.envMissing, null, 'envMissing is null when tag is absent (no explicit opt-in to report)');
+    assert.equal(warnings.filter(w => w.includes('IMPL_ROUTING')).length, 0, 'no warn when tag absent');
+  });
+
+  // AC10b (DEC-72): impl_model: "primary" → always primary, regardless of env (explicit opt-out)
+  test('AC10b: impl_model: primary + env missing → provider: primary (explicit opt-out)', () => {
+    clearEnv();
     const r = resolveImplRouting('primary');
     assert.equal(r.provider, 'primary');
     assert.equal(r.implModelTag, 'primary');
     assert.equal(r.reason, null);
   });
 
+  // DEC-72: impl_model: "primary" + env configured → STILL primary (explicit opt-out is absolute)
+  test('DEC-72: impl_model: primary + env configured → provider: primary (explicit opt-out overrides env default)', () => {
+    setValidEnv();
+    const r = resolveImplRouting('primary');
+    assert.equal(r.provider, 'primary');
+    assert.equal(r.implModelTag, 'primary');
+    assert.equal(r.reason, null);
+    assert.equal(r.envMissing, null);
+  });
+
   // AC7: decision is stable (called multiple times with same args → same provider)
   test('AC7: decision is deterministic (same input → same provider)', () => {
     setValidEnv();

.gaai/core/adapters/claude-code/impl-routing.js

@@ -6,10 +6,19 @@
  *
  * Called once per story at Implementation phase entry. Result is stable for the
  * entire phase — mid-phase re-evaluation is forbidden (E94S04 AC7).
+ *
+ * Default routing (DEC-72, 2026-04-20, amends E94 D-0):
+ *   - tag === 'primary'           → primary (explicit opt-out)
+ *   - tag === 'secondary' + env   → secondary
+ *   - tag === 'secondary' + !env  → primary (warn, reason='secondary_but_env_missing')
+ *   - tag absent + env            → secondary (NEW default — was primary under E94 D-0)
+ *   - tag absent + !env           → primary (preserves OSS non-regression)
  */
 
 import { randomUUID } from 'node:crypto';
 
+const REQUIRED_ENV = ['GAAI_IMPL_BASE_URL', 'GAAI_IMPL_AUTH_TOKEN', 'GAAI_IMPL_MODEL'];
+
 /**
  * @typedef {Object} RoutingDecision
  * @property {'primary'|'secondary'} provider   - Which provider path to use
@@ -19,6 +28,10 @@ import { randomUUID } from 'node:crypto';
  * @property {string|null}           reason     - 'secondary_but_env_missing' | null
  */
 
+function checkEnv() {
+  return REQUIRED_ENV.filter(name => !process.env[name]?.trim());
+}
+
 /**
  * Resolves the Implementation phase routing decision.
  *
@@ -29,22 +42,27 @@ export function resolveImplRouting(implModelTag) {
   const traceId = randomUUID();
   const tag = implModelTag ?? null;
 
-  if (tag !== 'secondary') {
+  // Explicit opt-out — always routes primary, regardless of env (DEC-72)
+  if (tag === 'primary') {
     return { provider: 'primary', traceId, implModelTag: tag, envMissing: null, reason: null };
   }
 
-  // Pre-flight env check — never attempt secondary if any required var is missing or empty
-  const missing = [];
-  if (!process.env.GAAI_IMPL_BASE_URL?.trim())    missing.push('GAAI_IMPL_BASE_URL');
-  if (!process.env.GAAI_IMPL_AUTH_TOKEN?.trim())  missing.push('GAAI_IMPL_AUTH_TOKEN');
-  if (!process.env.GAAI_IMPL_MODEL?.trim())       missing.push('GAAI_IMPL_MODEL');
+  // Env pre-flight gate — shared by explicit 'secondary' and env-driven default (DEC-72)
+  const missing = checkEnv();
 
   if (missing.length > 0) {
-    console.warn(
-      `IMPL_ROUTING_ENV_MISSING: expected GAAI_IMPL_BASE_URL|AUTH_TOKEN|MODEL, got: ${missing.join(', ')}`
-    );
-    return { provider: 'primary', traceId, implModelTag: tag, envMissing: missing, reason: 'secondary_but_env_missing' };
+    // Env missing: stories without env cannot route secondary.
+    // - tag === 'secondary' → warn + fallback (existing E94 behavior)
+    // - tag absent → silent primary (preserves OSS non-regression — DEC-72)
+    if (tag === 'secondary') {
+      console.warn(
+        `IMPL_ROUTING_ENV_MISSING: expected ${REQUIRED_ENV.join('|')}, got: ${missing.join(', ')}`
+      );
+      return { provider: 'primary', traceId, implModelTag: tag, envMissing: missing, reason: 'secondary_but_env_missing' };
+    }
+    return { provider: 'primary', traceId, implModelTag: tag, envMissing: null, reason: null };
   }
 
+  // Env configured: route secondary (tag === 'secondary' OR tag absent → new default per DEC-72)
   return { provider: 'secondary', traceId, implModelTag: tag, envMissing: null, reason: null };
 }

.gaai/core/workflows/delivery-loop.workflow.md

@@ -221,8 +221,8 @@ node .gaai/core/adapters/claude-code/runtime-routing-logger.js \
 The routing decision is evaluated **exactly once** at Implementation phase entry. Mid-phase changes to env vars or the backlog entry do NOT re-trigger evaluation.
 
 > **🔒 Mode invariance (NON-NEGOTIABLE — applies to ALL Implementation Agents):**
-> The decision to invoke `nested-claude-spawn.js` is based EXCLUSIVELY on the two conditions in the decision matrix below:
-> (a) `impl_model == "secondary"` in the backlog entry, AND
+> The decision to invoke `nested-claude-spawn.js` is based EXCLUSIVELY on the conditions in the decision matrix below (per DEC-72, amends E94 D-0):
+> (a) `impl_model != "primary"` in the backlog entry (i.e., `secondary` OR absent), AND
 > (b) all three `GAAI_IMPL_*` environment variables are present and non-empty.
 >
 > **No other factor influences this decision.** In particular:
@@ -232,7 +232,7 @@ The routing decision is evaluated **exactly once** at Implementation phase entry
 >
 > **If you (the agent) find yourself reasoning "I'll use primary because X":** STOP. X is invalid unless X is literally one of the two matrix conditions. Route to nested wrapper per the matrix.
 >
-> **Rationale:** Epic E94 D-0 (non-regression) is preserved by the `impl_model` tag itself — stories without the tag use primary. Agents second-guessing the matrix defeat the entire Epic's purpose (quota savings) and produce misleading `runtime-routing.jsonl` logs (e.g., `secondary_but_env_missing` logged when env was actually present).
+> **Rationale:** Epic E94 D-0's OSS non-regression intent is preserved by condition (b) — users without `GAAI_IMPL_*` env vars configured see zero behavioral change. DEC-72 (2026-04-20) amends the post-E94S10 default: when env vars are configured, secondary is used by default (tag absent → secondary). `impl_model: primary` is the explicit opt-out for stories that must run on primary (complex reasoning, frontend/UX judgment, security-critical). Agents second-guessing the matrix defeat the entire Epic's purpose (quota savings) and produce misleading `runtime-routing.jsonl` logs.
 
 **Decision matrix:**
 
@@ -246,16 +246,30 @@ read impl_model from backlog entry    # canonical runtime source per E94S02 AC6
 #   - No circuit-breaker auto-disable of secondary
 # Fallback is atomic binary: secondary failed → primary runs (or escalates). T-2.
 
-if impl_model == "secondary":
+# DEC-72 (2026-04-20): tag absent + env configured routes to secondary by default.
+# tag === 'primary' → explicit opt-out (always primary, regardless of env).
+
+if impl_model == "primary":
+    # Explicit opt-out — always primary, regardless of env
+    node .gaai/core/adapters/claude-code/runtime-routing-logger.js \
+      --trace-id "$STORY_TRACE_ID" --story-id "{id}" --phase "impl" \
+      --provider "primary" --model "${CLAUDE_MODEL:-claude-sonnet-4-6}" \
+      --duration-ms 0 --fallback-reason "" --impl-model-tag "primary" 2>/dev/null || true
+    route → Task tool on primary
+
+elif impl_model == "secondary" OR impl_model is absent:
     # Pre-flight env check (never attempt secondary if env missing)
     missing = []
     if not GAAI_IMPL_BASE_URL  (non-empty): missing += ["GAAI_IMPL_BASE_URL"]
     if not GAAI_IMPL_AUTH_TOKEN(non-empty): missing += ["GAAI_IMPL_AUTH_TOKEN"]
     if not GAAI_IMPL_MODEL     (non-empty): missing += ["GAAI_IMPL_MODEL"]
 
     if missing:
-        warn("IMPL_ROUTING_ENV_MISSING: expected GAAI_IMPL_BASE_URL|AUTH_TOKEN|MODEL, got: " + join(missing, ", "))
-        echo "⚠ impl_model=secondary but GAAI_IMPL_* env vars missing; using primary."
+        # Only warn when the user explicitly opted in via tag='secondary'.
+        # When tag is absent and env is missing, silent primary fallback preserves OSS non-regression (E94 D-0 intent, DEC-72).
+        if impl_model == "secondary":
+            warn("IMPL_ROUTING_ENV_MISSING: expected GAAI_IMPL_BASE_URL|AUTH_TOKEN|MODEL, got: " + join(missing, ", "))
+            echo "⚠ impl_model=secondary but GAAI_IMPL_* env vars missing; using primary."
         node .gaai/core/adapters/claude-code/runtime-routing-logger.js \
           --trace-id "$STORY_TRACE_ID" --story-id "{id}" --phase "impl" \
           --provider "primary" --model "${CLAUDE_MODEL:-claude-sonnet-4-6}" \
@@ -312,16 +326,13 @@ if impl_model == "secondary":
                 ESCALATE via existing daemon behavior (backlog status update + notes)
                 # Note: no retry, no tier-based strategy, no circuit-breaker (AC3, AC18, AC19)
 
-elif impl_model == "primary" OR impl_model is absent:
-    # Task tool on primary — byte-for-byte identical to pre-Epic delivery
-    node .gaai/core/adapters/claude-code/runtime-routing-logger.js \
-      --trace-id "$STORY_TRACE_ID" --story-id "{id}" --phase "impl" \
-      --provider "primary" --model "${CLAUDE_MODEL:-claude-sonnet-4-6}" \
-      --duration-ms 0 --fallback-reason "" --impl-model-tag "${impl_model_tag:-absent}" 2>/dev/null || true
-    route → Task tool on primary
+# Note: the 'impl_model is absent' path is now consolidated into the 'secondary OR absent'
+# branch above per DEC-72. The 'primary' branch at the top of this matrix handles the
+# explicit opt-out. There is no separate 'absent → primary' path anymore — absence means
+# "follow env-driven default" which is secondary when env is configured, primary otherwise.
 ```
 
-The routing helper is implemented in `.gaai/core/adapters/claude-code/impl-routing.js` (`resolveImplRouting(implModelTag)`) — testable without invoking a real subprocess.
+The routing helper is implemented in `.gaai/core/adapters/claude-code/impl-routing.js` (`resolveImplRouting(implModelTag)`) — testable without invoking a real subprocess. Default routing semantics per DEC-72 (2026-04-20).
 
 **Compliance:** no specific provider names appear in this workflow file. Only generic terms: "secondary provider", "nested subprocess", "user-configured endpoint" (AC13).
 

CHANGELOG.md

@@ -7,6 +7,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ---
 
+## [2.19.0] - 2026-04-20
+
+### Changed
+- feat(impl-routing): DEC-72 — env-driven default (secondary when configured)
+- chore: bump local VERSION to v2.19.0 [sync]
+- feat(delivery-loop): §7c unify non-.gaai deletions into sub-agent reviewer
+
+
 ## [2.19.0] - 2026-04-20
 
 ### Changed