coding-tool-x 3.8.7 → 3.8.8

package/src/server/services/session-history-worker.js

@@ -157,6 +157,7 @@ function runInventoryWorker(source, indexDbPath, options = {}) {
         CC_TOOL_SESSION_HISTORY_SOURCE: source,
         CC_TOOL_SESSION_HISTORY_DB: indexDbPath,
         CC_TOOL_SESSION_HISTORY_FORCE: options.force === true ? '1' : '0',
+        CC_TOOL_SESSION_HISTORY_PROJECT_NAME: options.projectName || '',
         CC_TOOL_SESSION_HISTORY_PROJECTS_DIR: options.projectsDir || ''
       },
       silent: true,
@@ -228,6 +229,7 @@ function attachWorkerHandler() {
   const source = process.env.CC_TOOL_SESSION_HISTORY_SOURCE;
   const dbPath = process.env.CC_TOOL_SESSION_HISTORY_DB;
   const projectsDir = process.env.CC_TOOL_SESSION_HISTORY_PROJECTS_DIR || undefined;
+  const projectName = process.env.CC_TOOL_SESSION_HISTORY_PROJECT_NAME || undefined;
   const force = process.env.CC_TOOL_SESSION_HISTORY_FORCE === '1';
   if (!source || !dbPath) {
     process.exit(1);
@@ -246,7 +248,7 @@ function attachWorkerHandler() {
     _sendWorkerMessage(message, exitCode);
   };
 
-  index.ensureSourceIndexed(source, { consistency: 'complete', force })
+  index.ensureSourceIndexed(source, { consistency: 'complete', force, projectName })
     .then(() => finishWorker({ type: 'done' }, 0))
     .catch((err) => finishWorker({ type: 'error', error: _serializeWorkerError(err) }, 1));
 }

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

@@ -281,10 +281,12 @@ class SkillService {
       registry = getPlatformContext().registry,
       controlService = null,
       artifactStore = null,
-      formatAdapter = null
+      formatAdapter = null,
+      runtime = null
     } = {}
   ) {
     this.registry = registry;
+    this.runtime = runtime || getPlatformContext().runtime;
     this.platform = resolveManagedPlatform(platform).platform;
     if (this.platform === 'omp') {
       const migration = migratePiStorage(PATHS);
@@ -315,6 +317,10 @@ class SkillService {
     this.storageDir = state.localSkills || platformConfig.storageDir;
     this.reposConfigPath = state.skillRepos || platformConfig.reposFile;
     this.cachePath = state.skillCaches || platformConfig.cacheFile;
+    this.metadataIndexPath = path.join(
+      path.dirname(this.cachePath),
+      `${this.platform}-skill-metadata-index.json`
+    );
     this.artifactStore = artifactStore || (
       PATHS.skillArtifacts
         ? new SkillArtifactStore({ root: PATHS.skillArtifacts })
@@ -341,6 +347,8 @@ class SkillService {
     this._remoteSkillsCache = null;
     this._remoteSkillsFetchedAt = 0;
     this._legacyMigrationChecked = false;
+    this._skillMetadataIndex = null;
+    this._skillMetadataIndexDirty = false;
 
     this.githubTokenCache = new Map();
 
@@ -348,6 +356,95 @@ class SkillService {
     this.ensureDirs();
   }
 
+  _getDshApiDriver() {
+    if (this.platform !== 'dsh') return null;
+    return this.runtime?.getDriver?.('dsh', 'api') || null;
+  }
+
+  _normalizeDshSkill(skill = {}, includeContent = false) {
+    const sourceScope = String(skill.source || '').startsWith('project-') ? 'project' : 'user';
+    const sourcePath = skill.path || '';
+    const controlKey = `dsh:${sourceScope}:${skill.name || sourcePath}`;
+    return {
+      key: controlKey,
+      controlKey,
+      name: skill.name || path.basename(skill.resourceBase || sourcePath),
+      description: skill.description || '',
+      directory: skill.name || path.basename(skill.resourceBase || sourcePath),
+      installed: true,
+      enabled: true,
+      cached: true,
+      isLocal: true,
+      source: 'native',
+      sourceProvider: 'dsh',
+      sourceScope,
+      scope: sourceScope,
+      sourcePath,
+      path: sourcePath,
+      fullPath: sourcePath,
+      installPath: skill.resourceBase || path.dirname(sourcePath),
+      trust: 'approved',
+      managed: false,
+      readonly: true,
+      protected: false,
+      projection: { mode: 'unsupported', state: 'unsupported' },
+      artifactState: 'ready',
+      invocation: skill.invocation || null,
+      ...(skill.whenToUse ? { whenToUse: skill.whenToUse } : {}),
+      ...(skill.metadata ? { metadata: skill.metadata } : {}),
+      ...(includeContent && skill.content !== undefined ? { content: skill.content } : {})
+    };
+  }
+
+  async _scanDshSkills(options = {}) {
+    const driver = this._getDshApiDriver();
+    if (!driver?.listSkills) {
+      return { skills: [], refresh: { state: 'unsupported', taskId: null, fetchedAt: null, error: null } };
+    }
+    const result = await driver.listSkills({
+      query: {
+        ...(options.cwd ? { cwd: options.cwd } : {}),
+        ...(options.profile ? { profile: options.profile } : {}),
+        ...(options.scope ? { scope: options.scope } : {})
+      }
+    });
+    if (result?.status !== 'ok') {
+      throw new Error(result?.error || 'DSH Skills are unavailable');
+    }
+    const scope = options.scope || 'user';
+    const nativeSkills = (Array.isArray(result.data?.skills) ? result.data.skills : [])
+      .filter(skill => {
+        const isProject = String(skill.source || '').startsWith('project-');
+        return scope === 'project' ? isProject : !isProject;
+      })
+      .map(skill => this._normalizeDshSkill(skill, false));
+    const remoteSkills = [
+      ...this._artifactSkills({ ...options, scope }),
+      ...(options.includeRemote === false ? [] : this._legacyCachedSkills({ ...options, scope }))
+    ];
+    const seenNames = new Set(nativeSkills.map(skill => skill.name || skill.directory).filter(Boolean));
+    const skills = [
+      ...nativeSkills,
+      ...remoteSkills.filter(skill => {
+        const name = skill.name || skill.directory;
+        if (!name || seenNames.has(name)) return false;
+        seenNames.add(name);
+        return true;
+      })
+    ];
+    return {
+      skills: skills.map(skill => this._sanitizeSkillListItem(skill)),
+      refresh: this._refreshSnapshot({ ...options, scope })
+    };
+  }
+
+  _sanitizeSkillListItem(skill = {}) {
+    const sanitized = { ...skill };
+    delete sanitized.content;
+    delete sanitized.fullContent;
+    return sanitized;
+  }
+
   refreshOmpPaths() {
     if (this.platform !== 'omp') return;
     let nextContext = null;
@@ -445,6 +542,96 @@ class SkillService {
     return value.map(skill => ({ ...skill }));
   }
 
+  _readSkillFrontmatter(skillPath) {
+    const resolvedPath = path.resolve(skillPath);
+    let stat;
+    try {
+      stat = fs.statSync(resolvedPath);
+    } catch {
+      return {};
+    }
+    const index = this._loadSkillMetadataIndex();
+    const cached = index[resolvedPath];
+    if (
+      cached
+      && Number(cached.mtimeMs) === Number(stat.mtimeMs)
+      && Number(cached.size) === Number(stat.size)
+      && cached.metadata
+    ) {
+      return { ...cached.metadata };
+    }
+
+    let metadata = {};
+    const fd = fs.openSync(skillPath, 'r');
+    try {
+      const chunks = [];
+      const buffer = Buffer.alloc(8192);
+      let total = 0;
+      const maxBytes = 128 * 1024;
+      while (total < maxBytes) {
+        const bytesRead = fs.readSync(fd, buffer, 0, buffer.length, total);
+        if (!bytesRead) break;
+        chunks.push(buffer.subarray(0, bytesRead));
+        total += bytesRead;
+        const partial = Buffer.concat(chunks).toString('utf8');
+        const header = partial.match(/^---\s*\r?\n[\s\S]*?\r?\n---(?:\s*\r?\n|$)/)?.[0];
+        if (header) {
+          const parsed = this.parseSkillMd(header);
+          metadata = {
+            ...(parsed.name ? { name: parsed.name } : {}),
+            ...(parsed.description ? { description: parsed.description } : {}),
+            ...(parsed.shortDescription ? { shortDescription: parsed.shortDescription } : {}),
+            ...(parsed.allowedTools ? { allowedTools: parsed.allowedTools } : {}),
+            ...(parsed.license ? { license: parsed.license } : {}),
+            ...(parsed.metadata ? { metadata: parsed.metadata } : {}),
+            ...(parsed.format ? { format: parsed.format } : {})
+          };
+          break;
+        }
+      }
+    } finally {
+      fs.closeSync(fd);
+    }
+    index[resolvedPath] = {
+      mtimeMs: stat.mtimeMs,
+      size: stat.size,
+      metadata
+    };
+    this._skillMetadataIndexDirty = true;
+    return { ...metadata };
+  }
+
+  _loadSkillMetadataIndex() {
+    if (this._skillMetadataIndex) return this._skillMetadataIndex;
+    this._skillMetadataIndex = {};
+    try {
+      if (fs.existsSync(this.metadataIndexPath)) {
+        const parsed = JSON.parse(fs.readFileSync(this.metadataIndexPath, 'utf8'));
+        if (parsed && typeof parsed.entries === 'object' && !Array.isArray(parsed.entries)) {
+          this._skillMetadataIndex = parsed.entries;
+        }
+      }
+    } catch {
+      this._skillMetadataIndex = {};
+    }
+    return this._skillMetadataIndex;
+  }
+
+  _saveSkillMetadataIndex() {
+    if (!this._skillMetadataIndexDirty) return;
+    const tempPath = `${this.metadataIndexPath}.tmp-${process.pid}-${Date.now()}`;
+    try {
+      fs.mkdirSync(path.dirname(this.metadataIndexPath), { recursive: true });
+      fs.writeFileSync(tempPath, JSON.stringify({ version: 1, entries: this._loadSkillMetadataIndex() }), 'utf8');
+      fs.renameSync(tempPath, this.metadataIndexPath);
+      this._skillMetadataIndexDirty = false;
+    } catch {
+      try {
+        if (fs.existsSync(tempPath)) fs.unlinkSync(tempPath);
+      } catch (_) {}
+    }
+  }
+
   _artifactSkills(options = {}) {
     if (!this.artifactStore || typeof this.artifactStore.list !== 'function') return [];
     const artifacts = this.artifactStore.list({ platform: this.platform });
@@ -459,7 +646,7 @@ class SkillService {
       const skillPath = path.join(artifact.root, 'SKILL.md');
       try {
         if (!fs.existsSync(skillPath) || fs.lstatSync(skillPath).isSymbolicLink()) return null;
-        const metadata = this.parseSkillMd(fs.readFileSync(skillPath, 'utf8'));
+        const metadata = this._readSkillFrontmatter(skillPath);
         const rawSourceProvider = artifact.sourceProvider || 'remote';
         const sourceProvider = rawSourceProvider === 'remote'
           ? (artifact.repoProvider || 'remote')
@@ -943,6 +1130,7 @@ class SkillService {
   }
 
   async scanSkills(options = {}) {
+    if (this.platform === 'dsh') return this._scanDshSkills(options);
     this._ensureLegacyControlMigration();
     const scope = options.scope || 'user';
     const scopeOptions = scope === 'project'
@@ -968,7 +1156,12 @@ class SkillService {
     const missingControls = this._controlOnlySkills(normalizedOptions, knownControlKeys);
     const skills = [...controlled, ...missingControls];
     this.deduplicateSkills(skills);
-    const preparedSkills = this._storePrepared(cacheKey, skills, generation);
+    const preparedSkills = this._storePrepared(
+      cacheKey,
+      skills.map(skill => this._sanitizeSkillListItem(skill)),
+      generation
+    );
+    this._saveSkillMetadataIndex();
     return {
       skills: preparedSkills,
       refresh: this._refreshSnapshot(normalizedOptions)
@@ -2211,8 +2404,7 @@ class SkillService {
     if (fs.existsSync(skillMdPath)) {
       try {
         if (fs.lstatSync(skillMdPath).isSymbolicLink()) return;
-        const content = fs.readFileSync(skillMdPath, 'utf-8');
-        const metadata = this.parseSkillMd(content);
+        const metadata = this._readSkillFrontmatter(skillMdPath);
         const fullDirectory = normalizeRepoPath(path.relative(repoRoot, currentDir));
         const directory = this.resolveSkillDirectory(fullDirectory, repo.directory || '', repo);
 
@@ -2943,8 +3135,7 @@ class SkillService {
       }
 
       try {
-        const content = fs.readFileSync(skillMdPath, 'utf-8');
-        const metadata = this.parseSkillMd(content);
+        const metadata = this._readSkillFrontmatter(skillMdPath);
         const sourceKey = protectedSkill
           ? `system:${this.platform}:${directory}`
           : (sourceProvider === 'native'
@@ -3447,6 +3638,22 @@ ${content}
    * 获取本地 Skill 详情。远端内容只能来自已经发布的 artifact。
    */
   async getSkillDetail(directory, repoHint = null, fullDirectoryHint = '', options = {}) {
+    if (this.platform === 'dsh') {
+      const driver = this._getDshApiDriver();
+      if (!driver?.getSkill) throw new Error('DSH Skills are unavailable');
+      const result = await driver.getSkill({
+        params: { skillName: directory },
+        query: {
+          ...(options.cwd ? { cwd: options.cwd } : {}),
+          ...(options.profile ? { profile: options.profile } : {}),
+          ...(options.scope ? { scope: options.scope } : {})
+        }
+      });
+      if (result?.status !== 'ok' || !result.data?.skill) {
+        throw new Error(result?.error || `DSH skill not found: ${directory}`);
+      }
+      return this._normalizeDshSkill(result.data.skill, true);
+    }
     const safeDirectory = this.normalizeSkillDirectory(directory);
     const scope = options.scope || 'user';
 

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

@@ -10,6 +10,7 @@ function toNumber(value) {
 
 function normalizeToolSource(source = '') {
   const normalized = String(source || '').trim().toLowerCase();
+  if (normalized === 'dsh') return 'dsh';
   if (normalized === 'claude' || normalized === 'claude-code') return 'claude';
   if (normalized === 'codex') return 'codex';
   if (normalized === 'gemini') return 'gemini';

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

@@ -774,6 +774,34 @@ async function getAllAvailableProjects() {
   const allProjects = [];
   const seenKeys = new Set();
 
+  async function getAllProjectPages(service, {
+    pageMethod = 'getProjectsPage',
+    fallbackMethod = 'getProjects',
+    baseArgs = [],
+    fallbackArgs = baseArgs,
+    options = {}
+  } = {}) {
+    if (typeof service?.[pageMethod] !== 'function') {
+      if (typeof service?.[fallbackMethod] !== 'function') return [];
+      const fallback = await service[fallbackMethod](...fallbackArgs, options);
+      return Array.isArray(fallback) ? fallback : [];
+    }
+
+    const projects = [];
+    let page = 1;
+    while (true) {
+      const payload = await service[pageMethod](
+        ...baseArgs,
+        { ...options, page, limit: 100, force: page === 1 ? options.force === true : false }
+      );
+      const rows = Array.isArray(payload) ? payload : payload?.projects;
+      if (Array.isArray(rows)) projects.push(...rows);
+      if (Array.isArray(payload) || !payload?.pagination?.hasMore) break;
+      page += 1;
+    }
+    return projects;
+  }
+
   function addProject(channel, project) {
     if (!project || !project.name) return;
 
@@ -802,8 +830,13 @@ async function getAllAvailableProjects() {
 
   try {
     const config = loadConfig();
-    const claudeProjects = await sessionsService.getProjectsWithStats(config, { force: true });
-    const list = Array.isArray(claudeProjects) ? claudeProjects : [];
+    const list = await getAllProjectPages(sessionsService, {
+      pageMethod: 'getProjectsPage',
+      fallbackMethod: 'getProjectsWithStats',
+      baseArgs: [config],
+      fallbackArgs: [config],
+      options: { force: true }
+    });
     list.forEach(project => addProject('claude', project));
   } catch (error) {
     console.error('获取 claude 项目失败:', error.message);
@@ -811,8 +844,7 @@ async function getAllAvailableProjects() {
 
   try {
     if (isCodexInstalled()) {
-      const codexProjects = await codexSessionsService.getProjects();
-      const list = Array.isArray(codexProjects) ? codexProjects : [];
+      const list = await getAllProjectPages(codexSessionsService, { options: { force: true } });
       list.forEach(project => addProject('codex', project));
     }
   } catch (error) {
@@ -821,8 +853,7 @@ async function getAllAvailableProjects() {
 
   try {
     if (isGeminiInstalled()) {
-      const geminiProjects = await geminiSessionsService.getProjects();
-      const list = Array.isArray(geminiProjects) ? geminiProjects : [];
+      const list = await getAllProjectPages(geminiSessionsService, { options: { force: true } });
       list.forEach(project => addProject('gemini', project));
     }
   } catch (error) {
@@ -831,8 +862,7 @@ async function getAllAvailableProjects() {
 
   try {
     if (isOpenCodeInstalled()) {
-      const opencodeProjects = opencodeSessionsService.getProjects();
-      const list = Array.isArray(opencodeProjects) ? opencodeProjects : [];
+      const list = await getAllProjectPages(opencodeSessionsService, { options: { force: true } });
       list.forEach(project => addProject('opencode', project));
     }
   } catch (error) {
@@ -840,8 +870,7 @@ async function getAllAvailableProjects() {
   }
 
   try {
-    const ompProjects = await ompSessionsService.getProjects();
-    const list = Array.isArray(ompProjects) ? ompProjects : [];
+    const list = await getAllProjectPages(ompSessionsService, { options: { force: true } });
     if (list.length > 0 || ompSessionsService.isOmpInstalled()) {
       list.forEach(project => addProject('omp', project));
     }

package/src/shared/driver-factories/api.js

@@ -120,10 +120,10 @@ function createApiOperationsDriver({ platform, runtime, manifest, config, sessio
     if (!payload.meta && typeof sessionHistoryIndex?.getSourceIndexMeta === 'function') {
       payload.meta = sessionHistoryIndex.getSourceIndexMeta(platform);
     }
-    if (isProjectList && !Object.prototype.hasOwnProperty.call(payload, 'currentProject')) {
-      payload.currentProject = platform === 'claude' ? config?.currentProject || null : null;
-    }
-    return payload;
+      if (isProjectList && !Object.prototype.hasOwnProperty.call(payload, 'currentProject')) {
+        payload.currentProject = platform === 'claude' ? config?.currentProject || null : null;
+      }
+      return payload;
   };
 
   for (const operation of operations) {
@@ -146,7 +146,7 @@ function createApiOperationsDriver({ platform, runtime, manifest, config, sessio
               : operation === 'messages'
                 ? index.getMessagePage?.(platform, sessionId, {
                   page: Number(requestContext.query?.page) || 1,
-                  limit: Number(requestContext.query?.limit) || 50,
+                  limit: Number(requestContext.query?.limit) || 20,
                   order: requestContext.query?.order,
                   consistency: 'stale-ok'
                 })
@@ -159,10 +159,26 @@ function createApiOperationsDriver({ platform, runtime, manifest, config, sessio
           route
         });
         const operationName = targetOperation(capability, operation);
+        const pageMethod = capability === 'projects' && operation === 'listProjects'
+          ? 'listProjectsPage'
+          : capability === 'sessions' && operation === 'listSessions'
+            ? 'listSessionsPage'
+            : null;
+        const invocationArgs = argsFor(capability, operation, requestContext);
+        // Prefer the platform driver's page method so aliases, fork metadata,
+        // and platform-specific project normalization remain intact. The
+        // shared index is only the compatibility fallback for older drivers.
+        if (sessionHistoryIndex && pageMethod && (!target || typeof target[pageMethod] !== 'function')) {
+          const value = capability === 'projects'
+            ? await sessionHistoryIndex.listProjectsPage(platform, invocationArgs[0])
+            : await sessionHistoryIndex.listSessionsPage(platform, invocationArgs[0], invocationArgs[1]);
+          return resultFor(requestContext, 'ok', await decorateReadModel(capability, operation, value));
+        }
         if (!target || typeof target[operationName] !== 'function') {
           return resultFor(requestContext, 'unsupported');
         }
-        const value = await target[operationName](...argsFor(capability, operation, requestContext));
+        const method = pageMethod && typeof target[pageMethod] === 'function' ? pageMethod : operationName;
+        const value = await target[method](...invocationArgs);
         if (value && typeof value === 'object' && typeof value.status === 'string') {
           if (value.status !== 'ok') return resultFor(requestContext, value.status, undefined, value.error, value.cause);
           return resultFor(requestContext, 'ok', await decorateReadModel(capability, operation, value.data));

package/src/shared/driver-factories/projects.js

@@ -74,6 +74,14 @@ function createProjectsDriver({
       }
       return invoke('listProjects', 'getProjects', [configFor(normalizedOptions)]);
     },
+    listProjectsPage(options = {}) {
+      const normalizedOptions = options || {};
+      const target = loadService();
+      if (typeof target?.getProjectsPage === 'function') {
+        return invoke('listProjectsPage', 'getProjectsPage', [configFor(normalizedOptions), normalizedOptions]);
+      }
+      return this.listProjects(normalizedOptions);
+    },
     getProjectOrder(options = {}) {
       return invoke('getProjectOrder', 'getProjectOrder', [configFor(options)]);
     },