Merge branch 'main' into feature/changelog

Author: hqwlkj

packages/cli/src/cli-args.ts

@@ -6,7 +6,7 @@
 import type { Argv } from "yargs";
 import Yargs from "yargs";
 import { getCliVersion } from "./utils/version";
-import { writeStderrLine } from "./utils/stdioHelpers";
+import { writeStderrLine } from "./utils/stdio-helpers";
 import { hideBin } from "yargs/helpers";
 
 // UUID v4 regex pattern for validation

packages/cli/src/cli.tsx

@@ -7,7 +7,7 @@ import { setShellIfWindows, getProjectCode } from "@vegamo/deepcode-core";
 import { checkForNpmUpdate, promptForPendingUpdate } from "./common/update-check";
 import { AppContainer } from "./ui";
 import { parseArguments } from "./cli-args";
-import { writeStderrLine, writeStdoutLine } from "./utils/stdioHelpers";
+import { writeStderrLine, writeStdoutLine } from "./utils/stdio-helpers";
 import { getPackageJson } from "./utils/package";
 import { CLI_VERSION } from "./generated/git-commit";
 

packages/cli/src/tests/exit-summary.test.ts

@@ -1,6 +1,6 @@
 import { test } from "node:test";
 import assert from "node:assert/strict";
-import { buildExitSummaryText } from "../ui";
+import { buildExitSummaryText, buildResumeHintText } from "../ui";
 import type { ModelUsage, SessionEntry } from "@vegamo/deepcode-core";
 
 const stripAnsi = (text: string): string => text.replace(/\u001b\[[0-9;]*[a-zA-Z]/g, "");
@@ -90,7 +90,7 @@ test("buildExitSummaryText does not derive usage rows from legacy aggregate usag
   assert.doesNotMatch(summary, /11,966/);
 });
 
-test("buildExitSummaryText shows resume hint when sessionId is provided", () => {
+test("buildExitSummaryText does not show resume hint when sessionId is provided", () => {
   const sessionId = "0a5cb7a5-c39d-4c39-a11b-05f8b22b8df6";
   const summary = stripAnsi(
     buildExitSummaryText({
@@ -100,8 +100,8 @@ test("buildExitSummaryText shows resume hint when sessionId is provided", () =>
   );
 
   assert.match(summary, /Goodbye!/);
-  assert.match(summary, /deepcode --resume 0a5cb7a5-c39d-4c39-a11b-05f8b22b8df6/);
-  assert.match(summary, /To continue this session/);
+  assert.doesNotMatch(summary, /deepcode --resume 0a5cb7a5-c39d-4c39-a11b-05f8b22b8df6/);
+  assert.doesNotMatch(summary, /To continue this session/);
 });
 
 test("buildExitSummaryText does not show resume hint when sessionId is omitted", () => {
@@ -116,7 +116,7 @@ test("buildExitSummaryText does not show resume hint when sessionId is omitted",
   assert.doesNotMatch(summary, /To continue this session/);
 });
 
-test("buildExitSummaryText shows resume hint with null session", () => {
+test("buildExitSummaryText does not show resume hint with null session", () => {
   const summary = stripAnsi(
     buildExitSummaryText({
       session: null,
@@ -125,7 +125,18 @@ test("buildExitSummaryText shows resume hint with null session", () => {
   );
 
   assert.match(summary, /Goodbye!/);
-  assert.match(summary, /deepcode --resume test-session-id/);
+  assert.doesNotMatch(summary, /deepcode --resume test-session-id/);
+  assert.doesNotMatch(summary, /To continue this session/);
+});
+
+test("buildResumeHintText shows resume command when sessionId is provided", () => {
+  const hint = stripAnsi(buildResumeHintText("0a5cb7a5-c39d-4c39-a11b-05f8b22b8df6") ?? "");
+
+  assert.equal(hint, "To continue this session, run deepcode --resume 0a5cb7a5-c39d-4c39-a11b-05f8b22b8df6");
+});
+
+test("buildResumeHintText returns null when sessionId is omitted", () => {
+  assert.equal(buildResumeHintText(), null);
 });
 
 function buildSession(usage: ModelUsage | null, usagePerModel: Record<string, ModelUsage> | null = null): SessionEntry {

packages/cli/src/tests/message-view.test.ts

@@ -127,12 +127,19 @@ test("renderMessageToStdout shows (no content) for empty user messages", () => {
 });
 
 test("MessageView echoes submitted user prompts with live prompt wrapping width", () => {
-  assert.equal(getPromptEchoContentWidth(8), 6);
+  assert.equal(getPromptEchoContentWidth(8), 5);
 
   const msg = makeSessionMessage({ role: "user", content: "abcdefg" });
   const output = renderToString(React.createElement(MessageView, { message: msg, width: 8 }), { columns: 8 });
 
-  assert.equal(stripAnsi(output), "> abcdef\n  g\n");
+  const text = stripAnsi(output);
+  assert.equal(text, " > abcde\n   fg\n");
+  assert.ok(
+    text
+      .trimEnd()
+      .split("\n")
+      .every((line) => line.length <= 8)
+  );
 });
 
 test("MessageView echoes model changes with submitted prompt wrapping", () => {
@@ -143,7 +150,14 @@ test("MessageView echoes model changes with submitted prompt wrapping", () => {
   });
   const output = renderToString(React.createElement(MessageView, { message: msg, width: 8 }), { columns: 8 });
 
-  assert.equal(stripAnsi(output), "> abcdef\n  gh\n");
+  const text = stripAnsi(output);
+  assert.equal(text, " > abcde\n   fgh\n");
+  assert.ok(
+    text
+      .trimEnd()
+      .split("\n")
+      .every((line) => line.length <= 8)
+  );
 });
 
 test("renderMessageToStdout renders assistant non-thinking messages with ✦", () => {

packages/cli/src/ui/components/MessageView/index.tsx

@@ -13,6 +13,7 @@ import type { DiffPreviewLine, MessageViewProps } from "./types";
 import { RawMode, useRawModeContext } from "../../contexts";
 
 const PROMPT_ECHO_PREFIX_WIDTH = 2;
+const PROMPT_ECHO_MARGIN_LEFT = 1;
 
 export function MessageView({ message, collapsed, width = 80 }: MessageViewProps): React.ReactElement | null {
   const { mode } = useRawModeContext();
@@ -131,7 +132,7 @@ export function MessageView({ message, collapsed, width = 80 }: MessageViewProps
 }
 
 export function getPromptEchoContentWidth(width: number): number {
-  return Math.max(1, width - PROMPT_ECHO_PREFIX_WIDTH);
+  return Math.max(1, width - PROMPT_ECHO_MARGIN_LEFT - PROMPT_ECHO_PREFIX_WIDTH);
 }
 
 function PromptEchoLine({
@@ -144,8 +145,9 @@ function PromptEchoLine({
   attachmentCount?: number;
 }): React.ReactElement {
   const contentWidth = getPromptEchoContentWidth(width);
+  const containerWidth = Math.max(1, width - PROMPT_ECHO_MARGIN_LEFT);
   return (
-    <Box marginBottom={1} marginY={0} width={Math.max(1, width)} flexDirection="row">
+    <Box marginBottom={1} marginLeft={PROMPT_ECHO_MARGIN_LEFT} marginY={0} width={containerWidth} flexDirection="row">
       <Box width={PROMPT_ECHO_PREFIX_WIDTH}>
         <Text color="#229ac3">{"> "}</Text>
       </Box>

packages/cli/src/ui/exit-summary.ts

@@ -68,7 +68,7 @@ function extractUsageFields(usage: ModelUsage | null): UsageFields {
 }
 
 export function buildExitSummaryText(input: ExitSummaryInput): string {
-  const { session, sessionId } = input;
+  const { session } = input;
 
   const innerWidth = 98;
   const contentWidth = innerWidth - 4; // "│  " prefix + "  │" suffix → 4 chars padding
@@ -135,13 +135,6 @@ export function buildExitSummaryText(input: ExitSummaryInput): string {
 
   rows.push("");
 
-  if (sessionId) {
-    const resumeHint =
-      chalk.dim(`To continue this session, run `) + chalk.hex("#229ac3")(`deepcode --resume ${sessionId}`);
-    rows.push(resumeHint);
-    rows.push("");
-  }
-
   const border = borderColor("─".repeat(innerWidth));
   const top = `${borderColor("╭")}${border}${borderColor("╮")}`;
   const bottom = `${borderColor("╰")}${border}${borderColor("╯")}`;
@@ -150,3 +143,10 @@ export function buildExitSummaryText(input: ExitSummaryInput): string {
 
   return [top, body, bottom].join("\n");
 }
+
+export function buildResumeHintText(sessionId?: string): string | null {
+  if (!sessionId) {
+    return null;
+  }
+  return chalk.dim(`To continue this session, run `) + chalk.hex("#229ac3")(`deepcode --resume ${sessionId}`);
+}

packages/cli/src/ui/index.ts

@@ -90,4 +90,4 @@ export {
   type FileMentionToken,
 } from "./core/file-mentions";
 export { findExpandedThinkingId, isCollapsedThinking } from "./core/thinking-state";
-export { buildExitSummaryText } from "./exit-summary";
+export { buildExitSummaryText, buildResumeHintText } from "./exit-summary";

packages/cli/src/ui/views/App.tsx

@@ -20,7 +20,7 @@ import {
   formatAskUserQuestionAnswers,
 } from "../core/ask-user-question";
 import { PermissionPrompt, type PermissionPromptResult } from "./PermissionPrompt";
-import { buildExitSummaryText } from "../exit-summary";
+import { buildExitSummaryText, buildResumeHintText } from "../exit-summary";
 import { RawMode, useRawModeContext } from "../contexts";
 import { renderMessageToStdout } from "../components/MessageView/utils";
 import {
@@ -290,22 +290,40 @@ function App({ projectRoot, initialPrompt, resumeSessionId, onRestart }: AppProp
   }, [sessionManager]);
 
   writeRef.current = write;
-  const handlePrompt = useCallback(
-    async (submission: PromptSubmission) => {
-      if (submission.command === "exit") {
-        setIsExiting(true);
-        setTimeout(() => {
-          const activeSessionId = sessionManager.getActiveSessionId();
-          const session = activeSessionId ? sessionManager.getSession(activeSessionId) : null;
-          const summary = buildExitSummaryText({ session, sessionId: activeSessionId ?? undefined });
-          process.stdout.write("\n");
+  const handleExit = useCallback(
+    ({ showCommand, showSummary }: { showCommand: boolean; showSummary: boolean }) => {
+      setIsExiting(true);
+      setTimeout(() => {
+        const activeSessionId = sessionManager.getActiveSessionId();
+        const session = activeSessionId ? sessionManager.getSession(activeSessionId) : null;
+        const resumeHint = buildResumeHintText(activeSessionId ?? undefined);
+
+        process.stdout.write("\n");
+        if (showCommand) {
           process.stdout.write(chalk.rgb(34, 154, 195)("> /exit "));
           process.stdout.write("\n\n");
+        }
+        if (showSummary) {
+          const summary = buildExitSummaryText({ session, sessionId: activeSessionId ?? undefined });
           process.stdout.write(summary);
           process.stdout.write("\n\n");
-          sessionManager.dispose();
-          exit();
-        }, 0);
+        }
+        if (resumeHint) {
+          process.stdout.write(resumeHint);
+          process.stdout.write("\n");
+        }
+
+        sessionManager.dispose();
+        exit();
+      }, 0);
+    },
+    [exit, sessionManager]
+  );
+
+  const handlePrompt = useCallback(
+    async (submission: PromptSubmission) => {
+      if (submission.command === "exit") {
+        handleExit({ showCommand: true, showSummary: true });
         return;
       }
       if (submission.command === "new") {
@@ -400,7 +418,7 @@ function App({ projectRoot, initialPrompt, resumeSessionId, onRestart }: AppProp
     [
       sessionManager,
       pendingPermissionReply,
-      exit,
+      handleExit,
       onRestart,
       refreshSkills,
       refreshSessionsList,
@@ -477,6 +495,10 @@ function App({ projectRoot, initialPrompt, resumeSessionId, onRestart }: AppProp
     [handlePrompt]
   );
 
+  const handleExitShortcut = useCallback(() => {
+    handleExit({ showCommand: false, showSummary: false });
+  }, [handleExit]);
+
   const reloadActiveSessionView = useCallback(
     (sessionId: string): void => {
       resetStaticView(loadVisibleMessages(sessionManager, sessionId), { clearScreen: true });
@@ -959,6 +981,7 @@ function App({ projectRoot, initialPrompt, resumeSessionId, onRestart }: AppProp
           onRawModeChange={handleRawModeChange}
           onInterrupt={handleInterrupt}
           onToggleProcessStdout={handleToggleProcessStdout}
+          onExitShortcut={handleExitShortcut}
           placeholder="Type your message..."
           statusLineSegments={statusLineSegments}
           statusLineSeparator={resolvedSettings.statusline.separator}

packages/cli/src/ui/views/PromptInput.tsx

@@ -1,5 +1,5 @@
 import React, { useEffect, useMemo, useRef, useState } from "react";
-import { Box, Text, useApp, useStdout } from "ink";
+import { Box, Text, useStdout } from "ink";
 import type { DOMElement } from "ink";
 import chalk from "chalk";
 import { ARGS_SEPARATOR } from "../constants";
@@ -101,6 +101,7 @@ type Props = {
   onRawModeChange?: (mode: string) => void;
   onInterrupt: () => void;
   onToggleProcessStdout?: () => void;
+  onExitShortcut?: () => void;
 };
 
 const PROMPT_PREFIX_WIDTH = 2;
@@ -132,9 +133,9 @@ export const PromptInput = React.memo(function PromptInput({
   onModelConfigChange,
   onInterrupt,
   onToggleProcessStdout,
+  onExitShortcut,
   onRawModeChange,
 }: Props): React.ReactElement {
-  const { exit } = useApp();
   const { stdout } = useStdout();
   const inputTextRef = useRef<DOMElement | null>(null);
   const [buffer, setBuffer] = useState<PromptBufferState>(EMPTY_BUFFER);
@@ -357,7 +358,7 @@ export const PromptInput = React.memo(function PromptInput({
         }
         const now = Date.now();
         if (pendingExit && now - lastCtrlDAt.current < 2000) {
-          exit();
+          onExitShortcut?.();
           return;
         }
         lastCtrlDAt.current = now;

packages/cli/src/utils/package.ts

@@ -3,11 +3,7 @@ import { fileURLToPath } from "node:url";
 import path from "node:path";
 import { CLI_VERSION } from "../generated/git-commit";
 
-export type PackageJson = BasePackageJson & {
-  config?: {
-    sandboxImageUri?: string;
-  };
-};
+export type PackageJson = BasePackageJson;
 
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);