From f9df968a15c68afe4c23ace9a4875d767faaa1e2 Mon Sep 17 00:00:00 2001 From: dal Date: Wed, 8 Oct 2025 10:23:52 -0600 Subject: [PATCH] organized files --- apps/cli/src/buster/program.tsx | 2 +- apps/cli/src/commands/{ => auth}/auth.tsx | 2 +- .../{auth-command.tsx => auth/index.tsx} | 2 +- apps/cli/src/commands/command-registry.tsx | 10 +++---- .../{deploy-command.tsx => deploy/index.tsx} | 8 +++--- .../{init-command.tsx => init/index.tsx} | 0 apps/cli/src/commands/{ => init}/init.tsx | 4 +-- .../cli/src/commands/{ => main}/main.test.tsx | 0 apps/cli/src/commands/{ => main}/main.tsx | 28 +++++++++---------- .../index.tsx} | 0 .../src/commands/{ => settings}/settings.tsx | 2 +- .../command.tsx} | 2 +- apps/cli/src/commands/update/index.ts | 1 + 13 files changed, 31 insertions(+), 30 deletions(-) rename apps/cli/src/commands/{ => auth}/auth.tsx (99%) rename apps/cli/src/commands/{auth-command.tsx => auth/index.tsx} (97%) rename apps/cli/src/commands/{deploy-command.tsx => deploy/index.tsx} (89%) rename apps/cli/src/commands/{init-command.tsx => init/index.tsx} (100%) rename apps/cli/src/commands/{ => init}/init.tsx (99%) rename apps/cli/src/commands/{ => main}/main.test.tsx (100%) rename apps/cli/src/commands/{ => main}/main.tsx (90%) rename apps/cli/src/commands/{settings-command.tsx => settings/index.tsx} (100%) rename apps/cli/src/commands/{ => settings}/settings.tsx (95%) rename apps/cli/src/commands/{update-command.tsx => update/command.tsx} (92%) diff --git a/apps/cli/src/buster/program.tsx b/apps/cli/src/buster/program.tsx index 4820c6564..f2e9677b7 100644 --- a/apps/cli/src/buster/program.tsx +++ b/apps/cli/src/buster/program.tsx @@ -1,6 +1,6 @@ import { program as commander } from 'commander'; import { render } from 'ink'; -import { Main } from '../commands/main'; +import { Main } from '../commands/main/main'; import { getCurrentVersion } from '../commands/update/update-handler'; import { setupPreActionHook } from './hooks'; diff --git a/apps/cli/src/commands/auth.tsx b/apps/cli/src/commands/auth/auth.tsx similarity index 99% rename from apps/cli/src/commands/auth.tsx rename to apps/cli/src/commands/auth/auth.tsx index b5f37caec..1a26a6fec 100644 --- a/apps/cli/src/commands/auth.tsx +++ b/apps/cli/src/commands/auth/auth.tsx @@ -7,7 +7,7 @@ import { deleteCredentials, loadCredentials, saveCredentials, -} from '../utils/credentials'; +} from '../../utils/credentials'; interface AuthProps { apiKey?: string; diff --git a/apps/cli/src/commands/auth-command.tsx b/apps/cli/src/commands/auth/index.tsx similarity index 97% rename from apps/cli/src/commands/auth-command.tsx rename to apps/cli/src/commands/auth/index.tsx index 8c444d335..074aea164 100644 --- a/apps/cli/src/commands/auth-command.tsx +++ b/apps/cli/src/commands/auth/index.tsx @@ -34,7 +34,7 @@ export function createAuthCommand(): Command { // If we have an API key in CI, just validate and save it without interactive UI if (isCIEnvironment && (options.apiKey || process.env.BUSTER_API_KEY)) { const { createBusterSDK } = await import('@buster/sdk'); - const { saveCredentials } = await import('../utils/credentials'); + const { saveCredentials } = await import('../../utils/credentials'); const apiKey = options.apiKey || process.env.BUSTER_API_KEY; const host = diff --git a/apps/cli/src/commands/command-registry.tsx b/apps/cli/src/commands/command-registry.tsx index 97d36ad4e..651cb7cca 100644 --- a/apps/cli/src/commands/command-registry.tsx +++ b/apps/cli/src/commands/command-registry.tsx @@ -1,9 +1,9 @@ import type { Command } from 'commander'; -import { createAuthCommand } from './auth-command'; -import { createDeployCommand } from './deploy-command'; -import { createInitCommand } from './init-command'; -import { createSettingsCommand } from './settings-command'; -import { createUpdateCommand } from './update-command'; +import { createAuthCommand } from './auth'; +import { createDeployCommand } from './deploy'; +import { createInitCommand } from './init'; +import { createSettingsCommand } from './settings'; +import { createUpdateCommand } from './update'; /** * Registers all CLI subcommands with the program diff --git a/apps/cli/src/commands/deploy-command.tsx b/apps/cli/src/commands/deploy/index.tsx similarity index 89% rename from apps/cli/src/commands/deploy-command.tsx rename to apps/cli/src/commands/deploy/index.tsx index ca9ceb28f..54df38438 100644 --- a/apps/cli/src/commands/deploy-command.tsx +++ b/apps/cli/src/commands/deploy/index.tsx @@ -1,7 +1,7 @@ import { Command } from 'commander'; import { render } from 'ink'; -import { DeployCommand } from './deploy/deploy'; -import { DeployOptionsSchema } from './deploy/schemas'; +import { DeployCommand } from './deploy'; +import { DeployOptionsSchema } from './schemas'; /** * Creates the deploy command for deploying semantic models @@ -32,13 +32,13 @@ export function createDeployCommand(): Command { render(); } else { // Direct execution for cleaner CLI output - const { deployHandler } = await import('./deploy/deploy-handler.js'); + const { deployHandler } = await import('./deploy-handler.js'); await deployHandler(parsedOptions); } } catch (error) { // Import the error formatter and type guard const { isDeploymentValidationError, formatDeployError, getExitCode } = await import( - './deploy/utils/errors.js' + './utils/errors.js' ); // Check if it's a DeploymentValidationError to handle it specially diff --git a/apps/cli/src/commands/init-command.tsx b/apps/cli/src/commands/init/index.tsx similarity index 100% rename from apps/cli/src/commands/init-command.tsx rename to apps/cli/src/commands/init/index.tsx diff --git a/apps/cli/src/commands/init.tsx b/apps/cli/src/commands/init/init.tsx similarity index 99% rename from apps/cli/src/commands/init.tsx rename to apps/cli/src/commands/init/init.tsx index 96a7bab6d..6b89c48db 100644 --- a/apps/cli/src/commands/init.tsx +++ b/apps/cli/src/commands/init/init.tsx @@ -5,8 +5,8 @@ import { Box, Text, useApp, useInput } from 'ink'; import Spinner from 'ink-spinner'; import TextInput from 'ink-text-input'; import { useEffect, useState } from 'react'; -import { BusterBanner } from '../components/banner'; -import { type Credentials, getCredentials, saveCredentials } from '../utils/credentials'; +import { BusterBanner } from '../../components/banner'; +import { type Credentials, getCredentials, saveCredentials } from '../../utils/credentials'; interface InitProps { apiKey?: string; diff --git a/apps/cli/src/commands/main.test.tsx b/apps/cli/src/commands/main/main.test.tsx similarity index 100% rename from apps/cli/src/commands/main.test.tsx rename to apps/cli/src/commands/main/main.test.tsx diff --git a/apps/cli/src/commands/main.tsx b/apps/cli/src/commands/main/main.tsx similarity index 90% rename from apps/cli/src/commands/main.tsx rename to apps/cli/src/commands/main/main.tsx index 2104af8f6..c67b74478 100644 --- a/apps/cli/src/commands/main.tsx +++ b/apps/cli/src/commands/main/main.tsx @@ -8,19 +8,19 @@ import { ChatTitle, ChatVersionTagline, VimStatus, -} from '../components/chat-layout'; -import { HistoryBrowser } from '../components/history-browser'; -import { AgentMessageComponent } from '../components/message'; -import { SettingsForm } from '../components/settings-form'; -import { ExpansionContext } from '../hooks/use-expansion'; -import type { CliAgentMessage } from '../services/analytics-engineer-handler'; -import type { Conversation } from '../utils/conversation-history'; -import { loadConversation, saveModelMessages } from '../utils/conversation-history'; -import { getCurrentChatId, initNewSession, setSessionChatId } from '../utils/session'; -import { getSetting } from '../utils/settings'; -import type { SlashCommand } from '../utils/slash-commands'; -import { transformModelMessagesToUI } from '../utils/transform-messages'; -import type { VimMode } from '../utils/vim-mode'; +} from '../../components/chat-layout'; +import { HistoryBrowser } from '../../components/history-browser'; +import { AgentMessageComponent } from '../../components/message'; +import { SettingsForm } from '../../components/settings-form'; +import { ExpansionContext } from '../../hooks/use-expansion'; +import type { CliAgentMessage } from '../../services/analytics-engineer-handler'; +import type { Conversation } from '../../utils/conversation-history'; +import { loadConversation, saveModelMessages } from '../../utils/conversation-history'; +import { getCurrentChatId, initNewSession, setSessionChatId } from '../../utils/session'; +import { getSetting } from '../../utils/settings'; +import type { SlashCommand } from '../../utils/slash-commands'; +import { transformModelMessagesToUI } from '../../utils/transform-messages'; +import type { VimMode } from '../../utils/vim-mode'; type AppMode = 'Planning' | 'Auto-accept' | 'None'; @@ -138,7 +138,7 @@ export function Main() { await saveModelMessages(chatId, cwd, updatedModelMessages); // Import and run the analytics engineer agent - const { runAnalyticsEngineerAgent } = await import('../services/analytics-engineer-handler'); + const { runAnalyticsEngineerAgent } = await import('../../services/analytics-engineer-handler'); // Create AbortController for this agent execution const abortController = new AbortController(); diff --git a/apps/cli/src/commands/settings-command.tsx b/apps/cli/src/commands/settings/index.tsx similarity index 100% rename from apps/cli/src/commands/settings-command.tsx rename to apps/cli/src/commands/settings/index.tsx diff --git a/apps/cli/src/commands/settings.tsx b/apps/cli/src/commands/settings/settings.tsx similarity index 95% rename from apps/cli/src/commands/settings.tsx rename to apps/cli/src/commands/settings/settings.tsx index cca3a9fe5..e4fcaccea 100644 --- a/apps/cli/src/commands/settings.tsx +++ b/apps/cli/src/commands/settings/settings.tsx @@ -1,6 +1,6 @@ import { Box, Text } from 'ink'; import { useEffect, useState } from 'react'; -import { getSetting, setSetting, toggleSetting } from '../utils/settings'; +import { getSetting, setSetting, toggleSetting } from '../../utils/settings'; interface SettingsCommandProps { vimMode?: boolean; diff --git a/apps/cli/src/commands/update-command.tsx b/apps/cli/src/commands/update/command.tsx similarity index 92% rename from apps/cli/src/commands/update-command.tsx rename to apps/cli/src/commands/update/command.tsx index d87310a1d..07f2f1e92 100644 --- a/apps/cli/src/commands/update-command.tsx +++ b/apps/cli/src/commands/update/command.tsx @@ -1,6 +1,6 @@ import { Command } from 'commander'; import { render } from 'ink'; -import { UpdateCommand } from './update/index'; +import { UpdateCommand } from './update'; /** * Creates the update command for updating the CLI to the latest version diff --git a/apps/cli/src/commands/update/index.ts b/apps/cli/src/commands/update/index.ts index f7ec529be..eea6b8493 100644 --- a/apps/cli/src/commands/update/index.ts +++ b/apps/cli/src/commands/update/index.ts @@ -13,3 +13,4 @@ export { updateHandler, } from './update-handler'; export { type UpdateOptions, UpdateOptionsSchema, type UpdateResult } from './update-schemas'; +export { createUpdateCommand } from './command';