@axhub/genie 0.2.7 → 0.2.9

package/server/session-core/providerAdapters.js

@@ -37,6 +37,18 @@ async function normalizeLegacyLoadResult(result, provider, sessionId) {
   };
 }
 
+function createEventLoadResult(events = [], source = 'acp') {
+  const normalizedEvents = Array.isArray(events) ? events : [];
+  return {
+    events: normalizedEvents,
+    total: normalizedEvents.length,
+    hasMore: false,
+    offset: 0,
+    limit: null,
+    source
+  };
+}
+
 function mergeSessionLists(legacySessions = [], acpSessions = []) {
   const merged = new Map();
 
@@ -59,21 +71,30 @@ function mergeSessionLists(legacySessions = [], acpSessions = []) {
   });
 }
 
-async function loadAcpEvents(provider, sessionId) {
+async function loadAcpEvents(provider, sessionId, nativeHistoryLoader = null) {
   const record = await findAcpSessionRecord(sessionId, provider);
   if (!record) {
     return null;
   }
 
+  if (typeof nativeHistoryLoader === 'function') {
+    try {
+      const nativeResult = await nativeHistoryLoader();
+      const normalizedResult = await normalizeLegacyLoadResult(nativeResult, provider, sessionId);
+      if (Array.isArray(normalizedResult)) {
+        return createEventLoadResult(normalizedResult, 'acp');
+      }
+      return {
+        ...normalizedResult,
+        source: 'acp'
+      };
+    } catch {
+      // Fall back to the mirrored event store when native history is unavailable.
+    }
+  }
+
   const events = await readMirroredConversationEvents(provider, sessionId);
-  return {
-    events,
-    total: events.length,
-    hasMore: false,
-    offset: 0,
-    limit: null,
-    source: 'acp'
-  };
+  return createEventLoadResult(events, 'acp');
 }
 
 const PROVIDER_ADAPTERS = {
@@ -89,7 +110,11 @@ const PROVIDER_ADAPTERS = {
       );
     },
     async loadEvents({ projectName, sessionId, limit = null, offset = 0 }) {
-      const acpResult = await loadAcpEvents('claude', sessionId);
+      const acpResult = await loadAcpEvents(
+        'claude',
+        sessionId,
+        () => getSessionMessages(projectName, sessionId, limit, offset),
+      );
       if (acpResult) {
         return acpResult;
       }
@@ -110,7 +135,11 @@ const PROVIDER_ADAPTERS = {
       );
     },
     async loadEvents({ sessionId, limit = null, offset = 0 }) {
-      const acpResult = await loadAcpEvents('codex', sessionId);
+      const acpResult = await loadAcpEvents(
+        'codex',
+        sessionId,
+        () => getCodexSessionMessages(sessionId, limit, offset),
+      );
       if (acpResult) {
         return acpResult;
       }
@@ -131,7 +160,11 @@ const PROVIDER_ADAPTERS = {
       );
     },
     async loadEvents({ sessionId, limit = null, offset = 0 }) {
-      const acpResult = await loadAcpEvents('gemini', sessionId);
+      const acpResult = await loadAcpEvents(
+        'gemini',
+        sessionId,
+        () => getGeminiSessionMessages(sessionId, limit, offset),
+      );
       if (acpResult) {
         return acpResult;
       }
@@ -152,7 +185,11 @@ const PROVIDER_ADAPTERS = {
       );
     },
     async loadEvents({ sessionId, limit = null, offset = 0 }) {
-      const acpResult = await loadAcpEvents('opencode', sessionId);
+      const acpResult = await loadAcpEvents(
+        'opencode',
+        sessionId,
+        () => getOpencodeSessionMessages(sessionId, limit, offset),
+      );
       if (acpResult) {
         return acpResult;
       }

package/server/session-core/providerDiscovery.js

@@ -151,7 +151,12 @@ async function discoverOpenCodeModels(projectPath) {
 }
 
 async function discoverClaudeModels() {
-  return { models: mapModelOptions(CLAUDE_MODELS.OPTIONS, 'runtime-fallback'), source: 'runtime-fallback', error: null, currentModel: process.env.CLAUDE_MODEL || CLAUDE_MODELS.DEFAULT };
+  return {
+    models: mapModelOptions(CLAUDE_MODELS.OPTIONS, 'runtime-fallback'),
+    source: 'runtime-fallback',
+    error: null,
+    currentModel: null
+  };
 }
 
 async function discoverCodexModels() {
@@ -163,11 +168,11 @@ async function discoverCodexModels() {
     if (match) currentModel = match[1];
   } catch {
   }
-  return { models: mapModelOptions(CODEX_MODELS.OPTIONS, 'runtime-fallback'), source: 'runtime-fallback', error: null, currentModel: currentModel || CODEX_MODELS.DEFAULT };
+  return { models: mapModelOptions(CODEX_MODELS.OPTIONS, 'runtime-fallback'), source: 'runtime-fallback', error: null, currentModel: currentModel || null };
 }
 
 async function discoverGeminiModels() {
-  return { models: mapModelOptions(GEMINI_MODELS.OPTIONS, 'runtime-fallback'), source: 'runtime-fallback', error: null, currentModel: GEMINI_MODELS.DEFAULT };
+  return { models: mapModelOptions(GEMINI_MODELS.OPTIONS, 'runtime-fallback'), source: 'runtime-fallback', error: null, currentModel: null };
 }
 
 const AUTH_CHECKERS = {

package/server/session-core/runtimeState.js

@@ -266,6 +266,14 @@ function createRuntimeSignature(snapshot) {
   });
 }
 
+export function seedSessionRuntimeSubscriptionSnapshot(subscriptionKey, snapshot) {
+  if (!subscriptionKey || !snapshot) {
+    return;
+  }
+
+  lastBroadcastSignatures.set(subscriptionKey, createRuntimeSignature(snapshot));
+}
+
 export function createSessionRuntimeSubscriptionKey(provider, sessionId) {
   const normalizedProvider = normalizeProvider(provider);
   const normalizedSessionId = normalizeNonEmptyString(sessionId);

package/server/utils/ccConnectManager.js

@@ -0,0 +1,390 @@
+import fs from 'fs';
+import { spawnSync } from 'child_process';
+import crossSpawn from 'cross-spawn';
+import { detectProviderInstallationStatus } from '../routes/cli-auth.js';
+import { resolveCommandPath } from './resolveCommandPath.js';
+import { spawnCommand } from './spawnCommand.js';
+import {
+  CC_CONNECT_PLATFORMS,
+  CC_CONNECT_PROVIDERS,
+  getPlatformConnection,
+  listCcConnectPlatformSummaries,
+  readCcConnectState,
+  upsertPlatformConnection,
+  writeCcConnectConfig,
+  writeCcConnectState
+} from './ccConnectState.js';
+
+const CC_CONNECT_COMMAND = 'cc-connect';
+const COMMAND_TIMEOUT_MS = 5000;
+const DAEMON_COMMAND_TIMEOUT_MS = 20000;
+
+const PROVIDER_ORDER = CC_CONNECT_PROVIDERS.map((provider) => provider.id);
+const PLATFORM_MAP = Object.fromEntries(CC_CONNECT_PLATFORMS.map((platform) => [platform.id, platform]));
+
+function createCcConnectError(code, message) {
+  const error = new Error(message);
+  error.code = code;
+  return error;
+}
+
+function nowIso() {
+  return new Date().toISOString();
+}
+
+function runCommandSync({ command, args = [], timeoutMs = COMMAND_TIMEOUT_MS, cwd = process.cwd(), env = process.env }) {
+  const runner = process.platform === 'win32' ? crossSpawn.sync : spawnSync;
+  const result = runner(command, args, {
+    cwd,
+    env,
+    encoding: 'utf8',
+    timeout: timeoutMs
+  });
+
+  return {
+    status: result.status,
+    stdout: result.stdout || '',
+    stderr: result.stderr || '',
+    error: result.error || null
+  };
+}
+
+function buildCommandEnv() {
+  const env = { ...process.env };
+  delete env.CLAUDECODE;
+  return env;
+}
+
+function buildShortErrorMessage(result) {
+  const stderr = String(result?.stderr || '').trim();
+  if (stderr) {
+    return stderr.replace(/\s+/g, ' ').slice(0, 260);
+  }
+
+  const stdout = String(result?.stdout || '').trim();
+  if (stdout) {
+    return stdout.replace(/\s+/g, ' ').slice(0, 260);
+  }
+
+  if (result?.error?.message) {
+    return result.error.message;
+  }
+
+  return 'Unknown error';
+}
+
+function runCcConnectDaemonCommand(args, timeoutMs = DAEMON_COMMAND_TIMEOUT_MS) {
+  return runCommandSync({
+    command: CC_CONNECT_COMMAND,
+    args,
+    timeoutMs,
+    env: buildCommandEnv()
+  });
+}
+
+function startCcConnectViaDaemon(configPath) {
+  const statusResult = runCcConnectDaemonCommand(['daemon', 'status']);
+  const isRunning = statusResult.status === 0 && /status:\s+running/i.test(statusResult.stdout || '');
+
+  if (isRunning) {
+    const restartResult = runCcConnectDaemonCommand(['daemon', 'restart']);
+    if (restartResult.status === 0) {
+      return { ok: true, detail: 'cc-connect daemon restarted with the latest configuration.' };
+    }
+
+    return {
+      ok: false,
+      detail: `Configuration written, but daemon restart failed: ${buildShortErrorMessage(restartResult)}`
+    };
+  }
+
+  const startResult = runCcConnectDaemonCommand(['daemon', 'start']);
+  if (startResult.status === 0) {
+    return { ok: true, detail: 'cc-connect daemon started with the latest configuration.' };
+  }
+
+  const installResult = runCcConnectDaemonCommand(['daemon', 'install', '--config', configPath], 60000);
+  if (installResult.status === 0) {
+    return { ok: true, detail: 'cc-connect daemon installed and started.' };
+  }
+
+  return {
+    ok: false,
+    detail: `Configuration written, but daemon start failed: ${buildShortErrorMessage(installResult)}`
+  };
+}
+
+function startCcConnectDetached(configPath) {
+  try {
+    const child = spawnCommand(CC_CONNECT_COMMAND, ['--config', configPath], {
+      detached: true,
+      stdio: 'ignore',
+      env: buildCommandEnv(),
+      windowsHide: true
+    });
+    child.unref();
+    return { ok: true, detail: 'cc-connect started in the background.' };
+  } catch (error) {
+    return {
+      ok: false,
+      detail: `Configuration written, but background start failed: ${error.message}`
+    };
+  }
+}
+
+export function ensureCcConnectDaemonRunning(configPath) {
+  if (process.platform === 'win32') {
+    return startCcConnectDetached(configPath);
+  }
+
+  return startCcConnectViaDaemon(configPath);
+}
+
+export function normalizeCcConnectPlatformId(value) {
+  const platformId = String(value || '').trim().toLowerCase();
+  return PLATFORM_MAP[platformId] ? platformId : null;
+}
+
+export function normalizeCcConnectProviderId(value) {
+  const providerId = String(value || '').trim().toLowerCase();
+  return PROVIDER_ORDER.includes(providerId) ? providerId : null;
+}
+
+export function mergeAvailableCcConnectProviders(configuredProviders = [], installedProviderIds = [], activeProvider = null) {
+  const available = new Set();
+
+  for (const providerId of configuredProviders) {
+    if (PROVIDER_ORDER.includes(providerId)) {
+      available.add(providerId);
+    }
+  }
+
+  for (const providerId of installedProviderIds) {
+    if (PROVIDER_ORDER.includes(providerId)) {
+      available.add(providerId);
+    }
+  }
+
+  if (activeProvider && PROVIDER_ORDER.includes(activeProvider)) {
+    available.add(activeProvider);
+  }
+
+  return PROVIDER_ORDER.filter((providerId) => available.has(providerId));
+}
+
+function buildPlatformSummaries(state, installedProviderIds) {
+  return listCcConnectPlatformSummaries(state).map((platform) => {
+    if (!platform.connected) {
+      return platform;
+    }
+
+    const connection = getPlatformConnection(state, platform.id);
+    const configuredProviders = mergeAvailableCcConnectProviders(
+      connection?.configuredProviders,
+      installedProviderIds,
+      connection?.activeProvider || null
+    );
+
+    return {
+      ...platform,
+      configuredProviders
+    };
+  });
+}
+
+function resolveInstalledProviderIdsFromStatuses(statuses = []) {
+  return statuses.filter((provider) => provider.installed).map((provider) => provider.id);
+}
+
+export async function getCcConnectStatus() {
+  const resolved = await resolveCommandPath(CC_CONNECT_COMMAND);
+  if (!resolved.found) {
+    return {
+      installed: false,
+      version: null,
+      isBeta: false,
+      resolvedPath: null
+    };
+  }
+
+  const result = runCommandSync({
+    command: resolved.resolvedPath || CC_CONNECT_COMMAND,
+    args: ['--version'],
+    timeoutMs: COMMAND_TIMEOUT_MS,
+    env: buildCommandEnv()
+  });
+  const version = String(result.stdout || '').trim() || null;
+
+  return {
+    installed: true,
+    version,
+    isBeta: Boolean(version && /beta|alpha|rc|pre/i.test(version)),
+    resolvedPath: resolved.resolvedPath || null
+  };
+}
+
+export async function getCcConnectProviderStatuses() {
+  return Promise.all(
+    PROVIDER_ORDER.map(async (providerId) => {
+      const label = CC_CONNECT_PROVIDERS.find((provider) => provider.id === providerId)?.label || providerId;
+      try {
+        const status = await detectProviderInstallationStatus(providerId);
+        return {
+          id: providerId,
+          label,
+          ...status
+        };
+      } catch (error) {
+        return {
+          id: providerId,
+          label,
+          success: false,
+          installed: false,
+          error: error.message
+        };
+      }
+    })
+  );
+}
+
+export async function getCcConnectInstalledProviderIds() {
+  const statuses = await getCcConnectProviderStatuses();
+  return resolveInstalledProviderIdsFromStatuses(statuses);
+}
+
+export async function getCcConnectConnectionSummary(platformId = null) {
+  const normalizedPlatformId = platformId == null ? null : normalizeCcConnectPlatformId(platformId);
+  if (platformId != null && !normalizedPlatformId) {
+    throw createCcConnectError('UNSUPPORTED_PLATFORM', 'Unsupported platform.');
+  }
+
+  const ccConnect = await getCcConnectStatus();
+  const providers = await getCcConnectProviderStatuses();
+  const installedProviderIds = resolveInstalledProviderIdsFromStatuses(providers);
+  const state = readCcConnectState();
+  const platforms = buildPlatformSummaries(state, installedProviderIds);
+
+  return {
+    ccConnect,
+    providers,
+    platforms,
+    platform: normalizedPlatformId
+      ? platforms.find((entry) => entry.id === normalizedPlatformId) || null
+      : null
+  };
+}
+
+function normalizeProjectPath(value) {
+  return typeof value === 'string' ? value.trim() : '';
+}
+
+function validateProjectPath(projectPath) {
+  const normalizedProjectPath = normalizeProjectPath(projectPath);
+  if (!normalizedProjectPath) {
+    throw createCcConnectError('PROJECT_PATH_REQUIRED', 'projectPath is required.');
+  }
+
+  if (!fs.existsSync(normalizedProjectPath)) {
+    throw createCcConnectError('PROJECT_PATH_NOT_FOUND', 'Selected project path does not exist.');
+  }
+
+  return normalizedProjectPath;
+}
+
+export async function updateCcConnectPlatformBinding({ platformId, provider, projectPath }) {
+  const normalizedPlatformId = normalizeCcConnectPlatformId(platformId);
+  if (!normalizedPlatformId) {
+    throw createCcConnectError('UNSUPPORTED_PLATFORM', 'Unsupported platform.');
+  }
+
+  const hasProviderUpdate = provider !== undefined;
+  const hasProjectUpdate = projectPath !== undefined;
+  if (!hasProviderUpdate && !hasProjectUpdate) {
+    throw createCcConnectError('NO_MUTATION', 'At least one of provider or projectPath is required.');
+  }
+
+  const ccConnect = await getCcConnectStatus();
+  if (!ccConnect.installed) {
+    throw createCcConnectError('CC_CONNECT_NOT_INSTALLED', 'cc-connect is not installed.');
+  }
+
+  const currentState = readCcConnectState();
+  const connection = getPlatformConnection(currentState, normalizedPlatformId);
+  if (!connection) {
+    throw createCcConnectError('PLATFORM_NOT_CONNECTED', `${PLATFORM_MAP[normalizedPlatformId].label} is not connected.`);
+  }
+
+  const installedProviderIds = await getCcConnectInstalledProviderIds();
+  const availableProviders = mergeAvailableCcConnectProviders(
+    connection.configuredProviders,
+    installedProviderIds,
+    connection.activeProvider
+  );
+
+  let nextProvider = connection.activeProvider;
+  let nextProjectPath = connection.projectPath;
+  const changedFields = [];
+
+  if (hasProviderUpdate) {
+    const normalizedProviderId = normalizeCcConnectProviderId(provider);
+    if (!normalizedProviderId) {
+      throw createCcConnectError('UNSUPPORTED_PROVIDER', `Unsupported provider: ${provider}`);
+    }
+
+    if (!availableProviders.includes(normalizedProviderId)) {
+      throw createCcConnectError('PROVIDER_NOT_AVAILABLE', `Unsupported provider: ${normalizedProviderId}`);
+    }
+
+    if (normalizedProviderId !== nextProvider) {
+      changedFields.push('provider');
+      nextProvider = normalizedProviderId;
+    }
+  }
+
+  if (hasProjectUpdate) {
+    const normalizedProjectPath = validateProjectPath(projectPath);
+    if (normalizedProjectPath !== nextProjectPath) {
+      changedFields.push('projectPath');
+      nextProjectPath = normalizedProjectPath;
+    }
+  }
+
+  if (changedFields.length === 0) {
+    return {
+      platform: normalizedPlatformId,
+      label: PLATFORM_MAP[normalizedPlatformId].label,
+      provider: nextProvider,
+      projectPath: nextProjectPath,
+      configuredProviders: availableProviders,
+      changed: false,
+      changedFields,
+      message: 'No changes applied.'
+    };
+  }
+
+  const nextState = upsertPlatformConnection(currentState, normalizedPlatformId, {
+    ...connection,
+    configuredProviders: availableProviders,
+    activeProvider: nextProvider,
+    projectPath: nextProjectPath,
+    updatedAt: nowIso()
+  });
+
+  writeCcConnectState(nextState);
+  const { configPath } = writeCcConnectConfig(nextState);
+  const daemonResult = ensureCcConnectDaemonRunning(configPath);
+  if (!daemonResult.ok) {
+    throw createCcConnectError('DAEMON_UPDATE_FAILED', daemonResult.detail);
+  }
+
+  return {
+    platform: normalizedPlatformId,
+    label: PLATFORM_MAP[normalizedPlatformId].label,
+    provider: nextProvider,
+    projectPath: nextProjectPath,
+    configuredProviders: availableProviders,
+    changed: true,
+    changedFields,
+    message: daemonResult.detail
+  };
+}