@juspay/neurolink 11.12.0 → 11.13.1

package/dist/cli/commands/proxy.js

@@ -15,28 +15,28 @@ import { dirname, join, resolve } from "node:path";
 import { stripVTControlCharacters } from "node:util";
 import chalk from "chalk";
 import ora from "ora";
-import { buildProxyHealthResponse, createProxyReadinessState, markProxyDrainingForUpdate, markProxyReady, resumeProxyConnections, waitForProxyReadiness, } from "../../lib/proxy/proxyHealth.js";
-import { logger } from "../../lib/utils/logger.js";
+import { buildProxyHealthResponse, createProxyReadinessState, markProxyDrainingForUpdate, markProxyReady, resumeProxyConnections, waitForProxyReadiness, } from "../../proxy/proxyHealth.js";
+import { logger } from "../../utils/logger.js";
 import { applyAllClients, restoreAllClients, } from "../proxy-clients/registry.js";
-import { redactUrlsInText, sanitizeForLog, } from "../../lib/utils/logSanitize.js";
-import { withTimeout } from "../../lib/utils/async/withTimeout.js";
+import { redactUrlsInText, sanitizeForLog, } from "../../utils/logSanitize.js";
+import { withTimeout } from "../../utils/async/withTimeout.js";
 import { formatUptime, isProcessRunning, StateFileManager, } from "../utils/serverUtils.js";
-import { configureProxyKeepAliveDispatcher } from "../../lib/proxy/proxyDispatcher.js";
-import { ProxyRuntimeConfigStore } from "../../lib/proxy/runtimeConfig.js";
-import { startProxyLogCleanupScheduler } from "../../lib/proxy/logCleanupScheduler.js";
-import { anthropicAccountKeysEqual, createAccountAllowlist, ENV_ANTHROPIC_ACCOUNT_KEY, isAccountAllowed, LEGACY_ANTHROPIC_ACCOUNT_KEY, normalizeAnthropicAccountKey, shouldLoadFallbackCredential, } from "../../lib/proxy/accountSelection.js";
-import { beginProxyRequest, getProxyActivitySnapshot, trackProxyResponse, } from "../../lib/proxy/proxyActivity.js";
-import { flushProxyLifecycleEvents, getProxyLifecycleLoggerSnapshot, hashProxyLifecycleSessionId, logProxyLifecycleEvent, } from "../../lib/proxy/proxyLifecycle.js";
-import { describeInstallFailure, getGlobalInstallArgs, isTransientInstallFailure, resolveGlobalInstaller, validateInstalledVersion, } from "../../lib/proxy/globalInstaller.js";
-import { startUpdaterWorkerSupervisor } from "../../lib/proxy/updaterSupervisor.js";
-import { openProxyWorkerLog } from "../../lib/proxy/workerLog.js";
-import { startRollingProxyServer } from "../../lib/proxy/rollingProxyServer.js";
-import { spawnProxySocketWorker } from "../../lib/proxy/rollingWorkerProcess.js";
-import { PROXY_ROLLING_SUPERVISOR_ENV, PROXY_SOCKET_WORKER_ENV, } from "../../lib/proxy/rollingWorkerProtocol.js";
-import { attachSocketWorkerProcess } from "../../lib/proxy/socketWorkerRuntime.js";
-import { waitForProxyUpdateWindow } from "../../lib/proxy/updateCoordinator.js";
-import { abandonPendingUpdate, clearUpdateDeferral, isVersionSuppressed, loadUpdateState, recordCheck, recordSuccessfulUpdate, recordUpdateDeferred, recordUpdateFailure, recordUpdateInstalled, suppressVersion, } from "../../lib/proxy/updateState.js";
-import { loadProxyEnvFile, resolveProxyEnvFile, } from "../../lib/proxy/proxyEnv.js";
+import { configureProxyKeepAliveDispatcher } from "../../proxy/proxyDispatcher.js";
+import { ProxyRuntimeConfigStore } from "../../proxy/runtimeConfig.js";
+import { startProxyLogCleanupScheduler } from "../../proxy/logCleanupScheduler.js";
+import { anthropicAccountKeysEqual, createAccountAllowlist, ENV_ANTHROPIC_ACCOUNT_KEY, isAccountAllowed, LEGACY_ANTHROPIC_ACCOUNT_KEY, normalizeAnthropicAccountKey, shouldLoadFallbackCredential, } from "../../proxy/accountSelection.js";
+import { beginProxyRequest, getProxyActivitySnapshot, trackProxyResponse, } from "../../proxy/proxyActivity.js";
+import { flushProxyLifecycleEvents, getProxyLifecycleLoggerSnapshot, hashProxyLifecycleSessionId, logProxyLifecycleEvent, } from "../../proxy/proxyLifecycle.js";
+import { describeInstallFailure, getGlobalInstallArgs, isTransientInstallFailure, resolveGlobalInstaller, validateInstalledVersion, } from "../../proxy/globalInstaller.js";
+import { startUpdaterWorkerSupervisor } from "../../proxy/updaterSupervisor.js";
+import { openProxyWorkerLog } from "../../proxy/workerLog.js";
+import { startRollingProxyServer } from "../../proxy/rollingProxyServer.js";
+import { spawnProxySocketWorker } from "../../proxy/rollingWorkerProcess.js";
+import { PROXY_ROLLING_SUPERVISOR_ENV, PROXY_SOCKET_WORKER_ENV, } from "../../proxy/rollingWorkerProtocol.js";
+import { attachSocketWorkerProcess } from "../../proxy/socketWorkerRuntime.js";
+import { waitForProxyUpdateWindow } from "../../proxy/updateCoordinator.js";
+import { abandonPendingUpdate, clearUpdateDeferral, isVersionSuppressed, loadUpdateState, recordCheck, recordSuccessfulUpdate, recordUpdateDeferred, recordUpdateFailure, recordUpdateInstalled, suppressVersion, } from "../../proxy/updateState.js";
+import { loadProxyEnvFile, resolveProxyEnvFile, } from "../../proxy/proxyEnv.js";
 import { createRequire } from "node:module";
 import { fileURLToPath } from "node:url";
 import packageJson from "../../../package.json" with { type: "json" };
@@ -329,7 +329,7 @@ async function resolveStatusPrimaryAccount(proxyConfig) {
     const accountAllowlist = createAccountAllowlist(proxyConfig?.routing?.accountAllowlist);
     let enabledAnthropicKeys = [];
     try {
-        const { tokenStore } = await import("../../lib/auth/tokenStore.js");
+        const { tokenStore } = await import("../../auth/tokenStore.js");
         const all = await tokenStore.listByPrefix("anthropic:");
         const filtered = [];
         for (const key of all) {
@@ -1019,9 +1019,9 @@ async function loadProxyStartEnv(argv, spinner) {
 }
 async function createProxyNeurolinkRuntime(logsDir) {
     process.env.NEUROLINK_SKIP_MCP = "true";
-    const { NeuroLink } = await import("../../lib/neurolink.js");
+    const { NeuroLink } = await import("../../neurolink.js");
     const neurolink = new NeuroLink();
-    const { initRequestLogger } = await import("../../lib/proxy/requestLogger.js");
+    const { initRequestLogger } = await import("../../proxy/requestLogger.js");
     initRequestLogger(true, logsDir);
     return {
         neurolink,
@@ -1155,11 +1155,11 @@ function registerProxyRequestTracking(app, requestMetadata, readiness) {
     app.use("/backend-api/*", trackingHandler);
 }
 export async function createProxyStartApp(params) {
-    const { createClaudeProxyRoutes } = await import("../../lib/server/routes/claudeProxyRoutes.js");
-    const { createOpenAIProxyRoutes } = await import("../../lib/server/routes/openaiProxyRoutes.js");
-    const { createCodexProxyRoutes } = await import("../../lib/server/routes/codexProxyRoutes.js");
-    const { logBodyCapture, logRequest } = await import("../../lib/proxy/requestLogger.js");
-    const { recordFinalError } = await import("../../lib/proxy/usageStats.js");
+    const { createClaudeProxyRoutes } = await import("../../server/routes/claudeProxyRoutes.js");
+    const { createOpenAIProxyRoutes } = await import("../../server/routes/openaiProxyRoutes.js");
+    const { createCodexProxyRoutes } = await import("../../server/routes/codexProxyRoutes.js");
+    const { logBodyCapture, logRequest } = await import("../../proxy/requestLogger.js");
+    const { recordFinalError } = await import("../../proxy/usageStats.js");
     const { Hono } = await import("hono");
     const app = new Hono();
     const readiness = createProxyReadinessState();
@@ -1483,8 +1483,8 @@ export async function createProxyStartApp(params) {
         const activeAccountAllowlist = runtimeConfig
             ? runtimeConfig.accountAllowlist
             : params.accountAllowlist;
-        const { getReconciledUsageSnapshot, getUsageSnapshot, getUsageStatsPersistenceStatus, } = await import("../../lib/proxy/usageStats.js");
-        const { loadAccountCooldowns } = await import("../../lib/proxy/accountCooldown.js");
+        const { getReconciledUsageSnapshot, getUsageSnapshot, getUsageStatsPersistenceStatus, } = await import("../../proxy/usageStats.js");
+        const { loadAccountCooldowns } = await import("../../proxy/accountCooldown.js");
         let usageSnapshot = getUsageSnapshot();
         let snapshotSource = "memory";
         try {
@@ -1519,7 +1519,7 @@ export async function createProxyStartApp(params) {
         const disabledAccountKeys = new Set();
         let accountInventoryLoaded = false;
         try {
-            const { tokenStore } = await import("../../lib/auth/tokenStore.js");
+            const { tokenStore } = await import("../../auth/tokenStore.js");
             const storedKeys = await withTimeout(tokenStore.listByPrefix("anthropic:"), PROXY_STATUS_ACCOUNT_INVENTORY_TIMEOUT_MS, "[proxy] /status account enumeration timed out");
             for (const key of storedKeys) {
                 storedAccountKeys.add(normalizeAnthropicAccountKey(key));
@@ -1822,8 +1822,8 @@ async function initializeProxyOpenTelemetry() {
         ]
             .filter(Boolean)
             .join(",");
-        const { initializeOpenTelemetry, isOpenTelemetryInitialized } = await import("../../lib/services/server/ai/observability/instrumentation.js");
-        const { buildObservabilityConfigFromEnv } = await import("../../lib/utils/observabilityHelpers.js");
+        const { initializeOpenTelemetry, isOpenTelemetryInitialized } = await import("../../services/server/ai/observability/instrumentation.js");
+        const { buildObservabilityConfigFromEnv } = await import("../../utils/observabilityHelpers.js");
         if (isOpenTelemetryInitialized()) {
             return;
         }
@@ -1880,8 +1880,8 @@ function recordBackgroundRefreshFailure(key) {
     });
 }
 async function refreshProxyTokensInBackground(accountAllowlist) {
-    const { needsRefresh, refreshToken, persistTokens, isPermanentRefreshFailure, } = await import("../../lib/proxy/tokenRefresh.js");
-    const { tokenStore } = await import("../../lib/auth/tokenStore.js");
+    const { needsRefresh, refreshToken, persistTokens, isPermanentRefreshFailure, } = await import("../../proxy/tokenRefresh.js");
+    const { tokenStore } = await import("../../auth/tokenStore.js");
     let storedAnthropicAccountCount;
     try {
         const allKeys = await tokenStore.listProviders();
@@ -2052,8 +2052,8 @@ function registerProxyShutdownHandlers(params) {
                 logger.error(`[proxy] failed to drain server during shutdown: ${error instanceof Error ? error.message : String(error)}`);
             }
         }
-        const usageStatsFlush = import("../../lib/proxy/usageStats.js").then(({ flushUsageStats }) => flushUsageStats());
-        const requestLogsFlush = import("../../lib/proxy/requestLogger.js").then(({ flushRequestLogs }) => flushRequestLogs());
+        const usageStatsFlush = import("../../proxy/usageStats.js").then(({ flushUsageStats }) => flushUsageStats());
+        const requestLogsFlush = import("../../proxy/requestLogger.js").then(({ flushRequestLogs }) => flushRequestLogs());
         const [usageStatsFlushResult, lifecycleFlushResult, requestLogsFlushResult,] = await Promise.allSettled([
             withTimeout(usageStatsFlush, PROXY_LIFECYCLE_SHUTDOWN_TIMEOUT_MS, "Timed out flushing proxy usage statistics during shutdown"),
             withTimeout(flushProxyLifecycleEvents(), PROXY_LIFECYCLE_SHUTDOWN_TIMEOUT_MS, "Timed out flushing proxy lifecycle metadata during shutdown"),
@@ -2072,7 +2072,7 @@ function registerProxyShutdownHandlers(params) {
             logger.warn(`[proxy] request log flush failed during shutdown: ${error instanceof Error ? error.message : String(error)}`);
         }
         try {
-            const { flushOpenTelemetry, shutdownOpenTelemetry } = await import("../../lib/services/server/ai/observability/instrumentation.js");
+            const { flushOpenTelemetry, shutdownOpenTelemetry } = await import("../../services/server/ai/observability/instrumentation.js");
             await flushOpenTelemetry();
             await shutdownOpenTelemetry();
         }
@@ -2146,7 +2146,7 @@ async function startProxyRuntime(params) {
         }
         updateReconciled = true;
         try {
-            const { reconcileRunningUpdate } = await import("../../lib/proxy/updateState.js");
+            const { reconcileRunningUpdate } = await import("../../proxy/updateState.js");
             if (reconcileRunningUpdate(PROXY_VERSION)) {
                 logger.always(`[proxy] confirmed pending update is now running at v${PROXY_VERSION}`);
             }
@@ -2481,14 +2481,14 @@ async function startProxyCommandHandler(argv) {
         }
         // In dev mode: redirect writable state to .neurolink-dev/ and skip singleton check
         let devPaths;
-        const { resolveProxyPaths, resolveProxyUsageStatsPath } = await import("../../lib/proxy/proxyPaths.js");
+        const { resolveProxyPaths, resolveProxyUsageStatsPath } = await import("../../proxy/proxyPaths.js");
         const proxyPaths = resolveProxyPaths(isDev);
         if (isDev) {
             devPaths = proxyPaths;
             setProxyStateDir(devPaths.stateDir);
-            const { initAccountQuota } = await import("../../lib/proxy/accountQuota.js");
+            const { initAccountQuota } = await import("../../proxy/accountQuota.js");
             initAccountQuota(devPaths.quotaFile);
-            const { initAccountCooldown } = await import("../../lib/proxy/accountCooldown.js");
+            const { initAccountCooldown } = await import("../../proxy/accountCooldown.js");
             initAccountCooldown(devPaths.cooldownFile);
             // Ensure the dev state directory exists
             const { mkdirSync, existsSync } = await import("fs");
@@ -2499,7 +2499,7 @@ async function startProxyCommandHandler(argv) {
         if (!isDev && !socketWorker) {
             await ensureProxyStartAllowed(spinner);
         }
-        const { initUsageStats, getUsageStatsPersistenceStatus } = await import("../../lib/proxy/usageStats.js");
+        const { initUsageStats, getUsageStatsPersistenceStatus } = await import("../../proxy/usageStats.js");
         await initUsageStats(resolveProxyUsageStatsPath(proxyPaths));
         const usageStatsPersistence = getUsageStatsPersistenceStatus();
         if (usageStatsPersistence.lastError) {
@@ -3235,7 +3235,7 @@ export const proxyGuardCommand = {
             let drainActive = false;
             try {
                 // Lazy-load update modules so they're only imported at check time
-                const { checkForUpdate } = await import("../../lib/proxy/updateChecker.js");
+                const { checkForUpdate } = await import("../../proxy/updateChecker.js");
                 // 1. Check for update
                 let result = await checkForUpdate(runningVersion);
                 updateVersion = result.latestVersion;
@@ -3683,7 +3683,7 @@ export const proxySetupCommand = {
         const noService = argv["no-service"];
         // Step 1: Check existing accounts
         console.info(chalk.blue("Step 1:") + " Checking accounts...");
-        const { tokenStore } = await import("../../lib/auth/tokenStore.js");
+        const { tokenStore } = await import("../../auth/tokenStore.js");
         const allKeys = await tokenStore.listProviders();
         const anthropicKeys = allKeys.filter((k) => k.startsWith("anthropic:") || k === "anthropic");
         const validKeys = [];
@@ -3993,6 +3993,46 @@ export const proxyInstallCommand = {
         console.info(chalk.gray(`  Remove: neurolink proxy uninstall`));
     },
 };
+/**
+ * Put every auto-configured CLI back the way it was, using the URL recorded in
+ * the proxy's own state file.
+ *
+ * `proxy uninstall` is the one moment where "the proxy is going away for good"
+ * is unambiguous, and it is the only place this can be done for a
+ * launchd-managed service: the shutdown path restores on SIGINT only, and both
+ * `launchctl unload` and this command stop the supervisor with SIGTERM. Without
+ * this, uninstalling left all five clients pointing at a socket that no longer
+ * answers, with nothing to say why.
+ *
+ * Must run before `clearProxyState()` — the state file is what tells us which
+ * URL the clients were given, and the restore helpers deliberately refuse to
+ * touch a URL they did not write.
+ */
+async function restoreClientsOnUninstall() {
+    let state = null;
+    try {
+        state = loadProxyState();
+    }
+    catch {
+        // An unreadable state file is not a reason to abort an uninstall.
+    }
+    if (!state?.port) {
+        // Nothing recorded, so we cannot prove which URL the configs carry.
+        return;
+    }
+    // 0.0.0.0 is a bind address, never a reachable one; clients were handed
+    // localhost, so that is what restore has to match on.
+    const host = state.host === "0.0.0.0" ? "localhost" : (state.host ?? "localhost");
+    const results = await restoreAllClients(`http://${host}:${state.port}`);
+    for (const result of results) {
+        if (result.restored) {
+            console.info(chalk.green(`\u2713 Restored ${result.displayName} settings`));
+        }
+        else if (result.error) {
+            logger.debug(`[proxy] ${result.id} restore failed during uninstall: ${result.error.message}`);
+        }
+    }
+}
 export const proxyUninstallCommand = {
     command: "uninstall",
     describe: "Remove proxy background service",
@@ -4008,6 +4048,7 @@ export const proxyUninstallCommand = {
                 console.info(chalk.red("A proxy supervisor is still running and could not be stopped; leaving its state intact. Stop it manually and retry."));
                 process.exit(1);
             }
+            await restoreClientsOnUninstall();
             clearProxyState();
             clearProxySupervisorState();
             console.info(chalk.yellow("No proxy service installed."));
@@ -4029,6 +4070,7 @@ export const proxyUninstallCommand = {
             process.exit(1);
         }
         unlinkSync(PLIST_PATH);
+        await restoreClientsOnUninstall();
         clearProxyState();
         clearProxySupervisorState();
         console.info(chalk.green(`✓ Plist removed from ${PLIST_PATH}`));

package/dist/cli/commands/proxyAnalyze.d.ts

@@ -1,3 +1,3 @@
 import type { CommandModule } from "yargs";
-import type { ProxyAnalyzeArgs } from "../../lib/types/index.js";
+import type { ProxyAnalyzeArgs } from "../../types/index.js";
 export declare const proxyAnalyzeCommand: CommandModule<object, ProxyAnalyzeArgs>;

package/dist/cli/commands/proxyAnalyze.js

@@ -1,6 +1,6 @@
 import chalk from "chalk";
-import { analyzeProxyLogs } from "../../lib/proxy/proxyAnalysis.js";
-import { logger } from "../../lib/utils/logger.js";
+import { analyzeProxyLogs } from "../../proxy/proxyAnalysis.js";
+import { logger } from "../../utils/logger.js";
 function formatLatency(label, summary) {
     const value = (amount) => amount === null ? "-" : amount.toFixed(1);
     return `${label.padEnd(22)} ${String(summary.count).padStart(7)} ${value(summary.p50).padStart(9)} ${value(summary.p95).padStart(9)} ${value(summary.p99).padStart(9)} ${value(summary.max).padStart(9)}`;
@@ -81,7 +81,16 @@ function printAnalysis(report) {
     logger.always(chalk.bold("  Cache"));
     if (report.coverage.cacheUsage) {
         logger.always(`    Usage records: ${report.cache.requestsWithUsage}, cache-read requests: ${report.cache.requestsWithCacheRead}, hit rate: ${report.cache.requestHitRate === null ? "-" : `${(report.cache.requestHitRate * 100).toFixed(1)}%`}`);
-        logger.always(`    Tokens: ${report.cache.cacheReadTokens} read, ${report.cache.cacheCreationTokens} created, ${report.cache.inputTokens} input`);
+        logger.always(`    Tokens: ${report.cache.cacheReadTokens} read, ${report.cache.cacheCreationTokens} created, ${report.cache.inputTokens} input, ${report.cache.outputTokens} output`);
+        logger.always(report.cache.requestsPriced > 0
+            ? `    Estimated cost: $${report.cache.estimatedCostUsd.toFixed(4)} across ${report.cache.requestsPriced} priced request(s)`
+            : "    Estimated cost: unavailable (no request carried a priceable model)");
+        if (report.cache.requestsPricedByPrefix > 0) {
+            logger.always(chalk.yellow(`    ⚠ ${report.cache.requestsPricedByPrefix} request(s) priced by name-prefix fallback, not an exact rate: ${report.cache.modelsPricedByPrefix.join(", ")}`));
+        }
+        if (report.cache.requestsUnpriced > 0) {
+            logger.always(chalk.yellow(`    ⚠ ${report.cache.requestsUnpriced} request(s) had usage but no pricing row: ${report.cache.unpricedModels.join(", ")}`));
+        }
     }
     else {
         logger.always(chalk.yellow("    Cache usage: unavailable"));

package/dist/cli/commands/proxyReplay.d.ts

@@ -1,3 +1,3 @@
 import type { CommandModule } from "yargs";
-import type { ProxyReplayArgs } from "../../lib/types/index.js";
+import type { ProxyReplayArgs } from "../../types/index.js";
 export declare const proxyReplayCommand: CommandModule<object, ProxyReplayArgs>;

package/dist/cli/commands/proxyReplay.js

@@ -1,8 +1,8 @@
 import { readFile, stat } from "node:fs/promises";
 import { resolve } from "node:path";
 import chalk from "chalk";
-import { compareProxyReplayBundle, exportProxyReplayBundle, isValidProxyReplayHeaderName, readProxyReplayBundle, writeProxyReplayDocument, } from "../../lib/proxy/proxyReplay.js";
-import { logger } from "../../lib/utils/logger.js";
+import { compareProxyReplayBundle, exportProxyReplayBundle, isValidProxyReplayHeaderName, readProxyReplayBundle, writeProxyReplayDocument, } from "../../proxy/proxyReplay.js";
+import { logger } from "../../utils/logger.js";
 const ACTIONS = ["export", "compare"];
 const MAX_BODY_OVERRIDE_BYTES = 16 * 1024 * 1024;
 function requiredValue(value, option) {

package/dist/cli/commands/rag.js

@@ -11,16 +11,16 @@ import { existsSync } from "fs";
 import { readFile, writeFile } from "fs/promises";
 import ora from "ora";
 import { basename, extname, resolve } from "path";
-import { ProviderFactory } from "../../lib/factories/providerFactory.js";
-import { ProviderRegistry } from "../../lib/factories/providerRegistry.js";
-import { ChunkerRegistry } from "../../lib/rag/chunking/chunkerRegistry.js";
-import { GraphRAG } from "../../lib/rag/graphRag/graphRAG.js";
-import { LLMMetadataExtractor } from "../../lib/rag/metadata/metadataExtractor.js";
-import { createHybridSearch, InMemoryBM25Index, } from "../../lib/rag/retrieval/hybridSearch.js";
-import { InMemoryVectorStore } from "../../lib/rag/retrieval/vectorQueryTool.js";
-import { globalSession } from "../../lib/session/globalSessionState.js";
-import { logger } from "../../lib/utils/logger.js";
-import { getBestProvider } from "../../lib/utils/providerUtils.js";
+import { ProviderFactory } from "../../factories/providerFactory.js";
+import { ProviderRegistry } from "../../factories/providerRegistry.js";
+import { ChunkerRegistry } from "../../rag/chunking/chunkerRegistry.js";
+import { GraphRAG } from "../../rag/graphRag/graphRAG.js";
+import { LLMMetadataExtractor } from "../../rag/metadata/metadataExtractor.js";
+import { createHybridSearch, InMemoryBM25Index, } from "../../rag/retrieval/hybridSearch.js";
+import { InMemoryVectorStore } from "../../rag/retrieval/vectorQueryTool.js";
+import { globalSession } from "../../session/globalSessionState.js";
+import { logger } from "../../utils/logger.js";
+import { getBestProvider } from "../../utils/providerUtils.js";
 /**
  * Ensure the NeuroLink SDK is initialized (which registers all providers)
  * This follows the same pattern as the 'generate' command

package/dist/cli/commands/serve.js

@@ -12,10 +12,10 @@ import chalk from "chalk";
 import fs from "fs";
 import ora from "ora";
 import path from "path";
-import { NeuroLink } from "../../lib/neurolink.js";
-import { ConfigurationError, ServerStartError, } from "../../lib/server/errors.js";
-import { withTimeout } from "../../lib/utils/errorHandling.js";
-import { logger } from "../../lib/utils/logger.js";
+import { NeuroLink } from "../../neurolink.js";
+import { ConfigurationError, ServerStartError, } from "../../server/errors.js";
+import { withTimeout } from "../../utils/errorHandling.js";
+import { logger } from "../../utils/logger.js";
 import { formatUptime, isProcessRunning, StateFileManager, } from "../utils/serverUtils.js";
 // ============================================
 // State Management
@@ -151,7 +151,7 @@ export class ServeCommandFactory {
                     default: 3000,
                     describe: "Port to listen on",
                 }), async (argv) => {
-                    const { startVoiceServer } = await import("../../lib/server/voice/voiceServerApp.js");
+                    const { startVoiceServer } = await import("../../server/voice/voiceServerApp.js");
                     await startVoiceServer(argv.port);
                 })
                     .option("port", {
@@ -383,7 +383,7 @@ export class ServeCommandFactory {
      * Returns a mutable reference wrapper so signal handlers always access the current server.
      */
     static async createAndStartServer(opts, spinner) {
-        const { createServer, registerAllRoutes } = await import("../../lib/server/index.js");
+        const { createServer, registerAllRoutes } = await import("../../server/index.js");
         const neurolink = new NeuroLink();
         const serverRef = {
             current: await createServer(neurolink, {
@@ -501,7 +501,7 @@ export class ServeCommandFactory {
                 await withTimeout(ctx.serverRef.current.stop(), 30000, new ServerStartError("Server stop timed out during restart", undefined, ctx.port, ctx.host));
                 // Re-import server module with cache busting for watch mode
                 const timestamp = Date.now();
-                const { createServer: createNewServer, registerAllRoutes: registerNewRoutes, } = await import(`../../lib/server/index.js?t=${timestamp}`);
+                const { createServer: createNewServer, registerAllRoutes: registerNewRoutes, } = await import(`../../server/index.js?t=${timestamp}`);
                 // Create new server
                 const newServer = await createNewServer(new NeuroLink(), {
                     framework: ctx.framework,

package/dist/cli/commands/server.js

@@ -6,9 +6,9 @@ import chalk from "chalk";
 import ora from "ora";
 import fs from "fs";
 import path from "path";
-import { logger } from "../../lib/utils/logger.js";
-import { NeuroLink } from "../../lib/neurolink.js";
-import { withTimeout } from "../../lib/utils/errorHandling.js";
+import { logger } from "../../utils/logger.js";
+import { NeuroLink } from "../../neurolink.js";
+import { withTimeout } from "../../utils/errorHandling.js";
 import { isProcessRunning, formatUptime, ensureStateDir, getNeuroLinkDir, } from "../utils/serverUtils.js";
 // ============================================
 // State Management
@@ -354,7 +354,7 @@ export class ServerCommandFactory {
             // Create NeuroLink instance
             const neurolink = new NeuroLink();
             // Dynamically import server module
-            const { createServer, registerAllRoutes } = await import("../../lib/server/index.js");
+            const { createServer, registerAllRoutes } = await import("../../server/index.js");
             const framework = (argv.framework ?? "hono");
             // Create server
             const server = await createServer(neurolink, {
@@ -568,7 +568,7 @@ export class ServerCommandFactory {
             : ora("Generating OpenAPI specification...").start();
         try {
             // Dynamically import OpenAPI generator
-            const { OpenAPIGenerator } = await import("../../lib/server/openapi/index.js");
+            const { OpenAPIGenerator } = await import("../../server/openapi/index.js");
             const generator = new OpenAPIGenerator({
                 basePath: argv.basePath ?? "/api",
                 info: {
@@ -619,7 +619,7 @@ export class ServerCommandFactory {
     static async executeRoutes(argv) {
         try {
             // Dynamically import route definitions and types
-            const { createAllRoutes } = await import("../../lib/server/routes/index.js");
+            const { createAllRoutes } = await import("../../server/routes/index.js");
             const routeGroups = createAllRoutes(argv.basePath ?? "/api");
             // Flatten route groups into individual routes with group info
             let flatRoutes = [];

package/dist/cli/commands/setup-anthropic.d.ts

@@ -8,5 +8,5 @@
  *
  * Follows the same UX patterns as setup-openai and setup-google-ai
  */
-import { type ProviderSetupArgv } from "../../lib/types/index.js";
+import { type ProviderSetupArgv } from "../../types/index.js";
 export declare function handleAnthropicSetup(argv: ProviderSetupArgv): Promise<void>;

package/dist/cli/commands/setup-anthropic.js

@@ -13,9 +13,9 @@ import path from "path";
 import inquirer from "inquirer";
 import chalk from "chalk";
 import ora from "ora";
-import { logger } from "../../lib/utils/logger.js";
-import { getTopModelChoices } from "../../lib/utils/modelChoices.js";
-import { AIProviderName, } from "../../lib/types/index.js";
+import { logger } from "../../utils/logger.js";
+import { getTopModelChoices } from "../../utils/modelChoices.js";
+import { AIProviderName, } from "../../types/index.js";
 import { maskCredential } from "../utils/maskCredential.js";
 export async function handleAnthropicSetup(argv) {
     try {

package/dist/cli/commands/setup-azure.d.ts

@@ -9,5 +9,5 @@
  *
  * Follows the same UX patterns as other setup commands
  */
-import { type ProviderSetupArgv } from "../../lib/types/index.js";
+import { type ProviderSetupArgv } from "../../types/index.js";
 export declare function handleAzureSetup(argv: ProviderSetupArgv): Promise<void>;

package/dist/cli/commands/setup-azure.js

@@ -12,10 +12,10 @@
 import inquirer from "inquirer";
 import chalk from "chalk";
 import ora from "ora";
-import { logger } from "../../lib/utils/logger.js";
+import { logger } from "../../utils/logger.js";
 import { updateEnvFile as updateEnvFileShared, displayEnvUpdateSummary, } from "../utils/envManager.js";
-import { getTopModelChoices } from "../../lib/utils/modelChoices.js";
-import { AIProviderName, } from "../../lib/types/index.js";
+import { getTopModelChoices } from "../../utils/modelChoices.js";
+import { AIProviderName, } from "../../types/index.js";
 import { maskCredential } from "../utils/maskCredential.js";
 export async function handleAzureSetup(argv) {
     try {

package/dist/cli/commands/setup-bedrock.d.ts

@@ -5,5 +5,5 @@
  * Checks for AWS_ACCESS_KEY_ID and AWS_SECRET_ACCESS_KEY
  * Auto-detects AWS CLI configuration, prompts for missing config, updates .env safely
  */
-import { type ProviderSetupArgv } from "../../lib/types/index.js";
+import { type ProviderSetupArgv } from "../../types/index.js";
 export declare function handleBedrockSetup(argv: ProviderSetupArgv): Promise<void>;

package/dist/cli/commands/setup-bedrock.js

@@ -11,10 +11,10 @@ import * as os from "os";
 import inquirer from "inquirer";
 import chalk from "chalk";
 import ora from "ora";
-import { logger } from "../../lib/utils/logger.js";
+import { logger } from "../../utils/logger.js";
 import { updateEnvFile as envUpdate } from "../utils/envManager.js";
-import { getTopModelChoices } from "../../lib/utils/modelChoices.js";
-import { AIProviderName, } from "../../lib/types/index.js";
+import { getTopModelChoices } from "../../utils/modelChoices.js";
+import { AIProviderName, } from "../../types/index.js";
 import { maskCredential } from "../utils/maskCredential.js";
 export async function handleBedrockSetup(argv) {
     try {

package/dist/cli/commands/setup-gcp.d.ts

@@ -10,5 +10,5 @@
  * All methods require GOOGLE_VERTEX_PROJECT
  * Optional: GOOGLE_VERTEX_LOCATION (defaults to 'us-central1')
  */
-import type { ProviderSetupArgv } from "../../lib/types/index.js";
+import type { ProviderSetupArgv } from "../../types/index.js";
 export declare function handleGCPSetup(argv: ProviderSetupArgv): Promise<void>;

package/dist/cli/commands/setup-gcp.js

@@ -16,7 +16,7 @@ import os from "os";
 import inquirer from "inquirer";
 import chalk from "chalk";
 import ora from "ora";
-import { logger } from "../../lib/utils/logger.js";
+import { logger } from "../../utils/logger.js";
 var AuthMethod;
 (function (AuthMethod) {
     AuthMethod["FILE_PATH"] = "file-path";

package/dist/cli/commands/setup-google-ai.d.ts

@@ -8,5 +8,5 @@
  *
  * Follows the same UX patterns as setup-openai and setup-gcp
  */
-import { type ProviderSetupArgv } from "../../lib/types/index.js";
+import { type ProviderSetupArgv } from "../../types/index.js";
 export declare function handleGoogleAISetup(argv: ProviderSetupArgv): Promise<void>;

package/dist/cli/commands/setup-google-ai.js

@@ -12,11 +12,11 @@ import path from "path";
 import inquirer from "inquirer";
 import chalk from "chalk";
 import ora from "ora";
-import { logger } from "../../lib/utils/logger.js";
-import { GoogleAIModels } from "../../lib/constants/enums.js";
+import { logger } from "../../utils/logger.js";
+import { GoogleAIModels } from "../../constants/enums.js";
 import { updateEnvFile as updateEnvFileManager, displayEnvUpdateSummary, } from "../utils/envManager.js";
-import { getTopModelChoices } from "../../lib/utils/modelChoices.js";
-import { AIProviderName, } from "../../lib/types/index.js";
+import { getTopModelChoices } from "../../utils/modelChoices.js";
+import { AIProviderName, } from "../../types/index.js";
 import { maskCredential } from "../utils/maskCredential.js";
 /**
  * Get the runtime default model that matches the provider implementation

package/dist/cli/commands/setup-huggingface.d.ts

@@ -1,4 +1,4 @@
 import type { Arguments, CommandBuilder } from "yargs";
-import type { SetupHuggingFaceArgs } from "../../lib/types/index.js";
+import type { SetupHuggingFaceArgs } from "../../types/index.js";
 export declare const handleHuggingFaceSetup: (argv: Arguments<SetupHuggingFaceArgs>) => Promise<void>;
 export declare const setupHuggingFaceBuilder: CommandBuilder;

package/dist/cli/commands/setup-huggingface.js

@@ -1,7 +1,7 @@
 import chalk from "chalk";
 import ora from "ora";
 import inquirer from "inquirer";
-import { logger } from "../../lib/utils/logger.js";
+import { logger } from "../../utils/logger.js";
 import { updateEnvFile as writeEnvFile, displayEnvUpdateSummary, } from "../utils/envManager.js";
 /**
  * Validates Hugging Face API key format

package/dist/cli/commands/setup-mistral.d.ts

@@ -1,4 +1,4 @@
 import type { Arguments, CommandBuilder } from "yargs";
-import type { SetupMistralArgs } from "../../lib/types/index.js";
+import type { SetupMistralArgs } from "../../types/index.js";
 export declare const handleMistralSetup: (argv: Arguments<SetupMistralArgs>) => Promise<void>;
 export declare const setupMistralBuilder: CommandBuilder;

package/dist/cli/commands/setup-mistral.js

@@ -3,9 +3,9 @@ import ora from "ora";
 import inquirer from "inquirer";
 import fs from "fs";
 import path from "path";
-import { logger } from "../../lib/utils/logger.js";
-import { getTopModelChoices } from "../../lib/utils/modelChoices.js";
-import { AIProviderName } from "../../lib/types/index.js";
+import { logger } from "../../utils/logger.js";
+import { getTopModelChoices } from "../../utils/modelChoices.js";
+import { AIProviderName } from "../../types/index.js";
 /**
  * Validates Mistral API key format
  * Mistral keys typically start with "sk-" and contain base62 plus "-" or "_".

package/dist/cli/commands/setup-openai.d.ts

@@ -8,5 +8,5 @@
  *
  * Follows the same UX patterns as setup-gcp and setup-bedrock
  */
-import { type ProviderSetupArgv } from "../../lib/types/index.js";
+import { type ProviderSetupArgv } from "../../types/index.js";
 export declare function handleOpenAISetup(argv: ProviderSetupArgv): Promise<void>;

package/dist/cli/commands/setup-openai.js

@@ -13,9 +13,9 @@ import path from "path";
 import inquirer from "inquirer";
 import chalk from "chalk";
 import ora from "ora";
-import { logger } from "../../lib/utils/logger.js";
-import { getTopModelChoices } from "../../lib/utils/modelChoices.js";
-import { AIProviderName, } from "../../lib/types/index.js";
+import { logger } from "../../utils/logger.js";
+import { getTopModelChoices } from "../../utils/modelChoices.js";
+import { AIProviderName, } from "../../types/index.js";
 import { maskCredential } from "../utils/maskCredential.js";
 export async function handleOpenAISetup(argv) {
     try {

package/dist/cli/commands/setup.d.ts

@@ -5,7 +5,7 @@
  * Provides a beautiful welcome experience for new users and guided
  * provider selection, while delegating to existing setup commands.
  */
-import type { ProviderConfigOptions, SetupArgs } from "../../lib/types/index.js";
+import type { ProviderConfigOptions, SetupArgs } from "../../types/index.js";
 /**
  * ProviderConfigOptions for the 21 canonical AIProviderName values the
  * interactive wizard above doesn't have a bespoke handleXSetup() for. 16