xibecode 1.3.3 → 1.3.7

package/dist/ui/claude-style-chat.js

@@ -1,6 +1,7 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react';
 import { createRequire } from 'module';
+import { spawn } from 'child_process';
 import TextInput from 'ink-text-input';
 import { Box, Static, Text, createRoot, useApp, useInput } from '../ink.js';
 import * as fs from 'fs/promises';
@@ -21,6 +22,11 @@ import { collectImageReferencesForPrompt } from 'xibecode-core';
 import { loadImageAttachment, mimeFromExtension } from '../utils/image-attachments.js';
 import { SessionManager } from 'xibecode-core';
 import { AutoMemoryManager, HooksManager, SettingsManager as CoreSettingsManager } from 'xibecode-core';
+import { cloudPullCommand } from '../commands/cloud-pull.js';
+import { attachRemoteExecution, codingToolExecutorRemoteOptions, getRuntimeStatusLabel, remoteToolSandboxIdForAgent, remoteToolWorkspaceRootForAgent, resolveRemoteExecutionConfig, } from '../utils/remote-execution.js';
+import { syncWorkspaceToSandbox } from '../utils/sandbox-sync.js';
+import { withCloudWorkspaceSyncSpinner } from '../utils/cloud-sync-feedback.js';
+import { getCloudRuntimeHint } from '../utils/cloud-runtime-hints.js';
 function isAbortLikeError(err) {
     if (!err || typeof err !== 'object')
         return false;
@@ -29,6 +35,42 @@ function isAbortLikeError(err) {
         anyErr.type === 'aborted' ||
         String(anyErr.message || '').toLowerCase().includes('aborted'));
 }
+async function runCommandCapture(command, args, cwd = process.cwd()) {
+    return new Promise((resolve) => {
+        const child = spawn(command, args, {
+            cwd,
+            stdio: ['ignore', 'pipe', 'pipe'],
+        });
+        let stdout = '';
+        let stderr = '';
+        child.stdout.on('data', (chunk) => {
+            stdout += String(chunk);
+        });
+        child.stderr.on('data', (chunk) => {
+            stderr += String(chunk);
+        });
+        child.on('error', (error) => {
+            stderr += error.message;
+            resolve({ code: 1, stdout, stderr });
+        });
+        child.on('close', (code) => {
+            resolve({ code: code ?? 0, stdout, stderr });
+        });
+    });
+}
+function buildAutoCommitMessage(stagedFiles, shortstat) {
+    const docsOnly = stagedFiles.length > 0
+        && stagedFiles.every((file) => /\.(md|mdx|txt|rst)$/i.test(file) || file.toLowerCase().includes('docs'));
+    const type = docsOnly ? 'docs' : 'chore';
+    if (stagedFiles.length === 1) {
+        return `${type}: update ${stagedFiles[0]}`;
+    }
+    if (stagedFiles.length === 0) {
+        return `${type}: update project files`;
+    }
+    const stat = shortstat.trim();
+    return `${type}: update ${stagedFiles.length} files${stat ? ` (${stat})` : ''}`;
+}
 function summarizeToolResultContent(content) {
     const raw = typeof content === 'string' ? content : JSON.stringify(content ?? '');
     try {
@@ -102,7 +144,7 @@ const HERO_LOGO = [
 const WORK_SPINNER_FRAMES = ['⠋', '⠙', '⠹', '⠸', '⠼', '⠴', '⠦', '⠧', '⠇', '⠏'];
 /** How fast to advance OpenClaude-style spinner verbs (ms) */
 const WORK_VERB_ROTATE_MS = 2400;
-const QUICK_HELP = ['/help', '/mode', '/format', '/model', '/setup', '/config', '/memory', '/hooks', '/donate', '/sponsor', '/clear', '/exit'];
+const QUICK_HELP = ['/help', '/mode', '/format', '/model', '/setup', '/config', '/memory', '/hooks', '/cpull', '/commit', '/donate', '/sponsor', '/clear', '/exit'];
 const CHAT_COMMANDS = [
     { name: '/help', description: 'Show available shortcuts and usage hints' },
     { name: '/mode', description: 'Switch agent mode from an interactive picker' },
@@ -113,6 +155,8 @@ const CHAT_COMMANDS = [
     { name: '/config', description: 'Show current config and quick config hints' },
     { name: '/memory', description: 'Show auto-memories for this project' },
     { name: '/hooks', description: 'Show registered lifecycle hooks' },
+    { name: '/cpull', description: 'Pull current cloud sandbox changes locally (supports --apply)' },
+    { name: '/commit', description: 'Stage all changes and commit (auto message or custom text)' },
     { name: '/donate', description: 'Open the donation page in your browser' },
     { name: '/sponsor', description: 'Open the sponsorship page in your browser' },
     { name: '/exit', description: 'Exit the interactive chat session' },
@@ -252,11 +296,14 @@ function XibeCodeChatApp(props) {
             { kind: 'line', id: nextLineIdRef.current++, type: 'info', text: 'Type /help for shortcuts.' },
         ];
         if (sessionIdRef.current) {
+            const hasHistory = Boolean(initialMessagesRef.current && initialMessagesRef.current.length > 0);
             base.push({
                 kind: 'line',
                 id: nextLineIdRef.current++,
                 type: 'info',
-                text: `Resumed session: ${sessionIdRef.current}`,
+                text: hasHistory
+                    ? `Resumed session: ${sessionIdRef.current}`
+                    : `Session: ${sessionIdRef.current}`,
             });
         }
         if (initialMessagesRef.current && initialMessagesRef.current.length > 0) {
@@ -407,10 +454,12 @@ function XibeCodeChatApp(props) {
         const provider = config.get('provider') ?? undefined;
         const model = config.getModel(costMode === 'economy');
         const baseUrl = config.getBaseUrl();
+        const sandboxMode = config.getSandboxMode();
+        const sandboxGateway = config.getSandboxGatewayUrl();
         const requestFormat = config.get('requestFormat') ?? 'auto';
         pushLine({
             type: 'info',
-            text: `Config: apiKey=${apiKeyPresent ? 'set' : 'missing'} | provider=${provider || 'auto'} | model=${model || '(none)'} | costMode=${costMode} | baseUrl=${baseUrl || '(default)'} | format=${requestFormat}`,
+            text: `Config: apiKey=${apiKeyPresent ? 'set' : 'missing'} | provider=${provider || 'auto'} | model=${model || '(none)'} | costMode=${costMode} | baseUrl=${baseUrl || '(default)'} | format=${requestFormat} | runtime=${sandboxMode}${sandboxGateway ? ` @ ${sandboxGateway}` : ''}`,
         });
     }, [props.profile, pushLine]);
     const requestOpenAIModelsFrom = useCallback(async (baseUrl, apiKey) => {
@@ -727,6 +776,42 @@ function XibeCodeChatApp(props) {
             props.onHooksCommand?.(subcmd || 'list', pushLine);
             return;
         }
+        if (resolvedInput === '/cpull' || resolvedInput.startsWith('/cpull ')) {
+            if (!props.onCloudPullCommand) {
+                pushLine({
+                    type: 'error',
+                    text: '/cpull is only available for cloud sandbox_full sessions.',
+                });
+                return;
+            }
+            const argsRaw = resolvedInput.replace(/^\/cpull\s*/i, '').trim();
+            try {
+                await props.onCloudPullCommand(argsRaw, pushLine);
+            }
+            catch (error) {
+                const message = error instanceof Error ? error.message : 'Failed to pull cloud workspace';
+                pushLine({ type: 'error', text: message });
+            }
+            return;
+        }
+        if (resolvedInput === '/commit' || resolvedInput.startsWith('/commit ')) {
+            if (!props.onCommitCommand) {
+                pushLine({
+                    type: 'error',
+                    text: '/commit is unavailable in this chat session.',
+                });
+                return;
+            }
+            const messageRaw = resolvedInput.replace(/^\/commit\s*/i, '').trim();
+            try {
+                await props.onCommitCommand(messageRaw, pushLine);
+            }
+            catch (error) {
+                const message = error instanceof Error ? error.message : 'Failed to create git commit';
+                pushLine({ type: 'error', text: message });
+            }
+            return;
+        }
         if (resolvedInput === '/format' || resolvedInput.startsWith('/format ')) {
             const arg = resolvedInput.replace(/^\/format\s*/i, '').trim().toLowerCase();
             if (!arg) {
@@ -1400,7 +1485,7 @@ function XibeCodeChatApp(props) {
                     if (item.kind === 'hero') {
                         return (_jsxs(Box, { flexDirection: "column", marginBottom: 1, children: [HERO_LOGO.map((line, idx) => (_jsx(React.Fragment, { children: _jsx(Text, { bold: true, color: idx < 6 ? 'claude' : 'suggestion', children: line }) }, `logo-${idx}`))), _jsx(Text, { color: "suggestion", children: "\u2726 Any model, Every tool, Zero limits. \u2726" }), _jsxs(Box, { marginTop: 1, borderStyle: "round", borderColor: "claude", flexDirection: "column", paddingX: 1, children: [_jsxs(Text, { children: [_jsx(Text, { color: "inactive", children: "Provider " }), _jsx(Text, { color: "claude", bold: true, children: providerName })] }), _jsxs(Text, { children: [_jsx(Text, { color: "inactive", children: "Model    " }), _jsx(Text, { children: activeModel })] }), _jsxs(Text, { children: [_jsx(Text, { color: "inactive", children: "Endpoint " }), _jsx(Text, { children: props.baseUrl || 'provider default' })] }), _jsxs(Text, { children: [_jsx(Text, { color: "inactive", children: "Format  " }), _jsxs(Text, { children: [wireFormat, ' ', _jsxs(Text, { dimColor: true, children: ["(", isAnthropicWireFormat(wireFormat, props.provider, props.customProviderFormat)
                                                                     ? 'Anthropic Messages'
-                                                                    : 'OpenAI chat', ")"] })] })] })] }), _jsxs(Box, { marginTop: 1, children: [_jsx(Text, { color: "suggestion", children: "\u25C8 cloud" }), _jsx(Text, { color: "inactive", children: "  Ready \u2014 type " }), _jsx(Text, { color: "claude", children: "/help" }), _jsx(Text, { color: "inactive", children: " to begin" })] }), _jsxs(Text, { color: "inactive", children: ["xibecode ", _jsxs(Text, { color: "claude", children: ["v", APP_VERSION] })] }), _jsx(Text, { color: "subtle", children: '─'.repeat(98) }), _jsx(Text, { color: "inactive", children: "Agent transcript" })] }, item.id));
+                                                                    : 'OpenAI chat', ")"] })] })] })] }), _jsxs(Box, { marginTop: 1, children: [_jsxs(Text, { color: "suggestion", children: [props.runtimeStatus, ":"] }), _jsx(Text, { color: "inactive", children: " Ready  -  type " }), _jsx(Text, { color: "claude", children: "/help" }), _jsx(Text, { color: "inactive", children: " to begin" })] }), props.sandboxLabel ? (_jsxs(Text, { color: "inactive", children: ["sandbox: ", props.sandboxLabel] })) : null, props.sandboxId ? (_jsxs(Text, { color: "inactive", children: ["sandbox id: ", props.sandboxId] })) : null, props.previewUrl ? (_jsxs(Text, { color: "inactive", children: ["preview: ", props.previewUrl] })) : null, props.pullHint ? (_jsxs(Text, { color: "inactive", children: ["pull: ", props.pullHint] })) : null, _jsxs(Text, { color: "inactive", children: ["xibecode ", _jsxs(Text, { color: "claude", children: ["v", APP_VERSION] })] }), _jsx(Text, { color: "subtle", children: '─'.repeat(98) }), _jsx(Text, { color: "inactive", children: "Agent transcript" })] }, item.id));
                     }
                     return (_jsx(React.Fragment, { children: item.type === 'assistant' ? (_jsxs(Box, { flexDirection: "column", marginBottom: 1, children: [_jsxs(Text, { bold: true, color: prefixColorKey('assistant'), children: [prefixForType('assistant'), ":"] }), _jsx(Box, { marginLeft: 2, flexDirection: "column", children: _jsx(AssistantMarkdown, { content: item.text }) })] })) : (_jsxs(Text, { children: [_jsxs(Text, { bold: true, color: prefixColorKey(item.type), children: [prefixForType(item.type), ":", ' '] }), _jsx(Text, { color: lineColorKey(item.type), children: item.text })] })) }, item.id));
                 } }), !hasChatContent && (_jsx(Box, { marginTop: 1, flexDirection: "column", children: _jsx(Text, { color: "inactive", children: "(send a message to start)" }) })), _jsx(Text, { color: "subtle", children: divider }), isRunning && (_jsx(Box, { marginTop: 1, paddingX: 1, borderStyle: "round", borderColor: "claudeBlue_FOR_SYSTEM_SPINNER", flexDirection: "column", children: _jsxs(Text, { wrap: "wrap", children: [_jsxs(Text, { bold: true, color: "claudeBlue_FOR_SYSTEM_SPINNER", children: [WORK_SPINNER_FRAMES[workSpinnerFrame], ' '] }), _jsx(Text, { bold: true, color: "briefLabelClaude", children: workVerbPhrase })] }) })), questionsState && (() => {
@@ -1470,9 +1555,38 @@ export async function launchClaudeStyleChat(options) {
     const mcpClientManager = new MCPClientManager();
     const memory = new NeuralMemory(process.cwd());
     await memory.init().catch(() => { });
-    const toolExecutor = new CodingToolExecutor(process.cwd(), { mcpClientManager, skillManager, memory });
+    const remoteExecution = resolveRemoteExecutionConfig(config, process.cwd());
+    const skipInitialSync = process.env.XIBECODE_SANDBOX_SKIP_SYNC === '1' || process.env.XIBECODE_SANDBOX_SKIP_SYNC === 'true';
+    if (remoteExecution?.strategy === 'sandbox_full' && !skipInitialSync) {
+        const syncResult = await withCloudWorkspaceSyncSpinner(() => syncWorkspaceToSandbox(remoteExecution, process.cwd(), {
+            maxMb: config.getSandboxSyncMaxMb(),
+            excludeGlobs: config.getSandboxSyncExcludeGlobs(),
+            workspaceRoot: remoteExecution.workspaceRoot,
+            respectGitignore: config.getSandboxSyncRespectGitignore(),
+        }));
+        remoteExecution.sessionId = syncResult.sessionId;
+        remoteExecution.e2bSandboxId = syncResult.sandboxId || remoteExecution.e2bSandboxId;
+    }
+    else if (skipInitialSync && remoteExecution?.strategy === 'sandbox_full' && !remoteExecution.sessionId) {
+        throw new Error('Cloud resume requested without a sandbox session ID.');
+    }
+    const cloudHint = await getCloudRuntimeHint(remoteExecution);
+    const runtimeStatus = getRuntimeStatusLabel(config);
+    const sandboxLabel = remoteExecution?.strategy === 'sandbox_full'
+        ? 'full (workspace synced to E2B)'
+        : remoteExecution
+            ? 'host_only (file edits stay local)'
+            : undefined;
+    const toolExecutor = new CodingToolExecutor(process.cwd(), {
+        mcpClientManager,
+        skillManager,
+        memory,
+        remoteExecution: codingToolExecutorRemoteOptions(remoteExecution),
+    });
+    attachRemoteExecution(toolExecutor, remoteExecution);
     let wireFormat = config.get('requestFormat') ?? 'auto';
     const customProviderFormat = config.get('customProviderFormat');
+    const remoteWs = remoteToolWorkspaceRootForAgent(remoteExecution);
     const createAgentForModel = (modelName, creds) => new EnhancedAgent({
         apiKey: creds.apiKey,
         baseUrl: creds.baseUrl,
@@ -1483,6 +1597,8 @@ export async function launchClaudeStyleChat(options) {
         customProviderFormat,
         requestFormat: wireFormat,
         defaultSkillsPrompt,
+        remoteToolWorkspaceRoot: remoteWs,
+        remoteToolSandboxId: remoteToolSandboxIdForAgent(remoteExecution),
     }, provider);
     let activeAgent = apiKey ? createAgentForModel(model, { apiKey, baseUrl }) : null;
     let activeCreds = { apiKey, baseUrl };
@@ -1952,8 +2068,88 @@ export async function launchClaudeStyleChat(options) {
             pushLine({ type: 'info', text: 'Usage: /hooks [list]. Default: list. Use "xc hooks" CLI for full management.' });
         }
     };
+    const onCloudPullCommand = async (argsRaw, pushLine) => {
+        if (!remoteExecution || remoteExecution.strategy !== 'sandbox_full') {
+            throw new Error('/cpull is available only in cloud sandbox_full mode.');
+        }
+        const sessionId = remoteExecution.sessionId?.trim();
+        if (!sessionId) {
+            throw new Error('No cloud session id found. Start with "xc cloud" before using /cpull.');
+        }
+        const tokens = argsRaw ? argsRaw.split(/\s+/).filter(Boolean) : [];
+        let apply = false;
+        let force = false;
+        let output;
+        for (let i = 0; i < tokens.length; i += 1) {
+            const token = tokens[i];
+            if (token === '--apply') {
+                apply = true;
+                continue;
+            }
+            if (token === '--force') {
+                force = true;
+                continue;
+            }
+            if (token === '--output') {
+                const next = tokens[i + 1];
+                if (!next || next.startsWith('--')) {
+                    throw new Error('Usage: /cpull [--apply] [--force] [--output <path>]');
+                }
+                output = next;
+                i += 1;
+                continue;
+            }
+            throw new Error(`Unknown /cpull option "${token}". Usage: /cpull [--apply] [--force] [--output <path>]`);
+        }
+        await cloudPullCommand({
+            profile: options.profile,
+            session: sessionId,
+            apply,
+            force,
+            output,
+            onStatus: (text) => pushLine({ type: 'info', text }),
+        });
+    };
+    const onCommitCommand = async (messageRaw, pushLine) => {
+        pushLine({ type: 'info', text: 'Staging files with git add .' });
+        const addResult = await runCommandCapture('git', ['add', '.']);
+        if (addResult.code !== 0) {
+            throw new Error(`git add failed: ${(addResult.stderr || addResult.stdout || 'unknown error').trim()}`);
+        }
+        const stagedResult = await runCommandCapture('git', ['diff', '--cached', '--name-only']);
+        if (stagedResult.code !== 0) {
+            throw new Error(`Failed to inspect staged files: ${(stagedResult.stderr || stagedResult.stdout || 'unknown error').trim()}`);
+        }
+        const stagedFiles = stagedResult.stdout
+            .split('\n')
+            .map((line) => line.trim())
+            .filter(Boolean);
+        if (stagedFiles.length === 0) {
+            pushLine({ type: 'info', text: 'No staged changes found after git add.' });
+            return;
+        }
+        let commitMessage = messageRaw.trim();
+        if (!commitMessage) {
+            const statResult = await runCommandCapture('git', ['diff', '--cached', '--shortstat']);
+            const shortstat = statResult.code === 0 ? statResult.stdout : '';
+            commitMessage = buildAutoCommitMessage(stagedFiles, shortstat);
+            pushLine({ type: 'info', text: `Auto commit message: ${commitMessage}` });
+        }
+        const commitResult = await runCommandCapture('git', ['commit', '-m', commitMessage]);
+        if (commitResult.code !== 0) {
+            throw new Error((commitResult.stderr || commitResult.stdout || 'git commit failed').trim());
+        }
+        const firstLine = (commitResult.stdout || commitResult.stderr)
+            .split('\n')
+            .map((line) => line.trim())
+            .find(Boolean);
+        pushLine({
+            type: 'info',
+            text: firstLine ? `Commit created: ${firstLine}` : `Commit created with message: ${commitMessage}`,
+        });
+    };
     try {
-        await renderAndRun(root, _jsx(XibeCodeChatApp, { model: model, initialMode: activeMode, provider: provider, baseUrl: baseUrl, needsFirstRunSetup: needsFirstRunSetup, defaultModel: model, modeOptions: modeOptions, initialRequestFormat: wireFormat, customProviderFormat: customProviderFormat, profile: options.profile, sessionId: currentSessionId, initialMessages: options.initialMessages, runPrompt: runPrompt, listBackgroundTasks: listBackgroundTasks, checkBackgroundTask: checkBackgroundTask, onUiLine: appendLogLine, registerUiSink: registerUiSink, registerModeSink: registerModeSink, registerQuestionsSink: registerQuestionsSink, loadModels: loadModels, onModelChange: onModelChange, onModeChange: onModeChange, onWireFormatChange: onWireFormatChange, onSessionCreated: onSessionCreated, onMessagesUpdate: onMessagesUpdate, getCurrentMessages: () => activeAgent?.getMessages() ?? currentSession?.messages ?? [], onMemoryCommand: onMemoryCommand, onHooksCommand: onHooksCommand }));
+        await renderAndRun(root, _jsx(XibeCodeChatApp, { model: model, initialMode: activeMode, provider: provider, runtimeStatus: runtimeStatus, sandboxLabel: sandboxLabel, sandboxId: cloudHint.sandboxId, previewUrl: cloudHint.previewUrl, pullHint: cloudHint.pullHint, baseUrl: baseUrl, needsFirstRunSetup: needsFirstRunSetup, defaultModel: model, modeOptions: modeOptions, initialRequestFormat: wireFormat, customProviderFormat: customProviderFormat, profile: options.profile, sessionId: currentSessionId, initialMessages: options.initialMessages, runPrompt: runPrompt, listBackgroundTasks: listBackgroundTasks, checkBackgroundTask: checkBackgroundTask, onUiLine: appendLogLine, registerUiSink: registerUiSink, registerModeSink: registerModeSink, registerQuestionsSink: registerQuestionsSink, loadModels: loadModels, onModelChange: onModelChange, onModeChange: onModeChange, onWireFormatChange: onWireFormatChange, onSessionCreated: onSessionCreated, onMessagesUpdate: onMessagesUpdate, getCurrentMessages: () => activeAgent?.getMessages() ?? currentSession?.messages ?? [], onMemoryCommand: onMemoryCommand, onHooksCommand: onHooksCommand, onCloudPullCommand: onCloudPullCommand, onCommitCommand: onCommitCommand }));
     }
     finally {
         process.off('unhandledRejection', onUnhandledRejection);