From 29898d06fa2a07901c917546ede81942d32ea379 Mon Sep 17 00:00:00 2001
From: Salman Muin Kayser Chishti <13schishti@gmail.com>
Date: Fri, 13 Feb 2026 09:19:03 +0000
Subject: [PATCH 01/36] Upgrade GitHub Actions for Node 24 compatibility

Signed-off-by: Salman Muin Kayser Chishti <13schishti@gmail.com>
---
 .github/workflows/electron-build.yml | 18 +++++++++---------
 .github/workflows/rowboat-build.yml  |  8 ++++----
 .github/workflows/x-publish.yml      |  4 ++--
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/electron-build.yml b/.github/workflows/electron-build.yml
index 4bd774c2..6566f105 100644
--- a/.github/workflows/electron-build.yml
+++ b/.github/workflows/electron-build.yml
@@ -13,7 +13,7 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       - name: Setup pnpm
         uses: pnpm/action-setup@v4
@@ -21,7 +21,7 @@ jobs:
           version: 9
 
       - name: Setup Node.js
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v6
         with:
           node-version: 24
           cache: 'pnpm'
@@ -107,7 +107,7 @@ jobs:
           fi
 
       - name: Upload workflow artifacts
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v6
         with:
           name: distributables
           path: apps/x/apps/main/out/make/*
@@ -118,7 +118,7 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       - name: Setup pnpm
         uses: pnpm/action-setup@v4
@@ -126,7 +126,7 @@ jobs:
           version: 9
 
       - name: Setup Node.js
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v6
         with:
           node-version: 24
           cache: 'pnpm'
@@ -171,7 +171,7 @@ jobs:
         working-directory: apps/x/apps/main
 
       - name: Upload workflow artifacts
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v6
         with:
           name: distributables-linux
           path: apps/x/apps/main/out/make/*
@@ -182,7 +182,7 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       - name: Setup pnpm
         uses: pnpm/action-setup@v4
@@ -190,7 +190,7 @@ jobs:
           version: 9
 
       - name: Setup Node.js
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v6
         with:
           node-version: 24
           cache: 'pnpm'
@@ -237,7 +237,7 @@ jobs:
         working-directory: apps/x/apps/main
 
       - name: Upload workflow artifacts
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v6
         with:
           name: distributables-windows
           path: apps/x/apps/main/out/make/*
diff --git a/.github/workflows/rowboat-build.yml b/.github/workflows/rowboat-build.yml
index ef2f93fa..270e6263 100644
--- a/.github/workflows/rowboat-build.yml
+++ b/.github/workflows/rowboat-build.yml
@@ -8,10 +8,10 @@ jobs:
     runs-on: ubuntu-latest
     
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
       
       - name: Setup Node.js
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v6
         with:
           cache-dependency-path: 'apps/rowboat/package-lock.json'
           node-version: '20'
@@ -29,10 +29,10 @@ jobs:
     runs-on: ubuntu-latest
     
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
       
       - name: Setup Node.js
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v6
         with:
           cache-dependency-path: 'apps/rowboat/package-lock.json'
           node-version: '24'
diff --git a/.github/workflows/x-publish.yml b/.github/workflows/x-publish.yml
index 4f58b1df..c411ab68 100644
--- a/.github/workflows/x-publish.yml
+++ b/.github/workflows/x-publish.yml
@@ -12,10 +12,10 @@ jobs:
 
     steps:
       - name: Checkout repo
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       - name: Set up Node
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v6
         with:
           node-version: 24
           registry-url: https://registry.npmjs.org/

From c107d7ca8403144cb1a7100465fbb092a49c4397 Mon Sep 17 00:00:00 2001
From: tusharmagar <tushmag@gmail.com>
Date: Tue, 17 Feb 2026 13:53:28 +0530
Subject: [PATCH 02/36] refactor: integrate context menu for delete action in
 sidebar tasks section

---
 .../src/components/sidebar-content.tsx        | 61 ++++++++++---------
 1 file changed, 31 insertions(+), 30 deletions(-)

diff --git a/apps/x/apps/renderer/src/components/sidebar-content.tsx b/apps/x/apps/renderer/src/components/sidebar-content.tsx
index 51b95109..e38624de 100644
--- a/apps/x/apps/renderer/src/components/sidebar-content.tsx
+++ b/apps/x/apps/renderer/src/components/sidebar-content.tsx
@@ -1054,36 +1054,37 @@ function TasksSection({
             </div>
             <SidebarMenu>
               {runs.map((run) => (
-                <SidebarMenuItem key={run.id} className="group/chat-item">
-                  <SidebarMenuButton
-                    isActive={currentRunId === run.id}
-                    onClick={() => actions?.onSelectRun(run.id)}
-                  >
-                    <div className="flex w-full items-center gap-2 min-w-0">
-                      {processingRunIds?.has(run.id) ? (
-                        <span className="size-2 shrink-0 rounded-full bg-emerald-500 animate-pulse" />
-                      ) : null}
-                      <span className="min-w-0 flex-1 truncate text-sm">{run.title || '(Untitled chat)'}</span>
-                      {run.createdAt ? (
-                        <span className={`shrink-0 text-[10px] text-muted-foreground${processingRunIds?.has(run.id) ? '' : ' group-hover/chat-item:hidden'}`}>
-                          {formatRunTime(run.createdAt)}
-                        </span>
-                      ) : null}
-                      {!processingRunIds?.has(run.id) && (
-                        <button
-                          type="button"
-                          className="shrink-0 hidden group-hover/chat-item:flex items-center justify-center text-muted-foreground hover:text-destructive transition-colors"
-                          onClick={(e) => {
-                            e.stopPropagation()
-                            setPendingDeleteRunId(run.id)
-                          }}
-                          aria-label="Delete chat"
-                        >
-                          <Trash2 className="size-3.5" />
-                        </button>
-                      )}
-                    </div>
-                  </SidebarMenuButton>
+                <SidebarMenuItem key={run.id}>
+                  <ContextMenu>
+                    <ContextMenuTrigger asChild>
+                      <SidebarMenuButton
+                        isActive={currentRunId === run.id}
+                        onClick={() => actions?.onSelectRun(run.id)}
+                      >
+                        <div className="flex w-full items-center gap-2 min-w-0">
+                          {processingRunIds?.has(run.id) ? (
+                            <span className="size-2 shrink-0 rounded-full bg-emerald-500 animate-pulse" />
+                          ) : null}
+                          <span className="min-w-0 flex-1 truncate text-sm">{run.title || '(Untitled chat)'}</span>
+                          {run.createdAt ? (
+                            <span className="shrink-0 text-[10px] text-muted-foreground">
+                              {formatRunTime(run.createdAt)}
+                            </span>
+                          ) : null}
+                        </div>
+                      </SidebarMenuButton>
+                    </ContextMenuTrigger>
+                    <ContextMenuContent className="w-48">
+                      <ContextMenuItem
+                        variant="destructive"
+                        disabled={processingRunIds?.has(run.id)}
+                        onClick={() => setPendingDeleteRunId(run.id)}
+                      >
+                        <Trash2 className="mr-2 size-4" />
+                        Delete
+                      </ContextMenuItem>
+                    </ContextMenuContent>
+                  </ContextMenu>
                 </SidebarMenuItem>
               ))}
             </SidebarMenu>

From f22087cbc3990c06bffbd576b6f85c72a5511a9c Mon Sep 17 00:00:00 2001
From: tusharmagar <tushmag@gmail.com>
Date: Wed, 18 Feb 2026 13:23:22 +0530
Subject: [PATCH 03/36] fix: update userId in executeAction to a static value
 and improve error logging

- Changed userId from connectedAccountId to a static value 'rowboat-user'.
- Enhanced error logging to include detailed error information in JSON format.
---
 apps/x/packages/core/src/composio/client.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/apps/x/packages/core/src/composio/client.ts b/apps/x/packages/core/src/composio/client.ts
index 97d1e8b2..070b4642 100644
--- a/apps/x/packages/core/src/composio/client.ts
+++ b/apps/x/packages/core/src/composio/client.ts
@@ -343,7 +343,7 @@ export async function executeAction(
     try {
         const client = getComposioClient();
         const result = await client.tools.execute(actionSlug, {
-            userId: connectedAccountId,
+            userId: 'rowboat-user',
             arguments: input,
             connectedAccountId,
             dangerouslySkipVersionCheck: true,
@@ -352,8 +352,8 @@ export async function executeAction(
         console.log(`[Composio] Action completed successfully`);
         return { success: true, data: result.data };
     } catch (error) {
-        console.error(`[Composio] Action execution failed:`, error);
-        const message = error instanceof Error ? error.message : 'Unknown error';
+        console.error(`[Composio] Action execution failed:`, JSON.stringify(error, Object.getOwnPropertyNames(error ?? {}), 2));
+        const message = error instanceof Error ? error.message : (typeof error === 'object' ? JSON.stringify(error) : 'Unknown error');
         return { success: false, data: null, error: message };
     }
 }

From d23f2167eeadc8cd462219787643b83d23de2a3e Mon Sep 17 00:00:00 2001
From: Arjun <6592213+arkml@users.noreply.github.com>
Date: Wed, 18 Feb 2026 16:36:13 +0530
Subject: [PATCH 04/36] css changes to tiptap

---
 apps/x/apps/renderer/src/styles/editor.css | 151 ++++++++++++---------
 1 file changed, 90 insertions(+), 61 deletions(-)

diff --git a/apps/x/apps/renderer/src/styles/editor.css b/apps/x/apps/renderer/src/styles/editor.css
index d94f0ffa..dc7c6c5e 100644
--- a/apps/x/apps/renderer/src/styles/editor.css
+++ b/apps/x/apps/renderer/src/styles/editor.css
@@ -16,8 +16,17 @@
   position: relative;
 }
 
+/* Notion-like base typography */
 .tiptap-editor .ProseMirror {
-  padding: 1rem;
+  font-family: ui-sans-serif, system-ui, -apple-system, BlinkMacSystemFont,
+    "Segoe UI", Helvetica, "Apple Color Emoji", Arial, sans-serif,
+    "Segoe UI Emoji", "Segoe UI Symbol";
+  font-size: 16px;
+  line-height: 1.5;
+  color: rgb(55, 53, 47);
+  max-width: 720px;
+  margin: 0 auto;
+  padding: 2rem 4rem;
   outline: none;
 }
 
@@ -27,47 +36,45 @@
 
 /* Placeholder */
 .tiptap-editor .ProseMirror p.is-editor-empty:first-child::before {
-  color: var(--muted-foreground);
+  color: rgba(55, 53, 47, 0.4);
   content: attr(data-placeholder);
   float: left;
   height: 0;
   pointer-events: none;
 }
 
-/* Typography */
-.tiptap-editor .ProseMirror {
-  font-size: 1rem;
-  line-height: 1.75;
-  color: var(--foreground);
-}
-
-.tiptap-editor .ProseMirror > * + * {
-  margin-top: 0.75em;
+/* Paragraphs */
+.tiptap-editor .ProseMirror p {
+  margin: 1px 0;
+  padding: 3px 2px;
 }
 
 /* Headings */
 .tiptap-editor .ProseMirror h1 {
-  font-size: 2em;
-  font-weight: 700;
-  line-height: 1.2;
-  margin-top: 1.5em;
-  margin-bottom: 0.5em;
+  font-size: 1.875em;
+  font-weight: 600;
+  line-height: 1.3;
+  margin-top: 2em;
+  margin-bottom: 4px;
+  padding: 3px 2px;
 }
 
 .tiptap-editor .ProseMirror h2 {
   font-size: 1.5em;
   font-weight: 600;
   line-height: 1.3;
-  margin-top: 1.25em;
-  margin-bottom: 0.5em;
+  margin-top: 1.1em;
+  margin-bottom: 1px;
+  padding: 3px 2px;
 }
 
 .tiptap-editor .ProseMirror h3 {
   font-size: 1.25em;
   font-weight: 600;
-  line-height: 1.4;
+  line-height: 1.3;
   margin-top: 1em;
-  margin-bottom: 0.5em;
+  margin-bottom: 1px;
+  padding: 3px 2px;
 }
 
 .tiptap-editor .ProseMirror h1:first-child,
@@ -76,16 +83,11 @@
   margin-top: 0;
 }
 
-/* Paragraphs */
-.tiptap-editor .ProseMirror p {
-  margin: 0;
-}
-
 /* Lists */
 .tiptap-editor .ProseMirror ul,
 .tiptap-editor .ProseMirror ol {
-  padding-left: 1.5em;
-  margin: 0.5em 0;
+  padding-left: 1.625em;
+  margin: 1px 0;
 }
 
 .tiptap-editor .ProseMirror ul {
@@ -97,7 +99,7 @@
 }
 
 .tiptap-editor .ProseMirror li {
-  margin: 0.25em 0;
+  padding: 3px 0;
 }
 
 .tiptap-editor .ProseMirror li p {
@@ -106,50 +108,56 @@
 
 /* Blockquote */
 .tiptap-editor .ProseMirror blockquote {
-  border-left: 3px solid var(--border);
-  padding-left: 1em;
+  border-left: 3px solid rgb(55, 53, 47);
+  padding-left: 14px;
+  margin: 4px 0;
   margin-left: 0;
   margin-right: 0;
-  color: var(--muted-foreground);
-  font-style: italic;
 }
 
-/* Code */
-.tiptap-editor .ProseMirror code {
-  background-color: var(--muted);
-  border-radius: 0.25em;
-  padding: 0.15em 0.3em;
-  font-family: ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, monospace;
-  font-size: 0.9em;
-}
-
-/* Code Block */
+/* Code blocks */
 .tiptap-editor .ProseMirror pre {
-  background-color: var(--muted);
-  border-radius: 0.5em;
-  padding: 1em;
+  background: rgb(247, 246, 243);
+  border-radius: 4px;
+  padding: 2rem;
+  font-family: "SFMono-Regular", Menlo, Consolas, "PT Mono",
+    "Liberation Mono", Courier, monospace;
+  font-size: 0.85em;
+  line-height: 1.5;
+  margin: 8px 0;
   overflow-x: auto;
-  margin: 0.75em 0;
 }
 
 .tiptap-editor .ProseMirror pre code {
   background: none;
   padding: 0;
-  font-size: 0.875em;
+  font-size: inherit;
   color: inherit;
+  border-radius: 0;
 }
 
-/* Horizontal Rule */
+/* Inline code */
+.tiptap-editor .ProseMirror code {
+  background: rgba(135, 131, 120, 0.15);
+  border-radius: 3px;
+  padding: 0.2em 0.4em;
+  font-family: "SFMono-Regular", Menlo, Consolas, monospace;
+  font-size: 0.85em;
+  color: #eb5757;
+}
+
+/* Divider */
 .tiptap-editor .ProseMirror hr {
   border: none;
-  border-top: 1px solid var(--border);
-  margin: 1.5em 0;
+  border-top: 1px solid rgba(55, 53, 47, 0.16);
+  margin: 8px 0;
 }
 
 /* Links */
 .tiptap-editor .ProseMirror a {
-  color: var(--primary);
+  color: inherit;
   text-decoration: underline;
+  text-decoration-color: rgba(55, 53, 47, 0.4);
   text-underline-offset: 2px;
   cursor: pointer;
 }
@@ -175,14 +183,13 @@
 .tiptap-editor .ProseMirror ul[data-type="taskList"] {
   list-style: none;
   padding-left: 0;
-  margin: 0.5em 0;
+  margin: 1px 0;
 }
 
 .tiptap-editor .ProseMirror ul[data-type="taskList"] li {
   display: flex;
   align-items: flex-start;
   gap: 0.5em;
-  margin: 0.25em 0;
 }
 
 .tiptap-editor .ProseMirror ul[data-type="taskList"] li > label {
@@ -238,14 +245,6 @@
   align-self: center;
 }
 
-/* Content area centering */
-.tiptap-editor .ProseMirror {
-  margin-left: 20%;
-  margin-right: 20%;
-  padding-left: 1rem;
-  padding-right: 1rem;
-}
-
 .wiki-link-anchor {
   position: absolute;
   height: 0;
@@ -327,3 +326,33 @@
   background-color: var(--primary);
   transition: width 0.3s ease;
 }
+
+/* Dark mode overrides */
+.dark .tiptap-editor .ProseMirror {
+  color: rgba(255, 255, 255, 0.9);
+}
+
+.dark .tiptap-editor .ProseMirror a {
+  text-decoration-color: rgba(255, 255, 255, 0.4);
+}
+
+.dark .tiptap-editor .ProseMirror blockquote {
+  border-left-color: rgba(255, 255, 255, 0.4);
+}
+
+.dark .tiptap-editor .ProseMirror hr {
+  border-top-color: rgba(255, 255, 255, 0.16);
+}
+
+.dark .tiptap-editor .ProseMirror pre {
+  background: rgba(255, 255, 255, 0.05);
+}
+
+.dark .tiptap-editor .ProseMirror code {
+  background: rgba(255, 255, 255, 0.1);
+  color: #ff7b72;
+}
+
+.dark .tiptap-editor .ProseMirror p.is-editor-empty:first-child::before {
+  color: rgba(255, 255, 255, 0.3);
+}

From 5e2be4531ab851e611058aab3a29d730996501d4 Mon Sep 17 00:00:00 2001
From: Arjun <6592213+arkml@users.noreply.github.com>
Date: Wed, 18 Feb 2026 17:43:23 +0530
Subject: [PATCH 05/36] fix assistant instruction for output format

---
 .../core/src/application/assistant/instructions.ts   | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/apps/x/packages/core/src/application/assistant/instructions.ts b/apps/x/packages/core/src/application/assistant/instructions.ts
index 5e0ce472..c0365c0f 100644
--- a/apps/x/packages/core/src/application/assistant/instructions.ts
+++ b/apps/x/packages/core/src/application/assistant/instructions.ts
@@ -125,6 +125,18 @@ Always consult this catalog first so you load the right skills before taking act
 - Summarize completed work and suggest logical next steps at the end of a task.
 - Always ask for confirmation before taking destructive actions.
 
+## Output Formatting
+- Use **H3** (###) for section headers in longer responses. Never use H1 or H2 — they're too large for chat.
+- Use **bold** for key terms, names, or concepts the user should notice.
+- Keep bullet points short (1-2 lines each). Use them for lists of 3+ items, not for general prose.
+- Use numbered lists only when order matters (steps, rankings).
+- For short answers (1-3 sentences), just use plain prose. No headers, no bullets.
+- Use code blocks with language tags (\`\`\`python, \`\`\`json, etc.) for any code or config.
+- Use inline \`code\` for file names, commands, variable names, or short technical references.
+- Add a blank line between sections for breathing room.
+- Never start a response with a heading. Lead with a sentence or two of context first.
+- Avoid deeply nested bullets. If nesting beyond 2 levels, restructure.
+
 ## MCP Tool Discovery (CRITICAL)
 
 **ALWAYS check for MCP tools BEFORE saying you can't do something.**

From 7329d0ad0dc20c00581641c445f5b5a6e7e26923 Mon Sep 17 00:00:00 2001
From: Arjun <6592213+arkml@users.noreply.github.com>
Date: Wed, 18 Feb 2026 18:08:24 +0530
Subject: [PATCH 06/36] Add global search across knowledge and chats

Cmd+K / Ctrl+K opens a spotlight-style search dialog that searches
knowledge files (by content and filename) and chat history (by title
and message content). Results are grouped by type with filter toggles
preselected based on the active sidebar tab.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---
 apps/x/apps/main/src/ipc.ts                   |   5 +
 apps/x/apps/renderer/src/App.tsx              |  32 +-
 .../renderer/src/components/search-dialog.tsx | 208 ++++++++++
 apps/x/packages/core/src/search/search.ts     | 375 ++++++++++++++++++
 apps/x/packages/shared/src/ipc.ts             |  16 +
 5 files changed, 635 insertions(+), 1 deletion(-)
 create mode 100644 apps/x/apps/renderer/src/components/search-dialog.tsx
 create mode 100644 apps/x/packages/core/src/search/search.ts

diff --git a/apps/x/apps/main/src/ipc.ts b/apps/x/apps/main/src/ipc.ts
index 72e1e589..b0757881 100644
--- a/apps/x/apps/main/src/ipc.ts
+++ b/apps/x/apps/main/src/ipc.ts
@@ -30,6 +30,7 @@ import * as composioHandler from './composio-handler.js';
 import { IAgentScheduleRepo } from '@x/core/dist/agent-schedule/repo.js';
 import { IAgentScheduleStateRepo } from '@x/core/dist/agent-schedule/state-repo.js';
 import { triggerRun as triggerAgentScheduleRun } from '@x/core/dist/agent-schedule/runner.js';
+import { search } from '@x/core/dist/search/search.js';
 
 type InvokeChannels = ipc.InvokeChannels;
 type IPCChannels = ipc.IPCChannels;
@@ -497,5 +498,9 @@ export function setupIpcHandlers() {
       const mimeType = mimeMap[ext] || 'application/octet-stream';
       return { data: buffer.toString('base64'), mimeType, size: stat.size };
     },
+    // Search handler
+    'search:query': async (_event, args) => {
+      return search(args.query, args.limit, args.types);
+    },
   });
 }
diff --git a/apps/x/apps/renderer/src/App.tsx b/apps/x/apps/renderer/src/App.tsx
index 7658c4c8..ed3dd739 100644
--- a/apps/x/apps/renderer/src/App.tsx
+++ b/apps/x/apps/renderer/src/App.tsx
@@ -6,7 +6,7 @@ import type { LanguageModelUsage, ToolUIPart } from 'ai';
 import './App.css'
 import z from 'zod';
 import { Button } from './components/ui/button';
-import { CheckIcon, LoaderIcon, ArrowUp, PanelLeftIcon, PanelRightIcon, Square, X, ChevronLeftIcon, ChevronRightIcon, SquarePen } from 'lucide-react';
+import { CheckIcon, LoaderIcon, ArrowUp, PanelLeftIcon, PanelRightIcon, Square, X, ChevronLeftIcon, ChevronRightIcon, SquarePen, SearchIcon } from 'lucide-react';
 import { cn } from '@/lib/utils';
 import { MarkdownEditor } from './components/markdown-editor';
 import { ChatInputBar } from './components/chat-button';
@@ -50,6 +50,7 @@ import { TooltipProvider } from "@/components/ui/tooltip"
 import { Toaster } from "@/components/ui/sonner"
 import { stripKnowledgePrefix, toKnowledgePath, wikiLabel } from '@/lib/wiki-links'
 import { OnboardingModal } from '@/components/onboarding-modal'
+import { SearchDialog } from '@/components/search-dialog'
 import { BackgroundTaskDetail } from '@/components/background-task-detail'
 import { FileCardProvider } from '@/contexts/file-card-context'
 import { MarkdownPreOverride } from '@/components/ai-elements/markdown-code-override'
@@ -675,6 +676,9 @@ function App() {
   // Onboarding state
   const [showOnboarding, setShowOnboarding] = useState(false)
 
+  // Search state
+  const [isSearchOpen, setIsSearchOpen] = useState(false)
+
   // Background tasks state
   type BackgroundTaskItem = {
     name: string
@@ -1829,6 +1833,18 @@ function App() {
     return () => document.removeEventListener('keydown', handleKeyDown)
   }, [handleCloseFullScreenChat, isFullScreenChat, expandedFrom, navigateToFullScreenChat])
 
+  // Keyboard shortcut: Cmd+K / Ctrl+K to open search
+  useEffect(() => {
+    const handleKeyDown = (e: KeyboardEvent) => {
+      if ((e.ctrlKey || e.metaKey) && e.key === 'k') {
+        e.preventDefault()
+        setIsSearchOpen(true)
+      }
+    }
+    document.addEventListener('keydown', handleKeyDown)
+    return () => document.removeEventListener('keydown', handleKeyDown)
+  }, [])
+
   const toggleExpand = (path: string, kind: 'file' | 'dir') => {
     if (kind === 'file') {
       navigateToFile(path)
@@ -2336,6 +2352,14 @@ function App() {
                 <span className="text-sm font-medium text-muted-foreground flex-1 min-w-0 truncate">
                   {headerTitle}
                 </span>
+                <button
+                  type="button"
+                  onClick={() => setIsSearchOpen(true)}
+                  className="titlebar-no-drag flex h-8 w-8 items-center justify-center rounded-md text-muted-foreground hover:bg-accent hover:text-foreground transition-colors"
+                  aria-label="Search"
+                >
+                  <SearchIcon className="size-4" />
+                </button>
                 {selectedPath && (
                   <div className="flex items-center gap-1 text-xs text-muted-foreground">
                     {isSaving ? (
@@ -2568,6 +2592,12 @@ function App() {
             />
           )}
         </div>
+        <SearchDialog
+          open={isSearchOpen}
+          onOpenChange={setIsSearchOpen}
+          onSelectFile={navigateToFile}
+          onSelectRun={(id) => { void navigateToView({ type: 'chat', runId: id }) }}
+        />
       </SidebarSectionProvider>
       <Toaster />
       <OnboardingModal
diff --git a/apps/x/apps/renderer/src/components/search-dialog.tsx b/apps/x/apps/renderer/src/components/search-dialog.tsx
new file mode 100644
index 00000000..22e398fe
--- /dev/null
+++ b/apps/x/apps/renderer/src/components/search-dialog.tsx
@@ -0,0 +1,208 @@
+import { useState, useEffect, useCallback } from 'react'
+import { FileTextIcon, MessageSquareIcon } from 'lucide-react'
+import {
+  CommandDialog,
+  CommandInput,
+  CommandList,
+  CommandEmpty,
+  CommandGroup,
+  CommandItem,
+} from '@/components/ui/command'
+import { useDebounce } from '@/hooks/use-debounce'
+import { useSidebarSection, type ActiveSection } from '@/contexts/sidebar-context'
+import { cn } from '@/lib/utils'
+
+interface SearchResult {
+  type: 'knowledge' | 'chat'
+  title: string
+  preview: string
+  path: string
+}
+
+type SearchType = 'knowledge' | 'chat'
+
+function activeTabToTypes(section: ActiveSection): SearchType[] {
+  if (section === 'knowledge') return ['knowledge']
+  return ['chat'] // "tasks" tab maps to chat
+}
+
+interface SearchDialogProps {
+  open: boolean
+  onOpenChange: (open: boolean) => void
+  onSelectFile: (path: string) => void
+  onSelectRun: (runId: string) => void
+}
+
+export function SearchDialog({ open, onOpenChange, onSelectFile, onSelectRun }: SearchDialogProps) {
+  const { activeSection } = useSidebarSection()
+  const [query, setQuery] = useState('')
+  const [results, setResults] = useState<SearchResult[]>([])
+  const [isSearching, setIsSearching] = useState(false)
+  const [activeTypes, setActiveTypes] = useState<Set<SearchType>>(
+    () => new Set(activeTabToTypes(activeSection))
+  )
+  const debouncedQuery = useDebounce(query, 250)
+
+  // Sync filter preselection when dialog opens
+  useEffect(() => {
+    if (open) {
+      setActiveTypes(new Set(activeTabToTypes(activeSection)))
+    }
+  }, [open, activeSection])
+
+  const toggleType = useCallback((type: SearchType) => {
+    setActiveTypes(new Set([type]))
+  }, [])
+
+  useEffect(() => {
+    if (!debouncedQuery.trim()) {
+      setResults([])
+      return
+    }
+
+    let cancelled = false
+    setIsSearching(true)
+
+    const types = Array.from(activeTypes) as ('knowledge' | 'chat')[]
+    window.ipc.invoke('search:query', { query: debouncedQuery, limit: 20, types })
+      .then((res) => {
+        if (!cancelled) {
+          setResults(res.results)
+        }
+      })
+      .catch((err) => {
+        console.error('Search failed:', err)
+        if (!cancelled) {
+          setResults([])
+        }
+      })
+      .finally(() => {
+        if (!cancelled) {
+          setIsSearching(false)
+        }
+      })
+
+    return () => { cancelled = true }
+  }, [debouncedQuery, activeTypes])
+
+  // Reset state when dialog closes
+  useEffect(() => {
+    if (!open) {
+      setQuery('')
+      setResults([])
+    }
+  }, [open])
+
+  const handleSelect = useCallback((result: SearchResult) => {
+    onOpenChange(false)
+    if (result.type === 'knowledge') {
+      onSelectFile(result.path)
+    } else {
+      onSelectRun(result.path)
+    }
+  }, [onOpenChange, onSelectFile, onSelectRun])
+
+  const knowledgeResults = results.filter(r => r.type === 'knowledge')
+  const chatResults = results.filter(r => r.type === 'chat')
+
+  return (
+    <CommandDialog
+      open={open}
+      onOpenChange={onOpenChange}
+      title="Search"
+      description="Search across knowledge and chats"
+      showCloseButton={false}
+      className="top-[20%] translate-y-0"
+    >
+      <CommandInput
+        placeholder="Search..."
+        value={query}
+        onValueChange={setQuery}
+      />
+      <div className="flex items-center gap-1.5 px-3 py-2 border-b">
+        <FilterToggle
+          active={activeTypes.has('knowledge')}
+          onClick={() => toggleType('knowledge')}
+          icon={<FileTextIcon className="size-3" />}
+          label="Knowledge"
+        />
+        <FilterToggle
+          active={activeTypes.has('chat')}
+          onClick={() => toggleType('chat')}
+          icon={<MessageSquareIcon className="size-3" />}
+          label="Chats"
+        />
+      </div>
+      <CommandList>
+        {!query.trim() && (
+          <CommandEmpty>Type to search...</CommandEmpty>
+        )}
+        {query.trim() && !isSearching && results.length === 0 && (
+          <CommandEmpty>No results found.</CommandEmpty>
+        )}
+        {knowledgeResults.length > 0 && (
+          <CommandGroup heading="Knowledge">
+            {knowledgeResults.map((result) => (
+              <CommandItem
+                key={`knowledge-${result.path}`}
+                value={`knowledge-${result.title}-${result.path}`}
+                onSelect={() => handleSelect(result)}
+              >
+                <FileTextIcon className="size-4 shrink-0 text-muted-foreground" />
+                <div className="flex flex-col gap-0.5 min-w-0">
+                  <span className="truncate font-medium">{result.title}</span>
+                  <span className="truncate text-xs text-muted-foreground">{result.preview}</span>
+                </div>
+              </CommandItem>
+            ))}
+          </CommandGroup>
+        )}
+        {chatResults.length > 0 && (
+          <CommandGroup heading="Chats">
+            {chatResults.map((result) => (
+              <CommandItem
+                key={`chat-${result.path}`}
+                value={`chat-${result.title}-${result.path}`}
+                onSelect={() => handleSelect(result)}
+              >
+                <MessageSquareIcon className="size-4 shrink-0 text-muted-foreground" />
+                <div className="flex flex-col gap-0.5 min-w-0">
+                  <span className="truncate font-medium">{result.title}</span>
+                  <span className="truncate text-xs text-muted-foreground">{result.preview}</span>
+                </div>
+              </CommandItem>
+            ))}
+          </CommandGroup>
+        )}
+      </CommandList>
+    </CommandDialog>
+  )
+}
+
+function FilterToggle({
+  active,
+  onClick,
+  icon,
+  label,
+}: {
+  active: boolean
+  onClick: () => void
+  icon: React.ReactNode
+  label: string
+}) {
+  return (
+    <button
+      type="button"
+      onClick={onClick}
+      className={cn(
+        "flex items-center gap-1.5 rounded-md px-2.5 py-1 text-xs font-medium transition-colors",
+        active
+          ? "bg-accent text-accent-foreground"
+          : "text-muted-foreground hover:bg-accent/50 hover:text-accent-foreground"
+      )}
+    >
+      {icon}
+      {label}
+    </button>
+  )
+}
diff --git a/apps/x/packages/core/src/search/search.ts b/apps/x/packages/core/src/search/search.ts
new file mode 100644
index 00000000..d68449f5
--- /dev/null
+++ b/apps/x/packages/core/src/search/search.ts
@@ -0,0 +1,375 @@
+import path from 'path';
+import fs from 'fs';
+import fsp from 'fs/promises';
+import readline from 'readline';
+import { execFile } from 'child_process';
+import { WorkDir } from '../config/config.js';
+
+interface SearchResult {
+  type: 'knowledge' | 'chat';
+  title: string;
+  preview: string;
+  path: string;
+}
+
+const KNOWLEDGE_DIR = path.join(WorkDir, 'knowledge');
+const RUNS_DIR = path.join(WorkDir, 'runs');
+
+type SearchType = 'knowledge' | 'chat';
+
+/**
+ * Search across knowledge files and chat history.
+ * @param types - optional filter to search only specific types (default: both)
+ */
+export async function search(query: string, limit = 20, types?: SearchType[]): Promise<{ results: SearchResult[] }> {
+  const trimmed = query.trim();
+  if (!trimmed) {
+    return { results: [] };
+  }
+
+  const searchKnowledgeEnabled = !types || types.includes('knowledge');
+  const searchChatsEnabled = !types || types.includes('chat');
+
+  const [knowledgeResults, chatResults] = await Promise.all([
+    searchKnowledgeEnabled ? searchKnowledge(trimmed, limit) : Promise.resolve([]),
+    searchChatsEnabled ? searchChats(trimmed, limit) : Promise.resolve([]),
+  ]);
+
+  const results = [...knowledgeResults, ...chatResults].slice(0, limit);
+  return { results };
+}
+
+/**
+ * Search knowledge markdown files by content and filename.
+ */
+async function searchKnowledge(query: string, limit: number): Promise<SearchResult[]> {
+  if (!fs.existsSync(KNOWLEDGE_DIR)) {
+    return [];
+  }
+
+  const results: SearchResult[] = [];
+  const seenPaths = new Set<string>();
+  const lowerQuery = query.toLowerCase();
+
+  // Content search via grep
+  try {
+    const grepMatches = await grepFiles(query, KNOWLEDGE_DIR, '*.md');
+    for (const match of grepMatches) {
+      if (results.length >= limit) break;
+      const relPath = path.relative(WorkDir, match.file);
+      if (seenPaths.has(relPath)) continue;
+      seenPaths.add(relPath);
+
+      const title = path.basename(match.file, '.md');
+      results.push({
+        type: 'knowledge',
+        title,
+        preview: match.line.trim().substring(0, 150),
+        path: relPath,
+      });
+    }
+  } catch {
+    // grep failed (no matches or dir issue) — continue
+  }
+
+  // Filename search — check files whose name matches the query
+  try {
+    const allFiles = await listMarkdownFiles(KNOWLEDGE_DIR);
+    for (const file of allFiles) {
+      if (results.length >= limit) break;
+      const relPath = path.relative(WorkDir, file);
+      if (seenPaths.has(relPath)) continue;
+
+      const basename = path.basename(file, '.md');
+      if (basename.toLowerCase().includes(lowerQuery)) {
+        seenPaths.add(relPath);
+        const preview = await readFirstLines(file, 2);
+        results.push({
+          type: 'knowledge',
+          title: basename,
+          preview,
+          path: relPath,
+        });
+      }
+    }
+  } catch {
+    // ignore errors
+  }
+
+  return results;
+}
+
+/**
+ * Search chat history by title and message content.
+ */
+async function searchChats(query: string, limit: number): Promise<SearchResult[]> {
+  if (!fs.existsSync(RUNS_DIR)) {
+    return [];
+  }
+
+  const results: SearchResult[] = [];
+  const seenIds = new Set<string>();
+  const lowerQuery = query.toLowerCase();
+
+  // Content search via grep on JSONL files
+  try {
+    const grepMatches = await grepFiles(query, RUNS_DIR, '*.jsonl');
+    for (const match of grepMatches) {
+      if (results.length >= limit) break;
+      const runId = path.basename(match.file, '.jsonl');
+      if (seenIds.has(runId)) continue;
+
+      const meta = await readRunMetadata(match.file);
+      if (meta.agentName !== 'copilot') {
+        seenIds.add(runId);
+        continue;
+      }
+      seenIds.add(runId);
+
+      // Extract a content preview from the matching line
+      let preview = '';
+      try {
+        const parsed = JSON.parse(match.line);
+        if (parsed.message?.content && typeof parsed.message.content === 'string') {
+          preview = parsed.message.content.replace(/<attached-files>[\s\S]*?<\/attached-files>/g, '').trim().substring(0, 150);
+        }
+      } catch {
+        preview = match.line.substring(0, 150);
+      }
+
+      results.push({
+        type: 'chat',
+        title: meta.title || runId,
+        preview,
+        path: runId,
+      });
+    }
+  } catch {
+    // grep failed — continue
+  }
+
+  // Title search — scan run files for matching titles
+  try {
+    const entries = await fsp.readdir(RUNS_DIR, { withFileTypes: true });
+    const jsonlFiles = entries
+      .filter(e => e.isFile() && e.name.endsWith('.jsonl'))
+      .map(e => e.name)
+      .sort()
+      .reverse(); // newest first
+
+    for (const name of jsonlFiles) {
+      if (results.length >= limit) break;
+      const runId = path.basename(name, '.jsonl');
+      if (seenIds.has(runId)) continue;
+
+      const filePath = path.join(RUNS_DIR, name);
+      const meta = await readRunMetadata(filePath);
+      if (meta.agentName !== 'copilot') {
+        seenIds.add(runId);
+        continue;
+      }
+      if (meta.title && meta.title.toLowerCase().includes(lowerQuery)) {
+        seenIds.add(runId);
+        results.push({
+          type: 'chat',
+          title: meta.title,
+          preview: meta.title,
+          path: runId,
+        });
+      }
+    }
+  } catch {
+    // ignore errors
+  }
+
+  return results;
+}
+
+/**
+ * Use grep to find files matching a query.
+ */
+function grepFiles(query: string, dir: string, includeGlob: string): Promise<Array<{ file: string; line: string }>> {
+  return new Promise((resolve, reject) => {
+    execFile(
+      'grep',
+      ['-ril', '--include=' + includeGlob, query, dir],
+      { maxBuffer: 1024 * 1024 },
+      (error, stdout) => {
+        if (error) {
+          // Exit code 1 = no matches
+          if (error.code === 1) {
+            resolve([]);
+            return;
+          }
+          reject(error);
+          return;
+        }
+
+        const files = stdout.trim().split('\n').filter(Boolean);
+        // For each matching file, get the first matching line
+        const promises = files.map(file =>
+          getFirstMatchingLine(file, query).then(line => ({ file, line }))
+        );
+        Promise.all(promises).then(resolve).catch(reject);
+      }
+    );
+  });
+}
+
+/**
+ * Get the first line in a file that matches the query (case-insensitive).
+ */
+function getFirstMatchingLine(filePath: string, query: string): Promise<string> {
+  return new Promise((resolve) => {
+    let resolved = false;
+    const done = (value: string) => {
+      if (resolved) return;
+      resolved = true;
+      resolve(value);
+    };
+
+    const lowerQuery = query.toLowerCase();
+    const stream = fs.createReadStream(filePath, { encoding: 'utf8' });
+    const rl = readline.createInterface({ input: stream, crlfDelay: Infinity });
+
+    rl.on('line', (line) => {
+      if (line.toLowerCase().includes(lowerQuery)) {
+        done(line);
+        rl.close();
+        stream.destroy();
+      }
+    });
+
+    rl.on('close', () => done(''));
+    stream.on('error', () => done(''));
+  });
+}
+
+interface RunMetadata {
+  title: string | undefined;
+  agentName: string | undefined;
+}
+
+/**
+ * Read metadata from a run JSONL file (agent name from start event, title from first user message).
+ */
+function readRunMetadata(filePath: string): Promise<RunMetadata> {
+  return new Promise((resolve) => {
+    let resolved = false;
+    const done = (value: RunMetadata) => {
+      if (resolved) return;
+      resolved = true;
+      resolve(value);
+    };
+
+    const stream = fs.createReadStream(filePath, { encoding: 'utf8' });
+    const rl = readline.createInterface({ input: stream, crlfDelay: Infinity });
+    let lineIndex = 0;
+    let agentName: string | undefined;
+
+    rl.on('line', (line) => {
+      if (resolved) return;
+      const trimmed = line.trim();
+      if (!trimmed) return;
+
+      try {
+        if (lineIndex === 0) {
+          // Start event — extract agentName
+          const start = JSON.parse(trimmed);
+          agentName = start.agentName;
+          lineIndex++;
+          return;
+        }
+
+        const event = JSON.parse(trimmed);
+        if (event.type === 'message') {
+          const msg = event.message;
+          if (msg?.role === 'user') {
+            const content = msg.content;
+            if (typeof content === 'string' && content.trim()) {
+              let cleaned = content.replace(/<attached-files>[\s\S]*?<\/attached-files>/g, '');
+              cleaned = cleaned.replace(/\s+/g, ' ').trim();
+              if (cleaned) {
+                done({ title: cleaned.length > 100 ? cleaned.substring(0, 100) : cleaned, agentName });
+                rl.close();
+                stream.destroy();
+                return;
+              }
+            }
+            done({ title: undefined, agentName });
+            rl.close();
+            stream.destroy();
+            return;
+          } else if (msg?.role === 'assistant') {
+            done({ title: undefined, agentName });
+            rl.close();
+            stream.destroy();
+            return;
+          }
+        }
+        lineIndex++;
+      } catch {
+        lineIndex++;
+      }
+    });
+
+    rl.on('close', () => done({ title: undefined, agentName }));
+    rl.on('error', () => done({ title: undefined, agentName: undefined }));
+    stream.on('error', () => {
+      rl.close();
+      done({ title: undefined, agentName: undefined });
+    });
+  });
+}
+
+/**
+ * Recursively list all .md files in a directory.
+ */
+async function listMarkdownFiles(dir: string): Promise<string[]> {
+  const results: string[] = [];
+  try {
+    const entries = await fsp.readdir(dir, { withFileTypes: true });
+    for (const entry of entries) {
+      const fullPath = path.join(dir, entry.name);
+      if (entry.isDirectory()) {
+        const nested = await listMarkdownFiles(fullPath);
+        results.push(...nested);
+      } else if (entry.isFile() && entry.name.endsWith('.md')) {
+        results.push(fullPath);
+      }
+    }
+  } catch {
+    // ignore
+  }
+  return results;
+}
+
+/**
+ * Read the first N non-empty lines of a file for preview.
+ */
+async function readFirstLines(filePath: string, n: number): Promise<string> {
+  return new Promise((resolve) => {
+    const stream = fs.createReadStream(filePath, { encoding: 'utf8' });
+    const rl = readline.createInterface({ input: stream, crlfDelay: Infinity });
+    const lines: string[] = [];
+
+    rl.on('line', (line) => {
+      const trimmed = line.trim();
+      if (trimmed && !trimmed.startsWith('#')) {
+        lines.push(trimmed);
+      }
+      if (lines.length >= n) {
+        rl.close();
+        stream.destroy();
+      }
+    });
+
+    rl.on('close', () => {
+      resolve(lines.join(' ').substring(0, 150));
+    });
+
+    stream.on('error', () => {
+      resolve('');
+    });
+  });
+}
diff --git a/apps/x/packages/shared/src/ipc.ts b/apps/x/packages/shared/src/ipc.ts
index 7af39efb..1fa9b423 100644
--- a/apps/x/packages/shared/src/ipc.ts
+++ b/apps/x/packages/shared/src/ipc.ts
@@ -396,6 +396,22 @@ const ipcSchemas = {
     req: z.object({ path: z.string() }),
     res: z.object({ data: z.string(), mimeType: z.string(), size: z.number() }),
   },
+  // Search channels
+  'search:query': {
+    req: z.object({
+      query: z.string(),
+      limit: z.number().optional(),
+      types: z.array(z.enum(['knowledge', 'chat'])).optional(),
+    }),
+    res: z.object({
+      results: z.array(z.object({
+        type: z.enum(['knowledge', 'chat']),
+        title: z.string(),
+        preview: z.string(),
+        path: z.string(),
+      })),
+    }),
+  },
 } as const;
 
 // ============================================================================

From dee38a615fbc1a3b99ff254683d57c4fc993029f Mon Sep 17 00:00:00 2001
From: arkml <6592213+arkml@users.noreply.github.com>
Date: Wed, 18 Feb 2026 18:17:14 +0530
Subject: [PATCH 07/36] Remove Rowboat Web Studio reference from README

Removed section about Rowboat Web Studio from README.
---
 README.md | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/README.md b/README.md
index 9ba7e099..640ee35c 100644
--- a/README.md
+++ b/README.md
@@ -141,11 +141,6 @@ Examples: Exa (web search), Twitter/X, ElevenLabs (voice), Slack, Linear/Jira, G
 - No proprietary formats or hosted lock-in
 - You can inspect, edit, back up, or delete everything at any time
 
-
-## Looking for Rowboat Web Studio?
-
-If you’re looking for Rowboat web Studio, start [here](https://docs.rowboatlabs.com/). 
-
 ---
 <div align="center">
 

From d7b423404c30dcb5735e027fab16ad3414986d5e Mon Sep 17 00:00:00 2001
From: Ramnique Singh <30795890+ramnique@users.noreply.github.com>
Date: Wed, 18 Feb 2026 22:07:24 +0530
Subject: [PATCH 08/36] add more debug logs for llm-events

---
 apps/x/packages/core/src/agents/runtime.ts | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/apps/x/packages/core/src/agents/runtime.ts b/apps/x/packages/core/src/agents/runtime.ts
index 09d1c721..8b1bd54e 100644
--- a/apps/x/packages/core/src/agents/runtime.ts
+++ b/apps/x/packages/core/src/agents/runtime.ts
@@ -827,10 +827,6 @@ export async function* streamAgent({
             tools,
             signal,
         )) {
-            // Only log significant events (not text-delta to reduce noise)
-            if (event.type !== 'text-delta') {
-                loopLogger.log('got llm-stream-event:', event.type);
-            }
             messageBuilder.ingest(event);
             yield* processEvent({
                 runId,
@@ -924,9 +920,11 @@ async function* streamLlm(
     tools: ToolSet,
     signal?: AbortSignal,
 ): AsyncGenerator<z.infer<typeof LlmStepStreamEvent>, void, unknown> {
+    const converted = convertFromMessages(messages);
+    console.log(`! SENDING payload to model: `, JSON.stringify(converted))
     const { fullStream } = streamText({
         model,
-        messages: convertFromMessages(messages),
+        messages: converted,
         system: instructions,
         tools,
         stopWhen: stepCountIs(1),
@@ -935,7 +933,7 @@ async function* streamLlm(
     for await (const event of fullStream) {
         // Check abort on every chunk for responsiveness
         signal?.throwIfAborted();
-        // console.log("\n\n\t>>>>\t\tstream event", JSON.stringify(event));
+        console.log("-> \t\tstream event", JSON.stringify(event));
         switch (event.type) {
             case "error":
                 yield {

From 737c3a75b435c0cc1cdfc15ce85c5b7d7bf86a97 Mon Sep 17 00:00:00 2001
From: Ramnique Singh <30795890+ramnique@users.noreply.github.com>
Date: Wed, 18 Feb 2026 22:07:54 +0530
Subject: [PATCH 09/36] send reasoning blocks back to llm

---
 apps/x/packages/core/src/agents/runtime.ts | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/apps/x/packages/core/src/agents/runtime.ts b/apps/x/packages/core/src/agents/runtime.ts
index 8b1bd54e..4150d958 100644
--- a/apps/x/packages/core/src/agents/runtime.ts
+++ b/apps/x/packages/core/src/agents/runtime.ts
@@ -226,13 +226,14 @@ export class StreamStepMessageBuilder {
     private textBuffer: string = "";
     private reasoningBuffer: string = "";
     private providerOptions: z.infer<typeof ProviderOptions> | undefined = undefined;
+    private reasoningProviderOptions: z.infer<typeof ProviderOptions> | undefined = undefined;
 
     flushBuffers() {
-        // skip reasoning
-        // if (this.reasoningBuffer) {
-        //     this.parts.push({ type: "reasoning", text: this.reasoningBuffer });
-        //     this.reasoningBuffer = "";
-        // }
+        if (this.reasoningBuffer || this.reasoningProviderOptions) {
+            this.parts.push({ type: "reasoning", text: this.reasoningBuffer, providerOptions: this.reasoningProviderOptions });
+            this.reasoningBuffer = "";
+            this.reasoningProviderOptions = undefined;
+        }
         if (this.textBuffer) {
             this.parts.push({ type: "text", text: this.textBuffer });
             this.textBuffer = "";
@@ -242,7 +243,11 @@ export class StreamStepMessageBuilder {
     ingest(event: z.infer<typeof LlmStepStreamEvent>) {
         switch (event.type) {
             case "reasoning-start":
+                break;
             case "reasoning-end":
+                this.reasoningProviderOptions = event.providerOptions;
+                this.flushBuffers();
+                break;
             case "text-start":
             case "text-end":
                 this.flushBuffers();

From 097efb39b17bcfec174ce4fb79b0d6eb178d0b3d Mon Sep 17 00:00:00 2001
From: Ramnique Singh <30795890+ramnique@users.noreply.github.com>
Date: Wed, 18 Feb 2026 22:08:24 +0530
Subject: [PATCH 10/36] fix tool-call / text part order in step-message builder

---
 apps/x/packages/core/src/agents/runtime.ts | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/apps/x/packages/core/src/agents/runtime.ts b/apps/x/packages/core/src/agents/runtime.ts
index 4150d958..4012e9b3 100644
--- a/apps/x/packages/core/src/agents/runtime.ts
+++ b/apps/x/packages/core/src/agents/runtime.ts
@@ -971,6 +971,12 @@ async function* streamLlm(
                     providerOptions: event.providerMetadata,
                 };
                 break;
+            case "text-end":
+                yield {
+                    type: "text-end",
+                    providerOptions: event.providerMetadata,
+                };
+                break;
             case "text-delta":
                 yield {
                     type: "text-delta",

From 383241b5b7de1ea7a3bb6dde22e1e7d6cd13b3f9 Mon Sep 17 00:00:00 2001
From: Tushar <47842976+tusharmagar@users.noreply.github.com>
Date: Wed, 18 Feb 2026 22:23:20 +0530
Subject: [PATCH 11/36] Add tabbed view support for chats and knowledge

---
 apps/x/apps/renderer/src/App.tsx              | 1470 +++++++++++------
 .../components/ai-elements/conversation.tsx   |   24 +-
 .../components/ai-elements/prompt-input.tsx   |    8 +-
 .../components/chat-input-with-mentions.tsx   |  201 +++
 .../renderer/src/components/chat-sidebar.tsx  |  871 +++++-----
 .../src/components/sidebar-content.tsx        |   74 +-
 .../apps/renderer/src/components/tab-bar.tsx  |   95 ++
 .../renderer/src/lib/chat-conversation.ts     |  177 ++
 apps/x/apps/renderer/src/styles/editor.css    |   10 +
 9 files changed, 1894 insertions(+), 1036 deletions(-)
 create mode 100644 apps/x/apps/renderer/src/components/chat-input-with-mentions.tsx
 create mode 100644 apps/x/apps/renderer/src/components/tab-bar.tsx
 create mode 100644 apps/x/apps/renderer/src/lib/chat-conversation.ts

diff --git a/apps/x/apps/renderer/src/App.tsx b/apps/x/apps/renderer/src/App.tsx
index ed3dd739..6e79bec8 100644
--- a/apps/x/apps/renderer/src/App.tsx
+++ b/apps/x/apps/renderer/src/App.tsx
@@ -6,15 +6,15 @@ import type { LanguageModelUsage, ToolUIPart } from 'ai';
 import './App.css'
 import z from 'zod';
 import { Button } from './components/ui/button';
-import { CheckIcon, LoaderIcon, ArrowUp, PanelLeftIcon, PanelRightIcon, Square, X, ChevronLeftIcon, ChevronRightIcon, SquarePen, SearchIcon } from 'lucide-react';
+import { CheckIcon, LoaderIcon, PanelLeftIcon, Expand, Shrink, X, ChevronLeftIcon, ChevronRightIcon, SquarePen, SearchIcon } from 'lucide-react';
 import { cn } from '@/lib/utils';
 import { MarkdownEditor } from './components/markdown-editor';
-import { ChatInputBar } from './components/chat-button';
 import { ChatSidebar } from './components/chat-sidebar';
+import { ChatInputWithMentions } from './components/chat-input-with-mentions';
 import { GraphView, type GraphEdge, type GraphNode } from '@/components/graph-view';
 import { useDebounce } from './hooks/use-debounce';
 import { SidebarContentPanel } from '@/components/sidebar-content';
-import { SidebarSectionProvider, type ActiveSection } from '@/contexts/sidebar-context';
+import { SidebarSectionProvider } from '@/contexts/sidebar-context';
 import {
   Conversation,
   ConversationContent,
@@ -28,9 +28,6 @@ import {
 } from '@/components/ai-elements/message';
 import {
   type PromptInputMessage,
-  PromptInputProvider,
-  PromptInputTextarea,
-  usePromptInputController,
   type FileMention,
 } from '@/components/ai-elements/prompt-input';
 
@@ -46,7 +43,7 @@ import {
   SidebarProvider,
   useSidebar,
 } from "@/components/ui/sidebar"
-import { TooltipProvider } from "@/components/ui/tooltip"
+import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from "@/components/ui/tooltip"
 import { Toaster } from "@/components/ui/sonner"
 import { stripKnowledgePrefix, toKnowledgePath, wikiLabel } from '@/lib/wiki-links'
 import { OnboardingModal } from '@/components/onboarding-modal'
@@ -54,6 +51,22 @@ import { SearchDialog } from '@/components/search-dialog'
 import { BackgroundTaskDetail } from '@/components/background-task-detail'
 import { FileCardProvider } from '@/contexts/file-card-context'
 import { MarkdownPreOverride } from '@/components/ai-elements/markdown-code-override'
+import { TabBar, type ChatTab, type FileTab } from '@/components/tab-bar'
+import {
+  type ChatTabViewState,
+  type ConversationItem,
+  type ToolCall,
+  createEmptyChatTabViewState,
+  getWebSearchCardData,
+  inferRunTitleFromMessage,
+  isChatMessage,
+  isErrorMessage,
+  isToolCall,
+  normalizeToolInput,
+  normalizeToolOutput,
+  parseAttachedFiles,
+  toToolState,
+} from '@/lib/chat-conversation'
 import { AgentScheduleConfig } from '@x/shared/dist/agent-schedule.js'
 import { AgentScheduleState } from '@x/shared/dist/agent-schedule-state.js'
 import { toast } from "sonner"
@@ -67,52 +80,6 @@ interface TreeNode extends DirEntry {
   loaded?: boolean
 }
 
-interface ChatMessage {
-  id: string;
-  role: 'user' | 'assistant';
-  content: string;
-  timestamp: number;
-}
-
-interface ToolCall {
-  id: string;
-  name: string;
-  input: ToolUIPart['input'];
-  result?: ToolUIPart['output'];
-  status: 'pending' | 'running' | 'completed' | 'error';
-  timestamp: number;
-}
-
-interface ErrorMessage {
-  id: string;
-  kind: 'error';
-  message: string;
-  timestamp: number;
-}
-
-type ConversationItem = ChatMessage | ToolCall | ErrorMessage;
-
-type ToolState = 'input-streaming' | 'input-available' | 'output-available' | 'output-error';
-
-const isChatMessage = (item: ConversationItem): item is ChatMessage => 'role' in item
-const isToolCall = (item: ConversationItem): item is ToolCall => 'name' in item
-const isErrorMessage = (item: ConversationItem): item is ErrorMessage => 'kind' in item && item.kind === 'error'
-
-const toToolState = (status: ToolCall['status']): ToolState => {
-  switch (status) {
-    case 'pending':
-      return 'input-streaming'
-    case 'running':
-      return 'input-available'
-    case 'completed':
-      return 'output-available'
-    case 'error':
-      return 'output-error'
-    default:
-      return 'input-available'
-  }
-}
-
 const streamdownComponents = { pre: MarkdownPreOverride }
 
 const DEFAULT_SIDEBAR_WIDTH = 256
@@ -139,41 +106,6 @@ const TITLEBAR_BUTTON_GAPS_COLLAPSED = 3
 const clampNumber = (value: number, min: number, max: number) =>
   Math.min(max, Math.max(min, value))
 
-// Parse attached files from message content and return clean message + file paths
-const parseAttachedFiles = (content: string): { message: string; files: string[] } => {
-  const attachedFilesRegex = /<attached-files>\s*([\s\S]*?)\s*<\/attached-files>/
-  const match = content.match(attachedFilesRegex)
-
-  if (!match) {
-    return { message: content, files: [] }
-  }
-
-  // Extract file paths from the XML
-  const filesXml = match[1]
-  const filePathRegex = /<file path="([^"]+)">/g
-  const files: string[] = []
-  let fileMatch
-  while ((fileMatch = filePathRegex.exec(filesXml)) !== null) {
-    files.push(fileMatch[1])
-  }
-
-  // Remove the attached-files block
-  let cleanMessage = content.replace(attachedFilesRegex, '').trim()
-
-  // Also remove @mentions for the attached files (they're shown as pills)
-  for (const filePath of files) {
-    // Get the display name (last part of path without extension)
-    const fileName = filePath.split('/').pop()?.replace(/\.md$/i, '') || ''
-    if (fileName) {
-      // Remove @filename pattern (with optional trailing space)
-      const mentionRegex = new RegExp(`@${fileName.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')}\\s*`, 'gi')
-      cleanMessage = cleanMessage.replace(mentionRegex, '')
-    }
-  }
-
-  return { message: cleanMessage.trim(), files }
-}
-
 const untitledBaseName = 'untitled'
 
 const getHeadingTitle = (markdown: string) => {
@@ -219,29 +151,6 @@ const normalizeUsage = (usage?: Partial<LanguageModelUsage> | null): LanguageMod
   }
 }
 
-const normalizeToolInput = (input: ToolCall['input'] | string | undefined): ToolCall['input'] => {
-  if (input === undefined || input === null) return {}
-  if (typeof input === 'string') {
-    const trimmed = input.trim()
-    if (!trimmed) return {}
-    try {
-      return JSON.parse(trimmed)
-    } catch {
-      return input
-    }
-  }
-  return input
-}
-
-const normalizeToolOutput = (output: ToolCall['result'] | undefined, status: ToolCall['status']) => {
-  if (output === undefined || output === null) {
-    return status === 'completed' ? 'No output returned.' : null
-  }
-  if (output === '') return '(empty output)'
-  if (typeof output === 'boolean' || typeof output === 'number') return String(output)
-  return output
-}
-
 // Sort nodes (dirs first, then alphabetically)
 function sortNodes(nodes: TreeNode[]): TreeNode[] {
   return nodes.sort((a, b) => {
@@ -293,170 +202,6 @@ const collectDirPaths = (nodes: TreeNode[]): string[] =>
 const collectFilePaths = (nodes: TreeNode[]): string[] =>
   nodes.flatMap(n => n.kind === 'file' ? [n.path] : (n.children ? collectFilePaths(n.children) : []))
 
-// Inner component that uses the controller to access mentions
-interface ChatInputInnerProps {
-  onSubmit: (message: PromptInputMessage, mentions?: FileMention[]) => void
-  onStop?: () => void
-  isProcessing: boolean
-  isStopping?: boolean
-  presetMessage?: string
-  onPresetMessageConsumed?: () => void
-  runId?: string | null
-}
-
-function ChatInputInner({
-  onSubmit,
-  onStop,
-  isProcessing,
-  isStopping,
-  presetMessage,
-  onPresetMessageConsumed,
-  runId,
-}: ChatInputInnerProps) {
-  const controller = usePromptInputController()
-  const message = controller.textInput.value
-  const canSubmit = Boolean(message.trim()) && !isProcessing
-
-  // Handle preset message from suggestions
-  useEffect(() => {
-    if (presetMessage) {
-      controller.textInput.setInput(presetMessage)
-      onPresetMessageConsumed?.()
-    }
-  }, [presetMessage, controller.textInput, onPresetMessageConsumed])
-
-  const handleSubmit = useCallback(() => {
-    if (!canSubmit) return
-    onSubmit({ text: message.trim(), files: [] }, controller.mentions.mentions)
-    controller.textInput.clear()
-    controller.mentions.clearMentions()
-  }, [canSubmit, message, onSubmit, controller])
-
-  const handleKeyDown = useCallback((e: React.KeyboardEvent) => {
-    if (e.key === 'Enter' && !e.shiftKey) {
-      e.preventDefault()
-      handleSubmit()
-    }
-  }, [handleSubmit])
-
-  useEffect(() => {
-    const onDragOver = (e: DragEvent) => {
-      if (e.dataTransfer?.types?.includes("Files")) {
-        e.preventDefault()
-      }
-    }
-    const onDrop = (e: DragEvent) => {
-      if (e.dataTransfer?.types?.includes("Files")) {
-        e.preventDefault()
-      }
-      if (e.dataTransfer?.files && e.dataTransfer.files.length > 0) {
-        const paths = Array.from(e.dataTransfer.files)
-          .map((f) => window.electronUtils?.getPathForFile(f))
-          .filter(Boolean)
-        if (paths.length > 0) {
-          const currentText = controller.textInput.value
-          const pathText = paths.join(' ')
-          controller.textInput.setInput(
-            currentText ? `${currentText} ${pathText}` : pathText
-          )
-        }
-      }
-    }
-    document.addEventListener("dragover", onDragOver)
-    document.addEventListener("drop", onDrop)
-    return () => {
-      document.removeEventListener("dragover", onDragOver)
-      document.removeEventListener("drop", onDrop)
-    }
-  }, [controller])
-
-  return (
-    <div className="flex items-center gap-2 bg-background border border-border rounded-lg shadow-none px-4 py-4">
-      <PromptInputTextarea
-        placeholder="Type your message..."
-        onKeyDown={handleKeyDown}
-        autoFocus
-        focusTrigger={runId}
-        className="min-h-6 py-0 border-0 shadow-none focus-visible:ring-0 rounded-none"
-      />
-      {isProcessing ? (
-        <Button
-          size="icon"
-          onClick={onStop}
-          title={isStopping ? "Click again to force stop" : "Stop generation"}
-          className={cn(
-            "h-7 w-7 rounded-full shrink-0 transition-all",
-            isStopping
-              ? "bg-destructive text-destructive-foreground hover:bg-destructive/90"
-              : "bg-primary text-primary-foreground hover:bg-primary/90"
-          )}
-        >
-          {isStopping ? (
-            <LoaderIcon className="h-4 w-4 animate-spin" />
-          ) : (
-            <Square className="h-3 w-3 fill-current" />
-          )}
-        </Button>
-      ) : (
-        <Button
-          size="icon"
-          onClick={handleSubmit}
-          disabled={!canSubmit}
-          className={cn(
-            "h-7 w-7 rounded-full shrink-0 transition-all",
-            canSubmit
-              ? "bg-primary text-primary-foreground hover:bg-primary/90"
-              : "bg-muted text-muted-foreground"
-          )}
-        >
-          <ArrowUp className="h-4 w-4" />
-        </Button>
-      )}
-    </div>
-  )
-}
-
-// Wrapper component with PromptInputProvider
-interface ChatInputWithMentionsProps {
-  knowledgeFiles: string[]
-  recentFiles: string[]
-  visibleFiles: string[]
-  onSubmit: (message: PromptInputMessage, mentions?: FileMention[]) => void
-  onStop?: () => void
-  isProcessing: boolean
-  isStopping?: boolean
-  presetMessage?: string
-  onPresetMessageConsumed?: () => void
-  runId?: string | null
-}
-
-function ChatInputWithMentions({
-  knowledgeFiles,
-  recentFiles,
-  visibleFiles,
-  onSubmit,
-  onStop,
-  isProcessing,
-  isStopping,
-  presetMessage,
-  onPresetMessageConsumed,
-  runId,
-}: ChatInputWithMentionsProps) {
-  return (
-    <PromptInputProvider knowledgeFiles={knowledgeFiles} recentFiles={recentFiles} visibleFiles={visibleFiles}>
-      <ChatInputInner
-        onSubmit={onSubmit}
-        onStop={onStop}
-        isProcessing={isProcessing}
-        isStopping={isStopping}
-        presetMessage={presetMessage}
-        onPresetMessageConsumed={onPresetMessageConsumed}
-        runId={runId}
-      />
-    </PromptInputProvider>
-  )
-}
-
 /** A snapshot of which view the user is on */
 type ViewState =
   | { type: 'chat'; runId: string | null }
@@ -561,7 +306,7 @@ function ContentHeader({
   return (
     <header
       className={cn(
-        "titlebar-drag-region flex h-10 shrink-0 items-center gap-2 border-b border-border px-3 bg-sidebar transition-[padding] duration-200 ease-linear",
+        "titlebar-drag-region flex h-10 shrink-0 items-stretch border-b border-border px-3 bg-sidebar transition-[padding] duration-200 ease-linear overflow-hidden",
         // When the sidebar is collapsed the content area shifts left, so we need enough left padding
         // to avoid overlapping the fixed traffic-lights/toggle/back/forward controls.
         isCollapsed && !collapsedLeftPaddingPx && "pl-[168px]"
@@ -569,7 +314,7 @@ function ContentHeader({
       style={isCollapsed && collapsedLeftPaddingPx ? { paddingLeft: collapsedLeftPaddingPx } : undefined}
     >
       {!isCollapsed && onNavigateBack && onNavigateForward ? (
-        <div className="titlebar-no-drag flex items-center gap-1">
+        <div className="titlebar-no-drag flex items-center gap-1 pr-2 shrink-0">
           <button
             type="button"
             onClick={onNavigateBack}
@@ -599,11 +344,15 @@ function ContentHeader({
 }
 
 function App() {
+  type ShortcutPane = 'left' | 'right'
+
   // File browser state (for Knowledge section)
   const [selectedPath, setSelectedPath] = useState<string | null>(null)
   const [fileContent, setFileContent] = useState<string>('')
   const [editorContent, setEditorContent] = useState<string>('')
   const editorContentRef = useRef<string>('')
+  const [editorContentByPath, setEditorContentByPath] = useState<Record<string, string>>({})
+  const editorContentByPathRef = useRef<Map<string, string>>(new Map())
   const [tree, setTree] = useState<TreeNode[]>([])
   const [expandedPaths, setExpandedPaths] = useState<Set<string>>(new Set())
   const [recentWikiFiles, setRecentWikiFiles] = useState<string[]>([])
@@ -616,6 +365,8 @@ function App() {
   const [graphStatus, setGraphStatus] = useState<'idle' | 'loading' | 'ready' | 'error'>('idle')
   const [graphError, setGraphError] = useState<string | null>(null)
   const [isChatSidebarOpen, setIsChatSidebarOpen] = useState(true)
+  const [isRightPaneMaximized, setIsRightPaneMaximized] = useState(false)
+  const [activeShortcutPane, setActiveShortcutPane] = useState<ShortcutPane>('left')
   const isMac = typeof navigator !== 'undefined' && navigator.platform.toLowerCase().includes('mac')
   const collapsedLeftPaddingPx =
     (isMac ? MACOS_TRAFFIC_LIGHTS_RESERVED_PX : 0) +
@@ -633,6 +384,10 @@ function App() {
   // Global navigation history (back/forward) across views (chat/file/graph/task)
   const historyRef = useRef<{ back: ViewState[]; forward: ViewState[] }>({ back: [], forward: [] })
   const [viewHistory, setViewHistory] = useState(historyRef.current)
+  const setHistory = useCallback((next: { back: ViewState[]; forward: ViewState[] }) => {
+    historyRef.current = next
+    setViewHistory(next)
+  }, [])
 
   // Auto-save state
   const [isSaving, setIsSaving] = useState(false)
@@ -642,7 +397,7 @@ function App() {
   const renameInProgressRef = useRef(false)
 
   // Chat state
-  const [message, setMessage] = useState<string>('')
+  const [, setMessage] = useState<string>('')
   const [conversation, setConversation] = useState<ConversationItem[]>([])
   const [currentAssistantMessage, setCurrentAssistantMessage] = useState<string>('')
   const [, setModelUsage] = useState<LanguageModelUsage | null>(null)
@@ -662,14 +417,139 @@ function App() {
   type RunListItem = { id: string; title?: string; createdAt: string; agentId: string }
   const [runs, setRuns] = useState<RunListItem[]>([])
 
+  // Chat tab state
+  const [chatTabs, setChatTabs] = useState<ChatTab[]>([{ id: 'default-chat-tab', runId: null }])
+  const [activeChatTabId, setActiveChatTabId] = useState('default-chat-tab')
+  const [chatViewStateByTab, setChatViewStateByTab] = useState<Record<string, ChatTabViewState>>({
+    'default-chat-tab': createEmptyChatTabViewState(),
+  })
+  const chatViewStateByTabRef = useRef(chatViewStateByTab)
+  const chatTabIdCounterRef = useRef(0)
+  const newChatTabId = () => `chat-tab-${++chatTabIdCounterRef.current}`
+  const chatDraftsRef = useRef(new Map<string, string>())
+  const chatScrollTopByTabRef = useRef(new Map<string, number>())
+  const [toolOpenByTab, setToolOpenByTab] = useState<Record<string, Record<string, boolean>>>({})
+  const activeChatTabIdRef = useRef(activeChatTabId)
+  activeChatTabIdRef.current = activeChatTabId
+  const setChatDraftForTab = useCallback((tabId: string, text: string) => {
+    if (text) {
+      chatDraftsRef.current.set(tabId, text)
+    } else {
+      chatDraftsRef.current.delete(tabId)
+    }
+  }, [])
+  const isToolOpenForTab = useCallback((tabId: string, toolId: string): boolean => {
+    return toolOpenByTab[tabId]?.[toolId] ?? false
+  }, [toolOpenByTab])
+  const setToolOpenForTab = useCallback((tabId: string, toolId: string, open: boolean) => {
+    setToolOpenByTab((prev) => {
+      const prevForTab = prev[tabId] ?? {}
+      if (prevForTab[toolId] === open) return prev
+      return {
+        ...prev,
+        [tabId]: {
+          ...prevForTab,
+          [toolId]: open,
+        },
+      }
+    })
+  }, [])
+  const getChatScrollContainer = useCallback((tabId: string): HTMLElement | null => {
+    if (typeof document === 'undefined') return null
+    const panel = document.querySelector<HTMLElement>(
+      `[data-chat-tab-panel="${tabId}"][aria-hidden="false"]`
+    )
+    if (!panel) return null
+    const logRoot = panel.querySelector<HTMLElement>('[role="log"]')
+    if (!logRoot) return null
+    const children = Array.from(logRoot.children) as HTMLElement[]
+    for (const child of children) {
+      const style = window.getComputedStyle(child)
+      if (style.overflowY === 'auto' || style.overflowY === 'scroll') {
+        return child
+      }
+    }
+    return null
+  }, [])
+  const saveChatScrollForTab = useCallback((tabId: string) => {
+    const container = getChatScrollContainer(tabId)
+    if (!container) return
+    chatScrollTopByTabRef.current.set(tabId, container.scrollTop)
+  }, [getChatScrollContainer])
+
+  const getChatTabTitle = useCallback((tab: ChatTab) => {
+    if (!tab.runId) return 'New chat'
+    return runs.find(r => r.id === tab.runId)?.title || '(Untitled chat)'
+  }, [runs])
+
+  const isChatTabProcessing = useCallback((tab: ChatTab) => {
+    return tab.runId ? processingRunIds.has(tab.runId) : false
+  }, [processingRunIds])
+
+  // File tab state
+  const [fileTabs, setFileTabs] = useState<FileTab[]>([])
+  const [activeFileTabId, setActiveFileTabId] = useState<string | null>(null)
+  const fileTabIdCounterRef = useRef(0)
+  const newFileTabId = () => `file-tab-${++fileTabIdCounterRef.current}`
+
+  const getFileTabTitle = useCallback((tab: FileTab) => {
+    return tab.path.split('/').pop()?.replace(/\.md$/i, '') || tab.path
+  }, [])
+
   // Pending requests state
-  const [pendingPermissionRequests, setPendingPermissionRequests] = useState<Map<string, z.infer<typeof ToolPermissionRequestEvent>>>(new Map())
+  const [, setPendingPermissionRequests] = useState<Map<string, z.infer<typeof ToolPermissionRequestEvent>>>(new Map())
   const [pendingAskHumanRequests, setPendingAskHumanRequests] = useState<Map<string, z.infer<typeof AskHumanRequestEvent>>>(new Map())
   // Track ALL permission requests (for rendering with response status)
   const [allPermissionRequests, setAllPermissionRequests] = useState<Map<string, z.infer<typeof ToolPermissionRequestEvent>>>(new Map())
   // Track permission responses (toolCallId -> response)
   const [permissionResponses, setPermissionResponses] = useState<Map<string, 'approve' | 'deny'>>(new Map())
 
+  useEffect(() => {
+    chatViewStateByTabRef.current = chatViewStateByTab
+  }, [chatViewStateByTab])
+
+  useEffect(() => {
+    const snapshot: ChatTabViewState = {
+      runId,
+      conversation,
+      currentAssistantMessage,
+      pendingAskHumanRequests: new Map(pendingAskHumanRequests),
+      allPermissionRequests: new Map(allPermissionRequests),
+      permissionResponses: new Map(permissionResponses),
+    }
+    setChatViewStateByTab((prev) => ({ ...prev, [activeChatTabId]: snapshot }))
+  }, [
+    activeChatTabId,
+    runId,
+    conversation,
+    currentAssistantMessage,
+    pendingAskHumanRequests,
+    allPermissionRequests,
+    permissionResponses,
+  ])
+
+  useEffect(() => {
+    const tabIds = new Set(chatTabs.map((tab) => tab.id))
+    setChatViewStateByTab((prev) => {
+      let changed = false
+      const next: Record<string, ChatTabViewState> = {}
+      for (const [tabId, state] of Object.entries(prev)) {
+        if (tabIds.has(tabId)) {
+          next[tabId] = state
+        } else {
+          changed = true
+        }
+      }
+      for (const tabId of tabIds) {
+        if (!next[tabId]) {
+          next[tabId] = createEmptyChatTabViewState()
+          changed = true
+        }
+      }
+      return changed ? next : prev
+    })
+  }, [chatTabs])
+
   // Workspace root for full paths
   const [workspaceRoot, setWorkspaceRoot] = useState<string>('')
 
@@ -708,15 +588,37 @@ function App() {
     runIdRef.current = runId
   }, [runId])
 
-  const handleEditorChange = useCallback((markdown: string) => {
+  const setEditorCacheForPath = useCallback((path: string, content: string) => {
+    editorContentByPathRef.current.set(path, content)
+    setEditorContentByPath((prev) => {
+      if (prev[path] === content) return prev
+      return { ...prev, [path]: content }
+    })
+  }, [])
+
+  const removeEditorCacheForPath = useCallback((path: string) => {
+    editorContentByPathRef.current.delete(path)
+    setEditorContentByPath((prev) => {
+      if (!(path in prev)) return prev
+      const next = { ...prev }
+      delete next[path]
+      return next
+    })
+  }, [])
+
+  const handleEditorChange = useCallback((path: string, markdown: string) => {
+    setEditorCacheForPath(path, markdown)
     const nextSelectedPath = selectedPathRef.current
+    if (nextSelectedPath !== path) {
+      return
+    }
     // Avoid clobbering editorPath during rapid transitions (e.g. autosave rename) where refs may lag a tick.
     if (!editorPathRef.current || (nextSelectedPath && editorPathRef.current === nextSelectedPath)) {
       editorPathRef.current = nextSelectedPath
     }
     editorContentRef.current = markdown
     setEditorContent(markdown)
-  }, [])
+  }, [setEditorCacheForPath])
   // Keep processingRunIdsRef in sync for use in async callbacks
   useEffect(() => {
     processingRunIdsRef.current = processingRunIds
@@ -787,6 +689,7 @@ function App() {
           if (selectedPathRef.current !== pathToReload) return
           setFileContent(result.data)
           setEditorContent(result.data)
+          setEditorCacheForPath(pathToReload, result.data)
           editorContentRef.current = result.data
           editorPathRef.current = pathToReload
           initialContentByPathRef.current.set(pathToReload, result.data)
@@ -796,7 +699,7 @@ function App() {
     })
     return cleanup
     // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [loadDirectory, selectedPath, editorContent])
+  }, [loadDirectory, selectedPath, editorContent, setEditorCacheForPath])
 
   // Load file content when selected
   useEffect(() => {
@@ -808,6 +711,17 @@ function App() {
       setLastSaved(null)
       return
     }
+    if (selectedPath.endsWith('.md')) {
+      const cachedContent = editorContentByPathRef.current.get(selectedPath)
+      if (cachedContent !== undefined) {
+        setFileContent(cachedContent)
+        setEditorContent(cachedContent)
+        editorContentRef.current = cachedContent
+        editorPathRef.current = selectedPath
+        initialContentRef.current = initialContentByPathRef.current.get(selectedPath) ?? cachedContent
+        return
+      }
+    }
     const requestId = (fileLoadRequestIdRef.current += 1)
     const pathToLoad = selectedPath
     let cancelled = false
@@ -826,6 +740,9 @@ function App() {
             && normalizeForCompare(editorContentRef.current) !== normalizeForCompare(result.data)
           if (!wouldClobberActiveEdits) {
             setEditorContent(result.data)
+            if (pathToLoad.endsWith('.md')) {
+              setEditorCacheForPath(pathToLoad, result.data)
+            }
             editorContentRef.current = result.data
             editorPathRef.current = pathToLoad
             initialContentByPathRef.current.set(pathToLoad, result.data)
@@ -854,7 +771,7 @@ function App() {
     return () => {
       cancelled = true
     }
-  }, [selectedPath])
+  }, [selectedPath, setEditorCacheForPath])
 
   // Track recently opened markdown files for wiki links
   useEffect(() => {
@@ -897,18 +814,32 @@ function App() {
             const targetPath = `${parentDir}/${desiredName}.md`
             if (targetPath !== pathAtStart) {
               const exists = await window.ipc.invoke('workspace:exists', { path: targetPath })
-	              if (!exists.exists) {
-	                renameInProgressRef.current = true
-	                await window.ipc.invoke('workspace:rename', { from: pathAtStart, to: targetPath })
-	                pathToSave = targetPath
-	                renamedFrom = pathAtStart
-	                renamedTo = targetPath
-	                editorPathRef.current = targetPath
-	                initialContentByPathRef.current.delete(pathAtStart)
-	              }
-	            }
-	          }
-	        }
+		              if (!exists.exists) {
+		                renameInProgressRef.current = true
+		                await window.ipc.invoke('workspace:rename', { from: pathAtStart, to: targetPath })
+		                pathToSave = targetPath
+		                renamedFrom = pathAtStart
+		                renamedTo = targetPath
+		                editorPathRef.current = targetPath
+		                setFileTabs(prev => prev.map(tab => (tab.path === pathAtStart ? { ...tab, path: targetPath } : tab)))
+		                initialContentByPathRef.current.delete(pathAtStart)
+		                const cachedContent = editorContentByPathRef.current.get(pathAtStart)
+		                if (cachedContent !== undefined) {
+		                  editorContentByPathRef.current.delete(pathAtStart)
+		                  editorContentByPathRef.current.set(targetPath, cachedContent)
+		                  setEditorContentByPath((prev) => {
+		                    const oldContent = prev[pathAtStart]
+		                    if (oldContent === undefined) return prev
+		                    const next = { ...prev }
+		                    delete next[pathAtStart]
+		                    next[targetPath] = oldContent
+		                    return next
+		                  })
+		                }
+		              }
+		            }
+		          }
+		        }
 	        await window.ipc.invoke('workspace:writeFile', {
 	          path: pathToSave,
 	          data: debouncedContent,
@@ -948,7 +879,7 @@ function App() {
       }
     }
     saveFile()
-  }, [debouncedContent])
+  }, [debouncedContent, setHistory])
 
   // Load runs list (all pages)
   const loadRuns = useCallback(async () => {
@@ -1181,34 +1112,25 @@ function App() {
     }
   }, [])
 
-  // Listen to run events
-  // Listen to run events - use ref to avoid stale closure issues
-  useEffect(() => {
-    const cleanup = window.ipc.on('runs:events', ((event: unknown) => {
-      handleRunEvent(event as RunEventType)
-    }) as (event: null) => void)
-    return cleanup
-  }, [])
-
-  const getStreamingBuffer = (id: string) => {
+  const getStreamingBuffer = useCallback((id: string) => {
     const existing = streamingBuffersRef.current.get(id)
     if (existing) return existing
     const next = { assistant: '' }
     streamingBuffersRef.current.set(id, next)
     return next
-  }
+  }, [])
 
-  const appendStreamingBuffer = (id: string, delta: string) => {
+  const appendStreamingBuffer = useCallback((id: string, delta: string) => {
     if (!delta) return
     const buffer = getStreamingBuffer(id)
     buffer.assistant += delta
-  }
+  }, [getStreamingBuffer])
 
-  const clearStreamingBuffer = (id: string) => {
+  const clearStreamingBuffer = useCallback((id: string) => {
     streamingBuffersRef.current.delete(id)
-  }
+  }, [])
 
-  const handleRunEvent = (event: RunEventType) => {
+  const handleRunEvent = useCallback((event: RunEventType) => {
     const activeRunId = runIdRef.current
     const isActiveRun = event.runId === activeRunId
 
@@ -1232,6 +1154,7 @@ function App() {
           next.delete(event.runId)
           return next
         })
+        void loadRuns()
         clearStreamingBuffer(event.runId)
         if (!isActiveRun) return
         setIsProcessing(false)
@@ -1277,6 +1200,16 @@ function App() {
       case 'message':
         {
           const msg = event.message
+          if (msg.role === 'user' && typeof msg.content === 'string') {
+            const inferredTitle = inferRunTitleFromMessage(msg.content)
+            if (inferredTitle) {
+              setRuns(prev => prev.map(run => (
+                run.id === event.runId && run.title !== inferredTitle
+                  ? { ...run, title: inferredTitle }
+                  : run
+              )))
+            }
+          }
           if (!isActiveRun) {
             if (msg.role === 'assistant') {
               clearStreamingBuffer(event.runId)
@@ -1471,7 +1404,15 @@ function App() {
         console.error('Run error:', event.error)
         break
     }
-  }
+  }, [appendStreamingBuffer, clearStreamingBuffer, loadRuns])
+
+  // Listen to run events - use refs/callbacks to avoid stale closure issues.
+  useEffect(() => {
+    const cleanup = window.ipc.on('runs:events', ((event: unknown) => {
+      handleRunEvent(event as RunEventType)
+    }) as (event: null) => void)
+    return cleanup
+  }, [handleRunEvent])
 
   const handlePromptSubmit = async (message: PromptInputMessage, mentions?: FileMention[]) => {
     if (isProcessing) return
@@ -1493,12 +1434,16 @@ function App() {
     try {
       let currentRunId = runId
       let isNewRun = false
+      let newRunCreatedAt: string | null = null
       if (!currentRunId) {
         const run = await window.ipc.invoke('runs:create', {
           agentId,
         })
         currentRunId = run.id
+        newRunCreatedAt = run.createdAt
         setRunId(currentRunId)
+        // Update active chat tab's runId to the new run
+        setChatTabs(prev => prev.map(t => t.id === activeChatTabId ? { ...t, runId: currentRunId } : t))
         isNewRun = true
       }
 
@@ -1530,9 +1475,17 @@ function App() {
         message: formattedMessage,
       })
 
-      // Refresh runs list after message is sent (so title is available)
       if (isNewRun) {
-        loadRuns()
+        const inferredTitle = inferRunTitleFromMessage(formattedMessage)
+        setRuns(prev => {
+          const withoutCurrent = prev.filter(run => run.id !== currentRunId)
+          return [{
+            id: currentRunId!,
+            title: inferredTitle,
+            createdAt: newRunCreatedAt ?? new Date().toISOString(),
+            agentId,
+          }, ...withoutCurrent]
+        })
       }
     } catch (error) {
       console.error('Failed to send message:', error)
@@ -1611,26 +1564,303 @@ function App() {
     setAllPermissionRequests(new Map())
     setPermissionResponses(new Map())
     setSelectedBackgroundTask(null)
+    setChatViewStateByTab(prev => ({
+      ...prev,
+      [activeChatTabIdRef.current]: createEmptyChatTabViewState(),
+    }))
   }, [])
 
-  const handleChatInputSubmit = (text: string) => {
+  // Chat tab operations
+  const applyChatTab = useCallback((tab: ChatTab) => {
+    if (tab.runId) {
+      loadRun(tab.runId)
+    } else {
+      loadRunRequestIdRef.current += 1
+      setConversation([])
+      setCurrentAssistantMessage('')
+      setRunId(null)
+      setMessage('')
+      setModelUsage(null)
+      setIsProcessing(false)
+      setPendingPermissionRequests(new Map())
+      setPendingAskHumanRequests(new Map())
+      setAllPermissionRequests(new Map())
+      setPermissionResponses(new Map())
+    }
+  }, [loadRun])
+
+  const restoreChatTabState = useCallback((tabId: string, fallbackRunId: string | null): boolean => {
+    const cached = chatViewStateByTabRef.current[tabId]
+    if (!cached) return false
+
+    const resolvedRunId = cached.runId ?? fallbackRunId
+    setRunId(resolvedRunId)
+    setConversation(cached.conversation)
+    setCurrentAssistantMessage(cached.currentAssistantMessage)
+
+    const pendingPermissions = new Map<string, z.infer<typeof ToolPermissionRequestEvent>>()
+    for (const [toolCallId, request] of cached.allPermissionRequests.entries()) {
+      if (!cached.permissionResponses.has(toolCallId)) {
+        pendingPermissions.set(toolCallId, request)
+      }
+    }
+    setPendingPermissionRequests(pendingPermissions)
+    setPendingAskHumanRequests(new Map(cached.pendingAskHumanRequests))
+    setAllPermissionRequests(new Map(cached.allPermissionRequests))
+    setPermissionResponses(new Map(cached.permissionResponses))
+    setIsProcessing(Boolean(resolvedRunId && processingRunIdsRef.current.has(resolvedRunId)))
+    return true
+  }, [])
+
+  const openChatInNewTab = useCallback((targetRunId: string) => {
+    const existingTab = chatTabs.find(t => t.runId === targetRunId)
+    if (existingTab) {
+      setActiveChatTabId(existingTab.id)
+      const restored = restoreChatTabState(existingTab.id, existingTab.runId)
+      if (processingRunIdsRef.current.has(targetRunId) || !restored) {
+        loadRun(targetRunId)
+      }
+      return
+    }
+    const id = newChatTabId()
+    setChatTabs(prev => [...prev, { id, runId: targetRunId }])
+    setActiveChatTabId(id)
+    loadRun(targetRunId)
+  }, [chatTabs, loadRun, restoreChatTabState])
+
+  const switchChatTab = useCallback((tabId: string) => {
+    const tab = chatTabs.find(t => t.id === tabId)
+    if (!tab) return
+    if (tabId === activeChatTabId) return
+    saveChatScrollForTab(activeChatTabId)
+    setActiveChatTabId(tabId)
+    const restored = restoreChatTabState(tabId, tab.runId)
+    if (tab.runId && processingRunIdsRef.current.has(tab.runId)) {
+      loadRun(tab.runId)
+      return
+    }
+    if (!restored) {
+      applyChatTab(tab)
+    }
+  }, [chatTabs, activeChatTabId, applyChatTab, loadRun, restoreChatTabState, saveChatScrollForTab])
+
+  const closeChatTab = useCallback((tabId: string) => {
+    if (chatTabs.length <= 1) return
+    const idx = chatTabs.findIndex(t => t.id === tabId)
+    if (idx === -1) return
+    saveChatScrollForTab(tabId)
+    const nextTabs = chatTabs.filter(t => t.id !== tabId)
+    setChatTabs(nextTabs)
+    setChatViewStateByTab(prev => {
+      if (!(tabId in prev)) return prev
+      const next = { ...prev }
+      delete next[tabId]
+      return next
+    })
+    chatDraftsRef.current.delete(tabId)
+    chatScrollTopByTabRef.current.delete(tabId)
+    setToolOpenByTab((prev) => {
+      if (!(tabId in prev)) return prev
+      const next = { ...prev }
+      delete next[tabId]
+      return next
+    })
+
+    if (tabId === activeChatTabId && nextTabs.length > 0) {
+      const newIdx = Math.min(idx, nextTabs.length - 1)
+      const newActiveTab = nextTabs[newIdx]
+      setActiveChatTabId(newActiveTab.id)
+      const restored = restoreChatTabState(newActiveTab.id, newActiveTab.runId)
+      if (newActiveTab.runId && processingRunIdsRef.current.has(newActiveTab.runId)) {
+        loadRun(newActiveTab.runId)
+      } else if (!restored) {
+        applyChatTab(newActiveTab)
+      }
+    }
+  }, [chatTabs, activeChatTabId, applyChatTab, loadRun, restoreChatTabState, saveChatScrollForTab])
+
+  useEffect(() => {
+    let cleanupScrollListener: (() => void) | undefined
+    let pollRaf: number | undefined
+    let restoreRafA: number | undefined
+    let restoreRafB: number | undefined
+    let restoreTimeout: ReturnType<typeof setTimeout> | undefined
+    let cancelled = false
+
+    const restoreScrollTop = (container: HTMLElement, top: number) => {
+      const maxScroll = Math.max(0, container.scrollHeight - container.clientHeight)
+      const clampedTop = clampNumber(top, 0, maxScroll)
+      container.scrollTop = clampedTop
+    }
+
+    const attach = (): boolean => {
+      if (cancelled) return true
+      const container = getChatScrollContainer(activeChatTabId)
+      if (!container) return false
+
+      const savedTop = chatScrollTopByTabRef.current.get(activeChatTabId)
+      if (savedTop !== undefined) {
+        // Reinforce restoration across a couple frames because stick-to-bottom
+        // may schedule scroll adjustments during mount/resize.
+        restoreScrollTop(container, savedTop)
+        restoreRafA = requestAnimationFrame(() => {
+          restoreScrollTop(container, savedTop)
+          restoreRafB = requestAnimationFrame(() => {
+            restoreScrollTop(container, savedTop)
+          })
+        })
+        restoreTimeout = setTimeout(() => {
+          restoreScrollTop(container, savedTop)
+        }, 220)
+      }
+
+      const onScroll = () => {
+        chatScrollTopByTabRef.current.set(activeChatTabId, container.scrollTop)
+      }
+      container.addEventListener('scroll', onScroll, { passive: true })
+      cleanupScrollListener = () => {
+        chatScrollTopByTabRef.current.set(activeChatTabId, container.scrollTop)
+        container.removeEventListener('scroll', onScroll)
+      }
+      return true
+    }
+
+    let attempts = 0
+    const maxAttempts = 60
+    const pollAttach = () => {
+      if (cancelled) return
+      if (attach()) return
+      if (attempts >= maxAttempts) return
+      attempts += 1
+      pollRaf = requestAnimationFrame(pollAttach)
+    }
+    pollAttach()
+
+    return () => {
+      cancelled = true
+      cleanupScrollListener?.()
+      if (pollRaf !== undefined) cancelAnimationFrame(pollRaf)
+      if (restoreRafA !== undefined) cancelAnimationFrame(restoreRafA)
+      if (restoreRafB !== undefined) cancelAnimationFrame(restoreRafB)
+      if (restoreTimeout !== undefined) clearTimeout(restoreTimeout)
+    }
+  }, [
+    activeChatTabId,
+    selectedPath,
+    isGraphOpen,
+    isChatSidebarOpen,
+    isRightPaneMaximized,
+    getChatScrollContainer,
+  ])
+
+  // File tab operations
+  const openFileInNewTab = useCallback((path: string) => {
+    const existingTab = fileTabs.find(t => t.path === path)
+    if (existingTab) {
+      setActiveFileTabId(existingTab.id)
+      setSelectedPath(path)
+      return
+    }
+    const id = newFileTabId()
+    setFileTabs(prev => [...prev, { id, path }])
+    setActiveFileTabId(id)
+    setSelectedPath(path)
+  }, [fileTabs])
+
+  const switchFileTab = useCallback((tabId: string) => {
+    const tab = fileTabs.find(t => t.id === tabId)
+    if (!tab) return
+    setActiveFileTabId(tabId)
+    setSelectedPath(tab.path)
+  }, [fileTabs])
+
+  const closeFileTab = useCallback((tabId: string) => {
+    const closingTab = fileTabs.find(t => t.id === tabId)
+    if (closingTab) {
+      removeEditorCacheForPath(closingTab.path)
+      initialContentByPathRef.current.delete(closingTab.path)
+      if (editorPathRef.current === closingTab.path) {
+        editorPathRef.current = null
+      }
+    }
+    setFileTabs(prev => {
+      if (prev.length <= 1) {
+        // Last file tab - close it and go back to chat
+        setActiveFileTabId(null)
+        setSelectedPath(null)
+        return []
+      }
+      const idx = prev.findIndex(t => t.id === tabId)
+      const next = prev.filter(t => t.id !== tabId)
+      if (tabId === activeFileTabId && next.length > 0) {
+        const newIdx = Math.min(idx, next.length - 1)
+        const newActiveTab = next[newIdx]
+        setActiveFileTabId(newActiveTab.id)
+        setSelectedPath(newActiveTab.path)
+      }
+      return next
+    })
+  }, [activeFileTabId, fileTabs, removeEditorCacheForPath])
+
+  const handleNewChatTab = useCallback(() => {
+    // If there's already an empty "New chat" tab, switch to it
+    const emptyTab = chatTabs.find(t => !t.runId)
+    if (emptyTab) {
+      if (emptyTab.id !== activeChatTabId) {
+        setActiveChatTabId(emptyTab.id)
+      }
+    } else {
+      // Create a new tab
+      const id = newChatTabId()
+      setChatTabs(prev => [...prev, { id, runId: null }])
+      setActiveChatTabId(id)
+    }
+    handleNewChat()
+    // Left-pane "new chat" should always open full chat view.
+    if (selectedPath || isGraphOpen) {
+      setExpandedFrom({ path: selectedPath, graph: isGraphOpen })
+    } else {
+      setExpandedFrom(null)
+    }
+    setIsRightPaneMaximized(false)
+    setSelectedPath(null)
+    setIsGraphOpen(false)
+  }, [chatTabs, activeChatTabId, handleNewChat, selectedPath, isGraphOpen])
+
+  // Sidebar variant: create/switch chat tab without leaving file/graph context.
+  const handleNewChatTabInSidebar = useCallback(() => {
+    const emptyTab = chatTabs.find(t => !t.runId)
+    if (emptyTab) {
+      if (emptyTab.id !== activeChatTabId) {
+        setActiveChatTabId(emptyTab.id)
+      }
+    } else {
+      const id = newChatTabId()
+      setChatTabs(prev => [...prev, { id, runId: null }])
+      setActiveChatTabId(id)
+    }
+    handleNewChat()
+  }, [chatTabs, activeChatTabId, handleNewChat])
+
+  const toggleKnowledgePane = useCallback(() => {
+    setIsRightPaneMaximized(false)
+    setIsChatSidebarOpen(prev => !prev)
+  }, [])
+
+  const toggleRightPaneMaximize = useCallback(() => {
     setIsChatSidebarOpen(true)
-    // Submit immediately - the sidebar will open and show the message
-    handlePromptSubmit({ text, files: [] })
-  }
+    setIsRightPaneMaximized(prev => !prev)
+  }, [])
 
   const handleOpenFullScreenChat = useCallback(() => {
     // Remember where we came from so the close button can return
     if (selectedPath || isGraphOpen) {
       setExpandedFrom({ path: selectedPath, graph: isGraphOpen })
     }
-    // Copy sidebar input text to full-screen input (keep sidebar message intact for return)
-    if (message.trim()) {
-      setPresetMessage(message)
-    }
+    setIsRightPaneMaximized(false)
     setSelectedPath(null)
     setIsGraphOpen(false)
-  }, [selectedPath, isGraphOpen, message])
+  }, [selectedPath, isGraphOpen])
 
   const handleCloseFullScreenChat = useCallback(() => {
     if (expandedFrom) {
@@ -1640,14 +1870,10 @@ function App() {
         setSelectedPath(expandedFrom.path)
       }
       setExpandedFrom(null)
+      setIsRightPaneMaximized(false)
     }
   }, [expandedFrom])
 
-  const setHistory = useCallback((next: { back: ViewState[]; forward: ViewState[] }) => {
-    historyRef.current = next
-    setViewHistory(next)
-  }, [])
-
   const currentViewState = React.useMemo<ViewState>(() => {
     if (selectedBackgroundTask) return { type: 'task', name: selectedBackgroundTask }
     if (selectedPath) return { type: 'file', path: selectedPath }
@@ -1667,6 +1893,8 @@ function App() {
         setSelectedBackgroundTask(null)
         setIsGraphOpen(false)
         setExpandedFrom(null)
+        setIsChatSidebarOpen(true)
+        setIsRightPaneMaximized(false)
         setSelectedPath(view.path)
         return
       case 'graph':
@@ -1674,17 +1902,20 @@ function App() {
         setSelectedPath(null)
         setExpandedFrom(null)
         setIsGraphOpen(true)
+        setIsRightPaneMaximized(false)
         return
       case 'task':
         setSelectedPath(null)
         setIsGraphOpen(false)
         setExpandedFrom(null)
+        setIsRightPaneMaximized(false)
         setSelectedBackgroundTask(view.name)
         return
       case 'chat':
         setSelectedPath(null)
         setIsGraphOpen(false)
         setExpandedFrom(null)
+        setIsRightPaneMaximized(false)
         setSelectedBackgroundTask(null)
         if (view.runId) {
           await loadRun(view.runId)
@@ -1762,8 +1993,22 @@ function App() {
   }, [viewHistory.forward, currentViewState])
 
   const navigateToFile = useCallback((path: string) => {
+    // If already open in a file tab, switch to it
+    const existingTab = fileTabs.find(t => t.path === path)
+    if (existingTab) {
+      switchFileTab(existingTab.id)
+      return
+    }
+    // Update current file tab or create one if none exists
+    if (activeFileTabId) {
+      setFileTabs(prev => prev.map(t => t.id === activeFileTabId ? { ...t, path } : t))
+    } else {
+      const id = newFileTabId()
+      setFileTabs(prev => [...prev, { id, path }])
+      setActiveFileTabId(id)
+    }
     void navigateToView({ type: 'file', path })
-  }, [navigateToView])
+  }, [navigateToView, fileTabs, activeFileTabId, switchFileTab])
 
   const navigateToFullScreenChat = useCallback(() => {
     // Only treat this as navigation when coming from another view
@@ -1845,6 +2090,67 @@ function App() {
     return () => document.removeEventListener('keydown', handleKeyDown)
   }, [])
 
+  // Keyboard shortcuts for tab management
+  useEffect(() => {
+    const handleTabKeyDown = (e: KeyboardEvent) => {
+      const mod = e.metaKey || e.ctrlKey
+      if (!mod) return
+      const rightPaneAvailable = Boolean((selectedPath || isGraphOpen) && isChatSidebarOpen)
+      const targetPane: ShortcutPane = rightPaneAvailable
+        ? (isRightPaneMaximized ? 'right' : activeShortcutPane)
+        : 'left'
+      const inFileView = targetPane === 'left' && Boolean(selectedPath)
+      const targetFileTabId = activeFileTabId ?? fileTabs.find((tab) => tab.path === selectedPath)?.id ?? null
+
+      // Cmd+W — close active tab
+      if (e.key === 'w') {
+        e.preventDefault()
+        if (inFileView && targetFileTabId) {
+          closeFileTab(targetFileTabId)
+        } else {
+          closeChatTab(activeChatTabId)
+        }
+        return
+      }
+
+      // Cmd+1..9 — switch to tab N (Cmd+9 always goes to last tab)
+      if (/^[1-9]$/.test(e.key)) {
+        e.preventDefault()
+        const n = parseInt(e.key, 10)
+        if (inFileView) {
+          const idx = e.key === '9' ? fileTabs.length - 1 : n - 1
+          const tab = fileTabs[idx]
+          if (tab) switchFileTab(tab.id)
+        } else {
+          const idx = e.key === '9' ? chatTabs.length - 1 : n - 1
+          const tab = chatTabs[idx]
+          if (tab) switchChatTab(tab.id)
+        }
+        return
+      }
+
+      // Cmd+Shift+] — next tab, Cmd+Shift+[ — previous tab
+      if (e.shiftKey && (e.key === ']' || e.key === '[')) {
+        e.preventDefault()
+        const direction = e.key === ']' ? 1 : -1
+        if (inFileView) {
+          const currentIdx = fileTabs.findIndex(t => t.id === targetFileTabId)
+          if (currentIdx === -1) return
+          const nextIdx = (currentIdx + direction + fileTabs.length) % fileTabs.length
+          switchFileTab(fileTabs[nextIdx].id)
+        } else {
+          const currentIdx = chatTabs.findIndex(t => t.id === activeChatTabId)
+          if (currentIdx === -1) return
+          const nextIdx = (currentIdx + direction + chatTabs.length) % chatTabs.length
+          switchChatTab(chatTabs[nextIdx].id)
+        }
+        return
+      }
+    }
+    document.addEventListener('keydown', handleTabKeyDown)
+    return () => document.removeEventListener('keydown', handleTabKeyDown)
+  }, [selectedPath, isGraphOpen, isChatSidebarOpen, isRightPaneMaximized, activeShortcutPane, chatTabs, fileTabs, activeChatTabId, activeFileTabId, closeChatTab, closeFileTab, switchChatTab, switchFileTab])
+
   const toggleExpand = (path: string, kind: 'file' | 'dir') => {
     if (kind === 'file') {
       navigateToFile(path)
@@ -1860,16 +2166,6 @@ function App() {
     setExpandedPaths(newExpanded)
   }
 
-  // Handle sidebar section changes - switch to chat view for tasks
-  const handleSectionChange = useCallback((section: ActiveSection) => {
-    if (section === 'tasks') {
-      if (selectedBackgroundTask) return
-      if (selectedPath || isGraphOpen) {
-        void navigateToView({ type: 'chat', runId })
-      }
-    }
-  }, [isGraphOpen, navigateToView, runId, selectedBackgroundTask, selectedPath])
-
   // Knowledge quick actions
   const knowledgeFiles = React.useMemo(() => {
     const files = collectFilePaths(tree).filter((path) => path.endsWith('.md'))
@@ -1986,6 +2282,27 @@ function App() {
         parts[parts.length - 1] = finalName
         const newPath = parts.join('/')
         await window.ipc.invoke('workspace:rename', { from: oldPath, to: newPath })
+        setFileTabs(prev => prev.map(tab => (tab.path === oldPath ? { ...tab, path: newPath } : tab)))
+        if (editorPathRef.current === oldPath) {
+          editorPathRef.current = newPath
+        }
+        const baseline = initialContentByPathRef.current.get(oldPath)
+        if (baseline !== undefined) {
+          initialContentByPathRef.current.delete(oldPath)
+          initialContentByPathRef.current.set(newPath, baseline)
+        }
+        const cachedContent = editorContentByPathRef.current.get(oldPath)
+        if (cachedContent !== undefined) {
+          editorContentByPathRef.current.delete(oldPath)
+          editorContentByPathRef.current.set(newPath, cachedContent)
+          setEditorContentByPath(prev => {
+            if (!(oldPath in prev)) return prev
+            const next = { ...prev }
+            delete next[oldPath]
+            next[newPath] = cachedContent
+            return next
+          })
+        }
         if (selectedPath === oldPath) setSelectedPath(newPath)
       } catch (err) {
         console.error('Failed to rename:', err)
@@ -1995,7 +2312,17 @@ function App() {
     remove: async (path: string) => {
       try {
         await window.ipc.invoke('workspace:remove', { path, opts: { trash: true } })
-        if (selectedPath === path) setSelectedPath(null)
+        if (path.endsWith('.md')) {
+          removeEditorCacheForPath(path)
+          initialContentByPathRef.current.delete(path)
+        }
+        // Close any file tab showing the deleted file
+        const tabForFile = fileTabs.find(t => t.path === path)
+        if (tabForFile) {
+          closeFileTab(tabForFile.id)
+        } else if (selectedPath === path) {
+          setSelectedPath(null)
+        }
       } catch (err) {
         console.error('Failed to remove:', err)
         throw err
@@ -2005,7 +2332,10 @@ function App() {
       const fullPath = workspaceRoot ? `${workspaceRoot}/${path}` : path
       navigator.clipboard.writeText(fullPath)
     },
-  }), [tree, selectedPath, workspaceRoot, collectDirPaths, navigateToFile, navigateToView])
+    onOpenInNewTab: (path: string) => {
+      openFileInNewTab(path)
+    },
+  }), [tree, selectedPath, workspaceRoot, navigateToFile, navigateToView, openFileInNewTab, fileTabs, closeFileTab, removeEditorCacheForPath])
 
   // Handler for when a voice note is created/updated
   const handleVoiceNoteCreated = useCallback(async (notePath: string) => {
@@ -2180,7 +2510,7 @@ function App() {
     }
   }, [isGraphOpen, knowledgeFilePaths])
 
-  const renderConversationItem = (item: ConversationItem) => {
+  const renderConversationItem = (item: ConversationItem, tabId: string) => {
     if (isChatMessage(item)) {
       if (item.role === 'user') {
         const { message, files } = parseAttachedFiles(item.content)
@@ -2214,36 +2544,15 @@ function App() {
     }
 
     if (isToolCall(item)) {
-      if (item.name === 'web-search') {
-        const input = normalizeToolInput(item.input) as Record<string, unknown> | undefined
-        const result = item.result as Record<string, unknown> | undefined
+      const webSearchData = getWebSearchCardData(item)
+      if (webSearchData) {
         return (
           <WebSearchResult
             key={item.id}
-            query={(input?.query as string) || ''}
-            results={(result?.results as Array<{ title: string; url: string; description: string }>) || []}
+            query={webSearchData.query}
+            results={webSearchData.results}
             status={item.status}
-          />
-        )
-      }
-      if (item.name === 'research-search') {
-        const input = normalizeToolInput(item.input) as Record<string, unknown> | undefined
-        const result = item.result as Record<string, unknown> | undefined
-        const rawResults = (result?.results as Array<{ title: string; url: string; highlights?: string[]; text?: string }>) || []
-        const mapped = rawResults.map(r => ({
-          title: r.title,
-          url: r.url,
-          description: r.highlights?.[0] || (r.text ? r.text.slice(0, 200) : ''),
-        }))
-        const category = input?.category as string | undefined
-        const cardTitle = category ? `${category.charAt(0).toUpperCase() + category.slice(1)} search` : 'Researched the web'
-        return (
-          <WebSearchResult
-            key={item.id}
-            query={(input?.query as string) || ''}
-            results={mapped}
-            status={item.status}
-            title={cardTitle}
+            title={webSearchData.title}
           />
         )
       }
@@ -2251,7 +2560,11 @@ function App() {
       const output = normalizeToolOutput(item.result, item.status)
       const input = normalizeToolInput(item.input)
       return (
-        <Tool key={item.id}>
+        <Tool
+          key={item.id}
+          open={isToolOpenForTab(tabId, item.id)}
+          onOpenChange={(open) => setToolOpenForTab(tabId, item.id, open)}
+        >
           <ToolHeader
             title={item.name}
             type={`tool-${item.name}`}
@@ -2280,25 +2593,47 @@ function App() {
     return null
   }
 
-  const hasConversation = conversation.length > 0 || currentAssistantMessage
-  const conversationContentClassName = hasConversation
-    ? "mx-auto w-full max-w-4xl pb-28"
-    : "mx-auto w-full max-w-4xl min-h-full items-center justify-center pb-0"
-  const headerTitle = selectedPath
-    ? selectedPath
-    : isGraphOpen
-      ? 'Graph View'
-      : selectedBackgroundTask
-        ? `Background Task: ${selectedBackgroundTask}`
-        : 'Chat'
+  const activeChatTabState = React.useMemo<ChatTabViewState>(() => ({
+    runId,
+    conversation,
+    currentAssistantMessage,
+    pendingAskHumanRequests,
+    allPermissionRequests,
+    permissionResponses,
+  }), [
+    runId,
+    conversation,
+    currentAssistantMessage,
+    pendingAskHumanRequests,
+    allPermissionRequests,
+    permissionResponses,
+  ])
+  const emptyChatTabState = React.useMemo<ChatTabViewState>(() => createEmptyChatTabViewState(), [])
+  const getChatTabStateForRender = useCallback((tabId: string): ChatTabViewState => {
+    if (tabId === activeChatTabId) return activeChatTabState
+    return chatViewStateByTab[tabId] ?? emptyChatTabState
+  }, [activeChatTabId, activeChatTabState, chatViewStateByTab, emptyChatTabState])
+  const hasConversation = activeChatTabState.conversation.length > 0 || activeChatTabState.currentAssistantMessage
   const selectedTask = selectedBackgroundTask
     ? backgroundTasks.find(t => t.name === selectedBackgroundTask)
     : null
+  const isRightPaneContext = Boolean(selectedPath || isGraphOpen)
+  const isRightPaneOnlyMode = isRightPaneContext && isChatSidebarOpen && isRightPaneMaximized
+  const openMarkdownTabs = React.useMemo(() => {
+    const markdownTabs = fileTabs.filter(tab => tab.path.endsWith('.md'))
+    if (selectedPath?.endsWith('.md')) {
+      const hasSelectedTab = markdownTabs.some(tab => tab.path === selectedPath)
+      if (!hasSelectedTab) {
+        return [...markdownTabs, { id: '__active-markdown-tab__', path: selectedPath }]
+      }
+    }
+    return markdownTabs
+  }, [fileTabs, selectedPath])
 
   return (
     <TooltipProvider delayDuration={0}>
-      <SidebarSectionProvider defaultSection="tasks" onSectionChange={handleSectionChange}>
-        <div className="flex h-svh w-full">
+      <SidebarSectionProvider defaultSection="tasks">
+        <div className="flex h-svh w-full overflow-hidden">
           {/* Content sidebar with SidebarProvider for collapse functionality */}
           <SidebarProvider
             style={{
@@ -2316,17 +2651,57 @@ function App() {
               currentRunId={runId}
               processingRunIds={processingRunIds}
               tasksActions={{
-                onNewChat: () => {
-                  void navigateToView({ type: 'chat', runId: null })
-                },
+                onNewChat: handleNewChatTab,
                 onSelectRun: (runIdToLoad) => {
+                  if (selectedPath || isGraphOpen) {
+                    setIsChatSidebarOpen(true)
+                    setIsRightPaneMaximized(false)
+                  }
+
+                  // If already open in a chat tab, switch to it
+                  const existingTab = chatTabs.find(t => t.runId === runIdToLoad)
+                  if (existingTab) {
+                    switchChatTab(existingTab.id)
+                    return
+                  }
+                  // In two-pane mode, keep current knowledge/graph context and just swap chat context.
+                  if (selectedPath || isGraphOpen) {
+                    setChatTabs(prev => prev.map(t => t.id === activeChatTabId ? { ...t, runId: runIdToLoad } : t))
+                    loadRun(runIdToLoad)
+                    return
+                  }
+
+                  // Outside two-pane mode, navigate to chat.
+                  setChatTabs(prev => prev.map(t => t.id === activeChatTabId ? { ...t, runId: runIdToLoad } : t))
                   void navigateToView({ type: 'chat', runId: runIdToLoad })
                 },
+                onOpenInNewTab: (targetRunId) => {
+                  openChatInNewTab(targetRunId)
+                },
                 onDeleteRun: async (runIdToDelete) => {
                   try {
                     await window.ipc.invoke('runs:delete', { runId: runIdToDelete })
-                    if (runId === runIdToDelete) {
-                      void navigateToView({ type: 'chat', runId: null })
+                    // Close any chat tab showing the deleted run
+                    const tabForRun = chatTabs.find(t => t.runId === runIdToDelete)
+                    if (tabForRun) {
+                      if (chatTabs.length > 1) {
+                        closeChatTab(tabForRun.id)
+                      } else {
+                        // Only one tab, reset it to new chat
+                        setChatTabs([{ id: tabForRun.id, runId: null }])
+                        if (selectedPath || isGraphOpen) {
+                          handleNewChat()
+                        } else {
+                          void navigateToView({ type: 'chat', runId: null })
+                        }
+                      }
+                    } else if (runId === runIdToDelete) {
+                      if (selectedPath || isGraphOpen) {
+                        setChatTabs(prev => prev.map(t => t.id === activeChatTabId ? { ...t, runId: null } : t))
+                        handleNewChat()
+                      } else {
+                        void navigateToView({ type: 'chat', runId: null })
+                      }
                     }
                     await loadRuns()
                   } catch (err) {
@@ -2340,7 +2715,12 @@ function App() {
               backgroundTasks={backgroundTasks}
               selectedBackgroundTask={selectedBackgroundTask}
             />
-            <SidebarInset className="overflow-hidden! min-h-0">
+            {!isRightPaneOnlyMode && (
+            <SidebarInset
+              className="overflow-hidden! min-h-0 min-w-0"
+              onMouseDownCapture={() => setActiveShortcutPane('left')}
+              onFocusCapture={() => setActiveShortcutPane('left')}
+            >
               {/* Header - also serves as titlebar drag region, adjusts padding when sidebar collapsed */}
               <ContentHeader
                 onNavigateBack={() => { void navigateBack() }}
@@ -2349,9 +2729,26 @@ function App() {
                 canNavigateForward={canNavigateForward}
                 collapsedLeftPaddingPx={collapsedLeftPaddingPx}
               >
-                <span className="text-sm font-medium text-muted-foreground flex-1 min-w-0 truncate">
-                  {headerTitle}
-                </span>
+                {selectedPath && fileTabs.length >= 1 ? (
+                  <TabBar
+                    tabs={fileTabs}
+                    activeTabId={activeFileTabId ?? ''}
+                    getTabTitle={getFileTabTitle}
+                    getTabId={(t) => t.id}
+                    onSwitchTab={switchFileTab}
+                    onCloseTab={closeFileTab}
+                  />
+                ) : (
+                  <TabBar
+                    tabs={chatTabs}
+                    activeTabId={activeChatTabId}
+                    getTabTitle={getChatTabTitle}
+                    getTabId={(t) => t.id}
+                    isProcessing={isChatTabProcessing}
+                    onSwitchTab={switchChatTab}
+                    onCloseTab={closeChatTab}
+                  />
+                )}
                 <button
                   type="button"
                   onClick={() => setIsSearchOpen(true)}
@@ -2361,7 +2758,7 @@ function App() {
                   <SearchIcon className="size-4" />
                 </button>
                 {selectedPath && (
-                  <div className="flex items-center gap-1 text-xs text-muted-foreground">
+                  <div className="flex items-center gap-1 text-xs text-muted-foreground self-center shrink-0 pl-2">
                     {isSaving ? (
                       <>
                         <LoaderIcon className="h-3 w-3 animate-spin" />
@@ -2380,7 +2777,7 @@ function App() {
                     variant="ghost"
                     size="sm"
                     onClick={() => { void navigateToView({ type: 'chat', runId }) }}
-                    className="titlebar-no-drag text-foreground"
+                    className="titlebar-no-drag text-foreground self-center shrink-0"
                   >
                     Close Graph
                   </Button>
@@ -2389,21 +2786,32 @@ function App() {
                   <button
                     type="button"
                     onClick={handleCloseFullScreenChat}
-                    className="titlebar-no-drag flex h-8 w-8 items-center justify-center rounded-md text-muted-foreground hover:bg-accent hover:text-foreground transition-colors"
+                    className="titlebar-no-drag flex h-8 w-8 items-center justify-center rounded-md text-muted-foreground hover:bg-accent hover:text-foreground transition-colors self-center shrink-0"
                     aria-label="Return to file"
                   >
                     <X className="size-5" />
                   </button>
                 )}
                 {(selectedPath || isGraphOpen) && (
-                  <button
-                    type="button"
-                    onClick={() => setIsChatSidebarOpen(!isChatSidebarOpen)}
-                    className="titlebar-no-drag flex h-8 w-8 items-center justify-center rounded-md text-muted-foreground hover:bg-accent hover:text-foreground transition-colors -mr-1"
-                    aria-label="Toggle Chat Sidebar"
-                  >
-                    <PanelRightIcon className="size-5" />
-                  </button>
+                  <Tooltip>
+                    <TooltipTrigger asChild>
+                      <button
+                        type="button"
+                        onClick={toggleKnowledgePane}
+                        className="titlebar-no-drag flex h-8 w-8 items-center justify-center rounded-md text-muted-foreground hover:bg-accent hover:text-foreground transition-colors -mr-1 self-center shrink-0"
+                        aria-label={isChatSidebarOpen
+                          ? (selectedPath ? "Maximize knowledge view" : "Maximize main view")
+                          : "Restore two-pane view"}
+                      >
+                        {isChatSidebarOpen ? <Expand className="size-5" /> : <Shrink className="size-5" />}
+                      </button>
+                    </TooltipTrigger>
+                    <TooltipContent side="bottom">
+                      {isChatSidebarOpen
+                        ? (selectedPath ? "Maximize knowledge view" : "Maximize main view")
+                        : "Restore two-pane view"}
+                    </TooltipContent>
+                  </Tooltip>
                 )}
               </ContentHeader>
 
@@ -2422,13 +2830,32 @@ function App() {
               ) : selectedPath ? (
                 selectedPath.endsWith('.md') ? (
                   <div className="flex-1 min-h-0 flex flex-col overflow-hidden">
-                    <MarkdownEditor
-                      content={editorContent}
-                      onChange={handleEditorChange}
-                      placeholder="Start writing..."
-                      wikiLinks={wikiLinkConfig}
-                      onImageUpload={handleImageUpload}
-                    />
+                    {openMarkdownTabs.map((tab) => {
+                      const isActive = activeFileTabId
+                        ? tab.id === activeFileTabId || tab.path === selectedPath
+                        : tab.path === selectedPath
+                      const tabContent = editorContentByPath[tab.path]
+                        ?? (isActive && editorPathRef.current === tab.path ? editorContent : '')
+                      return (
+                        <div
+                          key={tab.id}
+                          className={cn(
+                            'min-h-0 flex-1 flex-col overflow-hidden',
+                            isActive ? 'flex' : 'hidden'
+                          )}
+                          data-file-tab-panel={tab.id}
+                          aria-hidden={!isActive}
+                        >
+                          <MarkdownEditor
+                            content={tabContent}
+                            onChange={(markdown) => handleEditorChange(tab.path, markdown)}
+                            placeholder="Start writing..."
+                            wikiLinks={wikiLinkConfig}
+                            onImageUpload={handleImageUpload}
+                          />
+                        </div>
+                      )
+                    })}
                   </div>
                 ) : (
                   <div className="flex-1 overflow-auto p-4">
@@ -2455,70 +2882,92 @@ function App() {
               ) : (
               <FileCardProvider onOpenKnowledgeFile={(path) => { navigateToFile(path) }}>
               <div className="flex min-h-0 flex-1 flex-col">
-                <Conversation className="relative flex-1 overflow-y-auto [scrollbar-gutter:stable]">
-                  <ScrollPositionPreserver />
-                  <ConversationContent className={conversationContentClassName}>
-                    {!hasConversation ? (
-                      <ConversationEmptyState className="h-auto">
-                        <div className="text-2xl font-semibold tracking-tight text-foreground/80 sm:text-3xl md:text-4xl">
-                          What are we working on?
-                        </div>
-                      </ConversationEmptyState>
-                    ) : (
-                      <>
-                        {conversation.map(item => {
-                          const rendered = renderConversationItem(item)
-                          // If this is a tool call, check for permission request (pending or responded)
-                          if (isToolCall(item)) {
-                            const permRequest = allPermissionRequests.get(item.id)
-                            if (permRequest) {
-                              const response = permissionResponses.get(item.id) || null
-                              return (
-                                <React.Fragment key={item.id}>
-                                  {rendered}
-                                  <PermissionRequest
-                                    toolCall={permRequest.toolCall}
-                                    onApprove={() => handlePermissionResponse(permRequest.toolCall.toolCallId, permRequest.subflow, 'approve')}
-                                    onDeny={() => handlePermissionResponse(permRequest.toolCall.toolCallId, permRequest.subflow, 'deny')}
-                                    isProcessing={isProcessing}
-                                    response={response}
+                <div className="relative min-h-0 flex-1">
+                  {chatTabs.map((tab) => {
+                    const isActive = tab.id === activeChatTabId
+                    const tabState = getChatTabStateForRender(tab.id)
+                    const tabHasConversation = tabState.conversation.length > 0 || tabState.currentAssistantMessage
+                    const tabConversationContentClassName = tabHasConversation
+                      ? "mx-auto w-full max-w-4xl pb-28"
+                      : "mx-auto w-full max-w-4xl min-h-full items-center justify-center pb-0"
+                    return (
+                      <div
+                        key={tab.id}
+                        className={cn(
+                          'min-h-0 h-full flex-col',
+                          isActive
+                            ? 'flex'
+                            : 'pointer-events-none invisible absolute inset-0 flex'
+                        )}
+                        data-chat-tab-panel={tab.id}
+                        aria-hidden={!isActive}
+                      >
+                        <Conversation className="relative flex-1 overflow-y-auto [scrollbar-gutter:stable]">
+                          <ScrollPositionPreserver />
+                          <ConversationContent className={tabConversationContentClassName}>
+                            {!tabHasConversation ? (
+                              <ConversationEmptyState className="h-auto">
+                                <div className="text-2xl font-semibold tracking-tight text-foreground/80 sm:text-3xl md:text-4xl">
+                                  What are we working on?
+                                </div>
+                              </ConversationEmptyState>
+                            ) : (
+                              <>
+                                {tabState.conversation.map(item => {
+                                  const rendered = renderConversationItem(item, tab.id)
+                                  if (isToolCall(item)) {
+                                    const permRequest = tabState.allPermissionRequests.get(item.id)
+                                    if (permRequest) {
+                                      const response = tabState.permissionResponses.get(item.id) || null
+                                      return (
+                                        <React.Fragment key={item.id}>
+                                          {rendered}
+                                          <PermissionRequest
+                                            toolCall={permRequest.toolCall}
+                                            onApprove={() => handlePermissionResponse(permRequest.toolCall.toolCallId, permRequest.subflow, 'approve')}
+                                            onDeny={() => handlePermissionResponse(permRequest.toolCall.toolCallId, permRequest.subflow, 'deny')}
+                                            isProcessing={isActive && isProcessing}
+                                            response={response}
+                                          />
+                                        </React.Fragment>
+                                      )
+                                    }
+                                  }
+                                  return rendered
+                                })}
+
+                                {Array.from(tabState.pendingAskHumanRequests.values()).map((request) => (
+                                  <AskHumanRequest
+                                    key={request.toolCallId}
+                                    query={request.query}
+                                    onResponse={(response) => handleAskHumanResponse(request.toolCallId, request.subflow, response)}
+                                    isProcessing={isActive && isProcessing}
                                   />
-                                </React.Fragment>
-                              )
-                            }
-                          }
-                          return rendered
-                        })}
+                                ))}
 
-                        {/* Render pending ask-human requests */}
-                        {Array.from(pendingAskHumanRequests.values()).map((request) => (
-                          <AskHumanRequest
-                            key={request.toolCallId}
-                            query={request.query}
-                            onResponse={(response) => handleAskHumanResponse(request.toolCallId, request.subflow, response)}
-                            isProcessing={isProcessing}
-                          />
-                        ))}
+                                {tabState.currentAssistantMessage && (
+                                  <Message from="assistant">
+                                    <MessageContent>
+                                      <MessageResponse components={streamdownComponents}>{tabState.currentAssistantMessage}</MessageResponse>
+                                    </MessageContent>
+                                  </Message>
+                                )}
 
-                        {currentAssistantMessage && (
-                          <Message from="assistant">
-                            <MessageContent>
-                              <MessageResponse components={streamdownComponents}>{currentAssistantMessage}</MessageResponse>
-                            </MessageContent>
-                          </Message>
-                        )}
-
-                        {isProcessing && !currentAssistantMessage && (
-                          <Message from="assistant">
-                            <MessageContent>
-                              <Shimmer duration={1}>Thinking...</Shimmer>
-                            </MessageContent>
-                          </Message>
-                        )}
-                      </>
-                    )}
-                  </ConversationContent>
-                </Conversation>
+                                {isActive && isProcessing && !tabState.currentAssistantMessage && (
+                                  <Message from="assistant">
+                                    <MessageContent>
+                                      <Shimmer duration={1}>Thinking...</Shimmer>
+                                    </MessageContent>
+                                  </Message>
+                                )}
+                              </>
+                            )}
+                          </ConversationContent>
+                        </Conversation>
+                      </div>
+                    )
+                  })}
+                </div>
 
                 <div className="sticky bottom-0 z-10 bg-background pb-12 pt-0 shadow-lg">
                   <div className="pointer-events-none absolute inset-x-0 -top-6 h-6 bg-linear-to-t from-background to-transparent" />
@@ -2526,51 +2975,80 @@ function App() {
                     {!hasConversation && (
                       <Suggestions onSelect={setPresetMessage} className="mb-3 justify-center" />
                     )}
-                    <ChatInputWithMentions
-                      knowledgeFiles={knowledgeFiles}
-                      recentFiles={recentWikiFiles}
-                      visibleFiles={visibleKnowledgeFiles}
-                      onSubmit={handlePromptSubmit}
-                      onStop={handleStop}
-                      isProcessing={isProcessing}
-                      isStopping={isStopping}
-                      presetMessage={presetMessage}
-                      onPresetMessageConsumed={() => setPresetMessage(undefined)}
-                      runId={runId}
-                    />
+                    {chatTabs.map((tab) => {
+                      const isActive = tab.id === activeChatTabId
+                      const tabState = getChatTabStateForRender(tab.id)
+                      return (
+                        <div
+                          key={tab.id}
+                          className={isActive ? 'block' : 'hidden'}
+                          data-chat-input-panel={tab.id}
+                          aria-hidden={!isActive}
+                        >
+                          <ChatInputWithMentions
+                            knowledgeFiles={knowledgeFiles}
+                            recentFiles={recentWikiFiles}
+                            visibleFiles={visibleKnowledgeFiles}
+                            onSubmit={handlePromptSubmit}
+                            onStop={handleStop}
+                            isProcessing={isActive && isProcessing}
+                            isStopping={isActive && isStopping}
+                            isActive={isActive}
+                            presetMessage={isActive ? presetMessage : undefined}
+                            onPresetMessageConsumed={isActive ? () => setPresetMessage(undefined) : undefined}
+                            runId={tabState.runId}
+                            initialDraft={chatDraftsRef.current.get(tab.id)}
+                            onDraftChange={(text) => setChatDraftForTab(tab.id, text)}
+                          />
+                        </div>
+                      )
+                    })}
                   </div>
                 </div>
               </div>
               </FileCardProvider>
               )}
             </SidebarInset>
+            )}
 
             {/* Chat sidebar - shown when viewing files/graph */}
-            {(selectedPath || isGraphOpen) && (
+            {isRightPaneContext && (
               <ChatSidebar
-                defaultWidth={400}
+                defaultWidth={460}
                 isOpen={isChatSidebarOpen}
-                onNewChat={handleNewChat}
-                onOpenFullScreen={navigateToFullScreenChat}
+                isMaximized={isRightPaneMaximized}
+                chatTabs={chatTabs}
+                activeChatTabId={activeChatTabId}
+                getChatTabTitle={getChatTabTitle}
+                isChatTabProcessing={isChatTabProcessing}
+                onSwitchChatTab={switchChatTab}
+                onCloseChatTab={closeChatTab}
+                onNewChatTab={handleNewChatTabInSidebar}
+                onOpenFullScreen={toggleRightPaneMaximize}
                 conversation={conversation}
                 currentAssistantMessage={currentAssistantMessage}
+                chatTabStates={chatViewStateByTab}
                 isProcessing={isProcessing}
                 isStopping={isStopping}
                 onStop={handleStop}
-                message={message}
-                onMessageChange={setMessage}
                 onSubmit={handlePromptSubmit}
                 knowledgeFiles={knowledgeFiles}
                 recentFiles={recentWikiFiles}
                 visibleFiles={visibleKnowledgeFiles}
-                selectedPath={selectedPath}
-                pendingPermissionRequests={pendingPermissionRequests}
+                runId={runId}
+                presetMessage={presetMessage}
+                onPresetMessageConsumed={() => setPresetMessage(undefined)}
+                getInitialDraft={(tabId) => chatDraftsRef.current.get(tabId)}
+                onDraftChangeForTab={setChatDraftForTab}
                 pendingAskHumanRequests={pendingAskHumanRequests}
                 allPermissionRequests={allPermissionRequests}
                 permissionResponses={permissionResponses}
                 onPermissionResponse={handlePermissionResponse}
                 onAskHumanResponse={handleAskHumanResponse}
+                isToolOpenForTab={isToolOpenForTab}
+                onToolOpenChangeForTab={setToolOpenForTab}
                 onOpenKnowledgeFile={(path) => { navigateToFile(path) }}
+                onActivate={() => setActiveShortcutPane('right')}
               />
             )}
             {/* Rendered last so its no-drag region paints over the sidebar drag region */}
@@ -2579,18 +3057,10 @@ function App() {
               onNavigateForward={() => { void navigateForward() }}
               canNavigateBack={canNavigateBack}
               canNavigateForward={canNavigateForward}
-              onNewChat={handleNewChat}
+              onNewChat={handleNewChatTab}
               leftInsetPx={isMac ? MACOS_TRAFFIC_LIGHTS_RESERVED_PX : 0}
             />
           </SidebarProvider>
-
-          {/* Floating chat input - shown when viewing files/graph and chat sidebar is closed */}
-          {(selectedPath || isGraphOpen) && !isChatSidebarOpen && (
-            <ChatInputBar
-              onSubmit={handleChatInputSubmit}
-              onOpen={() => setIsChatSidebarOpen(true)}
-            />
-          )}
         </div>
         <SearchDialog
           open={isSearchOpen}
diff --git a/apps/x/apps/renderer/src/components/ai-elements/conversation.tsx b/apps/x/apps/renderer/src/components/ai-elements/conversation.tsx
index d9f36353..f1d514da 100644
--- a/apps/x/apps/renderer/src/components/ai-elements/conversation.tsx
+++ b/apps/x/apps/renderer/src/components/ai-elements/conversation.tsx
@@ -102,7 +102,7 @@ export const Conversation = ({ className, children, ...props }: ConversationProp
  * Must be used inside Conversation component.
  */
 export const ScrollPositionPreserver = () => {
-  const { isAtBottom } = useStickToBottomContext();
+  const { isAtBottom, scrollRef } = useStickToBottomContext();
   const preservationContext = useContext(ScrollPreservationContext);
   const containerFoundRef = useRef(false);
 
@@ -110,29 +110,13 @@ export const ScrollPositionPreserver = () => {
   useLayoutEffect(() => {
     if (containerFoundRef.current || !preservationContext) return;
 
-    // Find the scroll container (StickToBottom creates one)
-    // It's the first parent with overflow-y scroll/auto
-    const findScrollContainer = (): HTMLElement | null => {
-      const candidates = document.querySelectorAll('[role="log"]');
-      for (const candidate of candidates) {
-        // The scroll container is a direct child of the role="log" element
-        const children = candidate.children;
-        for (const child of children) {
-          const style = window.getComputedStyle(child);
-          if (style.overflowY === 'auto' || style.overflowY === 'scroll') {
-            return child as HTMLElement;
-          }
-        }
-      }
-      return null;
-    };
-
-    const container = findScrollContainer();
+    // Use the local StickToBottom scroll container for this conversation instance.
+    const container = scrollRef.current;
     if (container) {
       preservationContext.registerScrollContainer(container);
       containerFoundRef.current = true;
     }
-  }, [preservationContext]);
+  }, [preservationContext, scrollRef]);
 
   // Track engagement based on scroll position
   useEffect(() => {
diff --git a/apps/x/apps/renderer/src/components/ai-elements/prompt-input.tsx b/apps/x/apps/renderer/src/components/ai-elements/prompt-input.tsx
index c27ab5c3..98263434 100644
--- a/apps/x/apps/renderer/src/components/ai-elements/prompt-input.tsx
+++ b/apps/x/apps/renderer/src/components/ai-elements/prompt-input.tsx
@@ -931,7 +931,13 @@ export const PromptInputTextarea = ({
     if (autoFocus || focusTrigger !== undefined) {
       // Small delay to ensure the element is fully mounted and visible
       const timer = setTimeout(() => {
-        textareaRef.current?.focus();
+        const textarea = textareaRef.current;
+        if (!textarea) return;
+        try {
+          textarea.focus({ preventScroll: true });
+        } catch {
+          textarea.focus();
+        }
       }, 50);
       return () => clearTimeout(timer);
     }
diff --git a/apps/x/apps/renderer/src/components/chat-input-with-mentions.tsx b/apps/x/apps/renderer/src/components/chat-input-with-mentions.tsx
new file mode 100644
index 00000000..31bcba17
--- /dev/null
+++ b/apps/x/apps/renderer/src/components/chat-input-with-mentions.tsx
@@ -0,0 +1,201 @@
+import { useCallback, useEffect } from 'react'
+import { ArrowUp, LoaderIcon, Square } from 'lucide-react'
+
+import { Button } from '@/components/ui/button'
+import { cn } from '@/lib/utils'
+import {
+  type FileMention,
+  type PromptInputMessage,
+  PromptInputProvider,
+  PromptInputTextarea,
+  usePromptInputController,
+} from '@/components/ai-elements/prompt-input'
+
+interface ChatInputInnerProps {
+  onSubmit: (message: PromptInputMessage, mentions?: FileMention[]) => void
+  onStop?: () => void
+  isProcessing: boolean
+  isStopping?: boolean
+  isActive: boolean
+  presetMessage?: string
+  onPresetMessageConsumed?: () => void
+  runId?: string | null
+  initialDraft?: string
+  onDraftChange?: (text: string) => void
+}
+
+function ChatInputInner({
+  onSubmit,
+  onStop,
+  isProcessing,
+  isStopping,
+  isActive,
+  presetMessage,
+  onPresetMessageConsumed,
+  runId,
+  initialDraft,
+  onDraftChange,
+}: ChatInputInnerProps) {
+  const controller = usePromptInputController()
+  const message = controller.textInput.value
+  const canSubmit = Boolean(message.trim()) && !isProcessing
+
+  // Restore the tab draft when this input mounts.
+  useEffect(() => {
+    if (initialDraft) {
+      controller.textInput.setInput(initialDraft)
+    }
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [])
+
+  useEffect(() => {
+    onDraftChange?.(message)
+  }, [message, onDraftChange])
+
+  useEffect(() => {
+    if (presetMessage) {
+      controller.textInput.setInput(presetMessage)
+      onPresetMessageConsumed?.()
+    }
+  }, [presetMessage, controller.textInput, onPresetMessageConsumed])
+
+  const handleSubmit = useCallback(() => {
+    if (!canSubmit) return
+    onSubmit({ text: message.trim(), files: [] }, controller.mentions.mentions)
+    controller.textInput.clear()
+    controller.mentions.clearMentions()
+  }, [canSubmit, message, onSubmit, controller])
+
+  const handleKeyDown = useCallback((e: React.KeyboardEvent) => {
+    if (e.key === 'Enter' && !e.shiftKey) {
+      e.preventDefault()
+      handleSubmit()
+    }
+  }, [handleSubmit])
+
+  useEffect(() => {
+    if (!isActive) return
+    const onDragOver = (e: DragEvent) => {
+      if (e.dataTransfer?.types?.includes('Files')) {
+        e.preventDefault()
+      }
+    }
+
+    const onDrop = (e: DragEvent) => {
+      if (e.dataTransfer?.types?.includes('Files')) {
+        e.preventDefault()
+      }
+      if (e.dataTransfer?.files && e.dataTransfer.files.length > 0) {
+        const paths = Array.from(e.dataTransfer.files)
+          .map((file) => window.electronUtils?.getPathForFile(file))
+          .filter(Boolean)
+        if (paths.length > 0) {
+          const currentText = controller.textInput.value
+          const pathText = paths.join(' ')
+          controller.textInput.setInput(currentText ? `${currentText} ${pathText}` : pathText)
+        }
+      }
+    }
+
+    document.addEventListener('dragover', onDragOver)
+    document.addEventListener('drop', onDrop)
+    return () => {
+      document.removeEventListener('dragover', onDragOver)
+      document.removeEventListener('drop', onDrop)
+    }
+  }, [controller, isActive])
+
+  return (
+    <div className="flex items-center gap-2 rounded-lg border border-border bg-background px-4 py-4 shadow-none">
+      <PromptInputTextarea
+        placeholder="Type your message..."
+        onKeyDown={handleKeyDown}
+        autoFocus={isActive}
+        focusTrigger={isActive ? runId : undefined}
+        className="min-h-6 rounded-none border-0 py-0 shadow-none focus-visible:ring-0"
+      />
+      {isProcessing ? (
+        <Button
+          size="icon"
+          onClick={onStop}
+          title={isStopping ? 'Click again to force stop' : 'Stop generation'}
+          className={cn(
+            'h-7 w-7 shrink-0 rounded-full transition-all',
+            isStopping
+              ? 'bg-destructive text-destructive-foreground hover:bg-destructive/90'
+              : 'bg-primary text-primary-foreground hover:bg-primary/90'
+          )}
+        >
+          {isStopping ? (
+            <LoaderIcon className="h-4 w-4 animate-spin" />
+          ) : (
+            <Square className="h-3 w-3 fill-current" />
+          )}
+        </Button>
+      ) : (
+        <Button
+          size="icon"
+          onClick={handleSubmit}
+          disabled={!canSubmit}
+          className={cn(
+            'h-7 w-7 shrink-0 rounded-full transition-all',
+            canSubmit
+              ? 'bg-primary text-primary-foreground hover:bg-primary/90'
+              : 'bg-muted text-muted-foreground'
+          )}
+        >
+          <ArrowUp className="h-4 w-4" />
+        </Button>
+      )}
+    </div>
+  )
+}
+
+export interface ChatInputWithMentionsProps {
+  knowledgeFiles: string[]
+  recentFiles: string[]
+  visibleFiles: string[]
+  onSubmit: (message: PromptInputMessage, mentions?: FileMention[]) => void
+  onStop?: () => void
+  isProcessing: boolean
+  isStopping?: boolean
+  isActive?: boolean
+  presetMessage?: string
+  onPresetMessageConsumed?: () => void
+  runId?: string | null
+  initialDraft?: string
+  onDraftChange?: (text: string) => void
+}
+
+export function ChatInputWithMentions({
+  knowledgeFiles,
+  recentFiles,
+  visibleFiles,
+  onSubmit,
+  onStop,
+  isProcessing,
+  isStopping,
+  isActive = true,
+  presetMessage,
+  onPresetMessageConsumed,
+  runId,
+  initialDraft,
+  onDraftChange,
+}: ChatInputWithMentionsProps) {
+  return (
+    <PromptInputProvider knowledgeFiles={knowledgeFiles} recentFiles={recentFiles} visibleFiles={visibleFiles}>
+      <ChatInputInner
+        onSubmit={onSubmit}
+        onStop={onStop}
+        isProcessing={isProcessing}
+        isStopping={isStopping}
+        isActive={isActive}
+        presetMessage={presetMessage}
+        onPresetMessageConsumed={onPresetMessageConsumed}
+        runId={runId}
+        initialDraft={initialDraft}
+        onDraftChange={onDraftChange}
+      />
+    </PromptInputProvider>
+  )
+}
diff --git a/apps/x/apps/renderer/src/components/chat-sidebar.tsx b/apps/x/apps/renderer/src/components/chat-sidebar.tsx
index 8d2a005f..44fdbafd 100644
--- a/apps/x/apps/renderer/src/components/chat-sidebar.tsx
+++ b/apps/x/apps/renderer/src/components/chat-sidebar.tsx
@@ -1,13 +1,9 @@
-import { useCallback, useEffect, useMemo, useRef, useState } from 'react'
-import { ArrowUp, Expand, LoaderIcon, SquarePen, Square } from 'lucide-react'
-import type { ToolUIPart } from 'ai'
+import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react'
+import { Expand, Shrink, SquarePen } from 'lucide-react'
+
 import { Button } from '@/components/ui/button'
 import { cn } from '@/lib/utils'
-import {
-  Tooltip,
-  TooltipContent,
-  TooltipTrigger,
-} from '@/components/ui/tooltip'
+import { Tooltip, TooltipContent, TooltipTrigger } from '@/components/ui/tooltip'
 import {
   Conversation,
   ConversationContent,
@@ -19,233 +15,193 @@ import {
   MessageContent,
   MessageResponse,
 } from '@/components/ai-elements/message'
-
 import { Shimmer } from '@/components/ai-elements/shimmer'
 import { Tool, ToolContent, ToolHeader, ToolInput, ToolOutput } from '@/components/ai-elements/tool'
+import { WebSearchResult } from '@/components/ai-elements/web-search-result'
 import { PermissionRequest } from '@/components/ai-elements/permission-request'
 import { AskHumanRequest } from '@/components/ai-elements/ask-human-request'
 import { Suggestions } from '@/components/ai-elements/suggestions'
 import { type PromptInputMessage, type FileMention } from '@/components/ai-elements/prompt-input'
-import { useMentionDetection } from '@/hooks/use-mention-detection'
-import { MentionPopover } from '@/components/mention-popover'
-import { toKnowledgePath, wikiLabel } from '@/lib/wiki-links'
-import { getMentionHighlightSegments } from '@/lib/mention-highlights'
-import { ToolPermissionRequestEvent, AskHumanRequestEvent } from '@x/shared/src/runs.js'
-import z from 'zod'
-import React from 'react'
 import { FileCardProvider } from '@/contexts/file-card-context'
 import { MarkdownPreOverride } from '@/components/ai-elements/markdown-code-override'
-
-interface ChatMessage {
-  id: string
-  role: 'user' | 'assistant'
-  content: string
-  timestamp: number
-}
-
-interface ToolCall {
-  id: string
-  name: string
-  input: ToolUIPart['input']
-  result?: ToolUIPart['output']
-  status: 'pending' | 'running' | 'completed' | 'error'
-  timestamp: number
-}
-
-interface ErrorMessage {
-  id: string
-  kind: 'error'
-  message: string
-  timestamp: number
-}
-
-type ConversationItem = ChatMessage | ToolCall | ErrorMessage
-
-type ToolState = 'input-streaming' | 'input-available' | 'output-available' | 'output-error'
-
-const isChatMessage = (item: ConversationItem): item is ChatMessage => 'role' in item
-const isToolCall = (item: ConversationItem): item is ToolCall => 'name' in item
-const isErrorMessage = (item: ConversationItem): item is ErrorMessage => 'kind' in item && item.kind === 'error'
-
-const toToolState = (status: ToolCall['status']): ToolState => {
-  switch (status) {
-    case 'pending':
-      return 'input-streaming'
-    case 'running':
-      return 'input-available'
-    case 'completed':
-      return 'output-available'
-    case 'error':
-      return 'output-error'
-    default:
-      return 'input-available'
-  }
-}
-
-const normalizeToolInput = (input: ToolCall['input'] | string | undefined): ToolCall['input'] => {
-  if (input === undefined || input === null) return {}
-  if (typeof input === 'string') {
-    const trimmed = input.trim()
-    if (!trimmed) return {}
-    try {
-      return JSON.parse(trimmed)
-    } catch {
-      return input
-    }
-  }
-  return input
-}
-
-const normalizeToolOutput = (output: ToolCall['result'] | undefined, status: ToolCall['status']) => {
-  if (output === undefined || output === null) {
-    return status === 'completed' ? 'No output returned.' : null
-  }
-  if (output === '') return '(empty output)'
-  if (typeof output === 'boolean' || typeof output === 'number') return String(output)
-  return output
-}
+import { TabBar, type ChatTab } from '@/components/tab-bar'
+import { ChatInputWithMentions } from '@/components/chat-input-with-mentions'
+import { wikiLabel } from '@/lib/wiki-links'
+import {
+  type ChatTabViewState,
+  type ConversationItem,
+  type PermissionResponse,
+  createEmptyChatTabViewState,
+  getWebSearchCardData,
+  isChatMessage,
+  isErrorMessage,
+  isToolCall,
+  normalizeToolInput,
+  normalizeToolOutput,
+  parseAttachedFiles,
+  toToolState,
+} from '@/lib/chat-conversation'
 
 const streamdownComponents = { pre: MarkdownPreOverride }
 
-const MIN_WIDTH = 300
-const MAX_WIDTH = 700
-const DEFAULT_WIDTH = 400
+const MIN_WIDTH = 360
+const MAX_WIDTH = 1600
+const MIN_MAIN_PANE_WIDTH = 420
+const MIN_MAIN_PANE_RATIO = 0.3
+const DEFAULT_WIDTH = 460
+const RIGHT_PANE_WIDTH_STORAGE_KEY = 'x:right-pane-width'
+
+function clampPaneWidth(width: number, maxWidth: number = MAX_WIDTH): number {
+  const boundedMax = Math.max(0, Math.min(MAX_WIDTH, maxWidth))
+  const boundedMin = Math.min(MIN_WIDTH, boundedMax)
+  return Math.min(boundedMax, Math.max(boundedMin, width))
+}
+
+function getInitialPaneWidth(defaultWidth: number): number {
+  const fallback = clampPaneWidth(defaultWidth)
+  if (typeof window === 'undefined') return fallback
+  try {
+    const raw = window.localStorage.getItem(RIGHT_PANE_WIDTH_STORAGE_KEY)
+    if (!raw) return fallback
+    const parsed = Number(raw)
+    if (!Number.isFinite(parsed)) return fallback
+    return clampPaneWidth(parsed)
+  } catch {
+    return fallback
+  }
+}
 
 interface ChatSidebarProps {
   defaultWidth?: number
   isOpen?: boolean
-  onNewChat: () => void
+  isMaximized?: boolean
+  chatTabs: ChatTab[]
+  activeChatTabId: string
+  getChatTabTitle: (tab: ChatTab) => string
+  isChatTabProcessing: (tab: ChatTab) => boolean
+  onSwitchChatTab: (tabId: string) => void
+  onCloseChatTab: (tabId: string) => void
+  onNewChatTab: () => void
   onOpenFullScreen?: () => void
   conversation: ConversationItem[]
   currentAssistantMessage: string
+  chatTabStates?: Record<string, ChatTabViewState>
   isProcessing: boolean
   isStopping?: boolean
   onStop?: () => void
-  message: string
-  onMessageChange: (message: string) => void
   onSubmit: (message: PromptInputMessage, mentions?: FileMention[]) => void
   knowledgeFiles?: string[]
   recentFiles?: string[]
   visibleFiles?: string[]
-  selectedPath?: string | null
-  pendingPermissionRequests?: Map<string, z.infer<typeof ToolPermissionRequestEvent>>
-  pendingAskHumanRequests?: Map<string, z.infer<typeof AskHumanRequestEvent>>
-  allPermissionRequests?: Map<string, z.infer<typeof ToolPermissionRequestEvent>>
-  permissionResponses?: Map<string, 'approve' | 'deny'>
-  onPermissionResponse?: (toolCallId: string, subflow: string[], response: 'approve' | 'deny') => void
+  runId?: string | null
+  presetMessage?: string
+  onPresetMessageConsumed?: () => void
+  getInitialDraft?: (tabId: string) => string | undefined
+  onDraftChangeForTab?: (tabId: string, text: string) => void
+  pendingAskHumanRequests?: ChatTabViewState['pendingAskHumanRequests']
+  allPermissionRequests?: ChatTabViewState['allPermissionRequests']
+  permissionResponses?: ChatTabViewState['permissionResponses']
+  onPermissionResponse?: (toolCallId: string, subflow: string[], response: PermissionResponse) => void
   onAskHumanResponse?: (toolCallId: string, subflow: string[], response: string) => void
+  isToolOpenForTab?: (tabId: string, toolId: string) => boolean
+  onToolOpenChangeForTab?: (tabId: string, toolId: string, open: boolean) => void
   onOpenKnowledgeFile?: (path: string) => void
+  onActivate?: () => void
 }
 
 export function ChatSidebar({
   defaultWidth = DEFAULT_WIDTH,
   isOpen = true,
-  onNewChat,
+  isMaximized = false,
+  chatTabs,
+  activeChatTabId,
+  getChatTabTitle,
+  isChatTabProcessing,
+  onSwitchChatTab,
+  onCloseChatTab,
+  onNewChatTab,
   onOpenFullScreen,
   conversation,
   currentAssistantMessage,
+  chatTabStates = {},
   isProcessing,
   isStopping,
   onStop,
-  message,
-  onMessageChange,
   onSubmit,
   knowledgeFiles = [],
   recentFiles = [],
   visibleFiles = [],
-  selectedPath,
+  runId,
+  presetMessage,
+  onPresetMessageConsumed,
+  getInitialDraft,
+  onDraftChangeForTab,
   pendingAskHumanRequests = new Map(),
   allPermissionRequests = new Map(),
   permissionResponses = new Map(),
   onPermissionResponse,
   onAskHumanResponse,
+  isToolOpenForTab,
+  onToolOpenChangeForTab,
   onOpenKnowledgeFile,
+  onActivate,
 }: ChatSidebarProps) {
-  const [width, setWidth] = useState(defaultWidth)
+  const [width, setWidth] = useState(() => getInitialPaneWidth(defaultWidth))
   const [isResizing, setIsResizing] = useState(false)
   const [showContent, setShowContent] = useState(isOpen)
+  const [localPresetMessage, setLocalPresetMessage] = useState<string | undefined>(undefined)
+
+  const paneRef = useRef<HTMLDivElement>(null)
+  const startXRef = useRef(0)
+  const startWidthRef = useRef(0)
+
+  const getMaxAllowedWidth = useCallback(() => {
+    if (typeof window === 'undefined') return MAX_WIDTH
+    const paneElement = paneRef.current
+    const splitContainer = paneElement?.parentElement
+    const mainPane = splitContainer?.querySelector<HTMLElement>('[data-slot="sidebar-inset"]')
+    const paneWidth = paneElement?.getBoundingClientRect().width ?? 0
+    const mainPaneWidth = mainPane?.getBoundingClientRect().width ?? 0
+    const splitWidth = paneWidth + mainPaneWidth
+    const fallbackWidth = splitContainer?.clientWidth ?? window.innerWidth
+    const availableSplitWidth = splitWidth > 0 ? splitWidth : fallbackWidth
+    const minMainPaneWidth = Math.min(
+      availableSplitWidth,
+      Math.max(
+        MIN_MAIN_PANE_WIDTH,
+        Math.floor(availableSplitWidth * MIN_MAIN_PANE_RATIO)
+      )
+    )
+    return Math.max(0, availableSplitWidth - minMainPaneWidth)
+  }, [])
 
-  // Delay showing content when opening, hide immediately when closing
   useEffect(() => {
     if (isOpen) {
       const timer = setTimeout(() => setShowContent(true), 150)
       return () => clearTimeout(timer)
-    } else {
-      setShowContent(false)
     }
+    setShowContent(false)
   }, [isOpen])
-  const startXRef = useRef(0)
-  const startWidthRef = useRef(0)
-  const textareaRef = useRef<HTMLTextAreaElement>(null)
-  const containerRef = useRef<HTMLDivElement>(null)
-  const highlightRef = useRef<HTMLDivElement>(null)
-  const [mentions, setMentions] = useState<FileMention[]>([])
-  const autoMentionRef = useRef<{ path: string; displayName: string } | null>(null)
-  const lastSelectedPathRef = useRef<string | null>(null)
-
-  // Build mention labels for highlighting (handles multi-word names like "AI Agents")
-  const mentionLabels = useMemo(() => {
-    if (knowledgeFiles.length === 0) return []
-    const labels = knowledgeFiles
-      .map((path) => wikiLabel(path))
-      .map((label) => label.trim())
-      .filter(Boolean)
-    return Array.from(new Set(labels))
-  }, [knowledgeFiles])
-
-  const { activeMention, cursorCoords } = useMentionDetection(
-    textareaRef,
-    message,
-    knowledgeFiles.length > 0
-  )
-
-  // Use proper regex-based highlight segmentation that handles multi-word names
-  const mentionHighlights = useMemo(
-    () => getMentionHighlightSegments(message, activeMention, mentionLabels),
-    [message, activeMention, mentionLabels]
-  )
-
-  // Sync highlight overlay scroll with textarea
-  const syncHighlightScroll = useCallback(() => {
-    const textarea = textareaRef.current
-    const highlight = highlightRef.current
-    if (!textarea || !highlight) return
-    highlight.scrollTop = textarea.scrollTop
-    highlight.scrollLeft = textarea.scrollLeft
-  }, [])
 
   useEffect(() => {
-    syncHighlightScroll()
-  }, [message, mentionHighlights.hasHighlights, syncHighlightScroll])
+    if (typeof window === 'undefined') return
+    try {
+      window.localStorage.setItem(RIGHT_PANE_WIDTH_STORAGE_KEY, String(width))
+    } catch {
+      // Ignore persistence failures and keep in-memory behavior.
+    }
+  }, [width])
 
-  const handleMentionSelect = useCallback(
-    (path: string, displayName: string) => {
-      if (!activeMention) return
+  useEffect(() => {
+    const clampToAvailableWidth = () => {
+      const maxAllowedWidth = getMaxAllowedWidth()
+      setWidth((prev) => clampPaneWidth(prev, maxAllowedWidth))
+    }
 
-      const beforeAt = message.substring(0, activeMention.triggerIndex)
-      const afterQuery = message.substring(
-        activeMention.triggerIndex + 1 + activeMention.query.length
-      )
-
-      const newText = `${beforeAt}@${displayName} ${afterQuery}`
-      onMessageChange(newText)
-
-      const fullPath = toKnowledgePath(path)
-      if (fullPath) {
-        setMentions(prev => {
-          if (prev.some(m => m.path === fullPath)) return prev
-          return [...prev, { id: `mention-${Date.now()}`, path: fullPath, displayName }]
-        })
-      }
-
-      textareaRef.current?.focus()
-    },
-    [activeMention, message, onMessageChange]
-  )
-
-  const handleMentionClose = useCallback(() => {
-    // The popover handles its own closing
-  }, [])
+    clampToAvailableWidth()
+    window.addEventListener('resize', clampToAvailableWidth)
+    return () => window.removeEventListener('resize', clampToAvailableWidth)
+  }, [getMaxAllowedWidth])
 
   const handleMouseDown = useCallback((e: React.MouseEvent) => {
     e.preventDefault()
@@ -253,10 +209,10 @@ export function ChatSidebar({
     startWidthRef.current = width
     setIsResizing(true)
 
-    const handleMouseMove = (e: MouseEvent) => {
-      const delta = startXRef.current - e.clientX
-      const newWidth = Math.min(MAX_WIDTH, Math.max(MIN_WIDTH, startWidthRef.current + delta))
-      setWidth(newWidth)
+    const handleMouseMove = (event: MouseEvent) => {
+      const delta = startXRef.current - event.clientX
+      const maxAllowedWidth = getMaxAllowedWidth()
+      setWidth(clampPaneWidth(startWidthRef.current + delta, maxAllowedWidth))
     }
 
     const handleMouseUp = () => {
@@ -267,159 +223,89 @@ export function ChatSidebar({
 
     document.addEventListener('mousemove', handleMouseMove)
     document.addEventListener('mouseup', handleMouseUp)
-  }, [width])
+  }, [width, getMaxAllowedWidth])
 
-  // Auto-focus textarea when sidebar opens or when conversation is cleared (new chat)
-  useEffect(() => {
-    // Focus when conversation is empty (new chat started)
-    if (conversation.length === 0) {
-      const timer = setTimeout(() => {
-        textareaRef.current?.focus()
-      }, 50)
-      return () => clearTimeout(timer)
-    }
-  }, [conversation.length])
+  const activeTabState = useMemo<ChatTabViewState>(() => ({
+    runId: runId ?? null,
+    conversation,
+    currentAssistantMessage,
+    pendingAskHumanRequests,
+    allPermissionRequests,
+    permissionResponses,
+  }), [
+    runId,
+    conversation,
+    currentAssistantMessage,
+    pendingAskHumanRequests,
+    allPermissionRequests,
+    permissionResponses,
+  ])
+  const emptyTabState = useMemo<ChatTabViewState>(() => createEmptyChatTabViewState(), [])
+  const getTabState = useCallback((tabId: string): ChatTabViewState => {
+    if (tabId === activeChatTabId) return activeTabState
+    return chatTabStates[tabId] ?? emptyTabState
+  }, [activeChatTabId, activeTabState, chatTabStates, emptyTabState])
+  const hasConversation = activeTabState.conversation.length > 0 || Boolean(activeTabState.currentAssistantMessage)
 
-  // Auto-populate with @currentfile when switching knowledge files
-  useEffect(() => {
-    if (selectedPath === lastSelectedPathRef.current) return
-    lastSelectedPathRef.current = selectedPath ?? null
-
-    if (!selectedPath || !selectedPath.startsWith('knowledge/') || !selectedPath.endsWith('.md')) {
-      return
-    }
-
-    const displayName = wikiLabel(selectedPath)
-    const previousAuto = autoMentionRef.current
-    const trimmed = message.trim()
-    const previousToken = previousAuto ? `@${previousAuto.displayName}` : null
-    const shouldReplace = !trimmed || (previousToken && trimmed === previousToken)
-
-    if (!shouldReplace) {
-      return
-    }
-
-    const nextText = `@${displayName} `
-    if (message !== nextText) {
-      onMessageChange(nextText)
-    }
-
-    setMentions((prev) => {
-      const withoutPrevious = previousAuto
-        ? prev.filter((mention) => mention.path !== previousAuto.path)
-        : prev
-      if (withoutPrevious.some((mention) => mention.path === selectedPath)) {
-        return withoutPrevious
-      }
-      return [
-        ...withoutPrevious,
-        {
-          id: `mention-auto-${Date.now()}`,
-          path: selectedPath,
-          displayName,
-        },
-      ]
-    })
-
-    autoMentionRef.current = { path: selectedPath, displayName }
-  }, [selectedPath, message, onMessageChange])
-
-  const hasConversation = conversation.length > 0 || currentAssistantMessage
-  const canSubmit = Boolean(message.trim()) && !isProcessing
-
-  const handleSubmit = () => {
-    const trimmed = message.trim()
-    if (trimmed && !isProcessing) {
-      onSubmit({ text: trimmed, files: [] }, mentions)
-      setMentions([])
-    }
-  }
-
-  const handleKeyDown = (e: React.KeyboardEvent<HTMLTextAreaElement>) => {
-    // If mention popover is open, let it handle navigation keys
-    if (activeMention && ['ArrowDown', 'ArrowUp', 'Tab', 'Escape'].includes(e.key)) {
-      return
-    }
-
-    if (e.key === 'Enter') {
-      // If mention popover is open, Enter should select the item
-      if (activeMention) {
-        return
-      }
-
-      if (!e.shiftKey) {
-        e.preventDefault()
-        handleSubmit()
-      }
-    }
-
-    // Handle backspace to delete entire mention at once
-    if (e.key === 'Backspace') {
-      const textarea = e.currentTarget
-      const cursorPos = textarea.selectionStart
-      const selectionEnd = textarea.selectionEnd
-
-      // Only handle if no text is selected (cursor is at a single position)
-      if (cursorPos !== selectionEnd) return
-
-      // Check if cursor is right after a mention
-      for (const label of mentionLabels) {
-        const mentionText = `@${label}`
-        const startPos = cursorPos - mentionText.length
-        if (startPos >= 0) {
-          const textBefore = message.substring(startPos, cursorPos)
-          if (textBefore === mentionText) {
-            // Check if it's at word boundary (start of string or preceded by whitespace)
-            if (startPos === 0 || /\s/.test(message[startPos - 1])) {
-              e.preventDefault()
-              const newText = message.substring(0, startPos) + message.substring(cursorPos)
-              onMessageChange(newText)
-              // Remove the mention from state
-              setMentions(prev => prev.filter(m => m.displayName !== label))
-              // Set cursor position after React updates
-              setTimeout(() => {
-                textarea.selectionStart = startPos
-                textarea.selectionEnd = startPos
-              }, 0)
-              return
-            }
-          }
-        }
-      }
-    }
-  }
-
-  const renderConversationItem = (item: ConversationItem) => {
+  const renderConversationItem = (item: ConversationItem, tabId: string) => {
     if (isChatMessage(item)) {
+      if (item.role === 'user') {
+        const { message, files } = parseAttachedFiles(item.content)
+        return (
+          <Message key={item.id} from={item.role}>
+            <MessageContent>
+              {files.length > 0 && (
+                <div className="mb-2 flex flex-wrap gap-1.5">
+                  {files.map((filePath, index) => (
+                    <span
+                      key={index}
+                      className="inline-flex items-center gap-1 rounded-full bg-primary/10 px-2 py-0.5 text-xs text-primary"
+                    >
+                      @{wikiLabel(filePath)}
+                    </span>
+                  ))}
+                </div>
+              )}
+              {message}
+            </MessageContent>
+          </Message>
+        )
+      }
       return (
         <Message key={item.id} from={item.role}>
           <MessageContent>
-            {item.role === 'assistant' ? (
-              <MessageResponse components={streamdownComponents}>{item.content}</MessageResponse>
-            ) : (
-              item.content
-            )}
+            <MessageResponse components={streamdownComponents}>{item.content}</MessageResponse>
           </MessageContent>
         </Message>
       )
     }
 
     if (isToolCall(item)) {
+      const webSearchData = getWebSearchCardData(item)
+      if (webSearchData) {
+        return (
+          <WebSearchResult
+            key={item.id}
+            query={webSearchData.query}
+            results={webSearchData.results}
+            status={item.status}
+            title={webSearchData.title}
+          />
+        )
+      }
       const errorText = item.status === 'error' ? 'Tool error' : ''
       const output = normalizeToolOutput(item.result, item.status)
       const input = normalizeToolInput(item.input)
       return (
-        <Tool key={item.id}>
-          <ToolHeader
-            title={item.name}
-            type={`tool-${item.name}`}
-            state={toToolState(item.status)}
-          />
+        <Tool
+          key={item.id}
+          open={isToolOpenForTab?.(tabId, item.id) ?? false}
+          onOpenChange={(open) => onToolOpenChangeForTab?.(tabId, item.id, open)}
+        >
+          <ToolHeader title={item.name} type={`tool-${item.name}`} state={toToolState(item.status)} />
           <ToolContent>
             <ToolInput input={input} />
-            {output !== null ? (
-              <ToolOutput output={output} errorText={errorText} />
-            ) : null}
+            {output !== null ? <ToolOutput output={output} errorText={errorText} /> : null}
           </ToolContent>
         </Tool>
       )
@@ -438,218 +324,211 @@ export function ChatSidebar({
     return null
   }
 
-  const displayWidth = isOpen ? width : 0
+  const paneStyle = useMemo<React.CSSProperties>(() => {
+    if (!isOpen) {
+      return { width: 0, flex: '0 0 auto' }
+    }
+    if (isMaximized) {
+      // In maximize mode the pane should grow into the freed left space,
+      // not add extra width to the right and overflow the app viewport.
+      return { width: 0, flex: '1 1 auto' }
+    }
+    return { width, flex: '0 0 auto' }
+  }, [isOpen, isMaximized, width])
 
   return (
     <div
+      ref={paneRef}
+      onMouseDownCapture={onActivate}
+      onFocusCapture={onActivate}
       className={cn(
-        "relative flex flex-col border-l border-border bg-background shrink-0 overflow-hidden",
-        !isResizing && "transition-[width] duration-200 ease-linear"
+        'relative flex min-w-0 flex-col overflow-hidden border-l border-border bg-background',
+        !isResizing && 'transition-[width] duration-200 ease-linear'
       )}
-      style={{ width: displayWidth }}
+      style={paneStyle}
     >
-      {/* Resize handle */}
-      <div
-        onMouseDown={handleMouseDown}
-        className={cn(
-          "absolute inset-y-0 left-0 z-20 w-4 -translate-x-1/2 cursor-col-resize",
-          "after:absolute after:inset-y-0 after:left-1/2 after:w-[2px] after:transition-colors",
-          "hover:after:bg-sidebar-border",
-          isResizing && "after:bg-primary"
-        )}
-      />
+      {!isMaximized && (
+        <div
+          onMouseDown={handleMouseDown}
+          className={cn(
+            'absolute inset-y-0 left-0 z-20 w-4 -translate-x-1/2 cursor-col-resize',
+            'after:absolute after:inset-y-0 after:left-1/2 after:w-[2px] after:transition-colors',
+            'hover:after:bg-sidebar-border',
+            isResizing && 'after:bg-primary'
+          )}
+        />
+      )}
 
-      {/* Content - delayed on open, hidden immediately on close to avoid layout issues during animation */}
       {showContent && (
         <>
-          {/* Header - minimal, expand and new chat buttons */}
-          <header className="titlebar-drag-region flex h-10 shrink-0 items-center justify-end gap-1 px-2 bg-sidebar">
+          <header className="titlebar-drag-region flex h-10 shrink-0 items-stretch border-b border-border bg-sidebar">
+            <TabBar
+              tabs={chatTabs}
+              activeTabId={activeChatTabId}
+              getTabTitle={getChatTabTitle}
+              getTabId={(tab) => tab.id}
+              isProcessing={isChatTabProcessing}
+              onSwitchTab={onSwitchChatTab}
+              onCloseTab={onCloseChatTab}
+            />
             <Tooltip>
               <TooltipTrigger asChild>
-                <Button variant="ghost" size="icon" onClick={onNewChat} className="titlebar-no-drag h-8 w-8 text-muted-foreground hover:text-foreground">
-                  <SquarePen className="h-4 w-4" />
+                <Button
+                  variant="ghost"
+                  size="icon"
+                  onClick={onNewChatTab}
+                  className="titlebar-no-drag my-1 h-8 w-8 shrink-0 text-muted-foreground hover:text-foreground"
+                >
+                  <SquarePen className="size-5" />
                 </Button>
               </TooltipTrigger>
-              <TooltipContent side="bottom">New chat</TooltipContent>
+              <TooltipContent side="bottom">New chat tab</TooltipContent>
             </Tooltip>
             {onOpenFullScreen && (
               <Tooltip>
                 <TooltipTrigger asChild>
-                  <Button variant="ghost" size="icon" onClick={onOpenFullScreen} className="titlebar-no-drag h-8 w-8 text-muted-foreground hover:text-foreground">
-                    <Expand className="h-4 w-4" />
+                  <Button
+                    variant="ghost"
+                    size="icon"
+                    onClick={onOpenFullScreen}
+                    className="titlebar-no-drag my-1 mr-2 h-8 w-8 shrink-0 text-muted-foreground hover:text-foreground"
+                    aria-label={isMaximized ? 'Restore two-pane view' : 'Maximize chat view'}
+                  >
+                    {isMaximized ? <Shrink className="size-5" /> : <Expand className="size-5" />}
                   </Button>
                 </TooltipTrigger>
-                <TooltipContent side="bottom">Full screen chat</TooltipContent>
+                <TooltipContent side="bottom">
+                  {isMaximized ? 'Restore two-pane view' : 'Maximize chat view'}
+                </TooltipContent>
               </Tooltip>
             )}
           </header>
 
-      {/* Conversation area */}
-      <FileCardProvider onOpenKnowledgeFile={onOpenKnowledgeFile ?? (() => {})}>
-      <div className="flex min-h-0 flex-1 flex-col relative">
-        <Conversation className="relative flex-1 overflow-y-auto [scrollbar-gutter:stable]">
-          <ScrollPositionPreserver />
-          <ConversationContent className={hasConversation ? "px-4 pb-24" : "px-4 min-h-full items-center justify-center"}>
-            {!hasConversation ? (
-              <ConversationEmptyState className="h-auto">
-                <div className="flex flex-col items-center gap-1 text-center">
-                  <div className="text-sm text-muted-foreground">
-                    Ask anything...
-                  </div>
-                </div>
-              </ConversationEmptyState>
-            ) : (
-              <>
-                {conversation.map(item => {
-                  const rendered = renderConversationItem(item)
-                  // If this is a tool call, check for permission request (pending or responded)
-                  if (isToolCall(item) && onPermissionResponse) {
-                    const permRequest = allPermissionRequests.get(item.id)
-                    if (permRequest) {
-                      const response = permissionResponses.get(item.id) || null
-                      return (
-                        <React.Fragment key={item.id}>
-                          {rendered}
-                          <PermissionRequest
-                            toolCall={permRequest.toolCall}
-                            onApprove={() => onPermissionResponse(permRequest.toolCall.toolCallId, permRequest.subflow, 'approve')}
-                            onDeny={() => onPermissionResponse(permRequest.toolCall.toolCallId, permRequest.subflow, 'deny')}
-                            isProcessing={isProcessing}
-                            response={response}
-                          />
-                        </React.Fragment>
-                      )
-                    }
-                  }
-                  return rendered
+          <FileCardProvider onOpenKnowledgeFile={onOpenKnowledgeFile ?? (() => {})}>
+            <div className="flex min-h-0 flex-1 flex-col">
+              <div className="relative min-h-0 flex-1">
+                {chatTabs.map((tab) => {
+                  const isActive = tab.id === activeChatTabId
+                  const tabState = getTabState(tab.id)
+                  const tabHasConversation = tabState.conversation.length > 0 || Boolean(tabState.currentAssistantMessage)
+                  return (
+                    <div
+                      key={tab.id}
+                      className={cn(
+                        'min-h-0 h-full flex-col',
+                        isActive
+                          ? 'flex'
+                          : 'pointer-events-none invisible absolute inset-0 flex'
+                      )}
+                      data-chat-tab-panel={tab.id}
+                      aria-hidden={!isActive}
+                    >
+                      <Conversation className="relative flex-1 overflow-y-auto [scrollbar-gutter:stable]">
+                        <ScrollPositionPreserver />
+                        <ConversationContent className={tabHasConversation ? 'mx-auto w-full max-w-4xl px-3 pb-28' : 'mx-auto w-full max-w-4xl min-h-full items-center justify-center px-3 pb-0'}>
+                          {!tabHasConversation ? (
+                            <ConversationEmptyState className="h-auto">
+                              <div className="text-sm text-muted-foreground">Ask anything...</div>
+                            </ConversationEmptyState>
+                          ) : (
+                            <>
+                              {tabState.conversation.map((item) => {
+                                const rendered = renderConversationItem(item, tab.id)
+                                if (isToolCall(item) && onPermissionResponse) {
+                                  const permRequest = tabState.allPermissionRequests.get(item.id)
+                                  if (permRequest) {
+                                    const response = tabState.permissionResponses.get(item.id) || null
+                                    return (
+                                      <React.Fragment key={item.id}>
+                                        {rendered}
+                                        <PermissionRequest
+                                          toolCall={permRequest.toolCall}
+                                          onApprove={() => onPermissionResponse(permRequest.toolCall.toolCallId, permRequest.subflow, 'approve')}
+                                          onDeny={() => onPermissionResponse(permRequest.toolCall.toolCallId, permRequest.subflow, 'deny')}
+                                          isProcessing={isActive && isProcessing}
+                                          response={response}
+                                        />
+                                      </React.Fragment>
+                                    )
+                                  }
+                                }
+                                return rendered
+                              })}
+
+                              {onAskHumanResponse && Array.from(tabState.pendingAskHumanRequests.values()).map((request) => (
+                                <AskHumanRequest
+                                  key={request.toolCallId}
+                                  query={request.query}
+                                  onResponse={(response) => onAskHumanResponse(request.toolCallId, request.subflow, response)}
+                                  isProcessing={isActive && isProcessing}
+                                />
+                              ))}
+
+                              {tabState.currentAssistantMessage && (
+                                <Message from="assistant">
+                                  <MessageContent>
+                                    <MessageResponse components={streamdownComponents}>{tabState.currentAssistantMessage}</MessageResponse>
+                                  </MessageContent>
+                                </Message>
+                              )}
+
+                              {isActive && isProcessing && !tabState.currentAssistantMessage && (
+                                <Message from="assistant">
+                                  <MessageContent>
+                                    <Shimmer duration={1}>Thinking...</Shimmer>
+                                  </MessageContent>
+                                </Message>
+                              )}
+                            </>
+                          )}
+                        </ConversationContent>
+                      </Conversation>
+                    </div>
+                  )
                 })}
+              </div>
 
-                {/* Render pending ask-human requests */}
-                {onAskHumanResponse && Array.from(pendingAskHumanRequests.values()).map((request) => (
-                  <AskHumanRequest
-                    key={request.toolCallId}
-                    query={request.query}
-                    onResponse={(response) => onAskHumanResponse(request.toolCallId, request.subflow, response)}
-                    isProcessing={isProcessing}
-                  />
-                ))}
-
-                {currentAssistantMessage && (
-                  <Message from="assistant">
-                    <MessageContent>
-                      <MessageResponse components={streamdownComponents}>{currentAssistantMessage}</MessageResponse>
-                    </MessageContent>
-                  </Message>
-                )}
-
-                {isProcessing && !currentAssistantMessage && (
-                  <Message from="assistant">
-                    <MessageContent>
-                      <Shimmer duration={1}>Thinking...</Shimmer>
-                    </MessageContent>
-                  </Message>
-                )}
-              </>
-            )}
-          </ConversationContent>
-        </Conversation>
-
-        {/* Input area - responsive to sidebar width, matches floating bar position exactly */}
-        <div className="absolute bottom-6 left-14 right-6 z-10" ref={containerRef}>
-          {!hasConversation && (
-            <Suggestions
-              onSelect={(prompt) => {
-                onMessageChange(prompt)
-                setTimeout(() => textareaRef.current?.focus(), 0)
-              }}
-              vertical
-              className="mb-3"
-            />
-          )}
-          <div className="flex items-center gap-2 bg-background border border-border rounded-lg shadow-none px-4 py-2.5">
-            <div className="relative flex-1 min-w-0">
-              {mentionHighlights.hasHighlights && (
-                <div
-                  ref={highlightRef}
-                  aria-hidden="true"
-                  className="pointer-events-none absolute inset-0 z-0 overflow-hidden whitespace-pre-wrap wrap-break-word text-sm text-transparent"
-                >
-                  {mentionHighlights.segments.map((segment, index) =>
-                    segment.highlighted ? (
-                      <span
-                        key={`mention-${index}`}
-                        className="rounded bg-primary/20 text-transparent [box-decoration-break:clone] shadow-[inset_0_0_0_1px_hsl(var(--primary)/0.15),-3px_0_0_hsl(var(--primary)/0.2),3px_0_0_hsl(var(--primary)/0.2),0_-2px_0_hsl(var(--primary)/0.2),0_2px_0_hsl(var(--primary)/0.2)]"
-                      >
-                        {segment.text}
-                      </span>
-                    ) : (
-                      <span key={`text-${index}`}>{segment.text}</span>
-                    )
+              <div className="sticky bottom-0 z-10 bg-background pb-12 pt-0 shadow-lg">
+                <div className="pointer-events-none absolute inset-x-0 -top-6 h-6 bg-linear-to-t from-background to-transparent" />
+                <div className="mx-auto w-full max-w-4xl px-3">
+                  {!hasConversation && (
+                    <Suggestions onSelect={setLocalPresetMessage} className="mb-3 justify-center" />
                   )}
+                  {chatTabs.map((tab) => {
+                    const isActive = tab.id === activeChatTabId
+                    const tabState = getTabState(tab.id)
+                    return (
+                      <div
+                        key={tab.id}
+                        className={isActive ? 'block' : 'hidden'}
+                        data-chat-input-panel={tab.id}
+                        aria-hidden={!isActive}
+                      >
+                        <ChatInputWithMentions
+                          knowledgeFiles={knowledgeFiles}
+                          recentFiles={recentFiles}
+                          visibleFiles={visibleFiles}
+                          onSubmit={onSubmit}
+                          onStop={onStop}
+                          isProcessing={isActive && isProcessing}
+                          isStopping={isActive && isStopping}
+                          isActive={isActive}
+                          presetMessage={isActive ? (localPresetMessage ?? presetMessage) : undefined}
+                          onPresetMessageConsumed={isActive ? () => {
+                            setLocalPresetMessage(undefined)
+                            onPresetMessageConsumed?.()
+                          } : undefined}
+                          runId={tabState.runId}
+                          initialDraft={getInitialDraft?.(tab.id)}
+                          onDraftChange={onDraftChangeForTab ? (text) => onDraftChangeForTab(tab.id, text) : undefined}
+                        />
+                      </div>
+                    )
+                  })}
                 </div>
-              )}
-              <textarea
-                ref={textareaRef}
-                value={message}
-                onChange={(e) => onMessageChange(e.target.value)}
-                onKeyDown={handleKeyDown}
-                onScroll={syncHighlightScroll}
-                placeholder="Ask anything..."
-                rows={1}
-                className="relative z-10 w-full bg-transparent text-sm outline-none placeholder:text-muted-foreground resize-none max-h-32 min-h-6"
-                style={{ fieldSizing: 'content' } as React.CSSProperties}
-              />
+              </div>
             </div>
-            {isProcessing ? (
-              <Button
-                size="icon"
-                onClick={onStop}
-                title={isStopping ? "Click again to force stop" : "Stop generation"}
-                className={cn(
-                  "h-7 w-7 rounded-full shrink-0 transition-all",
-                  isStopping
-                    ? "bg-destructive text-destructive-foreground hover:bg-destructive/90"
-                    : "bg-primary text-primary-foreground hover:bg-primary/90"
-                )}
-              >
-                {isStopping ? (
-                  <LoaderIcon className="h-4 w-4 animate-spin" />
-                ) : (
-                  <Square className="h-3 w-3 fill-current" />
-                )}
-              </Button>
-            ) : (
-              <Button
-                size="icon"
-                onClick={handleSubmit}
-                disabled={!canSubmit}
-                className={cn(
-                  "h-7 w-7 rounded-full shrink-0 transition-all",
-                  canSubmit
-                    ? "bg-primary text-primary-foreground hover:bg-primary/90"
-                    : "bg-muted text-muted-foreground"
-                )}
-              >
-                <ArrowUp className="h-4 w-4" />
-              </Button>
-            )}
-          </div>
-          {knowledgeFiles.length > 0 && (
-            <MentionPopover
-              files={knowledgeFiles}
-              recentFiles={recentFiles}
-              visibleFiles={visibleFiles}
-              query={activeMention?.query ?? ''}
-              position={cursorCoords}
-              containerRef={containerRef}
-              onSelect={handleMentionSelect}
-              onClose={handleMentionClose}
-              open={Boolean(activeMention)}
-            />
-          )}
-        </div>
-      </div>
-      </FileCardProvider>
+          </FileCardProvider>
         </>
       )}
     </div>
diff --git a/apps/x/apps/renderer/src/components/sidebar-content.tsx b/apps/x/apps/renderer/src/components/sidebar-content.tsx
index 6256eb8d..6a4bec64 100644
--- a/apps/x/apps/renderer/src/components/sidebar-content.tsx
+++ b/apps/x/apps/renderer/src/components/sidebar-content.tsx
@@ -8,6 +8,7 @@ import {
   ChevronsDownUp,
   ChevronsUpDown,
   Copy,
+  ExternalLink,
   FilePlus,
   FolderPlus,
   AlertTriangle,
@@ -105,6 +106,7 @@ type KnowledgeActions = {
   rename: (path: string, newName: string, isDir: boolean) => Promise<void>
   remove: (path: string) => Promise<void>
   copyPath: (path: string) => void
+  onOpenInNewTab?: (path: string) => void
 }
 
 type RunListItem = {
@@ -149,6 +151,7 @@ type TasksActions = {
   onNewChat: () => void
   onSelectRun: (runId: string) => void
   onDeleteRun: (runId: string) => void
+  onOpenInNewTab?: (runId: string) => void
   onSelectBackgroundTask?: (taskName: string) => void
 }
 
@@ -981,6 +984,15 @@ function Tree({
           <ContextMenuSeparator />
         </>
       )}
+      {!isDir && actions.onOpenInNewTab && (
+        <>
+          <ContextMenuItem onClick={() => actions.onOpenInNewTab!(item.path)}>
+            <ExternalLink className="mr-2 size-4" />
+            Open in new tab
+          </ContextMenuItem>
+          <ContextMenuSeparator />
+        </>
+      )}
       <ContextMenuItem onClick={handleCopyPath}>
         <Copy className="mr-2 size-4" />
         Copy Path
@@ -1033,12 +1045,20 @@ function Tree({
     return (
       <ContextMenu>
         <ContextMenuTrigger asChild>
-          <SidebarMenuItem>
+          <SidebarMenuItem className="group/file-item">
             <SidebarMenuButton
               isActive={isSelected}
-              onClick={() => onSelect(item.path, item.kind)}
+              onClick={(e) => {
+                if (e.metaKey && actions.onOpenInNewTab) {
+                  actions.onOpenInNewTab(item.path)
+                } else {
+                  onSelect(item.path, item.kind)
+                }
+              }}
             >
-              <span>{item.name}</span>
+              <div className="flex w-full items-center gap-1 min-w-0">
+                <span className="min-w-0 flex-1 truncate">{item.name}</span>
+              </div>
             </SidebarMenuButton>
           </SidebarMenuItem>
         </ContextMenuTrigger>
@@ -1162,12 +1182,18 @@ function TasksSection({
             </div>
             <SidebarMenu>
               {runs.map((run) => (
-                <SidebarMenuItem key={run.id}>
-                  <ContextMenu>
-                    <ContextMenuTrigger asChild>
+                <ContextMenu key={run.id}>
+                  <ContextMenuTrigger asChild>
+                    <SidebarMenuItem className="group/chat-item">
                       <SidebarMenuButton
                         isActive={currentRunId === run.id}
-                        onClick={() => actions?.onSelectRun(run.id)}
+                        onClick={(e) => {
+                          if (e.metaKey && actions?.onOpenInNewTab) {
+                            actions.onOpenInNewTab(run.id)
+                          } else {
+                            actions?.onSelectRun(run.id)
+                          }
+                        }}
                       >
                         <div className="flex w-full items-center gap-2 min-w-0">
                           {processingRunIds?.has(run.id) ? (
@@ -1181,19 +1207,29 @@ function TasksSection({
                           ) : null}
                         </div>
                       </SidebarMenuButton>
-                    </ContextMenuTrigger>
-                    <ContextMenuContent className="w-48">
-                      <ContextMenuItem
-                        variant="destructive"
-                        disabled={processingRunIds?.has(run.id)}
-                        onClick={() => setPendingDeleteRunId(run.id)}
-                      >
-                        <Trash2 className="mr-2 size-4" />
-                        Delete
+                    </SidebarMenuItem>
+                  </ContextMenuTrigger>
+                  <ContextMenuContent className="w-48">
+                    {actions?.onOpenInNewTab && (
+                      <ContextMenuItem onClick={() => actions.onOpenInNewTab!(run.id)}>
+                        <ExternalLink className="mr-2 size-4" />
+                        Open in new tab
                       </ContextMenuItem>
-                    </ContextMenuContent>
-                  </ContextMenu>
-                </SidebarMenuItem>
+                    )}
+                    {!processingRunIds?.has(run.id) && (
+                      <>
+                        {actions?.onOpenInNewTab && <ContextMenuSeparator />}
+                        <ContextMenuItem
+                          variant="destructive"
+                          onClick={() => setPendingDeleteRunId(run.id)}
+                        >
+                          <Trash2 className="mr-2 size-4" />
+                          Delete
+                        </ContextMenuItem>
+                      </>
+                    )}
+                  </ContextMenuContent>
+                </ContextMenu>
               ))}
             </SidebarMenu>
           </>
diff --git a/apps/x/apps/renderer/src/components/tab-bar.tsx b/apps/x/apps/renderer/src/components/tab-bar.tsx
new file mode 100644
index 00000000..4abe8175
--- /dev/null
+++ b/apps/x/apps/renderer/src/components/tab-bar.tsx
@@ -0,0 +1,95 @@
+import * as React from "react"
+import { X } from "lucide-react"
+import { cn } from "@/lib/utils"
+
+export type ChatTab = {
+  id: string
+  runId: string | null
+}
+
+export type FileTab = {
+  id: string
+  path: string
+}
+
+interface TabBarProps<T> {
+  tabs: T[]
+  activeTabId: string
+  getTabTitle: (tab: T) => string
+  getTabId: (tab: T) => string
+  isProcessing?: (tab: T) => boolean
+  onSwitchTab: (tabId: string) => void
+  onCloseTab: (tabId: string) => void
+  layout?: 'fill' | 'scroll'
+}
+
+export function TabBar<T>({
+  tabs,
+  activeTabId,
+  getTabTitle,
+  getTabId,
+  isProcessing,
+  onSwitchTab,
+  onCloseTab,
+  layout = 'fill',
+}: TabBarProps<T>) {
+  return (
+    <div
+      className={cn(
+        'flex flex-1 self-stretch min-w-0',
+        layout === 'scroll'
+          ? 'overflow-x-auto overflow-y-hidden [scrollbar-width:none] [&::-webkit-scrollbar]:hidden'
+          : 'overflow-hidden'
+      )}
+    >
+      {tabs.map((tab, index) => {
+        const tabId = getTabId(tab)
+        const isActive = tabId === activeTabId
+        const processing = isProcessing?.(tab) ?? false
+        const title = getTabTitle(tab)
+
+        return (
+          <React.Fragment key={tabId}>
+            {index > 0 && (
+              <div className="self-stretch w-px bg-border/70 shrink-0" aria-hidden="true" />
+            )}
+            <button
+              type="button"
+              onClick={() => onSwitchTab(tabId)}
+              className={cn(
+                'titlebar-no-drag group/tab relative flex items-center gap-1.5 px-3 self-stretch text-xs transition-colors',
+                layout === 'scroll' ? 'min-w-[140px] max-w-[240px]' : 'min-w-0 max-w-[220px]',
+                isActive
+                  ? 'bg-background text-foreground'
+                  : 'text-muted-foreground hover:bg-accent/50 hover:text-foreground'
+              )}
+              style={layout === 'scroll' ? { flex: '0 0 auto' } : { flex: '1 1 0px' }}
+            >
+              {processing && (
+                <span className="size-1.5 shrink-0 rounded-full bg-emerald-500 animate-pulse" />
+              )}
+              <span className="truncate flex-1 text-left">{title}</span>
+              {tabs.length > 1 && (
+                <span
+                  role="button"
+                  className="shrink-0 flex items-center justify-center rounded-sm p-0.5 opacity-0 group-hover/tab:opacity-60 hover:opacity-100! hover:bg-foreground/10 transition-all"
+                  onClick={(e) => {
+                    e.stopPropagation()
+                    onCloseTab(tabId)
+                  }}
+                  aria-label="Close tab"
+                >
+                  <X className="size-3" />
+                </span>
+              )}
+            </button>
+            {/* Right edge divider after last tab to close off the section */}
+            {index === tabs.length - 1 && (
+              <div className="self-stretch w-px bg-border/70 shrink-0" aria-hidden="true" />
+            )}
+          </React.Fragment>
+        )
+      })}
+    </div>
+  )
+}
diff --git a/apps/x/apps/renderer/src/lib/chat-conversation.ts b/apps/x/apps/renderer/src/lib/chat-conversation.ts
new file mode 100644
index 00000000..4dcd4c8c
--- /dev/null
+++ b/apps/x/apps/renderer/src/lib/chat-conversation.ts
@@ -0,0 +1,177 @@
+import type { ToolUIPart } from 'ai'
+import z from 'zod'
+import { AskHumanRequestEvent, ToolPermissionRequestEvent } from '@x/shared/src/runs.js'
+
+export interface ChatMessage {
+  id: string
+  role: 'user' | 'assistant'
+  content: string
+  timestamp: number
+}
+
+export interface ToolCall {
+  id: string
+  name: string
+  input: ToolUIPart['input']
+  result?: ToolUIPart['output']
+  status: 'pending' | 'running' | 'completed' | 'error'
+  timestamp: number
+}
+
+export interface ErrorMessage {
+  id: string
+  kind: 'error'
+  message: string
+  timestamp: number
+}
+
+export type ConversationItem = ChatMessage | ToolCall | ErrorMessage
+export type PermissionResponse = 'approve' | 'deny'
+
+export type ChatTabViewState = {
+  runId: string | null
+  conversation: ConversationItem[]
+  currentAssistantMessage: string
+  pendingAskHumanRequests: Map<string, z.infer<typeof AskHumanRequestEvent>>
+  allPermissionRequests: Map<string, z.infer<typeof ToolPermissionRequestEvent>>
+  permissionResponses: Map<string, PermissionResponse>
+}
+
+export const createEmptyChatTabViewState = (): ChatTabViewState => ({
+  runId: null,
+  conversation: [],
+  currentAssistantMessage: '',
+  pendingAskHumanRequests: new Map(),
+  allPermissionRequests: new Map(),
+  permissionResponses: new Map(),
+})
+
+export type ToolState = 'input-streaming' | 'input-available' | 'output-available' | 'output-error'
+
+export const isChatMessage = (item: ConversationItem): item is ChatMessage => 'role' in item
+export const isToolCall = (item: ConversationItem): item is ToolCall => 'name' in item
+export const isErrorMessage = (item: ConversationItem): item is ErrorMessage =>
+  'kind' in item && item.kind === 'error'
+
+export const toToolState = (status: ToolCall['status']): ToolState => {
+  switch (status) {
+    case 'pending':
+      return 'input-streaming'
+    case 'running':
+      return 'input-available'
+    case 'completed':
+      return 'output-available'
+    case 'error':
+      return 'output-error'
+    default:
+      return 'input-available'
+  }
+}
+
+export const normalizeToolInput = (
+  input: ToolCall['input'] | string | undefined
+): ToolCall['input'] => {
+  if (input === undefined || input === null) return {}
+  if (typeof input === 'string') {
+    const trimmed = input.trim()
+    if (!trimmed) return {}
+    try {
+      return JSON.parse(trimmed)
+    } catch {
+      return input
+    }
+  }
+  return input
+}
+
+export const normalizeToolOutput = (
+  output: ToolCall['result'] | undefined,
+  status: ToolCall['status']
+) => {
+  if (output === undefined || output === null) {
+    return status === 'completed' ? 'No output returned.' : null
+  }
+  if (output === '') return '(empty output)'
+  if (typeof output === 'boolean' || typeof output === 'number') return String(output)
+  return output
+}
+
+export type WebSearchCardResult = { title: string; url: string; description: string }
+
+export type WebSearchCardData = {
+  query: string
+  results: WebSearchCardResult[]
+  title?: string
+}
+
+export const getWebSearchCardData = (tool: ToolCall): WebSearchCardData | null => {
+  if (tool.name === 'web-search') {
+    const input = normalizeToolInput(tool.input) as Record<string, unknown> | undefined
+    const result = tool.result as Record<string, unknown> | undefined
+    return {
+      query: (input?.query as string) || '',
+      results: (result?.results as WebSearchCardResult[]) || [],
+    }
+  }
+
+  if (tool.name === 'research-search') {
+    const input = normalizeToolInput(tool.input) as Record<string, unknown> | undefined
+    const result = tool.result as Record<string, unknown> | undefined
+    const rawResults = (result?.results as Array<{
+      title: string
+      url: string
+      highlights?: string[]
+      text?: string
+    }>) || []
+    const mapped = rawResults.map((entry) => ({
+      title: entry.title,
+      url: entry.url,
+      description: entry.highlights?.[0] || (entry.text ? entry.text.slice(0, 200) : ''),
+    }))
+    const category = input?.category as string | undefined
+    return {
+      query: (input?.query as string) || '',
+      results: mapped,
+      title: category
+        ? `${category.charAt(0).toUpperCase() + category.slice(1)} search`
+        : 'Researched the web',
+    }
+  }
+
+  return null
+}
+
+// Parse attached files from message content and return clean message + file paths.
+export const parseAttachedFiles = (content: string): { message: string; files: string[] } => {
+  const attachedFilesRegex = /<attached-files>\s*([\s\S]*?)\s*<\/attached-files>/
+  const match = content.match(attachedFilesRegex)
+
+  if (!match) {
+    return { message: content, files: [] }
+  }
+
+  const filesXml = match[1]
+  const filePathRegex = /<file path="([^"]+)">/g
+  const files: string[] = []
+  let fileMatch
+  while ((fileMatch = filePathRegex.exec(filesXml)) !== null) {
+    files.push(fileMatch[1])
+  }
+
+  let cleanMessage = content.replace(attachedFilesRegex, '').trim()
+  for (const filePath of files) {
+    const fileName = filePath.split('/').pop()?.replace(/\.md$/i, '') || ''
+    if (!fileName) continue
+    const mentionRegex = new RegExp(`@${fileName.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')}\\s*`, 'gi')
+    cleanMessage = cleanMessage.replace(mentionRegex, '')
+  }
+
+  return { message: cleanMessage.trim(), files }
+}
+
+export const inferRunTitleFromMessage = (content: string): string | undefined => {
+  const { message } = parseAttachedFiles(content)
+  const normalized = message.replace(/\s+/g, ' ').trim()
+  if (!normalized) return undefined
+  return normalized.length > 100 ? normalized.substring(0, 100) : normalized
+}
diff --git a/apps/x/apps/renderer/src/styles/editor.css b/apps/x/apps/renderer/src/styles/editor.css
index dc7c6c5e..31ce2bf1 100644
--- a/apps/x/apps/renderer/src/styles/editor.css
+++ b/apps/x/apps/renderer/src/styles/editor.css
@@ -245,6 +245,16 @@
   align-self: center;
 }
 
+/* Keep knowledge text width readable while margins collapse on narrow panes. */
+.tiptap-editor .ProseMirror {
+  width: 100%;
+  max-width: min(56rem, calc(100% - clamp(0.5rem, 2.5vw, 2rem)));
+  margin-left: auto;
+  margin-right: auto;
+  box-sizing: border-box;
+  padding-left: clamp(0.5rem, 1.5vw, 1rem);
+  padding-right: clamp(0.5rem, 1.5vw, 1rem);
+}
 .wiki-link-anchor {
   position: absolute;
   height: 0;

From b238089e2dbd227adeb58215d92d5303cf9ce36c Mon Sep 17 00:00:00 2001
From: tusharmagar <tushmag@gmail.com>
Date: Thu, 19 Feb 2026 11:43:22 +0530
Subject: [PATCH 12/36] fix: broken thinking indicator

---
 apps/x/apps/renderer/src/App.tsx | 26 +++++++++++++++++++++++---
 1 file changed, 23 insertions(+), 3 deletions(-)

diff --git a/apps/x/apps/renderer/src/App.tsx b/apps/x/apps/renderer/src/App.tsx
index 6e79bec8..9cc66879 100644
--- a/apps/x/apps/renderer/src/App.tsx
+++ b/apps/x/apps/renderer/src/App.tsx
@@ -624,23 +624,28 @@ function App() {
     processingRunIdsRef.current = processingRunIds
   }, [processingRunIds])
 
-  // Sync active run streaming UI with background tracking
+  // Sync active run streaming UI with background processing tracking.
+  // Depend on both runId and processingRunIds so we don't miss late/early event ordering.
   useEffect(() => {
     if (!runId) {
       setIsProcessing(false)
+      setIsStopping(false)
+      setStopClickedAt(null)
       setCurrentAssistantMessage('')
       return
     }
-    const isRunProcessing = processingRunIdsRef.current.has(runId)
+    const isRunProcessing = processingRunIds.has(runId)
     setIsProcessing(isRunProcessing)
     if (isRunProcessing) {
       const buffer = streamingBuffersRef.current.get(runId)
       setCurrentAssistantMessage(buffer?.assistant ?? '')
     } else {
+      setIsStopping(false)
+      setStopClickedAt(null)
       setCurrentAssistantMessage('')
       streamingBuffersRef.current.delete(runId)
     }
-  }, [runId])
+  }, [runId, processingRunIds])
 
   // Load directory tree
   const loadDirectory = useCallback(async () => {
@@ -1163,7 +1168,14 @@ function App() {
         break
 
       case 'start':
+        setProcessingRunIds(prev => {
+          if (prev.has(event.runId)) return prev
+          const next = new Set(prev)
+          next.add(event.runId)
+          return next
+        })
         if (!isActiveRun) return
+        setIsProcessing(true)
         setCurrentAssistantMessage('')
         setModelUsage(null)
         break
@@ -1171,12 +1183,20 @@ function App() {
       case 'llm-stream-event':
         {
           const llmEvent = event.event
+          // Fallback: if processing-start is missed/out-of-order, stream activity still means run is active.
+          setProcessingRunIds(prev => {
+            if (prev.has(event.runId)) return prev
+            const next = new Set(prev)
+            next.add(event.runId)
+            return next
+          })
           if (!isActiveRun) {
             if (llmEvent.type === 'text-delta' && llmEvent.delta) {
               appendStreamingBuffer(event.runId, llmEvent.delta)
             }
             return
           }
+          setIsProcessing(true)
           if (llmEvent.type === 'text-delta' && llmEvent.delta) {
             appendStreamingBuffer(event.runId, llmEvent.delta)
             setCurrentAssistantMessage(prev => prev + llmEvent.delta)

From 3fce67a9ff4a620becbfd9cff5c983ee122d0c3e Mon Sep 17 00:00:00 2001
From: Shraman123 <hazrashraman2002@gmail.com>
Date: Thu, 19 Feb 2026 13:07:07 +0530
Subject: [PATCH 13/36] fix: make dev script cross-platform for Windows
 PowerShell

---
 apps/rowboat/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/rowboat/package.json b/apps/rowboat/package.json
index 5b0bd228..c6c5e2b5 100644
--- a/apps/rowboat/package.json
+++ b/apps/rowboat/package.json
@@ -4,7 +4,7 @@
   "private": true,
   "type": "module",
   "scripts": {
-    "dev": "next dev --turbopack",
+    "dev": "npx next dev --turbopack",
     "build": "next build",
     "start": "next start",
     "lint": "next lint",

From 73da27eec6ca4631b5f7cb29be876b01f1bbaa09 Mon Sep 17 00:00:00 2001
From: tusharmagar <tushmag@gmail.com>
Date: Thu, 19 Feb 2026 15:04:11 +0530
Subject: [PATCH 14/36] feat: add search button to FixedSidebarToggle and
 integrate onOpenSearch prop

---
 apps/x/apps/renderer/src/App.tsx | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/apps/x/apps/renderer/src/App.tsx b/apps/x/apps/renderer/src/App.tsx
index 9cc66879..8ed5e7b7 100644
--- a/apps/x/apps/renderer/src/App.tsx
+++ b/apps/x/apps/renderer/src/App.tsx
@@ -224,6 +224,7 @@ function FixedSidebarToggle({
   canNavigateBack,
   canNavigateForward,
   onNewChat,
+  onOpenSearch,
   leftInsetPx,
 }: {
   onNavigateBack: () => void
@@ -231,6 +232,7 @@ function FixedSidebarToggle({
   canNavigateBack: boolean
   canNavigateForward: boolean
   onNewChat: () => void
+  onOpenSearch: () => void
   leftInsetPx: number
 }) {
   const { toggleSidebar, state } = useSidebar()
@@ -257,6 +259,15 @@ function FixedSidebarToggle({
       >
         <SquarePen className="size-5" />
       </button>
+      <button
+        type="button"
+        onClick={onOpenSearch}
+        className="flex h-8 w-8 items-center justify-center rounded-md text-muted-foreground hover:bg-accent hover:text-foreground transition-colors"
+        style={{ marginLeft: TITLEBAR_BUTTON_GAP_PX }}
+        aria-label="Search"
+      >
+        <SearchIcon className="size-5" />
+      </button>
       {/* Back / Forward navigation */}
       {isCollapsed && (
         <>
@@ -2769,14 +2780,6 @@ function App() {
                     onCloseTab={closeChatTab}
                   />
                 )}
-                <button
-                  type="button"
-                  onClick={() => setIsSearchOpen(true)}
-                  className="titlebar-no-drag flex h-8 w-8 items-center justify-center rounded-md text-muted-foreground hover:bg-accent hover:text-foreground transition-colors"
-                  aria-label="Search"
-                >
-                  <SearchIcon className="size-4" />
-                </button>
                 {selectedPath && (
                   <div className="flex items-center gap-1 text-xs text-muted-foreground self-center shrink-0 pl-2">
                     {isSaving ? (
@@ -3078,6 +3081,7 @@ function App() {
               canNavigateBack={canNavigateBack}
               canNavigateForward={canNavigateForward}
               onNewChat={handleNewChatTab}
+              onOpenSearch={() => setIsSearchOpen(true)}
               leftInsetPx={isMac ? MACOS_TRAFFIC_LIGHTS_RESERVED_PX : 0}
             />
           </SidebarProvider>

From 06444e5db209e23ab88d2d8cc2eefe48a1d8e886 Mon Sep 17 00:00:00 2001
From: tusharmagar <tushmag@gmail.com>
Date: Thu, 19 Feb 2026 15:13:22 +0530
Subject: [PATCH 15/36] fix: update titlebar button configurations for better
 layout

---
 apps/x/apps/renderer/src/App.tsx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/apps/x/apps/renderer/src/App.tsx b/apps/x/apps/renderer/src/App.tsx
index 8ed5e7b7..3ff5e433 100644
--- a/apps/x/apps/renderer/src/App.tsx
+++ b/apps/x/apps/renderer/src/App.tsx
@@ -100,8 +100,8 @@ const TITLEBAR_BUTTON_PX = 32
 const TITLEBAR_BUTTON_GAP_PX = 4
 const TITLEBAR_HEADER_GAP_PX = 8
 const TITLEBAR_TOGGLE_MARGIN_LEFT_PX = 12
-const TITLEBAR_BUTTONS_COLLAPSED = 4
-const TITLEBAR_BUTTON_GAPS_COLLAPSED = 3
+const TITLEBAR_BUTTONS_COLLAPSED = 5
+const TITLEBAR_BUTTON_GAPS_COLLAPSED = 4
 
 const clampNumber = (value: number, min: number, max: number) =>
   Math.min(max, Math.max(min, value))
@@ -320,7 +320,7 @@ function ContentHeader({
         "titlebar-drag-region flex h-10 shrink-0 items-stretch border-b border-border px-3 bg-sidebar transition-[padding] duration-200 ease-linear overflow-hidden",
         // When the sidebar is collapsed the content area shifts left, so we need enough left padding
         // to avoid overlapping the fixed traffic-lights/toggle/back/forward controls.
-        isCollapsed && !collapsedLeftPaddingPx && "pl-[168px]"
+        isCollapsed && !collapsedLeftPaddingPx && "pl-[196px]"
       )}
       style={isCollapsed && collapsedLeftPaddingPx ? { paddingLeft: collapsedLeftPaddingPx } : undefined}
     >

From f61404cbcde3155238cae66642dfcd1fe3e49770 Mon Sep 17 00:00:00 2001
From: tusharmagar <tushmag@gmail.com>
Date: Thu, 19 Feb 2026 15:30:26 +0530
Subject: [PATCH 16/36] feat: implement graph tab functionality and enhance tab
 management

- Introduced a new graph tab view with dedicated handling for file tabs.
- Updated tab navigation logic to support switching between regular and graph tabs.
- Added a new prop `allowSingleTabClose` to the TabBar component for improved tab closing behavior.
- Refactored existing tab management functions to accommodate the new graph tab functionality.
---
 apps/x/apps/renderer/src/App.tsx              | 127 ++++++++++++------
 .../apps/renderer/src/components/tab-bar.tsx  |   4 +-
 2 files changed, 88 insertions(+), 43 deletions(-)

diff --git a/apps/x/apps/renderer/src/App.tsx b/apps/x/apps/renderer/src/App.tsx
index 3ff5e433..047b4203 100644
--- a/apps/x/apps/renderer/src/App.tsx
+++ b/apps/x/apps/renderer/src/App.tsx
@@ -5,7 +5,6 @@ import { RunEvent, ListRunsResponse } from '@x/shared/src/runs.js';
 import type { LanguageModelUsage, ToolUIPart } from 'ai';
 import './App.css'
 import z from 'zod';
-import { Button } from './components/ui/button';
 import { CheckIcon, LoaderIcon, PanelLeftIcon, Expand, Shrink, X, ChevronLeftIcon, ChevronRightIcon, SquarePen, SearchIcon } from 'lucide-react';
 import { cn } from '@/lib/utils';
 import { MarkdownEditor } from './components/markdown-editor';
@@ -102,6 +101,7 @@ const TITLEBAR_HEADER_GAP_PX = 8
 const TITLEBAR_TOGGLE_MARGIN_LEFT_PX = 12
 const TITLEBAR_BUTTONS_COLLAPSED = 5
 const TITLEBAR_BUTTON_GAPS_COLLAPSED = 4
+const GRAPH_TAB_PATH = '__rowboat_graph_view__'
 
 const clampNumber = (value: number, min: number, max: number) =>
   Math.min(max, Math.max(min, value))
@@ -134,6 +134,8 @@ const getBaseName = (path: string) => {
   return file.replace(/\.md$/i, '')
 }
 
+const isGraphTabPath = (path: string) => path === GRAPH_TAB_PATH
+
 const normalizeUsage = (usage?: Partial<LanguageModelUsage> | null): LanguageModelUsage | null => {
   if (!usage) return null
   const hasNumbers = Object.values(usage).some((value) => typeof value === 'number')
@@ -504,6 +506,7 @@ function App() {
   const newFileTabId = () => `file-tab-${++fileTabIdCounterRef.current}`
 
   const getFileTabTitle = useCallback((tab: FileTab) => {
+    if (isGraphTabPath(tab.path)) return 'Graph View'
     return tab.path.split('/').pop()?.replace(/\.md$/i, '') || tab.path
   }, [])
 
@@ -1789,12 +1792,14 @@ function App() {
     const existingTab = fileTabs.find(t => t.path === path)
     if (existingTab) {
       setActiveFileTabId(existingTab.id)
+      setIsGraphOpen(false)
       setSelectedPath(path)
       return
     }
     const id = newFileTabId()
     setFileTabs(prev => [...prev, { id, path }])
     setActiveFileTabId(id)
+    setIsGraphOpen(false)
     setSelectedPath(path)
   }, [fileTabs])
 
@@ -1802,12 +1807,24 @@ function App() {
     const tab = fileTabs.find(t => t.id === tabId)
     if (!tab) return
     setActiveFileTabId(tabId)
+    setSelectedBackgroundTask(null)
+    setExpandedFrom(null)
+    // If chat-only maximize is active, drop back to a visible knowledge layout.
+    if (isRightPaneMaximized) {
+      setIsRightPaneMaximized(false)
+    }
+    if (isGraphTabPath(tab.path)) {
+      setSelectedPath(null)
+      setIsGraphOpen(true)
+      return
+    }
+    setIsGraphOpen(false)
     setSelectedPath(tab.path)
-  }, [fileTabs])
+  }, [fileTabs, isRightPaneMaximized])
 
   const closeFileTab = useCallback((tabId: string) => {
     const closingTab = fileTabs.find(t => t.id === tabId)
-    if (closingTab) {
+    if (closingTab && !isGraphTabPath(closingTab.path)) {
       removeEditorCacheForPath(closingTab.path)
       initialContentByPathRef.current.delete(closingTab.path)
       if (editorPathRef.current === closingTab.path) {
@@ -1819,15 +1836,23 @@ function App() {
         // Last file tab - close it and go back to chat
         setActiveFileTabId(null)
         setSelectedPath(null)
+        setIsGraphOpen(false)
         return []
       }
       const idx = prev.findIndex(t => t.id === tabId)
+      if (idx === -1) return prev
       const next = prev.filter(t => t.id !== tabId)
       if (tabId === activeFileTabId && next.length > 0) {
         const newIdx = Math.min(idx, next.length - 1)
         const newActiveTab = next[newIdx]
         setActiveFileTabId(newActiveTab.id)
-        setSelectedPath(newActiveTab.path)
+        if (isGraphTabPath(newActiveTab.path)) {
+          setSelectedPath(null)
+          setIsGraphOpen(true)
+        } else {
+          setIsGraphOpen(false)
+          setSelectedPath(newActiveTab.path)
+        }
       }
       return next
     })
@@ -1918,22 +1943,62 @@ function App() {
     return [...stack, entry]
   }, [])
 
+  const ensureFileTabForPath = useCallback((path: string) => {
+    const existingTab = fileTabs.find((tab) => tab.path === path)
+    if (existingTab) {
+      setActiveFileTabId(existingTab.id)
+      return
+    }
+
+    if (activeFileTabId) {
+      const activeTab = fileTabs.find((tab) => tab.id === activeFileTabId)
+      if (activeTab && !isGraphTabPath(activeTab.path)) {
+        setFileTabs((prev) => prev.map((tab) => (
+          tab.id === activeFileTabId ? { ...tab, path } : tab
+        )))
+        return
+      }
+    }
+
+    const id = newFileTabId()
+    setFileTabs((prev) => [...prev, { id, path }])
+    setActiveFileTabId(id)
+  }, [fileTabs, activeFileTabId])
+
+  const ensureGraphFileTab = useCallback(() => {
+    const existingGraphTab = fileTabs.find((tab) => isGraphTabPath(tab.path))
+    if (existingGraphTab) {
+      setActiveFileTabId(existingGraphTab.id)
+      return
+    }
+    const id = newFileTabId()
+    setFileTabs((prev) => [...prev, { id, path: GRAPH_TAB_PATH }])
+    setActiveFileTabId(id)
+  }, [fileTabs])
+
   const applyViewState = useCallback(async (view: ViewState) => {
     switch (view.type) {
       case 'file':
         setSelectedBackgroundTask(null)
         setIsGraphOpen(false)
         setExpandedFrom(null)
-        setIsChatSidebarOpen(true)
-        setIsRightPaneMaximized(false)
+        // Preserve split vs knowledge-max mode when navigating knowledge files.
+        // Only exit chat-only maximize, because that would hide the selected file.
+        if (isRightPaneMaximized) {
+          setIsRightPaneMaximized(false)
+        }
         setSelectedPath(view.path)
+        ensureFileTabForPath(view.path)
         return
       case 'graph':
         setSelectedBackgroundTask(null)
         setSelectedPath(null)
         setExpandedFrom(null)
         setIsGraphOpen(true)
-        setIsRightPaneMaximized(false)
+        ensureGraphFileTab()
+        if (isRightPaneMaximized) {
+          setIsRightPaneMaximized(false)
+        }
         return
       case 'task':
         setSelectedPath(null)
@@ -1955,7 +2020,7 @@ function App() {
         }
         return
     }
-  }, [handleNewChat, loadRun])
+  }, [ensureFileTabForPath, ensureGraphFileTab, handleNewChat, isRightPaneMaximized, loadRun])
 
   const navigateToView = useCallback(async (nextView: ViewState) => {
     const current = currentViewState
@@ -2024,22 +2089,8 @@ function App() {
   }, [viewHistory.forward, currentViewState])
 
   const navigateToFile = useCallback((path: string) => {
-    // If already open in a file tab, switch to it
-    const existingTab = fileTabs.find(t => t.path === path)
-    if (existingTab) {
-      switchFileTab(existingTab.id)
-      return
-    }
-    // Update current file tab or create one if none exists
-    if (activeFileTabId) {
-      setFileTabs(prev => prev.map(t => t.id === activeFileTabId ? { ...t, path } : t))
-    } else {
-      const id = newFileTabId()
-      setFileTabs(prev => [...prev, { id, path }])
-      setActiveFileTabId(id)
-    }
     void navigateToView({ type: 'file', path })
-  }, [navigateToView, fileTabs, activeFileTabId, switchFileTab])
+  }, [navigateToView])
 
   const navigateToFullScreenChat = useCallback(() => {
     // Only treat this as navigation when coming from another view
@@ -2130,8 +2181,13 @@ function App() {
       const targetPane: ShortcutPane = rightPaneAvailable
         ? (isRightPaneMaximized ? 'right' : activeShortcutPane)
         : 'left'
-      const inFileView = targetPane === 'left' && Boolean(selectedPath)
-      const targetFileTabId = activeFileTabId ?? fileTabs.find((tab) => tab.path === selectedPath)?.id ?? null
+      const inFileView = targetPane === 'left' && Boolean(selectedPath || isGraphOpen)
+      const selectedKnowledgePath = isGraphOpen ? GRAPH_TAB_PATH : selectedPath
+      const targetFileTabId = activeFileTabId ?? (
+        selectedKnowledgePath
+          ? (fileTabs.find((tab) => tab.path === selectedKnowledgePath)?.id ?? null)
+          : null
+      )
 
       // Cmd+W — close active tab
       if (e.key === 'w') {
@@ -2760,7 +2816,7 @@ function App() {
                 canNavigateForward={canNavigateForward}
                 collapsedLeftPaddingPx={collapsedLeftPaddingPx}
               >
-                {selectedPath && fileTabs.length >= 1 ? (
+                {(selectedPath || isGraphOpen) && fileTabs.length >= 1 ? (
                   <TabBar
                     tabs={fileTabs}
                     activeTabId={activeFileTabId ?? ''}
@@ -2768,6 +2824,7 @@ function App() {
                     getTabId={(t) => t.id}
                     onSwitchTab={switchFileTab}
                     onCloseTab={closeFileTab}
+                    allowSingleTabClose={fileTabs.length === 1 && isGraphOpen}
                   />
                 ) : (
                   <TabBar
@@ -2795,16 +2852,6 @@ function App() {
                     ) : null}
                   </div>
                 )}
-                {!selectedPath && isGraphOpen && (
-                  <Button
-                    variant="ghost"
-                    size="sm"
-                    onClick={() => { void navigateToView({ type: 'chat', runId }) }}
-                    className="titlebar-no-drag text-foreground self-center shrink-0"
-                  >
-                    Close Graph
-                  </Button>
-                )}
                 {!selectedPath && !isGraphOpen && expandedFrom && (
                   <button
                     type="button"
@@ -2822,17 +2869,13 @@ function App() {
                         type="button"
                         onClick={toggleKnowledgePane}
                         className="titlebar-no-drag flex h-8 w-8 items-center justify-center rounded-md text-muted-foreground hover:bg-accent hover:text-foreground transition-colors -mr-1 self-center shrink-0"
-                        aria-label={isChatSidebarOpen
-                          ? (selectedPath ? "Maximize knowledge view" : "Maximize main view")
-                          : "Restore two-pane view"}
+                        aria-label={isChatSidebarOpen ? "Maximize knowledge view" : "Restore two-pane view"}
                       >
                         {isChatSidebarOpen ? <Expand className="size-5" /> : <Shrink className="size-5" />}
                       </button>
                     </TooltipTrigger>
                     <TooltipContent side="bottom">
-                      {isChatSidebarOpen
-                        ? (selectedPath ? "Maximize knowledge view" : "Maximize main view")
-                        : "Restore two-pane view"}
+                      {isChatSidebarOpen ? "Maximize knowledge view" : "Restore two-pane view"}
                     </TooltipContent>
                   </Tooltip>
                 )}
diff --git a/apps/x/apps/renderer/src/components/tab-bar.tsx b/apps/x/apps/renderer/src/components/tab-bar.tsx
index 4abe8175..744f578d 100644
--- a/apps/x/apps/renderer/src/components/tab-bar.tsx
+++ b/apps/x/apps/renderer/src/components/tab-bar.tsx
@@ -21,6 +21,7 @@ interface TabBarProps<T> {
   onSwitchTab: (tabId: string) => void
   onCloseTab: (tabId: string) => void
   layout?: 'fill' | 'scroll'
+  allowSingleTabClose?: boolean
 }
 
 export function TabBar<T>({
@@ -32,6 +33,7 @@ export function TabBar<T>({
   onSwitchTab,
   onCloseTab,
   layout = 'fill',
+  allowSingleTabClose = false,
 }: TabBarProps<T>) {
   return (
     <div
@@ -69,7 +71,7 @@ export function TabBar<T>({
                 <span className="size-1.5 shrink-0 rounded-full bg-emerald-500 animate-pulse" />
               )}
               <span className="truncate flex-1 text-left">{title}</span>
-              {tabs.length > 1 && (
+              {(allowSingleTabClose || tabs.length > 1) && (
                 <span
                   role="button"
                   className="shrink-0 flex items-center justify-center rounded-sm p-0.5 opacity-0 group-hover/tab:opacity-60 hover:opacity-100! hover:bg-foreground/10 transition-all"

From fe689c705fc0bcb0460baec39784bf5d64e37b23 Mon Sep 17 00:00:00 2001
From: tusharmagar <tushmag@gmail.com>
Date: Thu, 19 Feb 2026 15:36:26 +0530
Subject: [PATCH 17/36] feat: make sure graph view opens in maximised pane

---
 apps/x/apps/renderer/src/App.tsx | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/apps/x/apps/renderer/src/App.tsx b/apps/x/apps/renderer/src/App.tsx
index 047b4203..60ce4b32 100644
--- a/apps/x/apps/renderer/src/App.tsx
+++ b/apps/x/apps/renderer/src/App.tsx
@@ -2357,6 +2357,11 @@ function App() {
       }
     },
     openGraph: () => {
+      // From chat-only landing state, open graph directly in full knowledge view.
+      if (!selectedPath && !isGraphOpen && !selectedBackgroundTask) {
+        setIsChatSidebarOpen(false)
+        setIsRightPaneMaximized(false)
+      }
       void navigateToView({ type: 'graph' })
     },
     expandAll: () => setExpandedPaths(new Set(collectDirPaths(tree))),
@@ -2422,7 +2427,7 @@ function App() {
     onOpenInNewTab: (path: string) => {
       openFileInNewTab(path)
     },
-  }), [tree, selectedPath, workspaceRoot, navigateToFile, navigateToView, openFileInNewTab, fileTabs, closeFileTab, removeEditorCacheForPath])
+  }), [tree, selectedPath, isGraphOpen, selectedBackgroundTask, workspaceRoot, navigateToFile, navigateToView, openFileInNewTab, fileTabs, closeFileTab, removeEditorCacheForPath])
 
   // Handler for when a voice note is created/updated
   const handleVoiceNoteCreated = useCallback(async (notePath: string) => {

From e8d8332e34c1979dc0ad2a9336505e9408fdc6c5 Mon Sep 17 00:00:00 2001
From: tusharmagar <tushmag@gmail.com>
Date: Thu, 19 Feb 2026 15:49:45 +0530
Subject: [PATCH 18/36] feat: enhance knowledge tree navigation and visibility
 auto-open the folder chain to reveal the active file in sidebar when a
 knowledge file is opened

---
 apps/x/apps/renderer/src/App.tsx              | 29 ++++++++
 .../src/components/sidebar-content.tsx        | 66 ++++++++++++++-----
 2 files changed, 80 insertions(+), 15 deletions(-)

diff --git a/apps/x/apps/renderer/src/App.tsx b/apps/x/apps/renderer/src/App.tsx
index 60ce4b32..df8bd3dc 100644
--- a/apps/x/apps/renderer/src/App.tsx
+++ b/apps/x/apps/renderer/src/App.tsx
@@ -134,6 +134,16 @@ const getBaseName = (path: string) => {
   return file.replace(/\.md$/i, '')
 }
 
+const getAncestorDirectoryPaths = (path: string): string[] => {
+  const parts = path.split('/').filter(Boolean)
+  if (parts.length <= 2) return []
+  const ancestors: string[] = []
+  for (let i = 1; i < parts.length - 1; i++) {
+    ancestors.push(parts.slice(0, i + 1).join('/'))
+  }
+  return ancestors
+}
+
 const isGraphTabPath = (path: string) => path === GRAPH_TAB_PATH
 
 const normalizeUsage = (usage?: Partial<LanguageModelUsage> | null): LanguageModelUsage | null => {
@@ -597,6 +607,25 @@ function App() {
     }
   }, [selectedPath])
 
+  // Keep active file visible in the Knowledge tree by auto-expanding its ancestor folders.
+  useEffect(() => {
+    if (!selectedPath) return
+    const ancestorDirs = getAncestorDirectoryPaths(selectedPath)
+    if (ancestorDirs.length === 0) return
+
+    setExpandedPaths((prev) => {
+      let changed = false
+      const next = new Set(prev)
+      for (const dirPath of ancestorDirs) {
+        if (!next.has(dirPath)) {
+          next.add(dirPath)
+          changed = true
+        }
+      }
+      return changed ? next : prev
+    })
+  }, [selectedPath])
+
   // Keep runIdRef in sync with runId state (for use in event handlers to avoid stale closures)
   useEffect(() => {
     runIdRef.current = runId
diff --git a/apps/x/apps/renderer/src/components/sidebar-content.tsx b/apps/x/apps/renderer/src/components/sidebar-content.tsx
index 6a4bec64..fb890ecb 100644
--- a/apps/x/apps/renderer/src/components/sidebar-content.tsx
+++ b/apps/x/apps/renderer/src/components/sidebar-content.tsx
@@ -820,6 +820,36 @@ function KnowledgeSection({
   onVoiceNoteCreated?: (path: string) => void
 }) {
   const isExpanded = expandedPaths.size > 0
+  const treeContainerRef = React.useRef<HTMLDivElement | null>(null)
+
+  useEffect(() => {
+    if (!selectedPath) return
+
+    let cancelled = false
+    let rafId: number | null = null
+    let attempts = 0
+    const maxAttempts = 20
+
+    const revealActiveFile = () => {
+      if (cancelled) return
+      const container = treeContainerRef.current
+      if (!container) return
+      const activeRow = container.querySelector<HTMLElement>('[data-knowledge-active="true"]')
+      if (activeRow) {
+        activeRow.scrollIntoView({ block: "nearest", inline: "nearest" })
+        return
+      }
+      if (attempts >= maxAttempts) return
+      attempts += 1
+      rafId = requestAnimationFrame(revealActiveFile)
+    }
+
+    rafId = requestAnimationFrame(revealActiveFile)
+    return () => {
+      cancelled = true
+      if (rafId !== null) cancelAnimationFrame(rafId)
+    }
+  }, [selectedPath, expandedPaths, tree])
 
   const quickActions = [
     { icon: FilePlus, label: "New Note", action: () => actions.createNote() },
@@ -865,18 +895,20 @@ function KnowledgeSection({
             </Tooltip>
           </div>
           <SidebarGroupContent className="flex-1 overflow-y-auto">
-            <SidebarMenu>
-              {tree.map((item, index) => (
-                <Tree
-                  key={index}
-                  item={item}
-                  selectedPath={selectedPath}
-                  expandedPaths={expandedPaths}
-                  onSelect={onSelectFile}
-                  actions={actions}
-                />
-              ))}
-            </SidebarMenu>
+            <div ref={treeContainerRef}>
+              <SidebarMenu>
+                {tree.map((item, index) => (
+                  <Tree
+                    key={index}
+                    item={item}
+                    selectedPath={selectedPath}
+                    expandedPaths={expandedPaths}
+                    onSelect={onSelectFile}
+                    actions={actions}
+                  />
+                ))}
+              </SidebarMenu>
+            </div>
           </SidebarGroupContent>
         </SidebarGroup>
       </ContextMenuTrigger>
@@ -935,7 +967,7 @@ function Tree({
       try {
         await actions.rename(item.path, trimmedName, isDir)
         toast('Renamed successfully', 'success')
-      } catch (err) {
+      } catch {
         toast('Failed to rename', 'error')
       }
     }
@@ -950,7 +982,7 @@ function Tree({
     try {
       await actions.remove(item.path)
       toast('Moved to trash', 'success')
-    } catch (err) {
+    } catch {
       toast('Failed to delete', 'error')
     }
   }
@@ -1045,7 +1077,11 @@ function Tree({
     return (
       <ContextMenu>
         <ContextMenuTrigger asChild>
-          <SidebarMenuItem className="group/file-item">
+          <SidebarMenuItem
+            className="group/file-item"
+            data-knowledge-file-path={item.path}
+            data-knowledge-active={isSelected ? "true" : "false"}
+          >
             <SidebarMenuButton
               isActive={isSelected}
               onClick={(e) => {

From bf5f6f16de69350e46534eb14007ec1bf10e1aef Mon Sep 17 00:00:00 2001
From: tusharmagar <tushmag@gmail.com>
Date: Thu, 19 Feb 2026 16:19:13 +0530
Subject: [PATCH 19/36] feat: update chat and app UI with new maximize/minimize
 icons

---
 apps/x/apps/renderer/src/App.tsx              | 51 ++++++++++++++-----
 .../renderer/src/components/chat-sidebar.tsx  |  4 +-
 2 files changed, 41 insertions(+), 14 deletions(-)

diff --git a/apps/x/apps/renderer/src/App.tsx b/apps/x/apps/renderer/src/App.tsx
index df8bd3dc..b810af9b 100644
--- a/apps/x/apps/renderer/src/App.tsx
+++ b/apps/x/apps/renderer/src/App.tsx
@@ -5,7 +5,7 @@ import { RunEvent, ListRunsResponse } from '@x/shared/src/runs.js';
 import type { LanguageModelUsage, ToolUIPart } from 'ai';
 import './App.css'
 import z from 'zod';
-import { CheckIcon, LoaderIcon, PanelLeftIcon, Expand, Shrink, X, ChevronLeftIcon, ChevronRightIcon, SquarePen, SearchIcon } from 'lucide-react';
+import { CheckIcon, LoaderIcon, PanelLeftIcon, Maximize2, Minimize2, ChevronLeftIcon, ChevronRightIcon, SquarePen, SearchIcon } from 'lucide-react';
 import { cn } from '@/lib/utils';
 import { MarkdownEditor } from './components/markdown-editor';
 import { ChatSidebar } from './components/chat-sidebar';
@@ -1655,8 +1655,10 @@ function App() {
   const restoreChatTabState = useCallback((tabId: string, fallbackRunId: string | null): boolean => {
     const cached = chatViewStateByTabRef.current[tabId]
     if (!cached) return false
+    // Ignore stale cache snapshots that don't match the tab's current run binding.
+    if (cached.runId !== fallbackRunId) return false
 
-    const resolvedRunId = cached.runId ?? fallbackRunId
+    const resolvedRunId = fallbackRunId
     setRunId(resolvedRunId)
     setConversation(cached.conversation)
     setCurrentAssistantMessage(cached.currentAssistantMessage)
@@ -1678,6 +1680,8 @@ function App() {
   const openChatInNewTab = useCallback((targetRunId: string) => {
     const existingTab = chatTabs.find(t => t.runId === targetRunId)
     if (existingTab) {
+      // Cancel stale in-flight loads from previously focused tabs.
+      loadRunRequestIdRef.current += 1
       setActiveChatTabId(existingTab.id)
       const restored = restoreChatTabState(existingTab.id, existingTab.runId)
       if (processingRunIdsRef.current.has(targetRunId) || !restored) {
@@ -1696,6 +1700,8 @@ function App() {
     if (!tab) return
     if (tabId === activeChatTabId) return
     saveChatScrollForTab(activeChatTabId)
+    // Cancel stale in-flight loads from previously focused tabs.
+    loadRunRequestIdRef.current += 1
     setActiveChatTabId(tabId)
     const restored = restoreChatTabState(tabId, tab.runId)
     if (tab.runId && processingRunIdsRef.current.has(tab.runId)) {
@@ -1732,6 +1738,8 @@ function App() {
     if (tabId === activeChatTabId && nextTabs.length > 0) {
       const newIdx = Math.min(idx, nextTabs.length - 1)
       const newActiveTab = nextTabs[newIdx]
+      // Cancel stale in-flight loads from the closing tab.
+      loadRunRequestIdRef.current += 1
       setActiveChatTabId(newActiveTab.id)
       const restored = restoreChatTabState(newActiveTab.id, newActiveTab.runId)
       if (newActiveTab.runId && processingRunIdsRef.current.has(newActiveTab.runId)) {
@@ -2776,7 +2784,6 @@ function App() {
                 onSelectRun: (runIdToLoad) => {
                   if (selectedPath || isGraphOpen) {
                     setIsChatSidebarOpen(true)
-                    setIsRightPaneMaximized(false)
                   }
 
                   // If already open in a chat tab, switch to it
@@ -2886,15 +2893,35 @@ function App() {
                     ) : null}
                   </div>
                 )}
+                {!selectedPath && !isGraphOpen && !selectedTask && (
+                  <Tooltip>
+                    <TooltipTrigger asChild>
+                      <button
+                        type="button"
+                        onClick={handleNewChatTab}
+                        className="titlebar-no-drag flex h-8 w-8 items-center justify-center rounded-md text-muted-foreground hover:bg-accent hover:text-foreground transition-colors self-center shrink-0"
+                        aria-label="New chat tab"
+                      >
+                        <SquarePen className="size-5" />
+                      </button>
+                    </TooltipTrigger>
+                    <TooltipContent side="bottom">New chat tab</TooltipContent>
+                  </Tooltip>
+                )}
                 {!selectedPath && !isGraphOpen && expandedFrom && (
-                  <button
-                    type="button"
-                    onClick={handleCloseFullScreenChat}
-                    className="titlebar-no-drag flex h-8 w-8 items-center justify-center rounded-md text-muted-foreground hover:bg-accent hover:text-foreground transition-colors self-center shrink-0"
-                    aria-label="Return to file"
-                  >
-                    <X className="size-5" />
-                  </button>
+                  <Tooltip>
+                    <TooltipTrigger asChild>
+                      <button
+                        type="button"
+                        onClick={handleCloseFullScreenChat}
+                        className="titlebar-no-drag flex h-8 w-8 items-center justify-center rounded-md text-muted-foreground hover:bg-accent hover:text-foreground transition-colors self-center shrink-0"
+                        aria-label="Restore two-pane view"
+                      >
+                        <Minimize2 className="size-5" />
+                      </button>
+                    </TooltipTrigger>
+                    <TooltipContent side="bottom">Restore two-pane view</TooltipContent>
+                  </Tooltip>
                 )}
                 {(selectedPath || isGraphOpen) && (
                   <Tooltip>
@@ -2905,7 +2932,7 @@ function App() {
                         className="titlebar-no-drag flex h-8 w-8 items-center justify-center rounded-md text-muted-foreground hover:bg-accent hover:text-foreground transition-colors -mr-1 self-center shrink-0"
                         aria-label={isChatSidebarOpen ? "Maximize knowledge view" : "Restore two-pane view"}
                       >
-                        {isChatSidebarOpen ? <Expand className="size-5" /> : <Shrink className="size-5" />}
+                        {isChatSidebarOpen ? <Maximize2 className="size-5" /> : <Minimize2 className="size-5" />}
                       </button>
                     </TooltipTrigger>
                     <TooltipContent side="bottom">
diff --git a/apps/x/apps/renderer/src/components/chat-sidebar.tsx b/apps/x/apps/renderer/src/components/chat-sidebar.tsx
index 44fdbafd..1e8610dd 100644
--- a/apps/x/apps/renderer/src/components/chat-sidebar.tsx
+++ b/apps/x/apps/renderer/src/components/chat-sidebar.tsx
@@ -1,5 +1,5 @@
 import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react'
-import { Expand, Shrink, SquarePen } from 'lucide-react'
+import { Maximize2, Minimize2, SquarePen } from 'lucide-react'
 
 import { Button } from '@/components/ui/button'
 import { cn } from '@/lib/utils'
@@ -394,7 +394,7 @@ export function ChatSidebar({
                     className="titlebar-no-drag my-1 mr-2 h-8 w-8 shrink-0 text-muted-foreground hover:text-foreground"
                     aria-label={isMaximized ? 'Restore two-pane view' : 'Maximize chat view'}
                   >
-                    {isMaximized ? <Shrink className="size-5" /> : <Expand className="size-5" />}
+                    {isMaximized ? <Minimize2 className="size-5" /> : <Maximize2 className="size-5" />}
                   </Button>
                 </TooltipTrigger>
                 <TooltipContent side="bottom">

From 1cad68e60fde22e14601fbc13d1b50433fef80af Mon Sep 17 00:00:00 2001
From: tusharmagar <tushmag@gmail.com>
Date: Thu, 19 Feb 2026 23:58:27 +0530
Subject: [PATCH 20/36] feat: enhance sidebar behavior with collapsible left
 pane and optimized chat sidebar transitions

---
 apps/x/apps/renderer/src/App.tsx                     | 10 +++++++---
 apps/x/apps/renderer/src/components/chat-sidebar.tsx |  8 +++++++-
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/apps/x/apps/renderer/src/App.tsx b/apps/x/apps/renderer/src/App.tsx
index b810af9b..e18c9d47 100644
--- a/apps/x/apps/renderer/src/App.tsx
+++ b/apps/x/apps/renderer/src/App.tsx
@@ -2748,6 +2748,7 @@ function App() {
     : null
   const isRightPaneContext = Boolean(selectedPath || isGraphOpen)
   const isRightPaneOnlyMode = isRightPaneContext && isChatSidebarOpen && isRightPaneMaximized
+  const shouldCollapseLeftPane = isRightPaneOnlyMode
   const openMarkdownTabs = React.useMemo(() => {
     const markdownTabs = fileTabs.filter(tab => tab.path.endsWith('.md'))
     if (selectedPath?.endsWith('.md')) {
@@ -2843,9 +2844,13 @@ function App() {
               backgroundTasks={backgroundTasks}
               selectedBackgroundTask={selectedBackgroundTask}
             />
-            {!isRightPaneOnlyMode && (
             <SidebarInset
-              className="overflow-hidden! min-h-0 min-w-0"
+              className={cn(
+                "overflow-hidden! min-h-0 min-w-0 transition-[max-width] duration-200 ease-linear",
+                shouldCollapseLeftPane && "pointer-events-none select-none"
+              )}
+              style={shouldCollapseLeftPane ? { maxWidth: 0 } : { maxWidth: '100%' }}
+              aria-hidden={shouldCollapseLeftPane}
               onMouseDownCapture={() => setActiveShortcutPane('left')}
               onFocusCapture={() => setActiveShortcutPane('left')}
             >
@@ -3136,7 +3141,6 @@ function App() {
               </FileCardProvider>
               )}
             </SidebarInset>
-            )}
 
             {/* Chat sidebar - shown when viewing files/graph */}
             {isRightPaneContext && (
diff --git a/apps/x/apps/renderer/src/components/chat-sidebar.tsx b/apps/x/apps/renderer/src/components/chat-sidebar.tsx
index 1e8610dd..05e498f7 100644
--- a/apps/x/apps/renderer/src/components/chat-sidebar.tsx
+++ b/apps/x/apps/renderer/src/components/chat-sidebar.tsx
@@ -154,6 +154,8 @@ export function ChatSidebar({
   const paneRef = useRef<HTMLDivElement>(null)
   const startXRef = useRef(0)
   const startWidthRef = useRef(0)
+  const prevIsMaximizedRef = useRef(isMaximized)
+  const justToggledMaximize = prevIsMaximizedRef.current !== isMaximized
 
   const getMaxAllowedWidth = useCallback(() => {
     if (typeof window === 'undefined') return MAX_WIDTH
@@ -183,6 +185,10 @@ export function ChatSidebar({
     setShowContent(false)
   }, [isOpen])
 
+  useEffect(() => {
+    prevIsMaximizedRef.current = isMaximized
+  }, [isMaximized])
+
   useEffect(() => {
     if (typeof window === 'undefined') return
     try {
@@ -343,7 +349,7 @@ export function ChatSidebar({
       onFocusCapture={onActivate}
       className={cn(
         'relative flex min-w-0 flex-col overflow-hidden border-l border-border bg-background',
-        !isResizing && 'transition-[width] duration-200 ease-linear'
+        !isResizing && !justToggledMaximize && 'transition-[width] duration-200 ease-linear'
       )}
       style={paneStyle}
     >

From dc42bceb773514740015b4b0295bbe419458ef5f Mon Sep 17 00:00:00 2001
From: RinZ27 <222222878+RinZ27@users.noreply.github.com>
Date: Fri, 20 Feb 2026 08:42:29 +0700
Subject: [PATCH 21/36] security: fix command injection bypass in apps/x

---
 apps/x/packages/core/src/application/lib/command-executor.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/x/packages/core/src/application/lib/command-executor.ts b/apps/x/packages/core/src/application/lib/command-executor.ts
index e865e98d..d16806b4 100644
--- a/apps/x/packages/core/src/application/lib/command-executor.ts
+++ b/apps/x/packages/core/src/application/lib/command-executor.ts
@@ -3,7 +3,7 @@ import { promisify } from 'util';
 import { getSecurityAllowList } from '../../config/security.js';
 
 const execPromise = promisify(exec);
-const COMMAND_SPLIT_REGEX = /(?:\|\||&&|;|\||\n)/;
+const COMMAND_SPLIT_REGEX = /(?:\|\||&&|;|\||\n|`|\$\(|\))/;
 const ENV_ASSIGNMENT_REGEX = /^[A-Za-z_][A-Za-z0-9_]*=.*/;
 const WRAPPER_COMMANDS = new Set(['sudo', 'env', 'time', 'command']);
 

From a358ae7051f9e7009ac0d5732dfaeb25eb70c0ed Mon Sep 17 00:00:00 2001
From: Ramnique Singh <30795890+ramnique@users.noreply.github.com>
Date: Sat, 21 Feb 2026 22:58:38 +0530
Subject: [PATCH 22/36] refactor oauth repo interface

---
 apps/x/apps/main/src/oauth-handler.ts         | 20 ++---
 apps/x/packages/core/src/auth/repo.ts         | 77 +++----------------
 .../src/knowledge/fireflies-client-factory.ts | 10 +--
 .../src/knowledge/google-client-factory.ts    | 14 ++--
 apps/x/packages/shared/src/ipc.ts             |  2 +-
 5 files changed, 35 insertions(+), 88 deletions(-)

diff --git a/apps/x/apps/main/src/oauth-handler.ts b/apps/x/apps/main/src/oauth-handler.ts
index eba43956..ce1e83eb 100644
--- a/apps/x/apps/main/src/oauth-handler.ts
+++ b/apps/x/apps/main/src/oauth-handler.ts
@@ -84,7 +84,7 @@ async function getProviderConfiguration(provider: string, clientIdOverride?: str
       return clientIdOverride;
     }
     const oauthRepo = getOAuthRepo();
-    const clientId = await oauthRepo.getClientId(provider);
+    const { clientId } = await oauthRepo.read(provider);
     if (clientId) {
       return clientId;
     }
@@ -212,11 +212,11 @@ export async function connectProvider(provider: string, clientId?: string): Prom
 
         // Save tokens
         console.log(`[OAuth] Token exchange successful for ${provider}`);
-        await oauthRepo.saveTokens(provider, tokens);
+        await oauthRepo.upsert(provider, { tokens });
         if (provider === 'google' && clientId) {
-          await oauthRepo.setClientId(provider, clientId);
+          await oauthRepo.upsert(provider, { clientId });
         }
-        await oauthRepo.clearError(provider);
+        await oauthRepo.upsert(provider, { error: null });
 
         // Trigger immediate sync for relevant providers
         if (provider === 'google') {
@@ -281,7 +281,7 @@ export async function connectProvider(provider: string, clientId?: string): Prom
 export async function disconnectProvider(provider: string): Promise<{ success: boolean }> {
   try {
     const oauthRepo = getOAuthRepo();
-    await oauthRepo.clearTokens(provider);
+    await oauthRepo.delete(provider);
     return { success: true };
   } catch (error) {
     console.error('OAuth disconnect failed:', error);
@@ -297,7 +297,7 @@ export async function getAccessToken(provider: string): Promise<string | null> {
   try {
     const oauthRepo = getOAuthRepo();
     
-    let tokens = await oauthRepo.getTokens(provider);
+    const { tokens } = await oauthRepo.read(provider);
     if (!tokens) {
       return null;
     }
@@ -306,7 +306,7 @@ export async function getAccessToken(provider: string): Promise<string | null> {
     if (oauthClient.isTokenExpired(tokens)) {
       if (!tokens.refresh_token) {
         // No refresh token, need to reconnect
-        await oauthRepo.setError(provider, 'Missing refresh token. Please reconnect.');
+        await oauthRepo.upsert(provider, { error: 'Missing refresh token. Please reconnect.' });
         return null;
       }
 
@@ -316,11 +316,11 @@ export async function getAccessToken(provider: string): Promise<string | null> {
         
         // Refresh token, preserving existing scopes
         const existingScopes = tokens.scopes;
-        tokens = await oauthClient.refreshTokens(config, tokens.refresh_token, existingScopes);
-        await oauthRepo.saveTokens(provider, tokens);
+        const refreshedTokens = await oauthClient.refreshTokens(config, tokens.refresh_token, existingScopes);
+        await oauthRepo.upsert(provider, { tokens });
       } catch (error) {
         const message = error instanceof Error ? error.message : 'Token refresh failed';
-        await oauthRepo.setError(provider, message);
+        await oauthRepo.upsert(provider, { error: message });
         console.error('Token refresh failed:', error);
         return null;
       }
diff --git a/apps/x/packages/core/src/auth/repo.ts b/apps/x/packages/core/src/auth/repo.ts
index 7a91e8b6..a53c2dcb 100644
--- a/apps/x/packages/core/src/auth/repo.ts
+++ b/apps/x/packages/core/src/auth/repo.ts
@@ -5,9 +5,9 @@ import { OAuthTokens } from './types.js';
 import z from 'zod';
 
 const ProviderConnectionSchema = z.object({
-  tokens: OAuthTokens,
-  clientId: z.string().optional(),
-  error: z.string().optional(),
+  tokens: OAuthTokens.nullable().optional(),
+  clientId: z.string().nullable().optional(),
+  error: z.string().nullable().optional(),
 });
 
 const OAuthConfigSchema = z.object({
@@ -17,7 +17,7 @@ const OAuthConfigSchema = z.object({
 
 const ClientFacingConfigSchema = z.record(z.string(), z.object({
   connected: z.boolean(),
-  error: z.string().optional(),
+  error: z.string().nullable().optional(),
 }));
 
 const LegacyOauthConfigSchema = z.record(z.string(), OAuthTokens);
@@ -28,13 +28,9 @@ const DEFAULT_CONFIG: z.infer<typeof OAuthConfigSchema> = {
 };
 
 export interface IOAuthRepo {
-  getTokens(provider: string): Promise<OAuthTokens | null>;
-  saveTokens(provider: string, tokens: OAuthTokens): Promise<void>;
-  clearTokens(provider: string): Promise<void>;
-  getClientId(provider: string): Promise<string | null>;
-  setClientId(provider: string, clientId: string): Promise<void>;
-  setError(provider: string, errorMessage: string): Promise<void>;
-  clearError(provider: string): Promise<void>;
+  read(provider: string): Promise<z.infer<typeof ProviderConnectionSchema>>;
+  upsert(provider: string, connection: Partial<z.infer<typeof ProviderConnectionSchema>>): Promise<void>;
+  delete(provider: string): Promise<void>;
   getClientFacingConfig(): Promise<z.infer<typeof ClientFacingConfigSchema>>;
 }
 
@@ -92,71 +88,22 @@ export class FSOAuthRepo implements IOAuthRepo {
     await fs.writeFile(this.configPath, JSON.stringify(config, null, 2));
   }
 
-  async getTokens(provider: string): Promise<OAuthTokens | null> {
+  async read(provider: string): Promise<z.infer<typeof ProviderConnectionSchema>> {
     const config = await this.readConfig();
-    const tokens = config.providers[provider]?.tokens;
-    return tokens ?? null;
+    return config.providers[provider] ?? {};
   }
-
-  async saveTokens(provider: string, tokens: OAuthTokens): Promise<void> {
+  async upsert(provider: string, connection: Partial<z.infer<typeof ProviderConnectionSchema>>): Promise<void> {
     const config = await this.readConfig();
-    if (config.providers[provider]) {
-      delete config.providers[provider];
-    }
-    config.providers[provider] = {
-      tokens,
-    };
+    config.providers[provider] = { ...config.providers[provider] ?? {}, ...connection };
     await this.writeConfig(config);
   }
 
-  async clearTokens(provider: string): Promise<void> {
+  async delete(provider: string): Promise<void> {
     const config = await this.readConfig();
     delete config.providers[provider];
     await this.writeConfig(config);
   }
 
-  async getClientId(provider: string): Promise<string | null> {
-    const config = await this.readConfig();
-    const clientId = config.providers[provider]?.clientId;
-    return clientId ?? null;
-  }
-
-  async setClientId(provider: string, clientId: string): Promise<void> {
-    const config = await this.readConfig();
-    if (!config.providers[provider]) {
-      throw new Error(`Provider ${provider} not found`);
-    }
-    config.providers[provider].clientId = clientId;
-    await this.writeConfig(config);
-  }
-
-  async clearClientId(provider: string): Promise<void> {
-    const config = await this.readConfig();
-    if (!config.providers[provider]) {
-      throw new Error(`Provider ${provider} not found`);
-    }
-    delete config.providers[provider].clientId;
-    await this.writeConfig(config);
-  }
-
-  async setError(provider: string, errorMessage: string): Promise<void> {
-    const config = await this.readConfig();
-    if (!config.providers[provider]) {
-      throw new Error(`Provider ${provider} not found`);
-    }
-    config.providers[provider].error = errorMessage;
-    await this.writeConfig(config);
-  }
-
-  async clearError(provider: string): Promise<void> {
-    const config = await this.readConfig();
-    if (!config.providers[provider]) {
-      throw new Error(`Provider ${provider} not found`);
-    }
-    delete config.providers[provider].error;
-    await this.writeConfig(config);
-  }
-
   async getClientFacingConfig(): Promise<z.infer<typeof ClientFacingConfigSchema>> {
     const config = await this.readConfig();
     const clientFacingConfig: z.infer<typeof ClientFacingConfigSchema> = {};
diff --git a/apps/x/packages/core/src/knowledge/fireflies-client-factory.ts b/apps/x/packages/core/src/knowledge/fireflies-client-factory.ts
index 67607bfe..1ee865e9 100644
--- a/apps/x/packages/core/src/knowledge/fireflies-client-factory.ts
+++ b/apps/x/packages/core/src/knowledge/fireflies-client-factory.ts
@@ -31,7 +31,7 @@ export class FirefliesClientFactory {
      */
     static async getClient(): Promise<Client | null> {
         const oauthRepo = container.resolve<IOAuthRepo>('oauthRepo');
-        const tokens = await oauthRepo.getTokens(this.PROVIDER_NAME);
+        const { tokens } = await oauthRepo.read(this.PROVIDER_NAME);
 
         if (!tokens) {
             this.clearCache();
@@ -49,7 +49,7 @@ export class FirefliesClientFactory {
             // Token expired, try to refresh
             if (!tokens.refresh_token) {
                 console.log("[Fireflies] Token expired and no refresh token available.");
-                await oauthRepo.setError(this.PROVIDER_NAME, 'Missing refresh token. Please reconnect.');
+                await oauthRepo.upsert(this.PROVIDER_NAME, { error: 'Missing refresh token. Please reconnect.' });
                 this.clearCache();
                 return null;
             }
@@ -62,7 +62,7 @@ export class FirefliesClientFactory {
                     tokens.refresh_token,
                     existingScopes
                 );
-                await oauthRepo.saveTokens(this.PROVIDER_NAME, refreshedTokens);
+                await oauthRepo.upsert(this.PROVIDER_NAME, { tokens: refreshedTokens });
 
                 // Update cached tokens and recreate client
                 this.cache.tokens = refreshedTokens;
@@ -77,7 +77,7 @@ export class FirefliesClientFactory {
                 return this.cache.client;
             } catch (error) {
                 const message = error instanceof Error ? error.message : 'Failed to refresh token for Fireflies';
-                await oauthRepo.setError(this.PROVIDER_NAME, message);
+                await oauthRepo.upsert(this.PROVIDER_NAME, { error: message });
                 console.error("[Fireflies] Failed to refresh token:", error);
                 this.clearCache();
                 return null;
@@ -107,7 +107,7 @@ export class FirefliesClientFactory {
      */
     static async hasValidCredentials(): Promise<boolean> {
         const oauthRepo = container.resolve<IOAuthRepo>('oauthRepo');
-        const tokens = await oauthRepo.getTokens(this.PROVIDER_NAME);
+        const { tokens } = await oauthRepo.read(this.PROVIDER_NAME);
         return tokens !== null;
     }
 
diff --git a/apps/x/packages/core/src/knowledge/google-client-factory.ts b/apps/x/packages/core/src/knowledge/google-client-factory.ts
index e15d2513..3cb83cd1 100644
--- a/apps/x/packages/core/src/knowledge/google-client-factory.ts
+++ b/apps/x/packages/core/src/knowledge/google-client-factory.ts
@@ -27,9 +27,9 @@ export class GoogleClientFactory {
 
     private static async resolveClientId(): Promise<string> {
         const oauthRepo = container.resolve<IOAuthRepo>('oauthRepo');
-        const clientId = await oauthRepo.getClientId(this.PROVIDER_NAME);
+        const { clientId } = await oauthRepo.read(this.PROVIDER_NAME);
         if (!clientId) {
-            await oauthRepo.setError(this.PROVIDER_NAME, 'Google client ID missing. Please reconnect.');
+            await oauthRepo.upsert(this.PROVIDER_NAME, { error: 'Google client ID missing. Please reconnect.' });
             throw new Error('Google client ID missing. Please reconnect.');
         }
         return clientId;
@@ -40,7 +40,7 @@ export class GoogleClientFactory {
      */
     static async getClient(): Promise<OAuth2Client | null> {
         const oauthRepo = container.resolve<IOAuthRepo>('oauthRepo');
-        const tokens = await oauthRepo.getTokens(this.PROVIDER_NAME);
+        const { tokens } = await oauthRepo.read(this.PROVIDER_NAME);
 
         if (!tokens) {
             this.clearCache();
@@ -64,7 +64,7 @@ export class GoogleClientFactory {
             // Token expired, try to refresh
             if (!tokens.refresh_token) {
                 console.log("[OAuth] Token expired and no refresh token available for Google.");
-                await oauthRepo.setError(this.PROVIDER_NAME, 'Missing refresh token. Please reconnect.');
+                await oauthRepo.upsert(this.PROVIDER_NAME, { error: 'Missing refresh token. Please reconnect.' });
                 this.clearCache();
                 return null;
             }
@@ -77,7 +77,7 @@ export class GoogleClientFactory {
                     tokens.refresh_token,
                     existingScopes
                 );
-                await oauthRepo.saveTokens(this.PROVIDER_NAME, refreshedTokens);
+                await oauthRepo.upsert(this.PROVIDER_NAME, { tokens: refreshedTokens });
 
                 // Update cached tokens and recreate client
                 this.cache.tokens = refreshedTokens;
@@ -89,7 +89,7 @@ export class GoogleClientFactory {
                 return this.cache.client;
             } catch (error) {
                 const message = error instanceof Error ? error.message : 'Failed to refresh token for Google';
-                await oauthRepo.setError(this.PROVIDER_NAME, message);
+                await oauthRepo.upsert(this.PROVIDER_NAME, { error: message });
                 console.error("[OAuth] Failed to refresh token for Google:", error);
                 this.clearCache();
                 return null;
@@ -116,7 +116,7 @@ export class GoogleClientFactory {
      */
     static async hasValidCredentials(requiredScopes: string | string[]): Promise<boolean> {
         const oauthRepo = container.resolve<IOAuthRepo>('oauthRepo');
-        const tokens = await oauthRepo.getTokens(this.PROVIDER_NAME);
+        const { tokens } = await oauthRepo.read(this.PROVIDER_NAME);
         if (!tokens) {
             return false;
         }
diff --git a/apps/x/packages/shared/src/ipc.ts b/apps/x/packages/shared/src/ipc.ts
index 1fa9b423..71491f8f 100644
--- a/apps/x/packages/shared/src/ipc.ts
+++ b/apps/x/packages/shared/src/ipc.ts
@@ -244,7 +244,7 @@ const ipcSchemas = {
     res: z.object({
       config: z.record(z.string(), z.object({
         connected: z.boolean(),
-        error: z.string().optional(),
+        error: z.string().nullable().optional(),
       })),
     }),
   },

From f5d585ac7edfe70045f1c1456bf1e40260896282 Mon Sep 17 00:00:00 2001
From: Ramnique Singh <30795890+ramnique@users.noreply.github.com>
Date: Sat, 21 Feb 2026 22:59:16 +0530
Subject: [PATCH 23/36] refactor build-oauth-url params

---
 apps/x/apps/main/src/oauth-handler.ts         |  4 ++--
 apps/x/packages/core/src/auth/oauth-client.ts | 12 ++----------
 2 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/apps/x/apps/main/src/oauth-handler.ts b/apps/x/apps/main/src/oauth-handler.ts
index ce1e83eb..2efc77c2 100644
--- a/apps/x/apps/main/src/oauth-handler.ts
+++ b/apps/x/apps/main/src/oauth-handler.ts
@@ -179,9 +179,9 @@ export async function connectProvider(provider: string, clientId?: string): Prom
 
     // Build authorization URL
     const authUrl = oauthClient.buildAuthorizationUrl(config, {
-      redirectUri: REDIRECT_URI,
+      redirect_uri: REDIRECT_URI,
       scope: scopes.join(' '),
-      codeChallenge,
+      code_challenge: codeChallenge,
       state,
     });
 
diff --git a/apps/x/packages/core/src/auth/oauth-client.ts b/apps/x/packages/core/src/auth/oauth-client.ts
index 613cee2e..762c8aae 100644
--- a/apps/x/packages/core/src/auth/oauth-client.ts
+++ b/apps/x/packages/core/src/auth/oauth-client.ts
@@ -152,19 +152,11 @@ export function generateState(): string {
  */
 export function buildAuthorizationUrl(
   config: client.Configuration,
-  params: {
-    redirectUri: string;
-    scope: string;
-    codeChallenge: string;
-    state: string;
-  }
+  params: Record<string, string>
 ): URL {
   return client.buildAuthorizationUrl(config, {
-    redirect_uri: params.redirectUri,
-    scope: params.scope,
-    code_challenge: params.codeChallenge,
     code_challenge_method: 'S256',
-    state: params.state,
+    ...params,
   });
 }
 

From 3ea416ac71b4865defbb898e6fc755b0d5117616 Mon Sep 17 00:00:00 2001
From: Ramnique Singh <30795890+ramnique@users.noreply.github.com>
Date: Sat, 21 Feb 2026 22:59:28 +0530
Subject: [PATCH 24/36] preserve refresh token if not reissued

---
 apps/x/packages/core/src/auth/oauth-client.ts | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/apps/x/packages/core/src/auth/oauth-client.ts b/apps/x/packages/core/src/auth/oauth-client.ts
index 762c8aae..0442d7d6 100644
--- a/apps/x/packages/core/src/auth/oauth-client.ts
+++ b/apps/x/packages/core/src/auth/oauth-client.ts
@@ -200,6 +200,11 @@ export async function refreshTokens(
     tokens.scopes = existingScopes;
   }
 
+  // Preserve existing refresh token if server didn't return it
+  if (!tokens.refresh_token) {
+    tokens.refresh_token = refreshToken;
+  }
+
   console.log(`[OAuth] Token refresh successful`);
   return tokens;
 }

From 83edc74d1d2520c6a7494fa1fe19337f9f85571c Mon Sep 17 00:00:00 2001
From: Arjun <6592213+arkml@users.noreply.github.com>
Date: Mon, 23 Feb 2026 09:53:06 +0530
Subject: [PATCH 25/36] docs: update documentation for desktop app

Squash merge of docs22 branch - updates documentation to reference
desktop app, fixes contribution docs, and fixes docs JSON.
---
 apps/docs/docs.json                           |  28 +--
 apps/docs/docs/api-sdk/using_the_api.mdx      | 173 ------------------
 apps/docs/docs/api-sdk/using_the_sdk.mdx      |  91 ---------
 .../docs/development/contribution-guide.mdx   |  66 ++++---
 .../docs/getting-started/introduction.mdx     | 122 +++++++-----
 apps/docs/docs/getting-started/quickstart.mdx |  97 ++--------
 apps/docs/docs/using-rowboat/agents.mdx       | 141 --------------
 .../docs/docs/using-rowboat/conversations.mdx |  52 ------
 .../using-rowboat/customise/custom-llms.mdx   |  53 ------
 apps/docs/docs/using-rowboat/jobs.mdx         |  45 -----
 apps/docs/docs/using-rowboat/rag.mdx          |  68 -------
 .../docs/using-rowboat/rowboat-studio.mdx     |  60 ------
 apps/docs/docs/using-rowboat/tools.mdx        |  56 ------
 apps/docs/docs/using-rowboat/triggers.mdx     | 131 -------------
 14 files changed, 127 insertions(+), 1056 deletions(-)
 delete mode 100644 apps/docs/docs/api-sdk/using_the_api.mdx
 delete mode 100644 apps/docs/docs/api-sdk/using_the_sdk.mdx
 delete mode 100644 apps/docs/docs/using-rowboat/agents.mdx
 delete mode 100644 apps/docs/docs/using-rowboat/conversations.mdx
 delete mode 100644 apps/docs/docs/using-rowboat/customise/custom-llms.mdx
 delete mode 100644 apps/docs/docs/using-rowboat/jobs.mdx
 delete mode 100644 apps/docs/docs/using-rowboat/rag.mdx
 delete mode 100644 apps/docs/docs/using-rowboat/rowboat-studio.mdx
 delete mode 100644 apps/docs/docs/using-rowboat/tools.mdx
 delete mode 100644 apps/docs/docs/using-rowboat/triggers.mdx

diff --git a/apps/docs/docs.json b/apps/docs/docs.json
index 3c381b70..8442b158 100644
--- a/apps/docs/docs.json
+++ b/apps/docs/docs.json
@@ -18,36 +18,12 @@
           "group": "Getting Started",
           "pages": [
             "docs/getting-started/introduction",
-            "docs/getting-started/quickstart",
-            "docs/getting-started/license"
+            "docs/getting-started/quickstart"
           ]
         },
-        {
-          "group": "Using Rowboat",
-          "pages": [
-            "docs/using-rowboat/rowboat-studio",
-            "docs/using-rowboat/agents",
-            "docs/using-rowboat/tools",
-            "docs/using-rowboat/rag",
-            "docs/using-rowboat/triggers",
-            "docs/using-rowboat/jobs",
-            "docs/using-rowboat/conversations",
-            {
-              "group": "Customise",
-              "icon": "sliders",
-              "pages": [
-                "docs/using-rowboat/customise/custom-llms"
-              ]
-            }
-          ]
-        },
-        {
-          "group": "API & SDK",
-          "pages": ["docs/api-sdk/using_the_api", "docs/api-sdk/using_the_sdk"]
-        },
         {
           "group": "Development",
-          "pages": ["docs/development/contribution-guide", "docs/development/roadmap"]
+          "pages": ["docs/development/contribution-guide", "docs/getting-started/license"]
         }
       ]
     },
diff --git a/apps/docs/docs/api-sdk/using_the_api.mdx b/apps/docs/docs/api-sdk/using_the_api.mdx
deleted file mode 100644
index 60125b90..00000000
--- a/apps/docs/docs/api-sdk/using_the_api.mdx
+++ /dev/null
@@ -1,173 +0,0 @@
----
-title: "Using the API"
-description: "This is a guide on using the HTTP API to power conversations with the assistant created in Studio."
-icon: "code"
----
-
-
-## Deploy your assistant to production on Studio
-<Frame>
-  <img src="/docs/img/prod-deploy.png" alt="Prod Deploy" />
-</Frame>
-
-## Obtain API key and Project ID
-
-Generate API keys via the developer configs in your project. Copy the Project ID from the same page.
-<Frame>
-  <img src="/docs/img/dev-config.png" alt="Developer Configs" />
-</Frame>
-
-## API Endpoint
-
-```
-POST <HOST>/api/v1/<PROJECT_ID>/chat
-```
-
-Where:
-
-- For self-hosted: `<HOST>` is `http://localhost:3000`
-
-## Authentication
-
-Include your API key in the Authorization header:
-
-```
-Authorization: Bearer <API_KEY>
-```
-
-## Examples
-
-### First Turn
-
-```bash
-curl --location '<HOST>/api/v1/<PROJECT_ID>/chat' \
---header 'Content-Type: application/json' \
---header 'Authorization: Bearer <API_KEY>' \
---data '{
-    "messages": [
-        {
-            "role": "user",
-            "content": "Hello, can you help me?"
-        }
-    ],
-    "state": null
-}'
-```
-
-Response:
-```json
-{
-    "messages": [
-        {
-            "role": "assistant",
-            "content": "Hello! Yes, I'd be happy to help you. What can I assist you with today?",
-            "agenticResponseType": "external"
-        }
-    ],
-    "state": {
-        "last_agent_name": "MainAgent"
-    }
-}
-```
-
-### Subsequent Turn
-
-Notice how we include both the previous messages and the state from the last response:
-
-```bash
-curl --location '<HOST>/api/v1/<PROJECT_ID>/chat' \
---header 'Content-Type: application/json' \
---header 'Authorization: Bearer <API_KEY>' \
---data '{
-    "messages": [
-        {
-            "role": "user",
-            "content": "Hello, can you help me?"
-        },
-        {
-            "role": "assistant",
-            "content": "Hello! Yes, I'd be happy to help you. What can I assist you with today?",
-            "agenticResponseType": "external"
-        },
-        {
-            "role": "user",
-            "content": "What services do you offer?"
-        }
-    ],
-    "state": {
-        "last_agent_name": "MainAgent"
-    }
-}'
-```
-
-## API Specification
-
-### Request Schema
-
-```typescript
-{
-    // Required fields
-    messages: Message[];      // Array of message objects representing the conversation history
-    state: any;              // State object from previous response, or null for first message
-
-    // Optional fields
-    workflowId?: string;     // Specific workflow ID to use (defaults to production workflow)
-    testProfileId?: string;  // Test profile ID for simulation
-}
-```
-
-### Message Types
-
-Messages can be one of the following types:
-
-1. System Message
-```typescript
-{
-    role: "system";
-    content: string;
-}
-```
-
-2. User Message
-```typescript
-{
-    role: "user";
-    content: string;
-}
-```
-
-3. Assistant Message
-```typescript
-{
-    role: "assistant";
-    content: string;
-    agenticResponseType: "internal" | "external";
-    agenticSender?: string | null;
-}
-```
-
-### Response Schema
-
-```typescript
-{
-    messages: Message[];  // Array of new messages from this turn
-    state: any;          // State object to pass in the next request
-}
-```
-
-## Important Notes
-
-1. Always pass the complete conversation history in the `messages` array
-2. Always include the `state` from the previous response in your next request
-3. The last message in the response's `messages` array will be a user-facing assistant message (`agenticResponseType: "external"`)
-
-## Rate Limiting
-
-The API has rate limits per project. If exceeded, you'll receive a 429 status code.
-
-## Error Responses
-
-- 400: Invalid request body or missing/invalid Authorization header
-- 403: Invalid API key
-- 404: Project or workflow not found
-- 429: Rate limit exceeded
\ No newline at end of file
diff --git a/apps/docs/docs/api-sdk/using_the_sdk.mdx b/apps/docs/docs/api-sdk/using_the_sdk.mdx
deleted file mode 100644
index 0909224f..00000000
--- a/apps/docs/docs/api-sdk/using_the_sdk.mdx
+++ /dev/null
@@ -1,91 +0,0 @@
----
-title: "Using the SDK"
-description: "This is a guide on using the RowBoat Python SDK as an alternative to the [RowBoat HTTP API](/using_the_api) to power conversations with the assistant created in Studio."
-icon: "toolbox"
----
-
-## Prerequisites
-- ``` pip install rowboat ```
-- [Deploy your assistant to production](/using_the_api/#deploy-your-assistant-to-production-on-studio)
-- [Obtain your `<API_KEY>` and `<PROJECT_ID>`](/using_the_api/#obtain-api-key-and-project-id)
-
-### API Host
-- For the open source installation, the `<HOST>` is [http://localhost:3000](http://localhost:3000)
-- When using the hosted app, the `<HOST>` is [https://app.rowboatlabs.com](https://app.rowboatlabs.com)
-
-## Usage
-
-### Basic Usage
-
-The main way to interact with Rowboat is using the `Client` class, which provides a stateless chat API. You can manage conversation state using the `conversationId` returned in each response.
-
-```python
-from rowboat.client import Client
-from rowboat.schema import UserMessage
-
-# Initialize the client
-client = Client(
-    host="<HOST>",
-    projectId="<PROJECT_ID>",
-    apiKey="<API_KEY>"
-)
-
-# Start a new conversation
-result = client.run_turn(
-    messages=[
-        UserMessage(role='user', content="What is the capital of France?")
-    ]
-)
-print(result.turn.output[-1].content)
-# The capital of France is Paris.
-
-print("Conversation ID:", result.conversationId)
-
-# Continue the conversation by passing the conversationId
-result = client.run_turn(
-    messages=[
-        UserMessage(role='user', content="What other major cities are in that country?")
-    ],
-    conversationId=result.conversationId
-)
-print(result.turn.output[-1].content)
-# Other major cities in France include Lyon, Marseille, Toulouse, and Nice.
-
-result = client.run_turn(
-    messages=[
-        UserMessage(role='user', content="What's the population of the first city you mentioned?")
-    ],
-    conversationId=result.conversationId
-)
-print(result.turn.output[-1].content)
-# Lyon has a population of approximately 513,000 in the city proper.
-```
-
-### Using Tool Overrides (Mock Tools)
-
-You can provide tool override instructions to test a specific configuration using the `mockTools` argument:
-
-```python
-result = client.run_turn(
-    messages=[
-        UserMessage(role='user', content="What's the weather?")
-    ],
-    mockTools={
-        "weather_lookup": "The weather in any city is sunny and 25°C.",
-        "calculator": "The result of any calculation is 42."
-    }
-)
-print(result.turn.output[-1].content)
-```
-
-### Message Types
-
-You can use different message types as defined in `rowboat.schema`, such as `UserMessage`, `SystemMessage`, `AssistantMessage`, etc. See `schema.py` for all available message types.
-
-### Error Handling
-
-If the API returns a non-200 status code, a `ValueError` will be raised with the error details.
-
----
-
-For more advanced usage, see the docstrings in `client.py` and the message schemas in `schema.py`.
\ No newline at end of file
diff --git a/apps/docs/docs/development/contribution-guide.mdx b/apps/docs/docs/development/contribution-guide.mdx
index 94d0f46c..022e3ea0 100644
--- a/apps/docs/docs/development/contribution-guide.mdx
+++ b/apps/docs/docs/development/contribution-guide.mdx
@@ -1,59 +1,55 @@
 ---
 title: "Contribution Guide"
-description: "Learn how to contribute to the Rowboat project and help improve our platform."
+description: "How to contribute to Rowboat — from bug reports to pull requests."
 icon: "github"
 ---
 
-# Join the Rowboat Voyage
+# Contributing to Rowboat
 
-We're building Rowboat as an open-source, community-powered platform — and we'd love for you to hop aboard! Whether you're fixing typos, suggesting a new tool integration, or designing your dream multi-agent workflow, your contributions are valuable and welcome.
+Rowboat is open-source and we welcome contributions of all kinds — bug reports, feature ideas, code, and docs improvements.
 
-<Frame>
-  <img src="/docs/img/contribution-guide-hero.png" className="w-full max-w-[600px] rounded-xl" alt="Contribution guide hero image showing community collaboration" />
-</Frame>
+**Quick links:**
+- [GitHub Repository](https://github.com/rowboatlabs/rowboat)
+- [Discord Community](https://discord.gg/wajrgmJQ6b)
+- [Open Issues](https://github.com/rowboatlabs/rowboat/issues)
 
 ---
 
-## How You Can Contribute
+## Ways to Contribute
 
+**Report bugs or suggest improvements** — If something feels off or could be better, [open an issue](https://github.com/rowboatlabs/rowboat/issues/new). Include steps to reproduce for bugs, or a clear description of the improvement you have in mind.
 
-- **Tackle Open Issues**  
-  Browse our [GitHub Issues](https://github.com/rowboatlabs/rowboat/issues) for tags like `good first issue`, `help wanted`, or `bug` to find a spot that fits your skillset.
+**Fix an existing issue** — Browse [open issues](https://github.com/rowboatlabs/rowboat/issues) and comment on one to let us know you're working on it.
 
-- **Join the Community**  
-  Our [Discord](https://discord.gg/rxB8pzHxaS) is the go-to hub for brainstorming, feedback, and finding contributors for bigger efforts.
-
-- **Propose Something New**  
-  Have a new tool integration idea or found a bug? Open an issue and let’s discuss it!
+**Propose a new feature or integration** — Open an issue first so we can discuss the approach before you invest time building it.
 
+**Improve documentation** — Typos, unclear explanations, missing examples — all fair game.
 
 ---
 
-## Contribution Workflow & Best Practices
-
-Whether it's your first contribution or your fiftieth, here's what a great contribution looks like:
-
-| Step / Tip                     | Description                                                                                   |
-|-------------------------------|-----------------------------------------------------------------------------------------------|
-| **1. Fork the Repository**     | Create a personal copy of [rowboatlabs/rowboat](https://github.com/rowboatlabs/rowboat) to start contributing. |
-| **2. Create a New Branch**     | Use a descriptive name like `fix-tool-crash` or `feature-new-mcp`. Avoid committing to `main`. |
-| **3. Make Your Changes**       | Focus your PR on a single issue or feature to keep things clean and reviewable.               |
-| **4. Write Tests if Needed**   | If you change logic, add relevant tests so your contribution is future-proof.                |
-| **5. Run Tests & Lint Locally**| Make sure your branch passes all tests and code quality checks before pushing.                |
-| **6. Document or Demo It**     | Add helpful context: screenshots, example scripts, or a short video/gif to demonstrate your changes. |
-| **7. Submit a Pull Request**   | Open a PR with a clear description of your changes and any context reviewers should know.           |
-| **8. Collaborate on Feedback** | Our maintainers may leave comments — it’s all part of the process. Let’s improve it together. |
-| **9. Don’t Be Shy to Follow Up** | Feel free to ping the PR/issue if you're waiting on feedback. We appreciate polite nudges.  |
-| **10. Celebrate the Merge!**   | You just made Rowboat better. Thanks for contributing 🚀                                      |
-
-<Tip>If you're fixing typos, spacing, or small tweaks — try bundling those into a related PR instead of sending them standalone. It helps keep reviews focused. </Tip>
+## Contribution Workflow
 
+1. **Fork** [rowboatlabs/rowboat](https://github.com/rowboatlabs/rowboat) and clone it locally.
+2. **Create a branch** with a descriptive name (`fix-tool-crash`, `feature-mcp-discovery`). Don't commit directly to `main`.
+3. **Make your changes.** Keep PRs focused on a single issue or feature.
+4. **Test your changes** locally before submitting.
+5. **Open a pull request** with a clear description of what you changed and why. Screenshots or short demos are appreciated for UI changes.
+6. **Respond to feedback** — maintainers may request changes. This is normal and collaborative.
+7. **Merge!** Once approved, we'll merge your PR.
 
+<Tip>For small fixes like typos or formatting, try bundling related changes into a single PR rather than submitting them individually.</Tip>
 
 ---
 
-## Come Build With Us
+## Guidelines
 
-We believe great ideas come from the community — and that means **you**. Whether you're an engineer, designer, AI tinkerer, or curious beginner, there’s room on this boat for everyone.
+- **One PR, one concern.** Don't mix unrelated changes in the same pull request.
+- **Write clear commit messages.** A reviewer should understand what changed from the message alone.
+- **Follow existing code style.** Match the patterns you see in the codebase.
+- **Be patient and respectful.** We review PRs as quickly as we can. A polite ping on Discord is always welcome if things go quiet.
 
-Let’s build the future of AI workflows — together. 🫶
+---
+
+## Getting Help
+
+If you're stuck or unsure about anything, drop a message in our [Discord](https://discord.gg/wajrgmJQ6b). We're happy to help you get unblocked.
\ No newline at end of file
diff --git a/apps/docs/docs/getting-started/introduction.mdx b/apps/docs/docs/getting-started/introduction.mdx
index 8fde54db..fd76e87d 100644
--- a/apps/docs/docs/getting-started/introduction.mdx
+++ b/apps/docs/docs/getting-started/introduction.mdx
@@ -1,60 +1,96 @@
 ---
 title: "Introduction"
-description: "Welcome to the official Rowboat documentation! Rowboat is a low-code AI IDE to build tool connected multi-agent assistants. Rowboat copilot builds the agents for you based on your requirements with the option do everything manually as well."
+description: "Welcome to the official Rowboat documentation! Rowboat is an open-source AI coworker that turns work into a knowledge graph and acts on it."
 icon: "book-open"
 ---
-
-<Frame>
-  <img src="../videos/Intro-Video.gif" alt="Intro Video" />
-</Frame>
-
-## What is RowBoat?
-**RowBoat is a state-of-art platform to build multi-agent AI systems in a visual interface, with the help of a copilot.**
-
-RowBoat enables you to build, manage and deploy user-facing assistants. An assistant is made up of multiple agents, each having access to a set of tools and working together to interact with the user as a single assistant. You can connect any tool to the agents.
-
-For example, you can build a *meeting prep assistant* that helps you prepare for upcoming meetings. One agent can access your Google Calendar to see your scheduled meetings, another agent can research the meeting attendees (such as finding their LinkedIn profiles or recent news), and a third agent can compile this research and send it to your email before the meeting. This way, you get automated, personalized meeting prep without manual effort.
+[![Demo](https://github.com/user-attachments/assets/3f560bcf-d93c-4064-81eb-75a9fae31742)](https://www.youtube.com/watch?v=5AWoGo-L16I)
 
 ---
 
-## How RowBoat works
+## What is Rowboat?  
+Rowboat is a local-first AI coworker, with work memory. Rowboat connects to your email and meeting notes, builds a long-lived knowledge graph, and uses that context to help you get work done - privately, on your machine.
 
-### RowBoat Studio
-RowBoat Studio lets you create AI agents in minutes, using a visual interface and plain language. 
-There are key components that you will work with:
-- Agents
-- Playground
-- Copilot
-
-
-<Card title="Using Rowboat" icon="puzzle-piece" horizontal href="/docs/using-rowboat/rowboat-studio">
-  Learn about Rowboat Studio and key concepts used in building assistants
-</Card>
-
-
-### RowBoat Chat API & SDK
-- [RowBoat Chat API](/docs/api-sdk/using_the_api) is a stateless HTTP API to interface with the assistant created on RowBoat Studio. You can use the API to drive end-user facing conversations in your app or website.
-- [RowBoat Chat SDK](/docs/api-sdk/using_the_sdk) is a simple Python SDK which wraps the HTTP API under the hood. It provides a clean interface for managing conversations using conversation IDs for state management.
+You can do things like:
+- `Build me a deck about our next quarter roadmap` → generates a PDF using context from your knowledge graph
+- `Prep me for my meeting with Alex` → pulls past decisions, open questions, and relevant threads into a crisp brief (or a voice note)
+- Visualize, edit, and update your knowledge graph anytime (it’s just Markdown)
+- Record voice memos that automatically capture and update key takeaways in the graph
 
 ---
 
-## Why RowBoat?
-Rowboat is the fastest way to build and deploy multi-agent assistants.
+## What it does
 
-<Steps>
-  <Step title="Build complex assistants">
-    Use plain language and a powerful visual interface to design and orchestrate multi-agent assistants with ease.
-  </Step>
+Rowboat is a **local-first AI coworker** that can:
+- **Remember** the important context you don’t want to re-explain (people, projects, decisions, commitments)
+- **Understand** what’s relevant right now (before a meeting, while replying to an email, when writing a doc)
+- **Help you act** by drafting, summarizing, planning, and producing real artifacts (briefs, emails, docs, PDF slides)
 
-  <Step title="Integrate tools and MCP servers">
-    Add tools and connect to MCP servers in just minutes — no complex setup required.
-  </Step>
+Under the hood, Rowboat maintains an **Obsidian-compatible vault** of plain Markdown notes with backlinks — a transparent “working memory” you can inspect and edit.
 
-  <Step title="Expedite your AI roadmap">
-    Accelerate development with battle-tested tooling tailored for building production-ready, multi-agent AI systems.
-  </Step>
-</Steps>
+## Integrations
 
+Rowboat builds memory from the work you already do, including:
+- **Gmail** (email)
+- **Granola** (meeting notes)
+- **Fireflies** (meeting notes)
+
+## How it’s different
+
+Most AI tools reconstruct context on demand by searching transcripts or documents.
+
+Rowboat maintains **long-lived knowledge** instead:
+- context accumulates over time
+- relationships are explicit and inspectable
+- notes are editable by you, not hidden inside a model
+- everything lives on your machine as plain Markdown
+
+The result is memory that compounds, rather than retrieval that starts cold every time.
+
+## What you can do with it
+
+- **Meeting prep** from prior decisions, threads, and open questions
+- **Email drafting** grounded in history and commitments
+- **Docs & decks** generated from your ongoing context (including PDF slides)
+- **Follow-ups**: capture decisions, action items, and owners so nothing gets dropped
+- **On-your-machine help**: create files, summarize into notes, and run workflows using local tools (with explicit, reviewable actions)
+
+## Background agents
+
+Rowboat can spin up **background agents** to do repeatable work automatically - so routine tasks happen without you having to ask every time.
+
+Examples:
+- Draft email replies in the background (grounded in your past context and commitments)
+- Generate a daily voice note each morning (agenda, priorities, upcoming meetings)
+- Create recurring project updates from the latest emails/notes
+- Keep your knowledge graph up to date as new information comes in
+
+You control what runs, when it runs, and what gets written back into your local Markdown vault.
+
+## Bring your own model
+
+Rowboat works with the model setup you prefer:
+- **Local models** via Ollama or LM Studio
+- **Hosted models** (bring your own API key/provider)
+- Swap models anytime — your data stays in your local Markdown vault
+
+## Extend Rowboat with tools (MCP)
+
+Rowboat can connect to external tools and services via **Model Context Protocol (MCP)**.
+That means you can plug in (for example) search, databases, CRMs, support tools, and automations - or your own internal tools.
+
+Examples: Exa (web search), Twitter/X, ElevenLabs (voice), Slack, Linear/Jira, GitHub, and more.
+
+## Local-first by design
+
+- All data is stored locally as plain Markdown
+- No proprietary formats or hosted lock-in
+- You can inspect, edit, back up, or delete everything at any time
+
+---
+<div align="center">
+
+[Discord](https://discord.gg/wajrgmJQ6b) · [Twitter](https://x.com/intent/user?screen_name=rowboatlabshq)
+</div>
 ---
 
 ## Contributing
@@ -72,7 +108,7 @@ Need help using Rowboat? Join our community!
 <Card
 title="Discord"
 icon="discord"
-horizontal href="https://discord.gg/rxB8pzHxaS"
+horizontal href="https://discord.gg/wajrgmJQ6b"
 >
 Join our growing discord community and interact with hundreds of developer using Rowboat!
 </Card>
diff --git a/apps/docs/docs/getting-started/quickstart.mdx b/apps/docs/docs/getting-started/quickstart.mdx
index 04fc761b..1ab0bc05 100644
--- a/apps/docs/docs/getting-started/quickstart.mdx
+++ b/apps/docs/docs/getting-started/quickstart.mdx
@@ -3,92 +3,25 @@ title: "Quickstart"
 description: "guide to getting started with rowboat"
 icon: "rocket"
 ---
----
-# Cloud Setup
+**Download latest for Mac/Windows/Linux:** [Download](https://www.rowboatlabs.com/downloads)
 
-Using the open-source version of Rowboat requires more technical skill to set up and navigate. For the smoothest experience, we recommend using our [hosted version](https://dev.rowboatlabs.com/)
+**All release files:** https://github.com/rowboatlabs/rowboat/releases/latest
 
----
+## Google setup (optional)
+To connect Gmail, Calendar, and Drive, follow [Google setup](https://github.com/rowboatlabs/rowboat/blob/main/google-setup.md).
 
-# Local Setup
+## Voice notes (optional)
+To enable voice notes, add a Deepgram API key in `~/.rowboat/config/deepgram.json`:
 
-<Note>Pre-requisite: Ensure Docker is installed on your machine. You'll also need an OpenAI account and API key to use the Copilot and agents.</Note>
+```json
+{
+  "apiKey": "<key>"
+}
+```
 
+## Web search (optional)
+To use Brave web search, add the Brave API key in `~/.rowboat/config/brave-search.json`.
 
-<Steps>
-  <Step title="Set your OpenAI key">
-    Export your OpenAI API key in your terminal:
+To use Exa research search, add the Exa API key in `~/.rowboat/config/exa-search.json`.
 
-    ```bash
-    export OPENAI_API_KEY=your-openai-api-key
-    ```
-  </Step>
-
-  <Step title="Set up Composio for tools and triggers (optional)">
-    To use external tools and triggers, export your Composio API key:
-
-    ```bash
-    export COMPOSIO_API_KEY=your-composio-api-key
-    export COMPOSIO_TRIGGERS_WEBHOOK_SECRET=your-webhook-secret
-    ```
-
-    <Note>For more detailed setup instructions, see the [Triggers](/docs/using-rowboat/triggers#local-setup) page.</Note>
-  </Step>
-
-  <Step title="Clone the repository and start Rowboat Docker">
-    Clone the Rowboat repository and start the app using Docker:
-
-    ```bash
-    git clone git@github.com:rowboatlabs/rowboat.git
-    cd rowboat
-    ./start.sh
-    ```
-  </Step>
-
-  <Step title="Access the app">
-    Once Docker is running, open your browser and go to:
-
-    [http://localhost:3000](http://localhost:3000)
-  </Step>
-</Steps>
-
-
-<Info>See the [Using custom LLM providers](#using-custom-llm-providers) section below for using custom providers like OpenRouter and LiteLLM. </Info>
-
----
-
-## Demo
-{/* (would be better to change this to a Getiing Started Tutorial) */}
-
-#### Create a multi-agent assistant with MCP tools by chatting with Rowboat
-[![Screenshot 2025-04-23 at 00 25 31](https://github.com/user-attachments/assets/c8a41622-8e0e-459f-becb-767503489866)](https://youtu.be/YRTCw9UHRbU)
-
----
-
-## Integrate with Rowboat agents
-
-There are 2 ways to integrate with the agents you create in Rowboat
-
-<Columns cols={2}>
-
-  <Card title="Using the API" icon="code" horizontal href="/docs/api-sdk/using_the_api">
-    Guide on using the HTTP API 
-  </Card>
-
-  <Card title="Using the SDK" icon="toolbox" horizontal href="/docs/api-sdk/using_the_sdk">
-    Guide on using the Python SDK
-  </Card>
-
-</Columns>
-
----
-
-## Using custom LLM providers
-By default, Rowboat uses OpenAI LLMs (gpt-4o, gpt-4.1, etc.) for both agents and copilot, when you export your OPENAI_API_KEY. 
-
-However, you can also configure custom LLM providers (e.g. LiteLLM, OpenRouter) to use any of the hundreds of available LLMs beyond OpenAI, such as Claude, DeepSeek, Ollama LLMs and so on.
-
-Check out our page on customising
-  <Card title="Customise" icon="sliders" horizontal href="/docs/using-rowboat/customise">
-    Learn more about customising your Rowboat experience here
-  </Card>
+(Use the same JSON format as above.)
diff --git a/apps/docs/docs/using-rowboat/agents.mdx b/apps/docs/docs/using-rowboat/agents.mdx
deleted file mode 100644
index ceaeccae..00000000
--- a/apps/docs/docs/using-rowboat/agents.mdx
+++ /dev/null
@@ -1,141 +0,0 @@
----
-title: "Agents"
-description: "Learn about creating and configuring individual agents within your multi-agent system"
-icon: "robot"
----
-
-## Overview
-
-Agents are the core building blocks of Rowboat's multi-agent system. Each agent carries out a specific part of a conversation, handles tasks via tools, and can collaborate with other agents to orchestrate complex workflows.
-
-They are powered by LLMs and can:
-- Respond to user input
-- Trigger tools or APIs
-- Pass control to other agents using @mentions
-- Fetch or process internal data
-- Execute RAG (Retrieval-Augmented Generation) queries
-- Participate in sequential pipeline workflows
-
----
-
-## Agent Types
-
-Rowboat supports several types of agents, each designed for specific use cases:
-
-| Name | Purpose | Characteristics |
-|------|---------|-----------------|
-| **Conversational Agents** (`conversation`) | Primary user-facing agents that interact directly with users and orchestrate workflows. | • Can respond to users and orchestrate workflows<br />• Typically serve as the start agent (Hub Agent)|
-| **Task Agents** (`internal`) | Specialized agents that perform specific tasks without direct user interaction. | • Focused on specific functions<br />• Return results to parent agents|
-| **Pipeline Agents** (`pipeline`) | Sequential workflow execution agents that process data in a chain. | • Execute in sequence within a pipeline<br />• Cannot transfer to other agents directly|
-
-
----
-
-## Agent Configuration
-
-Agents are configured through two main tabs in the Rowboat Studio interface:
-
-### **Instructions Tab**
-
-
-#### Description
-A clear description of the agent's role and responsibilities
-
-#### Instructions
-Instructions are the backbone of the agent's behavior. Use the Copilot's structured format for consistency:
-
-**Recommended Structure:**
-```
-## 🧑‍💼 Role:
-[Clear description of the agent's role]
-
-## ⚙️ Steps to Follow:
-1. [Step 1]
-2. [Step 2]
-3. [Step 3]
-
-## 🎯 Scope:
-✅ In Scope:
-- [What the agent should handle]
-
-❌ Out of Scope:
-- [What the agent should NOT handle]
-
-## 📋 Guidelines:
-✔️ Dos:
-- [Positive behaviors]
-
-🚫 Don'ts:
-- [Negative behaviors]
-```
-
-#### Examples
-These help agents behave correctly in specific situations. Each example can include:
-- A sample user message
-- The expected agent response
-- Any tool calls (if applicable)
-
-### **Configurations Tab**
-
-#### Name 
-Name of the agent
-
-
-#### Behaviour
-- **Agent Type**: Choose from `conversation`, `internal`, or `pipeline`
-- **Model**: Select the LLM model (GPT-4.1, GPT-4o, google/gemini-2.5-flash, etc.)
-
-#### RAG
-- **Add Source**: Connect data sources to enable RAG capabilities for the agent
-
----
-
-## Creating Your Initial Set of Agents
-
-Let Copilot bootstrap your agent graph.
-
-### Instruct Copilot
-
-Start by telling Copilot what your assistant is meant to do — it'll generate an initial set of agents with best-practice instructions, role definitions, and connected agents.
-
-<Frame>
-  <img src="/docs/img/create-agents-delivery.png" className="w-full max-w-[400px] rounded-xl" alt="Creating agents with Copilot" />
-</Frame>
-
-### Inspect the Output
-
-After applying the suggested agents, take a close look at each one's:
-- **Instructions**: Define how the agent behaves
-- **Examples**: Guide agent responses and tool use
-
-<Frame>
-  <img src="/docs/img/agent-instruction.png" alt="Inspect agent instructions" />
-</Frame>
-
----
-
-## Updating Agent Behavior
-
-There are three ways to update an agent:
-
-### 1. With Copilot
-
-Copilot understands the current chat context and can help rewrite or improve an agent's behavior based on how it performed.
-
-<Frame>
-  <img src="/docs/img/update-agent-copilot.png" className="w-full max-w-[400px] rounded-xl" alt="Update agent using Copilot" />
-</Frame>
-
-
-
-### 2. Manual Edits
-
-You can always manually edit the agent's instructions.
-
-<Frame>
-  <img src="/docs/img/update-agent-manual.png" alt="Manually edit agent" />
-</Frame>
-
----
-
-
diff --git a/apps/docs/docs/using-rowboat/conversations.mdx b/apps/docs/docs/using-rowboat/conversations.mdx
deleted file mode 100644
index c755f47d..00000000
--- a/apps/docs/docs/using-rowboat/conversations.mdx
+++ /dev/null
@@ -1,52 +0,0 @@
----
-title: "Conversations"
-description: "View and manage all conversations with your Rowboat agents"
-icon: "list-check"
----
-
-## Overview
-
-The Conversations page in Rowboat shows you all the interactions between users and your agents. Here you can monitor conversations, view detailed message exchanges, and understand how your agents are performing.
-
-<Frame>
-  <img src="/docs/img/conversations-ui.png" className="w-full max-w-[800px] rounded-xl" alt="Conversations page UI showing list of conversations" />
-</Frame>
-
-## What You'll See
-
-The Conversations page displays a list of all conversations organized by time:
-
-- **Today**: Recent conversations from today
-- **This week**: Conversations from the current week
-- **This month**: Conversations from the current month
-- **Older**: Conversations from previous months
-
-Each conversation shows:
-- **Conversation ID**: Unique identifier for the conversation
-- **Created time**: When the conversation started
-- **Reason**: What triggered the conversation (chat or job)
-
-## Viewing Conversation Details
-Click on any conversation to see the detailed view with all the message exchanges:
-
-<Frame>
-  <img src="/docs/img/conversations-inside-run.png" className="w-full max-w-[800px] rounded-xl" alt="Conversation details showing expanded view of a conversation with turns and messages" />
-</Frame>
-
-**Conversation Metadata**: Shows the Conversation ID, creation time, and last update time.
-
-**Workflow**: Shows the workflow JSON
-
-**Turns**: Each conversation is made up of turns, where:
-- **Turn #1, #2, etc.**: Numbered sequence of interactions
-- **Reason badge**: Shows why each turn happened (chat, API, job, etc.)
-- **Timestamp**: When each turn occurred
-- **Input messages**: What was sent to your agents
-- **Output messages**: What your agents responded with
-
-### Turn Details
-
-Each turn displays:
-- **Input**: The messages sent to your agents (user messages, system messages)
-- **Output**: The responses from your agents
-- **Error information**: Any issues that occurred during processing
diff --git a/apps/docs/docs/using-rowboat/customise/custom-llms.mdx b/apps/docs/docs/using-rowboat/customise/custom-llms.mdx
deleted file mode 100644
index 64b27ca1..00000000
--- a/apps/docs/docs/using-rowboat/customise/custom-llms.mdx
+++ /dev/null
@@ -1,53 +0,0 @@
----
-title: "Custom LLMs"
-description: "How to use and configure custom LLMs in Rowboat."
-
----
-
-<Note> This is currently only possible in the self hosted version of Rowboat</Note>
-
-## Using custom LLM providers
-
-By default, Rowboat uses OpenAI LLMs (gpt-4o, gpt-4.1, etc.) for both agents and copilot, when you export your OPENAI_API_KEY. 
-
-However, you can also configure custom LLM providers (e.g. LiteLLM, OpenRouter) to use any of the hundreds of available LLMs beyond OpenAI, such as Claude, DeepSeek, Ollama LLMs and so on.
-
-<Steps>
-  <Step title="Set up your LLM provider">
-    Configure your environment variables to point to your preferred LLM backend. Example using LiteLLM:
-
-    ```bash
-    export PROVIDER_BASE_URL=http://host.docker.internal:4000/
-    export PROVIDER_API_KEY=sk-1234
-    ```
-
-    Rowboat uses <code>gpt-4.1</code> as the default model for agents and copilot. You can override these:
-
-    ```bash
-    export PROVIDER_DEFAULT_MODEL=claude-3-7-sonnet-latest
-    export PROVIDER_COPILOT_MODEL=gpt-4.1
-    ```
-
-    **Notes:**
-    - Copilot is optimized for <code>gpt-4o</code>/<code>gpt-4.1</code>. We strongly recommend using these models for best results.
-    - You can use different models for the copilot and each agent, but all must be from the same provider (e.g., LiteLLM).
-    - Rowboat is provider-agnostic — any backend implementing the OpenAI messages format should work.
-    - OpenAI-specific tools (like <code>web_search</code>) will not function with non-OpenAI providers. Remove such tools to avoid errors.
-  </Step>
-
-  <Step title="Clone the repository and start Rowboat Docker">
-    Clone the Rowboat repo and spin it up locally:
-
-    ```bash
-    git clone git@github.com:rowboatlabs/rowboat.git
-    cd rowboat
-    docker-compose up --build
-    ```
-  </Step>
-
-  <Step title="Access the app">
-    Once Docker is running, navigate to:
-
-    [http://localhost:3000](http://localhost:3000)
-  </Step>
-</Steps>
diff --git a/apps/docs/docs/using-rowboat/jobs.mdx b/apps/docs/docs/using-rowboat/jobs.mdx
deleted file mode 100644
index 5b3e14df..00000000
--- a/apps/docs/docs/using-rowboat/jobs.mdx
+++ /dev/null
@@ -1,45 +0,0 @@
----
-title: "Jobs"
-description: "Monitor and inspect all your trigger executions and job runs"
-icon: "message"
----
-
-## Overview
-
-The Jobs page in Rowboat provides a comprehensive view of all your automated job executions. Here you can monitor the status of your triggers, inspect what happened during each run, and troubleshoot any issues that may have occurred.
-
-<Frame>
-  <img src="/docs/img/jobs-ui.png" className="w-full max-w-[800px] rounded-xl" alt="Jobs page showing list of all job runs with status indicators" />
-</Frame>
-
-## What You'll See
-
-The Jobs page displays a list of all job runs from your triggers, including:
-
-- **External trigger executions** from webhook events
-- **One-time trigger runs** from scheduled jobs
-- **Recurring trigger executions** from cron-based schedules
-
-Each job run displays the following key information:
-- **Job ID**: Unique identifier for the job run
-- **Status**: Indicates if the job succeeded, failed, or is in progress
-- **Reason**: The trigger or cause for the job (e.g., external trigger, scheduled, cron)
-- **Created Time**: When the job was executed
-
-## Viewing Job Details
-
-### Expand a Job Run
-
-Click on any job run to expand it and see detailed information about what happened during execution:
-
-<Frame>
-  <img src="/docs/img/jobs-inside-run.png" className="w-full max-w-[800px] rounded-xl" alt="Job run details showing expanded information for a specific job" />
-</Frame>
-
-**Basic job details**: Job ID, Status, creation time, Updated time, Conversation ID and Turn ID. By clicking on the Conversation ID, you can view more in-depth details about the run.
-
-**Job Reason**: Why the job triggered - either external trigger, scheduled, or cron.
-
-**Job Input**: The input data sent to your assistant.
-
-**Job Output**: The final output produced by your agents. 
\ No newline at end of file
diff --git a/apps/docs/docs/using-rowboat/rag.mdx b/apps/docs/docs/using-rowboat/rag.mdx
deleted file mode 100644
index 772d034d..00000000
--- a/apps/docs/docs/using-rowboat/rag.mdx
+++ /dev/null
@@ -1,68 +0,0 @@
----
-title: "RAG (Data)"
-description: "How to use our inbuilt RAG"
-icon: "database"
----
-
-# Using RAG in Rowboat
-
-Rowboat provides multiple ways to enhance your agents' context with Retrieval-Augmented Generation (RAG). This guide will help you set up and use each RAG feature.
-
-<Info>RAG is called "Data" on the build view in the Rowboat UI. </Info>
-
----
-
-## Types of RAG
-
-| RAG Type | Description | Configuration Required |
-|----------|-------------|------------------------|
-| **Text RAG** | Process and reason over text content directly | No configuration needed |
-| **File Uploads** | Upload PDF files directly from your device | No configuration needed |
-| **URL Scraping** | Scrape content from web URLs using Firecrawl | Requires API key setup |
-
-<Note> URL Scraping does not require any setup in the managed version of Rowboat. </Note>
-
-<Frame>
-  <img src="/docs/img/rag-adding-data.png" className="w-full max-w-[800px] rounded-xl" alt="Adding data sources for RAG in Rowboat" />
-</Frame>
-
-
-## RAG Features
-
-### 1. Text RAG
-
-Process and reason over text content directly
-
-
-### 2. File Uploads
-
-- Upload PDF files directly from your device  
-- **Open Source Version**: Files are stored locally on your machine
-- **Managed Version**: Files are stored in cloud S3 storage
-- Files are parsed using OpenAI by default  
-
-<Note> You can also use Google's Gemini model for parsing as it is better at parsing larger files. </Note>
-
-#### 2.1 Using Gemini for File Parsing
-
-To use Google's Gemini model for parsing uploaded PDFs, set the following variables:
-
-```bash
-# Enable Gemini for file parsing
-export USE_GEMINI_FILE_PARSING=true
-export GOOGLE_API_KEY=your_google_api_key
-```
-
-
-### 3. URL Scraping
-
-Rowboat uses Firecrawl for URL scraping. You can have a maximum of 100 URLs.
-
-**Open Source Version**: To enable URL scraping, set the following variables:
-
-```bash
-export USE_RAG_SCRAPING=true
-export FIRECRAWL_API_KEY=your_firecrawl_api_key
-```
-
-**Managed Version**: No configuration required - URL scraping is handled automatically.
diff --git a/apps/docs/docs/using-rowboat/rowboat-studio.mdx b/apps/docs/docs/using-rowboat/rowboat-studio.mdx
deleted file mode 100644
index edf74fb3..00000000
--- a/apps/docs/docs/using-rowboat/rowboat-studio.mdx
+++ /dev/null
@@ -1,60 +0,0 @@
----
-title: "Rowboat Studio"
-description: "Visual interface to build, test, and deploy multi-agent AI assistants using plain language"
-icon: "puzzle-piece"
----
-
-
-## Overview
-
-**Rowboat Studio** is your visual interface for building AI assistants — powered by agents, tools, and workflows — using plain language and minimal setup. It brings the process of creating multi-agent systems down to just a few clicks.
-
-Workflows created within Rowboat are known as **assistants**, and each assistant is composed of:
-- One or more **agents**
-- Attached **tools** and **MCP servers**
-
-Once built, assistants can be tested live in the **playground** and deployed in real-world products using the [API](/docs/api-sdk/using_the_api) or [SDK](/docs/api-sdk//using_the_sdk).
-
----
-
-## Key Components
-
-Here’s what you’ll interact with in Studio:
-
-| Component  | Description | Highlights |
-|------------|-------------|------------|
-| **Agent**     | Core building blocks of your assistant.<br />Each agent handles a specific part of the conversation and performs tasks using tools and instructions. | • Define behavior in plain language<br />• Connect agents into a graph<br />• Attach tools and RAG sources |
-| **Playground** | Interactive testbed for conversations.<br />Lets you simulate end-user chats with your assistant and inspect agent behavior in real time. | • Real-time feedback and debugging<br />• See tool calls and agent handoffs<br />• Test individual agents or the whole system |
-| **Copilot**    | Your AI assistant for building assistants.<br />Copilot creates and updates agents, tools, and instructions based on your plain-English prompts. | • Understands full system context<br />• Improves agents based on playground chat<br />• Builds workflows intelligently and fast |
-
-> **Agents are the heart of every assistant.** Learn more about how they work in the Agents page.
-
-<Card title="Agents" icon="robot" horizontal href="/docs/using-rowboat/agents">
-  Learn about creating and configuring individual agents within your multi-agent system
-</Card>
----
-
-## Building in Rowboat
-
-<Steps>
-  <Step title="Describe your assistant to Copilot">
-    Use plain language to tell Copilot what you want your assistant to do. Copilot will auto-generate the agents, instructions, and tools that form the base of your assistant.
-  </Step>
-
-  <Step title="Review and apply Copilot suggestions">
-    Inspect the created agents — especially their instructions and examples — and refine or approve them before moving forward.
-  </Step>
-
-  <Step title="Connect MCP servers and tools">
-    Integrate external services, tools, and backend logic into your agents using Rowboat's modular system. Tools are tied to agents and triggered through instructions.
-  </Step>
-
-  <Step title="Test in the Playground">
-    Use the chat playground to simulate real-world conversations. You’ll see which agent takes control, what tools are triggered, and how your assistant flows.
-  </Step>
-
-  <Step title="Deploy via API or SDK">
-    Assistants can be deployed into production using the **Rowboat Chat API** or the **Rowboat Chat SDK**. Both support stateless and stateful conversation flows.
-  </Step>
-</Steps>
-
diff --git a/apps/docs/docs/using-rowboat/tools.mdx b/apps/docs/docs/using-rowboat/tools.mdx
deleted file mode 100644
index 7a116d63..00000000
--- a/apps/docs/docs/using-rowboat/tools.mdx
+++ /dev/null
@@ -1,56 +0,0 @@
----
-title: "Tools"
-description: "Add and configure tools for your agents to interact with external services"
-icon: "wrench"
----
-
-## Overview
-
-The Tools page in Rowboat lets you add and configure tools that your agents can use to interact with external services, APIs, and systems. Tools enable your agents to perform real-world actions like sending emails, managing calendars, or processing payments.
-
-<Frame>
-  <img src="/docs/img/tools-ui.png" alt="Screenshot of the Tools UI in Rowboat" className="w-full max-w-[800px] rounded-xl shadow" />
-</Frame>
-
-## Tool Types
-
-| Tool Type | Description | Use Case | Availability |
-|-----------|-------------|----------|--------------|
-| **Library Tools** | Pre-built integrations with popular services | Quick setup, no configuration needed | Managed and open source |
-| **MCP Tools** | Custom tools from MCP servers | Custom functionality, specialized APIs | Managed and open source |
-| **Webhook Tools** | HTTP endpoints for custom integrations | Your own systems, custom workflows | Open source only |
-
-
-## Library (Composio Tools)
-
-- Browse a library of 500+ toolkits from popular services
-- With 3000+ tools to choose from!
-- Click on a service to see available tools and add them to your workflow
-- Users must create a [Composio](https://composio.dev/) account and add their API key
-- Tools require authorization to work properly
-
-### Setting up Composio API Key
-
-To use Composio tools, get a Composio key and export it as an environment variable:
-
-```bash
-export COMPOSIO_API_KEY=your_api_key_here
-```
-
-<Note>Users can visit [Composio's toolkit documentation](https://docs.composio.dev/toolkits/introduction) for a deep dive into all the tools available.</Note>
-
-## Custom MCP Servers
-
-- Add your own MCP (Model Context Protocol) servers
-- Connect to custom tools and APIs you've built
-- Configure server URLs and authentication
-- Import tools from your MCP servers
-
-## Webhook
-
-<Note>Webhook tools are only available in the open source (local) version of Rowboat.</Note>
-
-- Create custom webhook tools
-- Configure HTTP endpoints for your agents to call
-- Set up custom authentication and parameters
-- Build integrations with your own systems
diff --git a/apps/docs/docs/using-rowboat/triggers.mdx b/apps/docs/docs/using-rowboat/triggers.mdx
deleted file mode 100644
index 32c81f66..00000000
--- a/apps/docs/docs/using-rowboat/triggers.mdx
+++ /dev/null
@@ -1,131 +0,0 @@
----
-title: "Triggers"
-description: "Learn about setting up automated triggers for your Rowboat agents"
-icon: "bolt"
----
-
-## Overview
-
-Triggers in Rowboat are automated mechanisms that activate your agents when specific events occur or conditions are met. They form the foundation of your automated workflow system, enabling your agents to respond to external events, scheduled times, and system conditions without manual intervention.
-
-
-
-## Trigger Types
-
-Rowboat supports three main categories of triggers, each designed for different automation scenarios:
-
-| Trigger Type | Purpose | Execution | Use Cases |
-|--------------|---------|-----------|-----------|
-| **External Triggers** | Connect to external services and events | Real-time via webhooks | Slack messages, GitHub events, email processing |
-| **One-Time Triggers** | Execute at specific predetermined times | Single execution at set time | Delayed responses, time-sensitive actions |
-| **Recurring Triggers** | Execute on repeating schedules | Continuous via cron expressions | Daily reports, periodic maintenance, regular syncs |
-
----
-
-## External Triggers (Composio Integration)
-
-External triggers are powered by **Composio** and allow users to use triggers from across 30+ services including Slack, GitHub, Gmail, Notion, Google Calendar, and more.
-
-<Frame>
-  <img src="/docs/img/triggers-external-ui.png" className="w-full max-w-[800px] rounded-xl" alt="External Triggers UI showing available toolkits and services" />
-</Frame>
-
-### Creating External Triggers
-
-1. **Click New External Trigger**: Start the trigger creation process
-2. **Select a Toolkit**: Browse available toolkits or search for specific services
-3. **Choose Trigger Type**: Select the specific trigger from available options, click configure
-4. **Authenticate**: Complete OAuth2 flow or enter API keys for the selected service (your preferred method)
-5. **Configure**: Set up event filters and data mapping if required
-6. **Deploy**: Activate the trigger to start listening for events
-
-### Local Setup
-
-If you're running the open source version of Rowboat, you'll need to set up external triggers manually. In the managed version, this is all handled automatically for you.
-
-<Steps>
-  <Step title="Create a Composio project">
-    Sign into [Composio](https://composio.dev/) and create a new project for your Rowboat instance.
-  </Step>
-
-  <Step title="Get your Composio API key">
-    Go to your project settings and copy the project API key. Export it in your Rowboat environment:
-    
-    ```bash
-    export COMPOSIO_API_KEY=your-composio-api-key
-    ```
-  </Step>
-
-  <Step title="Expose your Rowboat port">
-    Use ngrok to expose your local Rowboat instance:
-    
-    ```bash
-    ngrok http 3000
-    ```
-    
-    Copy the generated ngrok URL (e.g., `https://a5fe8c0d45b8.ngrok-free.app`).
-  </Step>
-
-  <Step title="Configure webhook URL">
-    In Composio, go to Events & Triggers section and set the Trigger Webhook URL to:
-    
-    ```
-    {ngrok_url}/api/composio/webhook
-    ```
-    
-    Example: `https://a5fe8c0d45b8.ngrok-free.app/api/composio/webhook`
-  </Step>
-
-  <Step title="Set webhook secret">
-    Copy the Webhook Secret from Composio and export it in Rowboat:
-    
-    ```bash
-    export COMPOSIO_TRIGGERS_WEBHOOK_SECRET=your-webhook-secret
-    ```
-  </Step>
-
-  <Step title="Restart Rowboat">
-    Restart your Rowboat instance to load the new environment variables. You're now ready to use external triggers!
-  </Step>
-</Steps>
-
-<Note>Make sure your Rowboat assistant is deployed before receiving trigger calls</Note>
-
----
-
-## One-Time Triggers (Scheduled Jobs)
-
-One-time triggers execute your agents at a specific, predetermined time. They're useful for delayed responses, batch processing, time-sensitive actions, or coordinating with external schedules.
-
-<Frame>
-  <img src="/docs/img/triggers-onetime-ui.png" className="w-full max-w-[800px] rounded-xl" alt="One-Time Triggers UI showing scheduled job configuration" />
-</Frame>
-
-### Creating One-Time Triggers
-1. Set the exact execution time (date and time)
-2. Configure the input messages for your agents
-3. Deploy to schedule the execution
-
----
-
-## Recurring Triggers (Cron-based Jobs)
-
-Recurring triggers execute your agents on a repeating schedule using cron expressions. They're ideal for daily reports, periodic maintenance, regular data syncs, and continuous monitoring tasks.
-
-<Frame>
-  <img src="/docs/img/triggers-recurring-ui.png" className="w-full max-w-[800px] rounded-xl" alt="Recurring Triggers UI showing cron-based job configuration" />
-</Frame>
-
-### Creating Recurring Triggers
-1. Define the cron expression (e.g., `0 9 * * *` for daily at 9 AM)
-2. Configure the recurring message structure
-3. Enable the trigger to start the recurring schedule
-
-### Common Cron Patterns
-```cron
-0 9 * * *     # Daily at 9:00 AM
-0 8 * * 1     # Every Monday at 8:00 AM
-*/15 * * * *  # Every 15 minutes
-0 0 1 * *     # First day of month at midnight
-```
-

From bfa87846191fba4ac55996569769883ee74babe5 Mon Sep 17 00:00:00 2001
From: Arjun <6592213+arkml@users.noreply.github.com>
Date: Mon, 23 Feb 2026 10:23:14 +0530
Subject: [PATCH 26/36] clarify contribution steps

---
 apps/docs/docs/development/contribution-guide.mdx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/docs/docs/development/contribution-guide.mdx b/apps/docs/docs/development/contribution-guide.mdx
index 022e3ea0..1089d7e0 100644
--- a/apps/docs/docs/development/contribution-guide.mdx
+++ b/apps/docs/docs/development/contribution-guide.mdx
@@ -30,10 +30,10 @@ Rowboat is open-source and we welcome contributions of all kinds — bug reports
 ## Contribution Workflow
 
 1. **Fork** [rowboatlabs/rowboat](https://github.com/rowboatlabs/rowboat) and clone it locally.
-2. **Create a branch** with a descriptive name (`fix-tool-crash`, `feature-mcp-discovery`). Don't commit directly to `main`.
+2. **Create a branch from `dev`** with a descriptive name (`fix-tool-crash`, `feature-mcp-discovery`).
 3. **Make your changes.** Keep PRs focused on a single issue or feature.
 4. **Test your changes** locally before submitting.
-5. **Open a pull request** with a clear description of what you changed and why. Screenshots or short demos are appreciated for UI changes.
+5. **Open a pull request against `dev`** (not `main`) with a clear description of what you changed and why. Screenshots or short demos are appreciated for UI changes.
 6. **Respond to feedback** — maintainers may request changes. This is normal and collaborative.
 7. **Merge!** Once approved, we'll merge your PR.
 

From 1f85bcf8ae859cba11460e78254bbfc70cf2ee5f Mon Sep 17 00:00:00 2001
From: Arjun <6592213+arkml@users.noreply.github.com>
Date: Mon, 23 Feb 2026 10:39:50 +0530
Subject: [PATCH 27/36] remove prebuilt from start

---
 apps/x/apps/main/src/main.ts | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/apps/x/apps/main/src/main.ts b/apps/x/apps/main/src/main.ts
index 2a5330ab..34363b28 100644
--- a/apps/x/apps/main/src/main.ts
+++ b/apps/x/apps/main/src/main.ts
@@ -17,7 +17,6 @@ import { init as initCalendarSync } from "@x/core/dist/knowledge/sync_calendar.j
 import { init as initFirefliesSync } from "@x/core/dist/knowledge/sync_fireflies.js";
 import { init as initGranolaSync } from "@x/core/dist/knowledge/granola/sync.js";
 import { init as initGraphBuilder } from "@x/core/dist/knowledge/build_graph.js";
-import { init as initPreBuiltRunner } from "@x/core/dist/pre_built/runner.js";
 import { init as initAgentRunner } from "@x/core/dist/agent-schedule/runner.js";
 import { initConfigs } from "@x/core/dist/config/initConfigs.js";
 import started from "electron-squirrel-startup";
@@ -171,9 +170,6 @@ app.whenReady().then(async () => {
   // start knowledge graph builder
   initGraphBuilder();
 
-  // start pre-built agent runner
-  initPreBuiltRunner();
-
   // start background agent runner (scheduled agents)
   initAgentRunner();
 

From 53d48ab4f31d732559d70fc497937de1515f20f4 Mon Sep 17 00:00:00 2001
From: Arjun <6592213+arkml@users.noreply.github.com>
Date: Tue, 24 Feb 2026 13:00:08 +0530
Subject: [PATCH 28/36] add session and always permission scopes for command
 execution

Session-scoped permissions are stored in the run log and rebuilt by
the state-builder, scoping them to a single run. Always-scoped
permissions persist to security.json. The backend derives command
names from the run log instead of receiving them from the frontend.
Uses regex-based command parsing with subshell/parenthesis support.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---
 apps/x/apps/renderer/src/App.tsx              | 15 +++--
 .../ai-elements/permission-request.tsx        | 56 +++++++++++++++----
 .../renderer/src/components/chat-sidebar.tsx  |  4 +-
 apps/x/packages/core/src/agents/runtime.ts    | 15 ++++-
 .../src/application/lib/command-executor.ts   | 22 +++-----
 apps/x/packages/core/src/config/security.ts   | 23 ++++++--
 apps/x/packages/core/src/runs/runs.ts         | 27 ++++++++-
 apps/x/packages/shared/src/runs.ts            |  2 +
 8 files changed, 126 insertions(+), 38 deletions(-)

diff --git a/apps/x/apps/renderer/src/App.tsx b/apps/x/apps/renderer/src/App.tsx
index e18c9d47..dca1acac 100644
--- a/apps/x/apps/renderer/src/App.tsx
+++ b/apps/x/apps/renderer/src/App.tsx
@@ -1570,9 +1570,14 @@ function App() {
     }
   }, [runId, isStopping, stopClickedAt])
 
-  const handlePermissionResponse = useCallback(async (toolCallId: string, subflow: string[], response: 'approve' | 'deny') => {
+  const handlePermissionResponse = useCallback(async (
+    toolCallId: string,
+    subflow: string[],
+    response: 'approve' | 'deny',
+    scope?: 'once' | 'session' | 'always',
+  ) => {
     if (!runId) return
-    
+
     // Optimistically update the UI immediately
     setPermissionResponses(prev => {
       const next = new Map(prev)
@@ -1584,11 +1589,11 @@ function App() {
       next.delete(toolCallId)
       return next
     })
-    
+
     try {
       await window.ipc.invoke('runs:authorizePermission', {
         runId,
-        authorization: { subflow, toolCallId, response }
+        authorization: { subflow, toolCallId, response, scope }
       })
     } catch (error) {
       console.error('Failed to authorize permission:', error)
@@ -3057,6 +3062,8 @@ function App() {
                                           <PermissionRequest
                                             toolCall={permRequest.toolCall}
                                             onApprove={() => handlePermissionResponse(permRequest.toolCall.toolCallId, permRequest.subflow, 'approve')}
+                                            onApproveSession={() => handlePermissionResponse(permRequest.toolCall.toolCallId, permRequest.subflow, 'approve', 'session')}
+                                            onApproveAlways={() => handlePermissionResponse(permRequest.toolCall.toolCallId, permRequest.subflow, 'approve', 'always')}
                                             onDeny={() => handlePermissionResponse(permRequest.toolCall.toolCallId, permRequest.subflow, 'deny')}
                                             isProcessing={isActive && isProcessing}
                                             response={response}
diff --git a/apps/x/apps/renderer/src/components/ai-elements/permission-request.tsx b/apps/x/apps/renderer/src/components/ai-elements/permission-request.tsx
index 91b16287..e9cef6dc 100644
--- a/apps/x/apps/renderer/src/components/ai-elements/permission-request.tsx
+++ b/apps/x/apps/renderer/src/components/ai-elements/permission-request.tsx
@@ -2,8 +2,14 @@
 
 import { Badge } from "@/components/ui/badge";
 import { Button } from "@/components/ui/button";
+import {
+  DropdownMenu,
+  DropdownMenuTrigger,
+  DropdownMenuContent,
+  DropdownMenuItem,
+} from "@/components/ui/dropdown-menu";
 import { cn } from "@/lib/utils";
-import { AlertTriangleIcon, CheckCircleIcon, CheckIcon, XCircleIcon, XIcon } from "lucide-react";
+import { AlertTriangleIcon, CheckCircleIcon, CheckIcon, ChevronDownIcon, XCircleIcon, XIcon } from "lucide-react";
 import type { ComponentProps } from "react";
 import { ToolCallPart } from "@x/shared/dist/message.js";
 import z from "zod";
@@ -11,6 +17,8 @@ import z from "zod";
 export type PermissionRequestProps = ComponentProps<"div"> & {
   toolCall: z.infer<typeof ToolCallPart>;
   onApprove?: () => void;
+  onApproveSession?: () => void;
+  onApproveAlways?: () => void;
   onDeny?: () => void;
   isProcessing?: boolean;
   response?: 'approve' | 'deny' | null;
@@ -20,6 +28,8 @@ export const PermissionRequest = ({
   className,
   toolCall,
   onApprove,
+  onApproveSession,
+  onApproveAlways,
   onDeny,
   isProcessing = false,
   response = null,
@@ -117,16 +127,40 @@ export const PermissionRequest = ({
         </div>
         {!isResponded && (
           <div className="flex items-center gap-2 pt-2">
-            <Button
-              variant="default"
-              size="sm"
-              onClick={onApprove}
-              disabled={isProcessing}
-              className="flex-1"
-            >
-              <CheckIcon className="size-4" />
-              Approve
-            </Button>
+            <div className="flex flex-1 items-center">
+              <Button
+                variant="default"
+                size="sm"
+                onClick={onApprove}
+                disabled={isProcessing}
+                className={cn("flex-1", command && "rounded-r-none")}
+              >
+                <CheckIcon className="size-4" />
+                Approve
+              </Button>
+              {command && (
+                <DropdownMenu>
+                  <DropdownMenuTrigger asChild>
+                    <Button
+                      variant="default"
+                      size="sm"
+                      disabled={isProcessing}
+                      className="rounded-l-none border-l border-l-primary-foreground/20 px-1.5"
+                    >
+                      <ChevronDownIcon className="size-3.5" />
+                    </Button>
+                  </DropdownMenuTrigger>
+                  <DropdownMenuContent align="end">
+                    <DropdownMenuItem onClick={onApproveSession}>
+                      Allow for Session
+                    </DropdownMenuItem>
+                    <DropdownMenuItem onClick={onApproveAlways}>
+                      Always Allow
+                    </DropdownMenuItem>
+                  </DropdownMenuContent>
+                </DropdownMenu>
+              )}
+            </div>
             <Button
               variant="destructive"
               size="sm"
diff --git a/apps/x/apps/renderer/src/components/chat-sidebar.tsx b/apps/x/apps/renderer/src/components/chat-sidebar.tsx
index 05e498f7..170e8869 100644
--- a/apps/x/apps/renderer/src/components/chat-sidebar.tsx
+++ b/apps/x/apps/renderer/src/components/chat-sidebar.tsx
@@ -101,7 +101,7 @@ interface ChatSidebarProps {
   pendingAskHumanRequests?: ChatTabViewState['pendingAskHumanRequests']
   allPermissionRequests?: ChatTabViewState['allPermissionRequests']
   permissionResponses?: ChatTabViewState['permissionResponses']
-  onPermissionResponse?: (toolCallId: string, subflow: string[], response: PermissionResponse) => void
+  onPermissionResponse?: (toolCallId: string, subflow: string[], response: PermissionResponse, scope?: 'once' | 'session' | 'always') => void
   onAskHumanResponse?: (toolCallId: string, subflow: string[], response: string) => void
   isToolOpenForTab?: (tabId: string, toolId: string) => boolean
   onToolOpenChangeForTab?: (tabId: string, toolId: string, open: boolean) => void
@@ -450,6 +450,8 @@ export function ChatSidebar({
                                         <PermissionRequest
                                           toolCall={permRequest.toolCall}
                                           onApprove={() => onPermissionResponse(permRequest.toolCall.toolCallId, permRequest.subflow, 'approve')}
+                                          onApproveSession={() => onPermissionResponse(permRequest.toolCall.toolCallId, permRequest.subflow, 'approve', 'session')}
+                                          onApproveAlways={() => onPermissionResponse(permRequest.toolCall.toolCallId, permRequest.subflow, 'approve', 'always')}
                                           onDeny={() => onPermissionResponse(permRequest.toolCall.toolCallId, permRequest.subflow, 'deny')}
                                           isProcessing={isActive && isProcessing}
                                           response={response}
diff --git a/apps/x/packages/core/src/agents/runtime.ts b/apps/x/packages/core/src/agents/runtime.ts
index 4012e9b3..abeeb53a 100644
--- a/apps/x/packages/core/src/agents/runtime.ts
+++ b/apps/x/packages/core/src/agents/runtime.ts
@@ -12,7 +12,7 @@ import { execTool } from "../application/lib/exec-tool.js";
 import { AskHumanRequestEvent, RunEvent, ToolPermissionRequestEvent } from "@x/shared/dist/runs.js";
 import { BuiltinTools } from "../application/lib/builtin-tools.js";
 import { CopilotAgent } from "../application/assistant/agent.js";
-import { isBlocked } from "../application/lib/command-executor.js";
+import { isBlocked, extractCommandNames } from "../application/lib/command-executor.js";
 import container from "../di/container.js";
 import { IModelConfigRepo } from "../models/repo.js";
 import { createProvider } from "../models/models.js";
@@ -462,6 +462,7 @@ export class AgentState {
     pendingAskHumanRequests: Record<string, z.infer<typeof AskHumanRequestEvent>> = {};
     allowedToolCallIds: Record<string, true> = {};
     deniedToolCallIds: Record<string, true> = {};
+    sessionAllowedCommands: Set<string> = new Set();
 
     getPendingPermissions(): z.infer<typeof ToolPermissionRequestEvent>[] {
         const response: z.infer<typeof ToolPermissionRequestEvent>[] = [];
@@ -598,6 +599,16 @@ export class AgentState {
                 switch (event.response) {
                     case "approve":
                         this.allowedToolCallIds[event.toolCallId] = true;
+                        // For session scope, extract command names and add to session allowlist
+                        if (event.scope === "session") {
+                            const toolCall = this.toolCallIdMap[event.toolCallId];
+                            if (toolCall && typeof toolCall.arguments === 'object' && toolCall.arguments !== null && 'command' in toolCall.arguments) {
+                                const names = extractCommandNames(String(toolCall.arguments.command));
+                                for (const name of names) {
+                                    this.sessionAllowedCommands.add(name);
+                                }
+                            }
+                        }
                         break;
                     case "deny":
                         this.deniedToolCallIds[event.toolCallId] = true;
@@ -882,7 +893,7 @@ export async function* streamAgent({
                     }
                     if (underlyingTool.type === "builtin" && underlyingTool.name === "executeCommand") {
                         // if command is blocked, then seek permission
-                        if (isBlocked(part.arguments.command)) {
+                        if (isBlocked(part.arguments.command, state.sessionAllowedCommands)) {
                             loopLogger.log('emitting tool-permission-request, toolCallId:', part.toolCallId);
                             yield* processEvent({
                                 runId,
diff --git a/apps/x/packages/core/src/application/lib/command-executor.ts b/apps/x/packages/core/src/application/lib/command-executor.ts
index d16806b4..870f6a0c 100644
--- a/apps/x/packages/core/src/application/lib/command-executor.ts
+++ b/apps/x/packages/core/src/application/lib/command-executor.ts
@@ -3,15 +3,15 @@ import { promisify } from 'util';
 import { getSecurityAllowList } from '../../config/security.js';
 
 const execPromise = promisify(exec);
-const COMMAND_SPLIT_REGEX = /(?:\|\||&&|;|\||\n|`|\$\(|\))/;
+const COMMAND_SPLIT_REGEX = /(?:\|\||&&|;|\||\n|`|\$\(|\(|\))/;
 const ENV_ASSIGNMENT_REGEX = /^[A-Za-z_][A-Za-z0-9_]*=.*/;
 const WRAPPER_COMMANDS = new Set(['sudo', 'env', 'time', 'command']);
 
 function sanitizeToken(token: string): string {
-  return token.trim().replace(/^['"]+|['"]+$/g, '');
+  return token.trim().replace(/^['"()]+|['"()]+$/g, '');
 }
 
-function extractCommandNames(command: string): string[] {
+export function extractCommandNames(command: string): string[] {
   const discovered = new Set<string>();
   const segments = command.split(COMMAND_SPLIT_REGEX);
 
@@ -42,27 +42,21 @@ function extractCommandNames(command: string): string[] {
   return Array.from(discovered);
 }
 
-function findBlockedCommands(command: string): string[] {
+function findBlockedCommands(command: string, sessionAllowedCommands?: Set<string>): string[] {
   const invoked = extractCommandNames(command);
   if (!invoked.length) return [];
 
   const allowList = getSecurityAllowList();
-  if (!allowList.length) return invoked;
+  if (!allowList.length && (!sessionAllowedCommands || sessionAllowedCommands.size === 0)) return invoked;
 
   const allowSet = new Set(allowList);
   if (allowSet.has('*')) return [];
 
-  return invoked.filter((cmd) => !allowSet.has(cmd));
+  return invoked.filter((cmd) => !allowSet.has(cmd) && !sessionAllowedCommands?.has(cmd));
 }
 
-// export const BlockedResult = {
-//   stdout: '',
-//   stderr: `Command blocked by security policy. Update ${SECURITY_CONFIG_PATH} to allow them before retrying.`,
-//   exitCode: 126,
-// };
-
-export function isBlocked(command: string): boolean {
-  const blocked = findBlockedCommands(command);
+export function isBlocked(command: string, sessionAllowedCommands?: Set<string>): boolean {
+  const blocked = findBlockedCommands(command, sessionAllowedCommands);
   return blocked.length > 0;
 }
 
diff --git a/apps/x/packages/core/src/config/security.ts b/apps/x/packages/core/src/config/security.ts
index d69eb241..ac1afa58 100644
--- a/apps/x/packages/core/src/config/security.ts
+++ b/apps/x/packages/core/src/config/security.ts
@@ -20,6 +20,23 @@ const DEFAULT_ALLOW_LIST = [
 let cachedAllowList: string[] | null = null;
 let cachedMtimeMs: number | null = null;
 
+export async function addToSecurityConfig(commands: string[]): Promise<void> {
+    ensureSecurityConfigSync();
+    const current = readAllowList();
+    const merged = new Set(current);
+    for (const cmd of commands) {
+        const normalized = cmd.trim().toLowerCase();
+        if (normalized) merged.add(normalized);
+    }
+    await fsPromises.writeFile(
+        SECURITY_CONFIG_PATH,
+        JSON.stringify(Array.from(merged).sort(), null, 2) + "\n",
+        "utf8",
+    );
+    // Reset cache so next read picks up the new file
+    resetSecurityAllowListCache();
+}
+
 /**
  * Async function to ensure security config file exists.
  * Called explicitly at app startup via initConfigs().
@@ -102,11 +119,9 @@ export function getSecurityAllowList(): string[] {
         if (cachedAllowList && cachedMtimeMs === stats.mtimeMs) {
             return cachedAllowList;
         }
-
-        const allowList = readAllowList();
-        cachedAllowList = allowList;
+        cachedAllowList = readAllowList();
         cachedMtimeMs = stats.mtimeMs;
-        return allowList;
+        return cachedAllowList;
     } catch {
         cachedAllowList = null;
         cachedMtimeMs = null;
diff --git a/apps/x/packages/core/src/runs/runs.ts b/apps/x/packages/core/src/runs/runs.ts
index 490e935f..75f71d5f 100644
--- a/apps/x/packages/core/src/runs/runs.ts
+++ b/apps/x/packages/core/src/runs/runs.ts
@@ -1,13 +1,15 @@
 import z from "zod";
 import container from "../di/container.js";
 import { IMessageQueue } from "../application/lib/message-queue.js";
-import { AskHumanResponseEvent, ToolPermissionResponseEvent, CreateRunOptions, Run, ListRunsResponse, ToolPermissionAuthorizePayload, AskHumanResponsePayload } from "@x/shared/dist/runs.js";
+import { AskHumanResponseEvent, ToolPermissionRequestEvent, ToolPermissionResponseEvent, CreateRunOptions, Run, ListRunsResponse, ToolPermissionAuthorizePayload, AskHumanResponsePayload } from "@x/shared/dist/runs.js";
 import { IRunsRepo } from "./repo.js";
 import { IAgentRuntime } from "../agents/runtime.js";
 import { IBus } from "../application/lib/bus.js";
 import { IAbortRegistry } from "./abort-registry.js";
 import { IRunsLock } from "./lock.js";
 import { forceCloseAllMcpClients } from "../mcp/mcp.js";
+import { extractCommandNames } from "../application/lib/command-executor.js";
+import { addToSecurityConfig } from "../config/security.js";
 
 export async function createRun(opts: z.infer<typeof CreateRunOptions>): Promise<z.infer<typeof Run>> {
     const repo = container.resolve<IRunsRepo>('runsRepo');
@@ -26,11 +28,32 @@ export async function createMessage(runId: string, message: string): Promise<str
 }
 
 export async function authorizePermission(runId: string, ev: z.infer<typeof ToolPermissionAuthorizePayload>): Promise<void> {
+    const { scope, ...rest } = ev;
+
+    // For "always" scope, derive command from the run log and persist to security config
+    if (rest.response === "approve" && scope === "always") {
+        const repo = container.resolve<IRunsRepo>('runsRepo');
+        const run = await repo.fetch(runId);
+        const permReqEvent = run.log.find(
+            (e): e is z.infer<typeof ToolPermissionRequestEvent> =>
+                e.type === "tool-permission-request"
+                && e.toolCall.toolCallId === rest.toolCallId
+                && JSON.stringify(e.subflow) === JSON.stringify(rest.subflow)
+        );
+        if (permReqEvent && typeof permReqEvent.toolCall.arguments === 'object' && permReqEvent.toolCall.arguments !== null && 'command' in permReqEvent.toolCall.arguments) {
+            const commandNames = extractCommandNames(String(permReqEvent.toolCall.arguments.command));
+            if (commandNames.length > 0) {
+                await addToSecurityConfig(commandNames);
+            }
+        }
+    }
+
     const repo = container.resolve<IRunsRepo>('runsRepo');
     const event: z.infer<typeof ToolPermissionResponseEvent> = {
-        ...ev,
+        ...rest,
         runId,
         type: "tool-permission-response",
+        scope,
     };
     await repo.appendEvents(runId, [event]);
     const runtime = container.resolve<IAgentRuntime>('agentRuntime');
diff --git a/apps/x/packages/shared/src/runs.ts b/apps/x/packages/shared/src/runs.ts
index eccfb6a7..5f52f611 100644
--- a/apps/x/packages/shared/src/runs.ts
+++ b/apps/x/packages/shared/src/runs.ts
@@ -73,6 +73,7 @@ export const ToolPermissionResponseEvent = BaseRunEvent.extend({
     type: z.literal("tool-permission-response"),
     toolCallId: z.string(),
     response: z.enum(["approve", "deny"]),
+    scope: z.enum(["once", "session", "always"]).optional(),
 });
 
 export const RunErrorEvent = BaseRunEvent.extend({
@@ -106,6 +107,7 @@ export const ToolPermissionAuthorizePayload = ToolPermissionResponseEvent.pick({
     subflow: true,
     toolCallId: true,
     response: true,
+    scope: true,
 });
 
 export const AskHumanResponsePayload = AskHumanResponseEvent.pick({

From 9de0b4aea2b90a8d1114fa26d8ee6ff720941ccb Mon Sep 17 00:00:00 2001
From: tusharmagar <tushmag@gmail.com>
Date: Tue, 24 Feb 2026 19:03:22 +0530
Subject: [PATCH 29/36] Refactor file naming logic

---
 apps/x/apps/renderer/src/App.tsx | 82 ++++++++++++++++++--------------
 1 file changed, 46 insertions(+), 36 deletions(-)

diff --git a/apps/x/apps/renderer/src/App.tsx b/apps/x/apps/renderer/src/App.tsx
index dca1acac..afe5b36e 100644
--- a/apps/x/apps/renderer/src/App.tsx
+++ b/apps/x/apps/renderer/src/App.tsx
@@ -107,6 +107,10 @@ const clampNumber = (value: number, min: number, max: number) =>
   Math.min(max, Math.max(min, value))
 
 const untitledBaseName = 'untitled'
+const untitledIndexedNamePattern = /^untitled-\d+$/
+
+const isUntitledPlaceholderName = (name: string) =>
+  name === untitledBaseName || untitledIndexedNamePattern.test(name)
 
 const getHeadingTitle = (markdown: string) => {
   const lines = markdown.split('\n')
@@ -848,46 +852,52 @@ function App() {
 	      let renamedTo: string | null = null
 	      try {
 	        // Only rename the currently active file (avoids renaming/jumping while user switches rapidly)
-	        if (
-	          wasActiveAtStart &&
-	          selectedPathRef.current === pathAtStart &&
+        if (
+          wasActiveAtStart &&
+          selectedPathRef.current === pathAtStart &&
           !renameInProgressRef.current &&
           pathAtStart.startsWith('knowledge/')
         ) {
-          const headingTitle = getHeadingTitle(debouncedContent)
-          const desiredName = headingTitle ? sanitizeHeadingForFilename(headingTitle) : null
           const currentBase = getBaseName(pathAtStart)
-          if (desiredName && desiredName !== currentBase) {
-            const parentDir = pathAtStart.split('/').slice(0, -1).join('/')
-            const targetPath = `${parentDir}/${desiredName}.md`
-            if (targetPath !== pathAtStart) {
-              const exists = await window.ipc.invoke('workspace:exists', { path: targetPath })
-		              if (!exists.exists) {
-		                renameInProgressRef.current = true
-		                await window.ipc.invoke('workspace:rename', { from: pathAtStart, to: targetPath })
-		                pathToSave = targetPath
-		                renamedFrom = pathAtStart
-		                renamedTo = targetPath
-		                editorPathRef.current = targetPath
-		                setFileTabs(prev => prev.map(tab => (tab.path === pathAtStart ? { ...tab, path: targetPath } : tab)))
-		                initialContentByPathRef.current.delete(pathAtStart)
-		                const cachedContent = editorContentByPathRef.current.get(pathAtStart)
-		                if (cachedContent !== undefined) {
-		                  editorContentByPathRef.current.delete(pathAtStart)
-		                  editorContentByPathRef.current.set(targetPath, cachedContent)
-		                  setEditorContentByPath((prev) => {
-		                    const oldContent = prev[pathAtStart]
-		                    if (oldContent === undefined) return prev
-		                    const next = { ...prev }
-		                    delete next[pathAtStart]
-		                    next[targetPath] = oldContent
-		                    return next
-		                  })
-		                }
-		              }
-		            }
-		          }
-		        }
+          if (isUntitledPlaceholderName(currentBase)) {
+            const headingTitle = getHeadingTitle(debouncedContent)
+            const desiredName = headingTitle ? sanitizeHeadingForFilename(headingTitle) : null
+            if (desiredName && desiredName !== currentBase) {
+              const parentDir = pathAtStart.split('/').slice(0, -1).join('/')
+              let targetPath = `${parentDir}/${desiredName}.md`
+              if (targetPath !== pathAtStart) {
+                let suffix = 1
+                while (true) {
+                  const exists = await window.ipc.invoke('workspace:exists', { path: targetPath })
+                  if (!exists.exists) break
+                  targetPath = `${parentDir}/${desiredName}-${suffix}.md`
+                  suffix += 1
+                }
+                renameInProgressRef.current = true
+                await window.ipc.invoke('workspace:rename', { from: pathAtStart, to: targetPath })
+                pathToSave = targetPath
+                renamedFrom = pathAtStart
+                renamedTo = targetPath
+                editorPathRef.current = targetPath
+                setFileTabs(prev => prev.map(tab => (tab.path === pathAtStart ? { ...tab, path: targetPath } : tab)))
+                initialContentByPathRef.current.delete(pathAtStart)
+                const cachedContent = editorContentByPathRef.current.get(pathAtStart)
+                if (cachedContent !== undefined) {
+                  editorContentByPathRef.current.delete(pathAtStart)
+                  editorContentByPathRef.current.set(targetPath, cachedContent)
+                  setEditorContentByPath((prev) => {
+                    const oldContent = prev[pathAtStart]
+                    if (oldContent === undefined) return prev
+                    const next = { ...prev }
+                    delete next[pathAtStart]
+                    next[targetPath] = oldContent
+                    return next
+                  })
+                }
+              }
+            }
+          }
+        }
 	        await window.ipc.invoke('workspace:writeFile', {
 	          path: pathToSave,
 	          data: debouncedContent,

From 34792e9c19ef74a562bd4a961b66209ac58157c1 Mon Sep 17 00:00:00 2001
From: tusharmagar <tushmag@gmail.com>
Date: Tue, 24 Feb 2026 20:20:52 +0530
Subject: [PATCH 30/36] Enhance wiki link handling during file renaming

---
 apps/x/apps/renderer/src/lib/wiki-links.ts    |   3 +-
 .../core/src/workspace/wiki-link-rewrite.ts   | 148 ++++++++++++++++++
 .../packages/core/src/workspace/workspace.ts  |  22 ++-
 3 files changed, 170 insertions(+), 3 deletions(-)
 create mode 100644 apps/x/packages/core/src/workspace/wiki-link-rewrite.ts

diff --git a/apps/x/apps/renderer/src/lib/wiki-links.ts b/apps/x/apps/renderer/src/lib/wiki-links.ts
index 4b429a05..0e376cc9 100644
--- a/apps/x/apps/renderer/src/lib/wiki-links.ts
+++ b/apps/x/apps/renderer/src/lib/wiki-links.ts
@@ -9,8 +9,7 @@ export const normalizeWikiPath = (input: string) => {
 }
 
 export const ensureMarkdownExtension = (path: string) => {
-  const lastSegment = path.split('/').pop() ?? path
-  if (lastSegment.includes('.')) return path
+  if (path.toLowerCase().endsWith('.md')) return path
   return `${path}.md`
 }
 
diff --git a/apps/x/packages/core/src/workspace/wiki-link-rewrite.ts b/apps/x/packages/core/src/workspace/wiki-link-rewrite.ts
new file mode 100644
index 00000000..68edbb9a
--- /dev/null
+++ b/apps/x/packages/core/src/workspace/wiki-link-rewrite.ts
@@ -0,0 +1,148 @@
+import fs from 'node:fs/promises';
+import path from 'node:path';
+
+const WIKI_LINK_REGEX = /\[\[([^[\]]+)\]\]/g;
+const KNOWLEDGE_PREFIX = 'knowledge/';
+const MARKDOWN_EXTENSION = '.md';
+
+function normalizeRelPath(relPath: string): string {
+  return relPath.replace(/\\/g, '/');
+}
+
+function isKnowledgeMarkdownPath(relPath: string): boolean {
+  const normalized = normalizeRelPath(relPath).replace(/^\/+/, '');
+  const lower = normalized.toLowerCase();
+  return lower.startsWith(KNOWLEDGE_PREFIX) && lower.endsWith(MARKDOWN_EXTENSION);
+}
+
+function stripKnowledgePrefix(relPath: string): string {
+  const normalized = normalizeRelPath(relPath).replace(/^\/+/, '');
+  if (!normalized.toLowerCase().startsWith(KNOWLEDGE_PREFIX)) return normalized;
+  return normalized.slice(KNOWLEDGE_PREFIX.length);
+}
+
+function stripMarkdownExtension(wikiPath: string): string {
+  return wikiPath.toLowerCase().endsWith(MARKDOWN_EXTENSION)
+    ? wikiPath.slice(0, -MARKDOWN_EXTENSION.length)
+    : wikiPath;
+}
+
+function toWikiPathCompareKey(wikiPath: string): string {
+  return stripMarkdownExtension(wikiPath).toLowerCase();
+}
+
+function splitWikiPathPrefix(rawPath: string): { pathWithoutPrefix: string; hadKnowledgePrefix: boolean } {
+  let normalized = rawPath.trim().replace(/^\/+/, '').replace(/^\.\//, '');
+  const hadKnowledgePrefix = /^knowledge\//i.test(normalized);
+  if (hadKnowledgePrefix) {
+    normalized = normalized.slice(KNOWLEDGE_PREFIX.length);
+  }
+  return { pathWithoutPrefix: normalized, hadKnowledgePrefix };
+}
+
+function rewriteWikiLinksInMarkdown(markdown: string, fromWikiPath: string, toWikiPath: string): string {
+  const fromCompareKey = toWikiPathCompareKey(fromWikiPath);
+  const toWikiPathWithoutExtension = stripMarkdownExtension(toWikiPath);
+
+  return markdown.replace(WIKI_LINK_REGEX, (fullMatch, innerRaw: string) => {
+    const pipeIndex = innerRaw.indexOf('|');
+    const pathAndAnchor = pipeIndex >= 0 ? innerRaw.slice(0, pipeIndex) : innerRaw;
+    const aliasSuffix = pipeIndex >= 0 ? innerRaw.slice(pipeIndex) : '';
+
+    const hashIndex = pathAndAnchor.indexOf('#');
+    const pathPart = hashIndex >= 0 ? pathAndAnchor.slice(0, hashIndex) : pathAndAnchor;
+    const anchorSuffix = hashIndex >= 0 ? pathAndAnchor.slice(hashIndex) : '';
+
+    const leadingWhitespace = pathPart.match(/^\s*/)?.[0] ?? '';
+    const trailingWhitespace = pathPart.match(/\s*$/)?.[0] ?? '';
+    const rawPath = pathPart.trim();
+    if (!rawPath) return fullMatch;
+
+    const { pathWithoutPrefix, hadKnowledgePrefix } = splitWikiPathPrefix(rawPath);
+    if (!pathWithoutPrefix) return fullMatch;
+
+    if (toWikiPathCompareKey(pathWithoutPrefix) !== fromCompareKey) {
+      return fullMatch;
+    }
+
+    const preserveMarkdownExtension = rawPath.toLowerCase().endsWith(MARKDOWN_EXTENSION);
+    const rewrittenPath = preserveMarkdownExtension ? toWikiPath : toWikiPathWithoutExtension;
+    const finalPath = hadKnowledgePrefix ? `${KNOWLEDGE_PREFIX}${rewrittenPath}` : rewrittenPath;
+
+    return `[[${leadingWhitespace}${finalPath}${trailingWhitespace}${anchorSuffix}${aliasSuffix}]]`;
+  });
+}
+
+async function collectKnowledgeMarkdownFiles(workspaceRoot: string): Promise<string[]> {
+  const knowledgeRoot = path.join(workspaceRoot, 'knowledge');
+  try {
+    const stat = await fs.lstat(knowledgeRoot);
+    if (!stat.isDirectory()) return [];
+  } catch {
+    return [];
+  }
+
+  const markdownFiles: string[] = [];
+  const pendingDirectories: string[] = [knowledgeRoot];
+
+  while (pendingDirectories.length > 0) {
+    const currentDirectory = pendingDirectories.pop();
+    if (!currentDirectory) continue;
+
+    const entries = await fs.readdir(currentDirectory, { withFileTypes: true });
+    for (const entry of entries) {
+      if (entry.name.startsWith('.')) continue;
+
+      const absolutePath = path.join(currentDirectory, entry.name);
+      if (entry.isDirectory()) {
+        pendingDirectories.push(absolutePath);
+        continue;
+      }
+      if (!entry.isFile()) continue;
+      if (!entry.name.toLowerCase().endsWith(MARKDOWN_EXTENSION)) continue;
+
+      const relativePath = normalizeRelPath(path.relative(workspaceRoot, absolutePath));
+      markdownFiles.push(relativePath);
+    }
+  }
+
+  return markdownFiles;
+}
+
+export async function rewriteWikiLinksForRenamedKnowledgeFile(
+  workspaceRoot: string,
+  fromRelPath: string,
+  toRelPath: string
+): Promise<number> {
+  const normalizedFrom = normalizeRelPath(fromRelPath);
+  const normalizedTo = normalizeRelPath(toRelPath);
+
+  if (!isKnowledgeMarkdownPath(normalizedFrom) || !isKnowledgeMarkdownPath(normalizedTo)) {
+    return 0;
+  }
+
+  const fromWikiPath = stripKnowledgePrefix(normalizedFrom);
+  const toWikiPath = stripKnowledgePrefix(normalizedTo);
+  if (toWikiPathCompareKey(fromWikiPath) === toWikiPathCompareKey(toWikiPath)) return 0;
+
+  const markdownFiles = await collectKnowledgeMarkdownFiles(workspaceRoot);
+  let rewrittenFiles = 0;
+
+  for (const relativePath of markdownFiles) {
+    const absolutePath = path.join(workspaceRoot, ...relativePath.split('/'));
+    try {
+      const markdown = await fs.readFile(absolutePath, 'utf8');
+      if (!markdown.includes('[[')) continue;
+
+      const rewritten = rewriteWikiLinksInMarkdown(markdown, fromWikiPath, toWikiPath);
+      if (rewritten === markdown) continue;
+
+      await fs.writeFile(absolutePath, rewritten, 'utf8');
+      rewrittenFiles += 1;
+    } catch (error) {
+      console.error('Failed to rewrite wiki links in file:', relativePath, error);
+    }
+  }
+
+  return rewrittenFiles;
+}
diff --git a/apps/x/packages/core/src/workspace/workspace.ts b/apps/x/packages/core/src/workspace/workspace.ts
index 59910bdb..cd872f39 100644
--- a/apps/x/packages/core/src/workspace/workspace.ts
+++ b/apps/x/packages/core/src/workspace/workspace.ts
@@ -5,6 +5,7 @@ import { workspace } from '@x/shared';
 import { z } from 'zod';
 import { RemoveOptions, WriteFileOptions, WriteFileResult } from 'packages/shared/dist/workspace.js';
 import { WorkDir } from '../config/config.js';
+import { rewriteWikiLinksForRenamedKnowledgeFile } from './wiki-link-rewrite.js';
 
 // ============================================================================
 // Path Utilities
@@ -58,6 +59,11 @@ export function absToRelPosix(absPath: string): string | null {
   return relPath.split(path.sep).join('/');
 }
 
+function isKnowledgeMarkdownRelPath(relPath: string): boolean {
+  const normalized = relPath.replace(/\\/g, '/').replace(/^\/+/, '').toLowerCase();
+  return normalized.startsWith('knowledge/') && normalized.endsWith('.md');
+}
+
 // ============================================================================
 // File System Utilities
 // ============================================================================
@@ -286,6 +292,7 @@ export async function rename(
 
   // Check if source exists
   await fs.access(fromPath);
+  const fromStats = await fs.lstat(fromPath);
 
   // Check if destination exists (only if overwrite is false)
   if (!overwrite) {
@@ -309,6 +316,19 @@ export async function rename(
   await fs.mkdir(path.dirname(toPath), { recursive: true });
 
   await fs.rename(fromPath, toPath);
+
+  if (
+    fromStats.isFile()
+    && isKnowledgeMarkdownRelPath(from)
+    && isKnowledgeMarkdownRelPath(to)
+  ) {
+    try {
+      await rewriteWikiLinksForRenamedKnowledgeFile(WorkDir, from, to);
+    } catch (error) {
+      console.error('Failed to rewrite wiki backlinks after file rename:', error);
+    }
+  }
+
   return { ok: true as const };
 }
 
@@ -383,4 +403,4 @@ export async function remove(
   }
 
   return { ok: true as const };
-}
\ No newline at end of file
+}

From a3e74931bf8f80c38b3c1472fe68a051f4a83ff9 Mon Sep 17 00:00:00 2001
From: tusharmagar <tushmag@gmail.com>
Date: Tue, 24 Feb 2026 20:47:51 +0530
Subject: [PATCH 31/36] Implement enhanced wiki link rewriting and cache
 invalidation for renamed files

---
 apps/x/apps/renderer/src/App.tsx              | 221 ++++++++++++++----
 .../src/components/markdown-editor.tsx        |  14 +-
 .../core/src/workspace/wiki-link-rewrite.ts   |  30 ++-
 3 files changed, 218 insertions(+), 47 deletions(-)

diff --git a/apps/x/apps/renderer/src/App.tsx b/apps/x/apps/renderer/src/App.tsx
index afe5b36e..4f8859ef 100644
--- a/apps/x/apps/renderer/src/App.tsx
+++ b/apps/x/apps/renderer/src/App.tsx
@@ -138,6 +138,86 @@ const getBaseName = (path: string) => {
   return file.replace(/\.md$/i, '')
 }
 
+const WIKI_LINK_TOKEN_REGEX = /\[\[([^[\]]+)\]\]/g
+const KNOWLEDGE_PREFIX = 'knowledge/'
+
+const normalizeRelPathForWiki = (relPath: string) =>
+  relPath.replace(/\\/g, '/').replace(/^\/+/, '')
+
+const stripKnowledgePrefixForWiki = (relPath: string) => {
+  const normalized = normalizeRelPathForWiki(relPath)
+  return normalized.toLowerCase().startsWith(KNOWLEDGE_PREFIX)
+    ? normalized.slice(KNOWLEDGE_PREFIX.length)
+    : normalized
+}
+
+const stripMarkdownExtensionForWiki = (wikiPath: string) =>
+  wikiPath.toLowerCase().endsWith('.md') ? wikiPath.slice(0, -3) : wikiPath
+
+const wikiPathCompareKey = (wikiPath: string) =>
+  stripMarkdownExtensionForWiki(wikiPath).toLowerCase()
+
+const splitWikiPathPrefix = (rawPath: string) => {
+  let normalized = rawPath.trim().replace(/^\/+/, '').replace(/^\.\//, '')
+  const hadKnowledgePrefix = /^knowledge\//i.test(normalized)
+  if (hadKnowledgePrefix) {
+    normalized = normalized.slice(KNOWLEDGE_PREFIX.length)
+  }
+  return { pathWithoutPrefix: normalized, hadKnowledgePrefix }
+}
+
+const rewriteWikiLinksForRenamedFileInMarkdown = (
+  markdown: string,
+  fromRelPath: string,
+  toRelPath: string
+) => {
+  const normalizedFrom = normalizeRelPathForWiki(fromRelPath)
+  const normalizedTo = normalizeRelPathForWiki(toRelPath)
+  const lowerFrom = normalizedFrom.toLowerCase()
+  const lowerTo = normalizedTo.toLowerCase()
+  if (!lowerFrom.startsWith(KNOWLEDGE_PREFIX) || !lowerFrom.endsWith('.md')) return markdown
+  if (!lowerTo.startsWith(KNOWLEDGE_PREFIX) || !lowerTo.endsWith('.md')) return markdown
+
+  const fromWikiPath = stripKnowledgePrefixForWiki(normalizedFrom)
+  const toWikiPath = stripKnowledgePrefixForWiki(normalizedTo)
+  const fromCompareKey = wikiPathCompareKey(fromWikiPath)
+  const fromBaseName = stripMarkdownExtensionForWiki(fromWikiPath).split('/').pop()?.toLowerCase() ?? null
+  const toWikiPathWithoutExtension = stripMarkdownExtensionForWiki(toWikiPath)
+  const toBaseName = toWikiPathWithoutExtension.split('/').pop() ?? toWikiPathWithoutExtension
+
+  return markdown.replace(WIKI_LINK_TOKEN_REGEX, (fullMatch, innerRaw: string) => {
+    const pipeIndex = innerRaw.indexOf('|')
+    const pathAndAnchor = pipeIndex >= 0 ? innerRaw.slice(0, pipeIndex) : innerRaw
+    const aliasSuffix = pipeIndex >= 0 ? innerRaw.slice(pipeIndex) : ''
+
+    const hashIndex = pathAndAnchor.indexOf('#')
+    const pathPart = hashIndex >= 0 ? pathAndAnchor.slice(0, hashIndex) : pathAndAnchor
+    const anchorSuffix = hashIndex >= 0 ? pathAndAnchor.slice(hashIndex) : ''
+
+    const leadingWhitespace = pathPart.match(/^\s*/)?.[0] ?? ''
+    const trailingWhitespace = pathPart.match(/\s*$/)?.[0] ?? ''
+    const rawPath = pathPart.trim()
+    if (!rawPath) return fullMatch
+
+    const { pathWithoutPrefix, hadKnowledgePrefix } = splitWikiPathPrefix(rawPath)
+    if (!pathWithoutPrefix) return fullMatch
+
+    const matchesFullPath = wikiPathCompareKey(pathWithoutPrefix) === fromCompareKey
+    const isBareTarget = !pathWithoutPrefix.includes('/')
+    const targetBaseName = stripMarkdownExtensionForWiki(pathWithoutPrefix).toLowerCase()
+    const matchesBareSelfName = Boolean(fromBaseName && isBareTarget && targetBaseName === fromBaseName)
+    if (!matchesFullPath && !matchesBareSelfName) return fullMatch
+
+    const preserveMarkdownExtension = rawPath.toLowerCase().endsWith('.md')
+    const rewrittenTarget = matchesBareSelfName
+      ? (preserveMarkdownExtension ? `${toBaseName}.md` : toBaseName)
+      : (preserveMarkdownExtension ? toWikiPath : toWikiPathWithoutExtension)
+    const finalPath = hadKnowledgePrefix ? `${KNOWLEDGE_PREFIX}${rewrittenTarget}` : rewrittenTarget
+
+    return `[[${leadingWhitespace}${finalPath}${trailingWhitespace}${anchorSuffix}${aliasSuffix}]]`
+  })
+}
+
 const getAncestorDirectoryPaths = (path: string): string[] => {
   const parts = path.split('/').filter(Boolean)
   if (parts.length <= 2) return []
@@ -720,15 +800,44 @@ function App() {
 
       const changedPath = event.type === 'changed' ? event.path : null
       const changedPaths = (event.type === 'bulkChanged' ? event.paths : []) ?? []
+      const eventPaths = (() => {
+        if (event.type === 'changed') return [event.path]
+        if (event.type === 'bulkChanged') return event.paths ?? []
+        if (event.type === 'moved') return [event.from, event.to]
+        if (event.type === 'created' || event.type === 'deleted') return [event.path]
+        return []
+      })()
+      const selectedPathAtEvent = selectedPathRef.current
 
       // Reload background tasks if agent-schedule.json changed
-      if (changedPath === 'config/agent-schedule.json' || changedPaths.includes('config/agent-schedule.json')) {
+      if (
+        changedPath === 'config/agent-schedule.json'
+        || changedPaths.includes('config/agent-schedule.json')
+      ) {
         loadBackgroundTasks()
       }
 
+      // Invalidate cached content for files changed outside the active editor.
+      // This prevents stale backlinks after rename-rewrite passes touch many files.
+      for (const path of eventPaths) {
+        if (!path.endsWith('.md')) continue
+        if (selectedPathAtEvent && path === selectedPathAtEvent) continue
+        removeEditorCacheForPath(path)
+        initialContentByPathRef.current.delete(path)
+      }
+
+      // Keep selection stable if a file is moved externally.
+      if (
+        event.type === 'moved'
+        && selectedPathAtEvent
+        && event.from === selectedPathAtEvent
+      ) {
+        setSelectedPath(event.to)
+      }
+
       // Reload current file if it was changed externally
-      if (!selectedPath) return
-      const pathToReload = selectedPath
+      if (!selectedPathAtEvent) return
+      const pathToReload = selectedPathAtEvent
 
       const isCurrentFileChanged =
         changedPath === pathToReload || changedPaths.includes(pathToReload)
@@ -736,7 +845,7 @@ function App() {
       if (isCurrentFileChanged) {
         // Only reload if no unsaved edits
         const baseline = initialContentByPathRef.current.get(pathToReload) ?? initialContentRef.current
-        if (editorContent === baseline) {
+        if (editorContentRef.current === baseline) {
           const result = await window.ipc.invoke('workspace:readFile', { path: pathToReload })
           if (selectedPathRef.current !== pathToReload) return
           setFileContent(result.data)
@@ -751,7 +860,7 @@ function App() {
     })
     return cleanup
     // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [loadDirectory, selectedPath, editorContent, setEditorCacheForPath])
+  }, [loadDirectory, removeEditorCacheForPath, setEditorCacheForPath])
 
   // Load file content when selected
   useEffect(() => {
@@ -844,14 +953,15 @@ function App() {
     if (debouncedContent === baseline) return
     if (!debouncedContent) return
 
-	    const saveFile = async () => {
-	      const wasActiveAtStart = selectedPathRef.current === pathAtStart
-	      if (wasActiveAtStart) setIsSaving(true)
-	      let pathToSave = pathAtStart
-	      let renamedFrom: string | null = null
-	      let renamedTo: string | null = null
-	      try {
-	        // Only rename the currently active file (avoids renaming/jumping while user switches rapidly)
+    const saveFile = async () => {
+      const wasActiveAtStart = selectedPathRef.current === pathAtStart
+      if (wasActiveAtStart) setIsSaving(true)
+      let pathToSave = pathAtStart
+      let contentToSave = debouncedContent
+      let renamedFrom: string | null = null
+      let renamedTo: string | null = null
+      try {
+        // Only rename the currently active file (avoids renaming/jumping while user switches rapidly)
         if (
           wasActiveAtStart &&
           selectedPathRef.current === pathAtStart &&
@@ -876,6 +986,11 @@ function App() {
                 renameInProgressRef.current = true
                 await window.ipc.invoke('workspace:rename', { from: pathAtStart, to: targetPath })
                 pathToSave = targetPath
+                contentToSave = rewriteWikiLinksForRenamedFileInMarkdown(
+                  debouncedContent,
+                  pathAtStart,
+                  targetPath
+                )
                 renamedFrom = pathAtStart
                 renamedTo = targetPath
                 editorPathRef.current = targetPath
@@ -883,48 +998,61 @@ function App() {
                 initialContentByPathRef.current.delete(pathAtStart)
                 const cachedContent = editorContentByPathRef.current.get(pathAtStart)
                 if (cachedContent !== undefined) {
+                  const rewrittenCachedContent = rewriteWikiLinksForRenamedFileInMarkdown(
+                    cachedContent,
+                    pathAtStart,
+                    targetPath
+                  )
                   editorContentByPathRef.current.delete(pathAtStart)
-                  editorContentByPathRef.current.set(targetPath, cachedContent)
+                  editorContentByPathRef.current.set(targetPath, rewrittenCachedContent)
                   setEditorContentByPath((prev) => {
                     const oldContent = prev[pathAtStart]
                     if (oldContent === undefined) return prev
                     const next = { ...prev }
                     delete next[pathAtStart]
-                    next[targetPath] = oldContent
+                    next[targetPath] = rewriteWikiLinksForRenamedFileInMarkdown(
+                      oldContent,
+                      pathAtStart,
+                      targetPath
+                    )
                     return next
                   })
                 }
+                if (selectedPathRef.current === pathAtStart) {
+                  editorContentRef.current = contentToSave
+                  setEditorContent(contentToSave)
+                }
               }
             }
           }
         }
-	        await window.ipc.invoke('workspace:writeFile', {
-	          path: pathToSave,
-	          data: debouncedContent,
-	          opts: { encoding: 'utf8' }
-	        })
-	        initialContentByPathRef.current.set(pathToSave, debouncedContent)
+        await window.ipc.invoke('workspace:writeFile', {
+          path: pathToSave,
+          data: contentToSave,
+          opts: { encoding: 'utf8' }
+        })
+        initialContentByPathRef.current.set(pathToSave, contentToSave)
 
-	        // If we renamed the active file, update state/history AFTER the write completes so the editor
-	        // doesn't reload stale on-disk content mid-typing (which can drop the latest character).
-	        if (renamedFrom && renamedTo) {
-	          const fromPath = renamedFrom
-	          const toPath = renamedTo
-	          const replaceRenamedPath = (stack: ViewState[]) =>
-	            stack.map((v) => (v.type === 'file' && v.path === fromPath ? ({ type: 'file', path: toPath } satisfies ViewState) : v))
-	          setHistory({
-	            back: replaceRenamedPath(historyRef.current.back),
-	            forward: replaceRenamedPath(historyRef.current.forward),
-	          })
+        // If we renamed the active file, update state/history AFTER the write completes so the editor
+        // doesn't reload stale on-disk content mid-typing (which can drop the latest character).
+        if (renamedFrom && renamedTo) {
+          const fromPath = renamedFrom
+          const toPath = renamedTo
+          const replaceRenamedPath = (stack: ViewState[]) =>
+            stack.map((v) => (v.type === 'file' && v.path === fromPath ? ({ type: 'file', path: toPath } satisfies ViewState) : v))
+          setHistory({
+            back: replaceRenamedPath(historyRef.current.back),
+            forward: replaceRenamedPath(historyRef.current.forward),
+          })
 
-	          if (selectedPathRef.current === fromPath) {
-	            setSelectedPath(toPath)
-	          }
-	        }
+          if (selectedPathRef.current === fromPath) {
+            setSelectedPath(toPath)
+          }
+        }
 
-	        // Only update "current file" UI state if we're still on this file
-	        if (selectedPathRef.current === pathAtStart || selectedPathRef.current === pathToSave) {
-	          initialContentRef.current = debouncedContent
+        // Only update "current file" UI state if we're still on this file
+        if (selectedPathRef.current === pathAtStart || selectedPathRef.current === pathToSave) {
+          initialContentRef.current = contentToSave
           setLastSaved(new Date())
         }
       } catch (err) {
@@ -2426,6 +2554,8 @@ function App() {
         parts[parts.length - 1] = finalName
         const newPath = parts.join('/')
         await window.ipc.invoke('workspace:rename', { from: oldPath, to: newPath })
+        const rewriteForRename = (content: string) =>
+          isDir ? content : rewriteWikiLinksForRenamedFileInMarkdown(content, oldPath, newPath)
         setFileTabs(prev => prev.map(tab => (tab.path === oldPath ? { ...tab, path: newPath } : tab)))
         if (editorPathRef.current === oldPath) {
           editorPathRef.current = newPath
@@ -2433,20 +2563,27 @@ function App() {
         const baseline = initialContentByPathRef.current.get(oldPath)
         if (baseline !== undefined) {
           initialContentByPathRef.current.delete(oldPath)
-          initialContentByPathRef.current.set(newPath, baseline)
+          initialContentByPathRef.current.set(newPath, rewriteForRename(baseline))
         }
         const cachedContent = editorContentByPathRef.current.get(oldPath)
         if (cachedContent !== undefined) {
+          const rewrittenCachedContent = rewriteForRename(cachedContent)
           editorContentByPathRef.current.delete(oldPath)
-          editorContentByPathRef.current.set(newPath, cachedContent)
+          editorContentByPathRef.current.set(newPath, rewrittenCachedContent)
           setEditorContentByPath(prev => {
             if (!(oldPath in prev)) return prev
             const next = { ...prev }
             delete next[oldPath]
-            next[newPath] = cachedContent
+            next[newPath] = rewriteForRename(cachedContent)
             return next
           })
         }
+        if (selectedPath === oldPath) {
+          const rewrittenEditorContent = rewriteForRename(editorContentRef.current)
+          editorContentRef.current = rewrittenEditorContent
+          setEditorContent(rewrittenEditorContent)
+          initialContentRef.current = rewriteForRename(initialContentRef.current)
+        }
         if (selectedPath === oldPath) setSelectedPath(newPath)
       } catch (err) {
         console.error('Failed to rename:', err)
diff --git a/apps/x/apps/renderer/src/components/markdown-editor.tsx b/apps/x/apps/renderer/src/components/markdown-editor.tsx
index f05fcdb5..74ad10b8 100644
--- a/apps/x/apps/renderer/src/components/markdown-editor.tsx
+++ b/apps/x/apps/renderer/src/components/markdown-editor.tsx
@@ -52,7 +52,16 @@ function getMarkdownWithBlankLines(editor: Editor): string {
   const blocks: string[] = []
 
   // Helper to convert a node to markdown text
-  const nodeToText = (node: { type?: string; content?: Array<{ type?: string; text?: string; marks?: Array<{ type: string; attrs?: Record<string, unknown> }> }>; attrs?: Record<string, unknown> }): string => {
+  const nodeToText = (node: {
+    type?: string
+    content?: Array<{
+      type?: string
+      text?: string
+      marks?: Array<{ type: string; attrs?: Record<string, unknown> }>
+      attrs?: Record<string, unknown>
+    }>
+    attrs?: Record<string, unknown>
+  }): string => {
     if (!node.content) return ''
     return node.content.map(child => {
       if (child.type === 'text') {
@@ -67,6 +76,9 @@ function getMarkdownWithBlankLines(editor: Editor): string {
           }
         }
         return text
+      } else if (child.type === 'wikiLink') {
+        const path = (child.attrs?.path as string) || ''
+        return path ? `[[${path}]]` : ''
       } else if (child.type === 'hardBreak') {
         return '\n'
       }
diff --git a/apps/x/packages/core/src/workspace/wiki-link-rewrite.ts b/apps/x/packages/core/src/workspace/wiki-link-rewrite.ts
index 68edbb9a..fc451c7a 100644
--- a/apps/x/packages/core/src/workspace/wiki-link-rewrite.ts
+++ b/apps/x/packages/core/src/workspace/wiki-link-rewrite.ts
@@ -40,9 +40,16 @@ function splitWikiPathPrefix(rawPath: string): { pathWithoutPrefix: string; hadK
   return { pathWithoutPrefix: normalized, hadKnowledgePrefix };
 }
 
-function rewriteWikiLinksInMarkdown(markdown: string, fromWikiPath: string, toWikiPath: string): string {
+function rewriteWikiLinksInMarkdown(
+  markdown: string,
+  fromWikiPath: string,
+  toWikiPath: string,
+  opts?: { allowBareSelfNameMatch?: boolean }
+): string {
   const fromCompareKey = toWikiPathCompareKey(fromWikiPath);
+  const fromBaseName = stripMarkdownExtension(fromWikiPath).split('/').pop()?.toLowerCase() ?? null;
   const toWikiPathWithoutExtension = stripMarkdownExtension(toWikiPath);
+  const toBaseName = toWikiPathWithoutExtension.split('/').pop() ?? toWikiPathWithoutExtension;
 
   return markdown.replace(WIKI_LINK_REGEX, (fullMatch, innerRaw: string) => {
     const pipeIndex = innerRaw.indexOf('|');
@@ -61,12 +68,23 @@ function rewriteWikiLinksInMarkdown(markdown: string, fromWikiPath: string, toWi
     const { pathWithoutPrefix, hadKnowledgePrefix } = splitWikiPathPrefix(rawPath);
     if (!pathWithoutPrefix) return fullMatch;
 
-    if (toWikiPathCompareKey(pathWithoutPrefix) !== fromCompareKey) {
+    const matchesFullPath = toWikiPathCompareKey(pathWithoutPrefix) === fromCompareKey;
+    const isBareTarget = !pathWithoutPrefix.includes('/');
+    const targetBaseName = stripMarkdownExtension(pathWithoutPrefix).toLowerCase();
+    const matchesBareSelfName = Boolean(
+      opts?.allowBareSelfNameMatch
+      && fromBaseName
+      && isBareTarget
+      && targetBaseName === fromBaseName
+    );
+    if (!matchesFullPath && !matchesBareSelfName) {
       return fullMatch;
     }
 
     const preserveMarkdownExtension = rawPath.toLowerCase().endsWith(MARKDOWN_EXTENSION);
-    const rewrittenPath = preserveMarkdownExtension ? toWikiPath : toWikiPathWithoutExtension;
+    const rewrittenPath = matchesBareSelfName
+      ? (preserveMarkdownExtension ? `${toBaseName}.md` : toBaseName)
+      : (preserveMarkdownExtension ? toWikiPath : toWikiPathWithoutExtension);
     const finalPath = hadKnowledgePrefix ? `${KNOWLEDGE_PREFIX}${rewrittenPath}` : rewrittenPath;
 
     return `[[${leadingWhitespace}${finalPath}${trailingWhitespace}${anchorSuffix}${aliasSuffix}]]`;
@@ -128,13 +146,17 @@ export async function rewriteWikiLinksForRenamedKnowledgeFile(
   const markdownFiles = await collectKnowledgeMarkdownFiles(workspaceRoot);
   let rewrittenFiles = 0;
 
+  const normalizedToLower = normalizedTo.toLowerCase();
   for (const relativePath of markdownFiles) {
     const absolutePath = path.join(workspaceRoot, ...relativePath.split('/'));
     try {
       const markdown = await fs.readFile(absolutePath, 'utf8');
       if (!markdown.includes('[[')) continue;
 
-      const rewritten = rewriteWikiLinksInMarkdown(markdown, fromWikiPath, toWikiPath);
+      const isRenamedFile = normalizeRelPath(relativePath).toLowerCase() === normalizedToLower;
+      const rewritten = rewriteWikiLinksInMarkdown(markdown, fromWikiPath, toWikiPath, {
+        allowBareSelfNameMatch: isRenamedFile,
+      });
       if (rewritten === markdown) continue;
 
       await fs.writeFile(absolutePath, rewritten, 'utf8');

From b5424d92f92275a6e982be15d51d58f2ebbf174f Mon Sep 17 00:00:00 2001
From: tusharmagar <tushmag@gmail.com>
Date: Thu, 26 Feb 2026 11:42:43 +0530
Subject: [PATCH 32/36] Add OS-aware runtime context for cross-platform shell
 execution

Detect the runtime platform and default shell at startup, inject
platform context into assistant instructions, and replace hardcoded
/bin/sh with the detected shell in command executors (cli + electron).

Made-with: Cursor
---
 .../src/application/assistant/instructions.ts |  5 ++
 .../application/assistant/runtime-context.ts  | 69 +++++++++++++++++++
 .../src/application/lib/command-executor.ts   |  6 +-
 .../src/application/assistant/instructions.ts | 11 ++-
 .../application/assistant/runtime-context.ts  | 69 +++++++++++++++++++
 .../src/application/lib/command-executor.ts   | 10 +--
 6 files changed, 162 insertions(+), 8 deletions(-)
 create mode 100644 apps/cli/src/application/assistant/runtime-context.ts
 create mode 100644 apps/x/packages/core/src/application/assistant/runtime-context.ts

diff --git a/apps/cli/src/application/assistant/instructions.ts b/apps/cli/src/application/assistant/instructions.ts
index b6e49cf0..b22425c6 100644
--- a/apps/cli/src/application/assistant/instructions.ts
+++ b/apps/cli/src/application/assistant/instructions.ts
@@ -1,5 +1,8 @@
 import { skillCatalog } from "./skills/index.js";
 import { WorkDir as BASE_DIR } from "../../config/config.js";
+import { getRuntimeContext, getRuntimeContextPrompt } from "./runtime-context.js";
+
+const runtimeContextPrompt = getRuntimeContextPrompt(getRuntimeContext());
 
 export const CopilotInstructions = `You are an intelligent workflow assistant helping users manage their workflows in ${BASE_DIR}. You can also help the user with general tasks.
 
@@ -39,6 +42,8 @@ When a user asks for ANY task that might require external capabilities (web sear
 - Use relative paths (no \${BASE_DIR} prefixes) when running commands or referencing files.
 - Keep user data safe—double-check before editing or deleting important resources.
 
+${runtimeContextPrompt}
+
 ## Workspace access & scope
 - You have full read/write access inside \`${BASE_DIR}\` (this resolves to the user's \`~/.rowboat\` directory). Create folders, files, and agents there using builtin tools or allowed shell commands—don't wait for the user to do it manually.
 - If a user mentions a different root (e.g., \`~/.rowboatx\` or another path), clarify whether they meant the Rowboat workspace and propose the equivalent path you can act on. Only refuse if they explicitly insist on an inaccessible location.
diff --git a/apps/cli/src/application/assistant/runtime-context.ts b/apps/cli/src/application/assistant/runtime-context.ts
new file mode 100644
index 00000000..f1011c2c
--- /dev/null
+++ b/apps/cli/src/application/assistant/runtime-context.ts
@@ -0,0 +1,69 @@
+export type RuntimeShellDialect = 'windows-cmd' | 'posix-sh';
+export type RuntimeOsName = 'Windows' | 'macOS' | 'Linux' | 'Unknown';
+
+export interface RuntimeContext {
+  platform: NodeJS.Platform;
+  osName: RuntimeOsName;
+  shellDialect: RuntimeShellDialect;
+  shellExecutable: string;
+}
+
+export function getExecutionShell(platform: NodeJS.Platform = process.platform): string {
+  return platform === 'win32' ? (process.env.ComSpec || 'cmd.exe') : '/bin/sh';
+}
+
+export function getRuntimeContext(platform: NodeJS.Platform = process.platform): RuntimeContext {
+  if (platform === 'win32') {
+    return {
+      platform,
+      osName: 'Windows',
+      shellDialect: 'windows-cmd',
+      shellExecutable: getExecutionShell(platform),
+    };
+  }
+
+  if (platform === 'darwin') {
+    return {
+      platform,
+      osName: 'macOS',
+      shellDialect: 'posix-sh',
+      shellExecutable: getExecutionShell(platform),
+    };
+  }
+
+  if (platform === 'linux') {
+    return {
+      platform,
+      osName: 'Linux',
+      shellDialect: 'posix-sh',
+      shellExecutable: getExecutionShell(platform),
+    };
+  }
+
+  return {
+    platform,
+    osName: 'Unknown',
+    shellDialect: 'posix-sh',
+    shellExecutable: getExecutionShell(platform),
+  };
+}
+
+export function getRuntimeContextPrompt(runtime: RuntimeContext): string {
+  if (runtime.shellDialect === 'windows-cmd') {
+    return `## Runtime Platform (CRITICAL)
+- Detected platform: **${runtime.platform}**
+- Detected OS: **${runtime.osName}**
+- Shell used by executeCommand: **${runtime.shellExecutable}** (Windows Command Prompt / cmd syntax)
+- Use Windows command syntax for executeCommand (for example: \`dir\`, \`type\`, \`copy\`, \`move\`, \`del\`, \`rmdir\`).
+- Use Windows-style absolute paths when outside workspace (for example: \`C:\\Users\\...\`).
+- Do not assume macOS/Linux command syntax when the runtime is Windows.`;
+  }
+
+  return `## Runtime Platform (CRITICAL)
+- Detected platform: **${runtime.platform}**
+- Detected OS: **${runtime.osName}**
+- Shell used by executeCommand: **${runtime.shellExecutable}** (POSIX sh syntax)
+- Use POSIX command syntax for executeCommand (for example: \`ls\`, \`cat\`, \`cp\`, \`mv\`, \`rm\`).
+- Use POSIX paths when outside workspace (for example: \`~/Desktop\`, \`/Users/.../\` on macOS, \`/home/.../\` on Linux).
+- Do not assume Windows command syntax when the runtime is POSIX.`;
+}
diff --git a/apps/cli/src/application/lib/command-executor.ts b/apps/cli/src/application/lib/command-executor.ts
index 814d9801..cd16f05e 100644
--- a/apps/cli/src/application/lib/command-executor.ts
+++ b/apps/cli/src/application/lib/command-executor.ts
@@ -1,11 +1,13 @@
 import { exec, execSync } from 'child_process';
 import { promisify } from 'util';
 import { getSecurityAllowList, SECURITY_CONFIG_PATH } from '../../config/security.js';
+import { getExecutionShell } from '../assistant/runtime-context.js';
 
 const execPromise = promisify(exec);
 const COMMAND_SPLIT_REGEX = /(?:\|\||&&|;|\||\n)/;
 const ENV_ASSIGNMENT_REGEX = /^[A-Za-z_][A-Za-z0-9_]*=.*/;
 const WRAPPER_COMMANDS = new Set(['sudo', 'env', 'time', 'command']);
+const EXECUTION_SHELL = getExecutionShell();
 
 function sanitizeToken(token: string): string {
   return token.trim().replace(/^['"]+|['"]+$/g, '');
@@ -91,7 +93,7 @@ export async function executeCommand(
       cwd: options?.cwd,
       timeout: options?.timeout,
       maxBuffer: options?.maxBuffer || 1024 * 1024, // default 1MB
-      shell: '/bin/sh', // use sh for cross-platform compatibility
+      shell: EXECUTION_SHELL,
     });
 
     return {
@@ -125,7 +127,7 @@ export function executeCommandSync(
       cwd: options?.cwd,
       timeout: options?.timeout,
       encoding: 'utf-8',
-      shell: '/bin/sh',
+      shell: EXECUTION_SHELL,
     });
 
     return {
diff --git a/apps/x/packages/core/src/application/assistant/instructions.ts b/apps/x/packages/core/src/application/assistant/instructions.ts
index c0365c0f..96b50bb3 100644
--- a/apps/x/packages/core/src/application/assistant/instructions.ts
+++ b/apps/x/packages/core/src/application/assistant/instructions.ts
@@ -1,5 +1,8 @@
 import { skillCatalog } from "./skills/index.js";
 import { WorkDir as BASE_DIR } from "../../config/config.js";
+import { getRuntimeContext, getRuntimeContextPrompt } from "./runtime-context.js";
+
+const runtimeContextPrompt = getRuntimeContextPrompt(getRuntimeContext());
 
 export const CopilotInstructions = `You are Rowboat Copilot - an AI assistant for everyday work. You help users with anything they want. For instance, drafting emails, prepping for meetings, tracking projects, or answering questions - with memory that compounds from their emails, calendar, and notes. Everything runs locally on the user's machine. The nerdy coworker who remembers everything.
 
@@ -150,18 +153,22 @@ When a user asks for ANY task that might require external capabilities (web sear
 - Use relative paths (no \`\${BASE_DIR}\` prefixes) when running commands or referencing files.
 - Keep user data safe—double-check before editing or deleting important resources.
 
+${runtimeContextPrompt}
+
 ## Workspace Access & Scope
 - **Inside \`~/.rowboat/\`:** Use builtin workspace tools (\`workspace-readFile\`, \`workspace-writeFile\`, etc.). These don't require security approval.
 - **Outside \`~/.rowboat/\` (Desktop, Downloads, Documents, etc.):** Use \`executeCommand\` to run shell commands.
 - **IMPORTANT:** Do NOT access files outside \`~/.rowboat/\` unless the user explicitly asks you to (e.g., "organize my Desktop", "find a file in Downloads").
 
 **CRITICAL - When the user asks you to work with files outside ~/.rowboat:**
-- The user is on **macOS**. Use macOS paths and commands (e.g., \`~/Desktop\`, \`~/Downloads\`, \`open\` command).
+- Follow the detected runtime platform above for shell syntax and filesystem path style.
+- On macOS/Linux, use POSIX-style commands and paths (e.g., \`~/Desktop\`, \`~/Downloads\`, \`open\` on macOS).
+- On Windows, use cmd-compatible commands and Windows paths (e.g., \`C:\\Users\\<name>\\Desktop\`).
 - You CAN access the user's full filesystem via \`executeCommand\` - there is no sandbox restriction on paths.
 - NEVER say "I can only run commands inside ~/.rowboat" or "I don't have access to your Desktop" - just use \`executeCommand\`.
 - NEVER offer commands for the user to run manually - run them yourself with \`executeCommand\`.
 - NEVER say "I'll run shell commands equivalent to..." - just describe what you'll do in plain language (e.g., "I'll move 12 screenshots to a new Screenshots folder").
-- NEVER ask what OS the user is on - they are on macOS.
+- NEVER ask what OS the user is on if runtime platform is already available.
 - Load the \`organize-files\` skill for guidance on file organization tasks.
 
 ## Builtin Tools vs Shell Commands
diff --git a/apps/x/packages/core/src/application/assistant/runtime-context.ts b/apps/x/packages/core/src/application/assistant/runtime-context.ts
new file mode 100644
index 00000000..f1011c2c
--- /dev/null
+++ b/apps/x/packages/core/src/application/assistant/runtime-context.ts
@@ -0,0 +1,69 @@
+export type RuntimeShellDialect = 'windows-cmd' | 'posix-sh';
+export type RuntimeOsName = 'Windows' | 'macOS' | 'Linux' | 'Unknown';
+
+export interface RuntimeContext {
+  platform: NodeJS.Platform;
+  osName: RuntimeOsName;
+  shellDialect: RuntimeShellDialect;
+  shellExecutable: string;
+}
+
+export function getExecutionShell(platform: NodeJS.Platform = process.platform): string {
+  return platform === 'win32' ? (process.env.ComSpec || 'cmd.exe') : '/bin/sh';
+}
+
+export function getRuntimeContext(platform: NodeJS.Platform = process.platform): RuntimeContext {
+  if (platform === 'win32') {
+    return {
+      platform,
+      osName: 'Windows',
+      shellDialect: 'windows-cmd',
+      shellExecutable: getExecutionShell(platform),
+    };
+  }
+
+  if (platform === 'darwin') {
+    return {
+      platform,
+      osName: 'macOS',
+      shellDialect: 'posix-sh',
+      shellExecutable: getExecutionShell(platform),
+    };
+  }
+
+  if (platform === 'linux') {
+    return {
+      platform,
+      osName: 'Linux',
+      shellDialect: 'posix-sh',
+      shellExecutable: getExecutionShell(platform),
+    };
+  }
+
+  return {
+    platform,
+    osName: 'Unknown',
+    shellDialect: 'posix-sh',
+    shellExecutable: getExecutionShell(platform),
+  };
+}
+
+export function getRuntimeContextPrompt(runtime: RuntimeContext): string {
+  if (runtime.shellDialect === 'windows-cmd') {
+    return `## Runtime Platform (CRITICAL)
+- Detected platform: **${runtime.platform}**
+- Detected OS: **${runtime.osName}**
+- Shell used by executeCommand: **${runtime.shellExecutable}** (Windows Command Prompt / cmd syntax)
+- Use Windows command syntax for executeCommand (for example: \`dir\`, \`type\`, \`copy\`, \`move\`, \`del\`, \`rmdir\`).
+- Use Windows-style absolute paths when outside workspace (for example: \`C:\\Users\\...\`).
+- Do not assume macOS/Linux command syntax when the runtime is Windows.`;
+  }
+
+  return `## Runtime Platform (CRITICAL)
+- Detected platform: **${runtime.platform}**
+- Detected OS: **${runtime.osName}**
+- Shell used by executeCommand: **${runtime.shellExecutable}** (POSIX sh syntax)
+- Use POSIX command syntax for executeCommand (for example: \`ls\`, \`cat\`, \`cp\`, \`mv\`, \`rm\`).
+- Use POSIX paths when outside workspace (for example: \`~/Desktop\`, \`/Users/.../\` on macOS, \`/home/.../\` on Linux).
+- Do not assume Windows command syntax when the runtime is POSIX.`;
+}
diff --git a/apps/x/packages/core/src/application/lib/command-executor.ts b/apps/x/packages/core/src/application/lib/command-executor.ts
index 870f6a0c..947f49a0 100644
--- a/apps/x/packages/core/src/application/lib/command-executor.ts
+++ b/apps/x/packages/core/src/application/lib/command-executor.ts
@@ -1,11 +1,13 @@
 import { exec, execSync, spawn, ChildProcess } from 'child_process';
 import { promisify } from 'util';
 import { getSecurityAllowList } from '../../config/security.js';
+import { getExecutionShell } from '../assistant/runtime-context.js';
 
 const execPromise = promisify(exec);
 const COMMAND_SPLIT_REGEX = /(?:\|\||&&|;|\||\n|`|\$\(|\(|\))/;
 const ENV_ASSIGNMENT_REGEX = /^[A-Za-z_][A-Za-z0-9_]*=.*/;
 const WRAPPER_COMMANDS = new Set(['sudo', 'env', 'time', 'command']);
+const EXECUTION_SHELL = getExecutionShell();
 
 function sanitizeToken(token: string): string {
   return token.trim().replace(/^['"()]+|['"()]+$/g, '');
@@ -85,7 +87,7 @@ export async function executeCommand(
       cwd: options?.cwd,
       timeout: options?.timeout,
       maxBuffer: options?.maxBuffer || 1024 * 1024, // default 1MB
-      shell: '/bin/sh', // use sh for cross-platform compatibility
+      shell: EXECUTION_SHELL,
     });
 
     return {
@@ -145,7 +147,7 @@ export function executeCommandAbortable(
   // Check if already aborted before spawning
   if (options?.signal?.aborted) {
     // Return a dummy process and a resolved result
-    const dummyProc = spawn('true', { shell: true });
+    const dummyProc = spawn(process.execPath, ['-e', 'process.exit(0)']);
     dummyProc.kill();
     return {
       process: dummyProc,
@@ -159,7 +161,7 @@ export function executeCommandAbortable(
   }
 
   const proc = spawn(command, [], {
-    shell: '/bin/sh',
+    shell: EXECUTION_SHELL,
     cwd: options?.cwd,
     detached: process.platform !== 'win32', // Create process group on Unix
     stdio: ['ignore', 'pipe', 'pipe'],
@@ -273,7 +275,7 @@ export function executeCommandSync(
       cwd: options?.cwd,
       timeout: options?.timeout,
       encoding: 'utf-8',
-      shell: '/bin/sh',
+      shell: EXECUTION_SHELL,
     });
 
     return {

From 72534052e00da1e7c88490bc92b8fd61646a78e1 Mon Sep 17 00:00:00 2001
From: tusharmagar <tushmag@gmail.com>
Date: Thu, 26 Feb 2026 15:29:16 +0530
Subject: [PATCH 33/36] fix: cmd+z behaviour on notes

---
 apps/x/apps/renderer/src/App.tsx              | 63 +++++++++++++++++++
 .../src/components/markdown-editor.tsx        | 26 +++++++-
 2 files changed, 87 insertions(+), 2 deletions(-)

diff --git a/apps/x/apps/renderer/src/App.tsx b/apps/x/apps/renderer/src/App.tsx
index 4f8859ef..d3782925 100644
--- a/apps/x/apps/renderer/src/App.tsx
+++ b/apps/x/apps/renderer/src/App.tsx
@@ -452,6 +452,7 @@ function ContentHeader({
 
 function App() {
   type ShortcutPane = 'left' | 'right'
+  type MarkdownHistoryHandlers = { undo: () => boolean; redo: () => boolean }
 
   // File browser state (for Knowledge section)
   const [selectedPath, setSelectedPath] = useState<string | null>(null)
@@ -596,6 +597,8 @@ function App() {
   // File tab state
   const [fileTabs, setFileTabs] = useState<FileTab[]>([])
   const [activeFileTabId, setActiveFileTabId] = useState<string | null>(null)
+  const [editorSessionByTabId, setEditorSessionByTabId] = useState<Record<string, number>>({})
+  const fileHistoryHandlersRef = useRef<Map<string, MarkdownHistoryHandlers>>(new Map())
   const fileTabIdCounterRef = useRef(0)
   const newFileTabId = () => `file-tab-${++fileTabIdCounterRef.current}`
 
@@ -2036,6 +2039,13 @@ function App() {
       }
       return next
     })
+    setEditorSessionByTabId((prev) => {
+      if (!(tabId in prev)) return prev
+      const next = { ...prev }
+      delete next[tabId]
+      return next
+    })
+    fileHistoryHandlersRef.current.delete(tabId)
   }, [activeFileTabId, fileTabs, removeEditorCacheForPath])
 
   const handleNewChatTab = useCallback(() => {
@@ -2136,6 +2146,11 @@ function App() {
         setFileTabs((prev) => prev.map((tab) => (
           tab.id === activeFileTabId ? { ...tab, path } : tab
         )))
+        // Rebinds this tab to a different note path: reset editor session to clear undo history.
+        setEditorSessionByTabId((prev) => ({
+          ...prev,
+          [activeFileTabId]: (prev[activeFileTabId] ?? 0) + 1,
+        }))
         return
       }
     }
@@ -2352,6 +2367,46 @@ function App() {
     return () => document.removeEventListener('keydown', handleKeyDown)
   }, [])
 
+  // Route undo/redo to the active markdown tab only (prevents cross-tab browser undo behavior).
+  useEffect(() => {
+    const handleHistoryKeyDown = (e: KeyboardEvent) => {
+      const mod = e.metaKey || e.ctrlKey
+      if (!mod || e.altKey) return
+
+      const key = e.key.toLowerCase()
+      const wantsUndo = key === 'z' && !e.shiftKey
+      const wantsRedo = (key === 'z' && e.shiftKey) || (!isMac && key === 'y')
+      if (!wantsUndo && !wantsRedo) return
+
+      if (!selectedPath || !selectedPath.endsWith('.md') || !activeFileTabId) return
+
+      const target = e.target as EventTarget | null
+      if (target instanceof HTMLElement) {
+        const inTipTapEditor = Boolean(target.closest('.tiptap-editor'))
+        const inOtherTextInput = (
+          target instanceof HTMLInputElement
+          || target instanceof HTMLTextAreaElement
+          || target.isContentEditable
+        ) && !inTipTapEditor
+        if (inOtherTextInput) return
+      }
+
+      const handlers = fileHistoryHandlersRef.current.get(activeFileTabId)
+      if (!handlers) return
+
+      e.preventDefault()
+      e.stopPropagation()
+      if (wantsUndo) {
+        handlers.undo()
+      } else {
+        handlers.redo()
+      }
+    }
+
+    document.addEventListener('keydown', handleHistoryKeyDown, true)
+    return () => document.removeEventListener('keydown', handleHistoryKeyDown, true)
+  }, [activeFileTabId, isMac, selectedPath])
+
   // Keyboard shortcuts for tab management
   useEffect(() => {
     const handleTabKeyDown = (e: KeyboardEvent) => {
@@ -3136,6 +3191,14 @@ function App() {
                             placeholder="Start writing..."
                             wikiLinks={wikiLinkConfig}
                             onImageUpload={handleImageUpload}
+                            editorSessionKey={editorSessionByTabId[tab.id] ?? 0}
+                            onHistoryHandlersChange={(handlers) => {
+                              if (handlers) {
+                                fileHistoryHandlersRef.current.set(tab.id, handlers)
+                              } else {
+                                fileHistoryHandlersRef.current.delete(tab.id)
+                              }
+                            }}
                           />
                         </div>
                       )
diff --git a/apps/x/apps/renderer/src/components/markdown-editor.tsx b/apps/x/apps/renderer/src/components/markdown-editor.tsx
index 74ad10b8..2db7bcbe 100644
--- a/apps/x/apps/renderer/src/components/markdown-editor.tsx
+++ b/apps/x/apps/renderer/src/components/markdown-editor.tsx
@@ -195,6 +195,8 @@ interface MarkdownEditorProps {
   placeholder?: string
   wikiLinks?: WikiLinkConfig
   onImageUpload?: (file: File) => Promise<string | null>
+  editorSessionKey?: number
+  onHistoryHandlersChange?: (handlers: { undo: () => boolean; redo: () => boolean } | null) => void
 }
 
 type WikiLinkMatch = {
@@ -278,6 +280,8 @@ export function MarkdownEditor({
   placeholder = 'Start writing...',
   wikiLinks,
   onImageUpload,
+  editorSessionKey = 0,
+  onHistoryHandlersChange,
 }: MarkdownEditorProps) {
   const isInternalUpdate = useRef(false)
   const wrapperRef = useRef<HTMLDivElement>(null)
@@ -400,7 +404,7 @@ export function MarkdownEditor({
         return false
       },
     },
-  })
+  }, [editorSessionKey])
 
   const orderedFiles = useMemo(() => {
     if (!wikiLinks) return []
@@ -489,12 +493,30 @@ export function MarkdownEditor({
         isInternalUpdate.current = true
         // Pre-process to preserve blank lines
         const preprocessed = preprocessMarkdown(content)
-        editor.commands.setContent(preprocessed)
+        // Treat tab-open content as baseline: do not add hydration to undo history.
+        editor.chain().setMeta('addToHistory', false).setContent(preprocessed).run()
         isInternalUpdate.current = false
       }
     }
   }, [editor, content])
 
+  useEffect(() => {
+    if (!onHistoryHandlersChange) return
+    if (!editor) {
+      onHistoryHandlersChange(null)
+      return
+    }
+
+    onHistoryHandlersChange({
+      undo: () => editor.chain().focus().undo().run(),
+      redo: () => editor.chain().focus().redo().run(),
+    })
+
+    return () => {
+      onHistoryHandlersChange(null)
+    }
+  }, [editor, onHistoryHandlersChange])
+
   // Force re-render decorations when selection highlight changes
   useEffect(() => {
     if (editor) {

From cccb7a8a65f62e6d37a47e41604002245f71e0e3 Mon Sep 17 00:00:00 2001
From: Tushar <47842976+tusharmagar@users.noreply.github.com>
Date: Thu, 26 Feb 2026 21:41:17 +0530
Subject: [PATCH 34/36] Add plus button to prompt input for file and image
 attachments (#381)

* Add plus button to prompt input for file and image attachments

Co-authored-by: Cursor <cursoragent@cursor.com>

* Refactor chat message attachment handling and improve UI for attachments in chat input and sidebar

* fixed review comments

---------

Co-authored-by: Cursor <cursoragent@cursor.com>
Co-authored-by: Arjun <6592213+arkml@users.noreply.github.com>
---
 apps/x/apps/renderer/src/App.tsx              | 190 ++++++++++---
 .../components/chat-input-with-mentions.tsx   | 263 ++++++++++++++----
 .../components/chat-message-attachments.tsx   | 137 +++++++++
 .../renderer/src/components/chat-sidebar.tsx  |  17 +-
 .../src/lib/attachment-presentation.ts        | 107 +++++++
 .../renderer/src/lib/chat-conversation.ts     |   9 +
 apps/x/apps/renderer/src/lib/file-utils.ts    |  61 ++++
 apps/x/packages/core/src/agents/runtime.ts    |  42 ++-
 .../core/src/application/lib/message-queue.ts |  10 +-
 apps/x/packages/core/src/runs/repo.ts         |  30 +-
 apps/x/packages/core/src/runs/runs.ts         |   4 +-
 apps/x/packages/shared/src/ipc.ts             |   3 +-
 apps/x/packages/shared/src/message.ts         |  23 +-
 13 files changed, 782 insertions(+), 114 deletions(-)
 create mode 100644 apps/x/apps/renderer/src/components/chat-message-attachments.tsx
 create mode 100644 apps/x/apps/renderer/src/lib/attachment-presentation.ts
 create mode 100644 apps/x/apps/renderer/src/lib/file-utils.ts

diff --git a/apps/x/apps/renderer/src/App.tsx b/apps/x/apps/renderer/src/App.tsx
index d3782925..0ee4fa5d 100644
--- a/apps/x/apps/renderer/src/App.tsx
+++ b/apps/x/apps/renderer/src/App.tsx
@@ -9,7 +9,8 @@ import { CheckIcon, LoaderIcon, PanelLeftIcon, Maximize2, Minimize2, ChevronLeft
 import { cn } from '@/lib/utils';
 import { MarkdownEditor } from './components/markdown-editor';
 import { ChatSidebar } from './components/chat-sidebar';
-import { ChatInputWithMentions } from './components/chat-input-with-mentions';
+import { ChatInputWithMentions, type StagedAttachment } from './components/chat-input-with-mentions';
+import { ChatMessageAttachments } from '@/components/chat-message-attachments'
 import { GraphView, type GraphEdge, type GraphNode } from '@/components/graph-view';
 import { useDebounce } from './hooks/use-debounce';
 import { SidebarContentPanel } from '@/components/sidebar-content';
@@ -52,6 +53,7 @@ import { FileCardProvider } from '@/contexts/file-card-context'
 import { MarkdownPreOverride } from '@/components/ai-elements/markdown-code-override'
 import { TabBar, type ChatTab, type FileTab } from '@/components/tab-bar'
 import {
+  type ChatMessage,
   type ChatTabViewState,
   type ConversationItem,
   type ToolCall,
@@ -1171,19 +1173,41 @@ function App() {
             if (msg.role === 'user' || msg.role === 'assistant') {
               // Extract text content from message
               let textContent = ''
+              let msgAttachments: ChatMessage['attachments'] = undefined
               if (typeof msg.content === 'string') {
                 textContent = msg.content
               } else if (Array.isArray(msg.content)) {
-                // Extract text parts
-                textContent = msg.content
-                  .filter((part: { type: string }) => part.type === 'text')
-                  .map((part: { type: string; text?: string }) => part.text || '')
+                const contentParts = msg.content as Array<{
+                  type: string
+                  text?: string
+                  path?: string
+                  filename?: string
+                  mimeType?: string
+                  size?: number
+                  toolCallId?: string
+                  toolName?: string
+                  arguments?: ToolUIPart['input']
+                }>
+
+                textContent = contentParts
+                  .filter((part) => part.type === 'text')
+                  .map((part) => part.text || '')
                   .join('')
-                
+
+                const attachmentParts = contentParts.filter((part) => part.type === 'attachment' && part.path)
+                if (attachmentParts.length > 0) {
+                  msgAttachments = attachmentParts.map((part) => ({
+                    path: part.path!,
+                    filename: part.filename || part.path!.split('/').pop() || part.path!,
+                    mimeType: part.mimeType || 'application/octet-stream',
+                    size: part.size,
+                  }))
+                }
+
                 // Also extract tool-call parts from assistant messages
                 if (msg.role === 'assistant') {
-                  for (const part of msg.content) {
-                    if (part.type === 'tool-call') {
+                  for (const part of contentParts) {
+                    if (part.type === 'tool-call' && part.toolCallId && part.toolName) {
                       const toolCall: ToolCall = {
                         id: part.toolCallId,
                         name: part.toolName,
@@ -1197,11 +1221,12 @@ function App() {
                   }
                 }
               }
-              if (textContent) {
+              if (textContent || msgAttachments) {
                 items.push({
                   id: event.messageId,
                   role: msg.role,
                   content: textContent,
+                  attachments: msgAttachments,
                   timestamp: event.ts ? new Date(event.ts).getTime() : Date.now(),
                 })
               }
@@ -1618,20 +1643,35 @@ function App() {
     return cleanup
   }, [handleRunEvent])
 
-  const handlePromptSubmit = async (message: PromptInputMessage, mentions?: FileMention[]) => {
+  const handlePromptSubmit = async (
+    message: PromptInputMessage,
+    mentions?: FileMention[],
+    stagedAttachments: StagedAttachment[] = []
+  ) => {
     if (isProcessing) return
 
-    const { text } = message;
+    const { text } = message
     const userMessage = text.trim()
-    if (!userMessage) return
+    const hasAttachments = stagedAttachments.length > 0
+    if (!userMessage && !hasAttachments) return
 
     setMessage('')
 
     const userMessageId = `user-${Date.now()}`
-    setConversation(prev => [...prev, {
+    const displayAttachments: ChatMessage['attachments'] = hasAttachments
+      ? stagedAttachments.map((attachment) => ({
+          path: attachment.path,
+          filename: attachment.filename,
+          mimeType: attachment.mimeType,
+          size: attachment.size,
+          thumbnailUrl: attachment.thumbnailUrl,
+        }))
+      : undefined
+    setConversation((prev) => [...prev, {
       id: userMessageId,
       role: 'user',
       content: userMessage,
+      attachments: displayAttachments,
       timestamp: Date.now(),
     }])
 
@@ -1647,42 +1687,98 @@ function App() {
         newRunCreatedAt = run.createdAt
         setRunId(currentRunId)
         // Update active chat tab's runId to the new run
-        setChatTabs(prev => prev.map(t => t.id === activeChatTabId ? { ...t, runId: currentRunId } : t))
+        setChatTabs((prev) => prev.map((tab) => (
+          tab.id === activeChatTabId
+            ? { ...tab, runId: currentRunId }
+            : tab
+        )))
         isNewRun = true
       }
 
-      // Read mentioned file contents and format message with XML context
-      let formattedMessage = userMessage
-      if (mentions && mentions.length > 0) {
-        const attachedFiles = await Promise.all(
-          mentions.map(async (m) => {
-            try {
-              const result = await window.ipc.invoke('workspace:readFile', { path: m.path })
-              return { path: m.path, content: result.data as string }
-            } catch (err) {
-              console.error('Failed to read mentioned file:', m.path, err)
-              return { path: m.path, content: `[Error reading file: ${m.path}]` }
-            }
-          })
-        )
+      let titleSource = userMessage
 
-        if (attachedFiles.length > 0) {
-          const filesXml = attachedFiles
-            .map(f => `<file path="${f.path}">\n${f.content}\n</file>`)
-            .join('\n')
-          formattedMessage = `<attached-files>\n${filesXml}\n</attached-files>\n\n${userMessage}`
+      if (hasAttachments) {
+        type ContentPart =
+          | { type: 'text'; text: string }
+          | {
+              type: 'attachment'
+              path: string
+              filename: string
+              mimeType: string
+              size?: number
+            }
+
+        const contentParts: ContentPart[] = []
+
+        if (mentions && mentions.length > 0) {
+          for (const mention of mentions) {
+            contentParts.push({
+              type: 'attachment',
+              path: mention.path,
+              filename: mention.displayName || mention.path.split('/').pop() || mention.path,
+              mimeType: 'text/markdown',
+            })
+          }
         }
+
+        for (const attachment of stagedAttachments) {
+          contentParts.push({
+            type: 'attachment',
+            path: attachment.path,
+            filename: attachment.filename,
+            mimeType: attachment.mimeType,
+            size: attachment.size,
+          })
+        }
+
+        if (userMessage) {
+          contentParts.push({ type: 'text', text: userMessage })
+        } else {
+          titleSource = stagedAttachments[0]?.filename ?? ''
+        }
+
+        // Shared IPC payload types can lag until package rebuilds; runtime validation still enforces schema.
+        const attachmentPayload = contentParts as unknown as string
+        await window.ipc.invoke('runs:createMessage', {
+          runId: currentRunId,
+          message: attachmentPayload,
+        })
+      } else {
+        // Legacy path: plain string with optional XML-formatted @mentions.
+        let formattedMessage = userMessage
+        if (mentions && mentions.length > 0) {
+          const attachedFiles = await Promise.all(
+            mentions.map(async (mention) => {
+              try {
+                const result = await window.ipc.invoke('workspace:readFile', { path: mention.path })
+                return { path: mention.path, content: result.data as string }
+              } catch (err) {
+                console.error('Failed to read mentioned file:', mention.path, err)
+                return { path: mention.path, content: `[Error reading file: ${mention.path}]` }
+              }
+            })
+          )
+
+          if (attachedFiles.length > 0) {
+            const filesXml = attachedFiles
+              .map((file) => `<file path="${file.path}">\n${file.content}\n</file>`)
+              .join('\n')
+            formattedMessage = `<attached-files>\n${filesXml}\n</attached-files>\n\n${userMessage}`
+          }
+        }
+
+        await window.ipc.invoke('runs:createMessage', {
+          runId: currentRunId,
+          message: formattedMessage,
+        })
+
+        titleSource = formattedMessage
       }
 
-      await window.ipc.invoke('runs:createMessage', {
-        runId: currentRunId,
-        message: formattedMessage,
-      })
-
       if (isNewRun) {
-        const inferredTitle = inferRunTitleFromMessage(formattedMessage)
-        setRuns(prev => {
-          const withoutCurrent = prev.filter(run => run.id !== currentRunId)
+        const inferredTitle = inferRunTitleFromMessage(titleSource)
+        setRuns((prev) => {
+          const withoutCurrent = prev.filter((run) => run.id !== currentRunId)
           return [{
             id: currentRunId!,
             title: inferredTitle,
@@ -2849,6 +2945,18 @@ function App() {
   const renderConversationItem = (item: ConversationItem, tabId: string) => {
     if (isChatMessage(item)) {
       if (item.role === 'user') {
+        if (item.attachments && item.attachments.length > 0) {
+          return (
+            <Message key={item.id} from={item.role}>
+              <MessageContent className="group-[.is-user]:bg-transparent group-[.is-user]:px-0 group-[.is-user]:py-0 group-[.is-user]:rounded-none">
+                <ChatMessageAttachments attachments={item.attachments} />
+              </MessageContent>
+              {item.content && (
+                <MessageContent>{item.content}</MessageContent>
+              )}
+            </Message>
+          )
+        }
         const { message, files } = parseAttachedFiles(item.content)
         return (
           <Message key={item.id} from={item.role}>
diff --git a/apps/x/apps/renderer/src/components/chat-input-with-mentions.tsx b/apps/x/apps/renderer/src/components/chat-input-with-mentions.tsx
index 31bcba17..d3554c00 100644
--- a/apps/x/apps/renderer/src/components/chat-input-with-mentions.tsx
+++ b/apps/x/apps/renderer/src/components/chat-input-with-mentions.tsx
@@ -1,7 +1,28 @@
-import { useCallback, useEffect } from 'react'
-import { ArrowUp, LoaderIcon, Square } from 'lucide-react'
+import { useCallback, useEffect, useRef, useState } from 'react'
+import {
+  ArrowUp,
+  AudioLines,
+  FileArchive,
+  FileCode2,
+  FileIcon,
+  FileSpreadsheet,
+  FileText,
+  FileVideo,
+  LoaderIcon,
+  Plus,
+  Square,
+  X,
+} from 'lucide-react'
 
 import { Button } from '@/components/ui/button'
+import {
+  type AttachmentIconKind,
+  getAttachmentDisplayName,
+  getAttachmentIconKind,
+  getAttachmentToneClass,
+  getAttachmentTypeLabel,
+} from '@/lib/attachment-presentation'
+import { getExtension, getFileDisplayName, getMimeFromExtension, isImageMime } from '@/lib/file-utils'
 import { cn } from '@/lib/utils'
 import {
   type FileMention,
@@ -10,9 +31,41 @@ import {
   PromptInputTextarea,
   usePromptInputController,
 } from '@/components/ai-elements/prompt-input'
+import { toast } from 'sonner'
+
+export type StagedAttachment = {
+  id: string
+  path: string
+  filename: string
+  mimeType: string
+  isImage: boolean
+  size: number
+  thumbnailUrl?: string
+}
+
+const MAX_ATTACHMENT_SIZE = 10 * 1024 * 1024 // 10MB
+
+function getAttachmentIcon(kind: AttachmentIconKind) {
+  switch (kind) {
+    case 'audio':
+      return AudioLines
+    case 'video':
+      return FileVideo
+    case 'spreadsheet':
+      return FileSpreadsheet
+    case 'archive':
+      return FileArchive
+    case 'code':
+      return FileCode2
+    case 'text':
+      return FileText
+    default:
+      return FileIcon
+  }
+}
 
 interface ChatInputInnerProps {
-  onSubmit: (message: PromptInputMessage, mentions?: FileMention[]) => void
+  onSubmit: (message: PromptInputMessage, mentions?: FileMention[], attachments?: StagedAttachment[]) => void
   onStop?: () => void
   isProcessing: boolean
   isStopping?: boolean
@@ -38,7 +91,10 @@ function ChatInputInner({
 }: ChatInputInnerProps) {
   const controller = usePromptInputController()
   const message = controller.textInput.value
-  const canSubmit = Boolean(message.trim()) && !isProcessing
+  const [attachments, setAttachments] = useState<StagedAttachment[]>([])
+  const [focusNonce, setFocusNonce] = useState(0)
+  const fileInputRef = useRef<HTMLInputElement>(null)
+  const canSubmit = (Boolean(message.trim()) || attachments.length > 0) && !isProcessing
 
   // Restore the tab draft when this input mounts.
   useEffect(() => {
@@ -59,12 +115,48 @@ function ChatInputInner({
     }
   }, [presetMessage, controller.textInput, onPresetMessageConsumed])
 
+  const addFiles = useCallback(async (paths: string[]) => {
+    const newAttachments: StagedAttachment[] = []
+    for (const filePath of paths) {
+      try {
+        const result = await window.ipc.invoke('shell:readFileBase64', { path: filePath })
+        if (result.size > MAX_ATTACHMENT_SIZE) {
+          toast.error(`File too large: ${getFileDisplayName(filePath)} (max 10MB)`)
+          continue
+        }
+        const mime = result.mimeType || getMimeFromExtension(getExtension(filePath))
+        const image = isImageMime(mime)
+        newAttachments.push({
+          id: `att-${Date.now()}-${Math.random().toString(36).slice(2, 8)}`,
+          path: filePath,
+          filename: getFileDisplayName(filePath),
+          mimeType: mime,
+          isImage: image,
+          size: result.size,
+          thumbnailUrl: image ? `data:${mime};base64,${result.data}` : undefined,
+        })
+      } catch (err) {
+        console.error('Failed to read file:', filePath, err)
+        toast.error(`Failed to read: ${getFileDisplayName(filePath)}`)
+      }
+    }
+    if (newAttachments.length > 0) {
+      setAttachments((prev) => [...prev, ...newAttachments])
+      setFocusNonce((value) => value + 1)
+    }
+  }, [])
+
+  const removeAttachment = useCallback((id: string) => {
+    setAttachments((prev) => prev.filter((attachment) => attachment.id !== id))
+  }, [])
+
   const handleSubmit = useCallback(() => {
     if (!canSubmit) return
-    onSubmit({ text: message.trim(), files: [] }, controller.mentions.mentions)
+    onSubmit({ text: message.trim(), files: [] }, controller.mentions.mentions, attachments)
     controller.textInput.clear()
     controller.mentions.clearMentions()
-  }, [canSubmit, message, onSubmit, controller])
+    setAttachments([])
+  }, [attachments, canSubmit, controller, message, onSubmit])
 
   const handleKeyDown = useCallback((e: React.KeyboardEvent) => {
     if (e.key === 'Enter' && !e.shiftKey) {
@@ -88,11 +180,9 @@ function ChatInputInner({
       if (e.dataTransfer?.files && e.dataTransfer.files.length > 0) {
         const paths = Array.from(e.dataTransfer.files)
           .map((file) => window.electronUtils?.getPathForFile(file))
-          .filter(Boolean)
+          .filter(Boolean) as string[]
         if (paths.length > 0) {
-          const currentText = controller.textInput.value
-          const pathText = paths.join(' ')
-          controller.textInput.setInput(currentText ? `${currentText} ${pathText}` : pathText)
+          void addFiles(paths)
         }
       }
     }
@@ -103,50 +193,119 @@ function ChatInputInner({
       document.removeEventListener('dragover', onDragOver)
       document.removeEventListener('drop', onDrop)
     }
-  }, [controller, isActive])
+  }, [addFiles, isActive])
 
   return (
-    <div className="flex items-center gap-2 rounded-lg border border-border bg-background px-4 py-4 shadow-none">
-      <PromptInputTextarea
-        placeholder="Type your message..."
-        onKeyDown={handleKeyDown}
-        autoFocus={isActive}
-        focusTrigger={isActive ? runId : undefined}
-        className="min-h-6 rounded-none border-0 py-0 shadow-none focus-visible:ring-0"
-      />
-      {isProcessing ? (
-        <Button
-          size="icon"
-          onClick={onStop}
-          title={isStopping ? 'Click again to force stop' : 'Stop generation'}
-          className={cn(
-            'h-7 w-7 shrink-0 rounded-full transition-all',
-            isStopping
-              ? 'bg-destructive text-destructive-foreground hover:bg-destructive/90'
-              : 'bg-primary text-primary-foreground hover:bg-primary/90'
-          )}
-        >
-          {isStopping ? (
-            <LoaderIcon className="h-4 w-4 animate-spin" />
-          ) : (
-            <Square className="h-3 w-3 fill-current" />
-          )}
-        </Button>
-      ) : (
-        <Button
-          size="icon"
-          onClick={handleSubmit}
-          disabled={!canSubmit}
-          className={cn(
-            'h-7 w-7 shrink-0 rounded-full transition-all',
-            canSubmit
-              ? 'bg-primary text-primary-foreground hover:bg-primary/90'
-              : 'bg-muted text-muted-foreground'
-          )}
-        >
-          <ArrowUp className="h-4 w-4" />
-        </Button>
+    <div className="rounded-lg border border-border bg-background shadow-none">
+      {attachments.length > 0 && (
+        <div className="flex flex-wrap gap-2 px-4 pb-1 pt-3">
+          {attachments.map((attachment) => {
+            const attachmentType = getAttachmentTypeLabel(attachment)
+            const attachmentName = getAttachmentDisplayName(attachment)
+            const Icon = getAttachmentIcon(getAttachmentIconKind(attachment))
+
+            return (
+              <span
+                key={attachment.id}
+                className="group relative inline-flex min-w-[230px] max-w-[320px] items-center gap-2 rounded-xl border border-border/50 bg-muted/80 px-2.5 py-2"
+              >
+                <span
+                  className={cn(
+                    'flex size-9 shrink-0 items-center justify-center overflow-hidden rounded-lg',
+                    attachment.isImage && attachment.thumbnailUrl
+                      ? 'bg-muted'
+                      : getAttachmentToneClass(attachmentType)
+                  )}
+                >
+                  {attachment.isImage && attachment.thumbnailUrl ? (
+                    <img src={attachment.thumbnailUrl} alt="" className="size-full object-cover" />
+                  ) : (
+                    <Icon className="size-5" />
+                  )}
+                </span>
+                <span className="min-w-0 flex-1">
+                  <span className="block truncate text-sm leading-tight font-medium">{attachmentName}</span>
+                  <span className="block pt-0.5 text-xs leading-tight text-muted-foreground">{attachmentType}</span>
+                </span>
+                <button
+                  type="button"
+                  onClick={() => removeAttachment(attachment.id)}
+                  className="absolute right-1 top-1 flex size-5 items-center justify-center rounded-full border border-border/70 bg-background/70 text-muted-foreground opacity-0 transition-[opacity,color] duration-150 hover:text-foreground group-hover:opacity-100 focus-visible:opacity-100"
+                >
+                  <X className="size-3.5" />
+                </button>
+              </span>
+            )
+          })}
+        </div>
       )}
+      <div className="flex items-center gap-2 px-4 py-4">
+        <input
+          ref={fileInputRef}
+          type="file"
+          multiple
+          className="hidden"
+          onChange={(e) => {
+            const files = e.target.files
+            if (!files || files.length === 0) return
+            const paths = Array.from(files)
+              .map((file) => window.electronUtils?.getPathForFile(file))
+              .filter(Boolean) as string[]
+            if (paths.length > 0) {
+              void addFiles(paths)
+            }
+            e.target.value = ''
+          }}
+        />
+        <button
+          type="button"
+          onClick={() => fileInputRef.current?.click()}
+          className="flex h-7 w-7 shrink-0 items-center justify-center rounded-full text-muted-foreground transition-colors hover:bg-muted hover:text-foreground"
+          aria-label="Attach files"
+        >
+          <Plus className="h-4 w-4" />
+        </button>
+        <PromptInputTextarea
+          placeholder="Type your message..."
+          onKeyDown={handleKeyDown}
+          autoFocus={isActive}
+          focusTrigger={isActive ? `${runId ?? 'new'}:${focusNonce}` : undefined}
+          className="min-h-6 rounded-none border-0 py-0 shadow-none focus-visible:ring-0"
+        />
+        {isProcessing ? (
+          <Button
+            size="icon"
+            onClick={onStop}
+            title={isStopping ? 'Click again to force stop' : 'Stop generation'}
+            className={cn(
+              'h-7 w-7 shrink-0 rounded-full transition-all',
+              isStopping
+                ? 'bg-destructive text-destructive-foreground hover:bg-destructive/90'
+                : 'bg-primary text-primary-foreground hover:bg-primary/90'
+            )}
+          >
+            {isStopping ? (
+              <LoaderIcon className="h-4 w-4 animate-spin" />
+            ) : (
+              <Square className="h-3 w-3 fill-current" />
+            )}
+          </Button>
+        ) : (
+          <Button
+            size="icon"
+            onClick={handleSubmit}
+            disabled={!canSubmit}
+            className={cn(
+              'h-7 w-7 shrink-0 rounded-full transition-all',
+              canSubmit
+                ? 'bg-primary text-primary-foreground hover:bg-primary/90'
+                : 'bg-muted text-muted-foreground'
+            )}
+          >
+            <ArrowUp className="h-4 w-4" />
+          </Button>
+        )}
+      </div>
     </div>
   )
 }
@@ -155,7 +314,7 @@ export interface ChatInputWithMentionsProps {
   knowledgeFiles: string[]
   recentFiles: string[]
   visibleFiles: string[]
-  onSubmit: (message: PromptInputMessage, mentions?: FileMention[]) => void
+  onSubmit: (message: PromptInputMessage, mentions?: FileMention[], attachments?: StagedAttachment[]) => void
   onStop?: () => void
   isProcessing: boolean
   isStopping?: boolean
diff --git a/apps/x/apps/renderer/src/components/chat-message-attachments.tsx b/apps/x/apps/renderer/src/components/chat-message-attachments.tsx
new file mode 100644
index 00000000..298e5f03
--- /dev/null
+++ b/apps/x/apps/renderer/src/components/chat-message-attachments.tsx
@@ -0,0 +1,137 @@
+import {
+  AudioLines,
+  FileArchive,
+  FileCode2,
+  FileIcon,
+  FileSpreadsheet,
+  FileText,
+  FileVideo,
+} from 'lucide-react'
+import { useEffect, useMemo, useState } from 'react'
+
+import type { MessageAttachment } from '@/lib/chat-conversation'
+import {
+  type AttachmentIconKind,
+  getAttachmentDisplayName,
+  getAttachmentIconKind,
+  getAttachmentToneClass,
+  getAttachmentTypeLabel,
+} from '@/lib/attachment-presentation'
+import { isImageMime, toFileUrl } from '@/lib/file-utils'
+import { cn } from '@/lib/utils'
+
+function getAttachmentIcon(kind: AttachmentIconKind) {
+  switch (kind) {
+    case 'audio':
+      return AudioLines
+    case 'video':
+      return FileVideo
+    case 'spreadsheet':
+      return FileSpreadsheet
+    case 'archive':
+      return FileArchive
+    case 'code':
+      return FileCode2
+    case 'text':
+      return FileText
+    default:
+      return FileIcon
+  }
+}
+
+function ImageAttachmentPreview({ attachment }: { attachment: MessageAttachment }) {
+  const fallbackFileUrl = useMemo(() => toFileUrl(attachment.path), [attachment.path])
+  const [src, setSrc] = useState(attachment.thumbnailUrl || fallbackFileUrl)
+  const [triedBase64, setTriedBase64] = useState(Boolean(attachment.thumbnailUrl))
+
+  useEffect(() => {
+    const nextSrc = attachment.thumbnailUrl || fallbackFileUrl
+    setSrc(nextSrc)
+    setTriedBase64(Boolean(attachment.thumbnailUrl))
+  }, [attachment.thumbnailUrl, fallbackFileUrl])
+
+  const loadBase64 = useMemo(
+    () => async () => {
+      try {
+        const result = await window.ipc.invoke('shell:readFileBase64', { path: attachment.path })
+        const mimeType = result.mimeType || attachment.mimeType || 'image/*'
+        setSrc(`data:${mimeType};base64,${result.data}`)
+      } catch {
+        // Keep current src; fallback rendering (broken image icon) is better than crashing.
+      }
+    },
+    [attachment.mimeType, attachment.path]
+  )
+
+  useEffect(() => {
+    if (attachment.thumbnailUrl || triedBase64) return
+    setTriedBase64(true)
+    void loadBase64()
+  }, [attachment.thumbnailUrl, loadBase64, triedBase64])
+
+  return (
+    <img
+      src={src}
+      alt="Image attachment"
+      className="h-44 w-auto max-w-[300px] rounded-2xl border border-border/70 bg-muted object-cover"
+      onError={() => {
+        if (triedBase64) return
+        setTriedBase64(true)
+        void loadBase64()
+      }}
+    />
+  )
+}
+
+interface ChatMessageAttachmentsProps {
+  attachments: MessageAttachment[]
+  className?: string
+}
+
+export function ChatMessageAttachments({ attachments, className }: ChatMessageAttachmentsProps) {
+  if (attachments.length === 0) return null
+
+  const imageAttachments = attachments.filter((attachment) => isImageMime(attachment.mimeType))
+  const fileAttachments = attachments.filter((attachment) => !isImageMime(attachment.mimeType))
+
+  return (
+    <div className={cn('flex flex-col items-end gap-2', className)}>
+      {imageAttachments.length > 0 && (
+        <div className="flex flex-wrap justify-end gap-2">
+          {imageAttachments.map((attachment, index) => (
+            <ImageAttachmentPreview key={`${attachment.path}-${index}`} attachment={attachment} />
+          ))}
+        </div>
+      )}
+      {fileAttachments.length > 0 && (
+        <div className="flex flex-wrap justify-end gap-2">
+          {fileAttachments.map((attachment, index) => {
+            const Icon = getAttachmentIcon(getAttachmentIconKind(attachment))
+            const attachmentName = getAttachmentDisplayName(attachment)
+            const attachmentType = getAttachmentTypeLabel(attachment)
+            return (
+              <span
+                key={`${attachment.path}-${index}`}
+                className="inline-flex min-w-[240px] max-w-[440px] items-center gap-3 rounded-2xl border border-border/50 bg-muted/75 px-3 py-2.5 text-sm text-foreground"
+                title={attachmentName}
+              >
+                <span
+                  className={cn(
+                    'flex size-12 shrink-0 items-center justify-center rounded-xl',
+                    getAttachmentToneClass(attachmentType)
+                  )}
+                >
+                  <Icon className="size-6 shrink-0" />
+                </span>
+                <span className="min-w-0 flex-1">
+                  <span className="block truncate text-sm leading-tight font-medium">{attachmentName}</span>
+                  <span className="block pt-0.5 text-xs leading-tight text-muted-foreground">{attachmentType}</span>
+                </span>
+              </span>
+            )
+          })}
+        </div>
+      )}
+    </div>
+  )
+}
diff --git a/apps/x/apps/renderer/src/components/chat-sidebar.tsx b/apps/x/apps/renderer/src/components/chat-sidebar.tsx
index 170e8869..f020cdae 100644
--- a/apps/x/apps/renderer/src/components/chat-sidebar.tsx
+++ b/apps/x/apps/renderer/src/components/chat-sidebar.tsx
@@ -25,7 +25,8 @@ import { type PromptInputMessage, type FileMention } from '@/components/ai-eleme
 import { FileCardProvider } from '@/contexts/file-card-context'
 import { MarkdownPreOverride } from '@/components/ai-elements/markdown-code-override'
 import { TabBar, type ChatTab } from '@/components/tab-bar'
-import { ChatInputWithMentions } from '@/components/chat-input-with-mentions'
+import { ChatInputWithMentions, type StagedAttachment } from '@/components/chat-input-with-mentions'
+import { ChatMessageAttachments } from '@/components/chat-message-attachments'
 import { wikiLabel } from '@/lib/wiki-links'
 import {
   type ChatTabViewState,
@@ -89,7 +90,7 @@ interface ChatSidebarProps {
   isProcessing: boolean
   isStopping?: boolean
   onStop?: () => void
-  onSubmit: (message: PromptInputMessage, mentions?: FileMention[]) => void
+  onSubmit: (message: PromptInputMessage, mentions?: FileMention[], attachments?: StagedAttachment[]) => void
   knowledgeFiles?: string[]
   recentFiles?: string[]
   visibleFiles?: string[]
@@ -256,6 +257,18 @@ export function ChatSidebar({
   const renderConversationItem = (item: ConversationItem, tabId: string) => {
     if (isChatMessage(item)) {
       if (item.role === 'user') {
+        if (item.attachments && item.attachments.length > 0) {
+          return (
+            <Message key={item.id} from={item.role}>
+              <MessageContent className="group-[.is-user]:bg-transparent group-[.is-user]:px-0 group-[.is-user]:py-0 group-[.is-user]:rounded-none">
+                <ChatMessageAttachments attachments={item.attachments} />
+              </MessageContent>
+              {item.content && (
+                <MessageContent>{item.content}</MessageContent>
+              )}
+            </Message>
+          )
+        }
         const { message, files } = parseAttachedFiles(item.content)
         return (
           <Message key={item.id} from={item.role}>
diff --git a/apps/x/apps/renderer/src/lib/attachment-presentation.ts b/apps/x/apps/renderer/src/lib/attachment-presentation.ts
new file mode 100644
index 00000000..7ddedd30
--- /dev/null
+++ b/apps/x/apps/renderer/src/lib/attachment-presentation.ts
@@ -0,0 +1,107 @@
+import { getExtension } from '@/lib/file-utils'
+
+export type AttachmentLike = {
+  filename?: string
+  path: string
+  mimeType: string
+}
+
+export type AttachmentIconKind =
+  | 'audio'
+  | 'video'
+  | 'spreadsheet'
+  | 'archive'
+  | 'code'
+  | 'text'
+  | 'file'
+
+const ARCHIVE_EXTENSIONS = new Set([
+  'zip', 'rar', '7z', 'tar', 'gz', 'bz2', 'xz',
+])
+
+const SPREADSHEET_EXTENSIONS = new Set([
+  'csv', 'tsv', 'xls', 'xlsx',
+])
+
+const CODE_EXTENSIONS = new Set([
+  'js', 'jsx', 'ts', 'tsx', 'json', 'yaml', 'yml', 'toml', 'xml',
+  'py', 'rb', 'go', 'rs', 'java', 'kt', 'c', 'cpp', 'h', 'hpp',
+  'cs', 'php', 'swift', 'sh', 'sql', 'html', 'css', 'scss', 'md',
+])
+
+export function getAttachmentDisplayName(attachment: AttachmentLike): string {
+  if (attachment.filename) return attachment.filename
+  const fromPath = attachment.path.split(/[\\/]/).pop()
+  return fromPath || attachment.path
+}
+
+export function getAttachmentTypeLabel(attachment: AttachmentLike): string {
+  const ext = getExtension(getAttachmentDisplayName(attachment))
+  if (ext) return ext.toUpperCase()
+
+  const mediaType = attachment.mimeType.toLowerCase()
+  if (mediaType.startsWith('audio/')) return 'AUDIO'
+  if (mediaType.startsWith('video/')) return 'VIDEO'
+  if (mediaType.startsWith('text/')) return 'TEXT'
+  if (mediaType.startsWith('image/')) return 'IMAGE'
+
+  const [, subtypeRaw = 'file'] = mediaType.split('/')
+  const subtype = subtypeRaw.split(';')[0].split('+').pop() || 'file'
+  const cleaned = subtype.replace(/[^a-z0-9]/gi, '')
+  return cleaned ? cleaned.toUpperCase() : 'FILE'
+}
+
+export function getAttachmentIconKind(attachment: AttachmentLike): AttachmentIconKind {
+  const mediaType = attachment.mimeType.toLowerCase()
+  const ext = getExtension(attachment.filename || attachment.path)
+
+  if (mediaType.startsWith('audio/')) return 'audio'
+  if (mediaType.startsWith('video/')) return 'video'
+  if (mediaType.includes('spreadsheet') || SPREADSHEET_EXTENSIONS.has(ext)) return 'spreadsheet'
+  if (mediaType.includes('zip') || mediaType.includes('compressed') || ARCHIVE_EXTENSIONS.has(ext)) return 'archive'
+  if (
+    mediaType.includes('json')
+    || mediaType.includes('javascript')
+    || mediaType.includes('typescript')
+    || mediaType.includes('xml')
+    || CODE_EXTENSIONS.has(ext)
+  ) {
+    return 'code'
+  }
+  if (mediaType.startsWith('text/') || mediaType.includes('pdf') || mediaType.includes('document')) {
+    return 'text'
+  }
+
+  return 'file'
+}
+
+export function getAttachmentToneClass(typeLabel: string): string {
+  switch (typeLabel) {
+    case 'PDF':
+      return 'bg-red-500 text-white'
+    case 'CSV':
+    case 'XLS':
+    case 'XLSX':
+    case 'TSV':
+      return 'bg-emerald-500 text-white'
+    case 'ZIP':
+    case 'RAR':
+    case '7Z':
+    case 'TAR':
+    case 'GZ':
+      return 'bg-amber-500 text-white'
+    case 'MP3':
+    case 'WAV':
+    case 'M4A':
+    case 'FLAC':
+    case 'AAC':
+      return 'bg-fuchsia-500 text-white'
+    case 'MP4':
+    case 'MOV':
+    case 'AVI':
+    case 'WEBM':
+      return 'bg-violet-500 text-white'
+    default:
+      return 'bg-primary/85 text-primary-foreground'
+  }
+}
diff --git a/apps/x/apps/renderer/src/lib/chat-conversation.ts b/apps/x/apps/renderer/src/lib/chat-conversation.ts
index 4dcd4c8c..830e250b 100644
--- a/apps/x/apps/renderer/src/lib/chat-conversation.ts
+++ b/apps/x/apps/renderer/src/lib/chat-conversation.ts
@@ -2,10 +2,19 @@ import type { ToolUIPart } from 'ai'
 import z from 'zod'
 import { AskHumanRequestEvent, ToolPermissionRequestEvent } from '@x/shared/src/runs.js'
 
+export interface MessageAttachment {
+  path: string
+  filename: string
+  mimeType: string
+  size?: number
+  thumbnailUrl?: string
+}
+
 export interface ChatMessage {
   id: string
   role: 'user' | 'assistant'
   content: string
+  attachments?: MessageAttachment[]
   timestamp: number
 }
 
diff --git a/apps/x/apps/renderer/src/lib/file-utils.ts b/apps/x/apps/renderer/src/lib/file-utils.ts
new file mode 100644
index 00000000..3ac3431a
--- /dev/null
+++ b/apps/x/apps/renderer/src/lib/file-utils.ts
@@ -0,0 +1,61 @@
+const IMAGE_MIMES = new Set([
+    'image/png', 'image/jpeg', 'image/jpg', 'image/gif', 'image/webp',
+    'image/svg+xml', 'image/bmp', 'image/tiff', 'image/ico', 'image/avif',
+]);
+
+const EXTENSION_TO_MIME: Record<string, string> = {
+    // Images
+    png: 'image/png', jpg: 'image/jpeg', jpeg: 'image/jpeg', gif: 'image/gif',
+    webp: 'image/webp', svg: 'image/svg+xml', bmp: 'image/bmp', ico: 'image/ico',
+    avif: 'image/avif', tiff: 'image/tiff',
+    // Text / code
+    txt: 'text/plain', md: 'text/markdown', html: 'text/html', css: 'text/css',
+    csv: 'text/csv', xml: 'text/xml',
+    js: 'text/javascript', ts: 'text/typescript', jsx: 'text/javascript',
+    tsx: 'text/typescript', json: 'application/json', yaml: 'text/yaml',
+    yml: 'text/yaml', toml: 'text/toml',
+    py: 'text/x-python', rb: 'text/x-ruby', rs: 'text/x-rust',
+    go: 'text/x-go', java: 'text/x-java', c: 'text/x-c', cpp: 'text/x-c++',
+    h: 'text/x-c', hpp: 'text/x-c++', sh: 'text/x-shellscript',
+    // Documents
+    pdf: 'application/pdf',
+    // Archives
+    zip: 'application/zip',
+};
+
+export function isImageMime(mimeType: string): boolean {
+    return IMAGE_MIMES.has(mimeType) || mimeType.startsWith('image/');
+}
+
+export function getMimeFromExtension(ext: string): string {
+    const normalized = ext.toLowerCase().replace(/^\./, '');
+    return EXTENSION_TO_MIME[normalized] || 'application/octet-stream';
+}
+
+export function getFileDisplayName(filePath: string): string {
+    return filePath.split('/').pop() || filePath;
+}
+
+export function getExtension(filePath: string): string {
+    const name = filePath.split('/').pop() || '';
+    const dotIndex = name.lastIndexOf('.');
+    return dotIndex > 0 ? name.slice(dotIndex + 1).toLowerCase() : '';
+}
+
+export function toFileUrl(filePath: string): string {
+    if (!filePath) return filePath;
+    if (
+        filePath.startsWith('data:') ||
+        filePath.startsWith('file://') ||
+        filePath.startsWith('http://') ||
+        filePath.startsWith('https://')
+    ) {
+        return filePath;
+    }
+    const normalized = filePath.replace(/\\/g, '/');
+    const encoded = encodeURI(normalized);
+    if (/^[A-Za-z]:\//.test(normalized)) {
+        return `file:///${encoded}`;
+    }
+    return `file://${encoded}`;
+}
diff --git a/apps/x/packages/core/src/agents/runtime.ts b/apps/x/packages/core/src/agents/runtime.ts
index abeeb53a..e1924523 100644
--- a/apps/x/packages/core/src/agents/runtime.ts
+++ b/apps/x/packages/core/src/agents/runtime.ts
@@ -357,6 +357,12 @@ export async function loadAgent(id: string): Promise<z.infer<typeof Agent>> {
     return await repo.fetch(id);
 }
 
+function formatBytes(bytes: number): string {
+    if (bytes < 1024) return `${bytes} B`;
+    if (bytes < 1024 * 1024) return `${(bytes / 1024).toFixed(1)} KB`;
+    return `${(bytes / (1024 * 1024)).toFixed(1)} MB`;
+}
+
 export function convertFromMessages(messages: z.infer<typeof Message>[]): ModelMessage[] {
     const result: ModelMessage[] = [];
     for (const msg of messages) {
@@ -400,11 +406,37 @@ export function convertFromMessages(messages: z.infer<typeof Message>[]): ModelM
                 });
                 break;
             case "user":
-                result.push({
-                    role: "user",
-                    content: msg.content,
-                    providerOptions,
-                });
+                if (typeof msg.content === 'string') {
+                    // Legacy string — pass through unchanged
+                    result.push({
+                        role: "user",
+                        content: msg.content,
+                        providerOptions,
+                    });
+                } else {
+                    // New content parts array — collapse to text for LLM
+                    const textSegments: string[] = [];
+                    const attachmentLines: string[] = [];
+
+                    for (const part of msg.content) {
+                        if (part.type === "attachment") {
+                            const sizeStr = part.size ? `, ${formatBytes(part.size)}` : '';
+                            attachmentLines.push(`- ${part.filename} (${part.mimeType}${sizeStr}) at ${part.path}`);
+                        } else {
+                            textSegments.push(part.text);
+                        }
+                    }
+
+                    if (attachmentLines.length > 0) {
+                        textSegments.unshift("User has attached the following files:", ...attachmentLines, "");
+                    }
+
+                    result.push({
+                        role: "user",
+                        content: textSegments.join("\n"),
+                        providerOptions,
+                    });
+                }
                 break;
             case "tool":
                 result.push({
diff --git a/apps/x/packages/core/src/application/lib/message-queue.ts b/apps/x/packages/core/src/application/lib/message-queue.ts
index c60ecd1f..2b864840 100644
--- a/apps/x/packages/core/src/application/lib/message-queue.ts
+++ b/apps/x/packages/core/src/application/lib/message-queue.ts
@@ -1,12 +1,16 @@
 import { IMonotonicallyIncreasingIdGenerator } from "./id-gen.js";
+import { UserMessageContent } from "@x/shared/dist/message.js";
+import z from "zod";
+
+export type UserMessageContentType = z.infer<typeof UserMessageContent>;
 
 type EnqueuedMessage = {
     messageId: string;
-    message: string;
+    message: UserMessageContentType;
 };
 
 export interface IMessageQueue {
-    enqueue(runId: string, message: string): Promise<string>;
+    enqueue(runId: string, message: UserMessageContentType): Promise<string>;
     dequeue(runId: string): Promise<EnqueuedMessage | null>;
 }
 
@@ -22,7 +26,7 @@ export class InMemoryMessageQueue implements IMessageQueue {
         this.idGenerator = idGenerator;
     }
 
-    async enqueue(runId: string, message: string): Promise<string> {
+    async enqueue(runId: string, message: UserMessageContentType): Promise<string> {
         if (!this.store[runId]) {
             this.store[runId] = [];
         }
diff --git a/apps/x/packages/core/src/runs/repo.ts b/apps/x/packages/core/src/runs/repo.ts
index 15873c49..5d563f1f 100644
--- a/apps/x/packages/core/src/runs/repo.ts
+++ b/apps/x/packages/core/src/runs/repo.ts
@@ -46,10 +46,18 @@ export class FSRunsRepo implements IRunsRepo {
                 const messageEvent = event as z.infer<typeof MessageEvent>;
                 if (messageEvent.message.role === 'user') {
                     const content = messageEvent.message.content;
-                    if (typeof content === 'string' && content.trim()) {
-                        // Clean attached-files XML and @mentions, then truncate to 100 chars
-                        const cleaned = cleanContentForTitle(content);
-                        if (!cleaned) continue; // Skip if only attached files/mentions
+                    let textContent: string | undefined;
+                    if (typeof content === 'string') {
+                        textContent = content;
+                    } else {
+                        textContent = content
+                            .filter(p => p.type === 'text')
+                            .map(p => p.text)
+                            .join('');
+                    }
+                    if (textContent && textContent.trim()) {
+                        const cleaned = cleanContentForTitle(textContent);
+                        if (!cleaned) continue;
                         return cleaned.length > 100 ? cleaned.substring(0, 100) : cleaned;
                     }
                 }
@@ -90,9 +98,17 @@ export class FSRunsRepo implements IRunsRepo {
                             if (msg.role === 'user') {
                                 // Found first user message - use as title
                                 const content = msg.content;
-                                if (typeof content === 'string' && content.trim()) {
-                                    // Clean attached-files XML and @mentions, then truncate
-                                    const cleaned = cleanContentForTitle(content);
+                                let textContent: string | undefined;
+                                if (typeof content === 'string') {
+                                    textContent = content;
+                                } else {
+                                    textContent = content
+                                        .filter(p => p.type === 'text')
+                                        .map(p => p.text)
+                                        .join('');
+                                }
+                                if (textContent && textContent.trim()) {
+                                    const cleaned = cleanContentForTitle(textContent);
                                     if (cleaned) {
                                         title = cleaned.length > 100 ? cleaned.substring(0, 100) : cleaned;
                                     }
diff --git a/apps/x/packages/core/src/runs/runs.ts b/apps/x/packages/core/src/runs/runs.ts
index 75f71d5f..0f123497 100644
--- a/apps/x/packages/core/src/runs/runs.ts
+++ b/apps/x/packages/core/src/runs/runs.ts
@@ -1,6 +1,6 @@
 import z from "zod";
 import container from "../di/container.js";
-import { IMessageQueue } from "../application/lib/message-queue.js";
+import { IMessageQueue, UserMessageContentType } from "../application/lib/message-queue.js";
 import { AskHumanResponseEvent, ToolPermissionRequestEvent, ToolPermissionResponseEvent, CreateRunOptions, Run, ListRunsResponse, ToolPermissionAuthorizePayload, AskHumanResponsePayload } from "@x/shared/dist/runs.js";
 import { IRunsRepo } from "./repo.js";
 import { IAgentRuntime } from "../agents/runtime.js";
@@ -19,7 +19,7 @@ export async function createRun(opts: z.infer<typeof CreateRunOptions>): Promise
     return run;
 }
 
-export async function createMessage(runId: string, message: string): Promise<string> {
+export async function createMessage(runId: string, message: UserMessageContentType): Promise<string> {
     const queue = container.resolve<IMessageQueue>('messageQueue');
     const id = await queue.enqueue(runId, message);
     const runtime = container.resolve<IAgentRuntime>('agentRuntime');
diff --git a/apps/x/packages/shared/src/ipc.ts b/apps/x/packages/shared/src/ipc.ts
index 71491f8f..c0276d9a 100644
--- a/apps/x/packages/shared/src/ipc.ts
+++ b/apps/x/packages/shared/src/ipc.ts
@@ -6,6 +6,7 @@ import { LlmModelConfig } from './models.js';
 import { AgentScheduleConfig, AgentScheduleEntry } from './agent-schedule.js';
 import { AgentScheduleState } from './agent-schedule-state.js';
 import { ServiceEvent } from './service-events.js';
+import { UserMessageContent } from './message.js';
 
 // ============================================================================
 // Runtime Validation Schemas (Single Source of Truth)
@@ -128,7 +129,7 @@ const ipcSchemas = {
   'runs:createMessage': {
     req: z.object({
       runId: z.string(),
-      message: z.string(),
+      message: UserMessageContent,
     }),
     res: z.object({
       messageId: z.string(),
diff --git a/apps/x/packages/shared/src/message.ts b/apps/x/packages/shared/src/message.ts
index 702b103a..be761853 100644
--- a/apps/x/packages/shared/src/message.ts
+++ b/apps/x/packages/shared/src/message.ts
@@ -28,9 +28,30 @@ export const AssistantContentPart = z.union([
     ToolCallPart,
 ]);
 
+// A piece of user-typed text within a content array
+export const UserTextPart = z.object({
+    type: z.literal("text"),
+    text: z.string(),
+});
+
+// An attachment within a content array
+export const UserAttachmentPart = z.object({
+    type: z.literal("attachment"),
+    path: z.string(),                    // absolute file path
+    filename: z.string(),                // display name ("photo.png")
+    mimeType: z.string(),                // MIME type ("image/png", "text/plain")
+    size: z.number().optional(),         // bytes
+});
+
+// Any single part of a user message (text or attachment)
+export const UserContentPart = z.union([UserTextPart, UserAttachmentPart]);
+
+// Named type for user message content — used everywhere instead of repeating the union
+export const UserMessageContent = z.union([z.string(), z.array(UserContentPart)]);
+
 export const UserMessage = z.object({
     role: z.literal("user"),
-    content: z.string(),
+    content: UserMessageContent,
     providerOptions: ProviderOptions.optional(),
 });
 

From 9df1bb6765226a8516bbbd2d027d53286c89ce15 Mon Sep 17 00:00:00 2001
From: arkml <6592213+arkml@users.noreply.github.com>
Date: Fri, 27 Feb 2026 15:52:19 +0530
Subject: [PATCH 35/36] Config graph model (#411)

* config to specify graph model
---
 .../src/components/onboarding-modal.tsx       | 121 +++++++++++------
 .../src/components/settings-dialog.tsx        | 123 ++++++++++++------
 apps/x/packages/core/src/agents/runtime.ts    |   7 +-
 apps/x/packages/shared/src/models.ts          |   1 +
 4 files changed, 166 insertions(+), 86 deletions(-)

diff --git a/apps/x/apps/renderer/src/components/onboarding-modal.tsx b/apps/x/apps/renderer/src/components/onboarding-modal.tsx
index 4855cab7..9398f2fe 100644
--- a/apps/x/apps/renderer/src/components/onboarding-modal.tsx
+++ b/apps/x/apps/renderer/src/components/onboarding-modal.tsx
@@ -57,14 +57,14 @@ export function OnboardingModal({ open, onComplete }: OnboardingModalProps) {
   const [modelsCatalog, setModelsCatalog] = useState<Record<string, LlmModelOption[]>>({})
   const [modelsLoading, setModelsLoading] = useState(false)
   const [modelsError, setModelsError] = useState<string | null>(null)
-  const [providerConfigs, setProviderConfigs] = useState<Record<LlmProviderFlavor, { apiKey: string; baseURL: string; model: string }>>({
-    openai: { apiKey: "", baseURL: "", model: "" },
-    anthropic: { apiKey: "", baseURL: "", model: "" },
-    google: { apiKey: "", baseURL: "", model: "" },
-    openrouter: { apiKey: "", baseURL: "", model: "" },
-    aigateway: { apiKey: "", baseURL: "", model: "" },
-    ollama: { apiKey: "", baseURL: "http://localhost:11434", model: "" },
-    "openai-compatible": { apiKey: "", baseURL: "http://localhost:1234/v1", model: "" },
+  const [providerConfigs, setProviderConfigs] = useState<Record<LlmProviderFlavor, { apiKey: string; baseURL: string; model: string; knowledgeGraphModel: string }>>({
+    openai: { apiKey: "", baseURL: "", model: "", knowledgeGraphModel: "" },
+    anthropic: { apiKey: "", baseURL: "", model: "", knowledgeGraphModel: "" },
+    google: { apiKey: "", baseURL: "", model: "", knowledgeGraphModel: "" },
+    openrouter: { apiKey: "", baseURL: "", model: "", knowledgeGraphModel: "" },
+    aigateway: { apiKey: "", baseURL: "", model: "", knowledgeGraphModel: "" },
+    ollama: { apiKey: "", baseURL: "http://localhost:11434", model: "", knowledgeGraphModel: "" },
+    "openai-compatible": { apiKey: "", baseURL: "http://localhost:1234/v1", model: "", knowledgeGraphModel: "" },
   })
   const [testState, setTestState] = useState<{ status: "idle" | "testing" | "success" | "error"; error?: string }>({
     status: "idle",
@@ -87,7 +87,7 @@ export function OnboardingModal({ open, onComplete }: OnboardingModalProps) {
   const [slackConnecting, setSlackConnecting] = useState(false)
 
   const updateProviderConfig = useCallback(
-    (provider: LlmProviderFlavor, updates: Partial<{ apiKey: string; baseURL: string; model: string }>) => {
+    (provider: LlmProviderFlavor, updates: Partial<{ apiKey: string; baseURL: string; model: string; knowledgeGraphModel: string }>) => {
       setProviderConfigs(prev => ({
         ...prev,
         [provider]: { ...prev[provider], ...updates },
@@ -287,6 +287,7 @@ export function OnboardingModal({ open, onComplete }: OnboardingModalProps) {
       const apiKey = activeConfig.apiKey.trim() || undefined
       const baseURL = activeConfig.baseURL.trim() || undefined
       const model = activeConfig.model.trim()
+      const knowledgeGraphModel = activeConfig.knowledgeGraphModel.trim() || undefined
       const providerConfig = {
         provider: {
           flavor: llmProvider,
@@ -294,6 +295,7 @@ export function OnboardingModal({ open, onComplete }: OnboardingModalProps) {
           baseURL,
         },
         model,
+        knowledgeGraphModel,
       }
       const result = await window.ipc.invoke("models:test", providerConfig)
       if (result.success) {
@@ -657,39 +659,74 @@ export function OnboardingModal({ open, onComplete }: OnboardingModalProps) {
             )}
           </div>
 
-          <div className="space-y-2">
-            <span className="text-xs font-medium text-muted-foreground uppercase tracking-wider">Model</span>
-            {modelsLoading ? (
-              <div className="flex items-center gap-2 text-sm text-muted-foreground">
-                <Loader2 className="size-4 animate-spin" />
-                Loading models...
-              </div>
-            ) : showModelInput ? (
-              <Input
-                value={activeConfig.model}
-                onChange={(e) => updateProviderConfig(llmProvider, { model: e.target.value })}
-                placeholder="Enter model"
-              />
-            ) : (
-              <Select
-                value={activeConfig.model}
-                onValueChange={(value) => updateProviderConfig(llmProvider, { model: value })}
-              >
-                <SelectTrigger>
-                  <SelectValue placeholder="Select a model" />
-                </SelectTrigger>
-                <SelectContent>
-                  {modelsForProvider.map((model) => (
-                    <SelectItem key={model.id} value={model.id}>
-                      {model.name || model.id}
-                    </SelectItem>
-                  ))}
-                </SelectContent>
-              </Select>
-            )}
-            {modelsError && (
-              <div className="text-xs text-destructive">{modelsError}</div>
-            )}
+          <div className="grid grid-cols-2 gap-3">
+            <div className="space-y-2">
+              <span className="text-xs font-medium text-muted-foreground uppercase tracking-wider">Assistant model</span>
+              {modelsLoading ? (
+                <div className="flex items-center gap-2 text-sm text-muted-foreground">
+                  <Loader2 className="size-4 animate-spin" />
+                  Loading...
+                </div>
+              ) : showModelInput ? (
+                <Input
+                  value={activeConfig.model}
+                  onChange={(e) => updateProviderConfig(llmProvider, { model: e.target.value })}
+                  placeholder="Enter model"
+                />
+              ) : (
+                <Select
+                  value={activeConfig.model}
+                  onValueChange={(value) => updateProviderConfig(llmProvider, { model: value })}
+                >
+                  <SelectTrigger>
+                    <SelectValue placeholder="Select a model" />
+                  </SelectTrigger>
+                  <SelectContent>
+                    {modelsForProvider.map((model) => (
+                      <SelectItem key={model.id} value={model.id}>
+                        {model.name || model.id}
+                      </SelectItem>
+                    ))}
+                  </SelectContent>
+                </Select>
+              )}
+              {modelsError && (
+                <div className="text-xs text-destructive">{modelsError}</div>
+              )}
+            </div>
+
+            <div className="space-y-2">
+              <span className="text-xs font-medium text-muted-foreground uppercase tracking-wider">Knowledge graph model</span>
+              {modelsLoading ? (
+                <div className="flex items-center gap-2 text-sm text-muted-foreground">
+                  <Loader2 className="size-4 animate-spin" />
+                  Loading...
+                </div>
+              ) : showModelInput ? (
+                <Input
+                  value={activeConfig.knowledgeGraphModel}
+                  onChange={(e) => updateProviderConfig(llmProvider, { knowledgeGraphModel: e.target.value })}
+                  placeholder={activeConfig.model || "Enter model"}
+                />
+              ) : (
+                <Select
+                  value={activeConfig.knowledgeGraphModel || "__same__"}
+                  onValueChange={(value) => updateProviderConfig(llmProvider, { knowledgeGraphModel: value === "__same__" ? "" : value })}
+                >
+                  <SelectTrigger>
+                    <SelectValue placeholder="Select a model" />
+                  </SelectTrigger>
+                  <SelectContent>
+                    <SelectItem value="__same__">Same as assistant</SelectItem>
+                    {modelsForProvider.map((model) => (
+                      <SelectItem key={model.id} value={model.id}>
+                        {model.name || model.id}
+                      </SelectItem>
+                    ))}
+                  </SelectContent>
+                </Select>
+              )}
+            </div>
           </div>
 
           {showApiKey && (
diff --git a/apps/x/apps/renderer/src/components/settings-dialog.tsx b/apps/x/apps/renderer/src/components/settings-dialog.tsx
index 840b9cf4..2948ae02 100644
--- a/apps/x/apps/renderer/src/components/settings-dialog.tsx
+++ b/apps/x/apps/renderer/src/components/settings-dialog.tsx
@@ -167,14 +167,14 @@ const defaultBaseURLs: Partial<Record<LlmProviderFlavor, string>> = {
 
 function ModelSettings({ dialogOpen }: { dialogOpen: boolean }) {
   const [provider, setProvider] = useState<LlmProviderFlavor>("openai")
-  const [providerConfigs, setProviderConfigs] = useState<Record<LlmProviderFlavor, { apiKey: string; baseURL: string; model: string }>>({
-    openai: { apiKey: "", baseURL: "", model: "" },
-    anthropic: { apiKey: "", baseURL: "", model: "" },
-    google: { apiKey: "", baseURL: "", model: "" },
-    openrouter: { apiKey: "", baseURL: "", model: "" },
-    aigateway: { apiKey: "", baseURL: "", model: "" },
-    ollama: { apiKey: "", baseURL: "http://localhost:11434", model: "" },
-    "openai-compatible": { apiKey: "", baseURL: "http://localhost:1234/v1", model: "" },
+  const [providerConfigs, setProviderConfigs] = useState<Record<LlmProviderFlavor, { apiKey: string; baseURL: string; model: string; knowledgeGraphModel: string }>>({
+    openai: { apiKey: "", baseURL: "", model: "", knowledgeGraphModel: "" },
+    anthropic: { apiKey: "", baseURL: "", model: "", knowledgeGraphModel: "" },
+    google: { apiKey: "", baseURL: "", model: "", knowledgeGraphModel: "" },
+    openrouter: { apiKey: "", baseURL: "", model: "", knowledgeGraphModel: "" },
+    aigateway: { apiKey: "", baseURL: "", model: "", knowledgeGraphModel: "" },
+    ollama: { apiKey: "", baseURL: "http://localhost:11434", model: "", knowledgeGraphModel: "" },
+    "openai-compatible": { apiKey: "", baseURL: "http://localhost:1234/v1", model: "", knowledgeGraphModel: "" },
   })
   const [modelsCatalog, setModelsCatalog] = useState<Record<string, LlmModelOption[]>>({})
   const [modelsLoading, setModelsLoading] = useState(false)
@@ -199,7 +199,7 @@ function ModelSettings({ dialogOpen }: { dialogOpen: boolean }) {
     (!requiresBaseURL || activeConfig.baseURL.trim().length > 0)
 
   const updateConfig = useCallback(
-    (prov: LlmProviderFlavor, updates: Partial<{ apiKey: string; baseURL: string; model: string }>) => {
+    (prov: LlmProviderFlavor, updates: Partial<{ apiKey: string; baseURL: string; model: string; knowledgeGraphModel: string }>) => {
       setProviderConfigs(prev => ({
         ...prev,
         [prov]: { ...prev[prov], ...updates },
@@ -229,6 +229,7 @@ function ModelSettings({ dialogOpen }: { dialogOpen: boolean }) {
               apiKey: parsed.provider.apiKey || "",
               baseURL: parsed.provider.baseURL || (defaultBaseURLs[flavor] || ""),
               model: parsed.model,
+              knowledgeGraphModel: parsed.knowledgeGraphModel || "",
             },
           }))
         }
@@ -296,6 +297,7 @@ function ModelSettings({ dialogOpen }: { dialogOpen: boolean }) {
           baseURL: activeConfig.baseURL.trim() || undefined,
         },
         model: activeConfig.model.trim(),
+        knowledgeGraphModel: activeConfig.knowledgeGraphModel.trim() || undefined,
       }
       const result = await window.ipc.invoke("models:test", providerConfig)
       if (result.success) {
@@ -362,40 +364,75 @@ function ModelSettings({ dialogOpen }: { dialogOpen: boolean }) {
         )}
       </div>
 
-      {/* Model selection */}
-      <div className="space-y-2">
-        <span className="text-xs font-medium text-muted-foreground uppercase tracking-wider">Model</span>
-        {modelsLoading ? (
-          <div className="flex items-center gap-2 text-sm text-muted-foreground">
-            <Loader2 className="size-4 animate-spin" />
-            Loading models...
-          </div>
-        ) : showModelInput ? (
-          <Input
-            value={activeConfig.model}
-            onChange={(e) => updateConfig(provider, { model: e.target.value })}
-            placeholder="Enter model"
-          />
-        ) : (
-          <Select
-            value={activeConfig.model}
-            onValueChange={(value) => updateConfig(provider, { model: value })}
-          >
-            <SelectTrigger>
-              <SelectValue placeholder="Select a model" />
-            </SelectTrigger>
-            <SelectContent>
-              {modelsForProvider.map((model) => (
-                <SelectItem key={model.id} value={model.id}>
-                  {model.name || model.id}
-                </SelectItem>
-              ))}
-            </SelectContent>
-          </Select>
-        )}
-        {modelsError && (
-          <div className="text-xs text-destructive">{modelsError}</div>
-        )}
+      {/* Model selection - side by side */}
+      <div className="grid grid-cols-2 gap-3">
+        <div className="space-y-2">
+          <span className="text-xs font-medium text-muted-foreground uppercase tracking-wider">Assistant model</span>
+          {modelsLoading ? (
+            <div className="flex items-center gap-2 text-sm text-muted-foreground">
+              <Loader2 className="size-4 animate-spin" />
+              Loading...
+            </div>
+          ) : showModelInput ? (
+            <Input
+              value={activeConfig.model}
+              onChange={(e) => updateConfig(provider, { model: e.target.value })}
+              placeholder="Enter model"
+            />
+          ) : (
+            <Select
+              value={activeConfig.model}
+              onValueChange={(value) => updateConfig(provider, { model: value })}
+            >
+              <SelectTrigger>
+                <SelectValue placeholder="Select a model" />
+              </SelectTrigger>
+              <SelectContent>
+                {modelsForProvider.map((model) => (
+                  <SelectItem key={model.id} value={model.id}>
+                    {model.name || model.id}
+                  </SelectItem>
+                ))}
+              </SelectContent>
+            </Select>
+          )}
+          {modelsError && (
+            <div className="text-xs text-destructive">{modelsError}</div>
+          )}
+        </div>
+
+        <div className="space-y-2">
+          <span className="text-xs font-medium text-muted-foreground uppercase tracking-wider">Knowledge graph model</span>
+          {modelsLoading ? (
+            <div className="flex items-center gap-2 text-sm text-muted-foreground">
+              <Loader2 className="size-4 animate-spin" />
+              Loading...
+            </div>
+          ) : showModelInput ? (
+            <Input
+              value={activeConfig.knowledgeGraphModel}
+              onChange={(e) => updateConfig(provider, { knowledgeGraphModel: e.target.value })}
+              placeholder={activeConfig.model || "Enter model"}
+            />
+          ) : (
+            <Select
+              value={activeConfig.knowledgeGraphModel || "__same__"}
+              onValueChange={(value) => updateConfig(provider, { knowledgeGraphModel: value === "__same__" ? "" : value })}
+            >
+              <SelectTrigger>
+                <SelectValue placeholder="Select a model" />
+              </SelectTrigger>
+              <SelectContent>
+                <SelectItem value="__same__">Same as assistant</SelectItem>
+                {modelsForProvider.map((model) => (
+                  <SelectItem key={model.id} value={model.id}>
+                    {model.name || model.id}
+                  </SelectItem>
+                ))}
+              </SelectContent>
+            </Select>
+          )}
+        </div>
       </div>
 
       {/* API Key */}
diff --git a/apps/x/packages/core/src/agents/runtime.ts b/apps/x/packages/core/src/agents/runtime.ts
index e1924523..0aeb167f 100644
--- a/apps/x/packages/core/src/agents/runtime.ts
+++ b/apps/x/packages/core/src/agents/runtime.ts
@@ -706,7 +706,12 @@ export async function* streamAgent({
 
     // set up provider + model
     const provider = createProvider(modelConfig.provider);
-    const model = provider.languageModel(modelConfig.model);
+    const knowledgeGraphAgents = ["note_creation", "email-draft", "meeting-prep"];
+    const modelId = (knowledgeGraphAgents.includes(state.agentName!) && modelConfig.knowledgeGraphModel)
+        ? modelConfig.knowledgeGraphModel
+        : modelConfig.model;
+    const model = provider.languageModel(modelId);
+    logger.log(`using model: ${modelId}`);
 
     let loopCounter = 0;
     while (true) {
diff --git a/apps/x/packages/shared/src/models.ts b/apps/x/packages/shared/src/models.ts
index 14e91689..48085e9f 100644
--- a/apps/x/packages/shared/src/models.ts
+++ b/apps/x/packages/shared/src/models.ts
@@ -10,4 +10,5 @@ export const LlmProvider = z.object({
 export const LlmModelConfig = z.object({
   provider: LlmProvider,
   model: z.string(),
+  knowledgeGraphModel: z.string().optional(),
 });

From d7dc27a77e38ad93135999d44a32328489bb788a Mon Sep 17 00:00:00 2001
From: arkml <6592213+arkml@users.noreply.github.com>
Date: Fri, 27 Feb 2026 20:22:54 +0530
Subject: [PATCH 36/36] History (#406)

* notes history
---
 apps/x/apps/main/src/ipc.ts                   |  29 +++
 apps/x/apps/renderer/src/App.tsx              | 152 ++++++++---
 .../src/components/markdown-editor.tsx        |  10 +
 .../src/components/version-history-panel.tsx  | 177 +++++++++++++
 apps/x/packages/core/package.json             |   1 +
 apps/x/packages/core/src/config/config.ts     |   7 +-
 apps/x/packages/core/src/index.ts             |   5 +-
 .../core/src/knowledge/build_graph.ts         |  15 ++
 .../core/src/knowledge/version_history.ts     | 243 ++++++++++++++++++
 .../packages/core/src/workspace/workspace.ts  |  21 ++
 apps/x/packages/shared/src/ipc.ts             |  24 ++
 apps/x/pnpm-lock.yaml                         | 216 +++++++++++++++-
 12 files changed, 860 insertions(+), 40 deletions(-)
 create mode 100644 apps/x/apps/renderer/src/components/version-history-panel.tsx
 create mode 100644 apps/x/packages/core/src/knowledge/version_history.ts

diff --git a/apps/x/apps/main/src/ipc.ts b/apps/x/apps/main/src/ipc.ts
index b0757881..4d272275 100644
--- a/apps/x/apps/main/src/ipc.ts
+++ b/apps/x/apps/main/src/ipc.ts
@@ -31,6 +31,7 @@ import { IAgentScheduleRepo } from '@x/core/dist/agent-schedule/repo.js';
 import { IAgentScheduleStateRepo } from '@x/core/dist/agent-schedule/state-repo.js';
 import { triggerRun as triggerAgentScheduleRun } from '@x/core/dist/agent-schedule/runner.js';
 import { search } from '@x/core/dist/search/search.js';
+import { versionHistory } from '@x/core';
 
 type InvokeChannels = ipc.InvokeChannels;
 type IPCChannels = ipc.IPCChannels;
@@ -105,6 +106,18 @@ let watcher: FSWatcher | null = null;
 const changeQueue = new Set<string>();
 let debounceTimer: ReturnType<typeof setTimeout> | null = null;
 
+/**
+ * Emit knowledge commit event to all renderer windows
+ */
+function emitKnowledgeCommitEvent(): void {
+  const windows = BrowserWindow.getAllWindows();
+  for (const win of windows) {
+    if (!win.isDestroyed() && win.webContents) {
+      win.webContents.send('knowledge:didCommit', {});
+    }
+  }
+}
+
 /**
  * Emit workspace change event to all renderer windows
  */
@@ -283,6 +296,9 @@ export function stopServicesWatcher(): void {
  * Add new handlers here as you add channels to IPCChannels
  */
 export function setupIpcHandlers() {
+  // Forward knowledge commit events to renderer for panel refresh
+  versionHistory.onCommit(() => emitKnowledgeCommitEvent());
+
   registerIpcHandlers({
     'app:getVersions': async () => {
       // args is null for this channel (no request payload)
@@ -498,6 +514,19 @@ export function setupIpcHandlers() {
       const mimeType = mimeMap[ext] || 'application/octet-stream';
       return { data: buffer.toString('base64'), mimeType, size: stat.size };
     },
+    // Knowledge version history handlers
+    'knowledge:history': async (_event, args) => {
+      const commits = await versionHistory.getFileHistory(args.path);
+      return { commits };
+    },
+    'knowledge:fileAtCommit': async (_event, args) => {
+      const content = await versionHistory.getFileAtCommit(args.path, args.oid);
+      return { content };
+    },
+    'knowledge:restore': async (_event, args) => {
+      await versionHistory.restoreFile(args.path, args.oid);
+      return { ok: true };
+    },
     // Search handler
     'search:query': async (_event, args) => {
       return search(args.query, args.limit, args.types);
diff --git a/apps/x/apps/renderer/src/App.tsx b/apps/x/apps/renderer/src/App.tsx
index 0ee4fa5d..af6a4740 100644
--- a/apps/x/apps/renderer/src/App.tsx
+++ b/apps/x/apps/renderer/src/App.tsx
@@ -5,7 +5,7 @@ import { RunEvent, ListRunsResponse } from '@x/shared/src/runs.js';
 import type { LanguageModelUsage, ToolUIPart } from 'ai';
 import './App.css'
 import z from 'zod';
-import { CheckIcon, LoaderIcon, PanelLeftIcon, Maximize2, Minimize2, ChevronLeftIcon, ChevronRightIcon, SquarePen, SearchIcon } from 'lucide-react';
+import { CheckIcon, LoaderIcon, PanelLeftIcon, Maximize2, Minimize2, ChevronLeftIcon, ChevronRightIcon, SquarePen, SearchIcon, HistoryIcon } from 'lucide-react';
 import { cn } from '@/lib/utils';
 import { MarkdownEditor } from './components/markdown-editor';
 import { ChatSidebar } from './components/chat-sidebar';
@@ -49,6 +49,7 @@ import { stripKnowledgePrefix, toKnowledgePath, wikiLabel } from '@/lib/wiki-lin
 import { OnboardingModal } from '@/components/onboarding-modal'
 import { SearchDialog } from '@/components/search-dialog'
 import { BackgroundTaskDetail } from '@/components/background-task-detail'
+import { VersionHistoryPanel } from '@/components/version-history-panel'
 import { FileCardProvider } from '@/contexts/file-card-context'
 import { MarkdownPreOverride } from '@/components/ai-elements/markdown-code-override'
 import { TabBar, type ChatTab, type FileTab } from '@/components/tab-bar'
@@ -506,6 +507,13 @@ function App() {
   const initialContentRef = useRef<string>('')
   const renameInProgressRef = useRef(false)
 
+  // Version history state
+  const [versionHistoryPath, setVersionHistoryPath] = useState<string | null>(null)
+  const [viewingHistoricalVersion, setViewingHistoricalVersion] = useState<{
+    oid: string
+    content: string
+  } | null>(null)
+
   // Chat state
   const [, setMessage] = useState<string>('')
   const [conversation, setConversation] = useState<ConversationItem[]>([])
@@ -1072,6 +1080,14 @@ function App() {
     saveFile()
   }, [debouncedContent, setHistory])
 
+  // Close version history panel when switching files
+  useEffect(() => {
+    if (versionHistoryPath && selectedPath !== versionHistoryPath) {
+      setVersionHistoryPath(null)
+      setViewingHistoricalVersion(null)
+    }
+  }, [selectedPath, versionHistoryPath])
+
   // Load runs list (all pages)
   const loadRuns = useCallback(async () => {
     try {
@@ -3213,6 +3229,31 @@ function App() {
                     ) : null}
                   </div>
                 )}
+                {selectedPath && selectedPath.startsWith('knowledge/') && selectedPath.endsWith('.md') && (
+                  <Tooltip>
+                    <TooltipTrigger asChild>
+                      <button
+                        type="button"
+                        onClick={() => {
+                          if (versionHistoryPath) {
+                            setVersionHistoryPath(null)
+                            setViewingHistoricalVersion(null)
+                          } else {
+                            setVersionHistoryPath(selectedPath)
+                          }
+                        }}
+                        className={cn(
+                          "titlebar-no-drag flex h-8 w-8 items-center justify-center rounded-md text-muted-foreground hover:bg-accent hover:text-foreground transition-colors self-center shrink-0",
+                          versionHistoryPath && "bg-accent text-foreground"
+                        )}
+                        aria-label="Version history"
+                      >
+                        <HistoryIcon className="size-4" />
+                      </button>
+                    </TooltipTrigger>
+                    <TooltipContent side="bottom">Version history</TooltipContent>
+                  </Tooltip>
+                )}
                 {!selectedPath && !isGraphOpen && !selectedTask && (
                   <Tooltip>
                     <TooltipTrigger asChild>
@@ -3276,41 +3317,80 @@ function App() {
                 </div>
               ) : selectedPath ? (
                 selectedPath.endsWith('.md') ? (
-                  <div className="flex-1 min-h-0 flex flex-col overflow-hidden">
-                    {openMarkdownTabs.map((tab) => {
-                      const isActive = activeFileTabId
-                        ? tab.id === activeFileTabId || tab.path === selectedPath
-                        : tab.path === selectedPath
-                      const tabContent = editorContentByPath[tab.path]
-                        ?? (isActive && editorPathRef.current === tab.path ? editorContent : '')
-                      return (
-                        <div
-                          key={tab.id}
-                          className={cn(
-                            'min-h-0 flex-1 flex-col overflow-hidden',
-                            isActive ? 'flex' : 'hidden'
-                          )}
-                          data-file-tab-panel={tab.id}
-                          aria-hidden={!isActive}
-                        >
-                          <MarkdownEditor
-                            content={tabContent}
-                            onChange={(markdown) => handleEditorChange(tab.path, markdown)}
-                            placeholder="Start writing..."
-                            wikiLinks={wikiLinkConfig}
-                            onImageUpload={handleImageUpload}
-                            editorSessionKey={editorSessionByTabId[tab.id] ?? 0}
-                            onHistoryHandlersChange={(handlers) => {
-                              if (handlers) {
-                                fileHistoryHandlersRef.current.set(tab.id, handlers)
-                              } else {
-                                fileHistoryHandlersRef.current.delete(tab.id)
-                              }
-                            }}
-                          />
-                        </div>
-                      )
-                    })}
+                  <div className="flex-1 min-h-0 flex flex-row overflow-hidden">
+                    <div className="flex-1 min-h-0 flex flex-col overflow-hidden">
+                      {openMarkdownTabs.map((tab) => {
+                        const isActive = activeFileTabId
+                          ? tab.id === activeFileTabId || tab.path === selectedPath
+                          : tab.path === selectedPath
+                        const isViewingHistory = viewingHistoricalVersion && isActive && versionHistoryPath === tab.path
+                        const tabContent = isViewingHistory
+                          ? viewingHistoricalVersion.content
+                          : editorContentByPath[tab.path]
+                            ?? (isActive && editorPathRef.current === tab.path ? editorContent : '')
+                        return (
+                          <div
+                            key={tab.id}
+                            className={cn(
+                              'min-h-0 flex-1 flex-col overflow-hidden',
+                              isActive ? 'flex' : 'hidden'
+                            )}
+                            data-file-tab-panel={tab.id}
+                            aria-hidden={!isActive}
+                          >
+                            <MarkdownEditor
+                              content={tabContent}
+                              onChange={(markdown) => { if (!isViewingHistory) handleEditorChange(tab.path, markdown) }}
+                              placeholder="Start writing..."
+                              wikiLinks={wikiLinkConfig}
+                              onImageUpload={handleImageUpload}
+                              editorSessionKey={editorSessionByTabId[tab.id] ?? 0}
+                              onHistoryHandlersChange={(handlers) => {
+                                if (handlers) {
+                                  fileHistoryHandlersRef.current.set(tab.id, handlers)
+                                } else {
+                                  fileHistoryHandlersRef.current.delete(tab.id)
+                                }
+                              }}
+                              editable={!isViewingHistory}
+                            />
+                          </div>
+                        )
+                      })}
+                    </div>
+                    {versionHistoryPath && (
+                      <VersionHistoryPanel
+                        path={versionHistoryPath}
+                        onClose={() => {
+                          setVersionHistoryPath(null)
+                          setViewingHistoricalVersion(null)
+                        }}
+                        onSelectVersion={(oid, content) => {
+                          if (oid === null) {
+                            setViewingHistoricalVersion(null)
+                          } else {
+                            setViewingHistoricalVersion({ oid, content })
+                          }
+                        }}
+                        onRestore={async (oid) => {
+                          try {
+                            await window.ipc.invoke('knowledge:restore', {
+                              path: versionHistoryPath.startsWith('knowledge/')
+                                ? versionHistoryPath.slice('knowledge/'.length)
+                                : versionHistoryPath,
+                              oid,
+                            })
+                            // Reload file content
+                            const result = await window.ipc.invoke('workspace:readFile', { path: versionHistoryPath })
+                            handleEditorChange(versionHistoryPath, result.data)
+                            setViewingHistoricalVersion(null)
+                            setVersionHistoryPath(null)
+                          } catch (err) {
+                            console.error('Failed to restore version:', err)
+                          }
+                        }}
+                      />
+                    )}
                   </div>
                 ) : (
                   <div className="flex-1 overflow-auto p-4">
diff --git a/apps/x/apps/renderer/src/components/markdown-editor.tsx b/apps/x/apps/renderer/src/components/markdown-editor.tsx
index 2db7bcbe..6bcaef29 100644
--- a/apps/x/apps/renderer/src/components/markdown-editor.tsx
+++ b/apps/x/apps/renderer/src/components/markdown-editor.tsx
@@ -197,6 +197,7 @@ interface MarkdownEditorProps {
   onImageUpload?: (file: File) => Promise<string | null>
   editorSessionKey?: number
   onHistoryHandlersChange?: (handlers: { undo: () => boolean; redo: () => boolean } | null) => void
+  editable?: boolean
 }
 
 type WikiLinkMatch = {
@@ -282,6 +283,7 @@ export function MarkdownEditor({
   onImageUpload,
   editorSessionKey = 0,
   onHistoryHandlersChange,
+  editable = true,
 }: MarkdownEditorProps) {
   const isInternalUpdate = useRef(false)
   const wrapperRef = useRef<HTMLDivElement>(null)
@@ -303,6 +305,7 @@ export function MarkdownEditor({
   )
 
   const editor = useEditor({
+    editable,
     extensions: [
       StarterKit.configure({
         heading: {
@@ -517,6 +520,13 @@ export function MarkdownEditor({
     }
   }, [editor, onHistoryHandlersChange])
 
+  // Update editable state when prop changes
+  useEffect(() => {
+    if (editor) {
+      editor.setEditable(editable)
+    }
+  }, [editor, editable])
+
   // Force re-render decorations when selection highlight changes
   useEffect(() => {
     if (editor) {
diff --git a/apps/x/apps/renderer/src/components/version-history-panel.tsx b/apps/x/apps/renderer/src/components/version-history-panel.tsx
new file mode 100644
index 00000000..f8d03d38
--- /dev/null
+++ b/apps/x/apps/renderer/src/components/version-history-panel.tsx
@@ -0,0 +1,177 @@
+import { useEffect, useState, useCallback } from 'react'
+import { X, Clock } from 'lucide-react'
+import { cn } from '@/lib/utils'
+import { Button } from '@/components/ui/button'
+
+interface CommitInfo {
+  oid: string
+  message: string
+  timestamp: number
+  author: string
+}
+
+interface VersionHistoryPanelProps {
+  path: string // knowledge-relative file path (e.g. "knowledge/People/John.md")
+  onClose: () => void
+  onSelectVersion: (oid: string | null, content: string) => void // null = current
+  onRestore: (oid: string) => void
+}
+
+function formatTimestamp(unixSeconds: number): { date: string; time: string } {
+  const d = new Date(unixSeconds * 1000)
+  const date = d.toLocaleDateString('en-US', { month: 'long', day: 'numeric' })
+  const time = d.toLocaleTimeString('en-US', { hour: 'numeric', minute: '2-digit', hour12: true })
+  return { date, time }
+}
+
+export function VersionHistoryPanel({
+  path,
+  onClose,
+  onSelectVersion,
+  onRestore,
+}: VersionHistoryPanelProps) {
+  const [commits, setCommits] = useState<CommitInfo[]>([])
+  const [loading, setLoading] = useState(true)
+  const [selectedOid, setSelectedOid] = useState<string | null>(null) // null = current/latest
+  const [error, setError] = useState<string | null>(null)
+
+  // Strip "knowledge/" prefix for IPC calls
+  const relPath = path.startsWith('knowledge/') ? path.slice('knowledge/'.length) : path
+
+  const loadHistory = useCallback(async () => {
+    setLoading(true)
+    setError(null)
+    try {
+      const result = await window.ipc.invoke('knowledge:history', { path: relPath })
+      setCommits(result.commits)
+    } catch (err) {
+      console.error('Failed to load version history:', err)
+      setError('Failed to load history')
+    } finally {
+      setLoading(false)
+    }
+  }, [relPath])
+
+  useEffect(() => {
+    loadHistory()
+  }, [loadHistory])
+
+  // Refresh when new commits land
+  useEffect(() => {
+    return window.ipc.on('knowledge:didCommit', () => {
+      loadHistory()
+    })
+  }, [loadHistory])
+
+  const handleSelectCommit = useCallback(async (oid: string, isLatest: boolean) => {
+    if (isLatest) {
+      setSelectedOid(null)
+      // Read current file content
+      try {
+        const result = await window.ipc.invoke('workspace:readFile', { path })
+        onSelectVersion(null, result.data)
+      } catch (err) {
+        console.error('Failed to read current file:', err)
+      }
+      return
+    }
+
+    setSelectedOid(oid)
+    try {
+      const result = await window.ipc.invoke('knowledge:fileAtCommit', { path: relPath, oid })
+      onSelectVersion(oid, result.content)
+    } catch (err) {
+      console.error('Failed to load file at commit:', err)
+    }
+  }, [path, relPath, onSelectVersion])
+
+  const handleRestore = useCallback(() => {
+    if (selectedOid) {
+      onRestore(selectedOid)
+    }
+  }, [selectedOid, onRestore])
+
+  return (
+    <div className="flex flex-col w-[280px] shrink-0 border-l border-border bg-background">
+      {/* Header */}
+      <div className="flex items-center justify-between px-3 py-2 border-b border-border shrink-0">
+        <span className="text-sm font-medium text-foreground">Version history</span>
+        <button
+          type="button"
+          onClick={onClose}
+          className="flex h-6 w-6 items-center justify-center rounded-md text-muted-foreground hover:bg-accent hover:text-foreground transition-colors"
+          aria-label="Close version history"
+        >
+          <X className="h-4 w-4" />
+        </button>
+      </div>
+
+      {/* Commit list */}
+      <div className="flex-1 min-h-0 overflow-y-auto">
+        {loading ? (
+          <div className="flex items-center justify-center py-8 text-sm text-muted-foreground">
+            Loading...
+          </div>
+        ) : error ? (
+          <div className="flex items-center justify-center py-8 text-sm text-muted-foreground">
+            {error}
+          </div>
+        ) : commits.length === 0 ? (
+          <div className="flex items-center justify-center py-8 text-sm text-muted-foreground">
+            No history available
+          </div>
+        ) : (
+          <div className="py-1">
+            {commits.map((commit, index) => {
+              const isLatest = index === 0
+              const isSelected = isLatest ? selectedOid === null : selectedOid === commit.oid
+              const { date, time } = formatTimestamp(commit.timestamp)
+
+              return (
+                <button
+                  key={commit.oid}
+                  type="button"
+                  onClick={() => handleSelectCommit(commit.oid, isLatest)}
+                  className={cn(
+                    'w-full text-left px-3 py-2 transition-colors',
+                    isSelected
+                      ? 'bg-accent'
+                      : 'hover:bg-accent/50'
+                  )}
+                >
+                  <div className="flex items-center gap-1.5">
+                    {!isLatest && (
+                      <Clock className="h-3 w-3 text-muted-foreground shrink-0" />
+                    )}
+                    <span className="text-sm text-foreground">
+                      {date} &middot; {time}
+                    </span>
+                  </div>
+                  {isLatest && (
+                    <div className="text-xs text-muted-foreground mt-0.5">
+                      Current version
+                    </div>
+                  )}
+                </button>
+              )
+            })}
+          </div>
+        )}
+      </div>
+
+      {/* Footer */}
+      {selectedOid && (
+        <div className="shrink-0 border-t border-border p-3">
+          <Button
+            variant="default"
+            size="sm"
+            className="w-full"
+            onClick={handleRestore}
+          >
+            Restore this version
+          </Button>
+        </div>
+      )}
+    </div>
+  )
+}
diff --git a/apps/x/packages/core/package.json b/apps/x/packages/core/package.json
index bcfac93d..53495637 100644
--- a/apps/x/packages/core/package.json
+++ b/apps/x/packages/core/package.json
@@ -27,6 +27,7 @@
     "cron-parser": "^5.5.0",
     "glob": "^13.0.0",
     "google-auth-library": "^10.5.0",
+    "isomorphic-git": "^1.29.0",
     "googleapis": "^169.0.0",
     "mammoth": "^1.11.0",
     "node-html-markdown": "^2.0.0",
diff --git a/apps/x/packages/core/src/config/config.ts b/apps/x/packages/core/src/config/config.ts
index caefad82..4a91e101 100644
--- a/apps/x/packages/core/src/config/config.ts
+++ b/apps/x/packages/core/src/config/config.ts
@@ -91,4 +91,9 @@ function ensureWelcomeFile() {
 
 ensureDirs();
 ensureDefaultConfigs();
-ensureWelcomeFile();
\ No newline at end of file
+ensureWelcomeFile();
+
+// Initialize version history repo (async, fire-and-forget on startup)
+import('../knowledge/version_history.js').then(m => m.initRepo()).catch(err => {
+    console.error('[VersionHistory] Failed to init repo:', err);
+});
diff --git a/apps/x/packages/core/src/index.ts b/apps/x/packages/core/src/index.ts
index b7718cba..0eab08e3 100644
--- a/apps/x/packages/core/src/index.ts
+++ b/apps/x/packages/core/src/index.ts
@@ -5,4 +5,7 @@ export * as workspace from './workspace/workspace.js';
 export * as watcher from './workspace/watcher.js';
 
 // Config initialization
-export { initConfigs } from './config/initConfigs.js';
\ No newline at end of file
+export { initConfigs } from './config/initConfigs.js';
+
+// Knowledge version history
+export * as versionHistory from './knowledge/version_history.js';
diff --git a/apps/x/packages/core/src/knowledge/build_graph.ts b/apps/x/packages/core/src/knowledge/build_graph.ts
index a1b7e135..a119dfa6 100644
--- a/apps/x/packages/core/src/knowledge/build_graph.ts
+++ b/apps/x/packages/core/src/knowledge/build_graph.ts
@@ -15,6 +15,7 @@ import {
 } from './graph_state.js';
 import { buildKnowledgeIndex, formatIndexForPrompt } from './knowledge_index.js';
 import { limitEventItems } from './limit_event_items.js';
+import { commitAll } from './version_history.js';
 
 /**
  * Build obsidian-style knowledge graph by running topic extraction
@@ -320,6 +321,13 @@ async function buildGraphWithFiles(
             // Save state after each successful batch
             // This ensures partial progress is saved even if later batches fail
             saveState(state);
+
+            // Commit knowledge changes to version history
+            try {
+                await commitAll('Knowledge update', 'Rowboat');
+            } catch (err) {
+                console.error(`[GraphBuilder] Failed to commit version history:`, err);
+            }
         } catch (error) {
             hadError = true;
             console.error(`Error processing batch ${batchNumber}:`, error);
@@ -467,6 +475,13 @@ async function processVoiceMemosForKnowledge(): Promise<boolean> {
 
             // Save state after each batch
             saveState(state);
+
+            // Commit knowledge changes to version history
+            try {
+                await commitAll('Knowledge update', 'Rowboat');
+            } catch (err) {
+                console.error(`[GraphBuilder] Failed to commit version history:`, err);
+            }
         } catch (error) {
             hadError = true;
             console.error(`[GraphBuilder] Error processing batch ${batchNumber}:`, error);
diff --git a/apps/x/packages/core/src/knowledge/version_history.ts b/apps/x/packages/core/src/knowledge/version_history.ts
new file mode 100644
index 00000000..a6504f67
--- /dev/null
+++ b/apps/x/packages/core/src/knowledge/version_history.ts
@@ -0,0 +1,243 @@
+import fs from 'node:fs';
+import path from 'node:path';
+import git from 'isomorphic-git';
+import { WorkDir } from '../config/config.js';
+
+const KNOWLEDGE_DIR = path.join(WorkDir, 'knowledge');
+
+// Simple promise-based mutex to serialize commits
+let commitLock: Promise<void> = Promise.resolve();
+
+// Commit listeners for notifying other layers (e.g. renderer refresh)
+type CommitListener = () => void;
+const commitListeners: CommitListener[] = [];
+
+export function onCommit(listener: CommitListener): () => void {
+    commitListeners.push(listener);
+    return () => {
+        const idx = commitListeners.indexOf(listener);
+        if (idx >= 0) commitListeners.splice(idx, 1);
+    };
+}
+
+/**
+ * Initialize a git repo in the knowledge directory if one doesn't exist.
+ * Stages all existing .md files and makes an initial commit.
+ */
+export async function initRepo(): Promise<void> {
+    const gitDir = path.join(KNOWLEDGE_DIR, '.git');
+    if (fs.existsSync(gitDir)) {
+        return;
+    }
+
+    // Ensure knowledge dir exists
+    if (!fs.existsSync(KNOWLEDGE_DIR)) {
+        fs.mkdirSync(KNOWLEDGE_DIR, { recursive: true });
+    }
+
+    await git.init({ fs, dir: KNOWLEDGE_DIR });
+
+    // Stage all existing .md files
+    const files = getAllMdFiles(KNOWLEDGE_DIR, '');
+    for (const file of files) {
+        await git.add({ fs, dir: KNOWLEDGE_DIR, filepath: file });
+    }
+
+    if (files.length > 0) {
+        await git.commit({
+            fs,
+            dir: KNOWLEDGE_DIR,
+            message: 'Initial snapshot',
+            author: { name: 'Rowboat', email: 'local' },
+        });
+    }
+}
+
+/**
+ * Recursively find all .md files relative to the knowledge dir.
+ */
+function getAllMdFiles(baseDir: string, relDir: string): string[] {
+    const results: string[] = [];
+    const absDir = relDir ? path.join(baseDir, relDir) : baseDir;
+    let entries: string[];
+    try {
+        entries = fs.readdirSync(absDir);
+    } catch {
+        return results;
+    }
+    for (const entry of entries) {
+        if (entry === '.git' || entry.startsWith('.')) continue;
+        const fullPath = path.join(absDir, entry);
+        const relPath = relDir ? `${relDir}/${entry}` : entry;
+        const stat = fs.statSync(fullPath);
+        if (stat.isDirectory()) {
+            results.push(...getAllMdFiles(baseDir, relPath));
+        } else if (entry.endsWith('.md')) {
+            results.push(relPath);
+        }
+    }
+    return results;
+}
+
+/**
+ * Stage all changes to .md files and commit. No-op if nothing changed.
+ * Serialized via a promise lock to prevent concurrent git index corruption.
+ */
+export async function commitAll(message: string, authorName: string): Promise<void> {
+    const prev = commitLock;
+    let resolve: () => void;
+    commitLock = new Promise(r => { resolve = r; });
+
+    await prev;
+    try {
+        await commitAllInner(message, authorName);
+    } finally {
+        resolve!();
+    }
+}
+
+async function commitAllInner(message: string, authorName: string): Promise<void> {
+    const matrix = await git.statusMatrix({ fs, dir: KNOWLEDGE_DIR });
+
+    let hasChanges = false;
+    for (const [filepath, head, workdir, stage] of matrix) {
+        // Skip non-md files
+        if (!filepath.endsWith('.md')) continue;
+
+        // [filepath, HEAD, WORKDIR, STAGE]
+        // Unchanged: [f, 1, 1, 1]
+        if (head === 1 && workdir === 1 && stage === 1) continue;
+
+        hasChanges = true;
+
+        if (workdir === 0) {
+            // File deleted from workdir
+            await git.remove({ fs, dir: KNOWLEDGE_DIR, filepath });
+        } else {
+            // File added or modified
+            await git.add({ fs, dir: KNOWLEDGE_DIR, filepath });
+        }
+    }
+
+    if (!hasChanges) return;
+
+    await git.commit({
+        fs,
+        dir: KNOWLEDGE_DIR,
+        message,
+        author: { name: authorName, email: 'local' },
+    });
+
+    for (const listener of commitListeners) {
+        try { listener(); } catch { /* ignore */ }
+    }
+}
+
+export interface CommitInfo {
+    oid: string;
+    message: string;
+    timestamp: number;
+    author: string;
+}
+
+const MAX_FILE_HISTORY = 50;
+
+/**
+ * Get commit history for a specific file.
+ * Returns commits where the file content changed, most recent first.
+ * Capped at MAX_FILE_HISTORY entries.
+ */
+export async function getFileHistory(knowledgeRelPath: string): Promise<CommitInfo[]> {
+    // Normalize path separators for git (always forward slashes)
+    const filepath = knowledgeRelPath.replace(/\\/g, '/');
+
+    let commits: Awaited<ReturnType<typeof git.log>>;
+    try {
+        commits = await git.log({ fs, dir: KNOWLEDGE_DIR });
+    } catch {
+        return [];
+    }
+
+    if (commits.length === 0) return [];
+
+    const result: CommitInfo[] = [];
+
+    // Walk through commits and check if file changed between consecutive commits
+    for (let i = 0; i < commits.length; i++) {
+        if (result.length >= MAX_FILE_HISTORY) break;
+
+        const commit = commits[i]!;
+        const parentCommit = commits[i + 1]; // undefined for the first (oldest) commit
+
+        const currentOid = await getBlobOidAtCommit(commit.oid, filepath);
+        const parentOid = parentCommit
+            ? await getBlobOidAtCommit(parentCommit.oid, filepath)
+            : null;
+
+        // Include this commit if:
+        // - The file existed and changed from parent
+        // - The file was added (parentOid is null but currentOid exists)
+        // - The file was deleted (currentOid is null but parentOid exists)
+        if (currentOid !== parentOid) {
+            result.push({
+                oid: commit.oid,
+                message: commit.commit.message.trim(),
+                timestamp: commit.commit.author.timestamp,
+                author: commit.commit.author.name,
+            });
+        }
+    }
+
+    return result;
+}
+
+/**
+ * Get the blob OID for a file at a specific commit, or null if not found.
+ */
+async function getBlobOidAtCommit(commitOid: string, filepath: string): Promise<string | null> {
+    try {
+        const result = await git.readBlob({
+            fs,
+            dir: KNOWLEDGE_DIR,
+            oid: commitOid,
+            filepath,
+        });
+        // Compute a content hash from the blob to compare
+        return result.oid;
+    } catch {
+        return null;
+    }
+}
+
+/**
+ * Read file content at a specific commit.
+ */
+export async function getFileAtCommit(knowledgeRelPath: string, oid: string): Promise<string> {
+    const filepath = knowledgeRelPath.replace(/\\/g, '/');
+    const result = await git.readBlob({
+        fs,
+        dir: KNOWLEDGE_DIR,
+        oid,
+        filepath,
+    });
+    return Buffer.from(result.blob).toString('utf-8');
+}
+
+/**
+ * Restore a file to its content at a given commit, then commit the restoration.
+ */
+export async function restoreFile(knowledgeRelPath: string, oid: string): Promise<void> {
+    const content = await getFileAtCommit(knowledgeRelPath, oid);
+    const absPath = path.join(KNOWLEDGE_DIR, knowledgeRelPath);
+
+    // Ensure parent directory exists
+    const dir = path.dirname(absPath);
+    if (!fs.existsSync(dir)) {
+        fs.mkdirSync(dir, { recursive: true });
+    }
+
+    fs.writeFileSync(absPath, content, 'utf-8');
+
+    const filename = path.basename(knowledgeRelPath);
+    await commitAll(`Restored ${filename}`, 'You');
+}
diff --git a/apps/x/packages/core/src/workspace/workspace.ts b/apps/x/packages/core/src/workspace/workspace.ts
index cd872f39..de1fe212 100644
--- a/apps/x/packages/core/src/workspace/workspace.ts
+++ b/apps/x/packages/core/src/workspace/workspace.ts
@@ -6,6 +6,7 @@ import { z } from 'zod';
 import { RemoveOptions, WriteFileOptions, WriteFileResult } from 'packages/shared/dist/workspace.js';
 import { WorkDir } from '../config/config.js';
 import { rewriteWikiLinksForRenamedKnowledgeFile } from './wiki-link-rewrite.js';
+import { commitAll } from '../knowledge/version_history.js';
 
 // ============================================================================
 // Path Utilities
@@ -218,6 +219,21 @@ export async function readFile(
   };
 }
 
+// Debounced commit for knowledge file edits
+let knowledgeCommitTimer: ReturnType<typeof setTimeout> | null = null;
+
+function scheduleKnowledgeCommit(filename: string): void {
+  if (knowledgeCommitTimer) {
+    clearTimeout(knowledgeCommitTimer);
+  }
+  knowledgeCommitTimer = setTimeout(() => {
+    knowledgeCommitTimer = null;
+    commitAll(`Edit ${filename}`, 'You').catch(err => {
+      console.error('[VersionHistory] Failed to commit after edit:', err);
+    });
+  }, 3 * 60 * 1000);
+}
+
 export async function writeFile(
   relPath: string,
   data: string,
@@ -266,6 +282,11 @@ export async function writeFile(
   const stat = statToSchema(stats, 'file');
   const etag = computeEtag(stats.size, stats.mtimeMs);
 
+  // Schedule a debounced version history commit for knowledge files
+  if (relPath.startsWith('knowledge/') && relPath.endsWith('.md')) {
+    scheduleKnowledgeCommit(path.basename(relPath));
+  }
+
   return {
     path: relPath,
     stat,
diff --git a/apps/x/packages/shared/src/ipc.ts b/apps/x/packages/shared/src/ipc.ts
index c0276d9a..b5803ffc 100644
--- a/apps/x/packages/shared/src/ipc.ts
+++ b/apps/x/packages/shared/src/ipc.ts
@@ -397,6 +397,30 @@ const ipcSchemas = {
     req: z.object({ path: z.string() }),
     res: z.object({ data: z.string(), mimeType: z.string(), size: z.number() }),
   },
+  // Knowledge version history channels
+  'knowledge:history': {
+    req: z.object({ path: RelPath }),
+    res: z.object({
+      commits: z.array(z.object({
+        oid: z.string(),
+        message: z.string(),
+        timestamp: z.number(),
+        author: z.string(),
+      })),
+    }),
+  },
+  'knowledge:fileAtCommit': {
+    req: z.object({ path: RelPath, oid: z.string() }),
+    res: z.object({ content: z.string() }),
+  },
+  'knowledge:restore': {
+    req: z.object({ path: RelPath, oid: z.string() }),
+    res: z.object({ ok: z.literal(true) }),
+  },
+  'knowledge:didCommit': {
+    req: z.object({}),
+    res: z.null(),
+  },
   // Search channels
   'search:query': {
     req: z.object({
diff --git a/apps/x/pnpm-lock.yaml b/apps/x/pnpm-lock.yaml
index fa8765d6..d3525c4f 100644
--- a/apps/x/pnpm-lock.yaml
+++ b/apps/x/pnpm-lock.yaml
@@ -359,6 +359,9 @@ importers:
       googleapis:
         specifier: ^169.0.0
         version: 169.0.0
+      isomorphic-git:
+        specifier: ^1.29.0
+        version: 1.37.2
       mammoth:
         specifier: ^1.11.0
         version: 1.11.0
@@ -3501,6 +3504,10 @@ packages:
   abbrev@1.1.1:
     resolution: {integrity: sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==}
 
+  abort-controller@3.0.0:
+    resolution: {integrity: sha512-h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg==}
+    engines: {node: '>=6.5'}
+
   abs-svg-path@0.1.1:
     resolution: {integrity: sha512-d8XPSGjfyzlXC3Xx891DJRyZfqk5JU0BJrDQcsWomFIV1/BIzPW5HDH5iDdWpqWaav0YVIEzT1RHTwWr0FFshA==}
 
@@ -3627,6 +3634,9 @@ packages:
     resolution: {integrity: sha512-3duEwti880xqi4eAMN8AyR4a0ByT90zoYdLlevfrvU43vb0YZwZVfxOgxWrLXXXpyugL0hNZc9G6BiB5B3nUug==}
     engines: {node: '>=8'}
 
+  async-lock@1.4.1:
+    resolution: {integrity: sha512-Az2ZTpuytrtqENulXwO3GGv1Bztugx6TT37NIo7imr/Qo0gsYiGtSdBa2B6fsXhTpVZDNfu1Qn3pk531e3q+nQ==}
+
   async@1.5.2:
     resolution: {integrity: sha512-nSVgobk4rv61R9PUSDtYt7mPVB2olxNR5RWJcAsH676/ef11bUZwvu7+RGYrYauVdDPcO519v68wRhXQtxsV9w==}
 
@@ -3641,6 +3651,10 @@ packages:
     resolution: {integrity: sha512-KbWgR8wOYRAPekEmMXrYYdc7BRyhn2Ftk7KWfMUnQ43hFdojWEFRxhhRUm3/OFEdPa1r0KAvTTg9YQK57xTe0g==}
     engines: {node: '>=0.8'}
 
+  available-typed-arrays@1.0.7:
+    resolution: {integrity: sha512-wvUjBtSGN7+7SjNpq/9M2Tg350UZD3q62IFZLbRAR1bSMlCo1ZaeW+BJ+D090e4hIIZLBcTDWe4Mh4jvUDajzQ==}
+    engines: {node: '>= 0.4'}
+
   awilix@12.0.5:
     resolution: {integrity: sha512-Qf/V/hRo6DK0FoBKJ9QiObasRxHAhcNi0mV6kW2JMawxS3zq6Un+VsZmVAZDUfvB+MjTEiJ2tUJUl4cr0JiUAw==}
     engines: {node: '>=16.3.0'}
@@ -3742,6 +3756,9 @@ packages:
   buffer@5.7.1:
     resolution: {integrity: sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==}
 
+  buffer@6.0.3:
+    resolution: {integrity: sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA==}
+
   bytes@3.1.2:
     resolution: {integrity: sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==}
     engines: {node: '>= 0.8'}
@@ -3762,6 +3779,10 @@ packages:
     resolution: {integrity: sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ==}
     engines: {node: '>= 0.4'}
 
+  call-bind@1.0.8:
+    resolution: {integrity: sha512-oKlSFMcMwpUg2ednkhQ454wfWiU/ul3CkJe/PEHcTKuiX6RpbehUiFMXu13HalGZxfUwCQzZG747YXBn1im9ww==}
+    engines: {node: '>= 0.4'}
+
   call-bound@1.0.4:
     resolution: {integrity: sha512-+ys997U96po4Kx/ABpBCqhA9EuxJaQWDQg7295H4hBphv3IZg0boBKuwYpt4YXp6MZ5AmZQnU/tyMTlRpaSejg==}
     engines: {node: '>= 0.4'}
@@ -3825,6 +3846,9 @@ packages:
   class-variance-authority@0.7.1:
     resolution: {integrity: sha512-Ka+9Trutv7G8M6WT6SeiRWz792K5qEqIGEGzXKhAE6xOWAY6pPH8U+9IY3oCMv6kqTmLsv7Xh/2w2RigkePMsg==}
 
+  clean-git-ref@2.0.1:
+    resolution: {integrity: sha512-bLSptAy2P0s6hU4PzuIMKmMJJSE6gLXGH1cntDu7bWJUksvuM+7ReOK61mozULErYvP6a15rnYl0zFDef+pyPw==}
+
   clean-stack@2.2.0:
     resolution: {integrity: sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==}
     engines: {node: '>=6'}
@@ -4256,6 +4280,9 @@ packages:
   dfa@1.2.0:
     resolution: {integrity: sha512-ED3jP8saaweFTjeGX8HQPjeC1YYyZs98jGNZx6IiBvxW7JG5v492kamAQB3m2wop07CvU/RQmzcKr6bgcC5D/Q==}
 
+  diff3@0.0.3:
+    resolution: {integrity: sha512-iSq8ngPOt0K53A6eVr4d5Kn6GNrM2nQZtC740pzIriHtn4pOQ2lyzEXQMBeVcWERN0ye7fhBsk9PbLLQOnUx/g==}
+
   dingbat-to-unicode@1.0.1:
     resolution: {integrity: sha512-98l0sW87ZT58pU4i61wa2OHwxbiYSbuxsCBozaVnYX2iCnr3bLM3fIes1/ej7h1YdOKuKt/MLs706TVnALA65w==}
 
@@ -4496,6 +4523,10 @@ packages:
     resolution: {integrity: sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==}
     engines: {node: '>= 0.6'}
 
+  event-target-shim@5.0.1:
+    resolution: {integrity: sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ==}
+    engines: {node: '>=6'}
+
   eventemitter3@5.0.1:
     resolution: {integrity: sha512-GWkBvjiSZK87ELrYOSESUYeVIc9mvLLf/nXalMOS5dYrgZq9o5OVkbZAVM06CVxYsCwH9BDZFPlQTlPA1j4ahA==}
 
@@ -4640,6 +4671,10 @@ packages:
   fontkit@2.0.4:
     resolution: {integrity: sha512-syetQadaUEDNdxdugga9CpEYVaQIxOwk7GlwZWWZ19//qW4zE5bknOKeMBDYAASwnpaSHKJITRLMF9m1fp3s6g==}
 
+  for-each@0.3.5:
+    resolution: {integrity: sha512-dKx12eRCVIzqCxFGplyFKJMPvLEWgmNtUrpTiJIR5u97zEhRG8ySrtboPHZXx7daLxQVrl643cTzbab2tkQjxg==}
+    engines: {node: '>= 0.4'}
+
   foreground-child@3.3.1:
     resolution: {integrity: sha512-gIXjKqtFuWEgzFRJA9WCQeSJLZDjgJUOMCMzxtvFq/37KojM1BFGufqsCy0r4qSQmYLsZYMeyRqzIWOMup03sw==}
     engines: {node: '>=14'}
@@ -5104,6 +5139,10 @@ packages:
   is-arrayish@0.3.4:
     resolution: {integrity: sha512-m6UrgzFVUYawGBh1dUsWR5M2Clqic9RVXC/9f8ceNlv2IcO9j9J/z8UoCLPqtsPBFNzEpfR3xftohbfqDx8EQA==}
 
+  is-callable@1.2.7:
+    resolution: {integrity: sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==}
+    engines: {node: '>= 0.4'}
+
   is-core-module@2.16.1:
     resolution: {integrity: sha512-UfoeMA6fIJ8wTYFEUjelnaGI67v6+N7qXJEvQuIGa99l4xsCruSYOVSQ0uPANn4dAzm8lkYPaKLrrijLq7x23w==}
     engines: {node: '>= 0.4'}
@@ -5170,6 +5209,10 @@ packages:
     resolution: {integrity: sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==}
     engines: {node: '>=8'}
 
+  is-typed-array@1.1.15:
+    resolution: {integrity: sha512-p3EcsicXjit7SaskXHs1hA91QxgTw46Fv6EFKKGS5DRFLD8yKnohjF3hxoju94b/OcMZoQukzpPpBE9uLVKzgQ==}
+    engines: {node: '>= 0.4'}
+
   is-unicode-supported@0.1.0:
     resolution: {integrity: sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==}
     engines: {node: '>=10'}
@@ -5184,6 +5227,9 @@ packages:
   isarray@1.0.0:
     resolution: {integrity: sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==}
 
+  isarray@2.0.5:
+    resolution: {integrity: sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==}
+
   isbinaryfile@4.0.10:
     resolution: {integrity: sha512-iHrqe5shvBUcFbmZq9zOQHBoeOhZJu6RQGrDpBgenUm/Am+F3JM2MgQj+rK3Z601fzrL5gLZWtAPH2OBaSVcyw==}
     engines: {node: '>= 8.0.0'}
@@ -5191,6 +5237,11 @@ packages:
   isexe@2.0.0:
     resolution: {integrity: sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==}
 
+  isomorphic-git@1.37.2:
+    resolution: {integrity: sha512-HCQBBKmXIMPdHgYGstSBNp6MNmVcMQBbUqJF8xfywFmlpNseO4KKex59YlXqNxhRxmv3fUZwvNWvMyOdc1VvhA==}
+    engines: {node: '>=14.17'}
+    hasBin: true
+
   jackspeak@3.4.3:
     resolution: {integrity: sha512-OGlZQpz2yfahA/Rd1Y8Cd9SIEsqvXkLVoSw/cgwhnhFMDbsQFeZYoJJ7bIZBS9BcamUW96asq/npPWugM+RQBw==}
 
@@ -5762,6 +5813,9 @@ packages:
   minimist@1.2.8:
     resolution: {integrity: sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==}
 
+  minimisted@2.0.1:
+    resolution: {integrity: sha512-1oPjfuLQa2caorJUM8HV8lGgWCc0qqAO1MNv/k05G4qslmsndV/5WdNZrqCiyqiz3wohia2Ij2B7w2Dr7/IyrA==}
+
   minipass-collect@1.0.2:
     resolution: {integrity: sha512-6T6lH0H8OG9kITm/Jm6tdooIbogG9e0tLgpY6mphXSm/A9u8Nq1ryBG+Qspiub9LjWlBPsPS3tWQ/Botq4FdxA==}
     engines: {node: '>= 8'}
@@ -6169,6 +6223,10 @@ packages:
     resolution: {integrity: sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog==}
     engines: {node: '>=0.10.0'}
 
+  pify@4.0.1:
+    resolution: {integrity: sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==}
+    engines: {node: '>=6'}
+
   pkce-challenge@5.0.1:
     resolution: {integrity: sha512-wQ0b/W4Fr01qtpHlqSqspcj3EhBvimsdh0KlHhH8HRZnMsEa0ea2fTULOXOS9ccQr3om+GcGRk4e+isrZWV8qQ==}
     engines: {node: '>=16.20.0'}
@@ -6186,6 +6244,10 @@ packages:
   points-on-path@0.2.1:
     resolution: {integrity: sha512-25ClnWWuw7JbWZcgqY/gJ4FQWadKxGWk+3kR/7kD0tCaDtPPMj7oHu2ToLaVhfpnHrZzYby2w6tUA0eOIuUg8g==}
 
+  possible-typed-array-names@1.1.0:
+    resolution: {integrity: sha512-/+5VFTchJDoVj3bhoqi6UeymcD00DAwb1nJwamzPvHEszJ4FpF6SNNbUbOS8yI56qHzdV8eK0qEfOSiodkTdxg==}
+    engines: {node: '>= 0.4'}
+
   postcss-value-parser@4.2.0:
     resolution: {integrity: sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==}
 
@@ -6220,6 +6282,10 @@ packages:
   process-nextick-args@2.0.1:
     resolution: {integrity: sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==}
 
+  process@0.11.10:
+    resolution: {integrity: sha512-cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A==}
+    engines: {node: '>= 0.6.0'}
+
   progress@2.0.3:
     resolution: {integrity: sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==}
     engines: {node: '>=0.4.0'}
@@ -6434,6 +6500,10 @@ packages:
     resolution: {integrity: sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==}
     engines: {node: '>= 6'}
 
+  readable-stream@4.7.0:
+    resolution: {integrity: sha512-oIGGmcpTLwPga8Bn6/Z75SVaH1z5dUut2ibSyAMVhmUggWpmDn2dapB0n7f8nwaSiRtepAsfJyfXIO5DCVAODg==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+
   readdirp@4.1.2:
     resolution: {integrity: sha512-GDhwkLfywWL2s6vEjyhri+eXmfH6j1L7JE27WhqLeYzoh/A3DBaYGEj2H/HFZCn/kMfim73FXxEJTw06WtxQwg==}
     engines: {node: '>= 14.18.0'}
@@ -6649,12 +6719,21 @@ packages:
   server-destroy@1.0.1:
     resolution: {integrity: sha512-rb+9B5YBIEzYcD6x2VKidaa+cqYBJQKnU4oe4E3ANwRRN56yk/ua1YCJT1n21NTS8w6CcOclAKNP3PhdCXKYtQ==}
 
+  set-function-length@1.2.2:
+    resolution: {integrity: sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==}
+    engines: {node: '>= 0.4'}
+
   setimmediate@1.0.5:
     resolution: {integrity: sha512-MATJdZp8sLqDl/68LfQmbP8zKPLQNV6BIZoIgrscFDQ+RsvK/BxeDQOgyxKKoh0y/8h3BqVFnCqQ/gd+reiIXA==}
 
   setprototypeof@1.2.0:
     resolution: {integrity: sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==}
 
+  sha.js@2.4.12:
+    resolution: {integrity: sha512-8LzC5+bvI45BjpfXU8V5fdU2mfeKiQe1D1gIMn7XUlF3OTUrpdJpPPH4EMAnF0DsHHdSZqCdSss5qCmJKuiO3w==}
+    engines: {node: '>= 0.10'}
+    hasBin: true
+
   shebang-command@1.2.0:
     resolution: {integrity: sha512-EV3L1+UQWGor21OmnvojK36mhg+TyIKDh3iFBKBohr5xeXIhNBcx8oWdgkTEEQ+BEFFYdLRuqMfd5L84N1V5Vg==}
     engines: {node: '>=0.10.0'}
@@ -6701,6 +6780,12 @@ packages:
     resolution: {integrity: sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==}
     engines: {node: '>=14'}
 
+  simple-concat@1.0.1:
+    resolution: {integrity: sha512-cSFtAPtRhljv69IK0hTVZQ+OfE9nePi/rtJmw5UjHeVyVroEqJXP1sFztKUy1qU+xvz3u/sfYJLa947b7nAN2Q==}
+
+  simple-get@4.0.1:
+    resolution: {integrity: sha512-brv7p5WgH0jmQJr1ZDDfKDOSeWWg+OVypG99A/5vYGPqJ6pxiaHLy8nxtFjBA7oMa01ebA9gfh1uMCFqOuXxvA==}
+
   simple-swizzle@0.2.4:
     resolution: {integrity: sha512-nAu1WFPQSMNr2Zn9PGSZK9AGn4t/y97lEm+MXTtUDwfP0ksAIX4nO+6ruD9Jwut4C49SB1Ws+fbXsm/yScWOHw==}
 
@@ -6928,6 +7013,10 @@ packages:
     resolution: {integrity: sha512-DbplOfQFkqG5IHcDyyrs/lkvSr3mPUVsFf/RbDppOshs22yTPnSJWEe6FkYd1txAwU/zcnR905ar2fi4kwF29w==}
     engines: {node: '>=0.12'}
 
+  to-buffer@1.2.2:
+    resolution: {integrity: sha512-db0E3UJjcFhpDhAF4tLo03oli3pwl3dbnzXOUIlRKrp+ldk/VUxzpWYZENsw2SZiuBjHAk7DfB0VU7NKdpb6sw==}
+    engines: {node: '>= 0.4'}
+
   to-data-view@1.1.0:
     resolution: {integrity: sha512-1eAdufMg6mwgmlojAx3QeMnzB/BTVp7Tbndi3U7ftcT2zCZadjxkkmLmd97zmaxWi+sgGcgWrokmpEoy0Dn0vQ==}
 
@@ -6998,6 +7087,10 @@ packages:
     resolution: {integrity: sha512-OZs6gsjF4vMp32qrCbiVSkrFmXtG/AZhY3t0iAMrMBiAZyV9oALtXO8hsrHbMXF9x6L3grlFuwW2oAz7cav+Gw==}
     engines: {node: '>= 0.6'}
 
+  typed-array-buffer@1.0.3:
+    resolution: {integrity: sha512-nAYYwfY3qnzX30IkA6AQZjVbtK6duGontcQm1WSG1MD94YLqK0515GNApXkoxKOWMusVssAHWLh9SeaoefYFGw==}
+    engines: {node: '>= 0.4'}
+
   typescript-eslint@8.50.1:
     resolution: {integrity: sha512-ytTHO+SoYSbhAH9CrYnMhiLx8To6PSSvqnvXyPUgPETCvB6eBKmTI9w6XMPS3HsBRGkwTVBX+urA8dYQx6bHfQ==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
@@ -7272,6 +7365,10 @@ packages:
   whatwg-url@5.0.0:
     resolution: {integrity: sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==}
 
+  which-typed-array@1.1.20:
+    resolution: {integrity: sha512-LYfpUkmqwl0h9A2HL09Mms427Q1RZWuOHsukfVcKRq9q95iQxdw0ix1JQrqbcDR9PH1QDwf5Qo8OZb5lksZ8Xg==}
+    engines: {node: '>= 0.4'}
+
   which@1.3.1:
     resolution: {integrity: sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==}
     hasBin: true
@@ -11316,6 +11413,10 @@ snapshots:
 
   abbrev@1.1.1: {}
 
+  abort-controller@3.0.0:
+    dependencies:
+      event-target-shim: 5.0.1
+
   abs-svg-path@0.1.1: {}
 
   accepts@2.0.0:
@@ -11440,6 +11541,8 @@ snapshots:
 
   arrify@2.0.1: {}
 
+  async-lock@1.4.1: {}
+
   async@1.5.2:
     optional: true
 
@@ -11449,6 +11552,10 @@ snapshots:
 
   author-regex@1.0.0: {}
 
+  available-typed-arrays@1.0.7:
+    dependencies:
+      possible-typed-array-names: 1.1.0
+
   awilix@12.0.5:
     dependencies:
       camel-case: 4.1.2
@@ -11568,6 +11675,11 @@ snapshots:
       base64-js: 1.5.1
       ieee754: 1.2.1
 
+  buffer@6.0.3:
+    dependencies:
+      base64-js: 1.5.1
+      ieee754: 1.2.1
+
   bytes@3.1.2: {}
 
   cacache@16.1.3:
@@ -11610,6 +11722,13 @@ snapshots:
       es-errors: 1.3.0
       function-bind: 1.1.2
 
+  call-bind@1.0.8:
+    dependencies:
+      call-bind-apply-helpers: 1.0.2
+      es-define-property: 1.0.1
+      get-intrinsic: 1.3.0
+      set-function-length: 1.2.2
+
   call-bound@1.0.4:
     dependencies:
       call-bind-apply-helpers: 1.0.2
@@ -11672,6 +11791,8 @@ snapshots:
     dependencies:
       clsx: 2.1.1
 
+  clean-git-ref@2.0.1: {}
+
   clean-stack@2.2.0: {}
 
   cli-cursor@3.1.0:
@@ -12061,7 +12182,6 @@ snapshots:
       es-define-property: 1.0.1
       es-errors: 1.3.0
       gopd: 1.2.0
-    optional: true
 
   define-properties@1.2.1:
     dependencies:
@@ -12095,6 +12215,8 @@ snapshots:
 
   dfa@1.2.0: {}
 
+  diff3@0.0.3: {}
+
   dingbat-to-unicode@1.0.1: {}
 
   dir-compare@4.2.0:
@@ -12451,6 +12573,8 @@ snapshots:
 
   etag@1.8.1: {}
 
+  event-target-shim@5.0.1: {}
+
   eventemitter3@5.0.1: {}
 
   events@3.3.0: {}
@@ -12638,6 +12762,10 @@ snapshots:
       unicode-properties: 1.4.1
       unicode-trie: 2.0.0
 
+  for-each@0.3.5:
+    dependencies:
+      is-callable: 1.2.7
+
   foreground-child@3.3.1:
     dependencies:
       cross-spawn: 7.0.6
@@ -12983,7 +13111,6 @@ snapshots:
   has-property-descriptors@1.0.2:
     dependencies:
       es-define-property: 1.0.1
-    optional: true
 
   has-symbols@1.1.0: {}
 
@@ -13251,6 +13378,8 @@ snapshots:
 
   is-arrayish@0.3.4: {}
 
+  is-callable@1.2.7: {}
+
   is-core-module@2.16.1:
     dependencies:
       hasown: 2.0.2
@@ -13300,6 +13429,10 @@ snapshots:
 
   is-stream@2.0.1: {}
 
+  is-typed-array@1.1.15:
+    dependencies:
+      which-typed-array: 1.1.20
+
   is-unicode-supported@0.1.0: {}
 
   is-url@1.2.4: {}
@@ -13310,10 +13443,26 @@ snapshots:
 
   isarray@1.0.0: {}
 
+  isarray@2.0.5: {}
+
   isbinaryfile@4.0.10: {}
 
   isexe@2.0.0: {}
 
+  isomorphic-git@1.37.2:
+    dependencies:
+      async-lock: 1.4.1
+      clean-git-ref: 2.0.1
+      crc-32: 1.2.2
+      diff3: 0.0.3
+      ignore: 5.3.2
+      minimisted: 2.0.1
+      pako: 1.0.11
+      pify: 4.0.1
+      readable-stream: 4.7.0
+      sha.js: 2.4.12
+      simple-get: 4.0.1
+
   jackspeak@3.4.3:
     dependencies:
       '@isaacs/cliui': 8.0.2
@@ -14139,6 +14288,10 @@ snapshots:
 
   minimist@1.2.8: {}
 
+  minimisted@2.0.1:
+    dependencies:
+      minimist: 1.2.8
+
   minipass-collect@1.0.2:
     dependencies:
       minipass: 3.3.6
@@ -14506,6 +14659,8 @@ snapshots:
 
   pify@2.3.0: {}
 
+  pify@4.0.1: {}
+
   pkce-challenge@5.0.1: {}
 
   pkg-types@1.3.1:
@@ -14527,6 +14682,8 @@ snapshots:
       path-data-parser: 0.1.0
       points-on-curve: 0.2.0
 
+  possible-typed-array-names@1.1.0: {}
+
   postcss-value-parser@4.2.0: {}
 
   postcss@8.5.6:
@@ -14565,6 +14722,8 @@ snapshots:
 
   process-nextick-args@2.0.1: {}
 
+  process@0.11.10: {}
+
   progress@2.0.3: {}
 
   promise-inflight@1.0.1: {}
@@ -14887,6 +15046,14 @@ snapshots:
       string_decoder: 1.3.0
       util-deprecate: 1.0.2
 
+  readable-stream@4.7.0:
+    dependencies:
+      abort-controller: 3.0.0
+      buffer: 6.0.3
+      events: 3.3.0
+      process: 0.11.10
+      string_decoder: 1.3.0
+
   readdirp@4.1.2: {}
 
   rechoir@0.8.0:
@@ -15175,10 +15342,25 @@ snapshots:
 
   server-destroy@1.0.1: {}
 
+  set-function-length@1.2.2:
+    dependencies:
+      define-data-property: 1.1.4
+      es-errors: 1.3.0
+      function-bind: 1.1.2
+      get-intrinsic: 1.3.0
+      gopd: 1.2.0
+      has-property-descriptors: 1.0.2
+
   setimmediate@1.0.5: {}
 
   setprototypeof@1.2.0: {}
 
+  sha.js@2.4.12:
+    dependencies:
+      inherits: 2.0.4
+      safe-buffer: 5.2.1
+      to-buffer: 1.2.2
+
   shebang-command@1.2.0:
     dependencies:
       shebang-regex: 1.0.0
@@ -15236,6 +15418,14 @@ snapshots:
 
   signal-exit@4.1.0: {}
 
+  simple-concat@1.0.1: {}
+
+  simple-get@4.0.1:
+    dependencies:
+      decompress-response: 6.0.0
+      once: 1.4.0
+      simple-concat: 1.0.1
+
   simple-swizzle@0.2.4:
     dependencies:
       is-arrayish: 0.3.4
@@ -15493,6 +15683,12 @@ snapshots:
       unorm: 1.6.0
     optional: true
 
+  to-buffer@1.2.2:
+    dependencies:
+      isarray: 2.0.5
+      safe-buffer: 5.2.1
+      typed-array-buffer: 1.0.3
+
   to-data-view@1.1.0:
     optional: true
 
@@ -15550,6 +15746,12 @@ snapshots:
       media-typer: 1.1.0
       mime-types: 3.0.2
 
+  typed-array-buffer@1.0.3:
+    dependencies:
+      call-bound: 1.0.4
+      es-errors: 1.3.0
+      is-typed-array: 1.1.15
+
   typescript-eslint@8.50.1(eslint@9.39.2(jiti@2.6.1))(typescript@5.9.3):
     dependencies:
       '@typescript-eslint/eslint-plugin': 8.50.1(@typescript-eslint/parser@8.50.1(eslint@9.39.2(jiti@2.6.1))(typescript@5.9.3))(eslint@9.39.2(jiti@2.6.1))(typescript@5.9.3)
@@ -15827,6 +16029,16 @@ snapshots:
       tr46: 0.0.3
       webidl-conversions: 3.0.1
 
+  which-typed-array@1.1.20:
+    dependencies:
+      available-typed-arrays: 1.0.7
+      call-bind: 1.0.8
+      call-bound: 1.0.4
+      for-each: 0.3.5
+      get-proto: 1.0.1
+      gopd: 1.2.0
+      has-tostringtag: 1.0.2
+
   which@1.3.1:
     dependencies:
       isexe: 2.0.0