xibecode 1.3.5 → 1.3.11

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

@@ -23,6 +23,7 @@ import { loadImageAttachment, mimeFromExtension } from '../utils/image-attachmen
 import { SessionManager } from 'xibecode-core';
 import { AutoMemoryManager, HooksManager, SettingsManager as CoreSettingsManager } from 'xibecode-core';
 import { cloudPullCommand } from '../commands/cloud-pull.js';
+import { listWorkspaceFiles } from '../utils/list-files.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';
@@ -96,6 +97,52 @@ function summarizeToolResultContent(content) {
     }
     return raw.replace(/\s+/g, ' ').trim().slice(0, 300);
 }
+/** Mathem. brackets — wrap @-file picks so each pick is one immutable token */
+const AT_MENTION_OPEN = '\u27e6'; // ⟦
+const AT_MENTION_CLOSE = '\u27e7'; // ⟧
+/** Drop unknown ⟦…⟧ groups; keep only exact picker-produced tokens still registered in `locked` */
+function reconcileTaggedAtMentions(next, locked) {
+    let out = '';
+    let i = 0;
+    while (i < next.length) {
+        if (next.startsWith(AT_MENTION_OPEN, i)) {
+            const closeIdx = next.indexOf(AT_MENTION_CLOSE, i + AT_MENTION_OPEN.length);
+            if (closeIdx === -1) {
+                return out;
+            }
+            const block = next.slice(i, closeIdx + AT_MENTION_CLOSE.length);
+            if (locked.current.has(block)) {
+                out += block;
+            }
+            i = closeIdx + AT_MENTION_CLOSE.length;
+            continue;
+        }
+        out += next[i];
+        i += 1;
+    }
+    for (const t of [...locked.current]) {
+        if (!out.includes(t))
+            locked.current.delete(t);
+    }
+    return out;
+}
+/** Strip pick wrappers before commands / history / prompts — core expects plain `@path` */
+function flattenTaggedAtMentions(s) {
+    return s.replace(/\u27e6(@[A-Za-z0-9._\-\/]+)\u27e7/g, (_, inner) => {
+        let body = inner.slice(1);
+        if (body.startsWith('/'))
+            body = body.slice(1);
+        return `@${body}`;
+    });
+}
+/** Inserted path for dirs: `/relative/` — files stay repo-relative without a leading slash */
+function mentionPathForPick(entry) {
+    if (entry.isDirectory) {
+        const trimmed = entry.relativePath.replace(/\/+$/, '');
+        return trimmed ? `/${trimmed}/` : '/';
+    }
+    return entry.relativePath;
+}
 function transcriptLinesFromMessage(message) {
     if (typeof message.content === 'string') {
         const text = message.content.trim();
@@ -155,7 +202,7 @@ 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: '/cpull', description: 'Pull sandbox workspace; /cpull --apply merges only new/changed files (use --full to replace all)' },
     { 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' },
@@ -279,6 +326,15 @@ function XibeCodeChatApp(props) {
     const [configProviderIndex, setConfigProviderIndex] = useState(0);
     const [configCostModePickerOpen, setConfigCostModePickerOpen] = useState(false);
     const [configCostModeIndex, setConfigCostModeIndex] = useState(0);
+    // File picker state (@-triggered)
+    const [filePickerOpen, setFilePickerOpen] = useState(false);
+    const [filteredFileEntries, setFilteredFileEntries] = useState([]);
+    const [selectedFileIndex, setSelectedFileIndex] = useState(0);
+    const [fileQuery, setFileQuery] = useState('');
+    const [atPos, setAtPos] = useState(-1);
+    const [filePickerLoading, setFilePickerLoading] = useState(false);
+    /** Bump when the file picker inserts text so Ink TextInput remounts with the caret at the end */
+    const [chatInputMountKey, setChatInputMountKey] = useState(0);
     const [questionsState, setQuestionsState] = useState(null);
     const [workSpinnerFrame, setWorkSpinnerFrame] = useState(0);
     const [workVerbIndex, setWorkVerbIndex] = useState(0);
@@ -322,6 +378,9 @@ function XibeCodeChatApp(props) {
         // Keep a much larger in-memory transcript so context doesn't vanish quickly.
         setLines((prev) => [...prev.slice(-5000), withId]);
     }, [props]);
+    const handleChatInputChange = useCallback((next) => {
+        setInput(reconcileTaggedAtMentions(next, lockedPickTagsRef));
+    }, []);
     useEffect(() => {
         props.registerUiSink?.(pushLine);
     }, [props, pushLine]);
@@ -341,6 +400,12 @@ function XibeCodeChatApp(props) {
     const lastVisibleOutputAtRef = useRef(Date.now());
     const currentPromptRef = useRef(null);
     const restartAttemptsRef = useRef(0);
+    const promptHistoryRef = useRef([]);
+    const historyIndexRef = useRef(-1);
+    const savedInputRef = useRef('');
+    const cachedFileEntriesRef = useRef([]);
+    /** Exact ⟦@path⟧ strings inserted via the file picker — edits inside remove the whole token */
+    const lockedPickTagsRef = useRef(new Set());
     const sessionMessagesRef = useRef(props.initialMessages || []);
     const lastBgLineByTask = useRef(new Map());
     useEffect(() => {
@@ -433,6 +498,64 @@ function XibeCodeChatApp(props) {
         }, WORK_VERB_ROTATE_MS);
         return () => clearInterval(id);
     }, [isRunning]);
+    // Load workspace file list once on mount for @-picker
+    useEffect(() => {
+        let cancelled = false;
+        setFilePickerLoading(true);
+        (async () => {
+            try {
+                const entries = await listWorkspaceFiles(process.cwd());
+                if (!cancelled) {
+                    cachedFileEntriesRef.current = entries;
+                }
+            }
+            catch {
+                // silently fail
+            }
+            finally {
+                if (!cancelled)
+                    setFilePickerLoading(false);
+            }
+        })();
+        return () => { cancelled = true; };
+    }, []);
+    // Detect '@' in input to open file picker
+    useEffect(() => {
+        const lastAtIndex = input.lastIndexOf('@');
+        if (lastAtIndex === -1) {
+            setFilePickerOpen(false);
+            setSelectedFileIndex(0);
+            return;
+        }
+        // '@' must be at a word boundary
+        if (lastAtIndex > 0) {
+            const prev = input[lastAtIndex - 1];
+            if (prev !== ' ' && prev !== '(' && prev !== AT_MENTION_CLOSE) {
+                setFilePickerOpen(false);
+                setSelectedFileIndex(0);
+                return;
+            }
+        }
+        const afterAt = input.slice(lastAtIndex + 1);
+        // Space ends the active @-mention — hide suggestions (typing past first word breaks mention mode)
+        if (afterAt.includes(' ')) {
+            setFilePickerOpen(false);
+            setSelectedFileIndex(0);
+            return;
+        }
+        const query = afterAt;
+        setAtPos(lastAtIndex);
+        setFileQuery(query);
+        setFilePickerOpen(true);
+        const lowerQuery = query.toLowerCase();
+        const filtered = cachedFileEntriesRef.current.filter((e) => {
+            const rel = e.relativePath.toLowerCase();
+            const label = mentionPathForPick(e).toLowerCase();
+            return rel.includes(lowerQuery) || label.includes(lowerQuery);
+        });
+        setFilteredFileEntries(filtered);
+        setSelectedFileIndex((prev) => Math.min(prev, Math.max(0, filtered.length - 1)));
+    }, [input]);
     const ensureModelsLoaded = useCallback(async () => {
         if (availableModels.length > 0) {
             return availableModels;
@@ -603,17 +726,22 @@ function XibeCodeChatApp(props) {
         if (questionsState) {
             return;
         }
+        // If file picker is open, ignore Enter (handled by useInput)
+        if (filePickerOpen) {
+            return;
+        }
+        const flat = flattenTaggedAtMentions(trimmed);
         if (isRunning) {
-            queuedPromptRef.current = trimmed;
+            queuedPromptRef.current = flat;
             setInput('');
             pushLine({ type: 'info', text: 'Queued message — will run next.' });
             return;
         }
-        const commandMatches = CHAT_COMMANDS.filter((command) => command.name.toLowerCase().startsWith(trimmed.toLowerCase()));
-        const exactMatch = CHAT_COMMANDS.some((command) => command.name.toLowerCase() === trimmed.toLowerCase());
-        const resolvedInput = trimmed.startsWith('/') && !exactMatch && commandMatches[selectedCommandIndex]
+        const commandMatches = CHAT_COMMANDS.filter((command) => command.name.toLowerCase().startsWith(flat.toLowerCase()));
+        const exactMatch = CHAT_COMMANDS.some((command) => command.name.toLowerCase() === flat.toLowerCase());
+        const resolvedInput = flat.startsWith('/') && !exactMatch && commandMatches[selectedCommandIndex]
             ? commandMatches[selectedCommandIndex].name
-            : trimmed;
+            : flat;
         setInput('');
         // Setup wizard input capture
         if (setupStep !== 'idle') {
@@ -965,6 +1093,14 @@ function XibeCodeChatApp(props) {
             const anyErr = err;
             return anyErr.name === 'AbortError' || String(anyErr.message || '').toLowerCase().includes('aborted');
         };
+        // Save to prompt history (avoid duplicates for consecutive same prompts)
+        if (resolvedInput && !resolvedInput.startsWith('/')) {
+            const hist = promptHistoryRef.current;
+            if (hist[hist.length - 1] !== resolvedInput) {
+                hist.push(resolvedInput);
+            }
+            historyIndexRef.current = hist.length;
+        }
         // Watchdog auto-restart loop (up to 2 restarts)
         restartAttemptsRef.current = 0;
         let promptToRun = resolvedInput;
@@ -1004,9 +1140,11 @@ function XibeCodeChatApp(props) {
         configPrompt.kind,
         ensureModelsLoaded,
         exit,
+        filePickerOpen,
         isRunning,
         props,
         pushLine,
+        questionsState,
         requestOpenAIModelsFrom,
         selectedCommandIndex,
         activeMode,
@@ -1015,7 +1153,6 @@ function XibeCodeChatApp(props) {
         wireFormat,
         applyMode,
         startSetupWizard,
-        isRunning,
     ]);
     const normalizedInput = input.trim().toLowerCase();
     const isSlashMode = input.startsWith('/');
@@ -1035,6 +1172,9 @@ function XibeCodeChatApp(props) {
     const visibleModelOptions = filteredModels.slice(modelPickerStart, modelPickerStart + MODEL_PICKER_WINDOW);
     const setupModelPickerStart = computeWindowStart(setupModels.length, setupSelectedModelIndex, MODEL_PICKER_WINDOW);
     const visibleSetupModelOptions = setupModels.slice(setupModelPickerStart, setupModelPickerStart + MODEL_PICKER_WINDOW);
+    const FILE_PICKER_WINDOW = 14;
+    const filePickerStart = computeWindowStart(filteredFileEntries.length, selectedFileIndex, FILE_PICKER_WINDOW);
+    const visibleFileEntries = filteredFileEntries.slice(filePickerStart, filePickerStart + FILE_PICKER_WINDOW);
     useInput((inputKey, key) => {
         if (key.ctrl && inputKey === 'c') {
             exit();
@@ -1424,6 +1564,69 @@ function XibeCodeChatApp(props) {
                 return;
             }
         }
+        // File picker arrow navigation (@-triggered)
+        if (filePickerOpen && !isRunning && !isSlashMode) {
+            if (key.escape) {
+                setFilePickerOpen(false);
+                setSelectedFileIndex(0);
+                return;
+            }
+            if (key.upArrow) {
+                setSelectedFileIndex((prev) => prev === 0 ? filteredFileEntries.length - 1 : prev - 1);
+                return;
+            }
+            if (key.downArrow) {
+                setSelectedFileIndex((prev) => prev >= filteredFileEntries.length - 1 ? 0 : prev + 1);
+                return;
+            }
+            if (key.return) {
+                const selected = filteredFileEntries[selectedFileIndex];
+                if (selected) {
+                    const beforeAt = input.slice(0, atPos);
+                    const afterAtPart = input.slice(atPos + 1);
+                    const spaceIdx = afterAtPart.indexOf(' ');
+                    const rest = spaceIdx === -1 ? '' : afterAtPart.slice(spaceIdx);
+                    const pickedPath = mentionPathForPick(selected);
+                    const tag = `${AT_MENTION_OPEN}@${pickedPath}${AT_MENTION_CLOSE}`;
+                    lockedPickTagsRef.current.add(tag);
+                    const newInput = `${beforeAt}${tag}${rest} `;
+                    setInput(reconcileTaggedAtMentions(newInput, lockedPickTagsRef));
+                    setChatInputMountKey((k) => k + 1);
+                }
+                setFilePickerOpen(false);
+                setSelectedFileIndex(0);
+                return;
+            }
+        }
+        // Prompt history browsing with UP/DOWN arrows (only in normal chat input)
+        if (!isSlashMode && !isRunning && !questionsState && !configMenuOpen && !modePickerOpen && !modelPickerOpen && !setupModelPickerOpen && !setupProviderPickerOpen && !configProviderPickerOpen && !configCostModePickerOpen) {
+            const hist = promptHistoryRef.current;
+            if (key.upArrow) {
+                if (hist.length === 0)
+                    return;
+                // Save current input before browsing (only the first time we press up)
+                if (historyIndexRef.current >= hist.length) {
+                    savedInputRef.current = input;
+                }
+                if (historyIndexRef.current > 0) {
+                    historyIndexRef.current -= 1;
+                    setInput(hist[historyIndexRef.current]);
+                }
+                return;
+            }
+            if (key.downArrow) {
+                if (historyIndexRef.current < hist.length) {
+                    historyIndexRef.current += 1;
+                    if (historyIndexRef.current >= hist.length) {
+                        setInput(savedInputRef.current);
+                    }
+                    else {
+                        setInput(hist[historyIndexRef.current]);
+                    }
+                }
+                return;
+            }
+        }
         if (!isSlashMode || isRunning || filteredCommands.length === 0) {
             return;
         }
@@ -1504,11 +1707,15 @@ function XibeCodeChatApp(props) {
                                     const isSelected = otherIdx === selectedOptionIndex;
                                     return (_jsxs(Text, { children: [_jsx(Text, { bold: true, color: isSelected ? 'green' : 'inactive', children: isSelected ? ' ▸ ' : '   ' }), _jsxs(Text, { bold: true, color: isSelected ? 'green' : 'yellow', children: [optLetters[otherIdx], ")"] }), _jsx(Text, { color: isSelected ? 'green' : 'inactive', children: " type yourself" })] }));
                                 })()] }), _jsx(Text, { color: "inactive", dimColor: true, children: "\u2191/\u2193 to navigate, Enter to select, Esc to cancel" })] }));
-            })(), _jsxs(Box, { marginTop: 1, borderStyle: "round", borderColor: questionsState ? (questionsState.isTypingCustom ? 'green' : 'yellow') : 'claude', paddingX: 1, children: [_jsx(Text, { color: questionsState ? (questionsState.isTypingCustom ? 'green' : 'yellow') : 'claude', children: '> ' }), _jsx(TextInput, { value: input, onChange: setInput, onSubmit: onSubmit, placeholder: questionsState
+            })(), _jsxs(Box, { marginTop: 1, borderStyle: "round", borderColor: questionsState ? (questionsState.isTypingCustom ? 'green' : 'yellow') : 'claude', paddingX: 1, children: [_jsx(Text, { color: questionsState ? (questionsState.isTypingCustom ? 'green' : 'yellow') : 'claude', children: '> ' }), _jsx(TextInput, { value: input, onChange: handleChatInputChange, onSubmit: onSubmit, placeholder: questionsState
                             ? questionsState.isTypingCustom
                                 ? `Type your answer for Q${questionsState.currentIndex + 1} and press Enter`
                                 : `Use ↑/↓ and Enter to pick an option (Q${questionsState.currentIndex + 1}/${questionsState.questions.length})`
-                            : isRunning ? 'Waiting for response…' : 'Message XibeCode…' })] }), isSlashMode && (_jsxs(Box, { marginTop: 1, borderStyle: "round", borderColor: "suggestion", flexDirection: "column", paddingX: 1, children: [_jsx(Text, { color: "suggestion", bold: true, children: "Commands" }), filteredCommands.length === 0 ? (_jsxs(Text, { color: "inactive", children: ["No commands match \"", input, "\""] })) : (filteredCommands.map((command, index) => (_jsx(React.Fragment, { children: _jsxs(Text, { children: [_jsx(Text, { color: index === selectedCommandIndex ? 'claude' : 'inactive', children: index === selectedCommandIndex ? '▸ ' : '  ' }), _jsx(Text, { bold: true, color: index === selectedCommandIndex ? 'claude' : 'text', children: command.name }), _jsxs(Text, { color: "inactive", children: [" \u2014 ", command.description] })] }) }, command.name)))), _jsx(Text, { color: "subtle", children: "Use \u2191/\u2193 to navigate, Tab to autocomplete." })] })), modelPickerOpen && (_jsxs(Box, { marginTop: 1, borderStyle: "round", borderColor: "claude", flexDirection: "column", paddingX: 1, children: [_jsx(Text, { bold: true, color: "claude", children: "Select model" }), isModelListLoading ? (_jsx(Text, { color: "inactive", children: "Loading models from provider..." })) : filteredModels.length === 0 ? (_jsx(Text, { color: "inactive", children: "No models matched current filter." })) : (visibleModelOptions.map((modelName, index) => {
+                            : isRunning ? 'Waiting for response…' : 'Message XibeCode…' }, chatInputMountKey)] }), filePickerOpen && (_jsxs(Box, { marginTop: 1, borderStyle: "round", borderColor: "suggestion", flexDirection: "column", paddingX: 1, children: [_jsxs(Text, { bold: true, color: "suggestion", children: ["Files", filePickerLoading ? ' (loading...)' : ''] }), filePickerLoading ? (_jsx(Text, { color: "inactive", children: "Scanning workspace\u2026" })) : filteredFileEntries.length === 0 ? (_jsx(Text, { color: "inactive", children: fileQuery ? `No files match "${fileQuery}"` : 'No files in workspace' })) : (visibleFileEntries.map((entry, index) => {
+                        const absoluteIndex = filePickerStart + index;
+                        const isSelected = absoluteIndex === selectedFileIndex;
+                        return (_jsxs(Text, { children: [_jsx(Text, { color: isSelected ? 'claude' : 'inactive', children: isSelected ? '▸ ' : '  ' }), _jsx(Text, { color: isSelected ? 'claude' : (entry.isDirectory ? 'yellow' : 'text'), children: mentionPathForPick(entry) })] }, entry.relativePath));
+                    })), _jsx(Text, { color: "subtle", children: "\u2191/\u2193 navigate \u2022 Enter inserts locked \u27E6@path\u27E7 \u2022 Space ends mention \u2022 Esc close" })] })), isSlashMode && (_jsxs(Box, { marginTop: 1, borderStyle: "round", borderColor: "suggestion", flexDirection: "column", paddingX: 1, children: [_jsx(Text, { color: "suggestion", bold: true, children: "Commands" }), filteredCommands.length === 0 ? (_jsxs(Text, { color: "inactive", children: ["No commands match \"", input, "\""] })) : (filteredCommands.map((command, index) => (_jsx(React.Fragment, { children: _jsxs(Text, { children: [_jsx(Text, { color: index === selectedCommandIndex ? 'claude' : 'inactive', children: index === selectedCommandIndex ? '▸ ' : '  ' }), _jsx(Text, { bold: true, color: index === selectedCommandIndex ? 'claude' : 'text', children: command.name }), _jsxs(Text, { color: "inactive", children: [" \u2014 ", command.description] })] }) }, command.name)))), _jsx(Text, { color: "subtle", children: "Use \u2191/\u2193 to navigate, Tab to autocomplete." })] })), modelPickerOpen && (_jsxs(Box, { marginTop: 1, borderStyle: "round", borderColor: "claude", flexDirection: "column", paddingX: 1, children: [_jsx(Text, { bold: true, color: "claude", children: "Select model" }), isModelListLoading ? (_jsx(Text, { color: "inactive", children: "Loading models from provider..." })) : filteredModels.length === 0 ? (_jsx(Text, { color: "inactive", children: "No models matched current filter." })) : (visibleModelOptions.map((modelName, index) => {
                         const absoluteIndex = modelPickerStart + index;
                         const isSelected = absoluteIndex === selectedModelIndex;
                         return (_jsx(React.Fragment, { children: _jsxs(Text, { children: [_jsx(Text, { color: isSelected ? 'claude' : 'inactive', children: isSelected ? '▸ ' : '  ' }), _jsx(Text, { color: isSelected ? 'claude' : 'text', children: modelName })] }) }, modelName));
@@ -1542,6 +1749,11 @@ function XibeCodeChatApp(props) {
                     ].map((label, index) => (_jsx(React.Fragment, { children: _jsxs(Text, { children: [_jsx(Text, { color: index === configProviderIndex ? 'claude' : 'inactive', children: index === configProviderIndex ? '▸ ' : '  ' }), _jsx(Text, { color: index === configProviderIndex ? 'claude' : 'text', children: label })] }) }, label))), _jsx(Text, { color: "subtle", children: "\u2191/\u2193 navigate \u2022 Enter apply \u2022 Esc close" })] })), configCostModePickerOpen && (_jsxs(Box, { marginTop: 1, borderStyle: "round", borderColor: "suggestion", flexDirection: "column", paddingX: 1, children: [_jsx(Text, { bold: true, color: "suggestion", children: "Cost mode" }), ['normal', 'economy'].map((label, index) => (_jsx(React.Fragment, { children: _jsxs(Text, { children: [_jsx(Text, { color: index === configCostModeIndex ? 'claude' : 'inactive', children: index === configCostModeIndex ? '▸ ' : '  ' }), _jsx(Text, { color: index === configCostModeIndex ? 'claude' : 'text', children: label })] }) }, label))), _jsx(Text, { color: "subtle", children: "\u2191/\u2193 navigate \u2022 Enter apply \u2022 Esc close" })] })), modePickerOpen && (_jsxs(Box, { marginTop: 1, borderStyle: "round", borderColor: "suggestion", flexDirection: "column", paddingX: 1, children: [_jsx(Text, { bold: true, color: "suggestion", children: "Select mode" }), filteredModeOptions.length === 0 ? (_jsx(Text, { color: "inactive", children: "No modes matched current filter." })) : (filteredModeOptions.map((mode, index) => (_jsx(React.Fragment, { children: _jsxs(Text, { children: [_jsx(Text, { color: index === selectedModeIndex ? 'claude' : 'inactive', children: index === selectedModeIndex ? '▸ ' : '  ' }), _jsx(Text, { color: index === selectedModeIndex ? 'claude' : 'text', children: mode.id }), _jsxs(Text, { color: "inactive", children: [" \u2014 ", mode.description] })] }) }, mode.id)))), _jsx(Text, { color: "subtle", children: "\u2191/\u2193 navigate \u2022 Enter apply \u2022 Esc close" })] }))] }));
 }
 export async function launchClaudeStyleChat(options) {
+    if (options.forceLocalRuntime) {
+        process.env.XIBECODE_SANDBOX_MODE = 'local';
+        delete process.env.XIBECODE_SANDBOX_SESSION_ID;
+        delete process.env.XIBECODE_SANDBOX_SKIP_SYNC;
+    }
     const config = new ConfigManager(options.profile);
     const apiKey = options.apiKey || config.getApiKey() || '';
     const needsFirstRunSetup = !apiKey;
@@ -2079,6 +2291,7 @@ export async function launchClaudeStyleChat(options) {
         const tokens = argsRaw ? argsRaw.split(/\s+/).filter(Boolean) : [];
         let apply = false;
         let force = false;
+        let full = false;
         let output;
         for (let i = 0; i < tokens.length; i += 1) {
             const token = tokens[i];
@@ -2086,6 +2299,10 @@ export async function launchClaudeStyleChat(options) {
                 apply = true;
                 continue;
             }
+            if (token === '--full') {
+                full = true;
+                continue;
+            }
             if (token === '--force') {
                 force = true;
                 continue;
@@ -2093,18 +2310,19 @@ export async function launchClaudeStyleChat(options) {
             if (token === '--output') {
                 const next = tokens[i + 1];
                 if (!next || next.startsWith('--')) {
-                    throw new Error('Usage: /cpull [--apply] [--force] [--output <path>]');
+                    throw new Error('Usage: /cpull [--apply] [--full] [--force] [--output <path>]');
                 }
                 output = next;
                 i += 1;
                 continue;
             }
-            throw new Error(`Unknown /cpull option "${token}". Usage: /cpull [--apply] [--force] [--output <path>]`);
+            throw new Error(`Unknown /cpull option "${token}". Usage: /cpull [--apply] [--full] [--force] [--output <path>]`);
         }
         await cloudPullCommand({
             profile: options.profile,
             session: sessionId,
             apply,
+            full,
             force,
             output,
             onStatus: (text) => pushLine({ type: 'info', text }),