Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion apps/electron/electron.vite.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,13 @@ export default defineConfig({
input: resolve(__dirname, 'src/renderer/index.html'),
external: [
'web-worker',
'mermaid' // Optional peer dependency - dynamically imported in @xnetjs/canvas
'mermaid', // Optional peer dependency - dynamically imported in @xnetjs/canvas
// Native Node HNSW addon (imports node:fs / node-gyp-build) — reached
// via @xnetjs/workbench/ai → @xnetjs/vectors, which dynamically
// imports it and falls back to the pure-JS LinearVectorIndex when
// absent. Same exclusion apps/web ships; the renderer must not try
// to bundle it.
'usearch'
]
}
},
Expand Down
1 change: 1 addition & 0 deletions apps/electron/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@
"@xnetjs/telemetry": "workspace:*",
"@xnetjs/ui": "workspace:*",
"@xnetjs/views": "workspace:*",
"@xnetjs/workbench": "workspace:*",
"better-sqlite3": "^11.0.0",
"electron-updater": "^6.3.0",
"lucide-react": "^0.400.0",
Expand Down
21 changes: 20 additions & 1 deletion apps/electron/src/renderer/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@

import type { ConnectHubRequest } from './components/ConnectHubDialog'
import { useCommandPalette, CommandPalette } from '@xnetjs/ui'
import { AiChatPanel } from '@xnetjs/workbench/ai'
import React, { useCallback, useEffect, useState } from 'react'
import { ActionDock } from './components/ActionDock'
import { AddSharedDialog } from './components/AddSharedDialog'
Expand Down Expand Up @@ -55,6 +56,7 @@ export function App(): React.ReactElement {
handleOpenDataWorkspace,
handleOpenMeetings,
handleOpenStories,
handleOpenAssistant,
handleInsertSavedLensAsCanvasFrame,
handleCommandStateChange,
handlePendingInsertConsumed
Expand Down Expand Up @@ -102,7 +104,8 @@ export function App(): React.ReactElement {
handleOpenSettings,
handleOpenSocialImport,
handleOpenDataWorkspace,
handleOpenStories
handleOpenStories,
handleOpenAssistant
})

const renderOverlay = () => {
Expand Down Expand Up @@ -135,6 +138,21 @@ export function App(): React.ReactElement {
)
}

if (shellState.kind === 'assistant') {
// The web workbench's AI chat, unchanged (0406): it detects the agent
// bridge through window.xnetAgentBridge (#638) and auto-pairs over IPC,
// so on desktop Claude Code arrives with the workspace tools attached.
return (
<div className="absolute inset-0 z-30 px-4 pb-28 pt-6">
<div className={overlaySurfaceClassName}>
<div className="min-h-0 w-full flex-1 overflow-hidden">
<AiChatPanel />
</div>
</div>
</div>
)
}

if (shellState.kind === 'social-import') {
return (
<div className="absolute inset-0 z-30 px-4 pb-28 pt-6">
Expand Down Expand Up @@ -266,6 +284,7 @@ export function App(): React.ReactElement {
onOpenSettings={handleOpenSettings}
onOpenDataWorkspace={handleOpenDataWorkspace}
onOpenMeetings={handleOpenMeetings}
onOpenAssistant={handleOpenAssistant}
onOpenSocialImport={handleOpenSocialImport}
onOpenStories={STORIES_ENABLED ? handleOpenStories : undefined}
onAddShared={() => {
Expand Down
9 changes: 9 additions & 0 deletions apps/electron/src/renderer/components/SystemMenu.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ import {
Moon,
Settings,
Share2,
Sparkles,
Sun
} from 'lucide-react'
import React from 'react'
Expand All @@ -32,6 +33,7 @@ interface SystemMenuProps {
onOpenSettings: () => void
onOpenDataWorkspace: () => void
onOpenMeetings: () => void
onOpenAssistant: () => void
onOpenSocialImport: () => void
onOpenStories?: () => void
onAddShared: () => void
Expand Down Expand Up @@ -77,6 +79,7 @@ export function SystemMenu({
onOpenSettings,
onOpenDataWorkspace,
onOpenMeetings,
onOpenAssistant,
onOpenSocialImport,
onOpenStories,
onAddShared,
Expand Down Expand Up @@ -128,6 +131,12 @@ export function SystemMenu({
Meetings
</span>
</MenuItem>
<MenuItem onSelect={onOpenAssistant}>
<span className="flex items-center gap-2">
<Sparkles size={14} />
Assistant
</span>
</MenuItem>
<MenuItem onSelect={onOpenSocialImport}>
<span className="flex items-center gap-2">
<ImportIcon size={14} />
Expand Down
5 changes: 5 additions & 0 deletions apps/electron/src/renderer/shell/shell-state.ts
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ export type ShellState =
| { kind: 'social-import' }
| { kind: 'meetings' }
| { kind: 'stories' }
| { kind: 'assistant' }

export type DocumentItem = {
id: string
Expand Down Expand Up @@ -56,6 +57,7 @@ export type ShellAction =
| { type: 'open-social-import' }
| { type: 'open-meetings' }
| { type: 'open-stories' }
| { type: 'open-assistant' }

export function shellReducer(_state: ShellState, action: ShellAction): ShellState {
switch (action.type) {
Expand All @@ -77,6 +79,8 @@ export function shellReducer(_state: ShellState, action: ShellAction): ShellStat
return { kind: 'meetings' }
case 'open-stories':
return { kind: 'stories' }
case 'open-assistant':
return { kind: 'assistant' }
}
}

Expand All @@ -88,6 +92,7 @@ export function overlayTitleFor(kind: ShellState['kind']): string | null {
if (kind === 'social-import') return 'Social Import'
if (kind === 'meetings') return 'Meetings'
if (kind === 'stories') return 'Stories'
if (kind === 'assistant') return 'Assistant'
return null
}

Expand Down
6 changes: 6 additions & 0 deletions apps/electron/src/renderer/shell/use-document-shell.ts
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,7 @@ export interface DocumentShell {
handleOpenDataWorkspace: () => void
handleOpenMeetings: () => void
handleOpenStories: () => void
handleOpenAssistant: () => void
handleInsertSavedLensAsCanvasFrame: (view: SavedViewCanvasFrameInput) => void
handleCommandStateChange: Dispatch<SetStateAction<CanvasViewCommandState>>
handlePendingInsertConsumed: (requestId: string) => void
Expand Down Expand Up @@ -408,6 +409,10 @@ export function useDocumentShell(): DocumentShell {
transitionShell({ type: 'open-stories' })
}, [transitionShell])

const handleOpenAssistant = useCallback(() => {
transitionShell({ type: 'open-assistant' })
}, [transitionShell])

const handlePendingInsertConsumed = useCallback((requestId: string) => {
setPendingCanvasInsert((current) => (current?.requestId === requestId ? null : current))
}, [])
Expand Down Expand Up @@ -441,6 +446,7 @@ export function useDocumentShell(): DocumentShell {
handleOpenDataWorkspace,
handleOpenMeetings,
handleOpenStories,
handleOpenAssistant,
handleInsertSavedLensAsCanvasFrame,
handleCommandStateChange: setCanvasCommandState,
handlePendingInsertConsumed
Expand Down
14 changes: 13 additions & 1 deletion apps/electron/src/renderer/shell/use-shell-palette-commands.ts
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ export interface ShellPaletteCommandsOptions {
handleOpenSocialImport: () => void
handleOpenDataWorkspace: () => void
handleOpenStories: () => void
handleOpenAssistant: () => void
}

export function useShellPaletteCommands(options: ShellPaletteCommandsOptions): PaletteCommand[] {
Expand All @@ -41,7 +42,8 @@ export function useShellPaletteCommands(options: ShellPaletteCommandsOptions): P
handleOpenSettings,
handleOpenSocialImport,
handleOpenDataWorkspace,
handleOpenStories
handleOpenStories,
handleOpenAssistant
} = options

return useMemo<PaletteCommand[]>(
Expand Down Expand Up @@ -505,6 +507,15 @@ export function useShellPaletteCommands(options: ShellPaletteCommandsOptions): P
keywords: ['data', 'workspace', 'social', 'saved views', 'lenses'],
execute: handleOpenDataWorkspace
},
{
id: 'open-assistant',
name: 'Open Assistant',
description: 'Chat with your workspace — Claude Code arrives with the xnet tools attached',
icon: 'sparkles',
group: 'Navigate',
keywords: ['ai', 'chat', 'claude', 'assistant', 'agent'],
execute: handleOpenAssistant
},
...(STORIES_ENABLED
? [
{
Expand Down Expand Up @@ -540,6 +551,7 @@ export function useShellPaletteCommands(options: ShellPaletteCommandsOptions): P
handleOpenSettings,
handleOpenSocialImport,
handleOpenStories,
handleOpenAssistant,
canvasCommandState,
isCanvasInteractiveShell,
recentDocuments,
Expand Down
5 changes: 5 additions & 0 deletions apps/web/src/workbench/views/AiChatPanel.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
/**
* Shim (0406): canonical module lives in @xnetjs/workbench/ai. New code
* imports the package directly.
*/
export * from '@xnetjs/workbench/ai'
Loading
Loading