@thegitai/cli 1.0.0-preview.6 → 1.0.0-preview.7

package/dist/src/help-text.js

@@ -57,7 +57,8 @@ const HELP_MARKDOWN = [
     '## Keys & clipboard',
     '',
     '- **Enter** sends • **Shift+Tab** cycles modes • **Esc** cancels the turn •',
-    '  **Ctrl+C** quits. These are the same on macOS, Linux, and Windows.',
+    '  **Ctrl+C** clears the composer or the queued message, and quits once there',
+    '  is nothing left to clear. These are the same on macOS, Linux, and Windows.',
     `- **Paste** into the composer with your terminal's paste shortcut (\`${PASTE_SHORTCUT}\``,
     '  on this system) or by right-clicking the composer.',
     '- **Copy** from the transcript by dragging to select; double-click copies a',

package/dist/src/ui/tui/build-frame.js

@@ -405,15 +405,18 @@ function composerFooterLines(state) {
         }));
         return lines;
     }
+    const busyHelperText = state.queuedMessage
+        ? 'Enter re-queues • ↑ edit queued • Esc / Ctrl+C clear queued'
+        : state.input
+            ? 'Enter queues • Esc cancels turn • Ctrl+C clears draft'
+            : 'Enter queues • Esc / Ctrl+C cancel turn';
     const helperText = state.busy
-        ? state.queuedMessage
-            ? 'Enter re-queues • ↑ edit queued • Esc cancels queued'
-            : 'Enter queues • Esc / Ctrl+C cancel turn'
+        ? busyHelperText
         : process.platform === 'win32'
-            ? 'Enter sends • Shift+Tab mode • Alt+V image • Esc cancel turn • Ctrl+C quits'
+            ? 'Enter sends • Shift+Tab mode • Alt+V image • Esc cancel turn • Ctrl+C clears / quits'
             : process.platform === 'darwin'
-                ? 'Enter sends • Shift+Tab mode • Ctrl+V image • Esc cancel turn • Ctrl+C quits'
-                : 'Enter sends • Shift+Tab mode • Ctrl+V image • Esc cancel turn • Ctrl+C quits';
+                ? 'Enter sends • Shift+Tab mode • Ctrl+V image • Esc cancel turn • Ctrl+C clears / quits'
+                : 'Enter sends • Shift+Tab mode • Ctrl+V image • Esc cancel turn • Ctrl+C clears / quits';
     const agentLabel = agentModeLabel(state.agentMode).padEnd(AGENT_MODE_LABEL_WIDTH);
     const tokenUsageText = state.tokenUsage || formatClientTokenUsage(null);
     const footerSpans = [

package/dist/src/ui/tui/shell-input.js

@@ -9,6 +9,17 @@ function isClipboardImagePasteKey(key) {
     }
     return key.ctrl && key.input === 'v' && !key.shift && !key.meta;
 }
+function composerIsEmpty(state) {
+    return (!state.input &&
+        state.cursor === 0 &&
+        state.pastedChunks.length === 0 &&
+        state.promptHistoryCursor === null);
+}
+function composerHasDiscardableDraft(state) {
+    if (!composerIsEmpty(state))
+        return true;
+    return !state.busy && state.imageAttachments.length > 0;
+}
 function shouldShowCommandPalette(state) {
     if (state.busy ||
         state.exiting ||
@@ -132,11 +143,41 @@ export function handleShellKeyEvent(store, handlers, event) {
         return;
     const key = event;
     const state = store.getState();
+    const commandPaletteActive = shouldShowCommandPalette(state);
+    const commandSuggestions = commandPaletteActive
+        ? getSlashCommandSuggestions(state.input)
+        : [];
+    const prepareForComposerInputChange = (current, nextInput) => {
+        if (shouldRemountLiveFrameForComposerInputChange(current, nextInput)) {
+            handlers.onLiveFrameShapeChange();
+        }
+    };
     if (key.ctrl && key.input === 'c') {
         if (state.sudoPrompt) {
             handlers.onSudoPasswordInput({ kind: 'cancel' });
             return;
         }
+        if (state.queuedMessage) {
+            handlers.onLiveFrameShapeChange();
+            store.update((current) => ({ ...current, queuedMessage: null }));
+            return;
+        }
+        if (composerHasDiscardableDraft(state)) {
+            store.update((current) => {
+                prepareForComposerInputChange(current, '');
+                return {
+                    ...current,
+                    commandCursor: 0,
+                    cursor: 0,
+                    imageAttachments: current.busy ? current.imageAttachments : [],
+                    input: '',
+                    pastedChunks: [],
+                    promptHistoryCursor: null,
+                    promptHistoryDraft: '',
+                };
+            });
+            return;
+        }
         if (handlers.onCtrlC) {
             handlers.onCtrlC();
             return;
@@ -144,15 +185,6 @@ export function handleShellKeyEvent(store, handlers, event) {
         handlers.onRequestExit();
         return;
     }
-    const commandPaletteActive = shouldShowCommandPalette(state);
-    const commandSuggestions = commandPaletteActive
-        ? getSlashCommandSuggestions(state.input)
-        : [];
-    const prepareForComposerInputChange = (current, nextInput) => {
-        if (shouldRemountLiveFrameForComposerInputChange(current, nextInput)) {
-            handlers.onLiveFrameShapeChange();
-        }
-    };
     if (state.sudoPrompt) {
         if (key.escape) {
             handlers.onSudoPasswordInput({ kind: 'cancel' });
@@ -317,10 +349,7 @@ export function handleShellKeyEvent(store, handlers, event) {
             return;
         }
         store.update((current) => {
-            if (!current.input &&
-                current.cursor === 0 &&
-                current.pastedChunks.length === 0 &&
-                current.promptHistoryCursor === null) {
+            if (composerIsEmpty(current)) {
                 return current;
             }
             prepareForComposerInputChange(current, '');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@thegitai/cli",
-  "version": "1.0.0-preview.6",
+  "version": "1.0.0-preview.7",
   "description": "TheGitAI is an AI coding agent for your terminal. It indexes your repository, writes and edits files, runs commands, and builds features with you.",
   "keywords": [
     "ai",
@@ -37,10 +37,10 @@
     "@lydell/node-pty-linux-x64": "1.1.0",
     "@lydell/node-pty-win32-arm64": "1.1.0",
     "@lydell/node-pty-win32-x64": "1.1.0",
-    "@thegitai/tui-darwin-arm64": "1.0.0-preview.6",
-    "@thegitai/tui-darwin-x64": "1.0.0-preview.6",
-    "@thegitai/tui-linux-x64": "1.0.0-preview.6",
-    "@thegitai/tui-win32-x64": "1.0.0-preview.6",
+    "@thegitai/tui-darwin-arm64": "1.0.0-preview.7",
+    "@thegitai/tui-darwin-x64": "1.0.0-preview.7",
+    "@thegitai/tui-linux-x64": "1.0.0-preview.7",
+    "@thegitai/tui-win32-x64": "1.0.0-preview.7",
     "@vscode/ripgrep": "1.18.0"
   },
   "publishConfig": {