diff --git a/App.tsx b/App.tsx index b54c7f008..2297d0230 100755 --- a/App.tsx +++ b/App.tsx @@ -12,6 +12,7 @@ import { ToastProvider } from './components/ui/toast'; import { TooltipProvider } from './components/ui/tooltip'; import { ScriptAutomationRoot } from './components/scripts/ScriptAutomationRoot'; import { ExternalMcpApprovalsHost } from './components/ai/ExternalMcpApprovalsHost'; +import { PluginHostInteractionHost } from './components/plugins/PluginHostInteractionHost'; import { PluginAuthenticationHost } from './components/plugins/PluginAuthenticationHost'; import { MultilinePasteConfirmHost } from './components/terminal/MultilinePasteConfirmDialog'; import { useExternalMcpGrantPersister } from './components/ai/useExternalMcpGrantPersister'; @@ -86,6 +87,7 @@ function AppWithProviders({ settings, appLock }: { settings: SettingsState; appL + diff --git a/application/i18n/locales/en/core.ts b/application/i18n/locales/en/core.ts index d37450b0f..d13c6e279 100644 --- a/application/i18n/locales/en/core.ts +++ b/application/i18n/locales/en/core.ts @@ -1246,6 +1246,16 @@ Highlight the focused split pane: "settings.plugins.manager.remove": "Uninstall", "settings.plugins.manager.removeNote": "Uninstall removes package code and local KV data. User-owned settings, secrets and sync sidecars are retained.", "settings.plugins.permissions.statusUnknown": "Status unknown", + "plugins.interaction.title": "Plugin request", + "plugins.interaction.sharing": "Text you share becomes available to this plugin and its granted capabilities, including network access. Reading does not approve a new network destination.", + "plugins.interaction.input": "Input text", + "plugins.interaction.filter": "Filter choices", + "plugins.interaction.preview": "Preview clipboard", + "plugins.interaction.previewNote": "The clipboard is read only after you choose Preview. You can then inspect the text and separately confirm sharing it.", + "plugins.interaction.previewAction": "Preview clipboard", + "plugins.interaction.share": "Share with plugin", + "plugins.interaction.copy": "Copy to clipboard", + "plugins.interaction.failed": "This request expired or could not be completed.", "settings.plugins.permissions.current": "Matches the current activation", "settings.plugins.permissions.inactive": "Inactive for the current activation", "settings.plugins.permissions.title": "Saved grants", diff --git a/application/i18n/locales/es/core.ts b/application/i18n/locales/es/core.ts index d330e8057..134c04c4b 100644 --- a/application/i18n/locales/es/core.ts +++ b/application/i18n/locales/es/core.ts @@ -1246,6 +1246,16 @@ Resalta el panel dividido enfocado: "settings.plugins.manager.remove": "Desinstalar", "settings.plugins.manager.removeNote": "La desinstalación elimina el código y los datos KV locales. Se conservan los ajustes del usuario, los secretos y los datos auxiliares de sincronización.", "settings.plugins.permissions.statusUnknown": "Estado desconocido", + "plugins.interaction.title": "Solicitud de complemento", + "plugins.interaction.sharing": "El texto compartido estará disponible para este complemento y sus capacidades autorizadas, incluida la red. Leer no autoriza un nuevo destino de red.", + "plugins.interaction.input": "Introducir texto", + "plugins.interaction.filter": "Filtrar opciones", + "plugins.interaction.preview": "Vista previa del portapapeles", + "plugins.interaction.previewNote": "El portapapeles se lee al elegir Vista previa. Revise el texto y confirme por separado que desea compartirlo.", + "plugins.interaction.previewAction": "Vista previa del portapapeles", + "plugins.interaction.share": "Compartir con el complemento", + "plugins.interaction.copy": "Copiar al portapapeles", + "plugins.interaction.failed": "La solicitud caducó o no pudo completarse.", "settings.plugins.permissions.current": "Coincide con la ejecución actual", "settings.plugins.permissions.inactive": "No activa para la ejecución actual", "settings.plugins.permissions.title": "Autorizaciones guardadas", diff --git a/application/i18n/locales/ru/core.ts b/application/i18n/locales/ru/core.ts index 2f841c979..6a0d6b421 100644 --- a/application/i18n/locales/ru/core.ts +++ b/application/i18n/locales/ru/core.ts @@ -1141,6 +1141,16 @@ export const ruCoreMessages: Messages = { "settings.plugins.manager.remove": "Удалить", "settings.plugins.manager.removeNote": "Удаление очищает код пакета и локальные данные KV. Настройки пользователя, секреты и данные синхронизации сохраняются.", "settings.plugins.permissions.statusUnknown": "Состояние неизвестно", + "plugins.interaction.title": "Запрос плагина", + "plugins.interaction.sharing": "Переданный текст доступен плагину и его разрешённым возможностям, включая сеть. Чтение не разрешает новый сетевой адрес.", + "plugins.interaction.input": "Ввести текст", + "plugins.interaction.filter": "Фильтр вариантов", + "plugins.interaction.preview": "Предпросмотр буфера обмена", + "plugins.interaction.previewNote": "Буфер читается только после нажатия предпросмотра. Затем проверьте текст и отдельно подтвердите передачу.", + "plugins.interaction.previewAction": "Предпросмотр буфера обмена", + "plugins.interaction.share": "Передать плагину", + "plugins.interaction.copy": "Копировать в буфер обмена", + "plugins.interaction.failed": "Запрос истёк или не выполнен.", "settings.plugins.permissions.current": "Соответствует текущему запуску", "settings.plugins.permissions.inactive": "Не действует для текущего запуска", "settings.plugins.permissions.title": "Сохранённые разрешения", diff --git a/application/i18n/locales/zh-CN/core.ts b/application/i18n/locales/zh-CN/core.ts index a57d9c9ec..a1da718ad 100644 --- a/application/i18n/locales/zh-CN/core.ts +++ b/application/i18n/locales/zh-CN/core.ts @@ -1161,6 +1161,16 @@ Vaults 标签保持扁平,不使用这块背景。 "settings.plugins.manager.remove": "卸载", "settings.plugins.manager.removeNote": "卸载会移除插件代码和本地 KV 数据,保留用户设置、秘密存储和同步 sidecar。", "settings.plugins.permissions.statusUnknown": "状态未知", + "plugins.interaction.title": "插件请求", + "plugins.interaction.sharing": "分享的文本将交给此插件及其已授权的能力(包括网络访问)。读取文本不代表批准新的网络目标。", + "plugins.interaction.input": "输入文本", + "plugins.interaction.filter": "筛选选项", + "plugins.interaction.preview": "剪贴板预览", + "plugins.interaction.previewNote": "仅在点击“预览剪贴板”后读取。检查文本后,还需单独确认才能分享给插件。", + "plugins.interaction.previewAction": "预览剪贴板", + "plugins.interaction.share": "分享给插件", + "plugins.interaction.copy": "复制到剪贴板", + "plugins.interaction.failed": "此请求已过期或无法完成。", "settings.plugins.permissions.current": "匹配当前运行实例", "settings.plugins.permissions.inactive": "对当前运行实例不生效", "settings.plugins.permissions.title": "已保存的授权", diff --git a/application/i18n/locales/zh-TW/core.ts b/application/i18n/locales/zh-TW/core.ts index efdc44eb7..d5b15f213 100644 --- a/application/i18n/locales/zh-TW/core.ts +++ b/application/i18n/locales/zh-TW/core.ts @@ -1164,6 +1164,16 @@ Vaults 分頁維持扁平,不使用這塊背景。 "settings.plugins.manager.remove": "卸載", "settings.plugins.manager.removeNote": "卸載會移除插件代碼和本地 KV 數據,保留用戶設置、秘密存儲和同步 sidecar。", "settings.plugins.permissions.statusUnknown": "狀態不明", + "plugins.interaction.title": "外掛請求", + "plugins.interaction.sharing": "分享的文字會交給此外掛及其已授權能力(包括網路存取)。讀取文字不代表核准新的網路目的地。", + "plugins.interaction.input": "輸入文字", + "plugins.interaction.filter": "篩選選項", + "plugins.interaction.preview": "剪貼簿預覽", + "plugins.interaction.previewNote": "僅在點選「預覽剪貼簿」後讀取。檢查文字後,還需另外確認才能分享給外掛。", + "plugins.interaction.previewAction": "預覽剪貼簿", + "plugins.interaction.share": "分享給外掛", + "plugins.interaction.copy": "複製到剪貼簿", + "plugins.interaction.failed": "此請求已過期或無法完成。", "settings.plugins.permissions.current": "符合目前執行個體", "settings.plugins.permissions.inactive": "對目前執行個體不生效", "settings.plugins.permissions.title": "已儲存的授權", diff --git a/application/state/usePluginHostInteractions.ts b/application/state/usePluginHostInteractions.ts new file mode 100644 index 000000000..f9c652ce3 --- /dev/null +++ b/application/state/usePluginHostInteractions.ts @@ -0,0 +1,53 @@ +import { useCallback, useEffect, useRef, useState } from 'react'; +import type { HostInteractionPrompt, HostInteractionResponse } from '@netcatty/plugin-contract'; +import { netcattyBridge } from '../../infrastructure/services/netcattyBridge'; + +export function usePluginHostInteractions() { + const [prompt, setPrompt] = useState(null); + const [value, setValue] = useState(''); + const [error, setError] = useState(false); + const [busy, setBusy] = useState(false); + const current = useRef(null); + const pending = useRef(false); + useEffect(() => { + const bridge = netcattyBridge.get(); + if (!bridge?.onPluginInteraction || !bridge.setPluginInteractionReady) return; + const unsubscribe = bridge.onPluginInteraction((event) => { + if ('closed' in event) { + if (current.current?.requestId !== event.requestId) return; + current.current = null; setPrompt(null); + } else { + current.current = event; setPrompt(event); + setValue(event.request.kind === 'input' ? event.request.initialValue ?? '' : ''); + } + pending.current = false; setBusy(false); setError(false); + }); + void bridge.setPluginInteractionReady(true).catch(() => {}); + return () => { + current.current = null; + unsubscribe(); + void bridge.setPluginInteractionReady?.(false).catch(() => {}); + }; + }, []); + const respond = useCallback(async (action: HostInteractionResponse['action']) => { + const active = current.current; + if (!active || pending.current) return; + pending.current = true; setBusy(true); setError(false); + try { + const bridge = netcattyBridge.require(); + if (!bridge.respondPluginInteraction) throw new Error('Host interactions unavailable'); + const accepted = await bridge.respondPluginInteraction({ + requestId: active.requestId, actionToken: active.actionToken, action, + ...(action === 'submit' && (active.request.kind === 'input' || active.request.kind === 'quickPick') ? { value } : {}), + }); + if (!accepted && current.current?.actionToken === active.actionToken) { + current.current = null; setPrompt(null); + } + } catch { + if (current.current?.actionToken === active.actionToken) setError(true); + } finally { + if (current.current?.actionToken === active.actionToken) { pending.current = false; setBusy(false); } + } + }, [value]); + return { prompt, value, setValue, error, busy, respond }; +} diff --git a/components/PluginHostInteractionHost.test.tsx b/components/PluginHostInteractionHost.test.tsx new file mode 100644 index 000000000..679ec43ca --- /dev/null +++ b/components/PluginHostInteractionHost.test.tsx @@ -0,0 +1,89 @@ +import assert from 'node:assert/strict'; +import test from 'node:test'; +import { EventEmitter } from 'node:events'; +import { JSDOM } from 'jsdom'; + +test('host dialog drives choice/input/copy and the two-phase clipboard share using real service action tokens', async () => { + const dom = new JSDOM('
', { pretendToBeVisual: true, url: 'http://localhost' }); + const previous = new Map(); + const install = (key: string, value: unknown) => { + previous.set(key, Object.getOwnPropertyDescriptor(globalThis, key)); + Object.defineProperty(globalThis, key, { configurable: true, writable: true, value }); + }; + for (const key of ['window', 'document', 'navigator', 'HTMLElement', 'HTMLInputElement', 'Element', 'Node', 'NodeFilter', 'MutationObserver', 'CustomEvent', 'Event', 'KeyboardEvent', 'MouseEvent']) { + install(key, key === 'window' ? dom.window : dom.window[key as keyof typeof dom.window]); + } + install('getComputedStyle', dom.window.getComputedStyle.bind(dom.window)); + install('requestAnimationFrame', dom.window.requestAnimationFrame.bind(dom.window)); + install('cancelAnimationFrame', dom.window.cancelAnimationFrame.bind(dom.window)); + install('IS_REACT_ACT_ENVIRONMENT', true); + const { default: React, act } = await import('react'); + const { createRoot } = await import('react-dom/client'); + const { I18nProvider } = await import('../application/i18n/I18nProvider'); + const { PluginHostInteractionHost } = await import('./plugins/PluginHostInteractionHost'); + const { PluginHostInteractionService, assertInteractionRequest } = await import('../electron/plugins/hostInteractionService.cjs'); + let listener: ((event: unknown) => void) | null = null; + let reads = 0; + const writes: string[] = []; + const audits: unknown[] = []; + const sender = Object.assign(new EventEmitter(), { id: 7, isDestroyed: () => false, send(_channel: string, payload: unknown) { listener?.(payload); } }); + const owner = Object.assign(new EventEmitter(), { webContents: sender, isFocused: () => true, isVisible: () => true, isDestroyed: () => false }); + const service = new PluginHostInteractionService({ + getWindow: () => owner, isLocked: () => false, + permissionEngine: { onDidRevoke() { return { dispose() {} }; } }, + database: { recordSecurityAudit(...args: unknown[]) { audits.push(args); } }, + quotaManager: { chargeBytes() {} }, + clipboard: { readText() { reads++; return 'synthetic private text'; }, writeText(value: string) { writes.push(value); } }, + }); + Object.assign(dom.window, { netcatty: { + onPluginInteraction(callback: (event: unknown) => void) { listener = callback; return () => { listener = null; }; }, + async setPluginInteractionReady(ready: boolean) { return service.setReady(sender, ready); }, + async respondPluginInteraction(response: unknown) { return service.respond(sender, response); }, + } }); + const context = { pluginId: 'com.example.synthetic', pluginVersion: '1.0.0', runtimeId: 'runtime-synthetic', signal: new AbortController().signal, async assertActive() {} }; + const root = createRoot(document.getElementById('root')!); + const settle = () => new Promise((resolve) => setTimeout(resolve, 20)); + const button = (text: string) => Array.from(document.querySelectorAll('button')).find((item) => item.textContent === text)!; + const click = async (element: HTMLElement) => { assert.ok(element); await act(async () => { element.click(); await settle(); }); }; + const begin = async (params: unknown) => { + let promise!: Promise; + await act(async () => { promise = service.request(assertInteractionRequest(params), context); void promise.catch(() => {}); await settle(); }); + return { promise }; + }; + try { + await act(async () => root.render()); + const choice = await begin({ kind: 'quickPick', title: 'Synthetic choice', items: [{ id: 'compose', label: 'Compose' }] }); + assert.match(document.querySelector('[role="dialog"]')?.textContent ?? '', /com.example.synthetic/); + assert.equal(button('Continue').disabled, true); + await click(document.querySelector('input[type="radio"]')!); + await click(button('Continue')); + assert.deepEqual(await choice.promise, { cancelled: false, value: 'compose' }); + const input = await begin({ kind: 'input', title: 'Synthetic input', initialValue: 'synthetic output' }); + assert.equal(document.querySelector('input')?.value, 'synthetic output'); + await click(button('Continue')); + assert.deepEqual(await input.promise, { cancelled: false, value: 'synthetic output' }); + const copy = await begin({ kind: 'clipboard.write', title: 'Copy result', text: 'synthetic output' }); + assert.deepEqual(writes, []); + assert.equal(document.querySelector('textarea')?.value, 'synthetic output'); + await click(button('Copy to clipboard')); + assert.deepEqual(await copy.promise, { cancelled: false, value: true }); + assert.deepEqual(writes, ['synthetic output']); + const share = await begin({ kind: 'clipboard.read', title: 'Share clipboard' }); + assert.equal(reads, 0); + assert.equal(document.querySelector('textarea'), null); + await click(button('Preview clipboard')); + assert.equal(reads, 1); + assert.equal(document.querySelector('textarea')?.value, 'synthetic private text'); + await click(button('Share with plugin')); + assert.deepEqual(await share.promise, { cancelled: false, value: 'synthetic private text' }); + assert.equal(JSON.stringify(audits).includes('synthetic private text'), false); + const cancelled = await begin({ kind: 'clipboard.write', title: 'Cancelled copy', text: 'must not copy' }); + await click(button('Cancel')); + assert.deepEqual(await cancelled.promise, { cancelled: true }); + assert.deepEqual(writes, ['synthetic output']); + assert.equal(service.pending.size, 0); + } finally { + await act(async () => { root.unmount(); }); service.shutdown(); dom.window.close(); + for (const [key, descriptor] of previous) { if (descriptor) Object.defineProperty(globalThis, key, descriptor); else Reflect.deleteProperty(globalThis, key); } + } +}); diff --git a/components/plugins/PluginHostInteractionHost.tsx b/components/plugins/PluginHostInteractionHost.tsx new file mode 100644 index 000000000..0ff95935b --- /dev/null +++ b/components/plugins/PluginHostInteractionHost.tsx @@ -0,0 +1,54 @@ +import React, { useState } from 'react'; +import { PLUGIN_HOST_INTERACTION_LIMITS } from '@netcatty/plugin-contract'; +import { useI18n } from '../../application/i18n/I18nProvider'; +import { usePluginHostInteractions } from '../../application/state/usePluginHostInteractions'; +import { Button } from '../ui/button'; +import { Input } from '../ui/input'; +import { Dialog, DialogContent, DialogDescription, DialogFooter, DialogHeader, DialogTitle } from '../ui/dialog'; + +export function PluginHostInteractionHost() { + const state = usePluginHostInteractions(); + if (!state.prompt) return null; + return ; +} + +function HostInteractionDialog({ state, prompt }: { + state: ReturnType; + prompt: NonNullable['prompt']>; +}) { + const { t } = useI18n(); + const [search, setSearch] = useState(''); + const request = prompt.request; + const previewClipboard = request.kind === 'clipboard.read' && prompt.phase === 'request'; + const textBytes = new TextEncoder().encode(state.value).length; + const canSubmit = request.kind === 'quickPick' ? request.items.some((item) => item.id === state.value) : textBytes <= PLUGIN_HOST_INTERACTION_LIMITS.textBytes; + return { if (!open) void state.respond('cancel'); }}> + + + {t('plugins.interaction.title')} + {prompt.pluginId} · {prompt.pluginVersion} + +

{request.title}

+

{t('plugins.interaction.sharing')}

+ {request.kind === 'input' && state.setValue(event.target.value)} />} + {request.kind === 'quickPick' && <> + setSearch(event.target.value)} autoFocus disabled={state.busy} /> +
+ {request.items.filter((item) => `${item.label} ${item.description ?? ''}`.toLocaleLowerCase().includes(search.toLocaleLowerCase())).map((item) => )} +
+ } + {previewClipboard &&

{t('plugins.interaction.previewNote')}

} + {(request.kind === 'clipboard.write' || prompt.phase === 'preview') &&