fix: resolve merge conflicts with main

Author: carlos-alm

.claude/hooks/snapshot-pre-bash.sh

@@ -23,18 +23,27 @@ if [ -z "$COMMAND" ]; then
   exit 0
 fi
 
-# Skip read-only commands that can never write files — reduces snapshot overhead
-# for the most common Bash calls (ls, cat, grep, git log, git status, etc.).
+# Skip commands that can NEVER write files — reduces snapshot overhead for the
+# most common read-only Bash calls.  Only include commands that have no
+# write-capable flags/modes at all.  Notably absent:
+#   - echo, printf  — write files via shell redirections (echo … > file)
+#   - find          — can write via -exec sed -i, -exec cp, -delete, etc.
+#   - awk           — can write via redirection or getline
+#   - node -e/-p    — can write files via the Node.js fs module
 # sed is intentionally NOT in this list because `sed -i` modifies files in-place.
-if echo "$COMMAND" | grep -qE '^\s*(ls|cat|head|tail|grep|find|git\s+(log|status|diff|show|branch|remote|fetch|rev-parse|stash\s+list|ls-files|blame|describe|tag|config\s+--get)|gh\s+(pr|issue|repo)\s+(view|list|status)|echo|printf|pwd|which|node\s+-e|node\s+-p|npx\s+--version|wc|sort|uniq|awk)\b'; then
+if echo "$COMMAND" | grep -qE '^\s*(ls|cat|head|tail|grep|git\s+(log|status|diff|show|branch|remote|fetch|rev-parse|stash\s+list|ls-files|blame|describe|tag|config\s+--get)|gh\s+(pr|issue|repo)\s+(view|list|status)|pwd|which|npx\s+--version|wc|sort|uniq)\b'; then
   exit 0
 fi
 
 # Resolve the project root (worktree-aware — each worktree has its own .claude/)
 PROJECT_DIR=$(git rev-parse --show-toplevel 2>/dev/null) || PROJECT_DIR="${CLAUDE_PROJECT_DIR:-.}"
 
-# Key the snapshot file to the project root so parallel worktrees don't collide.
-# Use a simple hash of the path — just enough to be unique per worktree.
+# Key the snapshot file to (project root, command) so concurrent Bash calls
+# within the same session don't overwrite each other's baseline.
+# Claude Code can issue multiple Bash tool calls in parallel; using just the
+# project hash would mean call B's pre-hook overwrites call A's snapshot before
+# A's post-hook runs, silently dropping A's file writes from session-edits.log.
+# Including a hash of the command makes each concurrent call use a distinct file.
 PROJECT_HASH=$(echo "$PROJECT_DIR" | node -e "
   const crypto = require('crypto');
   let d='';
@@ -44,7 +53,16 @@ PROJECT_HASH=$(echo "$PROJECT_DIR" | node -e "
   });
 " 2>/dev/null) || PROJECT_HASH="default"
 
-SNAPSHOT_FILE="/tmp/claude-bash-snapshot-${PROJECT_HASH}.txt"
+CMD_HASH=$(echo "$COMMAND" | node -e "
+  const crypto = require('crypto');
+  let d='';
+  process.stdin.on('data',c=>d+=c);
+  process.stdin.on('end',()=>{
+    process.stdout.write(crypto.createHash('sha1').update(d.trim()).digest('hex').slice(0,8));
+  });
+" 2>/dev/null) || CMD_HASH="default"
+
+SNAPSHOT_FILE="/tmp/claude-bash-snapshot-${PROJECT_HASH}-${CMD_HASH}.txt"
 
 # Capture current git status --porcelain.
 # Lines look like: "XY filename" or "XY orig -> dest" (rename).

.claude/hooks/track-bash-writes.sh

@@ -27,7 +27,10 @@ fi
 # Resolve the project root (worktree-aware — each worktree has its own .claude/)
 PROJECT_DIR=$(git rev-parse --show-toplevel 2>/dev/null) || PROJECT_DIR="${CLAUDE_PROJECT_DIR:-.}"
 
-# Reproduce the same project hash used by snapshot-pre-bash.sh
+# Reproduce the same snapshot path used by snapshot-pre-bash.sh.
+# The snapshot is keyed by (project root, command) so concurrent Bash calls
+# within the same session each get a distinct file — preventing parallel calls
+# from overwriting each other's baseline.
 PROJECT_HASH=$(echo "$PROJECT_DIR" | node -e "
   const crypto = require('crypto');
   let d='';
@@ -37,7 +40,16 @@ PROJECT_HASH=$(echo "$PROJECT_DIR" | node -e "
   });
 " 2>/dev/null) || PROJECT_HASH="default"
 
-SNAPSHOT_FILE="/tmp/claude-bash-snapshot-${PROJECT_HASH}.txt"
+CMD_HASH=$(echo "$COMMAND" | node -e "
+  const crypto = require('crypto');
+  let d='';
+  process.stdin.on('data',c=>d+=c);
+  process.stdin.on('end',()=>{
+    process.stdout.write(crypto.createHash('sha1').update(d.trim()).digest('hex').slice(0,8));
+  });
+" 2>/dev/null) || CMD_HASH="default"
+
+SNAPSHOT_FILE="/tmp/claude-bash-snapshot-${PROJECT_HASH}-${CMD_HASH}.txt"
 
 # If there is no snapshot (hook was not installed yet, or the pre-hook was
 # skipped for a read-only command) we have no baseline — exit cleanly.

.claude/skills/titan-run/SKILL.md

@@ -16,7 +16,7 @@ You are the **orchestrator** for the full Titan Paradigm pipeline. Your job is t
 - `<path>` → target path (passed to recon)
 - `--skip-recon` → skip recon (assumes artifacts exist)
 - `--skip-gauntlet` → skip gauntlet (assumes artifacts exist)
-- `--start-from <phase>` → jump to phase: `recon`, `gauntlet`, `sync`, `forge`, `grind`, `parity`
+- `--start-from <phase>` → jump to phase: `recon`, `gauntlet`, `sync`, `forge`, `grind`, `parity`, `close`
 - `--gauntlet-batch-size <N>` → batch size for gauntlet (default: 5)
 - `--yes` → skip all confirmation prompts in the orchestrator (pre-pipeline, forge checkpoint, and resume prompts) and in forge (per-phase confirmation)
 

crates/codegraph-core/src/ast_analysis/dataflow.rs

@@ -908,8 +908,8 @@ fn find_binding(scope_stack: &[ScopeFrame], name: &str) -> Option<BindingInfo> {
         }
         if let Some(local) = scope.locals.get(name) {
             let confidence = match local {
-                LocalSource::CallReturn { .. } => 0.9,
-                LocalSource::Destructured { .. } => 0.8,
+                LocalSource::CallReturn => 0.9,
+                LocalSource::Destructured => 0.8,
             };
             return Some(BindingInfo {
                 binding_type: "local".to_string(),

src/domain/graph/builder/stages/build-edges.ts

@@ -1201,7 +1201,15 @@ function buildFileCallEdges(
           importedNames,
           typeMap as Map<string, unknown>,
         );
-        for (const t of aliasTargets) {
+        const sortedAliasTargets =
+          aliasTargets.length > 1
+            ? [...aliasTargets].sort(
+                (a, b) =>
+                  computeConfidence(relPath, b.file, aliasFrom ?? null) -
+                  computeConfidence(relPath, a.file, aliasFrom ?? null),
+              )
+            : aliasTargets;
+        for (const t of sortedAliasTargets) {
           const edgeKey = `${caller.id}|${t.id}`;
           if (t.id !== caller.id && !seenCallEdges.has(edgeKey) && !ptsEdgeRows.has(edgeKey)) {
             const conf =
@@ -1237,7 +1245,15 @@ function buildFileCallEdges(
             importedNames,
             typeMap as Map<string, unknown>,
           );
-          for (const t of aliasTargets) {
+          const sortedAliasTargets =
+            aliasTargets.length > 1
+              ? [...aliasTargets].sort(
+                  (a, b) =>
+                    computeConfidence(relPath, b.file, aliasFrom ?? null) -
+                    computeConfidence(relPath, a.file, aliasFrom ?? null),
+                )
+              : aliasTargets;
+          for (const t of sortedAliasTargets) {
             const edgeKey = `${caller.id}|${t.id}`;
             if (t.id !== caller.id && !seenCallEdges.has(edgeKey) && !ptsEdgeRows.has(edgeKey)) {
               const conf =

tests/benchmarks/regression-guard.test.ts

@@ -277,6 +277,19 @@ const SKIP_VERSIONS = new Set(['3.8.0']);
  *   exemption above (which was a WASM metric; this is native). Exempt this
  *   release; remove once 3.13.0+ data confirms the steady-state.
  *
+ * - 3.12.0:No-op rebuild — CI runner variance on a sub-50ms native metric.
+ *   The 3.12.0 baseline captures noopRebuildMs=30 (build benchmark) and
+ *   noopRebuildMs=23 (incremental benchmark); the per-PR gate re-measures
+ *   dev on a fresh runner and lands at 48ms (+60%) and 48ms (+109%) on run
+ *   27457266151 — both exceed the NOISY_METRIC_THRESHOLD of 50% due to
+ *   sub-50ms variance on shared runners. This PR (#1487) adds warmup runs to
+ *   benchmark.ts on the no-op and 1-file rebuild tiers; on a true no-op
+ *   rebuild no files are re-parsed and build-edges.ts is never reached, so
+ *   none of the code changes in this branch execute on the hot path. The
+ *   delta is entirely shared-runner scheduling noise. Same shape and root
+ *   cause as 3.11.2:No-op rebuild. Exempt this release; remove once
+ *   3.13.0+ data confirms the steady-state.
+ *
  * - 3.12.0:Full build — root-caused residual feature cost of the Phase 8.x
  *   resolution work on the native engine. The v3.12.0 publish gate first
  *   measured 2231 → 3333 (+49%). Local A/B against a v3.11.2 baseline worktree
@@ -328,6 +341,7 @@ const KNOWN_REGRESSIONS = new Set([
   '3.11.2:No-op rebuild',
   '3.11.2:1-file rebuild',
   '3.11.2:Full build',
+  '3.12.0:No-op rebuild',
   '3.12.0:Full build',
   '3.12.0:1-file rebuild',
   // tree-sitter-erlang devDependency removed (GHSA-rphw-c8qj-jv84 — malware).