theclawbay 0.3.87 → 0.4.1

package/dist/lib/base-command.js

@@ -4,6 +4,7 @@ exports.BaseCommand = void 0;
 const core_1 = require("@oclif/core");
 const errors_1 = require("./errors");
 const update_check_1 = require("./update-check");
+const tui_1 = require("./shared/tui");
 class BaseCommand extends core_1.Command {
     async runSafe(action) {
         try {
@@ -43,12 +44,13 @@ class BaseCommand extends core_1.Command {
         const render = (prefix) => {
             process.stdout.write(`\r\x1b[2K${prefix} ${message}`);
         };
+        const spinnerFrame = () => tui_1.tint.accent(frames[frameIndex] ?? frames[0] ?? "•");
         const ensureTimer = () => {
             if (timer)
                 return;
             timer = setInterval(() => {
                 frameIndex = (frameIndex + 1) % frames.length;
-                render(frames[frameIndex] ?? frames[0] ?? "•");
+                render(spinnerFrame());
             }, 80);
             if (typeof timer.unref === "function")
                 timer.unref();
@@ -63,20 +65,20 @@ class BaseCommand extends core_1.Command {
             update(nextMessage) {
                 message = nextMessage;
                 ensureTimer();
-                render(frames[frameIndex] ?? frames[0] ?? "•");
+                render(spinnerFrame());
             },
             succeed(nextMessage) {
                 if (nextMessage)
-                    message = nextMessage;
+                    message = tui_1.tint.bold(nextMessage);
                 clearTimer();
-                render("✓");
+                render(tui_1.tint.green(tui_1.glyph.tick));
                 process.stdout.write("\n");
             },
             fail(nextMessage) {
                 if (nextMessage)
                     message = nextMessage;
                 clearTimer();
-                render("✕");
+                render(tui_1.tint.red(tui_1.glyph.cross));
                 process.stdout.write("\n");
             },
             stop() {

package/dist/lib/clients/aider-cleanup.d.ts

@@ -0,0 +1 @@
+export declare function cleanupAiderConfig(): Promise<boolean>;

package/dist/lib/clients/aider-cleanup.js

@@ -0,0 +1,15 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.cleanupAiderConfig = cleanupAiderConfig;
+const fsx_1 = require("../shared/fsx");
+const aider_1 = require("./aider");
+const fsx_cleanup_1 = require("../shared/fsx-cleanup");
+// Extracted from src/commands/logout.ts (theclawbay CLI restructure).
+// Code motion only: bodies are verbatim from the original file.
+async function cleanupAiderConfig() {
+    const existing = await (0, fsx_1.readFileIfExists)(aider_1.AIDER_CONFIG_PATH);
+    if (existing === null)
+        return false;
+    const next = (0, fsx_1.removeManagedBlock)(existing, aider_1.AIDER_MANAGED_START, aider_1.AIDER_MANAGED_END);
+    return (0, fsx_cleanup_1.writeIfChanged)(aider_1.AIDER_CONFIG_PATH, next, existing);
+}

package/dist/lib/clients/aider.d.ts

@@ -0,0 +1,14 @@
+export declare const DEFAULT_AIDER_MODEL: string;
+export declare const AIDER_CONFIG_PATH: string;
+export declare const AIDER_MANAGED_START = "# theclawbay-aider-managed:start";
+export declare const AIDER_MANAGED_END = "# theclawbay-aider-managed:end";
+export declare function detectAiderClient(): Promise<boolean>;
+export declare function writeAiderConfig(params: {
+    backendUrl: string;
+    model: string;
+    models?: Array<{
+        id: string;
+        name: string;
+    }>;
+    apiKey: string;
+}): Promise<string>;

package/dist/lib/clients/aider.js

@@ -0,0 +1,57 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.AIDER_MANAGED_END = exports.AIDER_MANAGED_START = exports.AIDER_CONFIG_PATH = exports.DEFAULT_AIDER_MODEL = void 0;
+exports.detectAiderClient = detectAiderClient;
+exports.writeAiderConfig = writeAiderConfig;
+const models_1 = require("../shared/models");
+const node_path_1 = __importDefault(require("node:path"));
+const node_os_1 = __importDefault(require("node:os"));
+const platform_1 = require("../shared/platform");
+const fsx_1 = require("../shared/fsx");
+const urls_1 = require("../shared/urls");
+const promises_1 = __importDefault(require("node:fs/promises"));
+// Extracted from src/commands/setup.ts (theclawbay CLI restructure).
+// Code motion only: bodies are verbatim from the original file.
+exports.DEFAULT_AIDER_MODEL = models_1.DEFAULT_CODEX_MODEL;
+exports.AIDER_CONFIG_PATH = node_path_1.default.join(node_os_1.default.homedir(), ".aider.conf.yml");
+exports.AIDER_MANAGED_START = "# theclawbay-aider-managed:start";
+exports.AIDER_MANAGED_END = "# theclawbay-aider-managed:end";
+async function detectAiderClient() {
+    if ((0, platform_1.hasCommand)("aider"))
+        return true;
+    const candidates = [
+        exports.AIDER_CONFIG_PATH,
+        node_path_1.default.join(node_os_1.default.homedir(), ".aider.conf.yaml"),
+        node_path_1.default.join(process.cwd(), ".aider.conf.yml"),
+        node_path_1.default.join(process.cwd(), ".aider.chat.history.md"),
+    ];
+    for (const candidate of candidates) {
+        if (await (0, fsx_1.pathExists)(candidate))
+            return true;
+    }
+    return false;
+}
+async function writeAiderConfig(params) {
+    const existing = (await (0, fsx_1.readFileIfExists)(exports.AIDER_CONFIG_PATH)) ?? "";
+    const cleaned = (0, fsx_1.removeManagedBlock)(existing, exports.AIDER_MANAGED_START, exports.AIDER_MANAGED_END);
+    // Aliases let users switch with `/model <id>` without the openai/ prefix.
+    const aliasModels = (params.models ?? []).filter((model) => Boolean(model.id));
+    const aliasLines = aliasModels.length > 0
+        ? ["alias:", ...aliasModels.map((model) => `  - ${JSON.stringify(`${model.id}:openai/${model.id}`)}`)]
+        : [];
+    const next = (0, fsx_1.appendManagedBlock)(cleaned, [
+        exports.AIDER_MANAGED_START,
+        `model: ${JSON.stringify(`openai/${params.model.trim() || exports.DEFAULT_AIDER_MODEL}`)}`,
+        `openai-api-key: ${JSON.stringify(params.apiKey)}`,
+        `openai-api-base: ${JSON.stringify((0, urls_1.openAiCompatibleProxyUrl)(params.backendUrl))}`,
+        "restore-chat-history: true",
+        ...aliasLines,
+        exports.AIDER_MANAGED_END,
+    ]);
+    await promises_1.default.mkdir(node_path_1.default.dirname(exports.AIDER_CONFIG_PATH), { recursive: true });
+    await promises_1.default.writeFile(exports.AIDER_CONFIG_PATH, next, "utf8");
+    return exports.AIDER_CONFIG_PATH;
+}

package/dist/lib/clients/claude-cleanup.d.ts

@@ -0,0 +1,2 @@
+export declare function cleanupClaudeEditorSettings(): Promise<string[]>;
+export declare function cleanupClaudeDesktop3pConfig(): Promise<boolean>;

package/dist/lib/clients/claude-cleanup.js

@@ -0,0 +1,88 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.cleanupClaudeEditorSettings = cleanupClaudeEditorSettings;
+exports.cleanupClaudeDesktop3pConfig = cleanupClaudeDesktop3pConfig;
+const fsx_1 = require("../shared/fsx");
+const claude_1 = require("./claude");
+const fsx_cleanup_1 = require("../shared/fsx-cleanup");
+const promises_1 = __importDefault(require("node:fs/promises"));
+const node_path_1 = __importDefault(require("node:path"));
+// Extracted from src/commands/logout.ts (theclawbay CLI restructure).
+// Code motion only: bodies are verbatim from the original file.
+async function cleanupClaudeEditorSettings() {
+    const snapshotRaw = await (0, fsx_1.readFileIfExists)(claude_1.CLAUDE_EDITOR_SETTINGS_STATE_PATH);
+    if (snapshotRaw === null || !snapshotRaw.trim())
+        return [];
+    let entries = [];
+    try {
+        entries = JSON.parse(snapshotRaw);
+    }
+    catch {
+        return [];
+    }
+    const updated = [];
+    for (const entry of entries) {
+        const settings = await (0, fsx_cleanup_1.readJsonObjectFile)(entry.settingsPath);
+        if (!entry.envHadKey) {
+            delete settings[claude_1.CLAUDE_CODE_EDITOR_ENV_SETTING];
+        }
+        else {
+            settings[claude_1.CLAUDE_CODE_EDITOR_ENV_SETTING] = entry.envPreviousValue;
+        }
+        if (!entry.disableLoginPromptHadKey) {
+            delete settings[claude_1.CLAUDE_CODE_EDITOR_DISABLE_LOGIN_PROMPT_SETTING];
+        }
+        else {
+            settings[claude_1.CLAUDE_CODE_EDITOR_DISABLE_LOGIN_PROMPT_SETTING] = entry.disableLoginPromptPreviousValue;
+        }
+        if (entry.existed || Object.keys(settings).length > 0) {
+            const next = `${JSON.stringify(settings, null, 2)}\n`;
+            const existing = await (0, fsx_1.readFileIfExists)(entry.settingsPath);
+            if (existing !== next) {
+                await promises_1.default.mkdir(node_path_1.default.dirname(entry.settingsPath), { recursive: true });
+                await promises_1.default.writeFile(entry.settingsPath, next, "utf8");
+                updated.push(entry.settingsPath);
+            }
+            continue;
+        }
+        if (await (0, fsx_1.removeFileIfExists)(entry.settingsPath)) {
+            updated.push(entry.settingsPath);
+        }
+    }
+    await (0, fsx_1.removeFileIfExists)(claude_1.CLAUDE_EDITOR_SETTINGS_STATE_PATH);
+    return updated;
+}
+async function cleanupClaudeDesktop3pConfig() {
+    const snapshotRaw = await (0, fsx_1.readFileIfExists)(claude_1.CLAUDE_DESKTOP_3P_STATE_PATH);
+    if (snapshotRaw === null || !snapshotRaw.trim())
+        return false;
+    let snapshot = null;
+    try {
+        snapshot = JSON.parse(snapshotRaw);
+    }
+    catch {
+        snapshot = null;
+    }
+    if (!snapshot?.configPath) {
+        await (0, fsx_1.removeFileIfExists)(claude_1.CLAUDE_DESKTOP_3P_STATE_PATH);
+        return false;
+    }
+    if (!snapshot.existed) {
+        const removed = await (0, fsx_1.removeFileIfExists)(snapshot.configPath);
+        await (0, fsx_1.removeFileIfExists)(claude_1.CLAUDE_DESKTOP_3P_STATE_PATH);
+        return removed;
+    }
+    const previousRaw = snapshot.previousRaw ?? "";
+    await promises_1.default.mkdir(node_path_1.default.dirname(snapshot.configPath), { recursive: true });
+    const existingRaw = await (0, fsx_1.readFileIfExists)(snapshot.configPath);
+    if (existingRaw === previousRaw) {
+        await (0, fsx_1.removeFileIfExists)(claude_1.CLAUDE_DESKTOP_3P_STATE_PATH);
+        return false;
+    }
+    await promises_1.default.writeFile(snapshot.configPath, previousRaw, "utf8");
+    await (0, fsx_1.removeFileIfExists)(claude_1.CLAUDE_DESKTOP_3P_STATE_PATH);
+    return true;
+}

package/dist/lib/clients/claude.d.ts

@@ -0,0 +1,49 @@
+export declare const CLAUDE_ENV_SIMPLE_MODE_NAME = "CLAUDE_CODE_SIMPLE";
+export declare const CLAUDE_ENV_DISABLE_NONESSENTIAL_TRAFFIC_NAME = "CLAUDE_CODE_DISABLE_NONESSENTIAL_TRAFFIC";
+export declare const CLAUDE_ENV_ENABLE_TELEMETRY_NAME = "CLAUDE_CODE_ENABLE_TELEMETRY";
+export declare const CLAUDE_CODE_EDITOR_ENV_SETTING = "claudeCode.environmentVariables";
+export declare const CLAUDE_CODE_EDITOR_DISABLE_LOGIN_PROMPT_SETTING = "claudeCode.disableLoginPrompt";
+export declare const MANAGED_CLAUDE_ENV_NAMES: readonly ["ANTHROPIC_API_KEY", "ANTHROPIC_BASE_URL", "CLAUDE_CODE_SIMPLE", "CLAUDE_CODE_DISABLE_NONESSENTIAL_TRAFFIC", "CLAUDE_CODE_ENABLE_TELEMETRY"];
+export declare const CLAUDE_EDITOR_SETTINGS_STATE_PATH: string;
+export declare const CLAUDE_DESKTOP_3P_STATE_PATH: string;
+export type ClaudeEditorSettingsSnapshotEntry = {
+    settingsPath: string;
+    existed: boolean;
+    envHadKey: boolean;
+    envPreviousValue: unknown;
+    disableLoginPromptHadKey: boolean;
+    disableLoginPromptPreviousValue: unknown;
+};
+export type ClaudeDesktop3pRestoreSnapshot = {
+    version: 1;
+    configPath: string;
+    existed: boolean;
+    previousRaw: string | null;
+};
+export declare function claudeDesktop3pConfigPath(): string | null;
+export declare function claudeDesktopLogCandidates(): string[];
+export declare function claudeDesktopAppCandidatePaths(): string[];
+export declare function detectClaudeCodeClient(): Promise<boolean>;
+export declare function detectClaudeClient(): Promise<boolean>;
+export declare function buildManagedClaudeEditorEnv(params: {
+    apiKey: string;
+    backendUrl: string;
+}): Record<string, string>;
+export declare function persistClaudeEditorSettings(params: {
+    apiKey: string;
+    backendUrl: string;
+    claudeEnabled: boolean;
+}): Promise<string[]>;
+export declare function cleanupClaudeEditorSettings(): Promise<string[]>;
+export declare function cleanupClaudeDesktop3pConfig(): Promise<boolean>;
+export declare function cleanupLegacyClaudeEditorTerminalEnvSettings(params: {
+    apiKey: string;
+    backendUrl: string;
+}): Promise<string[]>;
+export declare function expandClaudeDesktopInferenceModels(modelIds: string[]): string[];
+export declare function discoverClaudeDesktopDeploymentOrganizationUuid(existing: Record<string, unknown>): Promise<string | null>;
+export declare function writeClaudeDesktop3pConfig(params: {
+    backendUrl: string;
+    apiKey: string;
+    claudeModels: string[];
+}): Promise<string | null>;