@axhub/genie 0.2.6 → 0.2.8

package/server/cli.js

@@ -24,6 +24,10 @@ import {
     DEFAULT_WORKING_DIRECTORY_ENV,
     getConfiguredDefaultProjectPath,
 } from './utils/defaultWorkingDirectory.js';
+import {
+    getCcConnectConnectionSummary,
+    updateCcConnectPlatformBinding,
+} from './utils/ccConnectManager.js';
 
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = dirname(__filename);
@@ -374,6 +378,27 @@ function buildEditorErrorResponse({ requestId, channel = null, targetClientId =
     };
 }
 
+function buildCcConnectSuccessResponse({ command, platform = null, data = {} }) {
+    return {
+        ok: true,
+        command,
+        platform,
+        data,
+    };
+}
+
+function buildCcConnectErrorResponse({ command, platform = null, code, message }) {
+    return {
+        ok: false,
+        command,
+        platform,
+        error: {
+            code,
+            message,
+        },
+    };
+}
+
 function printJson(payload) {
     console.log(JSON.stringify(payload, null, 2));
 }
@@ -627,6 +652,96 @@ async function runEditorCommand(positionals, options) {
     }
 }
 
+function buildCcConnectCommand(positionals, options) {
+    const commandPath = positionals.join(' ');
+    const requestedPlatform = typeof options.platform === 'string' ? options.platform.trim() : '';
+
+    if (commandPath === 'cc-connect' || commandPath === 'cc-connect status') {
+        return {
+            command: 'cc-connect status',
+            action: 'status',
+            platform: requestedPlatform || null,
+        };
+    }
+
+    if (commandPath === 'cc-connect set') {
+        const platform = requireOption(options, 'platform', '--platform is required');
+        const provider = typeof options.provider === 'string' && options.provider.trim()
+            ? options.provider.trim()
+            : null;
+        const projectPath = typeof options.projectPath === 'string' && options.projectPath.trim()
+            ? path.resolve(options.projectPath)
+            : null;
+
+        if (!provider && !projectPath) {
+            throw new Error('At least one of --provider or --project-path is required.');
+        }
+
+        return {
+            command: 'cc-connect set',
+            action: 'set',
+            platform,
+            provider,
+            projectPath,
+        };
+    }
+
+    throw new Error(`Unknown cc-connect command: ${commandPath}`);
+}
+
+async function runCcConnectCommand(positionals, options) {
+    const command = buildCcConnectCommand(positionals, options);
+
+    try {
+        if (command.action === 'status') {
+            const summary = await getCcConnectConnectionSummary(command.platform);
+            const data = command.platform
+                ? {
+                    ccConnect: summary.ccConnect,
+                    providers: summary.providers,
+                    platform: summary.platform,
+                }
+                : {
+                    ccConnect: summary.ccConnect,
+                    providers: summary.providers,
+                    platforms: summary.platforms,
+                };
+
+            printJson(buildCcConnectSuccessResponse({
+                command: command.command,
+                platform: command.platform,
+                data,
+            }));
+            return;
+        }
+
+        if (command.action === 'set') {
+            const result = await updateCcConnectPlatformBinding({
+                platformId: command.platform,
+                provider: command.provider === null ? undefined : command.provider,
+                projectPath: command.projectPath === null ? undefined : command.projectPath,
+            });
+
+            printJson(buildCcConnectSuccessResponse({
+                command: command.command,
+                platform: result.platform,
+                data: result,
+            }));
+            return;
+        }
+
+        throw new Error(`Unsupported cc-connect action: ${command.action}`);
+    } catch (error) {
+        printJson(buildCcConnectErrorResponse({
+            command: command.command,
+            platform: command.platform || null,
+            code: error.code || 'CC_CONNECT_COMMAND_FAILED',
+            message: error.message,
+        }));
+        process.exit(1);
+    }
+}
+
 // Show status command
 function showStatus(options = {}) {
     const runtimeStatus = getRuntimeStatus();
@@ -740,6 +855,8 @@ function showStatus(options = {}) {
 
 // Show help
 function showHelp() {
+    const defaultProjectUrl = 'https://github.com/lintendo/AI-Web-UI';
+    const defaultIssuesUrl = `${defaultProjectUrl}/issues`;
     console.log(`
 ╔═══════════════════════════════════════════════════════════════╗
 ║              Axhub Genie - Command Line Tool               ║
@@ -752,6 +869,7 @@ Commands:
   start          Start the Axhub Genie server (default)
   stop           Stop the running Axhub Genie server
   status         Show configuration and data locations
+  cc-connect     Inspect or update platform connection bindings
   editor         Query or control a connected web editor frontend
   update         Update to the latest version
   help           Show this help information
@@ -767,9 +885,12 @@ Options:
   --json                      Output JSON (status or editor commands)
   --api-base <url>            Override API base URL for editor commands
   --api-key <key>             API key for /api/agent/ws editor commands
+  --platform <id>             Target platform for cc-connect commands
+  --provider <id>             Provider for cc-connect updates or editor task references
   --channel <name>            Integration channel for editor commands
   --target-client-id <id>     Target frontend client ID for editor commands
   --client-id <id>            Optional client filter for editor clients list
+  --project-path <path>       Project path for cc-connect platform binding updates
   --element-key <key>         Target element key for editor node commands
   --status <values>           Comma-separated status filters for editor nodes list
   --state <editing|idle>      Target editing state for editor editing set
@@ -788,6 +909,9 @@ Examples:
   $ axhub-genie stop                   # Stop running server
   $ axhub-genie status                 # Show configuration
   $ axhub-genie status --json          # Get machine-readable status
+  $ axhub-genie cc-connect status
+  $ axhub-genie cc-connect set --platform weixin --provider codex
+  $ axhub-genie cc-connect set --platform feishu --project-path /path/to/repo
   $ axhub-genie editor clients list --channel project-a
   $ axhub-genie editor snapshot --channel project-a --target-client-id figma-123
   $ axhub-genie editor nodes list --channel project-a --target-client-id figma-123 --status pending-dispatch,dirty
@@ -805,10 +929,10 @@ Environment Variables:
   AXHUB_GENIE_NO_OPEN  Set to true to disable auto-opening the homepage
 
 Documentation:
-  ${packageJson.homepage || 'https://github.com/siteboon/claudecodeui'}
+  ${packageJson.homepage || defaultProjectUrl}
 
 Report Issues:
-  ${packageJson.bugs?.url || 'https://github.com/siteboon/claudecodeui/issues'}
+  ${packageJson.bugs?.url || defaultIssuesUrl}
 `);
 }
 
@@ -938,10 +1062,18 @@ function parseArgs(args) {
             parsed.options.apiKey = args[++i];
         } else if (arg.startsWith('--api-key=')) {
             parsed.options.apiKey = arg.split('=')[1];
+        } else if (arg === '--platform') {
+            parsed.options.platform = args[++i];
+        } else if (arg.startsWith('--platform=')) {
+            parsed.options.platform = arg.split('=')[1];
         } else if (arg === '--channel') {
             parsed.options.channel = args[++i];
         } else if (arg.startsWith('--channel=')) {
             parsed.options.channel = arg.split('=')[1];
+        } else if (arg === '--project-path') {
+            parsed.options.projectPath = args[++i];
+        } else if (arg.startsWith('--project-path=')) {
+            parsed.options.projectPath = arg.split('=')[1];
         } else if (arg === '--target-client-id') {
             parsed.options.targetClientId = args[++i];
         } else if (arg.startsWith('--target-client-id=')) {
@@ -1039,6 +1171,9 @@ async function main() {
         case 'editor':
             await runEditorCommand(positionals, options);
             break;
+        case 'cc-connect':
+            await runCcConnectCommand(positionals, options);
+            break;
         case 'status':
         case 'info':
             showStatus(options);
@@ -1076,6 +1211,9 @@ if (isDirectExecution) {
 }
 
 export {
+    buildCcConnectCommand,
+    buildCcConnectErrorResponse,
+    buildCcConnectSuccessResponse,
     buildEditorRequest,
     buildEditorSuccessResponse,
     buildEditorErrorResponse,

package/server/external-agent/service.js

@@ -1,10 +1,11 @@
 import { promises as fs } from 'fs';
 
 import { addProjectManually } from '../projects.js';
-import { queryClaudeSDK } from '../claude-sdk.js';
-import { queryCodex } from '../openai-codex.js';
-import { queryGemini } from '../gemini-cli.js';
-import { queryOpencode } from '../opencode-cli.js';
+import {
+  applyConversationEventToTimelineMessages,
+  CONVERSATION_EVENT_KINDS
+} from '../../shared/conversationEvents.js';
+import { executeAgentPrompt } from '../acp-runtime/index.js';
 import { detectProviderInstallationStatus } from '../routes/cli-auth.js';
 import {
   buildAgentCallbackPayload,
@@ -16,7 +17,6 @@ import {
 } from '../utils/agentCallback.js';
 import { normalizeExternalImages } from '../utils/agentImages.js';
 import { resolveWorkingDirectory } from '../utils/defaultWorkingDirectory.js';
-import { CODEX_MODELS, GEMINI_MODELS, OPENCODE_MODELS } from '../../shared/modelConstants.js';
 
 export const SUPPORTED_EXTERNAL_AGENT_PROVIDERS = ['claude', 'codex', 'gemini', 'opencode'];
 
@@ -274,7 +274,7 @@ function extractTerminalErrorMessage(payload) {
 export class CallbackCaptureWriter {
   constructor() {
     this.sessionId = null;
-    this.assistantMessages = [];
+    this.timelineMessages = [];
     this.tokenSummary = createEmptyTokenSummary();
     this.terminalState = null;
     this.terminalErrorMessage = null;
@@ -303,24 +303,34 @@ export class CallbackCaptureWriter {
       };
     }
 
-    if (payload.type === 'claude-response' && payload.data?.type === 'assistant') {
-      this.assistantMessages.push(payload.data);
-    }
+    if (payload.type === 'conversation-event' && payload.event) {
+      this.timelineMessages = applyConversationEventToTimelineMessages(
+        this.timelineMessages,
+        payload.event,
+        payload.event.provider || 'claude'
+      );
+
+      if (payload.event.kind === CONVERSATION_EVENT_KINDS.ERROR) {
+        this.terminalState = 'errored';
+        this.terminalErrorMessage = payload.event.payload?.message || this.terminalErrorMessage || 'Agent session failed';
+        return;
+      }
 
-    if (
-      payload.type === 'codex-response' &&
-      payload.data?.type === 'item_done' &&
-      payload.data?.itemType === 'agent_message' &&
-      typeof payload.data?.content === 'string' &&
-      payload.data.content.trim()
-    ) {
-      this.assistantMessages.push({
-        type: 'assistant',
-        message: {
-          role: 'assistant',
-          content: payload.data.content
+      if (payload.event.kind === CONVERSATION_EVENT_KINDS.SESSION_STATE_CHANGED) {
+        const nextState = String(payload.event.payload?.state || '').trim().toLowerCase();
+        if (nextState === 'completed') {
+          this.terminalState = 'completed';
+          this.terminalErrorMessage = null;
+        } else if (nextState === 'aborted') {
+          this.terminalState = 'aborted';
+          this.terminalErrorMessage = 'Session aborted';
+        } else if (nextState === 'errored') {
+          this.terminalState = 'errored';
+          this.terminalErrorMessage = payload.event.payload?.message || this.terminalErrorMessage || 'Agent session failed';
         }
-      });
+      }
+
+      return;
     }
 
     if (payload.type === 'session-aborted') {
@@ -359,7 +369,16 @@ export class CallbackCaptureWriter {
   }
 
   getAssistantMessages() {
-    return this.assistantMessages;
+    return this.timelineMessages
+      .filter((message) => message?.type === 'assistant' && !message?.isToolUse && !message?.isSystemNotice)
+      .map((message) => ({
+        type: 'assistant',
+        message: {
+          role: 'assistant',
+          content: message.content || ''
+        },
+        timestamp: message.timestamp || null
+      }));
   }
 
   getTotalTokens() {
@@ -418,52 +437,19 @@ async function ensureProjectPathExists(projectPath) {
 }
 
 async function runProviderSession({ provider, message, images, finalProjectPath, sessionId, model, writer }) {
-  if (provider === 'claude') {
-    await queryClaudeSDK(message, {
+  await executeAgentPrompt({
+    agentKey: provider,
+    command: message,
+    options: {
       projectPath: finalProjectPath,
       cwd: finalProjectPath,
       sessionId,
       model,
       permissionMode: 'bypassPermissions',
       images
-    }, writer);
-    return;
-  }
-
-  if (provider === 'codex') {
-    await queryCodex(message, {
-      projectPath: finalProjectPath,
-      cwd: finalProjectPath,
-      sessionId,
-      model: model || CODEX_MODELS.DEFAULT,
-      permissionMode: 'bypassPermissions',
-      images
-    }, writer);
-    return;
-  }
-
-  if (provider === 'gemini') {
-    await queryGemini(message, {
-      projectPath: finalProjectPath,
-      cwd: finalProjectPath,
-      sessionId,
-      resume: !!sessionId,
-      model: model || GEMINI_MODELS.DEFAULT,
-      permissionMode: 'bypassPermissions'
-    }, writer);
-    return;
-  }
-
-  if (provider === 'opencode') {
-    await queryOpencode(message, {
-      projectPath: finalProjectPath,
-      cwd: finalProjectPath,
-      sessionId,
-      resume: !!sessionId,
-      model: model || OPENCODE_MODELS.DEFAULT,
-      permissionMode: 'bypassPermissions'
-    }, writer);
-  }
+    },
+    writer
+  });
 }
 
 export async function runExternalAgentRequest({
@@ -483,6 +469,7 @@ export async function runExternalAgentRequest({
     const response = {
       success: true,
       openOnly: true,
+      runtime: 'acp',
       sessionId: normalized.normalizedSessionId,
       ...buildSessionNavigation(normalized.normalizedSessionId),
       isResumed: true,
@@ -491,6 +478,7 @@ export async function runExternalAgentRequest({
 
     transportWriter?.send?.({
       type: 'open-only',
+      runtime: 'acp',
       ...response
     });
 
@@ -550,6 +538,7 @@ export async function runExternalAgentRequest({
     const response = {
       success: true,
       sessionId: callbackSessionId,
+      runtime: 'acp',
       ...navigation,
       isResumed: !!normalized.normalizedSessionId,
       messages: callbackCaptureWriter.getAssistantMessages(),