diff --git a/src/commands/index.ts b/src/commands/index.ts
new file mode 100644
index 00000000..007664e5
--- /dev/null
+++ b/src/commands/index.ts
@@ -0,0 +1,17 @@
+/**
+ * Commands module barrel export
+ */
+
+export { handleApiCommand } from './api-command';
+export { handleCleanupCommand } from './cleanup-command';
+export { handleCliproxyCommand } from './cliproxy-command';
+export { handleConfigCommand } from './config-command';
+export { handleCopilotCommand } from './copilot-command';
+export { handleDoctorCommand } from './doctor-command';
+export { handleHelpCommand } from './help-command';
+export { handleInstallCommand } from './install-command';
+export { handleMigrateCommand } from './migrate-command';
+export { handleShellCompletionCommand } from './shell-completion-command';
+export { handleSyncCommand } from './sync-command';
+export { handleUpdateCommand } from './update-command';
+export { handleVersionCommand } from './version-command';
diff --git a/src/utils/index.ts b/src/utils/index.ts
new file mode 100644
index 00000000..e8190542
--- /dev/null
+++ b/src/utils/index.ts
@@ -0,0 +1,23 @@
+/**
+ * Utils module barrel export
+ * Selective exports of commonly used utilities
+ */
+
+// UI utilities (main export)
+export * from './ui';
+
+// Shell execution
+export { execClaude, escapeShellArg } from './shell-executor';
+
+// Claude detection and management
+export { getClaudeCliInfo } from './claude-detector';
+export { ClaudeSymlinkManager } from './claude-symlink-manager';
+export { ClaudeDirInstaller } from './claude-dir-installer';
+
+// Utilities
+export { ProgressIndicator } from './progress-indicator';
+export { getVersion } from './version';
+export { ErrorManager } from './error-manager';
+
+// Platform utilities
+export { default as getPlatformCommands } from './platform-commands';