@chatcode/cco-better-sidebar 0.18.0-rc.5 → 0.18.0-rc.7

package/src/client/locales.ts

@@ -37,13 +37,29 @@ export const zh = {
   pluginMarketUser: '用户级',
   pluginMarketInstalled: '插件安装成功。',
   pluginMarketUninstalled: '插件卸载成功。',
-  pluginMarketSubtitle: '浏览插件市场，选择安装到当前项目或用户环境。',
+  pluginMarketSubtitle: '浏览插件市场，选择项目目录安装，或安装到用户环境。',
+  pluginMarketChooseProject: '选择项目目录',
+  pluginMarketProjectHint: '安装到项目时，请先选择目标项目文件夹。',
+  pluginMarketChoosingDirectory: '正在选择目录…',
+  pluginMarketAwaitingConfirmation: '等待确认…',
+  pluginMarketConfirmProjectInstall: '确认项目级安装',
+  pluginMarketConfirmProjectDescription: '将把 {name} 安装到以下项目目录。如需更改，请取消后在顶部选择项目目录。',
+  pluginMarketConfirmInstall: '确认安装',
+  pluginMarketInstalledAt: '插件已安装到：{path}',
+  pluginMarketInstallPath: '{scope}安装目录：{path}',
+  pluginMarketDirectoryPath: '目录路径',
+  pluginMarketOpenDirectory: '打开目录',
+  pluginMarketSelectDirectory: '选择此目录',
+  pluginMarketHomeDirectory: '主目录',
+  pluginMarketDirectoryTruncated: '目录过多，仅显示部分结果；可输入完整路径打开项目。',
   pluginMarketSearch: '搜索市场或插件',
   pluginMarketDefault: '默认',
   pluginMarketBrowse: '查看插件',
   pluginMarketNoDescription: '暂无描述',
   pluginMarketInstalling: '安装中…',
   pluginMarketUninstalling: '卸载中…',
+  pluginMarketInstallProgress: '正在安装 {name}，请稍候…',
+  pluginMarketUninstallProgress: '正在卸载 {name}，请稍候…',
   accountMenuSettings: '设置',
   accountMenuLogout: '退出登录',
   accountMenuLogoutConfirmTitle: '退出登录？',
@@ -531,13 +547,29 @@ export const en: Record<keyof typeof zh, string> = {
   pluginMarketUser: 'User',
   pluginMarketInstalled: 'Plugin installed.',
   pluginMarketUninstalled: 'Plugin uninstalled.',
-  pluginMarketSubtitle: 'Browse marketplaces and install plugins for your project or user.',
+  pluginMarketSubtitle: 'Browse marketplaces, choose a project directory, or install for your user.',
+  pluginMarketChooseProject: 'Choose project directory',
+  pluginMarketProjectHint: 'Choose a target project folder when installing for a project.',
+  pluginMarketChoosingDirectory: 'Choosing directory…',
+  pluginMarketAwaitingConfirmation: 'Awaiting confirmation…',
+  pluginMarketConfirmProjectInstall: 'Confirm project installation',
+  pluginMarketConfirmProjectDescription: '{name} will be installed in the project directory below. To change it, cancel and choose a project directory at the top of the page.',
+  pluginMarketConfirmInstall: 'Confirm installation',
+  pluginMarketInstalledAt: 'Plugin installed at: {path}',
+  pluginMarketInstallPath: '{scope} installation directory: {path}',
+  pluginMarketDirectoryPath: 'Directory path',
+  pluginMarketOpenDirectory: 'Open directory',
+  pluginMarketSelectDirectory: 'Select this directory',
+  pluginMarketHomeDirectory: 'Home',
+  pluginMarketDirectoryTruncated: 'Only some folders are shown. Enter the full path to open your project.',
   pluginMarketSearch: 'Search marketplaces or plugins',
   pluginMarketDefault: 'Default',
   pluginMarketBrowse: 'Browse plugins',
   pluginMarketNoDescription: 'No description',
   pluginMarketInstalling: 'Installing…',
   pluginMarketUninstalling: 'Uninstalling…',
+  pluginMarketInstallProgress: 'Installing {name}, please wait…',
+  pluginMarketUninstallProgress: 'Uninstalling {name}, please wait…',
   accountMenuSettings: 'Settings',
   accountMenuLogout: 'Log out',
   accountMenuLogoutConfirmTitle: 'Log out?',
@@ -1038,9 +1070,46 @@ import { zhHK as zhHKDict } from './locales-zh-HK.ts'
 import { zhTW as zhTWDict } from './locales-zh-TW.ts'
 import { zhMO as zhMODict } from './locales-zh-MO.ts'
 
-// English fallback for the new account/model surfaces until third-language translations are supplied.
+// English fallback for the new account/model/marketplace surfaces until third-language translations are supplied.
 // Keep this list explicit so the dictionary parity check still catches other missing keys.
 const accountAndModelFallback = {
+  pluginMarketTitle: en.pluginMarketTitle,
+  pluginMarketProjectDirectory: en.pluginMarketProjectDirectory,
+  pluginMarketInstalledTab: en.pluginMarketInstalledTab,
+  pluginMarketRefresh: en.pluginMarketRefresh,
+  pluginMarketLoading: en.pluginMarketLoading,
+  pluginMarketRefreshing: en.pluginMarketRefreshing,
+  pluginMarketEmpty: en.pluginMarketEmpty,
+  pluginMarketBack: en.pluginMarketBack,
+  pluginMarketInstall: en.pluginMarketInstall,
+  pluginMarketUninstall: en.pluginMarketUninstall,
+  pluginMarketProject: en.pluginMarketProject,
+  pluginMarketUser: en.pluginMarketUser,
+  pluginMarketInstalled: en.pluginMarketInstalled,
+  pluginMarketUninstalled: en.pluginMarketUninstalled,
+  pluginMarketSubtitle: en.pluginMarketSubtitle,
+  pluginMarketChooseProject: en.pluginMarketChooseProject,
+  pluginMarketProjectHint: en.pluginMarketProjectHint,
+  pluginMarketChoosingDirectory: en.pluginMarketChoosingDirectory,
+  pluginMarketAwaitingConfirmation: en.pluginMarketAwaitingConfirmation,
+  pluginMarketConfirmProjectInstall: en.pluginMarketConfirmProjectInstall,
+  pluginMarketConfirmProjectDescription: en.pluginMarketConfirmProjectDescription,
+  pluginMarketConfirmInstall: en.pluginMarketConfirmInstall,
+  pluginMarketInstalledAt: en.pluginMarketInstalledAt,
+  pluginMarketInstallPath: en.pluginMarketInstallPath,
+  pluginMarketDirectoryPath: en.pluginMarketDirectoryPath,
+  pluginMarketOpenDirectory: en.pluginMarketOpenDirectory,
+  pluginMarketSelectDirectory: en.pluginMarketSelectDirectory,
+  pluginMarketHomeDirectory: en.pluginMarketHomeDirectory,
+  pluginMarketDirectoryTruncated: en.pluginMarketDirectoryTruncated,
+  pluginMarketSearch: en.pluginMarketSearch,
+  pluginMarketDefault: en.pluginMarketDefault,
+  pluginMarketBrowse: en.pluginMarketBrowse,
+  pluginMarketNoDescription: en.pluginMarketNoDescription,
+  pluginMarketInstalling: en.pluginMarketInstalling,
+  pluginMarketUninstalling: en.pluginMarketUninstalling,
+  pluginMarketInstallProgress: en.pluginMarketInstallProgress,
+  pluginMarketUninstallProgress: en.pluginMarketUninstallProgress,
   accountMenuLogoutConfirmTitle: en.accountMenuLogoutConfirmTitle,
   accountMenuLogoutConfirmDescription: en.accountMenuLogoutConfirmDescription,
   chatcodeGateChecking: en.chatcodeGateChecking,

package/src/plugin-market-api.ts

@@ -1,8 +1,15 @@
 /** Shared config plugin routes inside the sidebar's existing trust fence. */
 import type { Context } from './context-types.ts'
-import type { PluginMarketService, PluginMarketScope } from './plugin-market-shared.ts'
+import { realpath, stat } from 'node:fs/promises'
+import { isAbsolute } from 'node:path'
+import type { PluginMarketService, PluginMarketScope, PluginProjectDirectories } from './plugin-market-shared.ts'
 import { requireString, SidebarError } from './wire.ts'
 
+interface DirectoryPicker {
+  capability(): { kind: 'native'; pick(signal: AbortSignal): Promise<string | null> }
+    | { kind: 'browse'; list(path?: string, signal?: AbortSignal): Promise<PluginProjectDirectories> }
+}
+
 export function buildPluginMarketApi(ctx: Pick<Context, 'get'>, cwdOf: (payload: unknown) => Promise<{ cwd: string }>): Record<string, (payload: unknown) => Promise<unknown>> {
   const service = (): PluginMarketService => {
     const value = ctx.get('chatcodePluginMarket', false) as PluginMarketService | undefined
@@ -14,17 +21,46 @@ export function buildPluginMarketApi(ctx: Pick<Context, 'get'>, cwdOf: (payload:
     if (scope !== 'project' && scope !== 'user') throw new SidebarError('bad-request', 'scope must be project or user')
     return scope
   }
-  // Settings can be opened before a conversation exists. In that case the
-  // host launch directory is the project; never take a sessionless cwd from
-  // the browser. Conversations still use the existing authoritative resolver.
-  const contextOf = async (payload: unknown): Promise<{ sessionId: string; cwd: string }> => {
+  const selectedProject = async (payload: unknown): Promise<string> => {
+    if (typeof (payload as { projectPath?: unknown } | null)?.projectPath !== 'string') throw new SidebarError('bad-request', '请先选择目标项目目录。')
+    const path = requireString(payload, 'projectPath')
+    const qualified = process.platform !== 'win32' || /^(?:[A-Za-z]:[\\/]|[\\/]{2}[^\\/]+[\\/][^\\/]+)/.test(path)
+    if (!isAbsolute(path) || !qualified || path.includes('\0')) throw new SidebarError('bad-request', '请选择有效的项目目录。')
+    const canonical = await realpath(path)
+    if (!(await stat(canonical)).isDirectory()) throw new SidebarError('bad-request', '请选择项目文件夹。')
+    return canonical
+  }
+  const picker = () => {
+    const value = ctx.get('directoryPicker', false) as DirectoryPicker | undefined
+    if (!value) throw new SidebarError('method-error', '目录选择器未挂载，请启用宿主目录选择插件。', 503)
+    return value.capability()
+  }
+  // A sessionless settings page has no implicit project. Only user-scoped
+  // operations may use the launch cwd internally, which never becomes a target.
+  const contextOf = async (payload: unknown): Promise<{ sessionId: string; cwd?: string }> => {
     const sessionId = (payload as { sessionId?: unknown } | null)?.sessionId
-    if (sessionId === undefined || sessionId === '') return { sessionId: '', cwd: process.cwd() }
+    if (sessionId === undefined || sessionId === '') return { sessionId: '' }
     requireString(payload, 'sessionId')
     return { sessionId: sessionId as string, cwd: (await cwdOf(payload)).cwd }
   }
+  const projectOf = async (payload: unknown): Promise<string | undefined> => {
+    if ((payload as { projectPath?: unknown } | null)?.projectPath !== undefined) return selectedProject(payload)
+    return (await contextOf(payload)).cwd
+  }
   return {
     'plugins.context': contextOf,
+    'plugins.project.pick': async () => {
+      const capability = picker()
+      if (capability.kind === 'browse') return { kind: 'browse' }
+      const path = await capability.pick(AbortSignal.timeout(120_000))
+      return { kind: 'native', path: path === null ? null : await selectedProject({ projectPath: path }) }
+    },
+    'plugins.project.directories': async payload => {
+      const capability = picker()
+      if (capability.kind !== 'browse') throw new SidebarError('method-error', '当前宿主使用系统文件夹选择窗口。')
+      const path = (payload as { path?: unknown } | null)?.path
+      return capability.list(path === undefined ? undefined : requireString(payload, 'path'), AbortSignal.timeout(15_000))
+    },
     'plugins.marketplaces': () => service().marketplaces(),
     'plugins.catalog': async payload => {
       const market = service()
@@ -32,10 +68,20 @@ export function buildPluginMarketApi(ctx: Pick<Context, 'get'>, cwdOf: (payload:
       if ((payload as { includeMetadata?: unknown }).includeMetadata !== true) return market.plugins(id)
       return market.catalog ? market.catalog(id) : { plugins: await market.plugins(id), warning: '' }
     },
-    'plugins.installed': async payload => service().installed((await contextOf(payload)).cwd),
-    'plugins.install': async payload => service().install((await contextOf(payload)).cwd, requireString(payload, 'pluginId'), scopeOf(payload)),
+    'plugins.installed': async payload => {
+      const project = await projectOf(payload)
+      const records = await service().installed(project ?? process.cwd())
+      return project ? records : records.filter(record => record.scope === 'user')
+    },
+    'plugins.install': async payload => {
+      const scope = scopeOf(payload)
+      const project = scope === 'project' ? await selectedProject(payload) : await projectOf(payload)
+      return service().install(project ?? process.cwd(), requireString(payload, 'pluginId'), scope)
+    },
     'plugins.uninstall': async payload => {
-      await service().uninstall((await contextOf(payload)).cwd, requireString(payload, 'pluginId'), scopeOf(payload))
+      const scope = scopeOf(payload)
+      const project = scope === 'project' ? await selectedProject(payload) : await projectOf(payload)
+      await service().uninstall(project ?? process.cwd(), requireString(payload, 'pluginId'), scope)
       return { ok: true }
     },
   }

package/src/plugin-market-shared.ts

@@ -11,6 +11,15 @@ export interface InstalledMarketplacePlugin extends MarketplacePlugin {
 }
 export interface MarketplaceCatalog { marketplaces: PluginMarketplace[]; warning: string }
 export interface PluginCatalog { plugins: MarketplacePlugin[]; warning: string }
+/** Host-owned paths for the remote Web directory browser. */
+export interface PluginProjectDirectories {
+  path: string
+  home: string
+  crumbs: Array<{ name: string; path: string; hidden: boolean }>
+  entries: Array<{ name: string; path: string; hidden: boolean }>
+  truncated: boolean
+}
+export type PluginProjectPick = { kind: 'native'; path: string | null } | { kind: 'browse' }
 export interface PluginMarketService {
   marketplaces(): Promise<MarketplaceCatalog>
   plugins(marketplaceId: string): Promise<MarketplacePlugin[]>