Merge pull request #290 from Fr-e-d/contrib/sync-1777600001

sync: update 6 file(s) in core/

Author: Fr-e-d

.gaai/core/adapters/claude-code/runtime-routing-logger.js

@@ -100,7 +100,11 @@ export function logPhase(params) {
   };
 
   // Append optional secondary-mode telemetry fields when present (integers/boolean, DEC-65)
-  const TELEMETRY_FIELDS = ['context_size_at_spawn', 'compact_events_count', 'retry_429_count', 'nested_session_completed', 'pipeline', 'pr_url', 'auto_merge_applied'];
+  const TELEMETRY_FIELDS = [
+    'context_size_at_spawn', 'compact_events_count', 'retry_429_count',
+    'nested_session_completed', 'pipeline', 'pr_url', 'auto_merge_applied',
+    'cutover_from', 'cutover_to', 'forced', 'operator_id', 'pre_flip_in_progress_count',
+  ];
   for (const f of TELEMETRY_FIELDS) {
     if (f in params) entry[f] = params[f];
   }
@@ -138,6 +142,11 @@ if (import.meta.url === pathToFileURL(process.argv[1]).href) {
   const logPathArg    = argValue('--log-path');
   const prUrlArg         = argValue('--pr-url');
   const autoMergeApplied = argValue('--auto-merge-applied');
+  const cutoverFromArg    = argValue('--cutover-from');
+  const cutoverToArg      = argValue('--cutover-to');
+  const forcedArg         = argValue('--forced');
+  const operatorIdArg     = argValue('--operator-id');
+  const preFlipCountArg   = argValue('--pre-flip-in-progress-count');
 
   // --log-path overrides default log path (useful for testing without internal _setLogPath)
   if (logPathArg) _setLogPath(logPathArg);
@@ -159,6 +168,11 @@ if (import.meta.url === pathToFileURL(process.argv[1]).href) {
     if (pipelineArg !== undefined) phaseParams.pipeline = pipelineArg;
     if (prUrlArg !== undefined && prUrlArg !== '') phaseParams.pr_url = prUrlArg;
     if (autoMergeApplied !== undefined) phaseParams.auto_merge_applied = autoMergeApplied === 'true';
+    if (cutoverFromArg !== undefined)  phaseParams.cutover_from = cutoverFromArg;
+    if (cutoverToArg !== undefined)    phaseParams.cutover_to = cutoverToArg;
+    if (forcedArg !== undefined)       phaseParams.forced = forcedArg === 'true';
+    if (operatorIdArg !== undefined)   phaseParams.operator_id = operatorIdArg;
+    if (preFlipCountArg !== undefined) phaseParams.pre_flip_in_progress_count = Number(preFlipCountArg);
     logPhase(phaseParams);
     process.stdout.write(formatPhaseStdout(phase, provider, model, fallbackReason));
   } catch (err) {

.gaai/core/scripts/daemon-dispatch.sh

@@ -224,6 +224,59 @@ _emit_commit_routing_record() {
     2>/dev/null || true
 }
 
+# ── Cutover default pipeline reader (AC4) ────────────────────────────────
+# Reads cutover_state.default_pipeline from the top-level section in BACKLOG_FILE.
+# Returns "legacy" if the section is absent (safe default — no-op for existing deploys).
+# Re-reads the file on every call (no caching — AC4 E134S09).
+get_cutover_default_pipeline() {
+  local val
+  val=$(awk '
+    /^cutover_state:[[:space:]]*$/ { in_section=1; next }
+    in_section && /^[^[:space:]]/ { exit }
+    in_section && /^[[:space:]]+default_pipeline:/ {
+      gsub(/^[[:space:]]+default_pipeline:[[:space:]]*/, "")
+      gsub(/[[:space:]]*$/, "")
+      gsub(/^"|"$/, "")
+      print
+      exit
+    }
+  ' "$BACKLOG_FILE" 2>/dev/null || true)
+  echo "${val:-legacy}"
+}
+
+# ── Cutover routing record (AC3) ─────────────────────────────────────────
+# Emits one JSONL record with phase: cutover + cutover-specific telemetry.
+# Arguments: trace_id cutover_from cutover_to forced operator_id pre_flip_count
+# Best-effort: audit emit failure warns but does NOT abort the flip.
+# Cohort exclusion contract: WHERE phase != 'cutover' in E134S10 statistics.
+_emit_cutover_routing_record() {
+  local trace_id="$1" cutover_from="$2" cutover_to="$3" forced="$4"
+  local operator_id="$5" pre_flip_count="$6"
+
+  local log_path_args=()
+  if [[ -n "${ROUTING_LOG_PATH:-}" ]]; then
+    log_path_args=(--log-path "$ROUTING_LOG_PATH")
+  fi
+
+  node "$PROJECT_DIR/.gaai/core/adapters/claude-code/runtime-routing-logger.js" \
+    --trace-id                    "$trace_id" \
+    --story-id                    "cutover" \
+    --phase                       "cutover" \
+    --provider                    "daemon-bash" \
+    --model                       "n/a" \
+    --duration-ms                 0 \
+    --fallback-reason             "null" \
+    --impl-model-tag              "n/a" \
+    --pipeline                    "cutover" \
+    --cutover-from                "$cutover_from" \
+    --cutover-to                  "$cutover_to" \
+    --forced                      "$forced" \
+    --operator-id                 "$operator_id" \
+    --pre-flip-in-progress-count  "$pre_flip_count" \
+    "${log_path_args[@]}" \
+    2>/dev/null || true
+}
+
 # ── Phase handlers ────────────────────────────────────────────────────────
 
 handle_plan_phase() {

.gaai/core/scripts/delivery-daemon.sh

@@ -2383,8 +2383,13 @@ while true; do
 
     increment_retry "$story_id"
 
-    # ── Route: 3phase dispatch OR legacy wrapper (E134S02) ────────────────
+    # ── Route: 3phase dispatch OR legacy wrapper (E134S02 + E134S09) ───────
+    # Per-story delivery_pipeline takes precedence over cutover default.
+    # Cutover default is re-read at every poll (no caching — AC4 E134S09).
     _dp=$(get_delivery_pipeline "$story_id")
+    if [[ -z "$_dp" ]]; then
+      _dp=$(get_cutover_default_pipeline)
+    fi
     if [[ "$_dp" == "3phase" ]]; then
       _trace_id=$(node -e "import('node:crypto').then(m=>process.stdout.write(m.randomUUID()))" 2>/dev/null \
         || python3 -c "import uuid; print(str(uuid.uuid4()),end='')" 2>/dev/null \