coding-tool-x 3.8.7 → 3.8.9

package/src/platforms/drivers/omp/sessions.js

@@ -11,12 +11,12 @@ function createDriver(context = {}) {
     servicePath: './omp/sessions-implementation',
     localServicePath: '../platforms/drivers/omp/sessions-implementation',
     adapterLocalPath: '../platforms/drivers/omp/session-history-adapter',
-    adapterMethods: { inventory: 'inventory', parse: 'parse' },
+    adapterMethods: { inventory: 'inventory', summarize: 'summarize', parse: 'parse' },
     methods: {
       getProjects: 'getProjects',
       listSessions: 'getSessionsByProject',
+      listSessionsPage: 'getSessionsPage',
       recent: 'getRecentSessions',
-      search: 'searchSessions',
       getSessionById: 'getSessionById',
       messages: 'getSessionMessages',
       delete: 'deleteSession',
@@ -25,6 +25,37 @@ function createDriver(context = {}) {
       buildLaunchCommand: 'buildLaunchCommand',
       status: 'getSessionStatus'
     },
+    customMethods: {
+      search: (service, requestOrProjectName, keyword, contextLength, options = {}) => {
+        if (requestOrProjectName && typeof requestOrProjectName === 'object' && !Array.isArray(requestOrProjectName)) {
+          const request = requestOrProjectName;
+          const query = request.query || {};
+          return service.searchSessions(query.keyword || query.q || '', Number(query.context) || 15, {
+            ...request,
+            ...options,
+            projectName: request.params?.projectName || null,
+            limit: Number.parseInt(query.limit, 10) || 100
+          });
+        }
+        return service.searchSessions(keyword, contextLength, {
+          ...options,
+          projectName: requestOrProjectName
+        });
+      },
+      searchAcrossProjects: (service, requestOrKeyword, limit, options = {}) => {
+        if (requestOrKeyword && typeof requestOrKeyword === 'object' && !Array.isArray(requestOrKeyword)) {
+          const request = requestOrKeyword;
+          const query = request.query || {};
+          return service.searchSessions(query.keyword || query.q || '', Number(query.context) || 35, {
+            ...request,
+            ...options,
+            projectName: query.projectName || query.project || null,
+            limit: Number.parseInt(query.limit, 10) || 35
+          });
+        }
+        return service.searchSessions(requestOrKeyword, Number(options.contextLength) || 35, { ...options, limit });
+      }
+    },
     onSuccess: operation => {
       if (['delete', 'fork', 'saveSessionOrder'].includes(operation)) {
         context.sessionHistoryIndex?.invalidateSource('omp');

package/src/platforms/drivers/opencode/channels-implementation.js

@@ -68,6 +68,10 @@ function normalizeChannelName(value) {
     .replace(/\s+/g, ' ');
 }
 
+function normalizeAuthMode(value) {
+  return ['api_key', 'oauth', 'none'].includes(value) ? value : 'api_key';
+}
+
 // 获取渠道存储文件路径
 function getChannelsFilePath() {
   const channelsDir = path.dirname(configuredState.channels);
@@ -98,24 +102,7 @@ function loadChannels() {
     const data = JSON.parse(content);
     // 确保渠道有必要字段（兼容旧数据）
     if (data.channels) {
-      data.channels = data.channels.map(ch => {
-        const normalized = {
-          ...ch,
-          enabled: ch.enabled !== false,
-          weight: ch.weight || 1,
-          maxConcurrency: ch.maxConcurrency || null,
-          balanceToken: ch.balanceToken || '',
-          balanceUserId: ch.balanceUserId || null,
-          modelRedirects: ch.modelRedirects || [],
-          speedTestModel: ch.speedTestModel || null,
-          wireApi: ch.wireApi || 'openai',  // OpenCode 默认使用 OpenAI 兼容格式
-          gatewaySourceType: normalizeGatewaySourceType(ch.gatewaySourceType, 'codex'),
-          allowedModels: ch.allowedModels || []
-        };
-        normalized.providerKey = ch.providerKey || deriveProviderKey(normalized);
-        normalized.websiteUrl = resolveChannelWebsiteUrl('opencode', normalized);
-        return normalized;
-      });
+      data.channels = data.channels.map(ch => normalizeOpenCodeChannel(ch));
     }
     return data;
   } catch (err) {
@@ -191,12 +178,18 @@ function getChannels() {
 function createChannel(name, baseUrl, apiKey, extraConfig = {}) {
   const data = loadChannels();
   const isProxyRunning = getOpenCodeProxyRunning();
+  const authMode = normalizeAuthMode(extraConfig.authMode);
 
   const newChannel = {
     id: crypto.randomUUID(),
     name,
-    baseUrl,
-    apiKey,
+    baseUrl: authMode === 'oauth' || authMode === 'none' ? '' : baseUrl,
+    apiKey: authMode === 'oauth' || authMode === 'none' ? '' : apiKey,
+    authMode,
+    authRef: authMode === 'oauth' ? (extraConfig.authRef || {}) : undefined,
+    authSource: authMode === 'oauth' ? (extraConfig.authSource || 'synced-local') : undefined,
+    authStatus: authMode === 'oauth' ? (extraConfig.authStatus || 'available') : undefined,
+    oauthProviderId: authMode === 'oauth' ? (extraConfig.oauthProviderId || extraConfig.providerKey || '') : '',
     wireApi: extraConfig.wireApi || 'openai',
     enabled: extraConfig.enabled !== false,
     weight: extraConfig.weight || 1,
@@ -248,7 +241,7 @@ function updateChannel(channelId, updates) {
 
   const oldChannel = data.channels[index];
 
-  const merged = {
+  const merged = normalizeOpenCodeChannel({
     ...oldChannel,
     ...updates,
     id: channelId,
@@ -264,7 +257,7 @@ function updateChannel(channelId, updates) {
       'codex'
     ),
     updatedAt: Date.now()
-  };
+  });
   merged.providerKey = updates.providerKey || oldChannel.providerKey || deriveProviderKey(merged);
   merged.websiteUrl = resolveChannelWebsiteUrl('opencode', merged);
   data.channels[index] = merged;
@@ -524,6 +517,7 @@ function findOpenCodeExistingByProvider(channels = [], providerId = '', baseUrl
 }
 
 function normalizeOpenCodeChannel(channel = {}) {
+  const authMode = normalizeAuthMode(channel.authMode);
   const normalized = {
     ...channel,
     enabled: channel.enabled !== false,
@@ -537,6 +531,15 @@ function normalizeOpenCodeChannel(channel = {}) {
     gatewaySourceType: normalizeGatewaySourceType(channel.gatewaySourceType, 'codex'),
     allowedModels: Array.isArray(channel.allowedModels) ? channel.allowedModels : []
   };
+  normalized.authMode = authMode;
+  normalized.authRef = authMode === 'oauth' ? (channel.authRef || {}) : undefined;
+  normalized.authSource = authMode === 'oauth' ? (channel.authSource || 'synced-local') : undefined;
+  normalized.authStatus = authMode === 'oauth' ? (channel.authStatus || 'available') : undefined;
+  normalized.oauthProviderId = authMode === 'oauth' ? (channel.oauthProviderId || channel.providerKey || '') : '';
+  if (authMode === 'oauth' || authMode === 'none') {
+    normalized.baseUrl = '';
+    normalized.apiKey = '';
+  }
   normalized.providerKey = normalized.providerKey || deriveProviderKey(normalized);
   normalized.websiteUrl = resolveChannelWebsiteUrl('opencode', normalized);
   return normalized;

package/src/platforms/drivers/opencode/channels.js

@@ -3,7 +3,7 @@
 const { createChannelDriver } = require('../../../shared/channel-driver');
 
 function createDriver(context = {}) {
-  return createChannelDriver({
+  const driver = createChannelDriver({
     ...context,
     platform: 'opencode',
     servicePath: './opencode/channels-implementation',
@@ -35,6 +35,11 @@ function createDriver(context = {}) {
     },
     dashboardChannelShape: 'array'
   });
+  const auth = require('../../channel-auth-service');
+  driver.getAuth = context => auth.getChannelAuth('opencode', { channelId: context?.params?.channelId || context?.query?.channelId || '' });
+  driver.syncLocalAuth = context => auth.syncLocalChannelAuth('opencode', { channelId: context?.body?.channelId || context?.params?.channelId || context?.query?.channelId || '' });
+  driver.getAuthQuota = context => auth.fetchChannelAuthQuota('opencode', context?.params?.channelId, { refresh: context?.query?.refresh === 'true' });
+  return driver;
 }
 
 module.exports = { createDriver };

package/src/platforms/drivers/opencode/sessions-implementation.js

@@ -345,7 +345,33 @@ function getProjectRows() {
   `);
 }
 
-function getSessionRowsByProjectId(projectId) {
+function getProjectRowsPage(options = {}) {
+  const page = Math.max(1, Number.parseInt(options.page, 10) || 1);
+  const limit = Math.max(1, Math.min(100, Number.parseInt(options.limit, 10) || 20));
+  const query = String(options.q || options.search || '').trim();
+  const like = `%${query}%`;
+  const where = query ? 'WHERE p.id LIKE ? OR p.name LIKE ? OR p.worktree LIKE ?' : '';
+  const params = query ? [like, like, like] : [];
+  const total = Number(_query(`SELECT COUNT(*) AS total FROM project p ${where}`, ...params)[0]?.total) || 0;
+  const rows = _query(`
+    SELECT
+      p.*,
+      (SELECT s.directory FROM session s
+       WHERE s.project_id = p.id AND s.time_archived IS NULL
+       ORDER BY s.time_updated DESC LIMIT 1) AS session_directory,
+      (SELECT COUNT(*) FROM session s WHERE s.project_id = p.id AND s.time_archived IS NULL) AS session_count
+    FROM project p
+    ${where}
+    ORDER BY p.time_updated DESC, p.id ASC
+    LIMIT ? OFFSET ?
+  `, ...params, limit, (page - 1) * limit);
+  return { rows, page, limit, total };
+}
+
+function getSessionRowsByProjectId(projectId, options = {}) {
+  const pagination = options.limit != null
+    ? `LIMIT ${Math.max(1, Math.min(100, Number(options.limit) || 20))} OFFSET ${Math.max(0, Number(options.offset) || 0)}`
+    : '';
   return _query(`
     SELECT
       s.id,
@@ -384,7 +410,8 @@ function getSessionRowsByProjectId(projectId) {
     FROM session s
     WHERE s.project_id = ?
       AND s.time_archived IS NULL
-    ORDER BY s.time_updated DESC
+    ORDER BY s.time_updated DESC, s.id ASC
+    ${pagination}
   `, projectId);
 }
 
@@ -484,8 +511,7 @@ function normalizeSession(session, projectId) {
 // Public API
 // ---------------------------------------------------------------------------
 
-function getProjects(_options = {}) {
-  const projects = getProjectRows().map((project) => {
+function normalizeProjectRow(project) {
     const fallbackPath = project.worktree && project.worktree !== '/'
       ? project.worktree
       : project.session_directory || project.worktree || '/';
@@ -504,12 +530,25 @@ function getProjects(_options = {}) {
       lastUsed: toIsoTime(project.time_updated),
       source: 'opencode'
     };
-  });
+}
+
+function getProjects(_options = {}) {
+  const projects = getProjectRows().map(normalizeProjectRow);
 
   const order = getProjectOrder();
   return sortByOrder(projects, order, (a, b) => (b.lastUsed || '').localeCompare(a.lastUsed || ''));
 }
 
+function getProjectsPage(options = {}) {
+  const { rows, page, limit, total } = getProjectRowsPage(options);
+  const projects = rows.map(normalizeProjectRow);
+  return {
+    projects,
+    currentProject: null,
+    pagination: { page, limit, total, hasMore: page * limit < total }
+  };
+}
+
 function getSessionsByProjectId(projectId, _options = {}) {
   const sessions = getSessionRowsByProjectId(projectId).map(session => normalizeSession(session, projectId));
   const order = getSessionOrder(projectId);
@@ -523,13 +562,48 @@ function getSessionsByProjectId(projectId, _options = {}) {
   );
 }
 
-function searchSessions(keyword) {
+function getSessionsPage(projectId, options = {}) {
+  const page = Math.max(1, Number.parseInt(options.page, 10) || 1);
+  const limit = Math.max(1, Math.min(100, Number.parseInt(options.limit, 10) || 20));
+  const aggregate = _query(`
+    SELECT COUNT(*) AS total,
+      COALESCE(SUM(
+        COALESCE((SELECT SUM(LENGTH(CAST(m.data AS BLOB))) FROM message m WHERE m.session_id = s.id), 0)
+        + COALESCE((SELECT SUM(LENGTH(CAST(p.data AS BLOB))) FROM part p WHERE p.session_id = s.id), 0)
+        + COALESCE(LENGTH(CAST(s.title AS BLOB)), 0)
+        + COALESCE(LENGTH(CAST(s.slug AS BLOB)), 0)
+        + COALESCE(LENGTH(CAST(s.directory AS BLOB)), 0)
+      ), 0) AS total_size
+    FROM session s
+    WHERE s.project_id = ? AND s.time_archived IS NULL
+  `, projectId)[0] || {};
+  const sessions = getSessionRowsByProjectId(projectId, {
+    limit,
+    offset: (page - 1) * limit
+  }).map(session => normalizeSession(session, projectId));
+  const total = Number(aggregate.total) || 0;
+  const totalSize = Number(aggregate.total_size) || 0;
+  return {
+    sessions,
+    totalSize,
+    projectInfo: { sessionCount: total, totalSize },
+    pagination: { page, limit, total, hasMore: page * limit < total }
+  };
+}
+
+function searchSessions(keyword, options = {}) {
   if (!keyword || !keyword.trim()) return [];
   const lowerKeyword = keyword.toLowerCase();
+  const projectName = typeof options.projectName === 'string' && options.projectName.trim()
+    ? options.projectName.trim()
+    : null;
+  const contextLength = Math.max(1, Math.min(200, Number(options.contextLength) || 35));
+  const limit = Math.max(1, Math.min(200, Number(options.limit) || 100));
 
   const allSessions = [];
   const projects = getProjectRows();
   for (const project of projects) {
+    if (projectName && project.id !== projectName) continue;
     const sessions = getSessionRowsByProjectId(project.id);
     for (const session of sessions) {
       const messages = getMessageRowsBySessionId(session.id);
@@ -563,7 +637,7 @@ function searchSessions(keyword) {
           matchedMessages.push({
             messageIndex: i,
             role: data ? (data.role || 'unknown') : 'unknown',
-            context: buildContext(text, keyword),
+            context: buildContext(text, keyword, contextLength),
             timestamp: toIsoTime(message.time_created)
           });
         }
@@ -577,13 +651,17 @@ function searchSessions(keyword) {
           firstMessage: session.title || null,
           matches: matchedMessages,
           matchCount: matchedMessages.length,
+          updatedAt: normalizeTimestampMs(session.time_updated) || 0,
+          projectFullPath: project.worktree || null,
           source: 'opencode'
         });
       }
     }
   }
 
-  return allSessions.sort((a, b) => b.matchCount - a.matchCount);
+  return allSessions
+    .sort((a, b) => b.updatedAt - a.updatedAt || a.sessionId.localeCompare(b.sessionId))
+    .slice(0, limit);
 }
 
 function getRecentSessions(limit = 5) {
@@ -638,7 +716,7 @@ function getSessionMessages(sessionId, options = {}) {
   const session = getSessionById(sessionId);
   if (!session) return null;
   const page = Math.max(1, Number.parseInt(options.page, 10) || 1);
-  const limit = Math.max(1, Math.min(200, Number.parseInt(options.limit, 10) || 50));
+  const limit = Math.max(1, Math.min(200, Number.parseInt(options.limit, 10) || 20));
   const order = String(options.order || 'desc').toLowerCase() === 'asc' ? 'asc' : 'desc';
   const ordered = order === 'asc' ? [...session.messages] : [...session.messages].reverse();
   const offset = (page - 1) * limit;
@@ -907,7 +985,9 @@ module.exports = {
   getOpenCodeDbPath,
   isOpenCodeInstalled,
   getProjects,
+  getProjectsPage,
   getSessionsByProjectId,
+  getSessionsPage,
   getSessionById,
   getSessionStatus,
   getSessionMessages,

package/src/platforms/drivers/opencode/sessions.js

@@ -12,7 +12,6 @@ function createDriver(context = {}) {
     methods: {
       getProjects: 'getProjects',
       recent: 'getRecentSessions',
-      search: 'searchSessions',
       getSessionById: 'getSessionById',
       delete: 'deleteSession',
       fork: 'forkSession',
@@ -22,11 +21,48 @@ function createDriver(context = {}) {
       isAvailable: 'isOpenCodeInstalled'
     },
     customMethods: {
+      search: (service, requestOrProjectName, keyword, contextLength, options = {}) => {
+        if (requestOrProjectName && typeof requestOrProjectName === 'object' && !Array.isArray(requestOrProjectName)) {
+          const request = requestOrProjectName;
+          const query = request.query || {};
+          return service.searchSessions(query.keyword || query.q || '', {
+            ...request,
+            ...options,
+            projectName: request.params?.projectName || null,
+            contextLength: Number(query.context) || 15,
+            limit: Number.parseInt(query.limit, 10) || 100
+          });
+        }
+        return service.searchSessions(keyword, {
+          ...options,
+          projectName: requestOrProjectName,
+          contextLength,
+          limit: options.limit
+        });
+      },
+      searchAcrossProjects: (service, requestOrKeyword, limit, options = {}) => {
+        if (requestOrKeyword && typeof requestOrKeyword === 'object' && !Array.isArray(requestOrKeyword)) {
+          const request = requestOrKeyword;
+          const query = request.query || {};
+          return service.searchSessions(query.keyword || query.q || '', {
+            ...request,
+            ...options,
+            projectName: query.projectName || query.project || null,
+            limit: Number.parseInt(query.limit, 10) || 35,
+            contextLength: Number(query.context) || 35
+          });
+        }
+        return service.searchSessions(requestOrKeyword, { ...options, limit });
+      },
       listSessions: (service, ...args) => {
         const method = service.getSessionsByProjectId || service.getSessionsByProject;
         if (typeof method !== 'function') return undefined;
         return method.apply(service, args);
       },
+      listSessionsPage: (service, projectName, options = {}) => {
+        if (typeof service.getSessionsPage !== 'function') return undefined;
+        return service.getSessionsPage(projectName, options);
+      },
       messages: (service, sessionId, options) => {
         if (typeof service.getSessionMessages === 'function') {
           return service.getSessionMessages(sessionId, options);

package/src/platforms/manifest-schema.js

@@ -17,7 +17,15 @@ const DRIVER_IDS = new Set([
   'legacy:opencode',
   'legacy:omp',
   'opencode-conversion',
-  'claude-health'
+  'claude-health',
+  'dsh-api',
+  'dsh-projects',
+  'dsh-sessions',
+  'dsh-native-config',
+  'dsh-channels',
+  'dsh-proxy',
+  'dsh-statistics',
+  'dsh-native-logs'
 ]);
 
 const PATH_RESOLVER_IDS = new Set([
@@ -26,7 +34,8 @@ const PATH_RESOLVER_IDS = new Set([
   'codex',
   'gemini',
   'opencode',
-  'omp'
+  'omp',
+  'dsh'
 ]);
 
 const API_ROUTE_DESCRIPTOR_SCHEMA = {
@@ -46,7 +55,31 @@ const API_ROUTE_DESCRIPTOR_SCHEMA = {
 const API_ROUTE_METHODS = new Set(['GET', 'POST', 'PUT', 'PATCH', 'DELETE']);
 
 const CAPABILITY_OPERATIONS = Object.freeze({
-  api: new Set(['getConfig', 'getConfigAuthProviders', 'getConfigCapabilities', 'getConfigResources']),
+  api: new Set([
+    'getConfig',
+    'getConfigAuthProviders',
+    'getConfigCapabilities',
+    'getConfigResources',
+    'updateConfig',
+    'listProfiles',
+    'listPlugins',
+    'listProfilePlugins',
+    'listProfileCapabilities',
+    'listProfileMcp',
+    'listProfilePrompts',
+    'installPlugin',
+    'uninstallPlugin',
+    'updatePlugin',
+    'upsertMcp',
+    'deleteMcp',
+    'upsertPrompt',
+    'deletePrompt',
+    'listSkills',
+    'getSkill',
+    'createSkill',
+    'updateSkill',
+    'deleteSkill'
+  ]),
   channels: new Set(['applyToSettings', 'bestForRestore', 'catalogMetadata', 'create', 'current', 'enabled', 'getAuth', 'getAuthQuota', 'list', 'models', 'order', 'poolStatus', 'probeModels', 'remove', 'resetHealth', 'speedTest', 'speedTestAll', 'sync', 'syncLocalAuth', 'update']),
   health: new Set(['healthCheck']),
   hooks: new Set(['getHooks', 'saveHooks', 'testHooks']),
@@ -102,6 +135,13 @@ const schema = {
       }
     },
     resourceTypes: { type: 'object', additionalProperties: { type: 'boolean' } },
+    resourceActions: {
+      type: 'object',
+      additionalProperties: {
+        type: 'object',
+        additionalProperties: { type: 'boolean' }
+      }
+    },
     skillActivation: {
       type: 'object',
       additionalProperties: false,