coding-tool-x 3.9.1 → 3.9.3-260928

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

@@ -2,22 +2,69 @@
 
 function createDriver(context = {}) {
   const converter = require('./gateway-converter');
+  const {
+    loadLatestProxyRequestHeaders,
+    loadLatestProxyRequestSnapshot
+  } = require('../../../server/services/request-logger');
+  const target = context.platform || 'opencode';
+
+  function getOmpTargetContext() {
+    const snapshot = loadLatestProxyRequestSnapshot('omp');
+    const providerApi = snapshot?.route?.providerApi;
+    const targetApi = providerApi === 'openai-completions'
+      ? 'chat.completions'
+      : ['openai-responses', 'openai-codex-responses', 'azure-openai-responses'].includes(providerApi)
+        ? 'responses'
+        : null;
+    return { snapshot, providerApi, targetApi };
+  }
+
+  function convertPayload({ sourceType, payload, options = {} } = {}) {
+    const ompContext = target === 'omp' ? getOmpTargetContext() : null;
+    if (ompContext && !ompContext.targetApi) {
+      throw new Error('The latest OMP request log does not identify a supported OpenAI-compatible provider API. Send an OMP request through an OpenAI-compatible route, then retry.');
+    }
+    const requestedTargetApi = options.targetApi || options.api;
+    if (ompContext && requestedTargetApi && requestedTargetApi !== ompContext.targetApi) {
+      throw new Error(`The latest OMP request uses ${ompContext.providerApi}; conversion only supports ${ompContext.targetApi}.`);
+    }
+    const result = converter.convertToOpenCodePayload({
+      sourceType,
+      payload,
+      options: ompContext ? { ...options, targetApi: ompContext.targetApi } : options
+    });
+    return {
+      ...result,
+      target,
+      ...(ompContext?.snapshot?.route?.path ? { endpoint: ompContext.snapshot.route.path } : {}),
+      requestHeaders: loadLatestProxyRequestHeaders(target)
+    };
+  }
+
   return {
     platform: context.platform,
     capability: 'conversion',
     formats() {
+      const ompContext = target === 'omp' ? getOmpTargetContext() : null;
+      const targetApis = target === 'omp'
+        ? (ompContext.targetApi ? [ompContext.targetApi] : [])
+        : converter.SUPPORTED_TARGET_APIS;
       return {
         sourceTypes: converter.SUPPORTED_SOURCE_TYPES,
         formats: converter.SUPPORTED_SOURCE_TYPES.map(type => ({
           id: type,
           name: type === 'claude' ? 'Claude Code' : type === 'codex' ? 'Codex' : 'Gemini'
         })),
-        targetApis: converter.SUPPORTED_TARGET_APIS,
-        defaultTargetApi: 'responses',
-        endpoints: {
-          responses: '/v1/responses',
-          'chat.completions': '/v1/chat/completions'
-        }
+        targetApis,
+        defaultTargetApi: targetApis[0] || null,
+        endpoints: ompContext
+          ? (ompContext.targetApi && ompContext.snapshot?.route?.path
+            ? { [ompContext.targetApi]: ompContext.snapshot.route.path }
+            : {})
+          : {
+            responses: '/v1/responses',
+            'chat.completions': '/v1/chat/completions'
+          }
       };
     },
     getFormats() {
@@ -30,10 +77,15 @@ function createDriver(context = {}) {
         codex: converter.convertCodexToOpenCodePayload,
         gemini: converter.convertGeminiToOpenCodePayload
       };
-      return (handlers[sourceType] || converter.convertToOpenCodePayload)({ sourceType, payload, options });
+      if (target === 'omp') return convertPayload({ sourceType, payload, options });
+      return {
+        ...(handlers[sourceType] || converter.convertToOpenCodePayload)({ sourceType, payload, options }),
+        target,
+        requestHeaders: loadLatestProxyRequestHeaders(target)
+      };
     },
     convert({ sourceType, payload, options = {} } = {}) {
-      return converter.convertToOpenCodePayload({ sourceType, payload, options });
+      return convertPayload({ sourceType, payload, options });
     }
   };
 }

package/src/platforms/manifest-schema.js

@@ -68,6 +68,7 @@ const CAPABILITY_OPERATIONS = Object.freeze({
     'listProfileCapabilities',
     'listProfileMcp',
     'listProfilePrompts',
+    'listProfileAgentPresets',
     'installPlugin',
     'uninstallPlugin',
     'updatePlugin',
@@ -75,6 +76,8 @@ const CAPABILITY_OPERATIONS = Object.freeze({
     'deleteMcp',
     'upsertPrompt',
     'deletePrompt',
+    'upsertAgentPreset',
+    'deleteAgentPreset',
     'listSkills',
     'getSkill',
     'createSkill',
@@ -113,6 +116,7 @@ const schema = {
     portLabel: { type: 'string', minLength: 1 },
     apiBasePath: { type: 'string', minLength: 1 },
     logFile: { type: 'string', minLength: 1 },
+    logLayout: { enum: ['basic'] },
     logAliases: { type: 'array', items: { type: 'string', minLength: 1 } },
     logNote: { type: 'string' },
     logColor: { type: 'string', minLength: 1 },

package/src/platforms/manifests/dsh.json

@@ -5,6 +5,7 @@
   "command": "dsh",
   "iconToken": "terminal",
   "color": "#2563eb",
+  "logLayout": "basic",
   "defaultVisible": true,
   "defaultEnabled": false,
   "sortOrder": 50,
@@ -25,7 +26,7 @@
   "resourceTypes": {
     "skills": true,
     "commands": false,
-    "agents": false,
+    "agents": true,
     "plugins": true,
     "mcp": true,
     "prompts": true
@@ -38,10 +39,10 @@
       "refresh": true
     },
     "plugins": {
-      "repositories": true,
+      "repositories": false,
       "market": false,
-      "install": false,
-      "uninstall": false,
+      "install": true,
+      "uninstall": true,
       "import": false,
       "syncRepos": false
     }
@@ -477,6 +478,30 @@
         "request": "default",
         "response": "default"
       },
+      {
+        "method": "GET",
+        "path": "/profiles/:profileName/agent-presets",
+        "capability": "api",
+        "operation": "listProfileAgentPresets",
+        "request": "default",
+        "response": "default"
+      },
+      {
+        "method": "POST",
+        "path": "/profiles/:profileName/agent-presets",
+        "capability": "api",
+        "operation": "upsertAgentPreset",
+        "request": "default",
+        "response": "default"
+      },
+      {
+        "method": "DELETE",
+        "path": "/profiles/:profileName/agent-presets/:presetId",
+        "capability": "api",
+        "operation": "deleteAgentPreset",
+        "request": "default",
+        "response": "default"
+      },
       {
         "method": "GET",
         "path": "/skills",

package/src/platforms/manifests/omp.json

@@ -484,6 +484,7 @@
     "hooks": "legacy:omp",
     "resourceSync": "legacy:omp",
     "mcp": "legacy:omp",
-    "prompts": "legacy:omp"
+    "prompts": "legacy:omp",
+    "conversion": "opencode-conversion"
   }
 }

package/src/platforms/registry.js

@@ -188,6 +188,7 @@ function createPlatformRegistry({
       portLabel: platform.portLabel || null,
       apiPrefix: platform.api?.prefix || null,
       modelCatalogKey: platform.modelConfig?.catalogKey || platform.key,
+      ...(platform.logLayout ? { logLayout: platform.logLayout } : {}),
       capabilities
     };
     const resourceTypes = publicResourceTypes(platform.resourceTypes);

package/src/server/api/convert.js

@@ -1,40 +1,28 @@
 const express = require('express');
 const router = express.Router();
 const { getPlatformCatalog } = require('../services/platform-catalog');
+const { createSameOriginGuard } = require('../services/network-access');
 
-/**
- * 获取支持的格式列表
- * GET /api/convert/formats
- */
-router.get('/formats', (req, res) => {
-  const driver = getPlatformCatalog().driver('opencode', 'conversion');
+router.use(createSameOriginGuard({
+  message: '禁止跨站访问请求转换接口'
+}));
+
+function getConversionDriver(target) {
+  return getPlatformCatalog().driver(target, 'conversion');
+}
+
+function getConversionFormats(driver) {
   const formats = driver?.formats?.() || driver?.getFormats?.();
-  if (!formats) {
-    return res.status(404).json({ success: false, error: 'Conversion is not supported' });
-  }
-  const sourceTypes = formats.sourceTypes || [];
-  res.json({
-    formats: sourceTypes.map(type => ({
-      id: type,
-      name: (formats.formats || []).find(item => item.id === type)?.name
-        || String(type).replace(/[-_]/g, ' ').replace(/\b\w/g, char => char.toUpperCase()),
-      description: `${type} session format`,
-      extension: '.jsonl',
-      icon: type
-    })),
-    conversions: sourceTypes.flatMap(sourceType => sourceTypes
-      .filter(targetType => targetType !== sourceType)
-      .map(targetType => ({ from: sourceType, to: targetType })))
-  });
-});
+  return formats;
+}
 
 /**
- * 获取 OpenCode 网关支持格式
- * GET /api/convert/opencode/formats
+ * Read conversion capabilities for a target CLI.
+ * GET /api/convert/:target/formats
  */
-router.get('/opencode/formats', (req, res) => {
-  const driver = getConversionDriver();
-  const formats = driver?.formats?.() || driver?.getFormats?.();
+router.get('/:target/formats', (req, res) => {
+  const driver = getConversionDriver(req.params.target);
+  const formats = getConversionFormats(driver);
   if (!formats) {
     return res.status(404).json({ success: false, error: 'Conversion is not supported' });
   }
@@ -45,62 +33,24 @@ router.get('/opencode/formats', (req, res) => {
       name: (formats.formats || []).find(item => item.id === type)?.name
         || String(type).replace(/[-_]/g, ' ').replace(/\b\w/g, char => char.toUpperCase())
     })),
-    target: 'opencode',
+    target: req.params.target,
     targetApis: formats.targetApis || [],
     defaultTargetApi: formats.defaultTargetApi,
-    endpoints: formats.endpoints || {},
-    sourceEndpoints: Object.fromEntries(sourceTypes.map(type => [type, `/api/convert/opencode/${type}`]))
+    endpoints: formats.endpoints || {}
   });
 });
 
-function getConversionDriver() {
-  return getPlatformCatalog().driver('opencode', 'conversion');
-}
-
-function handleOpenCodeConvert(req, res, sourceType) {
-  try {
-    const { payload, options = {} } = req.body || {};
-    const driver = getConversionDriver();
-
-    if (!driver) {
-      return res.status(404).json({ success: false, error: 'Conversion is not supported' });
-    }
-    if (!payload) {
-      return res.status(400).json({
-        success: false,
-        error: 'Missing required parameters: payload'
-      });
-    }
-    const result = driver.convertSource
-      ? driver.convertSource(sourceType, payload, options)
-      : driver.convert({ sourceType, payload, options });
-    return res.json({
-      success: true,
-      ...result
-    });
-  } catch (error) {
-    console.error(`[Convert API] OpenCode ${sourceType} convert error:`, error);
-    return res.status(500).json({
-      success: false,
-      error: error.message
-    });
-  }
-}
-
-router.post('/opencode/:sourceType', (req, res) => {
-  return handleOpenCodeConvert(req, res, req.params.sourceType);
-});
-
 /**
- * 在线转换为 OpenCode 可处理格式
- * POST /api/convert/opencode
+ * Online conversion to a CLI-compatible request format.
+ * POST /api/convert/:target
  * Body: { sourceType, payload, options? }
  */
-router.post('/opencode', (req, res) => {
+router.post('/:target', (req, res) => {
   try {
     const { sourceType, payload, options = {} } = req.body || {};
-    const driver = getConversionDriver();
-    const sourceTypes = driver?.formats?.().sourceTypes || driver?.getFormats?.().sourceTypes || [];
+    const driver = getConversionDriver(req.params.target);
+    const formats = getConversionFormats(driver);
+    const sourceTypes = formats?.sourceTypes || [];
     const normalized = driver?.normalizeSourceType?.(sourceType) || sourceType;
 
     if (!driver) {
@@ -124,7 +74,7 @@ router.post('/opencode', (req, res) => {
       ...driver.convert({ sourceType: normalized, payload, options })
     });
   } catch (error) {
-    console.error('[Convert API] OpenCode gateway convert error:', error);
+    console.error(`[Convert API] ${req.params.target} convert error:`, error);
     return res.status(500).json({
       success: false,
       error: error.message

package/src/server/api/platforms.js

@@ -18,6 +18,7 @@ const PUBLIC_FIELDS = Object.freeze([
   'portLabel',
   'apiPrefix',
   'modelCatalogKey',
+  'logLayout',
   'promptLabel',
   'resourceTypes',
   'resourceActions'

package/src/server/services/model-detector.js

@@ -330,32 +330,29 @@ function buildRequestHeaders(channelType, channel) {
 }
 
 function buildOpenAiCompatibleUrl(baseUrl, endpoint) {
-  const trimmed = String(baseUrl || '').trim().replace(/\/+$/, '');
-  if (!trimmed) {
+  const rawBaseUrl = String(baseUrl || '').trim();
+  if (!rawBaseUrl) {
     throw new Error('Invalid baseUrl');
   }
 
+  const parsed = new URL(rawBaseUrl);
+  const basePath = parsed.pathname.replace(/\/+$/, '');
   const normalizedEndpoint = String(endpoint || '').startsWith('/')
     ? String(endpoint)
     : `/${endpoint}`;
-
-  if (trimmed.endsWith(normalizedEndpoint)) {
-    return trimmed;
-  }
-
   const endpointWithoutV1 = normalizedEndpoint.startsWith('/v1/')
     ? normalizedEndpoint.slice(3)
     : normalizedEndpoint;
 
-  if (trimmed.endsWith(endpointWithoutV1)) {
-    return trimmed;
-  }
+  if (basePath.endsWith(normalizedEndpoint)) return parsed.toString();
+  if (basePath.endsWith(endpointWithoutV1)) return parsed.toString();
 
-  if (trimmed.endsWith('/v1') && normalizedEndpoint.startsWith('/v1/')) {
-    return `${trimmed}${normalizedEndpoint.slice(3)}`;
-  }
-
-  return `${trimmed}${normalizedEndpoint}`;
+  const suffix = /\/v1$/.test(basePath) && normalizedEndpoint.startsWith('/v1/')
+    ? normalizedEndpoint.slice(3)
+    : normalizedEndpoint;
+  parsed.pathname = `${basePath}${suffix}` || '/';
+  parsed.hash = '';
+  return parsed.toString();
 }
 
 
@@ -1044,14 +1041,8 @@ async function fetchModelsFromProvider(channel, channelType, options = {}) {
       resolve(result);
     };
     try {
-      const baseUrl = channel.baseUrl.trim().replace(/\/+$/, '');
       const endpoint = capability.modelListEndpoint; // e.g. '/v1/models'
-      // 避免路径重复：如果 baseUrl 已包含 /v1，则只拼接 /models
-      const requestUrl = baseUrl.endsWith('/v1') && endpoint.startsWith('/v1/')
-        ? `${baseUrl}${endpoint.slice(3)}`
-        : `${baseUrl}${endpoint}`;
-
-      const parsedUrl = new URL(requestUrl);
+      const parsedUrl = new URL(buildOpenAiCompatibleUrl(channel.baseUrl, endpoint));
       const isHttps = parsedUrl.protocol === 'https:';
       const httpModule = isHttps ? https : http;
 

package/src/server/services/native-log-observer.js

@@ -140,6 +140,7 @@ function recordEvent(platform, event, runtime = getPlatformRuntime(), channelCac
     channel,
     model: event.model || '',
     tokens,
+    cacheUsageAvailable: event.cacheUsageAvailable,
     cost: Number(event.cost) || 0,
     timestamp,
     usageMissing: false

package/src/server/services/plugins-service.js

@@ -117,6 +117,18 @@ const PLATFORM_CAPABILITIES = {
     import: false,
     syncRepos: false
   },
+  dsh: {
+    platform: 'dsh',
+    supportsPlugins: true,
+    repositories: false,
+    market: false,
+    install: true,
+    uninstall: true,
+    toggle: false,
+    config: false,
+    import: false,
+    syncRepos: false
+  },
   omp: {
     platform: 'omp',
     supportsPlugins: true,
@@ -134,19 +146,6 @@ const PLATFORM_CAPABILITIES = {
     repositoryAuth: false,
     installMetadataMode: 'omp'
   },
-  dsh: {
-    platform: 'dsh',
-    supportsPlugins: true,
-    repositories: true,
-    market: false,
-    install: false,
-    uninstall: false,
-    toggle: false,
-    config: false,
-    import: false,
-    syncRepos: false,
-    disabledReason: 'DSH 插件由 profile 管理，当前面板仅提供只读查看'
-  }
 };
 
 function cloneRepos(repos = []) {
@@ -1670,7 +1669,7 @@ class PluginsService {
           source: 'dsh-profile',
           pluginType: 'dsh-profile',
           enabled: true,
-          readonly: true,
+          readonly: plugin.builtIn === true,
           description: plugin.description || '',
           directory: plugin.name || name
         });

package/src/server/services/request-logger.js

@@ -21,6 +21,21 @@ const { PATHS } = pathsModule;
 const getPlatformStatePath = typeof pathsModule.getPlatformStatePath === 'function'
   ? pathsModule.getPlatformStatePath
   : (category, platform) => PATHS[category]?.[platform];
+const latestProxyRequestSnapshots = new Map();
+
+function compactProxyRequestSnapshot(payload = {}) {
+  const request = payload.request && typeof payload.request === 'object' ? payload.request : {};
+  const route = payload.route && typeof payload.route === 'object' ? payload.route : undefined;
+  return {
+    ...(payload.timestamp !== undefined ? { timestamp: payload.timestamp } : {}),
+    ...(payload.source ? { source: payload.source } : {}),
+    request: {
+      ...(request.method ? { method: request.method } : {}),
+      ...(request.headers && typeof request.headers === 'object' ? { headers: request.headers } : {})
+    },
+    ...(route ? { route: { ...route } } : {})
+  };
+}
 
 function ensureDir(dir) {
   if (!fs.existsSync(dir)) {
@@ -57,6 +72,10 @@ function persistProxyRequestSnapshot(source, payload) {
   if (!isProxyRequestLoggingEnabled()) return;
 
   try {
+    latestProxyRequestSnapshots.set(
+      String(source || '').trim().toLowerCase(),
+      compactProxyRequestSnapshot(payload)
+    );
     const logPath = getPlatformStatePath('requestSnapshots', source);
     if (!logPath) return;
     ensureDir(path.dirname(logPath));
@@ -70,6 +89,80 @@ function persistProxyRequestSnapshot(source, payload) {
   }
 }
 
+function loadLatestProxyRequestSnapshot(source) {
+  const normalizedSource = String(source || '').trim().toLowerCase();
+  if (latestProxyRequestSnapshots.has(normalizedSource)) {
+    return latestProxyRequestSnapshots.get(normalizedSource);
+  }
+  const logPath = getPlatformStatePath('requestSnapshots', normalizedSource);
+  if (!logPath) return {};
+
+  let fd;
+  try {
+    fd = fs.openSync(logPath, 'r');
+    const fileSize = fs.fstatSync(fd).size;
+    const chunkSize = 1024 * 1024;
+    let position = fileSize;
+    let parts = [];
+    let bytesScanned = 0;
+    while (position > 0) {
+      const bytesToRead = Math.min(position, chunkSize);
+      position -= bytesToRead;
+      bytesScanned += bytesToRead;
+      const chunk = Buffer.alloc(bytesToRead);
+      fs.readSync(fd, chunk, 0, bytesToRead, position);
+      let segmentEnd = chunk.length;
+      for (let index = chunk.length - 1; index >= 0; index -= 1) {
+        if (chunk[index] !== 10) continue;
+        if (segmentEnd > index + 1) parts.push(chunk.subarray(index + 1, segmentEnd));
+        const line = Buffer.concat(parts.reverse()).toString('utf8');
+        parts = [];
+        segmentEnd = index;
+        if (!line.trim()) continue;
+        try {
+          const entry = JSON.parse(line);
+          if (entry && typeof entry === 'object') {
+            const compact = compactProxyRequestSnapshot(entry);
+            latestProxyRequestSnapshots.set(normalizedSource, compact);
+            return compact;
+          }
+        } catch {
+          // Ignore malformed records and continue scanning older complete lines.
+        }
+      }
+      if (segmentEnd > 0) parts.push(chunk.subarray(0, segmentEnd));
+      if (bytesScanned > 128 * 1024 * 1024) break;
+    }
+  } catch {
+    // Request snapshots are optional and may not exist yet.
+  } finally {
+    if (fd !== undefined) fs.closeSync(fd);
+  }
+  return {};
+}
+
+function loadLatestProxyRequestHeaders(source) {
+  const headers = loadLatestProxyRequestSnapshot(source)?.request?.headers;
+  if (!headers || typeof headers !== 'object' || Array.isArray(headers)) return {};
+
+  const hopByHopHeaders = new Set([
+    'connection',
+    'content-length',
+    'host',
+    'keep-alive',
+    'proxy-connection',
+    'te',
+    'trailer',
+    'transfer-encoding',
+    'upgrade'
+  ]);
+  const sensitiveHeaderName = /(auth|cookie|session|token|secret|credential|api[-_]?key|password|signature|\bjwt\b|capability)/i;
+
+  return Object.fromEntries(Object.entries(headers).filter(([name]) => (
+    !hopByHopHeaders.has(name.toLowerCase()) && !sensitiveHeaderName.test(name)
+  )));
+}
+
 /**
  * 创建 Express 中间件，用于记录 REST API 请求
  * 仅当 CC_TOOL_LOG_API_REQUESTS=true 时生效
@@ -317,6 +410,8 @@ module.exports = {
   isProxyRequestLoggingEnabled,
   isApiRequestLoggingEnabled,
   persistProxyRequestSnapshot,
+  loadLatestProxyRequestSnapshot,
+  loadLatestProxyRequestHeaders,
   persistClaudeRequestTemplate,
   loadClaudeRequestTemplate,
   createApiRequestLogger

package/src/server/services/usage-log-utils.js

@@ -73,7 +73,7 @@ function formatRealtimeTime(timestamp = Date.now()) {
   return new Date(timestamp).toLocaleTimeString('zh-CN', { hour12: false, hour: '2-digit', minute: '2-digit', second: '2-digit' });
 }
 
-function buildSuccessLogPayload({ source, requestId, channel, model, originalModel, redirectedModel, tokens, cost = 0, timestamp = Date.now(), usageMissing = false }) {
+function buildSuccessLogPayload({ source, requestId, channel, model, originalModel, redirectedModel, tokens, cacheUsageAvailable, cost = 0, timestamp = Date.now(), usageMissing = false }) {
   const normalized = normalizeUsageTokens(source, tokens);
   const payload = {
     type: 'log', status: 'success', id: requestId, time: formatRealtimeTime(timestamp), channel,
@@ -82,6 +82,7 @@ function buildSuccessLogPayload({ source, requestId, channel, model, originalMod
     reasoningTokens: normalized.reasoning, totalTokens: normalized.total, cost,
     source: normalizeToolSource(source), timestamp, usageMissing: Boolean(usageMissing)
   };
+  if (typeof cacheUsageAvailable === 'boolean') payload.cacheUsageAvailable = cacheUsageAvailable;
   if (originalModel) payload.originalModel = originalModel;
   if (redirectedModel) payload.redirectedModel = redirectedModel;
   return payload;