diff --git a/src/commands/add-dir/add-dir.tsx b/src/commands/add-dir/add-dir.tsx index 49304d2dc..cfb6c6687 100644 --- a/src/commands/add-dir/add-dir.tsx +++ b/src/commands/add-dir/add-dir.tsx @@ -1,125 +1,154 @@ -import { c as _c } from "react/compiler-runtime"; -import chalk from 'chalk'; -import figures from 'figures'; -import React, { useEffect } from 'react'; -import { getAdditionalDirectoriesForClaudeMd, setAdditionalDirectoriesForClaudeMd } from '../../bootstrap/state.js'; -import type { LocalJSXCommandContext } from '../../commands.js'; -import { MessageResponse } from '../../components/MessageResponse.js'; -import { AddWorkspaceDirectory } from '../../components/permissions/rules/AddWorkspaceDirectory.js'; -import { Box, Text } from '../../ink.js'; -import type { LocalJSXCommandOnDone } from '../../types/command.js'; -import { applyPermissionUpdate, persistPermissionUpdate } from '../../utils/permissions/PermissionUpdate.js'; -import type { PermissionUpdateDestination } from '../../utils/permissions/PermissionUpdateSchema.js'; -import { SandboxManager } from '../../utils/sandbox/sandbox-adapter.js'; -import { addDirHelpMessage, validateDirectoryForWorkspace } from './validation.js'; -function AddDirError(t0) { - const $ = _c(10); - const { - message, - args, - onDone - } = t0; - let t1; - let t2; - if ($[0] !== onDone) { - t1 = () => { - const timer = setTimeout(onDone, 0); - return () => clearTimeout(timer); - }; - t2 = [onDone]; - $[0] = onDone; - $[1] = t1; - $[2] = t2; - } else { - t1 = $[1]; - t2 = $[2]; - } - useEffect(t1, t2); - let t3; - if ($[3] !== args) { - t3 = {figures.pointer} /add-dir {args}; - $[3] = args; - $[4] = t3; - } else { - t3 = $[4]; - } - let t4; - if ($[5] !== message) { - t4 = {message}; - $[5] = message; - $[6] = t4; - } else { - t4 = $[6]; - } - let t5; - if ($[7] !== t3 || $[8] !== t4) { - t5 = {t3}{t4}; - $[7] = t3; - $[8] = t4; - $[9] = t5; - } else { - t5 = $[9]; - } - return t5; +import chalk from 'chalk' +import figures from 'figures' +import React, { useEffect } from 'react' +import { + getAdditionalDirectoriesForClaudeMd, + setAdditionalDirectoriesForClaudeMd, +} from '../../bootstrap/state.js' +import type { LocalJSXCommandContext } from '../../commands.js' +import { MessageResponse } from '../../components/MessageResponse.js' +import { AddWorkspaceDirectory } from '../../components/permissions/rules/AddWorkspaceDirectory.js' +import { Box, Text } from '../../ink.js' +import type { LocalJSXCommandOnDone } from '../../types/command.js' +import { + applyPermissionUpdate, + persistPermissionUpdate, +} from '../../utils/permissions/PermissionUpdate.js' +import type { PermissionUpdateDestination } from '../../utils/permissions/PermissionUpdateSchema.js' +import { SandboxManager } from '../../utils/sandbox/sandbox-adapter.js' +import { + addDirHelpMessage, + validateDirectoryForWorkspace, +} from './validation.js' + +function AddDirError({ + message, + args, + onDone, +}: { + message: string + args: string + onDone: () => void +}): React.ReactNode { + useEffect(() => { + // We need to defer calling onDone to avoid the "return null" bug where + // the component unmounts before React can render the error message. + // Using setTimeout ensures the error displays before the command exits. + const timer = setTimeout(onDone, 0) + return () => clearTimeout(timer) + }, [onDone]) + + return ( + + + {figures.pointer} /add-dir {args} + + + {message} + + + ) } -export async function call(onDone: LocalJSXCommandOnDone, context: LocalJSXCommandContext, args?: string): Promise { - const directoryPath = (args ?? '').trim(); - const appState = context.getAppState(); + +export async function call( + onDone: LocalJSXCommandOnDone, + context: LocalJSXCommandContext, + args?: string, +): Promise { + const directoryPath = (args ?? '').trim() + const appState = context.getAppState() // Helper to handle adding a directory (shared by both with-path and no-path cases) const handleAddDirectory = async (path: string, remember = false) => { - const destination: PermissionUpdateDestination = remember ? 'localSettings' : 'session'; + const destination: PermissionUpdateDestination = remember + ? 'localSettings' + : 'session' + const permissionUpdate = { type: 'addDirectories' as const, directories: [path], - destination - }; + destination, + } // Apply to session context - const latestAppState = context.getAppState(); - const updatedContext = applyPermissionUpdate(latestAppState.toolPermissionContext, permissionUpdate); + const latestAppState = context.getAppState() + const updatedContext = applyPermissionUpdate( + latestAppState.toolPermissionContext, + permissionUpdate, + ) context.setAppState(prev => ({ ...prev, - toolPermissionContext: updatedContext - })); + toolPermissionContext: updatedContext, + })) // Update sandbox config so Bash commands can access the new directory. // Bootstrap state is the source of truth for session-only dirs; persisted // dirs are picked up via the settings subscription, but we refresh // eagerly here to avoid a race when the user acts immediately. - const currentDirs = getAdditionalDirectoriesForClaudeMd(); + const currentDirs = getAdditionalDirectoriesForClaudeMd() if (!currentDirs.includes(path)) { - setAdditionalDirectoriesForClaudeMd([...currentDirs, path]); + setAdditionalDirectoriesForClaudeMd([...currentDirs, path]) } - SandboxManager.refreshConfig(); - let message: string; + SandboxManager.refreshConfig() + + let message: string + if (remember) { try { - persistPermissionUpdate(permissionUpdate); - message = `Added ${chalk.bold(path)} as a working directory and saved to local settings`; + persistPermissionUpdate(permissionUpdate) + message = `Added ${chalk.bold(path)} as a working directory and saved to local settings` } catch (error) { - message = `Added ${chalk.bold(path)} as a working directory. Failed to save to local settings: ${error instanceof Error ? error.message : 'Unknown error'}`; + message = `Added ${chalk.bold(path)} as a working directory. Failed to save to local settings: ${error instanceof Error ? error.message : 'Unknown error'}` } } else { - message = `Added ${chalk.bold(path)} as a working directory for this session`; + message = `Added ${chalk.bold(path)} as a working directory for this session` } - const messageWithHint = `${message} ${chalk.dim('· /permissions to manage')}`; - onDone(messageWithHint); - }; + + const messageWithHint = `${message} ${chalk.dim('· /permissions to manage')}` + onDone(messageWithHint) + } // When no path is provided, show AddWorkspaceDirectory input form directly // and return to REPL after confirmation if (!directoryPath) { - return { - onDone('Did not add a working directory.'); - }} />; + return ( + { + onDone('Did not add a working directory.') + }} + /> + ) } - const result = await validateDirectoryForWorkspace(directoryPath, appState.toolPermissionContext); + + const result = await validateDirectoryForWorkspace( + directoryPath, + appState.toolPermissionContext, + ) + if (result.resultType !== 'success') { - const message = addDirHelpMessage(result); - return onDone(message)} />; + const message = addDirHelpMessage(result) + + return ( + onDone(message)} + /> + ) } - return { - onDone(`Did not add ${chalk.bold(result.absolutePath)} as a working directory.`); - }} />; + + return ( + { + onDone( + `Did not add ${chalk.bold(result.absolutePath)} as a working directory.`, + ) + }} + /> + ) } diff --git a/src/commands/agents/agents.tsx b/src/commands/agents/agents.tsx index 1d2c55974..6a5931756 100644 --- a/src/commands/agents/agents.tsx +++ b/src/commands/agents/agents.tsx @@ -1,11 +1,16 @@ -import * as React from 'react'; -import { AgentsMenu } from '../../components/agents/AgentsMenu.js'; -import type { ToolUseContext } from '../../Tool.js'; -import { getTools } from '../../tools.js'; -import type { LocalJSXCommandOnDone } from '../../types/command.js'; -export async function call(onDone: LocalJSXCommandOnDone, context: ToolUseContext): Promise { - const appState = context.getAppState(); - const permissionContext = appState.toolPermissionContext; - const tools = getTools(permissionContext); - return ; +import * as React from 'react' +import { AgentsMenu } from '../../components/agents/AgentsMenu.js' +import type { ToolUseContext } from '../../Tool.js' +import { getTools } from '../../tools.js' +import type { LocalJSXCommandOnDone } from '../../types/command.js' + +export async function call( + onDone: LocalJSXCommandOnDone, + context: ToolUseContext, +): Promise { + const appState = context.getAppState() + const permissionContext = appState.toolPermissionContext + const tools = getTools(permissionContext) + + return } diff --git a/src/commands/bridge/bridge.tsx b/src/commands/bridge/bridge.tsx index dadf1c89f..33a681202 100644 --- a/src/commands/bridge/bridge.tsx +++ b/src/commands/bridge/bridge.tsx @@ -1,27 +1,40 @@ -import { c as _c } from "react/compiler-runtime"; -import { feature } from 'bun:bundle'; -import { toString as qrToString } from 'qrcode'; -import * as React from 'react'; -import { useEffect, useState } from 'react'; -import { getBridgeAccessToken } from '../../bridge/bridgeConfig.js'; -import { checkBridgeMinVersion, getBridgeDisabledReason, isEnvLessBridgeEnabled } from '../../bridge/bridgeEnabled.js'; -import { checkEnvLessBridgeMinVersion } from '../../bridge/envLessBridgeConfig.js'; -import { BRIDGE_LOGIN_INSTRUCTION, REMOTE_CONTROL_DISCONNECTED_MSG } from '../../bridge/types.js'; -import { Dialog } from '../../components/design-system/Dialog.js'; -import { ListItem } from '../../components/design-system/ListItem.js'; -import { shouldShowRemoteCallout } from '../../components/RemoteCallout.js'; -import { useRegisterOverlay } from '../../context/overlayContext.js'; -import { Box, Text } from '../../ink.js'; -import { useKeybindings } from '../../keybindings/useKeybinding.js'; -import { type AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS, logEvent } from '../../services/analytics/index.js'; -import { useAppState, useSetAppState } from '../../state/AppState.js'; -import type { ToolUseContext } from '../../Tool.js'; -import type { LocalJSXCommandContext, LocalJSXCommandOnDone } from '../../types/command.js'; -import { logForDebugging } from '../../utils/debug.js'; +import { feature } from 'bun:bundle' +import { toString as qrToString } from 'qrcode' +import * as React from 'react' +import { useEffect, useState } from 'react' +import { getBridgeAccessToken } from '../../bridge/bridgeConfig.js' +import { + checkBridgeMinVersion, + getBridgeDisabledReason, + isEnvLessBridgeEnabled, +} from '../../bridge/bridgeEnabled.js' +import { checkEnvLessBridgeMinVersion } from '../../bridge/envLessBridgeConfig.js' +import { + BRIDGE_LOGIN_INSTRUCTION, + REMOTE_CONTROL_DISCONNECTED_MSG, +} from '../../bridge/types.js' +import { Dialog } from '../../components/design-system/Dialog.js' +import { ListItem } from '../../components/design-system/ListItem.js' +import { shouldShowRemoteCallout } from '../../components/RemoteCallout.js' +import { useRegisterOverlay } from '../../context/overlayContext.js' +import { Box, Text } from '../../ink.js' +import { useKeybindings } from '../../keybindings/useKeybinding.js' +import { + type AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS, + logEvent, +} from '../../services/analytics/index.js' +import { useAppState, useSetAppState } from '../../state/AppState.js' +import type { ToolUseContext } from '../../Tool.js' +import type { + LocalJSXCommandContext, + LocalJSXCommandOnDone, +} from '../../types/command.js' +import { logForDebugging } from '../../utils/debug.js' + type Props = { - onDone: LocalJSXCommandOnDone; - name?: string; -}; + onDone: LocalJSXCommandOnDone + name?: string +} /** * /remote-control command — manages the bidirectional bridge connection. @@ -35,392 +48,194 @@ type Props = { * Running /remote-control when already connected shows a dialog with the session * URL and options to disconnect or continue. */ -function BridgeToggle(t0) { - const $ = _c(10); - const { - onDone, - name - } = t0; - const setAppState = useSetAppState(); - const replBridgeConnected = useAppState(_temp); - const replBridgeEnabled = useAppState(_temp2); - const replBridgeOutboundOnly = useAppState(_temp3); - const [showDisconnectDialog, setShowDisconnectDialog] = useState(false); - let t1; - if ($[0] !== name || $[1] !== onDone || $[2] !== replBridgeConnected || $[3] !== replBridgeEnabled || $[4] !== replBridgeOutboundOnly || $[5] !== setAppState) { - t1 = () => { - if ((replBridgeConnected || replBridgeEnabled) && !replBridgeOutboundOnly) { - setShowDisconnectDialog(true); - return; - } - let cancelled = false; - (async () => { - const error = await checkBridgePrerequisites(); - if (cancelled) { - return; - } - if (error) { - logEvent("tengu_bridge_command", { - action: "preflight_failed" as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS - }); - onDone(error, { - display: "system" - }); - return; - } - if (shouldShowRemoteCallout()) { - setAppState(prev => { - if (prev.showRemoteCallout) { - return prev; - } - return { - ...prev, - showRemoteCallout: true, - replBridgeInitialName: name - }; - }); - onDone("", { - display: "system" - }); - return; - } - logEvent("tengu_bridge_command", { - action: "connect" as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS - }); - setAppState(prev_0 => { - if (prev_0.replBridgeEnabled && !prev_0.replBridgeOutboundOnly) { - return prev_0; - } - return { - ...prev_0, - replBridgeEnabled: true, - replBridgeExplicit: true, - replBridgeOutboundOnly: false, - replBridgeInitialName: name - }; - }); - onDone("Remote Control connecting\u2026", { - display: "system" - }); - })(); - return () => { - cancelled = true; - }; - }; - $[0] = name; - $[1] = onDone; - $[2] = replBridgeConnected; - $[3] = replBridgeEnabled; - $[4] = replBridgeOutboundOnly; - $[5] = setAppState; - $[6] = t1; - } else { - t1 = $[6]; - } - let t2; - if ($[7] === Symbol.for("react.memo_cache_sentinel")) { - t2 = []; - $[7] = t2; - } else { - t2 = $[7]; - } - useEffect(t1, t2); - if (showDisconnectDialog) { - let t3; - if ($[8] !== onDone) { - t3 = ; - $[8] = onDone; - $[9] = t3; - } else { - t3 = $[9]; +function BridgeToggle({ onDone, name }: Props): React.ReactNode { + const setAppState = useSetAppState() + const replBridgeConnected = useAppState(s => s.replBridgeConnected) + const replBridgeEnabled = useAppState(s => s.replBridgeEnabled) + const replBridgeOutboundOnly = useAppState(s => s.replBridgeOutboundOnly) + const [showDisconnectDialog, setShowDisconnectDialog] = useState(false) + + // biome-ignore lint/correctness/useExhaustiveDependencies: bridge starts once, should not restart on state changes + useEffect(() => { + // If already connected or enabled in full bidirectional mode, show + // disconnect confirmation. Outbound-only (CCR mirror) doesn't count — + // /remote-control upgrades it to full RC instead. + if ((replBridgeConnected || replBridgeEnabled) && !replBridgeOutboundOnly) { + setShowDisconnectDialog(true) + return } - return t3; + + let cancelled = false + void (async () => { + // Pre-flight checks before enabling (awaits GrowthBook init if disk + // cache is stale — so Max users don't get a false "not enabled" error) + const error = await checkBridgePrerequisites() + if (cancelled) return + if (error) { + logEvent('tengu_bridge_command', { + action: + 'preflight_failed' as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS, + }) + onDone(error, { display: 'system' }) + return + } + + // Show first-time remote dialog if not yet seen. + // Store the name now so it's in AppState when the callout handler later + // enables the bridge (the handler only sets replBridgeEnabled, not the name). + if (shouldShowRemoteCallout()) { + setAppState(prev => { + if (prev.showRemoteCallout) return prev + return { + ...prev, + showRemoteCallout: true, + replBridgeInitialName: name, + } + }) + onDone('', { display: 'system' }) + return + } + + // Enable the bridge — useReplBridge in REPL.tsx handles the rest: + // registers environment, creates session with conversation, connects WebSocket + logEvent('tengu_bridge_command', { + action: + 'connect' as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS, + }) + setAppState(prev => { + if (prev.replBridgeEnabled && !prev.replBridgeOutboundOnly) return prev + return { + ...prev, + replBridgeEnabled: true, + replBridgeExplicit: true, + replBridgeOutboundOnly: false, + replBridgeInitialName: name, + } + }) + onDone('Remote Control connecting\u2026', { + display: 'system', + }) + })() + + return () => { + cancelled = true + } + }, []) // eslint-disable-line react-hooks/exhaustive-deps -- run once on mount + + if (showDisconnectDialog) { + return } - return null; + + return null } /** * Dialog shown when /remote-control is used while the bridge is already connected. * Shows the session URL and lets the user disconnect or continue. */ -function _temp3(s_1) { - return s_1.replBridgeOutboundOnly; -} -function _temp2(s_0) { - return s_0.replBridgeEnabled; -} -function _temp(s) { - return s.replBridgeConnected; -} -function BridgeDisconnectDialog(t0) { - const $ = _c(61); - const { - onDone - } = t0; - useRegisterOverlay("bridge-disconnect-dialog", undefined); - const setAppState = useSetAppState(); - const sessionUrl = useAppState(_temp4); - const connectUrl = useAppState(_temp5); - const sessionActive = useAppState(_temp6); - const [focusIndex, setFocusIndex] = useState(2); - const [showQR, setShowQR] = useState(false); - const [qrText, setQrText] = useState(""); - const displayUrl = sessionActive ? sessionUrl : connectUrl; - let t1; - let t2; - if ($[0] !== displayUrl || $[1] !== showQR) { - t1 = () => { - if (!showQR || !displayUrl) { - setQrText(""); - return; - } - qrToString(displayUrl, { - type: "utf8", - errorCorrectionLevel: "L", - small: true - }).then(setQrText).catch(() => setQrText("")); - }; - t2 = [showQR, displayUrl]; - $[0] = displayUrl; - $[1] = showQR; - $[2] = t1; - $[3] = t2; - } else { - t1 = $[2]; - t2 = $[3]; - } - useEffect(t1, t2); - let t3; - if ($[4] !== onDone || $[5] !== setAppState) { - t3 = function handleDisconnect() { - setAppState(_temp7); - logEvent("tengu_bridge_command", { - action: "disconnect" as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS - }); - onDone(REMOTE_CONTROL_DISCONNECTED_MSG, { - display: "system" - }); - }; - $[4] = onDone; - $[5] = setAppState; - $[6] = t3; - } else { - t3 = $[6]; - } - const handleDisconnect = t3; - let t4; - if ($[7] === Symbol.for("react.memo_cache_sentinel")) { - t4 = function handleShowQR() { - setShowQR(_temp8); - }; - $[7] = t4; - } else { - t4 = $[7]; - } - const handleShowQR = t4; - let t5; - if ($[8] !== onDone) { - t5 = function handleContinue() { - onDone(undefined, { - display: "skip" - }); - }; - $[8] = onDone; - $[9] = t5; - } else { - t5 = $[9]; - } - const handleContinue = t5; - let t6; - let t7; - if ($[10] === Symbol.for("react.memo_cache_sentinel")) { - t6 = () => setFocusIndex(_temp9); - t7 = () => setFocusIndex(_temp0); - $[10] = t6; - $[11] = t7; - } else { - t6 = $[10]; - t7 = $[11]; - } - let t8; - if ($[12] !== focusIndex || $[13] !== handleContinue || $[14] !== handleDisconnect) { - t8 = { - "select:next": t6, - "select:previous": t7, - "select:accept": () => { - if (focusIndex === 0) { - handleDisconnect(); - } else { - if (focusIndex === 1) { - handleShowQR(); - } else { - handleContinue(); - } - } - } - }; - $[12] = focusIndex; - $[13] = handleContinue; - $[14] = handleDisconnect; - $[15] = t8; - } else { - t8 = $[15]; - } - let t9; - if ($[16] === Symbol.for("react.memo_cache_sentinel")) { - t9 = { - context: "Select" - }; - $[16] = t9; - } else { - t9 = $[16]; - } - useKeybindings(t8, t9); - let T0; - let T1; - let t10; - let t11; - let t12; - let t13; - let t14; - let t15; - let t16; - if ($[17] !== displayUrl || $[18] !== handleContinue || $[19] !== qrText || $[20] !== showQR) { - const qrLines = qrText ? qrText.split("\n").filter(_temp1) : []; - T1 = Dialog; - t14 = "Remote Control"; - t15 = handleContinue; - t16 = true; - T0 = Box; - t10 = "column"; - t11 = 1; - const t17 = displayUrl ? ` at ${displayUrl}` : ""; - if ($[30] !== t17) { - t12 = This session is available via Remote Control{t17}.; - $[30] = t17; - $[31] = t12; - } else { - t12 = $[31]; +function BridgeDisconnectDialog({ onDone }: Props): React.ReactNode { + useRegisterOverlay('bridge-disconnect-dialog') + const setAppState = useSetAppState() + const sessionUrl = useAppState(s => s.replBridgeSessionUrl) + const connectUrl = useAppState(s => s.replBridgeConnectUrl) + const sessionActive = useAppState(s => s.replBridgeSessionActive) + const [focusIndex, setFocusIndex] = useState(2) + const [showQR, setShowQR] = useState(false) + const [qrText, setQrText] = useState('') + + const displayUrl = sessionActive ? sessionUrl : connectUrl + + // Generate QR code when URL changes or QR is toggled on + useEffect(() => { + if (!showQR || !displayUrl) { + setQrText('') + return } - t13 = showQR && qrLines.length > 0 && {qrLines.map(_temp10)}; - $[17] = displayUrl; - $[18] = handleContinue; - $[19] = qrText; - $[20] = showQR; - $[21] = T0; - $[22] = T1; - $[23] = t10; - $[24] = t11; - $[25] = t12; - $[26] = t13; - $[27] = t14; - $[28] = t15; - $[29] = t16; - } else { - T0 = $[21]; - T1 = $[22]; - t10 = $[23]; - t11 = $[24]; - t12 = $[25]; - t13 = $[26]; - t14 = $[27]; - t15 = $[28]; - t16 = $[29]; + qrToString(displayUrl, { + type: 'utf8', + errorCorrectionLevel: 'L', + small: true, + }) + .then(setQrText) + .catch(() => setQrText('')) + }, [showQR, displayUrl]) + + function handleDisconnect(): void { + setAppState(prev => { + if (!prev.replBridgeEnabled) return prev + return { + ...prev, + replBridgeEnabled: false, + replBridgeExplicit: false, + replBridgeOutboundOnly: false, + } + }) + logEvent('tengu_bridge_command', { + action: + 'disconnect' as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS, + }) + onDone(REMOTE_CONTROL_DISCONNECTED_MSG, { display: 'system' }) } - const t17 = focusIndex === 0; - let t18; - if ($[32] === Symbol.for("react.memo_cache_sentinel")) { - t18 = Disconnect this session; - $[32] = t18; - } else { - t18 = $[32]; + + function handleShowQR(): void { + setShowQR(prev => !prev) } - let t19; - if ($[33] !== t17) { - t19 = {t18}; - $[33] = t17; - $[34] = t19; - } else { - t19 = $[34]; + + function handleContinue(): void { + onDone(undefined, { display: 'skip' }) } - const t20 = focusIndex === 1; - const t21 = showQR ? "Hide QR code" : "Show QR code"; - let t22; - if ($[35] !== t21) { - t22 = {t21}; - $[35] = t21; - $[36] = t22; - } else { - t22 = $[36]; - } - let t23; - if ($[37] !== t20 || $[38] !== t22) { - t23 = {t22}; - $[37] = t20; - $[38] = t22; - $[39] = t23; - } else { - t23 = $[39]; - } - const t24 = focusIndex === 2; - let t25; - if ($[40] === Symbol.for("react.memo_cache_sentinel")) { - t25 = Continue; - $[40] = t25; - } else { - t25 = $[40]; - } - let t26; - if ($[41] !== t24) { - t26 = {t25}; - $[41] = t24; - $[42] = t26; - } else { - t26 = $[42]; - } - let t27; - if ($[43] !== t19 || $[44] !== t23 || $[45] !== t26) { - t27 = {t19}{t23}{t26}; - $[43] = t19; - $[44] = t23; - $[45] = t26; - $[46] = t27; - } else { - t27 = $[46]; - } - let t28; - if ($[47] === Symbol.for("react.memo_cache_sentinel")) { - t28 = Enter to select · Esc to continue; - $[47] = t28; - } else { - t28 = $[47]; - } - let t29; - if ($[48] !== T0 || $[49] !== t10 || $[50] !== t11 || $[51] !== t12 || $[52] !== t13 || $[53] !== t27) { - t29 = {t12}{t13}{t27}{t28}; - $[48] = T0; - $[49] = t10; - $[50] = t11; - $[51] = t12; - $[52] = t13; - $[53] = t27; - $[54] = t29; - } else { - t29 = $[54]; - } - let t30; - if ($[55] !== T1 || $[56] !== t14 || $[57] !== t15 || $[58] !== t16 || $[59] !== t29) { - t30 = {t29}; - $[55] = T1; - $[56] = t14; - $[57] = t15; - $[58] = t16; - $[59] = t29; - $[60] = t30; - } else { - t30 = $[60]; - } - return t30; + + const ITEM_COUNT = 3 + + useKeybindings( + { + 'select:next': () => setFocusIndex(i => (i + 1) % ITEM_COUNT), + 'select:previous': () => + setFocusIndex(i => (i - 1 + ITEM_COUNT) % ITEM_COUNT), + 'select:accept': () => { + if (focusIndex === 0) { + handleDisconnect() + } else if (focusIndex === 1) { + handleShowQR() + } else { + handleContinue() + } + }, + }, + { context: 'Select' }, + ) + + const qrLines = qrText ? qrText.split('\n').filter(l => l.length > 0) : [] + + return ( + + + + This session is available via Remote Control + {displayUrl ? ` at ${displayUrl}` : ''}. + + {showQR && qrLines.length > 0 && ( + + {qrLines.map((line, i) => ( + {line} + ))} + + )} + + + Disconnect this session + + + {showQR ? 'Hide QR code' : 'Show QR code'} + + + Continue + + + Enter to select · Esc to continue + + + ) } /** @@ -429,80 +244,52 @@ function BridgeDisconnectDialog(t0) { * cache is stale, so a user who just became entitled (e.g. upgraded to Max, * or the flag just launched) gets an accurate result on the first try. */ -function _temp10(line, i_1) { - return {line}; -} -function _temp1(l) { - return l.length > 0; -} -function _temp0(i_0) { - return (i_0 - 1 + 3) % 3; -} -function _temp9(i) { - return (i + 1) % 3; -} -function _temp8(prev_0) { - return !prev_0; -} -function _temp7(prev) { - if (!prev.replBridgeEnabled) { - return prev; - } - return { - ...prev, - replBridgeEnabled: false, - replBridgeExplicit: false, - replBridgeOutboundOnly: false - }; -} -function _temp6(s_1) { - return s_1.replBridgeSessionActive; -} -function _temp5(s_0) { - return s_0.replBridgeConnectUrl; -} -function _temp4(s) { - return s.replBridgeSessionUrl; -} async function checkBridgePrerequisites(): Promise { // Check organization policy — remote control may be disabled - const { - waitForPolicyLimitsToLoad, - isPolicyAllowed - } = await import('../../services/policyLimits/index.js'); - await waitForPolicyLimitsToLoad(); + const { waitForPolicyLimitsToLoad, isPolicyAllowed } = await import( + '../../services/policyLimits/index.js' + ) + await waitForPolicyLimitsToLoad() if (!isPolicyAllowed('allow_remote_control')) { - return "Remote Control is disabled by your organization's policy."; + return "Remote Control is disabled by your organization's policy." } - const disabledReason = await getBridgeDisabledReason(); + + const disabledReason = await getBridgeDisabledReason() if (disabledReason) { - return disabledReason; + return disabledReason } // Mirror the v1/v2 branching logic in initReplBridge: env-less (v2) is used // only when the flag is on AND the session is not perpetual. In assistant // mode (KAIROS) useReplBridge sets perpetual=true, which forces // initReplBridge onto the v1 path — so the prerequisite check must match. - let useV2 = isEnvLessBridgeEnabled(); + let useV2 = isEnvLessBridgeEnabled() if (feature('KAIROS') && useV2) { - const { - isAssistantMode - } = await import('../../assistant/index.js'); + const { isAssistantMode } = await import('../../assistant/index.js') if (isAssistantMode()) { - useV2 = false; + useV2 = false } } - const versionError = useV2 ? await checkEnvLessBridgeMinVersion() : checkBridgeMinVersion(); + const versionError = useV2 + ? await checkEnvLessBridgeMinVersion() + : checkBridgeMinVersion() if (versionError) { - return versionError; + return versionError } + if (!getBridgeAccessToken()) { - return BRIDGE_LOGIN_INSTRUCTION; + return BRIDGE_LOGIN_INSTRUCTION } - logForDebugging('[bridge] Prerequisites passed, enabling bridge'); - return null; + + logForDebugging('[bridge] Prerequisites passed, enabling bridge') + return null } -export async function call(onDone: LocalJSXCommandOnDone, _context: ToolUseContext & LocalJSXCommandContext, args: string): Promise { - const name = args.trim() || undefined; - return ; + +export async function call( + onDone: LocalJSXCommandOnDone, + _context: ToolUseContext & LocalJSXCommandContext, + args: string, +): Promise { + const name = args.trim() || undefined + return } diff --git a/src/commands/btw/btw.tsx b/src/commands/btw/btw.tsx index bf5daca30..28a83946b 100644 --- a/src/commands/btw/btw.tsx +++ b/src/commands/btw/btw.tsx @@ -1,183 +1,151 @@ -import { c as _c } from "react/compiler-runtime"; -import * as React from 'react'; -import { useEffect, useRef, useState } from 'react'; -import { useInterval } from 'usehooks-ts'; -import type { CommandResultDisplay } from '../../commands.js'; -import { Markdown } from '../../components/Markdown.js'; -import { SpinnerGlyph } from '../../components/Spinner/SpinnerGlyph.js'; -import { DOWN_ARROW, UP_ARROW } from '../../constants/figures.js'; -import { getSystemPrompt } from '../../constants/prompts.js'; -import { useModalOrTerminalSize } from '../../context/modalContext.js'; -import { getSystemContext, getUserContext } from '../../context.js'; -import { useTerminalSize } from '../../hooks/useTerminalSize.js'; -import ScrollBox, { type ScrollBoxHandle } from '../../ink/components/ScrollBox.js'; -import type { KeyboardEvent } from '../../ink/events/keyboard-event.js'; -import { Box, Text } from '../../ink.js'; -import type { LocalJSXCommandOnDone } from '../../types/command.js'; -import type { Message } from '../../types/message.js'; -import { createAbortController } from '../../utils/abortController.js'; -import { saveGlobalConfig } from '../../utils/config.js'; -import { errorMessage } from '../../utils/errors.js'; -import { type CacheSafeParams, getLastCacheSafeParams } from '../../utils/forkedAgent.js'; -import { getMessagesAfterCompactBoundary } from '../../utils/messages.js'; -import type { ProcessUserInputContext } from '../../utils/processUserInput/processUserInput.js'; -import { runSideQuestion } from '../../utils/sideQuestion.js'; -import { asSystemPrompt } from '../../utils/systemPromptType.js'; +import * as React from 'react' +import { useEffect, useRef, useState } from 'react' +import { useInterval } from 'usehooks-ts' +import type { CommandResultDisplay } from '../../commands.js' +import { Markdown } from '../../components/Markdown.js' +import { SpinnerGlyph } from '../../components/Spinner/SpinnerGlyph.js' +import { DOWN_ARROW, UP_ARROW } from '../../constants/figures.js' +import { getSystemPrompt } from '../../constants/prompts.js' +import { useModalOrTerminalSize } from '../../context/modalContext.js' +import { getSystemContext, getUserContext } from '../../context.js' +import { useTerminalSize } from '../../hooks/useTerminalSize.js' +import ScrollBox, { + type ScrollBoxHandle, +} from '../../ink/components/ScrollBox.js' +import type { KeyboardEvent } from '../../ink/events/keyboard-event.js' +import { Box, Text } from '../../ink.js' +import type { LocalJSXCommandOnDone } from '../../types/command.js' +import type { Message } from '../../types/message.js' +import { createAbortController } from '../../utils/abortController.js' +import { saveGlobalConfig } from '../../utils/config.js' +import { errorMessage } from '../../utils/errors.js' +import { + type CacheSafeParams, + getLastCacheSafeParams, +} from '../../utils/forkedAgent.js' +import { getMessagesAfterCompactBoundary } from '../../utils/messages.js' +import type { ProcessUserInputContext } from '../../utils/processUserInput/processUserInput.js' +import { runSideQuestion } from '../../utils/sideQuestion.js' +import { asSystemPrompt } from '../../utils/systemPromptType.js' + type BtwComponentProps = { - question: string; - context: ProcessUserInputContext; - onDone: (result?: string, options?: { - display?: CommandResultDisplay; - }) => void; -}; -const CHROME_ROWS = 5; -const OUTER_CHROME_ROWS = 6; -const SCROLL_LINES = 3; -function BtwSideQuestion(t0) { - const $ = _c(25); - const { - question, - context, - onDone - } = t0; - const [response, setResponse] = useState(null); - const [error, setError] = useState(null); - const [frame, setFrame] = useState(0); - const scrollRef = useRef(null); - const { - rows - } = useModalOrTerminalSize(useTerminalSize()); - let t1; - if ($[0] === Symbol.for("react.memo_cache_sentinel")) { - t1 = () => setFrame(_temp); - $[0] = t1; - } else { - t1 = $[0]; + question: string + context: ProcessUserInputContext + onDone: ( + result?: string, + options?: { display?: CommandResultDisplay }, + ) => void +} + +const CHROME_ROWS = 5 +const OUTER_CHROME_ROWS = 6 +const SCROLL_LINES = 3 + +function BtwSideQuestion({ + question, + context, + onDone, +}: BtwComponentProps): React.ReactNode { + const [response, setResponse] = useState(null) + const [error, setError] = useState(null) + const [frame, setFrame] = useState(0) + const scrollRef = useRef(null) + const { rows } = useModalOrTerminalSize(useTerminalSize()) + + // Animate spinner while loading + useInterval(() => setFrame(f => f + 1), response || error ? null : 80) + + function handleKeyDown(e: KeyboardEvent): void { + if ( + e.key === 'escape' || + e.key === 'return' || + e.key === ' ' || + (e.ctrl && (e.key === 'c' || e.key === 'd')) + ) { + e.preventDefault() + onDone(undefined, { display: 'skip' }) + return + } + if (e.key === 'up' || (e.ctrl && e.key === 'p')) { + e.preventDefault() + scrollRef.current?.scrollBy(-SCROLL_LINES) + } + if (e.key === 'down' || (e.ctrl && e.key === 'n')) { + e.preventDefault() + scrollRef.current?.scrollBy(SCROLL_LINES) + } } - useInterval(t1, response || error ? null : 80); - let t2; - if ($[1] !== onDone) { - t2 = function handleKeyDown(e) { - if (e.key === "escape" || e.key === "return" || e.key === " " || e.ctrl && (e.key === "c" || e.key === "d")) { - e.preventDefault(); - onDone(undefined, { - display: "skip" - }); - return; - } - if (e.key === "up" || e.ctrl && e.key === "p") { - e.preventDefault(); - scrollRef.current?.scrollBy(-SCROLL_LINES); - } - if (e.key === "down" || e.ctrl && e.key === "n") { - e.preventDefault(); - scrollRef.current?.scrollBy(SCROLL_LINES); - } - }; - $[1] = onDone; - $[2] = t2; - } else { - t2 = $[2]; - } - const handleKeyDown = t2; - let t3; - let t4; - if ($[3] !== context || $[4] !== question) { - t3 = () => { - const abortController = createAbortController(); - const fetchResponse = async function fetchResponse() { - ; - try { - const cacheSafeParams = await buildCacheSafeParams(context); - const result = await runSideQuestion({ - question, - cacheSafeParams - }); - if (!abortController.signal.aborted) { - if (result.response) { - setResponse(result.response); - } else { - setError("No response received"); - } - } - } catch (t5) { - const err = t5; - if (!abortController.signal.aborted) { - setError(errorMessage(err) || "Failed to get response"); + + useEffect(() => { + const abortController = createAbortController() + + async function fetchResponse(): Promise { + try { + const cacheSafeParams = await buildCacheSafeParams(context) + const result = await runSideQuestion({ question, cacheSafeParams }) + + if (!abortController.signal.aborted) { + if (result.response) { + setResponse(result.response) + } else { + setError('No response received') } } - }; - fetchResponse(); - return () => { - abortController.abort(); - }; - }; - t4 = [question, context]; - $[3] = context; - $[4] = question; - $[5] = t3; - $[6] = t4; - } else { - t3 = $[5]; - t4 = $[6]; - } - useEffect(t3, t4); - const maxContentHeight = Math.max(5, rows - CHROME_ROWS - OUTER_CHROME_ROWS); - let t5; - if ($[7] === Symbol.for("react.memo_cache_sentinel")) { - t5 = /btw{" "}; - $[7] = t5; - } else { - t5 = $[7]; - } - let t6; - if ($[8] !== question) { - t6 = {t5}{question}; - $[8] = question; - $[9] = t6; - } else { - t6 = $[9]; - } - let t7; - if ($[10] !== error || $[11] !== frame || $[12] !== response) { - t7 = {error ? {error} : response ? {response} : Answering...}; - $[10] = error; - $[11] = frame; - $[12] = response; - $[13] = t7; - } else { - t7 = $[13]; - } - let t8; - if ($[14] !== maxContentHeight || $[15] !== t7) { - t8 = {t7}; - $[14] = maxContentHeight; - $[15] = t7; - $[16] = t8; - } else { - t8 = $[16]; - } - let t9; - if ($[17] !== error || $[18] !== response) { - t9 = (response || error) && {UP_ARROW}/{DOWN_ARROW} to scroll · Space, Enter, or Escape to dismiss; - $[17] = error; - $[18] = response; - $[19] = t9; - } else { - t9 = $[19]; - } - let t10; - if ($[20] !== handleKeyDown || $[21] !== t6 || $[22] !== t8 || $[23] !== t9) { - t10 = {t6}{t8}{t9}; - $[20] = handleKeyDown; - $[21] = t6; - $[22] = t8; - $[23] = t9; - $[24] = t10; - } else { - t10 = $[24]; - } - return t10; + } catch (err) { + if (!abortController.signal.aborted) { + setError(errorMessage(err) || 'Failed to get response') + } + } + } + + void fetchResponse() + + return () => { + abortController.abort() + } + }, [question, context]) + + const maxContentHeight = Math.max(5, rows - CHROME_ROWS - OUTER_CHROME_ROWS) + + return ( + + + + /btw{' '} + + {question} + + + + {error ? ( + {error} + ) : response ? ( + {response} + ) : ( + + + Answering... + + )} + + + {(response || error) && ( + + + {UP_ARROW}/{DOWN_ARROW} to scroll · Space, Enter, or Escape to + dismiss + + + )} + + ) } /** @@ -195,48 +163,67 @@ function BtwSideQuestion(t0) { * applied buildEffectiveSystemPrompt extras (--agent, --system-prompt, * --append-system-prompt, coordinator mode). */ -function _temp(f) { - return f + 1; -} function stripInProgressAssistantMessage(messages: Message[]): Message[] { - const last = messages.at(-1); + const last = messages.at(-1) if (last?.type === 'assistant' && last.message.stop_reason === null) { - return messages.slice(0, -1); + return messages.slice(0, -1) } - return messages; + return messages } -async function buildCacheSafeParams(context: ProcessUserInputContext): Promise { - const forkContextMessages = getMessagesAfterCompactBoundary(stripInProgressAssistantMessage(context.messages)); - const saved = getLastCacheSafeParams(); + +async function buildCacheSafeParams( + context: ProcessUserInputContext, +): Promise { + const forkContextMessages = getMessagesAfterCompactBoundary( + stripInProgressAssistantMessage(context.messages), + ) + const saved = getLastCacheSafeParams() if (saved) { return { systemPrompt: saved.systemPrompt, userContext: saved.userContext, systemContext: saved.systemContext, toolUseContext: context, - forkContextMessages - }; + forkContextMessages, + } } - const [rawSystemPrompt, userContext, systemContext] = await Promise.all([getSystemPrompt(context.options.tools, context.options.mainLoopModel, [], context.options.mcpClients), getUserContext(), getSystemContext()]); + const [rawSystemPrompt, userContext, systemContext] = await Promise.all([ + getSystemPrompt( + context.options.tools, + context.options.mainLoopModel, + [], + context.options.mcpClients, + ), + getUserContext(), + getSystemContext(), + ]) return { systemPrompt: asSystemPrompt(rawSystemPrompt), userContext, systemContext, toolUseContext: context, - forkContextMessages - }; -} -export async function call(onDone: LocalJSXCommandOnDone, context: ProcessUserInputContext, args: string): Promise { - const question = args?.trim(); - if (!question) { - onDone('Usage: /btw ', { - display: 'system' - }); - return null; + forkContextMessages, } +} + +export async function call( + onDone: LocalJSXCommandOnDone, + context: ProcessUserInputContext, + args: string, +): Promise { + const question = args?.trim() + + if (!question) { + onDone('Usage: /btw ', { display: 'system' }) + return null + } + saveGlobalConfig(current => ({ ...current, - btwUseCount: current.btwUseCount + 1 - })); - return ; + btwUseCount: current.btwUseCount + 1, + })) + + return ( + + ) } diff --git a/src/commands/chrome/chrome.tsx b/src/commands/chrome/chrome.tsx index b659c2e80..3fd0dbca3 100644 --- a/src/commands/chrome/chrome.tsx +++ b/src/commands/chrome/chrome.tsx @@ -1,284 +1,240 @@ -import { c as _c } from "react/compiler-runtime"; -import React, { useState } from 'react'; -import { type OptionWithDescription, Select } from '../../components/CustomSelect/select.js'; -import { Dialog } from '../../components/design-system/Dialog.js'; -import { Box, Text } from '../../ink.js'; -import { useAppState } from '../../state/AppState.js'; -import { isClaudeAISubscriber } from '../../utils/auth.js'; -import { openBrowser } from '../../utils/browser.js'; -import { CLAUDE_IN_CHROME_MCP_SERVER_NAME, openInChrome } from '../../utils/claudeInChrome/common.js'; -import { isChromeExtensionInstalled } from '../../utils/claudeInChrome/setup.js'; -import { getGlobalConfig, saveGlobalConfig } from '../../utils/config.js'; -import { env } from '../../utils/env.js'; -import { isRunningOnHomespace } from '../../utils/envUtils.js'; -const CHROME_EXTENSION_URL = 'https://claude.ai/chrome'; -const CHROME_PERMISSIONS_URL = 'https://clau.de/chrome/permissions'; -const CHROME_RECONNECT_URL = 'https://clau.de/chrome/reconnect'; -type MenuAction = 'install-extension' | 'reconnect' | 'manage-permissions' | 'toggle-default'; +import React, { useState } from 'react' +import { + type OptionWithDescription, + Select, +} from '../../components/CustomSelect/select.js' +import { Dialog } from '../../components/design-system/Dialog.js' +import { Box, Text } from '../../ink.js' +import { useAppState } from '../../state/AppState.js' +import { isClaudeAISubscriber } from '../../utils/auth.js' +import { openBrowser } from '../../utils/browser.js' +import { + CLAUDE_IN_CHROME_MCP_SERVER_NAME, + openInChrome, +} from '../../utils/claudeInChrome/common.js' +import { isChromeExtensionInstalled } from '../../utils/claudeInChrome/setup.js' +import { getGlobalConfig, saveGlobalConfig } from '../../utils/config.js' +import { env } from '../../utils/env.js' +import { isRunningOnHomespace } from '../../utils/envUtils.js' + +const CHROME_EXTENSION_URL = 'https://claude.ai/chrome' +const CHROME_PERMISSIONS_URL = 'https://clau.de/chrome/permissions' +const CHROME_RECONNECT_URL = 'https://clau.de/chrome/reconnect' + +type MenuAction = + | 'install-extension' + | 'reconnect' + | 'manage-permissions' + | 'toggle-default' + type Props = { - onDone: (result?: string) => void; - isExtensionInstalled: boolean; - configEnabled: boolean | undefined; - isClaudeAISubscriber: boolean; - isWSL: boolean; -}; -function ClaudeInChromeMenu(t0) { - const $ = _c(41); - const { - onDone, - isExtensionInstalled: installed, - configEnabled, - isClaudeAISubscriber, - isWSL - } = t0; - const mcpClients = useAppState(_temp); - const [selectKey, setSelectKey] = useState(0); - const [enabledByDefault, setEnabledByDefault] = useState(configEnabled ?? false); - const [showInstallHint, setShowInstallHint] = useState(false); - const [isExtensionInstalled, setIsExtensionInstalled] = useState(installed); - let t1; - if ($[0] === Symbol.for("react.memo_cache_sentinel")) { - t1 = false && isRunningOnHomespace(); - $[0] = t1; - } else { - t1 = $[0]; + onDone: (result?: string) => void + isExtensionInstalled: boolean + configEnabled: boolean | undefined + isClaudeAISubscriber: boolean + isWSL: boolean +} + +function ClaudeInChromeMenu({ + onDone, + isExtensionInstalled: installed, + configEnabled, + isClaudeAISubscriber, + isWSL, +}: Props): React.ReactNode { + const mcpClients = useAppState(s => s.mcp.clients) + const [selectKey, setSelectKey] = useState(0) + const [enabledByDefault, setEnabledByDefault] = useState( + configEnabled ?? false, + ) + const [showInstallHint, setShowInstallHint] = useState(false) + const [isExtensionInstalled, setIsExtensionInstalled] = useState(installed) + + const isHomespace = process.env.USER_TYPE === 'ant' && isRunningOnHomespace() + + const chromeClient = mcpClients.find( + c => c.name === CLAUDE_IN_CHROME_MCP_SERVER_NAME, + ) + const isConnected = chromeClient?.type === 'connected' + + function openUrl(url: string): void { + if (isHomespace) { + void openBrowser(url) + } else { + void openInChrome(url) + } } - const isHomespace = t1; - let t2; - if ($[1] !== mcpClients) { - t2 = mcpClients.find(_temp2); - $[1] = mcpClients; - $[2] = t2; - } else { - t2 = $[2]; - } - const chromeClient = t2; - const isConnected = chromeClient?.type === "connected"; - let t3; - if ($[3] === Symbol.for("react.memo_cache_sentinel")) { - t3 = function openUrl(url) { - if (isHomespace) { - openBrowser(url); - } else { - openInChrome(url); + + function handleAction(action: MenuAction): void { + switch (action) { + case 'install-extension': + setSelectKey(k => k + 1) + setShowInstallHint(true) + openUrl(CHROME_EXTENSION_URL) + break + case 'reconnect': + setSelectKey(k => k + 1) + void isChromeExtensionInstalled().then(installed => { + setIsExtensionInstalled(installed) + if (installed) { + setShowInstallHint(false) + } + }) + openUrl(CHROME_RECONNECT_URL) + break + case 'manage-permissions': + setSelectKey(k => k + 1) + openUrl(CHROME_PERMISSIONS_URL) + break + case 'toggle-default': { + const newValue = !enabledByDefault + saveGlobalConfig(current => ({ + ...current, + claudeInChromeDefaultEnabled: newValue, + })) + setEnabledByDefault(newValue) + break } - }; - $[3] = t3; - } else { - t3 = $[3]; - } - const openUrl = t3; - let t4; - if ($[4] !== enabledByDefault) { - t4 = function handleAction(action) { - bb22: switch (action) { - case "install-extension": - { - setSelectKey(_temp3); - setShowInstallHint(true); - openUrl(CHROME_EXTENSION_URL); - break bb22; - } - case "reconnect": - { - setSelectKey(_temp4); - isChromeExtensionInstalled().then(installed_0 => { - setIsExtensionInstalled(installed_0); - if (installed_0) { - setShowInstallHint(false); - } - }); - openUrl(CHROME_RECONNECT_URL); - break bb22; - } - case "manage-permissions": - { - setSelectKey(_temp5); - openUrl(CHROME_PERMISSIONS_URL); - break bb22; - } - case "toggle-default": - { - const newValue = !enabledByDefault; - saveGlobalConfig(current => ({ - ...current, - claudeInChromeDefaultEnabled: newValue - })); - setEnabledByDefault(newValue); - } - } - }; - $[4] = enabledByDefault; - $[5] = t4; - } else { - t4 = $[5]; - } - const handleAction = t4; - let options; - if ($[6] !== enabledByDefault || $[7] !== isExtensionInstalled) { - options = []; - const requiresExtensionSuffix = isExtensionInstalled ? "" : " (requires extension)"; - if (!isExtensionInstalled && !isHomespace) { - let t5; - if ($[9] === Symbol.for("react.memo_cache_sentinel")) { - t5 = { - label: "Install Chrome extension", - value: "install-extension" - }; - $[9] = t5; - } else { - t5 = $[9]; - } - options.push(t5); } - let t5; - if ($[10] === Symbol.for("react.memo_cache_sentinel")) { - t5 = Manage permissions; - $[10] = t5; - } else { - t5 = $[10]; - } - let t6; - if ($[11] !== requiresExtensionSuffix) { - t6 = { - label: <>{t5}{requiresExtensionSuffix}, - value: "manage-permissions" - }; - $[11] = requiresExtensionSuffix; - $[12] = t6; - } else { - t6 = $[12]; - } - let t7; - if ($[13] === Symbol.for("react.memo_cache_sentinel")) { - t7 = Reconnect extension; - $[13] = t7; - } else { - t7 = $[13]; - } - let t8; - if ($[14] !== requiresExtensionSuffix) { - t8 = { - label: <>{t7}{requiresExtensionSuffix}, - value: "reconnect" - }; - $[14] = requiresExtensionSuffix; - $[15] = t8; - } else { - t8 = $[15]; - } - const t9 = `Enabled by default: ${enabledByDefault ? "Yes" : "No"}`; - let t10; - if ($[16] !== t9) { - t10 = { - label: t9, - value: "toggle-default" - }; - $[16] = t9; - $[17] = t10; - } else { - t10 = $[17]; - } - options.push(t6, t8, t10); - $[6] = enabledByDefault; - $[7] = isExtensionInstalled; - $[8] = options; - } else { - options = $[8]; } - const isDisabled = isWSL; - let t5; - if ($[18] !== onDone) { - t5 = () => onDone(); - $[18] = onDone; - $[19] = t5; - } else { - t5 = $[19]; + + const options: OptionWithDescription[] = [] + const requiresExtensionSuffix = isExtensionInstalled + ? '' + : ' (requires extension)' + + if (!isExtensionInstalled && !isHomespace) { + options.push({ + label: 'Install Chrome extension', + value: 'install-extension', + }) } - let t6; - if ($[20] === Symbol.for("react.memo_cache_sentinel")) { - t6 = Claude in Chrome works with the Chrome extension to let you control your browser directly from Claude Code. Navigate websites, fill forms, capture screenshots, record GIFs, and debug with console logs and network requests.; - $[20] = t6; - } else { - t6 = $[20]; - } - let t7; - if ($[21] !== isWSL) { - t7 = isWSL && Claude in Chrome is not supported in WSL at this time.; - $[21] = isWSL; - $[22] = t7; - } else { - t7 = $[22]; - } - let t8; - if ($[23] !== isClaudeAISubscriber) { - t8 = false; - $[23] = isClaudeAISubscriber; - $[24] = t8; - } else { - t8 = $[24]; - } - let t9; - if ($[25] !== handleAction || $[26] !== isConnected || $[27] !== isDisabled || $[28] !== isExtensionInstalled || $[29] !== options || $[30] !== selectKey || $[31] !== showInstallHint) { - t9 = !isDisabled && <>{!isHomespace && Status:{" "}{isConnected ? Enabled : Disabled}Extension:{" "}{isExtensionInstalled ? Installed : Not detected}} + + {showInstallHint && ( + + Once installed, select {'"Reconnect extension"'} to connect. + + )} + + + Usage: + claude --chrome + or + claude --no-chrome + + + + Site-level permissions are inherited from the Chrome extension. + Manage permissions in the Chrome extension settings to control + which sites Claude can browse, click, and type on. + + + )} + Learn more: https://code.claude.com/docs/en/chrome + + + ) } -function _temp5(k) { - return k + 1; + +export const call = async function ( + onDone: (result?: string) => void, +): Promise { + const isExtensionInstalled = await isChromeExtensionInstalled() + const config = getGlobalConfig() + const isSubscriber = isClaudeAISubscriber() + const isWSL = env.isWslEnvironment() + + return ( + + ) } -function _temp4(k_0) { - return k_0 + 1; -} -function _temp3(k_1) { - return k_1 + 1; -} -function _temp2(c) { - return c.name === CLAUDE_IN_CHROME_MCP_SERVER_NAME; -} -function _temp(s) { - return s.mcp.clients; -} -export const call = async function (onDone: (result?: string) => void): Promise { - const isExtensionInstalled = await isChromeExtensionInstalled(); - const config = getGlobalConfig(); - const isSubscriber = isClaudeAISubscriber(); - const isWSL = env.isWslEnvironment(); - return ; -}; diff --git a/src/commands/config/config.tsx b/src/commands/config/config.tsx index b263e37ba..d4e216c38 100644 --- a/src/commands/config/config.tsx +++ b/src/commands/config/config.tsx @@ -1,6 +1,7 @@ -import * as React from 'react'; -import { Settings } from '../../components/Settings/Settings.js'; -import type { LocalJSXCommandCall } from '../../types/command.js'; +import * as React from 'react' +import { Settings } from '../../components/Settings/Settings.js' +import type { LocalJSXCommandCall } from '../../types/command.js' + export const call: LocalJSXCommandCall = async (onDone, context) => { - return ; -}; + return +} diff --git a/src/commands/context/context.tsx b/src/commands/context/context.tsx index 595a3c594..747c5a9de 100644 --- a/src/commands/context/context.tsx +++ b/src/commands/context/context.tsx @@ -1,13 +1,13 @@ -import { feature } from 'bun:bundle'; -import * as React from 'react'; -import type { LocalJSXCommandContext } from '../../commands.js'; -import { ContextVisualization } from '../../components/ContextVisualization.js'; -import { microcompactMessages } from '../../services/compact/microCompact.js'; -import type { LocalJSXCommandOnDone } from '../../types/command.js'; -import type { Message } from '../../types/message.js'; -import { analyzeContextUsage } from '../../utils/analyzeContext.js'; -import { getMessagesAfterCompactBoundary } from '../../utils/messages.js'; -import { renderToAnsiString } from '../../utils/staticRender.js'; +import { feature } from 'bun:bundle' +import * as React from 'react' +import type { LocalJSXCommandContext } from '../../commands.js' +import { ContextVisualization } from '../../components/ContextVisualization.js' +import { microcompactMessages } from '../../services/compact/microCompact.js' +import type { LocalJSXCommandOnDone } from '../../types/command.js' +import type { Message } from '../../types/message.js' +import { analyzeContextUsage } from '../../utils/analyzeContext.js' +import { getMessagesAfterCompactBoundary } from '../../utils/messages.js' +import { renderToAnsiString } from '../../utils/staticRender.js' /** * Apply the same context transforms query.ts does before the API call, so @@ -16,48 +16,53 @@ import { renderToAnsiString } from '../../utils/staticRender.js'; * was collapsed — user sees "180k, 3 spans collapsed" when the API sees 120k. */ function toApiView(messages: Message[]): Message[] { - let view = getMessagesAfterCompactBoundary(messages); + let view = getMessagesAfterCompactBoundary(messages) if (feature('CONTEXT_COLLAPSE')) { /* eslint-disable @typescript-eslint/no-require-imports */ - const { - projectView - } = require('../../services/contextCollapse/operations.js') as typeof import('../../services/contextCollapse/operations.js'); + const { projectView } = + require('../../services/contextCollapse/operations.js') as typeof import('../../services/contextCollapse/operations.js') /* eslint-enable @typescript-eslint/no-require-imports */ - view = projectView(view); + view = projectView(view) } - return view; + return view } -export async function call(onDone: LocalJSXCommandOnDone, context: LocalJSXCommandContext): Promise { + +export async function call( + onDone: LocalJSXCommandOnDone, + context: LocalJSXCommandContext, +): Promise { const { messages, getAppState, - options: { - mainLoopModel, - tools - } - } = context; - const apiView = toApiView(messages); + options: { mainLoopModel, tools }, + } = context + + const apiView = toApiView(messages) // Apply microcompact to get accurate representation of messages sent to API - const { - messages: compactedMessages - } = await microcompactMessages(apiView); + const { messages: compactedMessages } = await microcompactMessages(apiView) // Get terminal width for responsive sizing - const terminalWidth = process.stdout.columns || 80; - const appState = getAppState(); + const terminalWidth = process.stdout.columns || 80 + + const appState = getAppState() // Analyze context with compacted messages // Pass original messages as last parameter for accurate API usage extraction - const data = await analyzeContextUsage(compactedMessages, mainLoopModel, async () => appState.toolPermissionContext, tools, appState.agentDefinitions, terminalWidth, context, - // Pass full context for system prompt calculation - undefined, - // mainThreadAgentDefinition - apiView // Original messages for API usage extraction - ); + const data = await analyzeContextUsage( + compactedMessages, + mainLoopModel, + async () => appState.toolPermissionContext, + tools, + appState.agentDefinitions, + terminalWidth, + context, // Pass full context for system prompt calculation + undefined, // mainThreadAgentDefinition + apiView, // Original messages for API usage extraction + ) // Render to ANSI string to preserve colors and pass to onDone like local commands do - const output = await renderToAnsiString(); - onDone(output); - return null; + const output = await renderToAnsiString() + onDone(output) + return null } diff --git a/src/commands/copy/copy.tsx b/src/commands/copy/copy.tsx index f9fc720d0..d5196de20 100644 --- a/src/commands/copy/copy.tsx +++ b/src/commands/copy/copy.tsx @@ -1,45 +1,44 @@ -import { c as _c } from "react/compiler-runtime"; -import { mkdir, writeFile } from 'fs/promises'; -import { marked, type Tokens } from 'marked'; -import { tmpdir } from 'os'; -import { join } from 'path'; -import React, { useRef } from 'react'; -import type { CommandResultDisplay } from '../../commands.js'; -import type { OptionWithDescription } from '../../components/CustomSelect/select.js'; -import { Select } from '../../components/CustomSelect/select.js'; -import { Byline } from '../../components/design-system/Byline.js'; -import { KeyboardShortcutHint } from '../../components/design-system/KeyboardShortcutHint.js'; -import { Pane } from '../../components/design-system/Pane.js'; -import type { KeyboardEvent } from '../../ink/events/keyboard-event.js'; -import { stringWidth } from '../../ink/stringWidth.js'; -import { setClipboard } from '../../ink/termio/osc.js'; -import { Box, Text } from '../../ink.js'; -import { logEvent } from '../../services/analytics/index.js'; -import type { LocalJSXCommandCall } from '../../types/command.js'; -import type { AssistantMessage, Message } from '../../types/message.js'; -import { getGlobalConfig, saveGlobalConfig } from '../../utils/config.js'; -import { extractTextContent, stripPromptXMLTags } from '../../utils/messages.js'; -import { countCharInString } from '../../utils/stringUtils.js'; -const COPY_DIR = join(tmpdir(), 'claude'); -const RESPONSE_FILENAME = 'response.md'; -const MAX_LOOKBACK = 20; +import { mkdir, writeFile } from 'fs/promises' +import { marked, type Tokens } from 'marked' +import { tmpdir } from 'os' +import { join } from 'path' +import React, { useRef } from 'react' +import type { CommandResultDisplay } from '../../commands.js' +import type { OptionWithDescription } from '../../components/CustomSelect/select.js' +import { Select } from '../../components/CustomSelect/select.js' +import { Byline } from '../../components/design-system/Byline.js' +import { KeyboardShortcutHint } from '../../components/design-system/KeyboardShortcutHint.js' +import { Pane } from '../../components/design-system/Pane.js' +import type { KeyboardEvent } from '../../ink/events/keyboard-event.js' +import { stringWidth } from '../../ink/stringWidth.js' +import { setClipboard } from '../../ink/termio/osc.js' +import { Box, Text } from '../../ink.js' +import { logEvent } from '../../services/analytics/index.js' +import type { LocalJSXCommandCall } from '../../types/command.js' +import type { AssistantMessage, Message } from '../../types/message.js' +import { getGlobalConfig, saveGlobalConfig } from '../../utils/config.js' +import { extractTextContent, stripPromptXMLTags } from '../../utils/messages.js' +import { countCharInString } from '../../utils/stringUtils.js' + +const COPY_DIR = join(tmpdir(), 'claude') +const RESPONSE_FILENAME = 'response.md' +const MAX_LOOKBACK = 20 + type CodeBlock = { - code: string; - lang: string | undefined; -}; + code: string + lang: string | undefined +} + function extractCodeBlocks(markdown: string): CodeBlock[] { - const tokens = marked.lexer(stripPromptXMLTags(markdown)); - const blocks: CodeBlock[] = []; + const tokens = marked.lexer(stripPromptXMLTags(markdown)) + const blocks: CodeBlock[] = [] for (const token of tokens) { if (token.type === 'code') { - const codeToken = token as Tokens.Code; - blocks.push({ - code: codeToken.text, - lang: codeToken.lang - }); + const codeToken = token as Tokens.Code + blocks.push({ code: codeToken.text, lang: codeToken.lang }) } } - return blocks; + return blocks } /** @@ -48,323 +47,267 @@ function extractCodeBlocks(markdown: string): CodeBlock[] { * Index 0 = latest, 1 = second-to-latest, etc. Caps at MAX_LOOKBACK. */ export function collectRecentAssistantTexts(messages: Message[]): string[] { - const texts: string[] = []; - for (let i = messages.length - 1; i >= 0 && texts.length < MAX_LOOKBACK; i--) { - const msg = messages[i]; - if (msg?.type !== 'assistant' || msg.isApiErrorMessage) continue; - const content = (msg as AssistantMessage).message.content; - if (!Array.isArray(content)) continue; - const text = extractTextContent(content, '\n\n'); - if (text) texts.push(text); + const texts: string[] = [] + for ( + let i = messages.length - 1; + i >= 0 && texts.length < MAX_LOOKBACK; + i-- + ) { + const msg = messages[i] + if (msg?.type !== 'assistant' || msg.isApiErrorMessage) continue + const content = (msg as AssistantMessage).message.content + if (!Array.isArray(content)) continue + const text = extractTextContent(content, '\n\n') + if (text) texts.push(text) } - return texts; + return texts } + export function fileExtension(lang: string | undefined): string { if (lang) { // Sanitize to prevent path traversal (e.g. ```../../etc/passwd) // Language identifiers are alphanumeric: python, tsx, jsonc, etc. - const sanitized = lang.replace(/[^a-zA-Z0-9]/g, ''); + const sanitized = lang.replace(/[^a-zA-Z0-9]/g, '') if (sanitized && sanitized !== 'plaintext') { - return `.${sanitized}`; + return `.${sanitized}` } } - return '.txt'; + return '.txt' } + async function writeToFile(text: string, filename: string): Promise { - const filePath = join(COPY_DIR, filename); - await mkdir(COPY_DIR, { - recursive: true - }); - await writeFile(filePath, text, 'utf-8'); - return filePath; + const filePath = join(COPY_DIR, filename) + await mkdir(COPY_DIR, { recursive: true }) + await writeFile(filePath, text, 'utf-8') + return filePath } -async function copyOrWriteToFile(text: string, filename: string): Promise { - const raw = await setClipboard(text); - if (raw) process.stdout.write(raw); - const lineCount = countCharInString(text, '\n') + 1; - const charCount = text.length; + +async function copyOrWriteToFile( + text: string, + filename: string, +): Promise { + const raw = await setClipboard(text) + if (raw) process.stdout.write(raw) + const lineCount = countCharInString(text, '\n') + 1 + const charCount = text.length // Also write to a temp file — clipboard paths are best-effort (OSC 52 needs // terminal support), so the file provides a reliable fallback. try { - const filePath = await writeToFile(text, filename); - return `Copied to clipboard (${charCount} characters, ${lineCount} lines)\nAlso written to ${filePath}`; + const filePath = await writeToFile(text, filename) + return `Copied to clipboard (${charCount} characters, ${lineCount} lines)\nAlso written to ${filePath}` } catch { - return `Copied to clipboard (${charCount} characters, ${lineCount} lines)`; + return `Copied to clipboard (${charCount} characters, ${lineCount} lines)` } } + function truncateLine(text: string, maxLen: number): string { - const firstLine = text.split('\n')[0] ?? ''; + const firstLine = text.split('\n')[0] ?? '' if (stringWidth(firstLine) <= maxLen) { - return firstLine; + return firstLine } - let result = ''; - let width = 0; - const targetWidth = maxLen - 1; + let result = '' + let width = 0 + const targetWidth = maxLen - 1 for (const char of firstLine) { - const charWidth = stringWidth(char); - if (width + charWidth > targetWidth) break; - result += char; - width += charWidth; + const charWidth = stringWidth(char) + if (width + charWidth > targetWidth) break + result += char + width += charWidth } - return result + '\u2026'; + return result + '\u2026' } + type PickerProps = { - fullText: string; - codeBlocks: CodeBlock[]; - messageAge: number; - onDone: (result?: string, options?: { - display?: CommandResultDisplay; - }) => void; -}; -type PickerSelection = number | 'full' | 'always'; -function CopyPicker(t0) { - const $ = _c(33); - const { - fullText, - codeBlocks, - messageAge, - onDone - } = t0; - const focusedRef = useRef("full"); - const t1 = `${fullText.length} chars, ${countCharInString(fullText, "\n") + 1} lines`; - let t2; - if ($[0] !== t1) { - t2 = { - label: "Full response", - value: "full" as const, - description: t1 - }; - $[0] = t1; - $[1] = t2; - } else { - t2 = $[1]; - } - let t3; - if ($[2] !== codeBlocks || $[3] !== t2) { - let t4; - if ($[5] === Symbol.for("react.memo_cache_sentinel")) { - t4 = { - label: "Always copy full response", - value: "always" as const, - description: "Skip this picker in the future (revert via /config)" - }; - $[5] = t4; - } else { - t4 = $[5]; - } - t3 = [t2, ...codeBlocks.map(_temp), t4]; - $[2] = codeBlocks; - $[3] = t2; - $[4] = t3; - } else { - t3 = $[4]; - } - const options = t3; - let t4; - if ($[6] !== codeBlocks || $[7] !== fullText) { - t4 = function getSelectionContent(selected) { - if (selected === "full" || selected === "always") { - return { - text: fullText, - filename: RESPONSE_FILENAME - }; - } - const block_0 = codeBlocks[selected]; + fullText: string + codeBlocks: CodeBlock[] + messageAge: number + onDone: ( + result?: string, + options?: { display?: CommandResultDisplay }, + ) => void +} + +type PickerSelection = number | 'full' | 'always' + +function CopyPicker({ + fullText, + codeBlocks, + messageAge, + onDone, +}: PickerProps): React.ReactNode { + const focusedRef = useRef('full') + + const options: OptionWithDescription[] = [ + { + label: 'Full response', + value: 'full' as const, + description: `${fullText.length} chars, ${countCharInString(fullText, '\n') + 1} lines`, + }, + ...codeBlocks.map((block, index) => { + const blockLines = countCharInString(block.code, '\n') + 1 return { - text: block_0.code, - filename: `copy${fileExtension(block_0.lang)}`, - blockIndex: selected - }; - }; - $[6] = codeBlocks; - $[7] = fullText; - $[8] = t4; - } else { - t4 = $[8]; - } - const getSelectionContent = t4; - let t5; - if ($[9] !== codeBlocks.length || $[10] !== getSelectionContent || $[11] !== messageAge || $[12] !== onDone) { - t5 = async function handleSelect(selected_0) { - const content = getSelectionContent(selected_0); - if (selected_0 === "always") { - if (!getGlobalConfig().copyFullResponse) { - saveGlobalConfig(_temp2); - } - logEvent("tengu_copy", { - block_count: codeBlocks.length, - always: true, - message_age: messageAge - }); - const result = await copyOrWriteToFile(content.text, content.filename); - onDone(`${result}\nPreference saved. Use /config to change copyFullResponse`); - return; + label: truncateLine(block.code, 60), + value: index, + description: + [block.lang, blockLines > 1 ? `${blockLines} lines` : undefined] + .filter(Boolean) + .join(', ') || undefined, } - logEvent("tengu_copy", { - selected_block: content.blockIndex, - block_count: codeBlocks.length, - message_age: messageAge - }); - const result_0 = await copyOrWriteToFile(content.text, content.filename); - onDone(result_0); - }; - $[9] = codeBlocks.length; - $[10] = getSelectionContent; - $[11] = messageAge; - $[12] = onDone; - $[13] = t5; - } else { - t5 = $[13]; + }), + { + label: 'Always copy full response', + value: 'always' as const, + description: 'Skip this picker in the future (revert via /config)', + }, + ] + + function getSelectionContent(selected: PickerSelection): { + text: string + filename: string + blockIndex?: number + } { + if (selected === 'full' || selected === 'always') { + return { text: fullText, filename: RESPONSE_FILENAME } + } + const block = codeBlocks[selected]! + return { + text: block.code, + filename: `copy${fileExtension(block.lang)}`, + blockIndex: selected, + } } - const handleSelect = t5; - let t6; - if ($[14] !== codeBlocks.length || $[15] !== getSelectionContent || $[16] !== messageAge || $[17] !== onDone) { - const handleWrite = async function handleWrite(selected_1) { - const content_0 = getSelectionContent(selected_1); - logEvent("tengu_copy", { - selected_block: content_0.blockIndex, + + async function handleSelect(selected: PickerSelection): Promise { + const content = getSelectionContent(selected) + if (selected === 'always') { + if (!getGlobalConfig().copyFullResponse) { + saveGlobalConfig(c => ({ ...c, copyFullResponse: true })) + } + logEvent('tengu_copy', { block_count: codeBlocks.length, + always: true, message_age: messageAge, - write_shortcut: true - }); - ; - try { - const filePath = await writeToFile(content_0.text, content_0.filename); - onDone(`Written to ${filePath}`); - } catch (t7) { - const e = t7; - onDone(`Failed to write file: ${e instanceof Error ? e.message : e}`); - } - }; - t6 = function handleKeyDown(e_0) { - if (e_0.key === "w") { - e_0.preventDefault(); - handleWrite(focusedRef.current); - } - }; - $[14] = codeBlocks.length; - $[15] = getSelectionContent; - $[16] = messageAge; - $[17] = onDone; - $[18] = t6; - } else { - t6 = $[18]; + }) + const result = await copyOrWriteToFile(content.text, content.filename) + onDone( + `${result}\nPreference saved. Use /config to change copyFullResponse`, + ) + return + } + logEvent('tengu_copy', { + selected_block: content.blockIndex, + block_count: codeBlocks.length, + message_age: messageAge, + }) + const result = await copyOrWriteToFile(content.text, content.filename) + onDone(result) } - const handleKeyDown = t6; - let t7; - if ($[19] === Symbol.for("react.memo_cache_sentinel")) { - t7 = Select content to copy:; - $[19] = t7; - } else { - t7 = $[19]; + + async function handleWrite(selected: PickerSelection): Promise { + const content = getSelectionContent(selected) + logEvent('tengu_copy', { + selected_block: content.blockIndex, + block_count: codeBlocks.length, + message_age: messageAge, + write_shortcut: true, + }) + try { + const filePath = await writeToFile(content.text, content.filename) + onDone(`Written to ${filePath}`) + } catch (e) { + onDone(`Failed to write file: ${e instanceof Error ? e.message : e}`) + } } - let t8; - if ($[20] === Symbol.for("react.memo_cache_sentinel")) { - t8 = value => { - focusedRef.current = value; - }; - $[20] = t8; - } else { - t8 = $[20]; + + function handleKeyDown(e: KeyboardEvent): void { + if (e.key === 'w') { + e.preventDefault() + void handleWrite(focusedRef.current) + } } - let t9; - if ($[21] !== handleSelect) { - t9 = selected_2 => { - handleSelect(selected_2); - }; - $[21] = handleSelect; - $[22] = t9; - } else { - t9 = $[22]; - } - let t10; - if ($[23] !== onDone) { - t10 = () => { - onDone("Copy cancelled", { - display: "system" - }); - }; - $[23] = onDone; - $[24] = t10; - } else { - t10 = $[24]; - } - let t11; - if ($[25] !== options || $[26] !== t10 || $[27] !== t9) { - t11 = { - setSelectedValue(value_0); - handleSelectIDE(value_0); - }} />; - $[19] = availableIDEs.length; - $[20] = handleSelectIDE; - $[21] = options; - $[22] = selectedValue; - $[23] = t6; - } else { - t6 = $[23]; - } - let t7; - if ($[24] !== availableIDEs) { - t7 = availableIDEs.length !== 0 && availableIDEs.some(_temp2) && Note: Only one Claude Code instance can be connected to VS Code at a time.; - $[24] = availableIDEs; - $[25] = t7; - } else { - t7 = $[25]; - } - let t8; - if ($[26] !== availableIDEs.length) { - t8 = availableIDEs.length !== 0 && !isSupportedTerminal() && Tip: You can enable auto-connect to IDE in /config or with the --ide flag; - $[26] = availableIDEs.length; - $[27] = t8; - } else { - t8 = $[27]; - } - let t9; - if ($[28] !== unavailableIDEs) { - t9 = unavailableIDEs.length > 0 && Found {unavailableIDEs.length} other running IDE(s). However, their workspace/project directories do not match the current cwd.{unavailableIDEs.map(_temp3)}; - $[28] = unavailableIDEs; - $[29] = t9; - } else { - t9 = $[29]; - } - let t10; - if ($[30] !== t5 || $[31] !== t6 || $[32] !== t7 || $[33] !== t8 || $[34] !== t9) { - t10 = {t5}{t6}{t7}{t8}{t9}; - $[30] = t5; - $[31] = t6; - $[32] = t7; - $[33] = t8; - $[34] = t9; - $[35] = t10; - } else { - t10 = $[35]; - } - let t11; - if ($[36] !== onClose || $[37] !== t10) { - t11 = {t10}; - $[36] = onClose; - $[37] = t10; - $[38] = t11; - } else { - t11 = $[38]; - } - return t11; + + return ( + + + {availableIDEs.length === 0 && ( + + {isSupportedJetBrainsTerminal() + ? 'No available IDEs detected. Please install the plugin and restart your IDE:\n' + + 'https://docs.claude.com/s/claude-code-jetbrains' + : 'No available IDEs detected. Make sure your IDE has the Claude Code extension or plugin installed and is running.'} + + )} + + {availableIDEs.length !== 0 && ( + ; - $[11] = options; - $[12] = selectedValue; - $[13] = t5; - $[14] = t6; - } else { - t6 = $[14]; - } - let t7; - if ($[15] !== handleCancel || $[16] !== t6) { - t7 = {t6}; - $[15] = handleCancel; - $[16] = t6; - $[17] = t7; - } else { - t7 = $[17]; - } - return t7; + availableIDEs: DetectedIDEInfo[] + onSelectIDE: (ide?: DetectedIDEInfo) => void + onDone: ( + result?: string, + options?: { display?: CommandResultDisplay }, + ) => void } -function _temp4(ide_0) { - return { - label: ide_0.name, - value: ide_0.port.toString() - }; -} -function RunningIDESelector(t0) { - const $ = _c(15); - const { - runningIDEs, - onSelectIDE, - onDone - } = t0; - const [selectedValue, setSelectedValue] = useState(runningIDEs[0] ?? ""); - let t1; - if ($[0] !== onSelectIDE) { - t1 = value => { - onSelectIDE(value as IdeType); - }; - $[0] = onSelectIDE; - $[1] = t1; - } else { - t1 = $[1]; - } - const handleSelectIDE = t1; - let t2; - if ($[2] !== runningIDEs) { - t2 = runningIDEs.map(_temp5); - $[2] = runningIDEs; - $[3] = t2; - } else { - t2 = $[3]; - } - const options = t2; - let t3; - if ($[4] !== onDone) { - t3 = function handleCancel() { - onDone("IDE selection cancelled", { - display: "system" - }); - }; - $[4] = onDone; - $[5] = t3; - } else { - t3 = $[5]; - } - const handleCancel = t3; - let t4; - if ($[6] !== handleSelectIDE) { - t4 = value_0 => { - setSelectedValue(value_0); - handleSelectIDE(value_0); - }; - $[6] = handleSelectIDE; - $[7] = t4; - } else { - t4 = $[7]; - } - let t5; - if ($[8] !== options || $[9] !== selectedValue || $[10] !== t4) { - t5 = { + setSelectedValue(value) + handleSelectIDE(value) + }} + /> + + ) +} + +function RunningIDESelector({ + runningIDEs, + onSelectIDE, + onDone, +}: { + runningIDEs: IdeType[] + onSelectIDE: (ide: IdeType) => void + onDone: ( + result?: string, + options?: { display?: CommandResultDisplay }, + ) => void +}): React.ReactNode { + const [selectedValue, setSelectedValue] = useState(runningIDEs[0] ?? '') + + const handleSelectIDE = useCallback( + (value: string) => { + onSelectIDE(value as IdeType) + }, + [onSelectIDE], + ) + + const options = runningIDEs.map(ide => ({ + label: toIDEDisplayName(ide), + value: ide, + })) + + function handleCancel(): void { + onDone('IDE selection cancelled', { display: 'system' }) + } + + return ( + + ; - $[9] = handleCancel; - $[10] = handleSelect; - $[11] = t7; - } else { - t7 = $[11]; - } - let t8; - if ($[12] === Symbol.for("react.memo_cache_sentinel")) { - t8 = View the latest workflow template at:{" "}https://github.com/anthropics/claude-code-action/blob/main/examples/claude.yml; - $[12] = t8; - } else { - t8 = $[12]; - } - let t9; - if ($[13] !== t5 || $[14] !== t7) { - t9 = {t5}{t6}{t7}{t8}; - $[13] = t5; - $[14] = t7; - $[15] = t9; - } else { - t9 = $[15]; - } - return t9; + + return ( + + + Existing Workflow Found + Repository: {repoName} + + + + + A Claude workflow file already exists at{' '} + .github/workflows/claude.yml + + What would you like to do? + + + + ; - $[19] = handleSelect; - $[20] = options; - $[21] = t6; - } else { - t6 = $[21]; - } - let t7; - if ($[22] !== handleCancel || $[23] !== t6) { - t7 = {t6}; - $[22] = handleCancel; - $[23] = t6; - $[24] = t7; - } else { - t7 = $[24]; - } - return t7; + + return ( + + + options={options} + onChange={handleSelect} + visibleOptionCount={options.length} + /> + + ) } -export async function call(onDone: LocalJSXCommandOnDone, context: ToolUseContext & LocalJSXCommandContext): Promise { - return ; + +export async function call( + onDone: LocalJSXCommandOnDone, + context: ToolUseContext & LocalJSXCommandContext, +): Promise { + return } diff --git a/src/commands/remote-env/remote-env.tsx b/src/commands/remote-env/remote-env.tsx index 65e0a5cb6..1c5f3feb6 100644 --- a/src/commands/remote-env/remote-env.tsx +++ b/src/commands/remote-env/remote-env.tsx @@ -1,6 +1,9 @@ -import * as React from 'react'; -import { RemoteEnvironmentDialog } from '../../components/RemoteEnvironmentDialog.js'; -import type { LocalJSXCommandOnDone } from '../../types/command.js'; -export async function call(onDone: LocalJSXCommandOnDone): Promise { - return ; +import * as React from 'react' +import { RemoteEnvironmentDialog } from '../../components/RemoteEnvironmentDialog.js' +import type { LocalJSXCommandOnDone } from '../../types/command.js' + +export async function call( + onDone: LocalJSXCommandOnDone, +): Promise { + return } diff --git a/src/commands/remote-setup/remote-setup.tsx b/src/commands/remote-setup/remote-setup.tsx index e51f2e8d7..05813453d 100644 --- a/src/commands/remote-setup/remote-setup.tsx +++ b/src/commands/remote-setup/remote-setup.tsx @@ -1,163 +1,162 @@ -import { execa } from 'execa'; -import * as React from 'react'; -import { useEffect, useState } from 'react'; -import { Select } from '../../components/CustomSelect/index.js'; -import { Dialog } from '../../components/design-system/Dialog.js'; -import { LoadingState } from '../../components/design-system/LoadingState.js'; -import { Box, Text } from '../../ink.js'; -import { logEvent, type AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS as SafeString } from '../../services/analytics/index.js'; -import type { LocalJSXCommandOnDone } from '../../types/command.js'; -import { openBrowser } from '../../utils/browser.js'; -import { getGhAuthStatus } from '../../utils/github/ghAuthStatus.js'; -import { createDefaultEnvironment, getCodeWebUrl, type ImportTokenError, importGithubToken, isSignedIn, RedactedGithubToken } from './api.js'; -type CheckResult = { - status: 'not_signed_in'; -} | { - status: 'has_gh_token'; - token: RedactedGithubToken; -} | { - status: 'gh_not_installed'; -} | { - status: 'gh_not_authenticated'; -}; +import { execa } from 'execa' +import * as React from 'react' +import { useEffect, useState } from 'react' +import { Select } from '../../components/CustomSelect/index.js' +import { Dialog } from '../../components/design-system/Dialog.js' +import { LoadingState } from '../../components/design-system/LoadingState.js' +import { Box, Text } from '../../ink.js' +import { + logEvent, + type AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS as SafeString, +} from '../../services/analytics/index.js' +import type { LocalJSXCommandOnDone } from '../../types/command.js' +import { openBrowser } from '../../utils/browser.js' +import { getGhAuthStatus } from '../../utils/github/ghAuthStatus.js' +import { + createDefaultEnvironment, + getCodeWebUrl, + type ImportTokenError, + importGithubToken, + isSignedIn, + RedactedGithubToken, +} from './api.js' + +type CheckResult = + | { status: 'not_signed_in' } + | { status: 'has_gh_token'; token: RedactedGithubToken } + | { status: 'gh_not_installed' } + | { status: 'gh_not_authenticated' } + async function checkLoginState(): Promise { if (!(await isSignedIn())) { - return { - status: 'not_signed_in' - }; + return { status: 'not_signed_in' } } - const ghStatus = await getGhAuthStatus(); + + const ghStatus = await getGhAuthStatus() if (ghStatus === 'not_installed') { - return { - status: 'gh_not_installed' - }; + return { status: 'gh_not_installed' } } if (ghStatus === 'not_authenticated') { - return { - status: 'gh_not_authenticated' - }; + return { status: 'gh_not_authenticated' } } // ghStatus === 'authenticated'. getGhAuthStatus spawns with stdout:'ignore' // (telemetry-safe); spawn once more with stdout:'pipe' to read the token. - const { - stdout - } = await execa('gh', ['auth', 'token'], { + const { stdout } = await execa('gh', ['auth', 'token'], { stdout: 'pipe', stderr: 'ignore', timeout: 5000, - reject: false - }); - const trimmed = stdout.trim(); + reject: false, + }) + const trimmed = stdout.trim() if (!trimmed) { - return { - status: 'gh_not_authenticated' - }; + return { status: 'gh_not_authenticated' } } - return { - status: 'has_gh_token', - token: new RedactedGithubToken(trimmed) - }; + return { status: 'has_gh_token', token: new RedactedGithubToken(trimmed) } } + function errorMessage(err: ImportTokenError, codeUrl: string): string { switch (err.kind) { case 'not_signed_in': - return `Login failed. Please visit ${codeUrl} and login using the GitHub App`; + return `Login failed. Please visit ${codeUrl} and login using the GitHub App` case 'invalid_token': - return 'GitHub rejected that token. Run `gh auth login` and try again.'; + return 'GitHub rejected that token. Run `gh auth login` and try again.' case 'server': - return `Server error (${err.status}). Try again in a moment.`; + return `Server error (${err.status}). Try again in a moment.` case 'network': - return "Couldn't reach the server. Check your connection."; + return "Couldn't reach the server. Check your connection." } } -type Step = { - name: 'checking'; -} | { - name: 'confirm'; - token: RedactedGithubToken; -} | { - name: 'uploading'; -}; -function Web({ - onDone -}: { - onDone: LocalJSXCommandOnDone; -}) { - const [step, setStep] = useState({ - name: 'checking' - }); + +type Step = + | { name: 'checking' } + | { name: 'confirm'; token: RedactedGithubToken } + | { name: 'uploading' } + +function Web({ onDone }: { onDone: LocalJSXCommandOnDone }) { + const [step, setStep] = useState({ name: 'checking' }) + useEffect(() => { - logEvent('tengu_remote_setup_started', {}); + logEvent('tengu_remote_setup_started', {}) void checkLoginState().then(async result => { switch (result.status) { case 'not_signed_in': logEvent('tengu_remote_setup_result', { - result: 'not_signed_in' as SafeString - }); - onDone('Not signed in to Claude. Run /login first.'); - return; + result: 'not_signed_in' as SafeString, + }) + onDone('Not signed in to Claude. Run /login first.') + return case 'gh_not_installed': - case 'gh_not_authenticated': - { - const url = `${getCodeWebUrl()}/onboarding?step=alt-auth`; - await openBrowser(url); - logEvent('tengu_remote_setup_result', { - result: result.status as SafeString - }); - onDone(result.status === 'gh_not_installed' ? `GitHub CLI not found. Install it via https://cli.github.com/, then run \`gh auth login\`, or connect GitHub on the web: ${url}` : `GitHub CLI not authenticated. Run \`gh auth login\` and try again, or connect GitHub on the web: ${url}`); - return; - } + case 'gh_not_authenticated': { + const url = `${getCodeWebUrl()}/onboarding?step=alt-auth` + await openBrowser(url) + logEvent('tengu_remote_setup_result', { + result: result.status as SafeString, + }) + onDone( + result.status === 'gh_not_installed' + ? `GitHub CLI not found. Install it via https://cli.github.com/, then run \`gh auth login\`, or connect GitHub on the web: ${url}` + : `GitHub CLI not authenticated. Run \`gh auth login\` and try again, or connect GitHub on the web: ${url}`, + ) + return + } case 'has_gh_token': - setStep({ - name: 'confirm', - token: result.token - }); + setStep({ name: 'confirm', token: result.token }) } - }); + }) // onDone is stable across renders; intentionally not in deps. // eslint-disable-next-line react-hooks/exhaustive-deps - }, []); + }, []) + const handleCancel = () => { logEvent('tengu_remote_setup_result', { - result: 'cancelled' as SafeString - }); - onDone(); - }; + result: 'cancelled' as SafeString, + }) + onDone() + } + const handleConfirm = async (token: RedactedGithubToken) => { - setStep({ - name: 'uploading' - }); - const result = await importGithubToken(token); + setStep({ name: 'uploading' }) + + const result = await importGithubToken(token) if (!result.ok) { - const importErr = (result as { ok: false; error: ImportTokenError }).error; logEvent('tengu_remote_setup_result', { result: 'import_failed' as SafeString, - error_kind: importErr.kind as SafeString - }); - onDone(errorMessage(importErr, getCodeWebUrl())); - return; + error_kind: result.error.kind as SafeString, + }) + onDone(errorMessage(result.error, getCodeWebUrl())) + return } // Token import succeeded. Environment creation is best-effort — if it // fails, the web state machine routes to env-setup on landing, which is // one extra click but still better than the OAuth dance. - await createDefaultEnvironment(); - const url = getCodeWebUrl(); - await openBrowser(url); + await createDefaultEnvironment() + + const url = getCodeWebUrl() + await openBrowser(url) + logEvent('tengu_remote_setup_result', { - result: 'success' as SafeString - }); - onDone(`Connected as ${result.result.github_username}. Opened ${url}`); - }; + result: 'success' as SafeString, + }) + onDone(`Connected as ${result.result.github_username}. Opened ${url}`) + } + if (step.name === 'checking') { - return ; + return } + if (step.name === 'uploading') { - return ; + return } - const token = step.token; - return + + const token = step.token + return ( + Claude on the web requires connecting to your GitHub account to clone @@ -167,21 +166,26 @@ function Web({ Your local credentials are used to authenticate with GitHub - { + if (value === 'send') { + void handleConfirm(token) + } else { + handleCancel() + } + }} + onCancel={handleCancel} + /> + + ) } -export async function call(onDone: LocalJSXCommandOnDone): Promise { - return ; + +export async function call( + onDone: LocalJSXCommandOnDone, +): Promise { + return } diff --git a/src/commands/resume/resume.tsx b/src/commands/resume/resume.tsx index 4764089c8..f66d654c6 100644 --- a/src/commands/resume/resume.tsx +++ b/src/commands/resume/resume.tsx @@ -1,257 +1,300 @@ -import { c as _c } from "react/compiler-runtime"; -import chalk from 'chalk'; -import type { UUID } from 'crypto'; -import figures from 'figures'; -import * as React from 'react'; -import { getOriginalCwd, getSessionId } from '../../bootstrap/state.js'; -import type { CommandResultDisplay, ResumeEntrypoint } from '../../commands.js'; -import { LogSelector } from '../../components/LogSelector.js'; -import { MessageResponse } from '../../components/MessageResponse.js'; -import { Spinner } from '../../components/Spinner.js'; -import { useIsInsideModal } from '../../context/modalContext.js'; -import { useTerminalSize } from '../../hooks/useTerminalSize.js'; -import { setClipboard } from '../../ink/termio/osc.js'; -import { Box, Text } from '../../ink.js'; -import type { LocalJSXCommandCall } from '../../types/command.js'; -import type { LogOption } from '../../types/logs.js'; -import { agenticSessionSearch } from '../../utils/agenticSessionSearch.js'; -import { checkCrossProjectResume } from '../../utils/crossProjectResume.js'; -import { getWorktreePaths } from '../../utils/getWorktreePaths.js'; -import { logError } from '../../utils/log.js'; -import { getLastSessionLog, getSessionIdFromLog, isCustomTitleEnabled, isLiteLog, loadAllProjectsMessageLogs, loadFullLog, loadSameRepoMessageLogs, searchSessionsByCustomTitle } from '../../utils/sessionStorage.js'; -import { validateUuid } from '../../utils/uuid.js'; -type ResumeResult = { - resultType: 'sessionNotFound'; - arg: string; -} | { - resultType: 'multipleMatches'; - arg: string; - count: number; -}; +import chalk from 'chalk' +import type { UUID } from 'crypto' +import figures from 'figures' +import * as React from 'react' +import { getOriginalCwd, getSessionId } from '../../bootstrap/state.js' +import type { CommandResultDisplay, ResumeEntrypoint } from '../../commands.js' +import { LogSelector } from '../../components/LogSelector.js' +import { MessageResponse } from '../../components/MessageResponse.js' +import { Spinner } from '../../components/Spinner.js' +import { useIsInsideModal } from '../../context/modalContext.js' +import { useTerminalSize } from '../../hooks/useTerminalSize.js' +import { setClipboard } from '../../ink/termio/osc.js' +import { Box, Text } from '../../ink.js' +import type { LocalJSXCommandCall } from '../../types/command.js' +import type { LogOption } from '../../types/logs.js' +import { agenticSessionSearch } from '../../utils/agenticSessionSearch.js' +import { checkCrossProjectResume } from '../../utils/crossProjectResume.js' +import { getWorktreePaths } from '../../utils/getWorktreePaths.js' +import { logError } from '../../utils/log.js' +import { + getLastSessionLog, + getSessionIdFromLog, + isCustomTitleEnabled, + isLiteLog, + loadAllProjectsMessageLogs, + loadFullLog, + loadSameRepoMessageLogs, + searchSessionsByCustomTitle, +} from '../../utils/sessionStorage.js' +import { validateUuid } from '../../utils/uuid.js' + +type ResumeResult = + | { resultType: 'sessionNotFound'; arg: string } + | { resultType: 'multipleMatches'; arg: string; count: number } + function resumeHelpMessage(result: ResumeResult): string { switch (result.resultType) { case 'sessionNotFound': - return `Session ${chalk.bold(result.arg)} was not found.`; + return `Session ${chalk.bold(result.arg)} was not found.` case 'multipleMatches': - return `Found ${result.count} sessions matching ${chalk.bold(result.arg)}. Please use /resume to pick a specific session.`; + return `Found ${result.count} sessions matching ${chalk.bold(result.arg)}. Please use /resume to pick a specific session.` } } -function ResumeError(t0) { - const $ = _c(10); - const { - message, - args, - onDone - } = t0; - let t1; - let t2; - if ($[0] !== onDone) { - t1 = () => { - const timer = setTimeout(onDone, 0); - return () => clearTimeout(timer); - }; - t2 = [onDone]; - $[0] = onDone; - $[1] = t1; - $[2] = t2; - } else { - t1 = $[1]; - t2 = $[2]; - } - React.useEffect(t1, t2); - let t3; - if ($[3] !== args) { - t3 = {figures.pointer} /resume {args}; - $[3] = args; - $[4] = t3; - } else { - t3 = $[4]; - } - let t4; - if ($[5] !== message) { - t4 = {message}; - $[5] = message; - $[6] = t4; - } else { - t4 = $[6]; - } - let t5; - if ($[7] !== t3 || $[8] !== t4) { - t5 = {t3}{t4}; - $[7] = t3; - $[8] = t4; - $[9] = t5; - } else { - t5 = $[9]; - } - return t5; + +function ResumeError({ + message, + args, + onDone, +}: { + message: string + args: string + onDone: () => void +}): React.ReactNode { + React.useEffect(() => { + const timer = setTimeout(onDone, 0) + return () => clearTimeout(timer) + }, [onDone]) + + return ( + + + {figures.pointer} /resume {args} + + + {message} + + + ) } + function ResumeCommand({ onDone, - onResume + onResume, }: { - onDone: (result?: string, options?: { - display?: CommandResultDisplay; - }) => void; - onResume: (sessionId: UUID, log: LogOption, entrypoint: ResumeEntrypoint) => Promise; + onDone: ( + result?: string, + options?: { display?: CommandResultDisplay }, + ) => void + onResume: ( + sessionId: UUID, + log: LogOption, + entrypoint: ResumeEntrypoint, + ) => Promise }): React.ReactNode { - const [logs, setLogs] = React.useState([]); - const [worktreePaths, setWorktreePaths] = React.useState([]); - const [loading, setLoading] = React.useState(true); - const [resuming, setResuming] = React.useState(false); - const [showAllProjects, setShowAllProjects] = React.useState(false); - const { - rows - } = useTerminalSize(); - const insideModal = useIsInsideModal(); - const loadLogs = React.useCallback(async (allProjects: boolean, paths: string[]) => { - setLoading(true); - try { - const allLogs = allProjects ? await loadAllProjectsMessageLogs() : await loadSameRepoMessageLogs(paths); - const resumable = filterResumableSessions(allLogs, getSessionId()); - if (resumable.length === 0) { - onDone('No conversations found to resume'); - return; + const [logs, setLogs] = React.useState([]) + const [worktreePaths, setWorktreePaths] = React.useState([]) + const [loading, setLoading] = React.useState(true) + const [resuming, setResuming] = React.useState(false) + const [showAllProjects, setShowAllProjects] = React.useState(false) + const { rows } = useTerminalSize() + const insideModal = useIsInsideModal() + + const loadLogs = React.useCallback( + async (allProjects: boolean, paths: string[]) => { + setLoading(true) + try { + const allLogs = allProjects + ? await loadAllProjectsMessageLogs() + : await loadSameRepoMessageLogs(paths) + const resumable = filterResumableSessions(allLogs, getSessionId()) + if (resumable.length === 0) { + onDone('No conversations found to resume') + return + } + setLogs(resumable) + } catch (_err) { + onDone('Failed to load conversations') + } finally { + setLoading(false) } - setLogs(resumable); - } catch (_err) { - onDone('Failed to load conversations'); - } finally { - setLoading(false); - } - }, [onDone]); + }, + [onDone], + ) + React.useEffect(() => { async function init() { - const paths_0 = await getWorktreePaths(getOriginalCwd()); - setWorktreePaths(paths_0); - void loadLogs(false, paths_0); + const paths = await getWorktreePaths(getOriginalCwd()) + setWorktreePaths(paths) + void loadLogs(false, paths) } - void init(); - }, [loadLogs]); + void init() + }, [loadLogs]) + const handleToggleAllProjects = React.useCallback(() => { - const newValue = !showAllProjects; - setShowAllProjects(newValue); - void loadLogs(newValue, worktreePaths); - }, [showAllProjects, loadLogs, worktreePaths]); + const newValue = !showAllProjects + setShowAllProjects(newValue) + void loadLogs(newValue, worktreePaths) + }, [showAllProjects, loadLogs, worktreePaths]) + async function handleSelect(log: LogOption) { - const sessionId = validateUuid(getSessionIdFromLog(log)); + const sessionId = validateUuid(getSessionIdFromLog(log)) if (!sessionId) { - onDone('Failed to resume conversation'); - return; + onDone('Failed to resume conversation') + return } // Load full messages for lite logs - const fullLog = isLiteLog(log) ? await loadFullLog(log) : log; + const fullLog = isLiteLog(log) ? await loadFullLog(log) : log // Check if this conversation is from a different directory - const crossProjectCheck = checkCrossProjectResume(fullLog, showAllProjects, worktreePaths); + const crossProjectCheck = checkCrossProjectResume( + fullLog, + showAllProjects, + worktreePaths, + ) if (crossProjectCheck.isCrossProject) { if (crossProjectCheck.isSameRepoWorktree) { // Same repo worktree - can resume directly - setResuming(true); - void onResume(sessionId, fullLog, 'slash_command_picker'); - return; + setResuming(true) + void onResume(sessionId, fullLog, 'slash_command_picker') + return } // Different project - show command instead of resuming - const crossCmd = (crossProjectCheck as { isCrossProject: true; isSameRepoWorktree: false; command: string }).command; - const raw = await setClipboard(crossCmd); - if (raw) process.stdout.write(raw); + const raw = await setClipboard(crossProjectCheck.command) + if (raw) process.stdout.write(raw) // Format the output message - const message = ['', 'This conversation is from a different directory.', '', 'To resume, run:', ` ${crossCmd}`, '', '(Command copied to clipboard)', ''].join('\n'); - onDone(message, { - display: 'user' - }); - return; + const message = [ + '', + 'This conversation is from a different directory.', + '', + 'To resume, run:', + ` ${crossProjectCheck.command}`, + '', + '(Command copied to clipboard)', + '', + ].join('\n') + + onDone(message, { display: 'user' }) + return } // Same directory - proceed with resume - setResuming(true); - void onResume(sessionId, fullLog, 'slash_command_picker'); + setResuming(true) + void onResume(sessionId, fullLog, 'slash_command_picker') } + function handleCancel() { - onDone('Resume cancelled', { - display: 'system' - }); + onDone('Resume cancelled', { display: 'system' }) } + if (loading) { - return + return ( + Loading conversations… - ; + + ) } + if (resuming) { - return + return ( + Resuming conversation… - ; + + ) } - return loadLogs(showAllProjects, worktreePaths)} showAllProjects={showAllProjects} onToggleAllProjects={handleToggleAllProjects} onAgenticSearch={agenticSessionSearch} />; + + return ( + loadLogs(showAllProjects, worktreePaths)} + showAllProjects={showAllProjects} + onToggleAllProjects={handleToggleAllProjects} + onAgenticSearch={agenticSessionSearch} + /> + ) } -export function filterResumableSessions(logs: LogOption[], currentSessionId: string): LogOption[] { - return logs.filter(l => !l.isSidechain && getSessionIdFromLog(l) !== currentSessionId); + +export function filterResumableSessions( + logs: LogOption[], + currentSessionId: string, +): LogOption[] { + return logs.filter( + l => !l.isSidechain && getSessionIdFromLog(l) !== currentSessionId, + ) } + export const call: LocalJSXCommandCall = async (onDone, context, args) => { - const onResume = async (sessionId: UUID, log: LogOption, entrypoint: ResumeEntrypoint) => { + const onResume = async ( + sessionId: UUID, + log: LogOption, + entrypoint: ResumeEntrypoint, + ) => { try { - await context.resume?.(sessionId, log, entrypoint); - onDone(undefined, { - display: 'skip' - }); + await context.resume?.(sessionId, log, entrypoint) + onDone(undefined, { display: 'skip' }) } catch (error) { - logError(error as Error); - onDone(`Failed to resume: ${(error as Error).message}`); + logError(error as Error) + onDone(`Failed to resume: ${(error as Error).message}`) } - }; - const arg = args?.trim(); + } + + const arg = args?.trim() // No argument provided - show picker if (!arg) { - return ; + return ( + + ) } // Load logs to search (includes same-repo worktrees) - const worktreePaths = await getWorktreePaths(getOriginalCwd()); - const logs = await loadSameRepoMessageLogs(worktreePaths); + const worktreePaths = await getWorktreePaths(getOriginalCwd()) + const logs = await loadSameRepoMessageLogs(worktreePaths) if (logs.length === 0) { - const message = 'No conversations found to resume.'; - return onDone(message)} />; + const message = 'No conversations found to resume.' + return ( + onDone(message)} + /> + ) } // First, check if arg is a valid UUID - const maybeSessionId = validateUuid(arg); + const maybeSessionId = validateUuid(arg) if (maybeSessionId) { - const matchingLogs = logs.filter(l => getSessionIdFromLog(l) === maybeSessionId).sort((a, b) => b.modified.getTime() - a.modified.getTime()); + const matchingLogs = logs + .filter(l => getSessionIdFromLog(l) === maybeSessionId) + .sort((a, b) => b.modified.getTime() - a.modified.getTime()) + if (matchingLogs.length > 0) { - const log = matchingLogs[0]!; - const fullLog = isLiteLog(log) ? await loadFullLog(log) : log; - void onResume(maybeSessionId, fullLog, 'slash_command_session_id'); - return null; + const log = matchingLogs[0]! + const fullLog = isLiteLog(log) ? await loadFullLog(log) : log + void onResume(maybeSessionId, fullLog, 'slash_command_session_id') + return null } // Enriched logs didn't find it — try direct file lookup. This handles // sessions filtered out by enrichLogs (e.g., first message >16KB makes // firstPrompt extraction fail, causing the session to be dropped). - const directLog = await getLastSessionLog(maybeSessionId); + const directLog = await getLastSessionLog(maybeSessionId) if (directLog) { - void onResume(maybeSessionId, directLog, 'slash_command_session_id'); - return null; + void onResume(maybeSessionId, directLog, 'slash_command_session_id') + return null } } // Next, try exact custom title match (only if feature is enabled) if (isCustomTitleEnabled()) { const titleMatches = await searchSessionsByCustomTitle(arg, { - exact: true - }); + exact: true, + }) if (titleMatches.length === 1) { - const log = titleMatches[0]!; - const sessionId = getSessionIdFromLog(log); + const log = titleMatches[0]! + const sessionId = getSessionIdFromLog(log) if (sessionId) { - const fullLog = isLiteLog(log) ? await loadFullLog(log) : log; - void onResume(sessionId, fullLog, 'slash_command_title'); - return null; + const fullLog = isLiteLog(log) ? await loadFullLog(log) : log + void onResume(sessionId, fullLog, 'slash_command_title') + return null } } @@ -260,16 +303,21 @@ export const call: LocalJSXCommandCall = async (onDone, context, args) => { const message = resumeHelpMessage({ resultType: 'multipleMatches', arg, - count: titleMatches.length - }); - return onDone(message)} />; + count: titleMatches.length, + }) + return ( + onDone(message)} + /> + ) } } // No match found - show error - const message = resumeHelpMessage({ - resultType: 'sessionNotFound', - arg - }); - return onDone(message)} />; -}; + const message = resumeHelpMessage({ resultType: 'sessionNotFound', arg }) + return ( + onDone(message)} /> + ) +} diff --git a/src/commands/review/UltrareviewOverageDialog.tsx b/src/commands/review/UltrareviewOverageDialog.tsx index 46cb40a02..020db57f8 100644 --- a/src/commands/review/UltrareviewOverageDialog.tsx +++ b/src/commands/review/UltrareviewOverageDialog.tsx @@ -1,95 +1,71 @@ -import { c as _c } from "react/compiler-runtime"; -import React, { useCallback, useRef, useState } from 'react'; -import { Select } from '../../components/CustomSelect/select.js'; -import { Dialog } from '../../components/design-system/Dialog.js'; -import { Box, Text } from '../../ink.js'; +import React, { useCallback, useRef, useState } from 'react' +import { Select } from '../../components/CustomSelect/select.js' +import { Dialog } from '../../components/design-system/Dialog.js' +import { Box, Text } from '../../ink.js' + type Props = { - onProceed: (signal: AbortSignal) => Promise; - onCancel: () => void; -}; -export function UltrareviewOverageDialog(t0) { - const $ = _c(15); - const { - onProceed, - onCancel - } = t0; - const [isLaunching, setIsLaunching] = useState(false); - let t1; - if ($[0] === Symbol.for("react.memo_cache_sentinel")) { - t1 = new AbortController(); - $[0] = t1; - } else { - t1 = $[0]; - } - const abortControllerRef = useRef(t1); - let t2; - if ($[1] !== onCancel || $[2] !== onProceed) { - t2 = value => { - if (value === "proceed") { - setIsLaunching(true); - onProceed(abortControllerRef.current.signal).catch(() => setIsLaunching(false)); - } else { - onCancel(); - } - }; - $[1] = onCancel; - $[2] = onProceed; - $[3] = t2; - } else { - t2 = $[3]; - } - const handleSelect = t2; - let t3; - if ($[4] !== onCancel) { - t3 = () => { - abortControllerRef.current.abort(); - onCancel(); - }; - $[4] = onCancel; - $[5] = t3; - } else { - t3 = $[5]; - } - const handleCancel = t3; - let t4; - if ($[6] === Symbol.for("react.memo_cache_sentinel")) { - t4 = [{ - label: "Proceed with Extra Usage billing", - value: "proceed" - }, { - label: "Cancel", - value: "cancel" - }]; - $[6] = t4; - } else { - t4 = $[6]; - } - const options = t4; - let t5; - if ($[7] === Symbol.for("react.memo_cache_sentinel")) { - t5 = Your free ultrareviews for this organization are used. Further reviews bill as Extra Usage (pay-per-use).; - $[7] = t5; - } else { - t5 = $[7]; - } - let t6; - if ($[8] !== handleCancel || $[9] !== handleSelect || $[10] !== isLaunching) { - t6 = {t5}{isLaunching ? Launching… : + )} + + + ) } diff --git a/src/commands/review/ultrareviewCommand.tsx b/src/commands/review/ultrareviewCommand.tsx index 56e92fdf1..faad0fc2f 100644 --- a/src/commands/review/ultrareviewCommand.tsx +++ b/src/commands/review/ultrareviewCommand.tsx @@ -1,57 +1,89 @@ -import type { ContentBlockParam } from '@anthropic-ai/sdk/resources/messages.js'; -import React from 'react'; -import type { LocalJSXCommandCall, LocalJSXCommandOnDone } from '../../types/command.js'; -import { checkOverageGate, confirmOverage, launchRemoteReview } from './reviewRemote.js'; -import { UltrareviewOverageDialog } from './UltrareviewOverageDialog.js'; +import type { ContentBlockParam } from '@anthropic-ai/sdk/resources/messages.js' +import React from 'react' +import type { + LocalJSXCommandCall, + LocalJSXCommandOnDone, +} from '../../types/command.js' +import { + checkOverageGate, + confirmOverage, + launchRemoteReview, +} from './reviewRemote.js' +import { UltrareviewOverageDialog } from './UltrareviewOverageDialog.js' + function contentBlocksToString(blocks: ContentBlockParam[]): string { - return blocks.map(b => b.type === 'text' ? b.text : '').filter(Boolean).join('\n'); + return blocks + .map(b => (b.type === 'text' ? b.text : '')) + .filter(Boolean) + .join('\n') } -async function launchAndDone(args: string, context: Parameters[1], onDone: LocalJSXCommandOnDone, billingNote: string, signal?: AbortSignal): Promise { - const result = await launchRemoteReview(args, context, billingNote); + +async function launchAndDone( + args: string, + context: Parameters[1], + onDone: LocalJSXCommandOnDone, + billingNote: string, + signal?: AbortSignal, +): Promise { + const result = await launchRemoteReview(args, context, billingNote) // User hit Escape during the ~5s launch — the dialog already showed // "cancelled" and unmounted, so skip onDone (would write to a dead // transcript slot) and let the caller skip confirmOverage. - if (signal?.aborted) return; + if (signal?.aborted) return if (result) { - onDone(contentBlocksToString(result), { - shouldQuery: true - }); + onDone(contentBlocksToString(result), { shouldQuery: true }) } else { // Precondition failures now return specific ContentBlockParam[] above. // null only reaches here on teleport failure (PR mode) or non-github // repo — both are CCR/repo connectivity issues. - onDone('Ultrareview failed to launch the remote session. Check that this is a GitHub repo and try again.', { - display: 'system' - }); + onDone( + 'Ultrareview failed to launch the remote session. Check that this is a GitHub repo and try again.', + { display: 'system' }, + ) } } + export const call: LocalJSXCommandCall = async (onDone, context, args) => { - const gate = await checkOverageGate(); + const gate = await checkOverageGate() + if (gate.kind === 'not-enabled') { - onDone('Free ultrareviews used. Enable Extra Usage at https://claude.ai/settings/billing to continue.', { - display: 'system' - }); - return null; + onDone( + 'Free ultrareviews used. Enable Extra Usage at https://claude.ai/settings/billing to continue.', + { display: 'system' }, + ) + return null } + if (gate.kind === 'low-balance') { - onDone(`Balance too low to launch ultrareview ($${gate.available.toFixed(2)} available, $10 minimum). Top up at https://claude.ai/settings/billing`, { - display: 'system' - }); - return null; + onDone( + `Balance too low to launch ultrareview ($${gate.available.toFixed(2)} available, $10 minimum). Top up at https://claude.ai/settings/billing`, + { display: 'system' }, + ) + return null } + if (gate.kind === 'needs-confirm') { - return { - await launchAndDone(args, context, onDone, ' This review bills as Extra Usage.', signal); - // Only persist the confirmation flag after a non-aborted launch — - // otherwise Escape-during-launch would leave the flag set and - // skip this dialog on the next attempt. - if (!signal.aborted) confirmOverage(); - }} onCancel={() => onDone('Ultrareview cancelled.', { - display: 'system' - })} />; + return ( + { + await launchAndDone( + args, + context, + onDone, + ' This review bills as Extra Usage.', + signal, + ) + // Only persist the confirmation flag after a non-aborted launch — + // otherwise Escape-during-launch would leave the flag set and + // skip this dialog on the next attempt. + if (!signal.aborted) confirmOverage() + }} + onCancel={() => onDone('Ultrareview cancelled.', { display: 'system' })} + /> + ) } // gate.kind === 'proceed' - await launchAndDone(args, context, onDone, gate.billingNote); - return null; -}; + await launchAndDone(args, context, onDone, gate.billingNote) + return null +} diff --git a/src/commands/sandbox-toggle/sandbox-toggle.tsx b/src/commands/sandbox-toggle/sandbox-toggle.tsx index dc70b194c..157961ad5 100644 --- a/src/commands/sandbox-toggle/sandbox-toggle.tsx +++ b/src/commands/sandbox-toggle/sandbox-toggle.tsx @@ -1,82 +1,127 @@ -import { relative } from 'path'; -import React from 'react'; -import { getCwdState } from '../../bootstrap/state.js'; -import { SandboxSettings } from '../../components/sandbox/SandboxSettings.js'; -import { color } from '../../ink.js'; -import { getPlatform } from '../../utils/platform.js'; -import { addToExcludedCommands, SandboxManager } from '../../utils/sandbox/sandbox-adapter.js'; -import { getSettings_DEPRECATED, getSettingsFilePathForSource } from '../../utils/settings/settings.js'; -import type { ThemeName } from '../../utils/theme.js'; -export async function call(onDone: (result?: string) => void, _context: unknown, args?: string): Promise { - const settings = getSettings_DEPRECATED(); - const themeName: ThemeName = settings.theme as ThemeName || 'light'; - const platform = getPlatform(); +import { relative } from 'path' +import React from 'react' +import { getCwdState } from '../../bootstrap/state.js' +import { SandboxSettings } from '../../components/sandbox/SandboxSettings.js' +import { color } from '../../ink.js' +import { getPlatform } from '../../utils/platform.js' +import { + addToExcludedCommands, + SandboxManager, +} from '../../utils/sandbox/sandbox-adapter.js' +import { + getSettings_DEPRECATED, + getSettingsFilePathForSource, +} from '../../utils/settings/settings.js' +import type { ThemeName } from '../../utils/theme.js' + +export async function call( + onDone: (result?: string) => void, + _context: unknown, + args?: string, +): Promise { + const settings = getSettings_DEPRECATED() + const themeName: ThemeName = (settings.theme as ThemeName) || 'light' + + const platform = getPlatform() + if (!SandboxManager.isSupportedPlatform()) { // WSL1 users will see this since isSupportedPlatform returns false for WSL1 - const errorMessage = platform === 'wsl' ? 'Error: Sandboxing requires WSL2. WSL1 is not supported.' : 'Error: Sandboxing is currently only supported on macOS, Linux, and WSL2.'; - const message = color('error', themeName)(errorMessage); - onDone(message); - return null; + const errorMessage = + platform === 'wsl' + ? 'Error: Sandboxing requires WSL2. WSL1 is not supported.' + : 'Error: Sandboxing is currently only supported on macOS, Linux, and WSL2.' + const message = color('error', themeName)(errorMessage) + onDone(message) + return null } // Check dependencies - get structured result with errors/warnings - const depCheck = SandboxManager.checkDependencies(); + const depCheck = SandboxManager.checkDependencies() // Check if platform is in enabledPlatforms list (undocumented enterprise setting) if (!SandboxManager.isPlatformInEnabledList()) { - const message = color('error', themeName)(`Error: Sandboxing is disabled for this platform (${platform}) via the enabledPlatforms setting.`); - onDone(message); - return null; + const message = color( + 'error', + themeName, + )( + `Error: Sandboxing is disabled for this platform (${platform}) via the enabledPlatforms setting.`, + ) + onDone(message) + return null } // Check if sandbox settings are locked by higher-priority settings if (SandboxManager.areSandboxSettingsLockedByPolicy()) { - const message = color('error', themeName)('Error: Sandbox settings are overridden by a higher-priority configuration and cannot be changed locally.'); - onDone(message); - return null; + const message = color( + 'error', + themeName, + )( + 'Error: Sandbox settings are overridden by a higher-priority configuration and cannot be changed locally.', + ) + onDone(message) + return null } // Parse the arguments - const trimmedArgs = args?.trim() || ''; + const trimmedArgs = args?.trim() || '' // If no args, show the interactive menu if (!trimmedArgs) { - return ; + return } // Handle subcommands if (trimmedArgs) { - const parts = trimmedArgs.split(' '); - const subcommand = parts[0]; + const parts = trimmedArgs.split(' ') + const subcommand = parts[0] + if (subcommand === 'exclude') { // Handle exclude subcommand - const commandPattern = trimmedArgs.slice('exclude '.length).trim(); + const commandPattern = trimmedArgs.slice('exclude '.length).trim() + if (!commandPattern) { - const message = color('error', themeName)('Error: Please provide a command pattern to exclude (e.g., /sandbox exclude "npm run test:*")'); - onDone(message); - return null; + const message = color( + 'error', + themeName, + )( + 'Error: Please provide a command pattern to exclude (e.g., /sandbox exclude "npm run test:*")', + ) + onDone(message) + return null } // Remove quotes if present - const cleanPattern = commandPattern.replace(/^["']|["']$/g, ''); + const cleanPattern = commandPattern.replace(/^["']|["']$/g, '') // Add to excludedCommands - addToExcludedCommands(cleanPattern); + addToExcludedCommands(cleanPattern) // Get the local settings path and make it relative to cwd - const localSettingsPath = getSettingsFilePathForSource('localSettings'); - const relativePath = localSettingsPath ? relative(getCwdState(), localSettingsPath) : '.claude/settings.local.json'; - const message = color('success', themeName)(`Added "${cleanPattern}" to excluded commands in ${relativePath}`); - onDone(message); - return null; + const localSettingsPath = getSettingsFilePathForSource('localSettings') + const relativePath = localSettingsPath + ? relative(getCwdState(), localSettingsPath) + : '.claude/settings.local.json' + + const message = color( + 'success', + themeName, + )(`Added "${cleanPattern}" to excluded commands in ${relativePath}`) + + onDone(message) + return null } else { // Unknown subcommand - const message = color('error', themeName)(`Error: Unknown subcommand "${subcommand}". Available subcommand: exclude`); - onDone(message); - return null; + const message = color( + 'error', + themeName, + )( + `Error: Unknown subcommand "${subcommand}". Available subcommand: exclude`, + ) + onDone(message) + return null } } // Should never reach here since we handle all cases above - return null; + return null } diff --git a/src/commands/session/session.tsx b/src/commands/session/session.tsx index b7ae9fa1c..82135a3fa 100644 --- a/src/commands/session/session.tsx +++ b/src/commands/session/session.tsx @@ -1,139 +1,83 @@ -import { c as _c } from "react/compiler-runtime"; -import { toString as qrToString } from 'qrcode'; -import * as React from 'react'; -import { useEffect, useState } from 'react'; -import { Pane } from '../../components/design-system/Pane.js'; -import { Box, Text } from '../../ink.js'; -import { useKeybinding } from '../../keybindings/useKeybinding.js'; -import { useAppState } from '../../state/AppState.js'; -import type { LocalJSXCommandCall } from '../../types/command.js'; -import { logForDebugging } from '../../utils/debug.js'; +import { toString as qrToString } from 'qrcode' +import * as React from 'react' +import { useEffect, useState } from 'react' +import { Pane } from '../../components/design-system/Pane.js' +import { Box, Text } from '../../ink.js' +import { useKeybinding } from '../../keybindings/useKeybinding.js' +import { useAppState } from '../../state/AppState.js' +import type { LocalJSXCommandCall } from '../../types/command.js' +import { logForDebugging } from '../../utils/debug.js' + type Props = { - onDone: () => void; -}; -function SessionInfo(t0) { - const $ = _c(19); - const { - onDone - } = t0; - const remoteSessionUrl = useAppState(_temp); - const [qrCode, setQrCode] = useState(""); - let t1; - let t2; - if ($[0] !== remoteSessionUrl) { - t1 = () => { - if (!remoteSessionUrl) { - return; - } - const url = remoteSessionUrl; - const generateQRCode = async function generateQRCode() { - const qr = await qrToString(url, { - type: "utf8", - errorCorrectionLevel: "L" - }); - setQrCode(qr); - }; - generateQRCode().catch(_temp2); - }; - t2 = [remoteSessionUrl]; - $[0] = remoteSessionUrl; - $[1] = t1; - $[2] = t2; - } else { - t1 = $[1]; - t2 = $[2]; - } - useEffect(t1, t2); - let t3; - if ($[3] === Symbol.for("react.memo_cache_sentinel")) { - t3 = { - context: "Confirmation" - }; - $[3] = t3; - } else { - t3 = $[3]; - } - useKeybinding("confirm:no", onDone, t3); + onDone: () => void +} + +function SessionInfo({ onDone }: Props): React.ReactNode { + const remoteSessionUrl = useAppState(s => s.remoteSessionUrl) + const [qrCode, setQrCode] = useState('') + + // Generate QR code when URL is available + useEffect(() => { + if (!remoteSessionUrl) return + + const url = remoteSessionUrl + async function generateQRCode(): Promise { + const qr = await qrToString(url, { + type: 'utf8', + errorCorrectionLevel: 'L', + }) + setQrCode(qr) + } + // Intentionally silent fail - URL is still shown so QR is non-critical + generateQRCode().catch(e => { + logForDebugging('QR code generation failed', e) + }) + }, [remoteSessionUrl]) + + // Handle ESC to dismiss + useKeybinding('confirm:no', onDone, { context: 'Confirmation' }) + + // Not in remote mode if (!remoteSessionUrl) { - let t4; - if ($[4] === Symbol.for("react.memo_cache_sentinel")) { - t4 = Not in remote mode. Start with `claude --remote` to use this command.(press esc to close); - $[4] = t4; - } else { - t4 = $[4]; - } - return t4; + return ( + + + Not in remote mode. Start with `claude --remote` to use this command. + + (press esc to close) + + ) } - let T0; - let t4; - let t5; - if ($[5] !== qrCode) { - const lines = qrCode.split("\n").filter(_temp3); - const isLoading = lines.length === 0; - T0 = Pane; - if ($[9] === Symbol.for("react.memo_cache_sentinel")) { - t4 = Remote session; - $[9] = t4; - } else { - t4 = $[9]; - } - t5 = isLoading ? Generating QR code… : lines.map(_temp4); - $[5] = qrCode; - $[6] = T0; - $[7] = t4; - $[8] = t5; - } else { - T0 = $[6]; - t4 = $[7]; - t5 = $[8]; - } - let t6; - if ($[10] === Symbol.for("react.memo_cache_sentinel")) { - t6 = Open in browser: ; - $[10] = t6; - } else { - t6 = $[10]; - } - let t7; - if ($[11] !== remoteSessionUrl) { - t7 = {t6}{remoteSessionUrl}; - $[11] = remoteSessionUrl; - $[12] = t7; - } else { - t7 = $[12]; - } - let t8; - if ($[13] === Symbol.for("react.memo_cache_sentinel")) { - t8 = (press esc to close); - $[13] = t8; - } else { - t8 = $[13]; - } - let t9; - if ($[14] !== T0 || $[15] !== t4 || $[16] !== t5 || $[17] !== t7) { - t9 = {t4}{t5}{t7}{t8}; - $[14] = T0; - $[15] = t4; - $[16] = t5; - $[17] = t7; - $[18] = t9; - } else { - t9 = $[18]; - } - return t9; -} -function _temp4(line_0, i) { - return {line_0}; -} -function _temp3(line) { - return line.length > 0; -} -function _temp2(e) { - logForDebugging("QR code generation failed", e); -} -function _temp(s) { - return s.remoteSessionUrl; + + const lines = qrCode.split('\n').filter(line => line.length > 0) + const isLoading = lines.length === 0 + + return ( + + + Remote session + + + {/* QR Code - silently fails if generation errors, URL is still shown */} + {isLoading ? ( + Generating QR code… + ) : ( + lines.map((line, i) => {line}) + )} + + {/* URL */} + + Open in browser: + {remoteSessionUrl} + + + + (press esc to close) + + + ) } + export const call: LocalJSXCommandCall = async onDone => { - return ; -}; + return +} diff --git a/src/commands/skills/skills.tsx b/src/commands/skills/skills.tsx index a765951c3..568efdc52 100644 --- a/src/commands/skills/skills.tsx +++ b/src/commands/skills/skills.tsx @@ -1,7 +1,11 @@ -import * as React from 'react'; -import type { LocalJSXCommandContext } from '../../commands.js'; -import { SkillsMenu } from '../../components/skills/SkillsMenu.js'; -import type { LocalJSXCommandOnDone } from '../../types/command.js'; -export async function call(onDone: LocalJSXCommandOnDone, context: LocalJSXCommandContext): Promise { - return ; +import * as React from 'react' +import type { LocalJSXCommandContext } from '../../commands.js' +import { SkillsMenu } from '../../components/skills/SkillsMenu.js' +import type { LocalJSXCommandOnDone } from '../../types/command.js' + +export async function call( + onDone: LocalJSXCommandOnDone, + context: LocalJSXCommandContext, +): Promise { + return } diff --git a/src/commands/stats/stats.tsx b/src/commands/stats/stats.tsx index 2fe5ca9d7..b467ee3d6 100644 --- a/src/commands/stats/stats.tsx +++ b/src/commands/stats/stats.tsx @@ -1,6 +1,7 @@ -import * as React from 'react'; -import { Stats } from '../../components/Stats.js'; -import type { LocalJSXCommandCall } from '../../types/command.js'; +import * as React from 'react' +import { Stats } from '../../components/Stats.js' +import type { LocalJSXCommandCall } from '../../types/command.js' + export const call: LocalJSXCommandCall = async onDone => { - return ; -}; + return +} diff --git a/src/commands/status/status.tsx b/src/commands/status/status.tsx index 6e0d9c342..25bb4b107 100644 --- a/src/commands/status/status.tsx +++ b/src/commands/status/status.tsx @@ -1,7 +1,11 @@ -import * as React from 'react'; -import type { LocalJSXCommandContext } from '../../commands.js'; -import { Settings } from '../../components/Settings/Settings.js'; -import type { LocalJSXCommandOnDone } from '../../types/command.js'; -export async function call(onDone: LocalJSXCommandOnDone, context: LocalJSXCommandContext): Promise { - return ; +import * as React from 'react' +import type { LocalJSXCommandContext } from '../../commands.js' +import { Settings } from '../../components/Settings/Settings.js' +import type { LocalJSXCommandOnDone } from '../../types/command.js' + +export async function call( + onDone: LocalJSXCommandOnDone, + context: LocalJSXCommandContext, +): Promise { + return } diff --git a/src/commands/statusline.tsx b/src/commands/statusline.tsx index 2e5778156..d12f4ad2d 100644 --- a/src/commands/statusline.tsx +++ b/src/commands/statusline.tsx @@ -1,23 +1,31 @@ -import type { ContentBlockParam } from '@anthropic-ai/sdk/resources/index.mjs'; -import type { Command } from '../commands.js'; -import { AGENT_TOOL_NAME } from '../tools/AgentTool/constants.js'; +import type { ContentBlockParam } from '@anthropic-ai/sdk/resources/index.mjs' +import type { Command } from '../commands.js' +import { AGENT_TOOL_NAME } from '../tools/AgentTool/constants.js' + const statusline = { type: 'prompt', description: "Set up Claude Code's status line UI", - contentLength: 0, - // Dynamic content + contentLength: 0, // Dynamic content aliases: [], name: 'statusline', progressMessage: 'setting up statusLine', - allowedTools: [AGENT_TOOL_NAME, 'Read(~/**)', 'Edit(~/.claude/settings.json)'], + allowedTools: [ + AGENT_TOOL_NAME, + 'Read(~/**)', + 'Edit(~/.claude/settings.json)', + ], source: 'builtin', disableNonInteractive: true, async getPromptForCommand(args): Promise { - const prompt = args.trim() || 'Configure my statusLine from my shell PS1 configuration'; - return [{ - type: 'text', - text: `Create an ${AGENT_TOOL_NAME} with subagent_type "statusline-setup" and the prompt "${prompt}"` - }]; - } -} satisfies Command; -export default statusline; + const prompt = + args.trim() || 'Configure my statusLine from my shell PS1 configuration' + return [ + { + type: 'text', + text: `Create an ${AGENT_TOOL_NAME} with subagent_type "statusline-setup" and the prompt "${prompt}"`, + }, + ] + }, +} satisfies Command + +export default statusline diff --git a/src/commands/tag/tag.tsx b/src/commands/tag/tag.tsx index e399248a2..c9d0c6524 100644 --- a/src/commands/tag/tag.tsx +++ b/src/commands/tag/tag.tsx @@ -1,214 +1,167 @@ -import { c as _c } from "react/compiler-runtime"; -import chalk from 'chalk'; -import type { UUID } from 'crypto'; -import * as React from 'react'; -import { getSessionId } from '../../bootstrap/state.js'; -import type { CommandResultDisplay } from '../../commands.js'; -import { Select } from '../../components/CustomSelect/select.js'; -import { Dialog } from '../../components/design-system/Dialog.js'; -import { COMMON_HELP_ARGS, COMMON_INFO_ARGS } from '../../constants/xml.js'; -import { Box, Text } from '../../ink.js'; -import { logEvent } from '../../services/analytics/index.js'; -import type { LocalJSXCommandOnDone } from '../../types/command.js'; -import { recursivelySanitizeUnicode } from '../../utils/sanitization.js'; -import { getCurrentSessionTag, getTranscriptPath, saveTag } from '../../utils/sessionStorage.js'; -function ConfirmRemoveTag(t0) { - const $ = _c(11); - const { - tagName, - onConfirm, - onCancel - } = t0; - const t1 = `Current tag: #${tagName}`; - let t2; - if ($[0] === Symbol.for("react.memo_cache_sentinel")) { - t2 = This will remove the tag from the current session.; - $[0] = t2; - } else { - t2 = $[0]; - } - let t3; - if ($[1] !== onCancel || $[2] !== onConfirm) { - t3 = value => value === "yes" ? onConfirm() : onCancel(); - $[1] = onCancel; - $[2] = onConfirm; - $[3] = t3; - } else { - t3 = $[3]; - } - let t4; - if ($[4] === Symbol.for("react.memo_cache_sentinel")) { - t4 = [{ - label: "Yes, remove tag", - value: "yes" - }, { - label: "No, keep tag", - value: "no" - }]; - $[4] = t4; - } else { - t4 = $[4]; - } - let t5; - if ($[5] !== t3) { - t5 = {t2}; - $[10] = handleSelect; - $[11] = options; - $[12] = t5; - } else { - t5 = $[12]; - } - let t6; - if ($[13] !== t4 || $[14] !== t5) { - t6 = {t4}{t5}; - $[13] = t4; - $[14] = t5; - $[15] = t6; - } else { - t6 = $[15]; - } - let t7; - if ($[16] !== handleCancel || $[17] !== t6) { - t7 = {t6}; - $[16] = handleCancel; - $[17] = t6; - $[18] = t7; - } else { - t7 = $[18]; - } - return t7; + + return ( + + + {/* Description for first-time users */} + {!hasGenerated && ( + + Relive your year of coding with Claude. + + { + "We'll create a personalized ASCII animation celebrating your journey." + } + + + )} + + {/* Menu */} +