synabun 2026.4.20-beta.9 → 2026.4.21

package/CHANGELOG.md

@@ -2,6 +2,23 @@
 
 Raw internal changelogs are archived in [changelog/](changelog/).
 
+## 2026-04-21
+
+### Added — Workspace Trust Flow For Windows Git "Dubious Ownership" Repos
+- **New `POST /api/terminal/trust-workspace` endpoint** — In `neural-interface/server.js`, added `detectDubiousOwnership(dir)` helper that probes `git rev-parse --is-inside-work-tree` and matches stderr against `/dubious ownership|safe\.directory/i` (CVE-2022-24765 protection; fires on Windows when the repo is owned by a different SID — external drives, cross-user installs, copied repos). New `normalizeGitPath(dir)` converts backslashes to forward slashes and strips trailing slashes to match the format `git config --add safe.directory` expects. The endpoint validates `path` (non-empty string, no control chars, not `*`/`/`/`\\`, `existsSync` + `isDirectory`), runs `spawnGit(['config', '--global', '--add', 'safe.directory', normalizeGitPath(abs)])`, re-probes to confirm, logs `[git] trusted workspace: <path>`, and returns `{ ok, path, stillDubious }`.
+- **`POST /api/claude-code/integrations` flags dubious workspaces on registration** — The `target === 'project'` branch now calls `detectDubiousOwnership(normalized)` after saving the project to the hook-projects list; when the error fires it adds `dubiousOwnership: true, trustPath: normalizeGitPath(normalized)` to the response JSON. Mac/Linux and healthy Windows installs see no change to response shape.
+- **`promptTrustWorkspace(trustPath)` modal in the file-explorer add-project flow** — In `neural-interface/public/shared/ui-file-explorer.js`, `addProjectFlow()` now reads the integrations response and `await`s a new `promptTrustWorkspace()` modal when `dubiousOwnership` is true. The modal reuses the existing `.fe-modal-overlay` system with a `.fe-trust-modal` amber variant, shows the exact path in a `.fe-trust-path` monospace chip, and offers **Skip** (close, no git change) or **Trust workspace** (POSTs to `/api/terminal/trust-workspace`, toasts the result, closes). The promise resolves either way so the add flow never blocks.
+- **Inline trust row in the onboarding wizard** — In `neural-interface/public/onboarding.html`, the project-add step on `$addBtn` now persists `dubiousOwnership` + `trustPath` fields onto each `wizardState.projects[i]` entry, and `renderProjectList()` appends an amber inline `⚠ Git ownership mismatch — [Trust workspace]` row under the card when flagged. Click POSTs to `/api/terminal/trust-workspace`; on success the row swaps to `✓ Workspace trusted`. Separate from the file-explorer modal because onboarding already has its own card-based flow and shouldn't launch overlay dialogs.
+- **Amber modal styling** — In `neural-interface/public/shared/styles.css`, added `.fe-trust-modal` overrides of `.fe-modal-title` (amber `#ffb74d`) and `.fe-modal-confirm` (warm `rgba(255,183,77,…)`) so the trust dialog is visually distinct from the destructive-red delete modal. New `.fe-trust-path` class styles the monospace path chip with dark background and `word-break: break-all`.
+
+### Fixed — Git UI Silently Disabled On Windows Across Shim / Version / PATH Variants
+- **`git` invocation rewritten to resolve absolute path, then fall back to shell only when needed** — In `neural-interface/server.js`, added `resolveGitPath()` that runs `where git` on Windows / `command -v git` on Unix via `execSync` at first use, caches the result, and prefers `.exe` entries over `.cmd`/`.bat` shims (Scoop, winget) so `spawnSync` can execute git directly without cmd.exe involvement. New `spawnGit(args, opts)` uses the resolved absolute path with no shell on all platforms; only falls back to `shell: true` with per-arg metacharacter quoting when path resolution fails OR the resolved target is a `.cmd`/`.bat` shim. Logs `[git] resolved: <path>` at first use so Windows users can confirm which binary Node is running.
+- **Chained branch-name fallback for old git installs** — `getGitInfo()` and `GET /api/terminal/branches` used `git branch --show-current` which requires git 2.22+ — older Git for Windows builds silently exited non-zero and the branch label disappeared. Added chained fallback: `branch --show-current` → `rev-parse --abbrev-ref HEAD` → `rev-parse --short HEAD`. The `--abbrev-ref` form works on every git version and handles both named branches and detached HEAD (returns literal `"HEAD"`, which the parser treats as "no branch" and escalates to the short SHA).
+- **Plain `git branch` parse replacing `--format=%(refname:short)`** — The branch-list endpoint's `--format=%(refname:short)` arg was prone to cmd.exe variable-expansion mangling on Windows even with double-quoting. Replaced with bare `git branch` and a `line.replace(/^[\s*]+/, '').trim()` parser that strips the current-branch marker and filters out `(HEAD detached …)` lines and rename arrows. Removes the cmd.exe `%(…)` hazard entirely.
+- **All git calls now route through `spawnGit` with unified error logging** — The call sites (`getGitInfo`, `/api/terminal/branches`, `/api/terminal/checkout`, the project-add integration probe) had inconsistent handling — some used raw `execSync`, some `spawnSync` directly. Every git call now goes through `spawnGit(['…'])`, and every failure routes through a new `logGitFailure(where, err)` helper that suppresses the expected "not a git repository" case, deduplicates the "git not found on PATH" warning via `_gitMissingLogged`, and logs everything else with one-line stderr.
+- **Startup `git --version` probe** — Added a `setImmediate(() => spawnGit(['--version']))` at module init that always logs `[git] git version X.Y.Z — OK` or `[git] startup probe FAILED: <reason>. File explorer git UI will be hidden.` — the first diagnostic Windows users should check, since every prior git failure was silently swallowed by the catch blocks.
+- **`windowsHide: true` on every git spawn** — Prevents a momentary cmd.exe console window flash on Windows whenever the file explorer refreshes git status.
+
 ## 2026-04-20
 
 ### Added — Install Toggles For Claude / Gemini / Codex / OpenCode In Onboarding Step 5

package/neural-interface/public/onboarding.html

@@ -2154,15 +2154,58 @@ document.getElementById('buildBtn').addEventListener('click', async () => {
       wizardState.projects.forEach((p, i) => {
         const card = document.createElement('div');
         card.className = 'onboard-project-card';
-        card.style.cssText = 'display:flex;align-items:center;gap:10px;padding:10px 12px;background:rgba(109,213,140,0.06);border:1px solid rgba(109,213,140,0.2);border-radius:8px;font-size:12px';
+        card.style.cssText = 'display:flex;flex-direction:column;gap:8px;padding:10px 12px;background:rgba(109,213,140,0.06);border:1px solid rgba(109,213,140,0.2);border-radius:8px;font-size:12px';
+        const safePath = p.path.replace(/\\/g, '/');
         card.innerHTML = `
-          <svg viewBox="0 0 24 24" style="width:18px;height:18px;fill:none;stroke:rgba(109,213,140,0.8);stroke-width:2;flex-shrink:0"><path d="M22 11.08V12a10 10 0 1 1-5.93-9.14"/><polyline points="22 4 12 14.01 9 11.01"/></svg>
-          <div style="flex:1;min-width:0">
-            <div style="color:var(--t-bright);font-weight:500">${p.label}</div>
-            <div style="color:var(--t-muted);font-size:11px;overflow:hidden;text-overflow:ellipsis;white-space:nowrap" title="${p.path.replace(/\\/g, '/')}">${p.path.replace(/\\/g, '/')}</div>
+          <div style="display:flex;align-items:center;gap:10px">
+            <svg viewBox="0 0 24 24" style="width:18px;height:18px;fill:none;stroke:rgba(109,213,140,0.8);stroke-width:2;flex-shrink:0"><path d="M22 11.08V12a10 10 0 1 1-5.93-9.14"/><polyline points="22 4 12 14.01 9 11.01"/></svg>
+            <div style="flex:1;min-width:0">
+              <div style="color:var(--t-bright);font-weight:500">${p.label}</div>
+              <div style="color:var(--t-muted);font-size:11px;overflow:hidden;text-overflow:ellipsis;white-space:nowrap" title="${safePath}">${safePath}</div>
+            </div>
+            <button class="onboard-project-remove" style="background:none;border:none;color:var(--t-muted);cursor:pointer;font-size:16px;padding:2px 6px;line-height:1;opacity:0.5" title="Remove">&times;</button>
           </div>
-          <button class="onboard-project-remove" style="background:none;border:none;color:var(--t-muted);cursor:pointer;font-size:16px;padding:2px 6px;line-height:1;opacity:0.5" title="Remove">&times;</button>
         `;
+        if (p.dubiousOwnership && !p.trusted) {
+          const trustRow = document.createElement('div');
+          trustRow.className = 'onboard-trust-row';
+          trustRow.style.cssText = 'display:flex;align-items:center;gap:8px;padding:6px 8px;background:rgba(255,183,77,0.08);border:1px solid rgba(255,183,77,0.25);border-radius:6px;font-size:11px;color:rgba(255,204,128,0.9)';
+          trustRow.innerHTML = `
+            <span>&#9888; Git ownership mismatch &mdash; workspace needs to be trusted</span>
+            <button class="onboard-trust-btn" style="margin-left:auto;background:rgba(255,183,77,0.2);border:1px solid rgba(255,183,77,0.35);color:#ffe0b2;padding:4px 10px;border-radius:5px;font-size:11px;cursor:pointer">Trust workspace</button>
+          `;
+          const $btn = trustRow.querySelector('.onboard-trust-btn');
+          $btn.addEventListener('click', async () => {
+            $btn.disabled = true;
+            $btn.textContent = 'Trusting...';
+            try {
+              const r = await fetch('/api/terminal/trust-workspace', {
+                method: 'POST',
+                headers: { 'Content-Type': 'application/json' },
+                body: JSON.stringify({ path: p.trustPath || safePath }),
+              });
+              const d = await r.json();
+              if (d.ok) {
+                p.trusted = true;
+                renderProjectList();
+              } else {
+                $btn.disabled = false;
+                $btn.textContent = 'Trust workspace';
+                $error.textContent = d.error || 'Trust failed';
+              }
+            } catch {
+              $btn.disabled = false;
+              $btn.textContent = 'Trust workspace';
+              $error.textContent = 'Trust failed';
+            }
+          });
+          card.appendChild(trustRow);
+        } else if (p.trusted) {
+          const okRow = document.createElement('div');
+          okRow.style.cssText = 'font-size:11px;color:rgba(109,213,140,0.8)';
+          okRow.textContent = '✓ Workspace trusted';
+          card.appendChild(okRow);
+        }
         card.querySelector('.onboard-project-remove').addEventListener('click', () => {
           wizardState.projects.splice(i, 1);
           renderProjectList();
@@ -2212,15 +2255,16 @@ document.getElementById('buildBtn').addEventListener('click', async () => {
 
     // Register via API
     $addBtn.innerHTML = '<div class="spinner" style="width:14px;height:14px"></div> Registering...';
+    let integData = null;
     try {
       const res = await fetch('/api/claude-code/integrations', {
         method: 'POST',
         headers: { 'Content-Type': 'application/json' },
         body: JSON.stringify({ target: 'project', projectPath: folderPath, label }),
       });
-      const data = await res.json();
-      if (!data.ok) {
-        $error.textContent = data.error || 'Failed to register project.';
+      integData = await res.json();
+      if (!integData.ok) {
+        $error.textContent = integData.error || 'Failed to register project.';
         $addBtn.disabled = false;
         $addBtn.innerHTML = origHTML;
         return;
@@ -2232,7 +2276,12 @@ document.getElementById('buildBtn').addEventListener('click', async () => {
       return;
     }
 
-    wizardState.projects.push({ path: folderPath, label });
+    const projectEntry = { path: folderPath, label };
+    if (integData && integData.dubiousOwnership && integData.trustPath) {
+      projectEntry.dubiousOwnership = true;
+      projectEntry.trustPath = integData.trustPath;
+    }
+    wizardState.projects.push(projectEntry);
     $addBtn.disabled = false;
     $addBtn.innerHTML = origHTML;
     renderProjectList();

package/neural-interface/public/shared/ocp/ocp-render.js

@@ -1620,21 +1620,25 @@ export function renderToolActivityDock(tab, panelRoot, callbacks = {}) {
           Agents
         </span>
         <span class="ocp-activity-header-count">${runningCount ? `${runningCount}/` : ''}${totalCount}</span>
+        <button class="ocp-activity-header-hide" type="button" title="Collapse (Ctrl+Shift+A)" aria-label="Close agents drawer">×</button>
       </div>
       <div class="ocp-activity-list">
         ${entries.map(e => activityRowHtml(e, { expanded: !!expandedMap[e.key] })).join('')}
       </div>
     </div>
     <button class="${tagClass}" title="${escAttr(tagTitle)}" type="button">
-      <span class="ocp-activity-tag-dot"></span>
-      <span class="ocp-activity-tag-count">${tagCount}</span>
-      <span class="ocp-activity-tag-label">${runningCount > 0 ? 'Running' : 'Agents'}</span>
+      ${runningCount > 0 ? '<span class="ocp-activity-tag-dot"></span>' : ''}
+      <span class="ocp-activity-tag-count">${tagCount} ${runningCount > 0 ? 'RUN' : 'AGT'}</span>
     </button>
   `;
 
   dock.querySelector('.ocp-activity-tag')?.addEventListener('click', () => {
     if (typeof onToggle === 'function') onToggle(!isOpen);
   });
+  dock.querySelector('.ocp-activity-header-hide')?.addEventListener('click', (ev) => {
+    ev.stopPropagation();
+    if (typeof onToggle === 'function') onToggle(false);
+  });
 
   dock.querySelectorAll('.ocp-activity-row').forEach((row) => {
     const agentKey = row.dataset.agentKey;

package/neural-interface/public/shared/ocp/ocp-styles.js

@@ -2024,72 +2024,64 @@ export function injectStyles() {
       border-color: rgba(232,224,220,0.35);
     }
 
-    /* ── Tool activity dock (left edge, bottom-anchored) ── */
+    /* ── Tool activity dock (sibling surface, matches Claude todo dock aesthetic) ── */
     .ocp-activity-dock {
       position: absolute;
-      bottom: 72px;
+      bottom: 0;
       right: calc(100% + 6px);
       display: flex;
+      flex-direction: row-reverse;
       align-items: flex-end;
-      z-index: 3;
+      z-index: 20;
       pointer-events: none;
+      max-height: 100%;
     }
     .ocp-activity-tag {
       pointer-events: auto;
       display: flex;
       flex-direction: column;
       align-items: center;
-      justify-content: center;
-      gap: 4px;
-      padding: 10px 8px;
-      min-height: 64px;
-      border: none;
-      border-radius: 10px 0 0 10px;
-      background: linear-gradient(180deg, rgba(26, 26, 32, 0.88), rgba(16, 16, 20, 0.92));
-      backdrop-filter: blur(14px);
-      -webkit-backdrop-filter: blur(14px);
-      box-shadow: inset 1px 0 0 rgba(255, 255, 255, 0.06), -2px 0 10px rgba(0, 0, 0, 0.18);
+      gap: 5px;
+      padding: 9px 6px;
+      background: rgba(18, 18, 20, 0.92);
+      backdrop-filter: blur(60px) saturate(1.5);
+      -webkit-backdrop-filter: blur(60px) saturate(1.5);
+      border: 0.5px solid rgba(255, 255, 255, 0.06);
+      border-radius: 10px;
       color: rgba(232, 224, 220, 0.78);
-      font-size: 11px;
-      font-weight: 600;
-      font-variant-numeric: tabular-nums;
       cursor: pointer;
-      transition: background 0.2s ease, color 0.2s ease;
+      font-family: 'JetBrains Mono', monospace;
+      font-variant-numeric: tabular-nums;
+      box-shadow:
+        0 0 0 0.5px rgba(0, 0, 0, 0.3),
+        0 1px 2px rgba(0, 0, 0, 0.15),
+        0 4px 8px rgba(0, 0, 0, 0.12),
+        0 12px 24px rgba(0, 0, 0, 0.14);
+      transition: background 0.15s, border-color 0.15s, color 0.15s;
     }
     .ocp-activity-tag:hover {
-      background: linear-gradient(180deg, rgba(32, 32, 40, 0.92), rgba(22, 22, 28, 0.94));
-      color: rgba(232, 224, 220, 1);
-    }
-    .ocp-activity-tag.running {
-      color: #b5edc1;
+      background: rgba(28, 26, 22, 0.94);
+      border-color: rgba(255, 255, 255, 0.12);
+      color: rgba(232, 224, 220, 0.98);
     }
+    .ocp-activity-tag.running { color: #b5edc1; }
     .ocp-activity-tag-dot {
-      width: 7px;
-      height: 7px;
+      width: 5px;
+      height: 5px;
       border-radius: 50%;
       background: rgba(232, 224, 220, 0.45);
     }
     .ocp-activity-tag.running .ocp-activity-tag-dot {
       background: #6fd18a;
-      box-shadow: 0 0 8px rgba(111, 209, 138, 0.7);
+      box-shadow: 0 0 6px rgba(111, 209, 138, 0.7);
       animation: ocp-activity-pulse 1.4s ease-in-out infinite;
     }
     .ocp-activity-tag-count {
-      font-size: 12px;
-      font-weight: 700;
-    }
-    .ocp-activity-tag-label {
-      font-size: 9px;
-      font-weight: 600;
-      letter-spacing: 0.06em;
-      text-transform: uppercase;
+      font-size: 9.5px;
       writing-mode: vertical-rl;
       transform: rotate(180deg);
-      color: rgba(232, 224, 220, 0.5);
-      margin-top: 2px;
-    }
-    .ocp-activity-tag.running .ocp-activity-tag-label {
-      color: rgba(181, 237, 193, 0.8);
+      letter-spacing: 0.04em;
+      opacity: 0.85;
     }
 
     .ocp-activity-drawer {
@@ -2098,19 +2090,45 @@ export function injectStyles() {
       max-width: 0;
       overflow: hidden;
       opacity: 0;
-      background: linear-gradient(180deg, rgba(22, 22, 28, 0.92), rgba(14, 14, 18, 0.94));
-      backdrop-filter: blur(18px);
-      -webkit-backdrop-filter: blur(18px);
-      border-radius: 12px 0 0 12px;
-      box-shadow: inset 1px 0 0 rgba(255, 255, 255, 0.06), -6px 6px 22px rgba(0, 0, 0, 0.3);
-      margin-right: -1px;
-      transition: width 0.24s cubic-bezier(0.22, 1, 0.36, 1), max-width 0.24s cubic-bezier(0.22, 1, 0.36, 1), opacity 0.18s ease;
+      background: rgba(18, 18, 20, 0.92);
+      backdrop-filter: blur(60px) saturate(1.5);
+      -webkit-backdrop-filter: blur(60px) saturate(1.5);
+      border: 0.5px solid rgba(255, 255, 255, 0.06);
+      border-radius: 14px;
+      box-shadow:
+        0 0 0 0.5px rgba(0, 0, 0, 0.3),
+        0 1px 2px rgba(0, 0, 0, 0.15),
+        0 4px 8px rgba(0, 0, 0, 0.12),
+        0 12px 24px rgba(0, 0, 0, 0.14),
+        0 32px 64px rgba(0, 0, 0, 0.18);
+      display: flex;
+      flex-direction: column;
+      margin-right: 6px;
+      max-height: 100%;
+      transition: width 0.22s cubic-bezier(0.2, 0, 0.2, 1), max-width 0.22s cubic-bezier(0.2, 0, 0.2, 1), opacity 0.18s ease;
     }
     .ocp-activity-dock.open .ocp-activity-drawer {
       width: 320px;
       max-width: 320px;
       opacity: 1;
     }
+    .ocp-activity-dock.open .ocp-activity-tag { display: none; }
+    .ocp-activity-header-hide {
+      margin-left: 6px;
+      background: none;
+      border: none;
+      color: rgba(232, 224, 220, 0.55);
+      cursor: pointer;
+      font-size: 15px;
+      line-height: 1;
+      padding: 2px 5px;
+      border-radius: 4px;
+      transition: background 0.12s, color 0.12s;
+    }
+    .ocp-activity-header-hide:hover {
+      color: rgba(232, 224, 220, 1);
+      background: rgba(255, 255, 255, 0.06);
+    }
     .ocp-activity-header {
       padding: 12px 14px 8px;
       font-size: 10px;
@@ -2119,14 +2137,15 @@ export function injectStyles() {
       text-transform: uppercase;
       color: rgba(232, 224, 220, 0.55);
       display: flex;
-      justify-content: space-between;
       align-items: center;
+      gap: 8px;
       border-bottom: 1px solid rgba(255, 255, 255, 0.05);
     }
     .ocp-activity-header-title {
       display: inline-flex;
       align-items: center;
       gap: 7px;
+      margin-right: auto;
     }
     .ocp-activity-header-dot {
       width: 6px;

package/neural-interface/public/shared/ocp/ocp-tabs.js

@@ -761,6 +761,10 @@ export async function sendMessage(content, options = {}) {
         removeThinking(container);
         finalizeStreamingMessage(container);
       }
+      // Mark this assistant message as rendered so late terminal SSE
+      // message.updated events (which arrive after POST resolves on some
+      // Windows/model combos) don't re-stream the full payload into a new bubble.
+      if (info.id) _renderedAssistantMsgIds.add(info.id);
       tab.running = false;
       tab.turnStartedAt = 0;
       if (info.tokens || info.usage) {
@@ -1186,6 +1190,10 @@ export function handleSSEEvent(eventType, event) {
         removeThinking(container);
         finalizeStreamingMessage(container);
         _partTypes.clear();
+        // Only mark the ID as rendered at the terminal signal (tokens/usage
+        // arrived or status is explicitly terminal). Mid-turn message.updated
+        // events may fire before streaming starts and shouldn't lock out later
+        // part.delta / part.updated events.
         if (assistantMid && (explicitTerminal || info.tokens || info.usage)) {
           _renderedAssistantMsgIds.add(assistantMid);
         }
@@ -1215,6 +1223,8 @@ export function handleSSEEvent(eventType, event) {
     // Streaming text delta — the primary streaming event from OpenCode
     case 'message.part.delta': {
       if (_userMsgIds.has(event.messageID)) break; // skip user message echoes
+      // Skip deltas for assistant messages already finalized (late echoes).
+      if (event.messageID && _renderedAssistantMsgIds.has(event.messageID)) break;
       if (event.delta) {
         const partType = String(event.part?.type || event.partType || _partTypes.get(event.partID) || '').trim().toLowerCase();
         const isReasoning = partType === 'reasoning' || partType === 'thinking' || partType === 'thought';
@@ -1249,7 +1259,11 @@ export function handleSSEEvent(eventType, event) {
         update();
       } else if (updatedType === 'text') {
         const hasStreaming = container.querySelector('.ocp-msg-assistant.streaming');
-        if (!hasStreaming) {
+        // Skip the fallback render if this assistant message has already been
+        // finalized by POST response or a prior message.updated — otherwise we
+        // create a duplicate bubble when late text part.updated events arrive.
+        const partMsgId = part.messageID || part.messageId;
+        if (!hasStreaming && !(partMsgId && _renderedAssistantMsgIds.has(partMsgId))) {
           renderAssistantPayload(container, part, { textMode: 'stream' });
         }
         setTurnStatus(tab, 'Writing response…', tabStatusDetail(tab));

package/neural-interface/public/shared/styles.css

@@ -13868,6 +13868,23 @@
   }
   .fe-modal-confirm:hover { background: rgba(229,115,115,0.35); color: #ffab91; }
 
+  /* ── Trust-workspace modal (amber accent, different from destructive red) ── */
+  .fe-trust-modal .fe-modal-title { color: #ffb74d; }
+  .fe-trust-modal .fe-modal-confirm { background: rgba(255,183,77,0.18); color: #ffcc80; }
+  .fe-trust-modal .fe-modal-confirm:hover { background: rgba(255,183,77,0.3); color: #ffe0b2; }
+  .fe-trust-modal .fe-modal-confirm:disabled { opacity: 0.5; cursor: default; }
+  .fe-trust-path {
+    margin-top: 10px;
+    padding: 8px 10px;
+    background: rgba(0,0,0,0.3);
+    border: 1px solid rgba(255,255,255,0.08);
+    border-radius: 6px;
+    font-family: var(--font-mono, ui-monospace, monospace);
+    font-size: 11px;
+    color: rgba(255,255,255,0.6);
+    word-break: break-all;
+  }
+
   /* ── Color palette popup ── */
   .fe-color-palette {
     position: absolute;

package/neural-interface/public/shared/ui-file-explorer.js

@@ -648,7 +648,13 @@ async function addProjectFlow() {
 
     // Register as a project
     const label = data.path.split(/[\\/]/).pop() || data.path;
-    await fetch('/api/claude-code/integrations', { method: 'POST', headers: { 'Content-Type': 'application/json' }, body: JSON.stringify({ target: 'project', projectPath: data.path, label }) });
+    const integRes = await fetch('/api/claude-code/integrations', { method: 'POST', headers: { 'Content-Type': 'application/json' }, body: JSON.stringify({ target: 'project', projectPath: data.path, label }) });
+    const integData = await integRes.json().catch(() => ({}));
+
+    // Windows git CVE-2022-24765 safe.directory prompt — only fires when server detected the specific error.
+    if (integData && integData.dubiousOwnership && integData.trustPath) {
+      await promptTrustWorkspace(integData.trustPath);
+    }
 
     // Refresh projects list and select the new one
     await fetchProjects();
@@ -665,6 +671,67 @@ async function addProjectFlow() {
   }
 }
 
+function promptTrustWorkspace(trustPath) {
+  return new Promise((resolve) => {
+    const existing = document.getElementById('fe-trust-modal');
+    if (existing) existing.remove();
+
+    const overlay = document.createElement('div');
+    overlay.id = 'fe-trust-modal';
+    overlay.className = 'fe-modal-overlay';
+
+    const modal = document.createElement('div');
+    modal.className = 'fe-modal fe-trust-modal';
+    modal.innerHTML = `
+      <div class="fe-modal-title">Git ownership mismatch</div>
+      <div class="fe-modal-body">
+        Git is refusing to read this workspace because it's owned by a different user account. Trusting it adds the directory to your global <code>safe.directory</code> config so Synabun's git UI can show the branch and changes.
+        <div class="fe-trust-path" id="fe-trust-path"></div>
+      </div>
+      <div class="fe-modal-actions">
+        <button class="fe-modal-btn fe-modal-cancel" id="fe-trust-skip">Skip</button>
+        <button class="fe-modal-btn fe-modal-confirm" id="fe-trust-confirm">Trust workspace</button>
+      </div>
+    `;
+    overlay.appendChild(modal);
+    document.body.appendChild(overlay);
+    modal.querySelector('#fe-trust-path').textContent = trustPath;
+
+    requestAnimationFrame(() => overlay.classList.add('fe-modal-overlay--in'));
+
+    const done = () => {
+      overlay.classList.remove('fe-modal-overlay--in');
+      setTimeout(() => overlay.remove(), 150);
+      document.removeEventListener('keydown', onKey);
+      resolve();
+    };
+    const onKey = (ev) => { if (ev.key === 'Escape') done(); };
+    document.addEventListener('keydown', onKey);
+
+    modal.querySelector('#fe-trust-skip').addEventListener('click', done);
+    overlay.addEventListener('click', (ev) => { if (ev.target === overlay) done(); });
+
+    modal.querySelector('#fe-trust-confirm').addEventListener('click', async () => {
+      const btn = modal.querySelector('#fe-trust-confirm');
+      btn.disabled = true;
+      btn.textContent = 'Trusting...';
+      try {
+        const res = await fetch('/api/terminal/trust-workspace', {
+          method: 'POST',
+          headers: { 'Content-Type': 'application/json' },
+          body: JSON.stringify({ path: trustPath }),
+        });
+        const data = await res.json();
+        if (data.ok) showToast('Workspace trusted');
+        else showToast(data.error || 'Trust failed');
+      } catch {
+        showToast('Trust failed');
+      }
+      done();
+    });
+  });
+}
+
 function initProjectSelector() {
   const btn = $('fe-project-btn');
   const wrap = $('fe-project-selector');
@@ -1704,21 +1771,21 @@ function focusEditorLocation(lineNum, columnNum = 1) {
   syncGutterScroll();
 }
 
-async function openFileEditor(filePath, opts = {}) {
-  try {
-    const normalizedPath = String(filePath || '').replace(/\\/g, '/');
-    const res = await fetch(`/api/file-content?path=${encodeURIComponent(filePath)}`);
-    const data = await res.json();
-    if (!res.ok) {
-      const isOpencodeConfig = normalizedPath.endsWith('/.config/opencode/config.json');
-      const isAllowlistMiss = res.status === 403 && data?.error === 'Path outside registered project roots';
-      if (isOpencodeConfig && isAllowlistMiss) {
-        showToast('Restart Synabun to apply OpenCode config editor support');
-        return;
-      }
-      showToast(data.error || 'Cannot open file');
-      return;
-    }
+async function openFileEditor(filePath, opts = {}) {
+  try {
+    const normalizedPath = String(filePath || '').replace(/\\/g, '/');
+    const res = await fetch(`/api/file-content?path=${encodeURIComponent(filePath)}`);
+    const data = await res.json();
+    if (!res.ok) {
+      const isOpencodeConfig = normalizedPath.endsWith('/.config/opencode/config.json');
+      const isAllowlistMiss = res.status === 403 && data?.error === 'Path outside registered project roots';
+      if (isOpencodeConfig && isAllowlistMiss) {
+        showToast('Restart Synabun to apply OpenCode config editor support');
+        return;
+      }
+      showToast(data.error || 'Cannot open file');
+      return;
+    }
 
     _editorOpen = true;
     _editorFilePath = data.path;

package/neural-interface/public/shared/ui-settings.js

@@ -2269,6 +2269,7 @@ function buildProjectsTab(ccIntegrations) {
                   </div>
                   <div class="cc-panel-actions">
                     <button class="cc-explore-btn" data-cc-explore="${i}" style="background:var(--accent-blue-bg);border:1px solid var(--accent-blue-border);color:var(--accent-blue);padding:5px 12px;border-radius:4px;cursor:pointer;font-size:12px">Learn it</button>
+                    <button class="cc-trust-btn" data-cc-trust="${i}" title="Add this workspace to git safe.directory (fixes 'dubious ownership' errors)" style="background:rgba(255,183,77,0.14);border:1px solid rgba(255,183,77,0.3);color:#ffcc80;padding:5px 12px;border-radius:4px;cursor:pointer;font-size:12px">Trust workspace</button>
                     <button class="cc-enable-btn${p.installed ? ' on' : ''}" data-cc-project-toggle="${i}">${p.installed ? 'Enabled' : 'Enable'}</button>
                     <button class="cc-remove-panel-btn" data-cc-remove="${i}">Remove</button>
                   </div>
@@ -6147,6 +6148,43 @@ export async function openSettingsModal() {
     });
   });
 
+  // Trust workspace (adds to git safe.directory global config)
+  overlay.querySelectorAll('.cc-trust-btn[data-cc-trust]').forEach(btn => {
+    btn.addEventListener('click', async (e) => {
+      e.stopPropagation();
+      const idx = btn.dataset.ccTrust;
+      const panel = overlay.querySelector(`.cc-panel[data-cc-idx="${idx}"]`);
+      const projectPath = panel?.dataset.ccPath;
+      if (!projectPath) return;
+      const origText = btn.textContent;
+      btn.disabled = true;
+      btn.textContent = 'Trusting...';
+      try {
+        const res = await fetch('/api/terminal/trust-workspace', {
+          method: 'POST',
+          headers: { 'Content-Type': 'application/json' },
+          body: JSON.stringify({ path: projectPath }),
+        });
+        const data = await res.json();
+        if (data.ok) {
+          btn.textContent = '✓ Trusted';
+          btn.style.background = 'rgba(109,213,140,0.14)';
+          btn.style.borderColor = 'rgba(109,213,140,0.3)';
+          btn.style.color = '#a5d6a7';
+          setTimeout(() => { btn.disabled = false; btn.textContent = 'Trust workspace'; btn.style.background = 'rgba(255,183,77,0.14)'; btn.style.borderColor = 'rgba(255,183,77,0.3)'; btn.style.color = '#ffcc80'; }, 2500);
+        } else {
+          btn.disabled = false;
+          btn.textContent = origText;
+          alert('Trust failed: ' + (data.error || 'unknown error'));
+        }
+      } catch (err) {
+        btn.disabled = false;
+        btn.textContent = origText;
+        alert('Trust failed: ' + err.message);
+      }
+    });
+  });
+
   // Remove project
   overlay.querySelectorAll('.cc-remove-panel-btn[data-cc-remove]').forEach(btn => {
     btn.addEventListener('click', async (e) => {

package/neural-interface/server.js

@@ -95,7 +95,20 @@ dotenvConfig({ path: resolve(process.env.SYNABUN_DATA_HOME || resolve(__dirname,
 
 const app = express();
 const SERVER_BOOT_ID = randomUUID();
-app.use(express.json({ limit: '5mb' }));
+app.use(express.json({ limit: '25mb' }));
+
+// Clean body-parser error handler: ui-state / whiteboard persist base64 images and can
+// exceed the JSON limit. Default Express handler dumps a 10-line raw-body stack with no
+// URL — this logs one line with context and responds 413 instead.
+app.use((err, req, res, next) => {
+  if (err && (err.type === 'entity.too.large' || err.type === 'entity.parse.failed')) {
+    const len = req.headers['content-length'] || '?';
+    console.warn(`[body-parser] ${err.type} ${req.method} ${req.originalUrl || req.url} content-length=${len} limit=${err.limit || '?'}`);
+    if (!res.headersSent) res.status(err.status || 413).json({ error: err.type, limit: err.limit });
+    return;
+  }
+  next(err);
+});
 
 // Block tunnel traffic from accessing anything except /mcp and /invite
 // Cloudflared adds CF-Connecting-IP header on proxied requests
@@ -3814,8 +3827,8 @@ let _ocpBootReconcileTried = false;
 let _ocpLastBootAt = 0;           // Date.now() when serve process last became ready
 let _ocpAuthReconciling = false;  // prevent concurrent reconciliation
 
-// ── Verbose trace logging (toggle with OCP_VERBOSE=0 to disable) ──
-const OCP_VERBOSE = process.env.OCP_VERBOSE !== '0';
+// ── Verbose trace logging (opt-in: OCP_VERBOSE=1 to enable) ──
+const OCP_VERBOSE = process.env.OCP_VERBOSE === '1';
 let _ocpTraceSeq = 0;
 function _ocpNow() { return Number(process.hrtime.bigint() / 1_000_000n); }
 function _ocpMs(start) { return _ocpNow() - start; }
@@ -12742,6 +12755,18 @@ app.post('/api/claude-code/integrations', (req, res) => {
       // Create default category tree for the project (parent + children)
       try { ensureProjectCategories(); } catch {}
 
+      // Probe for git "dubious ownership" — signals the UI to show an explicit trust prompt.
+      // Only relevant on Windows when the project dir is owned by a different SID than the
+      // account running Node (external drives, copied repos, etc.). No-op on Mac/Linux.
+      let dubiousOwnership = false;
+      let trustPath = null;
+      try {
+        if (detectDubiousOwnership(normalized)) {
+          dubiousOwnership = true;
+          trustPath = normalizeGitPath(normalized);
+        }
+      } catch { /* non-critical */ }
+
       // Auto-create greeting config entry for the new project
       try {
         const greetingKey = projectLabel.toLowerCase().replace(/[^a-z0-9]+/g, '-').replace(/^-|-$/g, '');
@@ -12761,7 +12786,7 @@ app.post('/api/claude-code/integrations', (req, res) => {
         }
       } catch { /* non-critical */ }
 
-      return res.json({ ok: true, message: `Hook enabled for ${basename(normalized)}.` });
+      return res.json({ ok: true, message: `Hook enabled for ${basename(normalized)}.`, dubiousOwnership, trustPath });
     }
 
     res.status(400).json({ error: 'Invalid target. Use "global" or "project".' });
@@ -17072,27 +17097,132 @@ app.get('/api/terminal/sessions/:id/claude-session', (req, res) => {
 
 // ── Terminal file tree ──
 
+const IS_WINDOWS = process.platform === 'win32';
+let _gitMissingLogged = false;
+let _gitExePath = null;   // Cached absolute path — preferring .exe on Windows
+let _gitResolved = false;
+
+// Resolve git's absolute path at first use. On Windows, `where git` lists all matches;
+// prefer .exe so spawnSync works without cmd.exe quoting issues. On Unix, use `command -v`.
+function resolveGitPath() {
+  if (_gitResolved) return _gitExePath;
+  _gitResolved = true;
+  try {
+    const cmd = IS_WINDOWS ? 'where git' : 'command -v git';
+    const out = execSync(cmd, { encoding: 'utf8', timeout: 3000, windowsHide: true, stdio: ['ignore', 'pipe', 'ignore'] }).trim();
+    const lines = out.split(/\r?\n/).map(l => l.trim()).filter(Boolean);
+    if (IS_WINDOWS) {
+      _gitExePath = lines.find(l => /\.exe$/i.test(l)) || lines[0] || null;
+    } else {
+      _gitExePath = lines[0] || null;
+    }
+    if (_gitExePath) console.log(`[git] resolved: ${_gitExePath}`);
+    else console.warn('[git] resolver returned no paths');
+  } catch (err) {
+    console.warn('[git] resolution failed:', err?.message || String(err));
+    _gitExePath = null;
+  }
+  return _gitExePath;
+}
+
+// Cross-platform git invocation. Uses resolved absolute path when possible (spawnable
+// directly on all OSes with no shell/quoting pitfalls). Falls back to `shell: true` on
+// Windows only when path resolution fails or when the resolved target is a .cmd/.bat shim.
+function spawnGit(args, opts = {}) {
+  const baseOpts = { stdio: 'pipe', timeout: 5000, windowsHide: true, ...opts };
+  const gitPath = resolveGitPath();
+  if (gitPath) {
+    if (IS_WINDOWS && /\.(cmd|bat)$/i.test(gitPath)) {
+      const quoted = args.map(a => /[\s()%&|<>^"']/.test(a) ? `"${String(a).replace(/"/g, '\\"')}"` : a);
+      return spawnSync(gitPath, quoted, { ...baseOpts, shell: true });
+    }
+    return spawnSync(gitPath, args, baseOpts);
+  }
+  if (IS_WINDOWS) {
+    const quoted = args.map(a => /[\s()%&|<>^"']/.test(a) ? `"${String(a).replace(/"/g, '\\"')}"` : a);
+    return spawnSync('git', quoted, { ...baseOpts, shell: true });
+  }
+  return spawnSync('git', args, baseOpts);
+}
+
+function logGitFailure(where, err) {
+  const msg = err?.stderr?.toString?.() || err?.message || String(err);
+  if (!msg || /not a git repository/i.test(msg)) return;
+  if (/ENOENT/i.test(msg) || /is not recognized/i.test(msg) || /command not found/i.test(msg)) {
+    if (_gitMissingLogged) return;
+    _gitMissingLogged = true;
+    console.warn(`[git] '${where}' failed: git executable not found on PATH. Install Git and ensure it's on the Node process PATH.`);
+    return;
+  }
+  console.warn(`[git] '${where}' failed:`, msg.trim().split('\n')[0]);
+}
+
+// Startup probe — always logs git status so Windows users can see whether git works at all.
+setImmediate(() => {
+  const probe = spawnGit(['--version'], { timeout: 3000 });
+  if (probe.status === 0) {
+    console.log(`[git] ${probe.stdout.toString().trim()} — OK`);
+  } else {
+    const msg = probe.stderr?.toString?.()?.trim() || probe.error?.message || 'unknown error';
+    console.warn(`[git] startup probe FAILED: ${msg}. File explorer git UI will be hidden.`);
+  }
+});
+
+// Git "dubious ownership" detection — CVE-2022-24765 safety check refuses to operate on
+// repos owned by a different OS user/SID. Common on Windows external drives or repos
+// copied from another machine. Returns true only when git emits the specific error.
+function detectDubiousOwnership(dir) {
+  const r = spawnGit(['rev-parse', '--is-inside-work-tree'], { cwd: dir, timeout: 3000 });
+  if (r.status === 0) return false;
+  const stderr = r.stderr?.toString?.() || '';
+  return /dubious ownership|safe\.directory/i.test(stderr);
+}
+
+// Normalize a filesystem path for `git config --add safe.directory` — forward-slashed
+// absolute path, no trailing slash.
+function normalizeGitPath(dir) {
+  return String(dir).replace(/\\/g, '/').replace(/\/+$/, '');
+}
+
 /** Try to get git status for a directory. Returns { branch, statuses } or null. */
 function getGitInfo(dir) {
-  try {
-    // Check if inside a git work tree
-    execSync('git rev-parse --is-inside-work-tree', { cwd: dir, stdio: 'pipe', timeout: 3000 });
+  // Check if inside a git work tree (spawnGit for consistent path resolution)
+  const inside = spawnGit(['rev-parse', '--is-inside-work-tree'], { cwd: dir, timeout: 3000 });
+  if (inside.status !== 0) {
+    logGitFailure('rev-parse --is-inside-work-tree', inside.error || { stderr: inside.stderr });
+    return null;
+  }
 
-    // Get branch name
-    let branch = '';
-    try {
-      branch = execSync('git branch --show-current', { cwd: dir, stdio: 'pipe', timeout: 3000 }).toString().trim();
-      if (!branch) {
-        // Detached HEAD — get short SHA
-        branch = execSync('git rev-parse --short HEAD', { cwd: dir, stdio: 'pipe', timeout: 3000 }).toString().trim();
-      }
-    } catch {}
+  // Get branch name — try --show-current first (git 2.22+), then fall back to
+  // --abbrev-ref HEAD (works on older git; detached HEAD returns the literal "HEAD"),
+  // then short SHA for detached HEAD. The chained fallback is essential for Windows users
+  // with older Git for Windows installs where --show-current exits non-zero.
+  let branch = '';
+  const showCurrent = spawnGit(['branch', '--show-current'], { cwd: dir, timeout: 3000 });
+  if (showCurrent.status === 0) {
+    branch = showCurrent.stdout.toString().trim();
+  } else {
+    logGitFailure('branch --show-current', showCurrent.error || { stderr: showCurrent.stderr });
+  }
+  if (!branch) {
+    const abbrev = spawnGit(['rev-parse', '--abbrev-ref', 'HEAD'], { cwd: dir, timeout: 3000 });
+    if (abbrev.status === 0) {
+      const b = abbrev.stdout.toString().trim();
+      if (b && b !== 'HEAD') branch = b;
+    }
+  }
+  if (!branch) {
+    const shortSha = spawnGit(['rev-parse', '--short', 'HEAD'], { cwd: dir, timeout: 3000 });
+    if (shortSha.status === 0) branch = shortSha.stdout.toString().trim();
+  }
 
+  try {
     // Get status for this directory (porcelain v1: XY <path>)
-    // spawnSync over execSync — execSync's 1MB default maxBuffer overflows on repos with very large
-    // status output (e.g. tracked browser-profile caches), throwing ENOBUFS and silently disabling git UI.
-    const statusResult = spawnSync('git', ['status', '--porcelain', '-u', '.'], { cwd: dir, stdio: 'pipe', timeout: 5000, maxBuffer: 256 * 1024 * 1024 });
-    if (statusResult.status !== 0) return { branch, statuses: new Map() };
+    const statusResult = spawnGit(['status', '--porcelain', '-u', '.'], { cwd: dir, maxBuffer: 256 * 1024 * 1024 });
+    if (statusResult.status !== 0) {
+      logGitFailure('status --porcelain', statusResult.error || { stderr: statusResult.stderr });
+      return { branch, statuses: new Map() };
+    }
     const raw = statusResult.stdout.toString();
     const statuses = new Map(); // name → status code
 
@@ -17130,8 +17260,9 @@ function getGitInfo(dir) {
     }
 
     return { branch, statuses };
-  } catch {
-    return null;
+  } catch (err) {
+    logGitFailure('getGitInfo status-parse', err);
+    return { branch, statuses: new Map() };
   }
 }
 
@@ -17213,23 +17344,36 @@ app.get('/api/terminal/branches', (req, res) => {
   const dir = req.query.path;
   if (!dir || typeof dir !== 'string') return res.status(400).json({ error: 'path required' });
 
-  try {
-    execSync('git rev-parse --is-inside-work-tree', { cwd: dir, stdio: 'pipe', timeout: 3000 });
-  } catch {
+  const inside = spawnGit(['rev-parse', '--is-inside-work-tree'], { cwd: dir, timeout: 3000 });
+  if (inside.status !== 0) {
+    logGitFailure('branches: rev-parse', inside.error || { stderr: inside.stderr });
     return res.json({ branches: [], current: null });
   }
 
   try {
-    // Current branch
+    // Current branch — chained fallback (older git may not support --show-current)
     let current = '';
-    try {
-      current = execSync('git branch --show-current', { cwd: dir, stdio: 'pipe', timeout: 3000 }).toString().trim();
-    } catch {}
-
-    // All local branches — spawnSync with argv so the %(...) format isn't mangled by cmd.exe variable expansion on Windows
-    const branchResult = spawnSync('git', ['branch', '--format=%(refname:short)'], { cwd: dir, stdio: 'pipe', timeout: 5000 });
-    const raw = branchResult.status === 0 ? branchResult.stdout.toString().trim() : '';
-    const branches = raw ? raw.split('\n').map(b => b.trim()).filter(Boolean) : [];
+    const showCurrent = spawnGit(['branch', '--show-current'], { cwd: dir, timeout: 3000 });
+    if (showCurrent.status === 0) current = showCurrent.stdout.toString().trim();
+    else logGitFailure('branches: show-current', showCurrent.error || { stderr: showCurrent.stderr });
+    if (!current) {
+      const abbrev = spawnGit(['rev-parse', '--abbrev-ref', 'HEAD'], { cwd: dir, timeout: 3000 });
+      if (abbrev.status === 0) {
+        const b = abbrev.stdout.toString().trim();
+        if (b && b !== 'HEAD') current = b;
+      }
+    }
+
+    // All local branches — plain `git branch` parsed manually; avoids --format=%(refname:short)
+    // which can get mangled by cmd.exe variable expansion on Windows even with proper quoting.
+    const branchResult = spawnGit(['branch'], { cwd: dir });
+    if (branchResult.status !== 0) logGitFailure('branch list', branchResult.error || { stderr: branchResult.stderr });
+    const raw = branchResult.status === 0 ? branchResult.stdout.toString() : '';
+    // Plain `git branch` output: each line is "  branch" or "* branch" (current). Strip
+    // marker + whitespace. Skip detached-HEAD lines like "* (HEAD detached at abc1234)".
+    const branches = raw.split('\n')
+      .map(l => l.replace(/^[\s*]+/, '').trim())
+      .filter(b => b && !b.startsWith('(') && !b.includes(' -> '));
 
     res.json({ branches, current });
   } catch (err) {
@@ -17237,6 +17381,38 @@ app.get('/api/terminal/branches', (req, res) => {
   }
 });
 
+// Trust a workspace path with git — runs `git config --global --add safe.directory <path>`
+// so git stops refusing to operate on it (CVE-2022-24765 dubious-ownership protection).
+// Triggered by the add-project UI flows when the server detects the dubious-ownership error.
+app.post('/api/terminal/trust-workspace', (req, res) => {
+  const { path: dir } = req.body || {};
+  if (!dir || typeof dir !== 'string') return res.status(400).json({ ok: false, error: 'path required' });
+  if (/[\x00-\x1f]/.test(dir) || dir === '*' || dir === '/' || dir === '\\') {
+    return res.status(400).json({ ok: false, error: 'Invalid path' });
+  }
+  let abs;
+  try {
+    abs = resolve(dir);
+    if (!existsSync(abs)) return res.status(400).json({ ok: false, error: `Directory not found: ${abs}` });
+    if (!statSync(abs).isDirectory()) return res.status(400).json({ ok: false, error: 'Path is not a directory' });
+  } catch (err) {
+    return res.status(400).json({ ok: false, error: err.message });
+  }
+
+  const gitPath = normalizeGitPath(abs);
+  const r = spawnGit(['config', '--global', '--add', 'safe.directory', gitPath]);
+  if (r.status !== 0) {
+    const stderr = r.stderr?.toString?.()?.trim() || r.error?.message || 'git config failed';
+    logGitFailure('config --add safe.directory', r.error || { stderr: r.stderr });
+    return res.status(500).json({ ok: false, error: stderr });
+  }
+
+  // Confirm by re-probing
+  const stillDubious = detectDubiousOwnership(abs);
+  console.log(`[git] trusted workspace: ${gitPath}${stillDubious ? ' (but still flagged — check permissions)' : ''}`);
+  res.json({ ok: true, path: gitPath, stillDubious });
+});
+
 app.post('/api/terminal/checkout', (req, res) => {
   const { path: dir, branch } = req.body;
   if (!dir || !branch) return res.status(400).json({ error: 'path and branch required' });
@@ -17246,26 +17422,25 @@ app.post('/api/terminal/checkout', (req, res) => {
     return res.status(400).json({ error: 'Invalid branch name' });
   }
 
-  try {
-    execSync('git rev-parse --is-inside-work-tree', { cwd: dir, stdio: 'pipe', timeout: 3000 });
-  } catch {
+  const inside = spawnGit(['rev-parse', '--is-inside-work-tree'], { cwd: dir, timeout: 3000 });
+  if (inside.status !== 0) {
+    logGitFailure('checkout: rev-parse', inside.error || { stderr: inside.stderr });
     return res.status(400).json({ error: 'Not a git repository' });
   }
 
-  // Use spawnSync to avoid shell injection — branch passed as argument, not interpolated
-  // No '--' separator — that would make git treat the branch name as a file pathspec
-  const result = spawnSync('git', ['checkout', branch], { cwd: dir, stdio: 'pipe', timeout: 10000 });
-
+  // Branch is validated against /^[\w.\-/]+$/ above, so no shell metacharacters are possible.
+  // No '--' separator — that would make git treat the branch name as a file pathspec.
+  const result = spawnGit(['checkout', branch], { cwd: dir, timeout: 10000 });
   if (result.status !== 0) {
-    const stderr = result.stderr?.toString?.()?.trim() || 'Checkout failed';
+    const stderr = result.stderr?.toString?.()?.trim() || result.error?.message || 'Checkout failed';
     return res.status(500).json({ error: stderr });
   }
 
   // Return confirmed branch name + git's own output
   let current = '';
-  try {
-    current = execSync('git branch --show-current', { cwd: dir, stdio: 'pipe', timeout: 3000 }).toString().trim();
-  } catch {}
+  const showCurrent = spawnGit(['branch', '--show-current'], { cwd: dir, timeout: 3000 });
+  if (showCurrent.status === 0) current = showCurrent.stdout.toString().trim();
+  else logGitFailure('checkout: show-current', showCurrent.error || { stderr: showCurrent.stderr });
   const output = result.stderr?.toString?.()?.trim() || `Switched to branch '${current}'`;
   res.json({ ok: true, branch: current, output });
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "synabun",
-  "version": "2026.4.20-beta.9",
+  "version": "2026.4.21",
   "description": "Persistent vector memory for AI assistants",
   "license": "Apache-2.0",
   "author": "The SynaBun Authors",