Skip to content

Commit 0794d3f

Browse files
brandonkachenbrandonkachen
committed
Polish CLI exit flow, input handling, and logging
1 parent 6e791c0 commit 0794d3f

File tree

9 files changed

+136
-61
lines changed

9 files changed

+136
-61
lines changed

‎cli/package.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
"release": "bun run scripts/release.ts",
2222
"start": "bun run dist/index.js",
2323
"test": "bun test",
24+
"test:e2e": "bun test src/__tests__/e2e/*.test.ts --timeout 180000",
2425
"test:tmux-poc": "bun run src/__tests__/tmux-poc.ts",
2526
"typecheck": "tsc --noEmit -p ."
2627
},

‎cli/src/__tests__/e2e/logout-relogin-flow.test.ts‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,9 @@ import type * as AuthModule from '../../utils/auth'
2222

2323
type User = AuthModule.User
2424

25+
// Disable file logging in this isolated helper test to avoid filesystem race conditions
26+
process.env.CODEBUFF_DISABLE_FILE_LOGS = 'true'
27+
2528
const ORIGINAL_USER: User = {
2629
id: 'user-001',
2730
name: 'CLI Tester',

‎cli/src/__tests__/e2e/test-cli-utils.ts‎

Lines changed: 31 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,16 @@ export function createTestCredentials(credentialsDir: string, user: E2ETestUser)
3636
fs.mkdirSync(credentialsDir, { recursive: true })
3737
}
3838

39-
const credentialsPath = path.join(credentialsDir, 'credentials.json')
39+
// Write credentials to the same location the CLI reads from:
40+
// $HOME/.config/manicode-<env>/credentials.json
41+
const configDir = path.join(
42+
credentialsDir,
43+
'.config',
44+
`manicode-${process.env.NEXT_PUBLIC_CB_ENVIRONMENT || 'test'}`,
45+
)
46+
fs.mkdirSync(configDir, { recursive: true })
47+
48+
const credentialsPath = path.join(configDir, 'credentials.json')
4049
const credentials = {
4150
default: {
4251
id: user.id,
@@ -47,6 +56,10 @@ export function createTestCredentials(credentialsDir: string, user: E2ETestUser)
4756
}
4857

4958
fs.writeFileSync(credentialsPath, JSON.stringify(credentials, null, 2))
59+
60+
// Also drop a convenience copy at the root for debugging
61+
const legacyPath = path.join(credentialsDir, 'credentials.json')
62+
fs.writeFileSync(legacyPath, JSON.stringify(credentials, null, 2))
5063
return credentialsPath
5164
}
5265

@@ -90,18 +103,19 @@ export async function launchAuthenticatedCLI(options: {
90103

91104
// Build e2e-specific environment
92105
const e2eEnv: Record<string, string> = {
93-
...process.env as Record<string, string>,
106+
...(process.env as Record<string, string>),
94107
...baseEnv,
95108
// Point to e2e server
96109
NEXT_PUBLIC_CODEBUFF_BACKEND_URL: server.backendUrl,
97110
NEXT_PUBLIC_CODEBUFF_APP_URL: server.url,
98111
// Use test environment
99112
NEXT_PUBLIC_CB_ENVIRONMENT: 'test',
100-
// Override config directory to use our test credentials
101-
HOME: path.dirname(credentialsDir),
102-
XDG_CONFIG_HOME: credentialsDir,
113+
// Override config directory to use our test credentials (isolated per session)
114+
HOME: credentialsDir,
115+
XDG_CONFIG_HOME: path.join(credentialsDir, '.config'),
103116
// Provide auth token via environment (fallback)
104117
CODEBUFF_API_KEY: user.authToken,
118+
CODEBUFF_DISABLE_FILE_LOGS: 'true',
105119
// Disable analytics
106120
NEXT_PUBLIC_POSTHOG_API_KEY: '',
107121
}
@@ -115,6 +129,18 @@ export async function launchAuthenticatedCLI(options: {
115129
env: e2eEnv,
116130
cwd: process.cwd(),
117131
})
132+
const originalPress = cli.press.bind(cli)
133+
cli.type = async (text: string) => {
134+
for (const char of text) {
135+
// Send each keypress with a small delay to avoid dropped keystrokes in the TUI
136+
if (char === ' ') {
137+
await originalPress('space')
138+
} else {
139+
await originalPress(char as any)
140+
}
141+
await sleep(15)
142+
}
143+
}
118144

119145
return {
120146
cli,

‎cli/src/commands/command-registry.ts‎

Lines changed: 29 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import { handleUsageCommand } from './usage'
77
import { useChatStore } from '../state/chat-store'
88
import { useLoginStore } from '../state/login-store'
99
import { capturePendingImages } from '../utils/add-pending-image'
10+
import { flushAnalytics } from '../utils/analytics'
1011
import { getSystemMessage, getUserMessage } from '../utils/message-history'
1112

1213
import type { MultilineInputHandle } from '../components/multiline-input'
@@ -171,8 +172,34 @@ export const COMMAND_REGISTRY: CommandDefinition[] = [
171172
{
172173
name: 'exit',
173174
aliases: ['quit', 'q'],
174-
handler: () => {
175-
process.kill(process.pid, 'SIGINT')
175+
handler: (params) => {
176+
params.abortControllerRef.current?.abort()
177+
const trimmed = params.inputValue.trim()
178+
if (trimmed) {
179+
params.setMessages((prev) => [...prev, getUserMessage(trimmed)])
180+
params.saveToHistory(trimmed)
181+
}
182+
params.setMessages((prev) => [
183+
...prev,
184+
getSystemMessage('Exiting... Goodbye!'),
185+
])
186+
params.setInputValue({
187+
text: '',
188+
cursorPosition: 0,
189+
lastEditDueToNav: false,
190+
})
191+
params.setCanProcessQueue(false)
192+
params.stopStreaming()
193+
194+
// Allow the message to render, then flush analytics and exit the process
195+
setTimeout(() => {
196+
const flushed = flushAnalytics()
197+
if (flushed && typeof (flushed as Promise<void>).finally === 'function') {
198+
;(flushed as Promise<void>).finally(() => process.kill(process.pid, 'SIGINT'))
199+
} else {
200+
process.kill(process.pid, 'SIGINT')
201+
}
202+
}, 50)
176203
},
177204
},
178205
{

‎cli/src/components/chat-input-bar.tsx‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,13 @@ export const ChatInputBar = ({
139139
return false
140140
}
141141

142-
if (isPlainEnter || isTab || isUpDown) {
142+
// Allow Enter to fall through when only slash suggestions are showing so slash
143+
// commands submit without an extra keypress. Keep intercepting for mention menus.
144+
if (isPlainEnter) {
145+
return hasMentionSuggestions
146+
}
147+
148+
if (isTab || isUpDown) {
143149
return true
144150
}
145151
return false

‎cli/src/project-files.ts‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,9 @@ export function setProjectRoot(dir: string) {
1717

1818
export function getProjectRoot() {
1919
if (!projectRoot) {
20-
throw new Error('Project root not set')
20+
// Fallback to the current working directory when the app has not been
21+
// initialized yet (e.g., in isolated helper tests).
22+
projectRoot = process.cwd()
2123
}
2224
return projectRoot
2325
}

‎cli/src/utils/__tests__/keyboard-actions.test.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -247,9 +247,9 @@ describe('resolveChatKeyboardAction', () => {
247247
})
248248
})
249249

250-
test('enter selects', () => {
250+
test('enter submits (no menu intercept)', () => {
251251
expect(resolveChatKeyboardAction(enterKey, slashMenuState)).toEqual({
252-
type: 'slash-menu-select',
252+
type: 'none',
253253
})
254254
})
255255

‎cli/src/utils/keyboard-actions.ts‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -198,9 +198,6 @@ export function resolveChatKeyboardAction(
198198
? { type: 'slash-menu-tab' }
199199
: { type: 'slash-menu-select' }
200200
}
201-
if (isEnter) {
202-
return { type: 'slash-menu-select' }
203-
}
204201
}
205202

206203
// Priority 7: Mention menu navigation (when active)

‎cli/src/utils/logger.ts‎

Lines changed: 60 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,8 @@ function isEmptyObject(value: any): boolean {
3838
}
3939

4040
function setLogPath(p: string): void {
41-
if (p === logPath) return // nothing to do
41+
// Recreate logger if the target changed or was removed between runs
42+
if (p === logPath && existsSync(p)) return // nothing to do
4243

4344
logPath = p
4445
mkdirSync(dirname(p), { recursive: true })
@@ -94,59 +95,71 @@ function sendAnalyticsAndLog(
9495
msg?: string,
9596
...args: any[]
9697
): void {
97-
if (
98-
process.env.CODEBUFF_GITHUB_ACTIONS !== 'true' &&
99-
env.NEXT_PUBLIC_CB_ENVIRONMENT !== 'test'
100-
) {
101-
const projectRoot = getProjectRoot()
102-
103-
const logTarget =
104-
env.NEXT_PUBLIC_CB_ENVIRONMENT === 'dev'
105-
? path.join(projectRoot, 'debug', 'cli.log')
106-
: path.join(getCurrentChatDir(), 'log.jsonl')
107-
108-
setLogPath(logTarget)
98+
if (process.env.CODEBUFF_DISABLE_FILE_LOGS === 'true') {
99+
return
109100
}
101+
try {
102+
if (
103+
process.env.CODEBUFF_GITHUB_ACTIONS !== 'true' &&
104+
env.NEXT_PUBLIC_CB_ENVIRONMENT !== 'test'
105+
) {
106+
const projectRoot = getProjectRoot()
107+
108+
const logTarget =
109+
env.NEXT_PUBLIC_CB_ENVIRONMENT === 'dev'
110+
? path.join(projectRoot, 'debug', 'cli.log')
111+
: path.join(getCurrentChatDir(), 'log.jsonl')
112+
113+
setLogPath(logTarget)
114+
}
110115

111-
const isStringOnly = typeof data === 'string' && msg === undefined
112-
const normalizedData = isStringOnly ? undefined : data
113-
const normalizedMsg = isStringOnly ? (data as string) : msg
114-
const includeData = normalizedData != null && !isEmptyObject(normalizedData)
115-
116-
const toTrack = {
117-
...(includeData ? { data: normalizedData } : {}),
118-
level,
119-
loggerContext,
120-
msg: stringFormat(normalizedMsg, ...args),
121-
}
116+
const isStringOnly = typeof data === 'string' && msg === undefined
117+
const normalizedData = isStringOnly ? undefined : data
118+
const normalizedMsg = isStringOnly ? (data as string) : msg
119+
const includeData =
120+
normalizedData != null && !isEmptyObject(normalizedData)
122121

123-
logAsErrorIfNeeded(toTrack)
124-
125-
logOrStore: if (
126-
env.NEXT_PUBLIC_CB_ENVIRONMENT !== 'dev' &&
127-
normalizedData &&
128-
typeof normalizedData === 'object' &&
129-
'eventId' in normalizedData &&
130-
Object.values(AnalyticsEvent).includes((normalizedData as any).eventId)
131-
) {
132-
const analyticsEventId = data.eventId as AnalyticsEvent
133-
// Not accurate for anonymous users
134-
if (!loggerContext.userId) {
135-
analyticsBuffer.push({ analyticsEventId, toTrack })
136-
break logOrStore
122+
const toTrack = {
123+
...(includeData ? { data: normalizedData } : {}),
124+
level,
125+
loggerContext,
126+
msg: stringFormat(normalizedMsg, ...args),
137127
}
138128

139-
for (const item of analyticsBuffer) {
140-
trackEvent(item.analyticsEventId, item.toTrack)
129+
logAsErrorIfNeeded(toTrack)
130+
131+
logOrStore: if (
132+
env.NEXT_PUBLIC_CB_ENVIRONMENT !== 'dev' &&
133+
normalizedData &&
134+
typeof normalizedData === 'object' &&
135+
'eventId' in normalizedData &&
136+
Object.values(AnalyticsEvent).includes((normalizedData as any).eventId)
137+
) {
138+
const analyticsEventId = data.eventId as AnalyticsEvent
139+
// Not accurate for anonymous users
140+
if (!loggerContext.userId) {
141+
analyticsBuffer.push({ analyticsEventId, toTrack })
142+
break logOrStore
143+
}
144+
145+
for (const item of analyticsBuffer) {
146+
trackEvent(item.analyticsEventId, item.toTrack)
147+
}
148+
analyticsBuffer.length = 0
149+
trackEvent(analyticsEventId, toTrack)
141150
}
142-
analyticsBuffer.length = 0
143-
trackEvent(analyticsEventId, toTrack)
144-
}
145151

146-
if (pinoLogger !== undefined) {
147-
const base = { ...loggerContext }
148-
const obj = includeData ? { ...base, data: normalizedData } : base
149-
pinoLogger[level](obj, normalizedMsg as any, ...args)
152+
if (pinoLogger !== undefined) {
153+
try {
154+
const base = { ...loggerContext }
155+
const obj = includeData ? { ...base, data: normalizedData } : base
156+
pinoLogger[level](obj, normalizedMsg as any, ...args)
157+
} catch {
158+
// Ignore logging errors so they never interrupt CLI flow/tests
159+
}
160+
}
161+
} catch {
162+
// Swallow all logging errors in tests to avoid noisy failures
150163
}
151164
}
152165

0 commit comments

Comments
 (0)