byterover-cli 1.0.2 → 1.0.4

package/dist/infra/http/authenticated-http-client.js

@@ -76,6 +76,11 @@ export class AuthenticatedHttpClient {
      * Preserves error information while abstracting axios-specific details.
      */
     handleError(error) {
+        if (isAxiosError(error) && error.response?.status === 401) {
+            // IMPORTANT: Do not handle 401 errors here - let callers handle errors (e.g., distinguish 401 from network errors)
+            return error;
+        }
+        // WARNING: isLLMServerError() matches any response with the standard ApiErrorResponse structure (IAM, Cogit, LLM services all use it)
         if (this.isLLMServerError(error)) {
             // Extract standardized API error message
             return new Error(this.parseHttpError(error));

package/dist/infra/process/agent-worker.js

@@ -27,8 +27,9 @@ import { ProjectConfigStore } from '../config/file-config-store.js';
 import { CurateExecutor } from '../core/executors/curate-executor.js';
 import { QueryExecutor } from '../core/executors/query-executor.js';
 import { createTaskProcessor } from '../core/task-processor.js';
-import { KeychainTokenStore } from '../storage/keychain-token-store.js';
+import { createTokenStore } from '../storage/token-store.js';
 import { createTransportClient } from '../transport/transport-factory.js';
+import { CURATE_MAX_CONCURRENT } from './constants.js';
 import { TaskQueueManager } from './task-queue-manager.js';
 // IPC types imported from ./ipc-types.ts
 function sendToParent(message) {
@@ -62,6 +63,12 @@ let initializationError;
 let isInitializing = false;
 /** Guard: prevent double cleanup */
 let isCleaningUp = false;
+/** Parent process PID for heartbeat monitoring */
+let parentPid;
+/** Parent heartbeat running flag (for recursive setTimeout pattern) */
+let parentHeartbeatRunning = false;
+/** Parent heartbeat check interval in milliseconds */
+const PARENT_HEARTBEAT_INTERVAL_MS = 2000;
 let eventForwarders = [];
 // ============================================================================
 // Task Queue Manager (replaces inline queue logic)
@@ -69,13 +76,13 @@ let eventForwarders = [];
 /**
  * Task queue manager handles:
  * - Separate queues for curate and query tasks
- * - Concurrency limits (max 2 concurrent per type)
+ * - Concurrency limits (max 1 concurrent per type)
  * - Task deduplication (same taskId can't be queued twice)
  * - Cancel tasks from queue before processing
  * - FIFO processing order
  */
 const taskQueueManager = new TaskQueueManager({
-    curate: { maxConcurrent: 2 },
+    curate: { maxConcurrent: CURATE_MAX_CONCURRENT },
     onExecutorError(taskId, error) {
         agentLog(`Executor error for task ${taskId}: ${error}`);
     },
@@ -104,7 +111,6 @@ function cleanupAgentEventForwarding() {
         return;
     }
     // Get the old agent's event bus (if still available)
-    // Cast to CipherAgent to access agentEventBus property
     const eventBus = cipherAgent?.agentEventBus;
     if (eventBus) {
         for (const { event, handler } of eventForwarders) {
@@ -310,7 +316,7 @@ async function tryInitializeAgent(forceReinit = false) {
             taskProcessor = undefined;
             isAgentInitialized = false;
         }
-        const tokenStore = new KeychainTokenStore();
+        const tokenStore = createTokenStore();
         const configStore = new ProjectConfigStore();
         const authToken = await tokenStore.load();
         const brvConfig = await configStore.read();
@@ -320,6 +326,12 @@ async function tryInitializeAgent(forceReinit = false) {
             agentLog('Cannot initialize - no auth token');
             return false;
         }
+        // Check if token is expired - fail early with clear message instead of 401 later
+        if (authToken.isExpired()) {
+            initializationError = new NotAuthenticatedError();
+            agentLog('Cannot initialize - token expired (please run /login to re-authenticate)');
+            return false;
+        }
         // Create Executors
         const curateExecutor = new CurateExecutor();
         const queryExecutor = new QueryExecutor();
@@ -370,6 +382,13 @@ async function tryInitializeAgent(forceReinit = false) {
         }
         return true;
     }
+    catch (error) {
+        // Catch errors and return false instead of throwing
+        // This allows lazy init to retry when tasks arrive
+        initializationError = error instanceof Error ? error : new Error(String(error));
+        agentLog(`Agent initialization failed: ${error}`);
+        return false;
+    }
     finally {
         isInitializing = false;
     }
@@ -378,7 +397,7 @@ async function tryInitializeAgent(forceReinit = false) {
  * Handle task:execute from Transport.
  */
 async function handleTaskExecute(data) {
-    const { content, files, taskId, type } = data;
+    const { clientCwd, content, files, taskId, type } = data;
     agentLog(`Processing task: ${taskId} (type=${type})`);
     // If not initialized, try to initialize now (lazy init for post-onboarding)
     if (!isAgentInitialized) {
@@ -409,6 +428,7 @@ async function handleTaskExecute(data) {
         // File validation is handled by UseCase (business logic belongs there)
         // Note: taskId is passed to UseCase → CipherAgent → ChatSession, which adds it to all events
         const result = await taskProcessor.process({
+            clientCwd,
             content,
             files,
             taskId,
@@ -519,6 +539,71 @@ async function startAgent() {
     });
     agentLog('Ready to process tasks');
 }
+// ============================================================================
+// Parent Heartbeat Monitoring
+// ============================================================================
+/**
+ * Setup parent process heartbeat monitoring.
+ *
+ * Why this is needed:
+ * - When main process receives SIGKILL, it dies immediately
+ * - SIGKILL cannot be caught, so no cleanup happens
+ * - IPC 'disconnect' event may not fire
+ * - Child processes become orphans (PPID = 1)
+ *
+ * This function periodically checks if parent is still alive.
+ * If parent dies, child self-terminates to prevent zombie processes.
+ */
+function setupParentHeartbeat() {
+    // Already running - don't start another
+    if (parentHeartbeatRunning)
+        return;
+    parentHeartbeatRunning = true;
+    parentPid = process.ppid;
+    /**
+     * Recursive setTimeout pattern - safer than setInterval:
+     * - No callback overlap possible
+     * - Clean cancellation (just set flag = false)
+     * - No orphan timers
+     */
+    const checkParent = () => {
+        // Stopped - don't schedule next check
+        if (!parentHeartbeatRunning || !parentPid)
+            return;
+        // Check if parent is still alive using signal 0
+        // Signal 0 doesn't send any signal, just checks if process exists
+        try {
+            process.kill(parentPid, 0);
+        }
+        catch {
+            // Parent is dead - self-terminate
+            agentLog(`Parent process (${parentPid}) died - shutting down to prevent zombie`);
+            parentHeartbeatRunning = false;
+            // Stop agent and exit
+            stopAgent()
+                .catch(() => { })
+                .finally(() => {
+                // eslint-disable-next-line n/no-process-exit, unicorn/no-process-exit
+                process.exit(0);
+            });
+            return;
+        }
+        // Schedule next check (only if still running)
+        if (parentHeartbeatRunning) {
+            setTimeout(checkParent, PARENT_HEARTBEAT_INTERVAL_MS);
+        }
+    };
+    // Start first check after delay
+    setTimeout(checkParent, PARENT_HEARTBEAT_INTERVAL_MS);
+    agentLog(`Parent heartbeat monitoring started (PPID: ${parentPid})`);
+}
+/**
+ * Stop the parent heartbeat monitoring.
+ * With recursive setTimeout, just set flag to false - next check won't schedule.
+ */
+function stopParentHeartbeat() {
+    parentHeartbeatRunning = false;
+}
 /**
  * Stop Agent Process.
  */
@@ -530,6 +615,8 @@ async function stopAgent() {
     }
     isCleaningUp = true;
     try {
+        // Stop parent heartbeat first
+        stopParentHeartbeat();
         // Clear task queue
         taskQueueManager.clear();
         // Cleanup event forwarders before stopping agent
@@ -559,11 +646,16 @@ async function runWorker() {
     try {
         await startAgent();
         sendToParent({ type: 'ready' });
+        // Start parent heartbeat monitoring after ready
+        // This ensures we self-terminate if parent dies (SIGKILL scenario)
+        setupParentHeartbeat();
     }
     catch (error) {
         const message = error instanceof Error ? error.message : String(error);
         agentLog(`Failed to start: ${message}`);
         sendToParent({ error: message, type: 'error' });
+        // Cleanup before exit to release any acquired resources
+        await stopAgent().catch(() => { });
         // eslint-disable-next-line n/no-process-exit, unicorn/no-process-exit
         process.exit(1);
     }
@@ -588,6 +680,19 @@ async function runWorker() {
     process.once('SIGTERM', cleanup);
     process.once('SIGINT', cleanup);
     process.once('disconnect', cleanup);
+    // Global exception handlers - ensure cleanup on unexpected errors
+    process.on('uncaughtException', async (error) => {
+        agentLog(`Uncaught exception: ${error}`);
+        await stopAgent().catch(() => { });
+        // eslint-disable-next-line n/no-process-exit
+        process.exit(1);
+    });
+    process.on('unhandledRejection', async (reason) => {
+        agentLog(`Unhandled rejection: ${reason}`);
+        await stopAgent().catch(() => { });
+        // eslint-disable-next-line n/no-process-exit
+        process.exit(1);
+    });
 }
 // ============================================================================
 // Run
@@ -597,6 +702,8 @@ try {
 }
 catch (error) {
     agentLog(`Fatal error: ${error}`);
+    // Cleanup before exit to release any acquired resources
+    await stopAgent().catch(() => { });
     // eslint-disable-next-line n/no-process-exit, unicorn/no-process-exit
     process.exit(1);
 }

package/dist/infra/process/constants.d.ts

@@ -0,0 +1 @@
+export declare const CURATE_MAX_CONCURRENT = 1;

package/dist/infra/process/constants.js

@@ -0,0 +1 @@
+export const CURATE_MAX_CONCURRENT = 1;

package/dist/infra/process/task-queue-manager.js

@@ -10,6 +10,7 @@
  *
  * This class is extracted from agent-worker.ts to enable unit testing.
  */
+import { CURATE_MAX_CONCURRENT } from './constants.js';
 export class TaskQueueManager {
     activeCurateTasks = 0;
     activeQueryTasks = 0;
@@ -22,7 +23,7 @@ export class TaskQueueManager {
     taskExecutor;
     constructor(config) {
         this.config = {
-            curate: { maxConcurrent: config?.curate?.maxConcurrent ?? 2 },
+            curate: { maxConcurrent: config?.curate?.maxConcurrent ?? CURATE_MAX_CONCURRENT },
             // Query tasks are unlimited (Infinity) - lightweight and fast
             query: { maxConcurrent: config?.query?.maxConcurrent ?? Infinity },
         };

package/dist/infra/process/transport-handlers.js

@@ -152,6 +152,7 @@ export class TransportHandlers {
             clientId,
             content: data.content,
             createdAt: Date.now(),
+            ...(data.clientCwd ? { clientCwd: data.clientCwd } : {}),
             ...(data.files?.length ? { files: data.files } : {}),
             taskId,
             type: data.type,
@@ -161,6 +162,7 @@ export class TransportHandlers {
         // Broadcast task:created to broadcast-room for TUI monitoring
         this.transport.broadcastTo('broadcast-room', TransportTaskEventNames.CREATED, {
             content: data.content,
+            ...(data.clientCwd ? { clientCwd: data.clientCwd } : {}),
             ...(data.files?.length ? { files: data.files } : {}),
             taskId,
             type: data.type,
@@ -170,6 +172,7 @@ export class TransportHandlers {
             const executeMsg = {
                 clientId,
                 content: data.content,
+                ...(data.clientCwd ? { clientCwd: data.clientCwd } : {}),
                 ...(data.files?.length ? { files: data.files } : {}),
                 taskId,
                 type: data.type,
@@ -214,6 +217,7 @@ export class TransportHandlers {
             // so it's not available at task:started time. It's saved to DB instead.
             this.transport.broadcastTo('broadcast-room', TransportTaskEventNames.STARTED, {
                 content: task.content,
+                ...(task.clientCwd ? { clientCwd: task.clientCwd } : {}),
                 ...(task.files?.length ? { files: task.files } : {}),
                 taskId,
                 type: task.type,

package/dist/infra/process/transport-worker.js

@@ -35,9 +35,13 @@ function sendToParent(message) {
 let transportServer;
 let transportHandlers;
 let instancePollingInterval;
+let parentHeartbeatRunning = false;
+let parentPid;
 const instanceManager = new FileInstanceManager();
 /** Polling interval in milliseconds */
 const INSTANCE_POLLING_INTERVAL_MS = 2000;
+/** Parent heartbeat check interval in milliseconds */
+const PARENT_HEARTBEAT_INTERVAL_MS = 2000;
 /**
  * Setup polling to detect instance.json deletion and recreate it.
  *
@@ -79,6 +83,69 @@ function stopInstancePolling() {
         instancePollingInterval = undefined;
     }
 }
+/**
+ * Setup parent process heartbeat monitoring.
+ *
+ * Why this is needed:
+ * - When main process receives SIGKILL, it dies immediately
+ * - SIGKILL cannot be caught, so no cleanup happens
+ * - IPC 'disconnect' event may not fire
+ * - Child processes become orphans (PPID = 1)
+ *
+ * This function periodically checks if parent is still alive.
+ * If parent dies, child self-terminates to prevent zombie processes.
+ */
+function setupParentHeartbeat() {
+    // Already running - don't start another
+    if (parentHeartbeatRunning)
+        return;
+    parentHeartbeatRunning = true;
+    parentPid = process.ppid;
+    /**
+     * Recursive setTimeout pattern - safer than setInterval:
+     * - No callback overlap possible
+     * - Clean cancellation (just set flag = false)
+     * - No orphan timers
+     */
+    const checkParent = () => {
+        // Stopped - don't schedule next check
+        if (!parentHeartbeatRunning || !parentPid)
+            return;
+        // Check if parent is still alive using signal 0
+        // Signal 0 doesn't send any signal, just checks if process exists
+        try {
+            process.kill(parentPid, 0);
+        }
+        catch {
+            // Parent is dead - self-terminate
+            transportLog(`Parent process (${parentPid}) died - shutting down to prevent zombie`);
+            parentHeartbeatRunning = false;
+            stopInstancePolling();
+            // Release instance lock and exit
+            stopTransport()
+                .catch(() => { })
+                .finally(() => {
+                // eslint-disable-next-line n/no-process-exit, unicorn/no-process-exit
+                process.exit(0);
+            });
+            return;
+        }
+        // Schedule next check (only if still running)
+        if (parentHeartbeatRunning) {
+            setTimeout(checkParent, PARENT_HEARTBEAT_INTERVAL_MS);
+        }
+    };
+    // Start first check after delay
+    setTimeout(checkParent, PARENT_HEARTBEAT_INTERVAL_MS);
+    transportLog(`Parent heartbeat monitoring started (PPID: ${parentPid})`);
+}
+/**
+ * Stop the parent heartbeat monitoring.
+ * With recursive setTimeout, just set flag to false - next check won't schedule.
+ */
+function stopParentHeartbeat() {
+    parentHeartbeatRunning = false;
+}
 async function startTransport() {
     // Create Socket.IO server
     transportServer = createTransportServer();
@@ -103,7 +170,8 @@ async function startTransport() {
     return port;
 }
 async function stopTransport() {
-    // Stop instance polling first
+    // Stop heartbeat and polling first
+    stopParentHeartbeat();
     stopInstancePolling();
     // Release instance.json
     const projectRoot = process.cwd();
@@ -125,11 +193,16 @@ async function runWorker() {
     try {
         const port = await startTransport();
         sendToParent({ port, type: 'ready' });
+        // Start parent heartbeat monitoring after ready
+        // This ensures we self-terminate if parent dies (SIGKILL scenario)
+        setupParentHeartbeat();
     }
     catch (error) {
         const message = error instanceof Error ? error.message : String(error);
         transportLog(`Failed to start: ${message}`);
         sendToParent({ error: message, type: 'error' });
+        // Cleanup before exit to release any acquired resources
+        await stopTransport().catch(() => { });
         // eslint-disable-next-line n/no-process-exit, unicorn/no-process-exit
         process.exit(1);
     }
@@ -154,6 +227,19 @@ async function runWorker() {
     process.once('SIGTERM', cleanup);
     process.once('SIGINT', cleanup);
     process.once('disconnect', cleanup);
+    // Global exception handlers - ensure cleanup on unexpected errors
+    process.on('uncaughtException', async (error) => {
+        transportLog(`Uncaught exception: ${error}`);
+        await stopTransport().catch(() => { });
+        // eslint-disable-next-line n/no-process-exit
+        process.exit(1);
+    });
+    process.on('unhandledRejection', async (reason) => {
+        transportLog(`Unhandled rejection: ${reason}`);
+        await stopTransport().catch(() => { });
+        // eslint-disable-next-line n/no-process-exit
+        process.exit(1);
+    });
 }
 // ============================================================================
 // Run
@@ -163,6 +249,8 @@ try {
 }
 catch (error) {
     transportLog(`Fatal error: ${error}`);
+    // Cleanup before exit to release any acquired resources
+    await stopTransport().catch(() => { });
     // eslint-disable-next-line n/no-process-exit, unicorn/no-process-exit
     process.exit(1);
 }

package/dist/infra/repl/commands/curate-command.js

@@ -2,7 +2,7 @@ import { randomUUID } from 'node:crypto';
 import { isDevelopment } from '../../../config/environment.js';
 import { CommandKind } from '../../../tui/types.js';
 import { FileGlobalConfigStore } from "../../storage/file-global-config-store.js";
-import { KeychainTokenStore } from '../../storage/keychain-token-store.js';
+import { createTokenStore } from '../../storage/token-store.js';
 import { ReplTerminal } from '../../terminal/repl-terminal.js';
 import { MixpanelTrackingService } from '../../tracking/mixpanel-tracking-service.js';
 import { CurateUseCase } from '../../usecase/curate-use-case.js';
@@ -38,7 +38,7 @@ export const curateCommand = {
                     contextText = args || undefined;
                 }
                 const terminal = new ReplTerminal({ onMessage, onPrompt });
-                const tokenStore = new KeychainTokenStore();
+                const tokenStore = createTokenStore();
                 const globalConfigStore = new FileGlobalConfigStore();
                 const useCase = new CurateUseCase({
                     terminal,

package/dist/infra/repl/commands/gen-rules-command.js

@@ -3,7 +3,7 @@ import { FsFileService } from '../../file/fs-file-service.js';
 import { LegacyRuleDetector } from '../../rule/legacy-rule-detector.js';
 import { RuleTemplateService } from '../../rule/rule-template-service.js';
 import { FileGlobalConfigStore } from "../../storage/file-global-config-store.js";
-import { KeychainTokenStore } from '../../storage/keychain-token-store.js';
+import { createTokenStore } from '../../storage/token-store.js';
 import { FsTemplateLoader } from '../../template/fs-template-loader.js';
 import { ReplTerminal } from '../../terminal/repl-terminal.js';
 import { MixpanelTrackingService } from '../../tracking/mixpanel-tracking-service.js';
@@ -23,7 +23,7 @@ export const genRulesCommand = {
             const templateLoader = new FsTemplateLoader(fileService);
             const templateService = new RuleTemplateService(templateLoader);
             const globalConfigStore = new FileGlobalConfigStore();
-            const trackingService = new MixpanelTrackingService({ globalConfigStore, tokenStore: new KeychainTokenStore() });
+            const trackingService = new MixpanelTrackingService({ globalConfigStore, tokenStore: createTokenStore() });
             // Create and run UseCase
             const useCase = new GenerateRulesUseCase(fileService, new LegacyRuleDetector(), templateService, terminal, trackingService);
             await useCase.run();

package/dist/infra/repl/commands/init-command.js

@@ -10,7 +10,7 @@ import { LegacyRuleDetector } from '../../rule/legacy-rule-detector.js';
 import { RuleTemplateService } from '../../rule/rule-template-service.js';
 import { HttpSpaceService } from '../../space/http-space-service.js';
 import { FileGlobalConfigStore } from "../../storage/file-global-config-store.js";
-import { KeychainTokenStore } from '../../storage/keychain-token-store.js';
+import { createTokenStore } from '../../storage/token-store.js';
 import { HttpTeamService } from '../../team/http-team-service.js';
 import { FsTemplateLoader } from '../../template/fs-template-loader.js';
 import { ReplTerminal } from '../../terminal/repl-terminal.js';
@@ -37,7 +37,7 @@ export const initCommand = {
                 const terminal = new ReplTerminal({ onMessage, onPrompt });
                 // Create services
                 const envConfig = getCurrentConfig();
-                const tokenStore = new KeychainTokenStore();
+                const tokenStore = createTokenStore();
                 const globalConfigStore = new FileGlobalConfigStore();
                 const trackingService = new MixpanelTrackingService({ globalConfigStore, tokenStore });
                 const fileService = new FsFileService();

package/dist/infra/repl/commands/login-command.js

@@ -6,7 +6,7 @@ import { OidcDiscoveryService } from '../../auth/oidc-discovery-service.js';
 import { SystemBrowserLauncher } from '../../browser/system-browser-launcher.js';
 import { CallbackHandler } from '../../http/callback-handler.js';
 import { FileGlobalConfigStore } from "../../storage/file-global-config-store.js";
-import { KeychainTokenStore } from '../../storage/keychain-token-store.js';
+import { createTokenStore } from '../../storage/token-store.js';
 import { ReplTerminal } from '../../terminal/repl-terminal.js';
 import { MixpanelTrackingService } from '../../tracking/mixpanel-tracking-service.js';
 import { LoginUseCase } from '../../usecase/login-use-case.js';
@@ -23,7 +23,7 @@ export const loginCommand = {
             const terminal = new ReplTerminal({ onMessage, onPrompt });
             // Create services
             const config = getCurrentConfig();
-            const tokenStore = new KeychainTokenStore();
+            const tokenStore = createTokenStore();
             const globalConfigStore = new FileGlobalConfigStore();
             const trackingService = new MixpanelTrackingService({ globalConfigStore, tokenStore });
             const discoveryService = new OidcDiscoveryService();

package/dist/infra/repl/commands/logout-command.js

@@ -1,7 +1,7 @@
 import { CommandKind } from '../../../tui/types.js';
 import { FileGlobalConfigStore } from "../../storage/file-global-config-store.js";
 import { FileOnboardingPreferenceStore } from '../../storage/file-onboarding-preference-store.js';
-import { KeychainTokenStore } from '../../storage/keychain-token-store.js';
+import { createTokenStore } from '../../storage/token-store.js';
 import { ReplTerminal } from '../../terminal/repl-terminal.js';
 import { MixpanelTrackingService } from '../../tracking/mixpanel-tracking-service.js';
 import { LogoutUseCase } from '../../usecase/logout-use-case.js';
@@ -26,7 +26,7 @@ export const logoutCommand = {
                     flags: logoutFlags,
                     strict: false,
                 });
-                const tokenStore = new KeychainTokenStore();
+                const tokenStore = createTokenStore();
                 const globalConfigStore = new FileGlobalConfigStore();
                 const useCase = new LogoutUseCase({
                     onboardingPreferenceStore: new FileOnboardingPreferenceStore(),

package/dist/infra/repl/commands/pull-command.js

@@ -6,7 +6,7 @@ import { ProjectConfigStore } from '../../config/file-config-store.js';
 import { FileContextTreeSnapshotService } from '../../context-tree/file-context-tree-snapshot-service.js';
 import { FileContextTreeWriterService } from '../../context-tree/file-context-tree-writer-service.js';
 import { FileGlobalConfigStore } from "../../storage/file-global-config-store.js";
-import { KeychainTokenStore } from '../../storage/keychain-token-store.js';
+import { createTokenStore } from '../../storage/token-store.js';
 import { ReplTerminal } from '../../terminal/repl-terminal.js';
 import { MixpanelTrackingService } from '../../tracking/mixpanel-tracking-service.js';
 import { PullUseCase } from '../../usecase/pull-use-case.js';
@@ -28,7 +28,7 @@ export const pullCommand = {
                 const terminal = new ReplTerminal({ onMessage, onPrompt });
                 const parsed = await parseReplArgs(args, { flags: pullFlags, strict: false });
                 const envConfig = getCurrentConfig();
-                const tokenStore = new KeychainTokenStore();
+                const tokenStore = createTokenStore();
                 const globalConfigStore = new FileGlobalConfigStore();
                 const trackingService = new MixpanelTrackingService({ globalConfigStore, tokenStore });
                 const contextTreeSnapshotService = new FileContextTreeSnapshotService();

package/dist/infra/repl/commands/push-command.js

@@ -6,7 +6,7 @@ import { ProjectConfigStore } from '../../config/file-config-store.js';
 import { FileContextFileReader } from '../../context-tree/file-context-file-reader.js';
 import { FileContextTreeSnapshotService } from '../../context-tree/file-context-tree-snapshot-service.js';
 import { FileGlobalConfigStore } from "../../storage/file-global-config-store.js";
-import { KeychainTokenStore } from '../../storage/keychain-token-store.js';
+import { createTokenStore } from '../../storage/token-store.js';
 import { ReplTerminal } from '../../terminal/repl-terminal.js';
 import { MixpanelTrackingService } from '../../tracking/mixpanel-tracking-service.js';
 import { PushUseCase } from '../../usecase/push-use-case.js';
@@ -34,7 +34,7 @@ export const pushCommand = {
                 const terminal = new ReplTerminal({ onMessage, onPrompt });
                 const parsed = await parseReplArgs(args, { flags: pushFlags, strict: false });
                 const envConfig = getCurrentConfig();
-                const tokenStore = new KeychainTokenStore();
+                const tokenStore = createTokenStore();
                 const globalConfigStore = new FileGlobalConfigStore();
                 const trackingService = new MixpanelTrackingService({ globalConfigStore, tokenStore });
                 const useCase = new PushUseCase({

package/dist/infra/repl/commands/query-command.js

@@ -1,7 +1,7 @@
 import { isDevelopment } from '../../../config/environment.js';
 import { CommandKind } from '../../../tui/types.js';
 import { FileGlobalConfigStore } from "../../storage/file-global-config-store.js";
-import { KeychainTokenStore } from '../../storage/keychain-token-store.js';
+import { createTokenStore } from '../../storage/token-store.js';
 import { ReplTerminal } from '../../terminal/repl-terminal.js';
 import { MixpanelTrackingService } from '../../tracking/mixpanel-tracking-service.js';
 import { QueryUseCase } from '../../usecase/query-use-case.js';
@@ -31,7 +31,7 @@ export const queryCommand = {
                     query = args;
                 }
                 const terminal = new ReplTerminal({ onMessage, onPrompt });
-                const tokenStore = new KeychainTokenStore();
+                const tokenStore = createTokenStore();
                 const globalConfigStore = new FileGlobalConfigStore();
                 const useCase = new QueryUseCase({
                     terminal,

package/dist/infra/repl/commands/space/list-command.js

@@ -2,7 +2,7 @@ import { getCurrentConfig } from '../../../../config/environment.js';
 import { CommandKind } from '../../../../tui/types.js';
 import { ProjectConfigStore } from '../../../config/file-config-store.js';
 import { HttpSpaceService } from '../../../space/http-space-service.js';
-import { KeychainTokenStore } from '../../../storage/keychain-token-store.js';
+import { createTokenStore } from '../../../storage/token-store.js';
 import { ReplTerminal } from '../../../terminal/repl-terminal.js';
 import { SpaceListUseCase } from '../../../usecase/space-list-use-case.js';
 import { Flags, parseReplArgs, toCommandFlags } from '../arg-parser.js';
@@ -54,7 +54,7 @@ export const listCommand = {
                     projectConfigStore: new ProjectConfigStore(),
                     spaceService: new HttpSpaceService({ apiBaseUrl: envConfig.apiBaseUrl }),
                     terminal,
-                    tokenStore: new KeychainTokenStore(),
+                    tokenStore: createTokenStore(),
                 });
                 await useCase.run();
             },

package/dist/infra/repl/commands/space/switch-command.js

@@ -2,7 +2,7 @@ import { getCurrentConfig } from '../../../../config/environment.js';
 import { CommandKind } from '../../../../tui/types.js';
 import { ProjectConfigStore } from '../../../config/file-config-store.js';
 import { HttpSpaceService } from '../../../space/http-space-service.js';
-import { KeychainTokenStore } from '../../../storage/keychain-token-store.js';
+import { createTokenStore } from '../../../storage/token-store.js';
 import { HttpTeamService } from '../../../team/http-team-service.js';
 import { ReplTerminal } from '../../../terminal/repl-terminal.js';
 import { SpaceSwitchUseCase } from '../../../usecase/space-switch-use-case.js';
@@ -21,7 +21,7 @@ export const switchCommand = {
                     spaceService: new HttpSpaceService({ apiBaseUrl: envConfig.apiBaseUrl }),
                     teamService: new HttpTeamService({ apiBaseUrl: envConfig.apiBaseUrl }),
                     terminal,
-                    tokenStore: new KeychainTokenStore(),
+                    tokenStore: createTokenStore(),
                     workspaceDetector: new WorkspaceDetectorService(),
                 });
                 await useCase.run();

package/dist/infra/repl/commands/status-command.js

@@ -3,7 +3,7 @@ import { ProjectConfigStore } from '../../config/file-config-store.js';
 import { FileContextTreeService } from '../../context-tree/file-context-tree-service.js';
 import { FileContextTreeSnapshotService } from '../../context-tree/file-context-tree-snapshot-service.js';
 import { FileGlobalConfigStore } from "../../storage/file-global-config-store.js";
-import { KeychainTokenStore } from '../../storage/keychain-token-store.js';
+import { createTokenStore } from '../../storage/token-store.js';
 import { ReplTerminal } from '../../terminal/repl-terminal.js';
 import { MixpanelTrackingService } from '../../tracking/mixpanel-tracking-service.js';
 import { StatusUseCase } from '../../usecase/status-use-case.js';
@@ -15,7 +15,7 @@ export const statusCommand = {
         return {
             async execute(onMessage, onPrompt) {
                 const terminal = new ReplTerminal({ onMessage, onPrompt });
-                const tokenStore = new KeychainTokenStore();
+                const tokenStore = createTokenStore();
                 const globalConfigStore = new FileGlobalConfigStore();
                 const trackingService = new MixpanelTrackingService({ globalConfigStore, tokenStore });
                 const useCase = new StatusUseCase({

package/dist/infra/repl/repl-startup.js

@@ -2,7 +2,6 @@ import { jsx as _jsx } from "react/jsx-runtime";
 import { render } from 'ink';
 import { App } from '../../tui/app.js';
 import { AppProviders } from '../../tui/providers/app-providers.js';
-import { stopQueuePollingService } from '../cipher/consumer/queue-polling-service.js';
 import { connectTransportClient, disconnectTransportClient } from './transport-client-helper.js';
 /** Broadcast client - joins broadcast-room to monitor all events */
 let transportBroadcastClient = null;
@@ -30,6 +29,5 @@ export async function startRepl(options) {
     // Cleanup
     await disconnectTransportClient(transportBroadcastClient);
     transportBroadcastClient = null;
-    stopQueuePollingService();
     await trackingService.track('repl', { status: 'finished' });
 }