@aion0/forge 0.5.15 → 0.5.17

package/.forge/mcp.json

@@ -2,7 +2,7 @@
   "mcpServers": {
     "forge": {
       "type": "sse",
-      "url": "http://localhost:8406/sse?workspaceId=656c9e65-9d73-4cb6-a065-60d966e1fc78"
+      "url": "http://localhost:8406/sse?workspaceId=656c9e65-9d73-4cb6-a065-60d966e1fc78&agentId=engineer-1774920478256"
     }
   }
 }

package/RELEASE_NOTES.md

@@ -1,23 +1,18 @@
-# Forge v0.5.15
+# Forge v0.5.17
 
 Released: 2026-03-31
 
-## Changes since v0.5.14
-
-### Features
-- feat: replace Stop button with Done/Failed/Idle for running agents
-- feat: Claude Code Stop hook for agent completion detection
+## Changes since v0.5.16
 
 ### Bug Fixes
-- fix: suppress session monitor for 10s after manual state change
-- fix: reset session monitor state when task status manually changed
-- fix: stop button resets task to idle for terminal agents, not smith down
-- fix: session monitor fallback timeout to 60min
-- fix: session monitor fallback timeout to 10min
-- fix: session monitor done threshold to 5min (hook is primary detection)
-- fix: add logging to agent-context.json write for debugging
-- fix: hook uses correct Claude Code schema + date-stamped backup
-- fix: hook reads agent context from file instead of env vars
+- fix: reset session monitor on clearTmuxSession + always restart on ensurePersistentSession
+- fix: reset warmup count on startMonitoring and resetState
+- fix: warmup 7 polls — poll 7 sets fresh baseline before real detection
+- fix: warmup 6 polls (~18s) before first running detection
+- fix: poll 3s with 4-poll warmup (12s before first running detection)
+- fix: session monitor poll interval 3s → 6s
+- fix: read fixedSessionId directly from file instead of dynamic import
+- fix: add logging for fixedSession resolution in ensurePersistentSession
 
 
-**Full Changelog**: https://github.com/aiwatching/forge/compare/v0.5.14...v0.5.15
+**Full Changelog**: https://github.com/aiwatching/forge/compare/v0.5.16...v0.5.17

package/app/api/code/route.ts

@@ -89,6 +89,28 @@ export async function GET(req: Request) {
     return NextResponse.json({ error: 'Directory not under any project root' }, { status: 403 });
   }
 
+  // Code search (grep)
+  const searchQuery = searchParams.get('search');
+  if (searchQuery) {
+    try {
+      const { execSync } = require('node:child_process');
+      const safeQuery = searchQuery.replace(/['"\\]/g, '\\$&');
+      // Use grep -rn with limits to prevent huge output
+      const result = execSync(
+        `grep -rn --include='*.ts' --include='*.tsx' --include='*.js' --include='*.jsx' --include='*.py' --include='*.java' --include='*.go' --include='*.rs' --include='*.md' --include='*.json' --include='*.yaml' --include='*.yml' --include='*.css' --include='*.html' --include='*.vue' --include='*.svelte' -m 5 '${safeQuery}' . 2>/dev/null | head -100`,
+        { cwd: resolvedDir, encoding: 'utf-8', timeout: 10000, stdio: ['pipe', 'pipe', 'pipe'] }
+      ).trim();
+      const matches = result ? result.split('\n').map((line: string) => {
+        const match = line.match(/^\.\/(.+?):(\d+):(.*)$/);
+        if (!match) return null;
+        return { file: match[1], line: parseInt(match[2]), content: match[3].trim().slice(0, 200) };
+      }).filter(Boolean) : [];
+      return NextResponse.json({ matches });
+    } catch {
+      return NextResponse.json({ matches: [] });
+    }
+  }
+
   // Git diff for a specific file
   const diffFile = searchParams.get('diff');
   if (diffFile) {

package/app/api/git/route.ts

@@ -34,12 +34,13 @@ export async function GET(req: NextRequest) {
 
   try {
     // Run all git commands in parallel
-    const [branchOut, statusOut, remoteOut, lastCommitOut, logOut] = await Promise.all([
+    const [branchOut, statusOut, remoteOut, lastCommitOut, logOut, branchListOut] = await Promise.all([
       gitAsync('rev-parse --abbrev-ref HEAD', dir),
       gitAsync('status --porcelain -u', dir),
       gitAsync('remote get-url origin', dir),
       gitAsync('log -1 --format="%h %s"', dir),
-      gitAsync('log --format="%h||%s||%an||%ar" -10', dir),
+      gitAsync('log --format="%h||%s||%an||%ar" -20', dir),
+      gitAsync('branch --format="%(refname:short)||%(upstream:short)||%(objectname:short)"', dir),
     ]);
 
     const branch = branchOut;
@@ -59,7 +60,12 @@ export async function GET(req: NextRequest) {
       return { hash, message, author, date };
     }) : [];
 
-    return NextResponse.json({ branch, changes, remote: remoteOut, ahead, behind, lastCommit: lastCommitOut, log });
+    const branches = branchListOut ? branchListOut.split('\n').filter(Boolean).map(line => {
+      const [name, upstream, hash] = line.split('||');
+      return { name, upstream: upstream || '', hash: hash || '', current: name === branch };
+    }) : [];
+
+    return NextResponse.json({ branch, branches, changes, remote: remoteOut, ahead, behind, lastCommit: lastCommitOut, log });
   } catch (e: any) {
     return NextResponse.json({ error: e.message }, { status: 500 });
   }
@@ -120,6 +126,13 @@ export async function POST(req: NextRequest) {
       return NextResponse.json({ ok: true, output });
     }
 
+    if (action === 'checkout') {
+      const branch = body.branch;
+      if (!branch) return NextResponse.json({ error: 'branch required' }, { status: 400 });
+      const out = gitSync(`checkout ${branch}`, dir);
+      return NextResponse.json({ ok: true, output: out });
+    }
+
     if (action === 'stage') {
       if (files && files.length > 0) {
         for (const f of files) gitSync(`add "${f}"`, dir);

package/components/ProjectDetail.tsx

@@ -49,6 +49,7 @@ function highlightLine(line: string): React.ReactNode {
 
 interface GitInfo {
   branch: string;
+  branches: { name: string; upstream: string; hash: string; current: boolean }[];
   changes: { status: string; path: string }[];
   remote: string;
   ahead: number;
@@ -72,6 +73,12 @@ export default memo(function ProjectDetail({ projectPath, projectName, hasGit }:
   const [fileLanguage, setFileLanguage] = useState('');
   const [fileLoading, setFileLoading] = useState(false);
   const [showLog, setShowLog] = useState(false);
+  const [changesExpanded, setChangesExpanded] = useState(false);
+  const [codeSearch, setCodeSearch] = useState('');
+  const [codeSearchResults, setCodeSearchResults] = useState<{ file: string; line: number; content: string }[]>([]);
+  const [codeSearching, setCodeSearching] = useState(false);
+  const [changesHeight, setChangesHeight] = useState(120);
+  const changesResizeRef = useRef<{ startY: number; origH: number } | null>(null);
   const [diffContent, setDiffContent] = useState<string | null>(null);
   const [diffFile, setDiffFile] = useState<string | null>(null);
   const [projectSkills, setProjectSkills] = useState<{ name: string; displayName: string; type: string; scope: string; version: string; installedVersion: string; hasUpdate: boolean; source: 'registry' | 'local' }[]>([]);
@@ -448,7 +455,25 @@ export default memo(function ProjectDetail({ projectPath, projectName, hasGit }:
         <div className="flex items-center gap-2">
           <span className="text-sm font-semibold text-[var(--text-primary)]">{projectName}</span>
           {gitInfo?.branch && (
-            <span className="text-[9px] text-[var(--accent)] bg-[var(--accent)]/10 px-1.5 py-0.5 rounded">{gitInfo.branch}</span>
+            <div className="relative">
+              <select
+                value={gitInfo.branch}
+                onChange={async (e) => {
+                  const branch = e.target.value;
+                  if (branch === gitInfo.branch) return;
+                  try {
+                    await fetch('/api/git', { method: 'POST', headers: { 'Content-Type': 'application/json' }, body: JSON.stringify({ action: 'checkout', dir: projectPath, branch }) });
+                    fetchGitInfo(); fetchTree();
+                  } catch {}
+                }}
+                className="text-[9px] text-[var(--accent)] bg-[var(--accent)]/10 px-1.5 py-0.5 rounded border-none cursor-pointer appearance-none pr-4 focus:outline-none"
+                style={{ backgroundImage: 'url("data:image/svg+xml,%3Csvg xmlns=\'http://www.w3.org/2000/svg\' width=\'8\' height=\'8\' viewBox=\'0 0 8 8\'%3E%3Cpath d=\'M0 2l4 4 4-4z\' fill=\'%2358a6ff\'/%3E%3C/svg%3E")', backgroundRepeat: 'no-repeat', backgroundPosition: 'right 4px center' }}
+              >
+                {(gitInfo.branches || []).map(b => (
+                  <option key={b.name} value={b.name}>{b.name}{b.current ? ' ●' : ''}</option>
+                ))}
+              </select>
+            </div>
           )}
           {gitInfo?.ahead ? <span className="text-[9px] text-green-400">↑{gitInfo.ahead}</span> : null}
           {gitInfo?.behind ? <span className="text-[9px] text-yellow-400">↓{gitInfo.behind}</span> : null}
@@ -645,11 +670,51 @@ export default memo(function ProjectDetail({ projectPath, projectName, hasGit }:
 
       {/* Code content area */}
       {projectTab === 'code' && <div className="flex-1 flex min-h-0 overflow-hidden">
-        {/* File tree */}
-        <div style={{ width: sidebarWidth }} className="overflow-y-auto p-1 shrink-0">
-          {fileTree.map((node: any) => (
-            <FileTreeNode key={node.path} node={node} depth={0} selected={selectedFile} onSelect={openFile} />
-          ))}
+        {/* File tree + search */}
+        <div style={{ width: sidebarWidth }} className="flex flex-col shrink-0">
+          {/* Search input */}
+          <div className="p-1 border-b border-[var(--border)]">
+            <input
+              value={codeSearch}
+              onChange={e => setCodeSearch(e.target.value)}
+              onKeyDown={async e => {
+                if (e.key === 'Enter' && codeSearch.trim()) {
+                  setCodeSearching(true);
+                  try {
+                    const res = await fetch(`/api/code?dir=${encodeURIComponent(projectPath)}&search=${encodeURIComponent(codeSearch.trim())}`);
+                    const data = await res.json();
+                    setCodeSearchResults(data.matches || []);
+                  } catch { setCodeSearchResults([]); }
+                  setCodeSearching(false);
+                }
+                if (e.key === 'Escape') { setCodeSearch(''); setCodeSearchResults([]); }
+              }}
+              placeholder="Search code... (Enter)"
+              className="w-full text-[10px] bg-[var(--bg-tertiary)] border border-[var(--border)] rounded px-2 py-1 text-[var(--text-primary)] focus:outline-none focus:border-[var(--accent)] placeholder-[var(--text-secondary)]"
+            />
+          </div>
+          {/* Search results */}
+          {codeSearchResults.length > 0 && (
+            <div className="overflow-y-auto border-b border-[var(--border)] max-h-60">
+              <div className="px-2 py-0.5 text-[8px] text-[var(--text-secondary)] bg-[var(--bg-tertiary)] sticky top-0 flex items-center justify-between">
+                <span>{codeSearchResults.length} results for "{codeSearch}"</span>
+                <button onClick={() => { setCodeSearch(''); setCodeSearchResults([]); }} className="text-[var(--text-secondary)] hover:text-[var(--text-primary)]">✕</button>
+              </div>
+              {codeSearchResults.map((r, i) => (
+                <div key={i} onClick={() => openFile(r.file)} className="px-2 py-0.5 cursor-pointer hover:bg-[var(--bg-tertiary)] border-b border-[var(--border)]/30">
+                  <div className="text-[9px] text-[var(--accent)] truncate">{r.file}:{r.line}</div>
+                  <div className="text-[8px] text-[var(--text-secondary)] font-mono truncate">{r.content}</div>
+                </div>
+              ))}
+            </div>
+          )}
+          {codeSearching && <div className="px-2 py-1 text-[9px] text-[var(--text-secondary)]">Searching...</div>}
+          {/* File tree */}
+          <div className="overflow-y-auto flex-1 p-1">
+            {fileTree.map((node: any) => (
+              <FileTreeNode key={node.path} node={node} depth={0} selected={selectedFile} onSelect={openFile} />
+            ))}
+          </div>
         </div>
 
         {/* Sidebar resize handle */}
@@ -1299,36 +1364,58 @@ export default memo(function ProjectDetail({ projectPath, projectName, hasGit }:
         <div className="border-t border-[var(--border)] shrink-0">
           {/* Changes list */}
           {gitInfo.changes.length > 0 && (
-            <div className="max-h-32 overflow-y-auto border-b border-[var(--border)]">
-              <div className="px-3 py-1 text-[9px] text-[var(--text-secondary)] bg-[var(--bg-tertiary)] sticky top-0">
-                {gitInfo.changes.length} changes
-              </div>
-              {gitInfo.changes.map(g => (
-                <div key={g.path} className="flex items-center px-3 py-0.5 text-xs hover:bg-[var(--bg-tertiary)] group">
-                  <span className={`text-[10px] font-mono w-4 shrink-0 ${
-                    g.status.includes('M') ? 'text-yellow-500' :
-                    g.status.includes('?') ? 'text-green-500' :
-                    g.status.includes('D') ? 'text-red-500' : 'text-[var(--text-secondary)]'
-                  }`}>
-                    {g.status.includes('?') ? '+' : g.status[0]}
-                  </span>
-                  <button
-                    onClick={() => openDiff(g.path)}
-                    className={`truncate flex-1 text-left ml-1 ${diffFile === g.path ? 'text-[var(--accent)]' : 'text-[var(--text-secondary)] hover:text-[var(--text-primary)]'}`}
-                    title="View diff"
-                  >
-                    {g.path}
-                  </button>
-                  <button
-                    onClick={() => openFile(g.path)}
-                    className="text-[8px] text-[var(--text-secondary)] hover:text-[var(--accent)] opacity-0 group-hover:opacity-100 shrink-0 ml-1"
-                    title="Open source file"
-                  >
-                    src
-                  </button>
+            <>
+              <div className="overflow-y-auto border-b border-[var(--border)]" style={{ height: changesHeight }}>
+                <div className="px-3 py-1 text-[9px] text-[var(--text-secondary)] bg-[var(--bg-tertiary)] sticky top-0 flex items-center gap-1 cursor-pointer z-10" onClick={() => {
+                  setChangesExpanded(!changesExpanded);
+                  setChangesHeight(changesExpanded ? 120 : Math.min(400, gitInfo.changes.length * 22 + 24));
+                }}>
+                  <span>{changesExpanded ? '▼' : '▶'}</span>
+                  <span>{gitInfo.changes.length} changes</span>
+                  <button onClick={(e) => { e.stopPropagation(); fetchGitInfo(); }} className="ml-auto text-[8px] hover:text-[var(--accent)]" title="Refresh">↻</button>
                 </div>
-              ))}
-            </div>
+                {gitInfo.changes.map(g => (
+                  <div key={g.path} className="flex items-center px-3 py-0.5 text-xs hover:bg-[var(--bg-tertiary)] group">
+                    <span className={`text-[10px] font-mono w-4 shrink-0 ${
+                      g.status.includes('M') ? 'text-yellow-500' :
+                      g.status.includes('?') ? 'text-green-500' :
+                      g.status.includes('D') ? 'text-red-500' : 'text-[var(--text-secondary)]'
+                    }`}>
+                      {g.status.includes('?') ? '+' : g.status[0]}
+                    </span>
+                    <button
+                      onClick={() => openDiff(g.path)}
+                      className={`truncate flex-1 text-left ml-1 ${diffFile === g.path ? 'text-[var(--accent)]' : 'text-[var(--text-secondary)] hover:text-[var(--text-primary)]'}`}
+                      title="View diff"
+                    >
+                      {g.path}
+                    </button>
+                    <button
+                      onClick={() => openFile(g.path)}
+                      className="text-[8px] text-[var(--text-secondary)] hover:text-[var(--accent)] opacity-0 group-hover:opacity-100 shrink-0 ml-1"
+                      title="Open source file"
+                    >
+                      src
+                    </button>
+                  </div>
+                ))}
+              </div>
+              {/* Drag handle to resize changes list */}
+              <div
+                className="h-1 cursor-ns-resize hover:bg-[var(--accent)]/30 border-b border-[var(--border)]"
+                onMouseDown={(e) => {
+                  e.preventDefault();
+                  changesResizeRef.current = { startY: e.clientY, origH: changesHeight };
+                  const onMove = (ev: MouseEvent) => {
+                    if (!changesResizeRef.current) return;
+                    setChangesHeight(Math.max(60, Math.min(600, changesResizeRef.current.origH + ev.clientY - changesResizeRef.current.startY)));
+                  };
+                  const onUp = () => { changesResizeRef.current = null; window.removeEventListener('mousemove', onMove); window.removeEventListener('mouseup', onUp); };
+                  window.addEventListener('mousemove', onMove);
+                  window.addEventListener('mouseup', onUp);
+                }}
+              />
+            </>
           )}
 
           {/* Git actions */}

package/lib/workspace/orchestrator.ts

@@ -1633,6 +1633,8 @@ export class WorkspaceOrchestrator extends EventEmitter {
     const entry = this.agents.get(agentId);
     if (!entry) return;
     entry.state.tmuxSession = undefined;
+    // Reset session monitor warmup so it doesn't immediately trigger running on restart
+    this.sessionMonitor?.resetState(agentId);
     this.saveNow();
     this.emitAgentsChanged();
   }
@@ -2151,10 +2153,17 @@ export class WorkspaceOrchestrator extends EventEmitter {
         if (supportsSession) {
           let sessionId: string | undefined;
           if (config.primary) {
+            // Read fixedSessionId directly from file (avoid dynamic import issues in production build)
             try {
-              const { getFixedSession } = await import('../project-sessions') as any;
-              sessionId = getFixedSession(this.projectPath);
-            } catch {}
+              const psPath = join(homedir(), '.forge', 'data', 'project-sessions.json');
+              if (existsSync(psPath)) {
+                const psData = JSON.parse(readFileSync(psPath, 'utf-8'));
+                sessionId = psData[this.projectPath];
+              }
+              console.log(`[daemon] ${config.label}: fixedSession=${sessionId || 'NONE'} for ${this.projectPath}`);
+            } catch (err: any) {
+              console.error(`[daemon] ${config.label}: failed to read fixedSession: ${err.message}`);
+            }
           } else {
             sessionId = config.boundSessionId;
           }
@@ -2255,6 +2264,9 @@ export class WorkspaceOrchestrator extends EventEmitter {
       this.emitAgentsChanged();
     }
 
+    // Always (re-)start session monitor with fresh warmup
+    this.startAgentSessionMonitor(agentId, config);
+
     // Ensure boundSessionId is set (required for session monitor + --resume)
     if (!config.primary && !config.boundSessionId) {
       const bindDelay = sessionAlreadyExists ? 500 : 5000;

package/lib/workspace/session-monitor.ts

@@ -47,6 +47,7 @@ export class SessionFileMonitor extends EventEmitter {
     this.stopMonitoring(agentId);
     this.currentState.set(agentId, 'idle');
     this.lastStableTime.set(agentId, Date.now());
+    this.warmupCount.set(agentId, 0); // reset warmup for fresh start
 
     const timer = setInterval(() => {
       this.checkFile(agentId, sessionFilePath);
@@ -96,6 +97,7 @@ export class SessionFileMonitor extends EventEmitter {
   resetState(agentId: string): void {
     this.currentState.set(agentId, 'idle');
     this.lastStableTime.set(agentId, Date.now());
+    this.warmupCount.set(agentId, 0); // re-warmup after reset
     // Suppress state changes for 10s after manual reset
     this.suppressUntil.set(agentId, Date.now() + 10_000);
   }
@@ -110,20 +112,23 @@ export class SessionFileMonitor extends EventEmitter {
     return join(homedir(), '.claude', 'projects', encoded, `${sessionId}.jsonl`);
   }
 
-  private initialized = new Set<string>();
+  private warmupCount = new Map<string, number>();
   private checkFile(agentId: string, filePath: string): void {
     try {
       const stat = statSync(filePath);
       const mtime = stat.mtimeMs;
       const size = stat.size;
 
-      // First poll: just record baseline, don't trigger state change
-      if (!this.initialized.has(agentId)) {
-        this.initialized.add(agentId);
+      // Warmup: skip first 6 polls (~18s) to avoid false running during startup
+      // On poll 7 (first real check), just set new baseline — don't trigger running
+      const count = (this.warmupCount.get(agentId) || 0) + 1;
+      this.warmupCount.set(agentId, count);
+      if (count <= 7) {
         this.lastMtime.set(agentId, mtime);
         this.lastSize.set(agentId, size);
         this.lastStableTime.set(agentId, Date.now());
-        console.log(`[session-monitor] ${agentId}: baseline mtime=${mtime} size=${size}`);
+        if (count === 1) console.log(`[session-monitor] ${agentId}: warmup started`);
+        if (count === 7) console.log(`[session-monitor] ${agentId}: warmup done, monitoring active`);
         return;
       }
 
@@ -163,8 +168,8 @@ export class SessionFileMonitor extends EventEmitter {
         }
       }
     } catch (err: any) {
-      if (!this.initialized.has(`err-${agentId}`)) {
-        this.initialized.add(`err-${agentId}`);
+      if ((this.warmupCount.get(`err-${agentId}`) || 0) === 0) {
+        this.warmupCount.set(`err-${agentId}`, 1);
         console.log(`[session-monitor] ${agentId}: checkFile error — ${err.message}`);
       }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aion0/forge",
-  "version": "0.5.15",
+  "version": "0.5.17",
   "description": "Unified AI workflow platform — multi-model task orchestration, persistent sessions, web terminal, remote access",
   "type": "module",
   "scripts": {