@geminilight/mindos 0.6.67 → 0.6.70

package/app/hooks/useFileImport.ts

@@ -57,8 +57,13 @@ async function extractPdfText(file: File): Promise<string> {
     const err = await res.json().catch(() => ({}));
     throw new Error((err as { error?: string }).error || 'PDF extraction failed');
   }
-  const data = await res.json() as { text?: string; extracted?: boolean };
-  if (!data.extracted || !data.text) throw new Error('No text extracted from PDF');
+  const data = await res.json() as { text?: string; extracted?: 'success' | 'empty' | 'error'; extractionError?: string };
+  if (data.extracted === 'error') {
+    throw new Error(data.extractionError || 'Failed to parse PDF');
+  }
+  if (data.extracted !== 'success' || !data.text) {
+    throw new Error('No text extracted from PDF');
+  }
   return data.text;
 }
 

package/app/hooks/useFileUpload.ts

@@ -22,10 +22,6 @@ function uint8ToBase64(bytes: Uint8Array): string {
   return btoa(binary);
 }
 
-/**
- * Extract text from a PDF file via the backend API.
- * Returns a LocalAttachment with `status` reflecting the outcome.
- */
 async function extractPdfToAttachment(file: File): Promise<LocalAttachment> {
   const name = file.name;
 
@@ -41,7 +37,8 @@ async function extractPdfToAttachment(file: File): Promise<LocalAttachment> {
 
     let payload: {
       text?: string;
-      extracted?: boolean;
+      extracted?: 'success' | 'empty' | 'error';
+      extractionError?: string;
       error?: string;
       truncated?: boolean;
       totalChars?: number;
@@ -57,27 +54,37 @@ async function extractPdfToAttachment(file: File): Promise<LocalAttachment> {
       throw new Error(payload.error || `PDF extraction failed (${res.status})`);
     }
 
-    const extracted = payload.extracted ? (payload.text || '') : '';
+    // Handle extraction error state
+    if (payload.extracted === 'error') {
+      return {
+        name,
+        content: `[PDF: ${name}] Failed to extract text from this PDF.`,
+        status: 'error',
+        error: payload.extractionError || 'PDF extraction failed (unable to parse PDF)',
+      };
+    }
 
-    if (!extracted) {
+    // Handle empty PDF (no extraction error, but no text)
+    const text = payload.extracted === 'success' ? (payload.text || '') : '';
+    if (!text) {
       return {
         name,
         content: `[PDF: ${name}] Could not extract readable text (possibly scanned/image PDF).`,
         status: 'error',
-        error: 'Scanned or image-only PDF — no extractable text',
+        error: 'No extractable text found — PDF may be scanned, image-only, or have no text content',
       };
     }
 
     const att: LocalAttachment = {
       name,
-      content: `[PDF TEXT EXTRACTED: ${name}]\n\n${extracted}`,
+      content: `[PDF TEXT EXTRACTED: ${name}]\n\n${text}`,
       status: 'success',
     };
 
     if (payload.truncated && payload.totalChars) {
       att.truncatedInfo = {
         totalChars: payload.totalChars,
-        includedChars: extracted.length,
+        includedChars: text.length,
         totalPages: payload.pagesParsed ?? 0,
       };
     }

package/app/lib/acp/agent-descriptors.ts

@@ -50,45 +50,45 @@ export interface ResolvedAgentCommand {
   enabled: boolean;
 }
 
+/* ── Aliases ───────────────────────────────────────────────────────────── */
+
+/**
+ * Maps alternative agent IDs to their canonical ID in AGENT_DESCRIPTORS.
+ * This eliminates full duplicate entries while maintaining backward compatibility.
+ */
+export const AGENT_ALIASES: Record<string, string> = {
+  'gemini-cli':  'gemini',
+  'claude-code': 'claude',
+  'claude-acp':  'claude',
+  'codebuddy':   'codebuddy-code',
+  'codex':       'codex-acp',
+  'pi-acp':      'pi',
+};
+
+/** Resolve an agent ID to its canonical form (idempotent for canonical IDs). */
+export function resolveAlias(agentId: string): string {
+  return AGENT_ALIASES[agentId] ?? agentId;
+}
+
 /* ── Canonical Descriptors ─────────────────────────────────────────────── */
 
 /**
  * All known ACP agents with their detection binary, launch command, and install hint.
- * Both detection (`which binary?`) and launch (`spawn cmd args`) read from here.
+ * Only canonical entries — aliases are handled by AGENT_ALIASES above.
  */
 export const AGENT_DESCRIPTORS: Record<string, AcpAgentDescriptor> = {
-  // Gemini CLI — Google's AI coding agent
   'gemini':          { binary: 'gemini',          cmd: 'gemini',    args: ['--experimental-acp'], installCmd: 'npm install -g @google/gemini-cli',
     displayName: 'Gemini CLI',
     description: 'Google Gemini 驱动的编程智能体。支持多文件编辑、代码审查、调试和项目级重构，原生集成 Google 搜索实时查询技术文档。' },
-  'gemini-cli':      { binary: 'gemini',          cmd: 'gemini',    args: ['--experimental-acp'], installCmd: 'npm install -g @google/gemini-cli',
-    displayName: 'Gemini CLI',
-    description: 'Google Gemini 驱动的编程智能体。支持多文件编辑、代码审查、调试和项目级重构，原生集成 Google 搜索实时查询技术文档。' },
-  // Claude Code — Anthropic's AI coding agent
   'claude':          { binary: 'claude',          cmd: 'npx',       args: ['--yes', '@agentclientprotocol/claude-agent-acp'], installCmd: 'npm install -g @anthropic-ai/claude-code',
     displayName: 'Claude Code',
     description: 'Anthropic Claude 驱动的编程智能体。擅长复杂推理、长上下文理解和安全代码生成，支持多文件编辑与 agentic 工作流。' },
-  'claude-code':     { binary: 'claude',          cmd: 'npx',       args: ['--yes', '@agentclientprotocol/claude-agent-acp'], installCmd: 'npm install -g @anthropic-ai/claude-code',
-    displayName: 'Claude Code',
-    description: 'Anthropic Claude 驱动的编程智能体。擅长复杂推理、长上下文理解和安全代码生成，支持多文件编辑与 agentic 工作流。' },
-  'claude-acp':      { binary: 'claude',          cmd: 'npx',       args: ['--yes', '@agentclientprotocol/claude-agent-acp'], installCmd: 'npm install -g @anthropic-ai/claude-code',
-    displayName: 'Claude Code',
-    description: 'Anthropic Claude 驱动的编程智能体。擅长复杂推理、长上下文理解和安全代码生成，支持多文件编辑与 agentic 工作流。' },
-  // CodeBuddy Code — Tencent Cloud's AI coding agent
   'codebuddy-code':  { binary: 'codebuddy',       cmd: 'codebuddy', args: ['--acp'], installCmd: 'npm install -g @tencent-ai/codebuddy-code',
     displayName: 'CodeBuddy Code',
     description: '腾讯云智能编程助手。基于混元大模型，支持代码补全、生成、审查和多文件重构，深度理解中文语境，适配国内开发生态。' },
-  'codebuddy':       { binary: 'codebuddy',       cmd: 'codebuddy', args: ['--acp'], installCmd: 'npm install -g @tencent-ai/codebuddy-code',
-    displayName: 'CodeBuddy Code',
-    description: '腾讯云智能编程助手。基于混元大模型，支持代码补全、生成、审查和多文件重构，深度理解中文语境，适配国内开发生态。' },
-  // Codex — OpenAI's coding agent
   'codex-acp':       { binary: 'codex',           cmd: 'codex',     args: [],        installCmd: 'npm install -g @openai/codex',
     displayName: 'Codex',
     description: 'OpenAI Codex 编程智能体。基于 GPT 系列模型，擅长代码生成、自动化任务和多语言编程支持。' },
-  'codex':           { binary: 'codex',           cmd: 'codex',     args: [],        installCmd: 'npm install -g @openai/codex',
-    displayName: 'Codex',
-    description: 'OpenAI Codex 编程智能体。基于 GPT 系列模型，擅长代码生成、自动化任务和多语言编程支持。' },
-  // Cursor — AI-first code editor agent
   'cursor':          { binary: 'cursor',          cmd: 'cursor',    args: [],
     displayName: 'Cursor',
     description: 'Cursor AI 编程智能体。AI-first 代码编辑器的 CLI 模式，支持上下文感知的代码编辑、Tab 补全和多文件协同修改。' },
@@ -113,9 +113,6 @@ export const AGENT_DESCRIPTORS: Record<string, AcpAgentDescriptor> = {
   'pi':              { binary: 'pi',              cmd: 'pi',        args: [],
     displayName: 'Pi Agent',
     description: 'Pi Agent 编程智能体。轻量级终端编程助手。' },
-  'pi-acp':          { binary: 'pi',              cmd: 'pi',        args: [],
-    displayName: 'Pi Agent',
-    description: 'Pi Agent 编程智能体。轻量级终端编程助手。' },
   'auggie':          { binary: 'auggie',          cmd: 'auggie',    args: [],
     displayName: 'Auggie',
     description: 'Augment Code 编程智能体。支持代码理解、生成和全仓库上下文感知。' },
@@ -147,7 +144,7 @@ export function resolveAgentCommand(
   registryEntry?: AcpRegistryEntry,
   userOverride?: AcpAgentOverride,
 ): ResolvedAgentCommand {
-  const descriptor = AGENT_DESCRIPTORS[agentId];
+  const descriptor = AGENT_DESCRIPTORS[resolveAlias(agentId)];
   const enabled = userOverride?.enabled !== false;
 
   // Layer 1: User override
@@ -220,22 +217,65 @@ function registryToCommand(entry: AcpRegistryEntry): { cmd: string; args: string
 
 /** Get the binary name for detection (used by detect endpoint). */
 export function getDescriptorBinary(agentId: string): string | undefined {
-  return AGENT_DESCRIPTORS[agentId]?.binary;
+  return AGENT_DESCRIPTORS[resolveAlias(agentId)]?.binary;
 }
 
 /** Get the install command for UI display. */
 export function getDescriptorInstallCmd(agentId: string): string | undefined {
-  return AGENT_DESCRIPTORS[agentId]?.installCmd;
+  return AGENT_DESCRIPTORS[resolveAlias(agentId)]?.installCmd;
 }
 
 /** Get curated display name (overrides registry name if available). */
 export function getDescriptorDisplayName(agentId: string): string | undefined {
-  return AGENT_DESCRIPTORS[agentId]?.displayName;
+  return AGENT_DESCRIPTORS[resolveAlias(agentId)]?.displayName;
 }
 
 /** Get curated description (overrides registry description if available). */
 export function getDescriptorDescription(agentId: string): string | undefined {
-  return AGENT_DESCRIPTORS[agentId]?.description;
+  return AGENT_DESCRIPTORS[resolveAlias(agentId)]?.description;
+}
+
+/* ── Detection ─────────────────────────────────────────────────────────── */
+
+/** Agent info needed for local binary detection (no CDN dependency). */
+export interface DetectableAgent {
+  id: string;
+  name: string;
+  binary: string;
+  installCmd?: string;
+  description?: string;
+}
+
+/**
+ * Return the canonical list of agents for local detection.
+ * Pure local data — no CDN fetch, no async, no network dependency.
+ */
+export function getDetectableAgents(): DetectableAgent[] {
+  return Object.entries(AGENT_DESCRIPTORS).map(([id, desc]) => ({
+    id,
+    name: desc.displayName ?? id,
+    binary: desc.binary,
+    installCmd: desc.installCmd,
+    description: desc.description,
+  }));
+}
+
+/**
+ * Look up user override for an agent, checking canonical ID, alias → canonical,
+ * and reverse alias (canonical → any alias) so users can configure with any name.
+ */
+export function findUserOverride(
+  agentId: string,
+  overrides?: Record<string, AcpAgentOverride>,
+): AcpAgentOverride | undefined {
+  if (!overrides) return undefined;
+  if (overrides[agentId]) return overrides[agentId];
+  const canonical = resolveAlias(agentId);
+  if (canonical !== agentId && overrides[canonical]) return overrides[canonical];
+  for (const [alias, target] of Object.entries(AGENT_ALIASES)) {
+    if (target === agentId && overrides[alias]) return overrides[alias];
+  }
+  return undefined;
 }
 
 /** Parse and validate acpAgents config from raw settings JSON. */

package/app/lib/acp/index.ts

@@ -1,8 +1,9 @@
 export { fetchAcpRegistry, getAcpAgents, findAcpAgent, clearRegistryCache } from './registry';
-export { spawnAcpAgent, sendMessage, sendAndWait, onMessage, onNotification, onRequest, sendResponse, installAutoApproval, killAgent, killAllAgents, getProcess, getActiveProcesses } from './subprocess';
+export { spawnAndConnect, spawnAcpAgent, killAgent, killAllAgents, getProcess, getActiveProcesses } from './subprocess';
 export { createSession, createSessionFromEntry, loadSession, listSessions, prompt, promptStream, cancelPrompt, setMode, setConfigOption, closeSession, getSession, getActiveSessions, closeAllSessions } from './session';
 export { bridgeA2aToAcp, bridgeAcpResponseToA2a, bridgeAcpUpdatesToA2a } from './bridge';
 export { acpTools } from './acp-tools';
+export { AGENT_DESCRIPTORS, AGENT_ALIASES, resolveAlias, findUserOverride, getDetectableAgents } from './agent-descriptors';
 export { ACP_ERRORS } from './types';
 export type {
   AcpAgentCapabilities,
@@ -16,10 +17,6 @@ export type {
   AcpSessionState,
   AcpSession,
   AcpSessionInfo,
-  AcpJsonRpcRequest,
-  AcpJsonRpcResponse,
-  AcpJsonRpcError,
-  AcpPromptRequest,
   AcpPromptResponse,
   AcpUpdateType,
   AcpSessionUpdate,
@@ -37,4 +34,5 @@ export type {
   AcpRegistry,
   AcpTransportType,
 } from './types';
-export type { AcpProcess, AcpIncomingRequest, AcpNotification } from './subprocess';
+export type { AcpProcess, AcpClientCallbacks, AcpConnection } from './subprocess';
+export type { AcpAgentDescriptor, AcpAgentOverride, ResolvedAgentCommand, DetectableAgent } from './agent-descriptors';

package/app/lib/acp/registry.ts

@@ -10,57 +10,31 @@
  */
 
 import type { AcpRegistry, AcpRegistryEntry } from './types';
-import { AGENT_DESCRIPTORS, getDescriptorDisplayName, getDescriptorDescription } from './agent-descriptors';
+import { AGENT_DESCRIPTORS, getDescriptorDisplayName, getDescriptorDescription, resolveAlias } from './agent-descriptors';
 
 /* ── Constants ─────────────────────────────────────────────────────────── */
 
 const REGISTRY_URL = 'https://cdn.agentclientprotocol.com/registry/v1/latest/registry.json';
-const CACHE_TTL_MS = 60 * 60 * 1000; // 1 hour
-const FETCH_TIMEOUT_MS = 10_000;
+const CACHE_TTL_MS = 7 * 24 * 60 * 60 * 1000; // 7 days — registry updates very rarely
+const FETCH_TIMEOUT_MS = 3_000;
 
 /* ── Built-in Registry (from AGENT_DESCRIPTORS) ────────────────────────── */
 
 /**
  * Generate a baseline registry from the local AGENT_DESCRIPTORS.
- * This ensures agents like Gemini CLI, CodeBuddy, Claude etc. are always
- * detectable even when CDN is unreachable.
- *
- * We deduplicate by binary name — e.g. 'gemini' and 'gemini-cli' both map
- * to binary 'gemini', so we only keep the canonical entry (shorter ID or
- * the one matching the CDN convention).
+ * AGENT_DESCRIPTORS contains only canonical entries (aliases are in AGENT_ALIASES),
+ * so no deduplication is needed.
  */
 function buildBuiltinRegistry(): AcpRegistryEntry[] {
-  // Preferred IDs per binary — matches what CDN uses
-  const CANONICAL_IDS: Record<string, string> = {
-    'gemini': 'gemini',
-    'claude': 'claude-acp',
-    'codebuddy': 'codebuddy-code',
-    'codex': 'codex-acp',
-    'pi': 'pi-acp',
-  };
-
-  const seen = new Set<string>();
-  const entries: AcpRegistryEntry[] = [];
-
-  for (const [id, desc] of Object.entries(AGENT_DESCRIPTORS)) {
-    // Skip alias entries — only keep the canonical ID for each binary
-    const canonical = CANONICAL_IDS[desc.binary];
-    if (canonical && canonical !== id) continue;
-    if (seen.has(desc.binary)) continue;
-    seen.add(desc.binary);
-
-    entries.push({
-      id,
-      name: desc.displayName ?? id,
-      description: desc.description ?? '',
-      transport: desc.cmd === 'npx' ? 'npx' : 'stdio',
-      command: desc.cmd,
-      args: desc.args,
-      packageName: desc.installCmd?.match(/npm install -g (.+)/)?.[1],
-    });
-  }
-
-  return entries;
+  return Object.entries(AGENT_DESCRIPTORS).map(([id, desc]) => ({
+    id,
+    name: desc.displayName ?? id,
+    description: desc.description ?? '',
+    transport: (desc.cmd === 'npx' ? 'npx' : 'stdio') as AcpRegistryEntry['transport'],
+    command: desc.cmd,
+    args: desc.args,
+    packageName: desc.installCmd?.match(/npm install -g (.+)/)?.[1],
+  }));
 }
 
 let builtinAgents: AcpRegistryEntry[] | null = null;
@@ -78,7 +52,7 @@ let cachedRegistry: AcpRegistry | null = null;
 
 /**
  * Fetch the ACP registry from the CDN and merge with built-in entries.
- * Caches for 1 hour. Falls back to built-in registry if CDN is unreachable.
+ * Caches for 7 days. Falls back to built-in registry if CDN is unreachable.
  */
 export async function fetchAcpRegistry(): Promise<AcpRegistry> {
   // Return cached if still valid
@@ -119,15 +93,36 @@ export async function fetchAcpRegistry(): Promise<AcpRegistry> {
   }
 }
 
-/** Merge built-in and CDN registries. CDN entries win on conflict; built-in fills gaps. */
+/**
+ * Merge built-in and CDN registries.
+ * - Same ID: keep built-in core fields, supplement with CDN metadata (tags, homepage, version)
+ * - CDN alias of built-in entry: skip (avoids duplicate agents in UI)
+ * - New CDN-only entry: add as-is
+ */
 function mergeRegistries(builtin: AcpRegistryEntry[], cdn: AcpRegistryEntry[]): AcpRegistryEntry[] {
   const byId = new Map<string, AcpRegistryEntry>();
 
-  // Start with built-in
   for (const entry of builtin) byId.set(entry.id, entry);
 
-  // CDN overwrites / adds
-  for (const entry of cdn) byId.set(entry.id, entry);
+  for (const cdnEntry of cdn) {
+    const existing = byId.get(cdnEntry.id);
+    const canonicalId = resolveAlias(cdnEntry.id);
+    const canonicalExisting = canonicalId !== cdnEntry.id ? byId.get(canonicalId) : undefined;
+
+    if (existing) {
+      // Same ID in both — keep built-in core, supplement with CDN metadata
+      byId.set(cdnEntry.id, {
+        ...existing,
+        tags: cdnEntry.tags ?? existing.tags,
+        homepage: cdnEntry.homepage ?? existing.homepage,
+        version: cdnEntry.version ?? existing.version,
+      });
+    } else if (canonicalExisting) {
+      // CDN entry is an alias of a built-in entry — skip to avoid duplicates
+    } else {
+      byId.set(cdnEntry.id, cdnEntry);
+    }
+  }
 
   return Array.from(byId.values());
 }
@@ -146,11 +141,12 @@ export async function getAcpAgents(): Promise<AcpRegistryEntry[]> {
 }
 
 /**
- * Find a specific ACP agent by ID.
+ * Find a specific ACP agent by ID (supports alias resolution).
  */
 export async function findAcpAgent(id: string): Promise<AcpRegistryEntry | null> {
   const agents = await getAcpAgents();
-  return agents.find(a => a.id === id) ?? null;
+  const canonical = resolveAlias(id);
+  return agents.find(a => a.id === id || a.id === canonical) ?? null;
 }
 
 /**