sidekick-shared 0.26.4 → 0.26.6

package/dist/sessionMonitor.js

@@ -35,6 +35,7 @@ var __importStar = (this && this.__importStar) || (function () {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SessionMonitor = void 0;
 const fs = __importStar(require("node:fs"));
+const path = __importStar(require("node:path"));
 const EventAggregator_1 = require("./aggregation/EventAggregator");
 const observedSessionCollector_1 = require("./observedSessionCollector");
 /**
@@ -119,6 +120,22 @@ class SessionMonitor {
                 ];
             },
             read: () => null,
+            // One session is watched, so an event naming any other file costs
+            // nothing; an event naming this file costs one stat.
+            resolveReference: async (signal) => {
+                if (!signal.root || typeof signal.filename !== 'string' || !signal.filename) {
+                    return { status: 'unknown' };
+                }
+                if (!this.sessionPath)
+                    return { status: 'ignored' };
+                const eventPath = path.resolve(signal.root, signal.filename);
+                if (eventPath !== path.resolve(this.sessionPath))
+                    return { status: 'ignored' };
+                const [reference] = await source.discover();
+                return reference
+                    ? { status: 'present', reference }
+                    : { status: 'missing', sessionId: this.provider.getSessionId(this.sessionPath) };
+            },
             subscribe: (listener, sourceOptions) => {
                 const watchers = new Set();
                 let pollTimer = null;
@@ -131,7 +148,12 @@ class SessionMonitor {
                 }
                 for (const root of new Set(roots)) {
                     try {
-                        const watcher = fs.watch(root, { persistent: false, recursive: true }, listener);
+                        const watcher = fs.watch(root, { persistent: false, recursive: true }, (eventType, filename) => listener({
+                            trigger: 'event',
+                            root,
+                            eventType,
+                            filename: filename === null || filename === undefined ? null : String(filename),
+                        }));
                         watchers.add(watcher);
                         watcher.on('error', () => {
                             watchers.delete(watcher);
@@ -149,7 +171,7 @@ class SessionMonitor {
                 }
                 const pollIntervalMs = sourceOptions?.pollIntervalMs ?? 0;
                 if (pollIntervalMs > 0) {
-                    pollTimer = setInterval(listener, pollIntervalMs);
+                    pollTimer = setInterval(() => listener({ trigger: 'poll' }), pollIntervalMs);
                     pollTimer.unref?.();
                 }
                 return {

package/dist/terminalSync.d.ts

@@ -1,7 +1,7 @@
-import { type AccountProviderId } from './accountRegistry';
-export declare function setTerminalActiveProfile(provider: AccountProviderId, home: string | null): void;
-export declare function installShellHook(): void;
-export declare function uninstallShellHook(): void;
-export declare function isShellHookInstalled(): boolean;
+import type { AccountProviderId } from './accountRegistry';
+/**
+ * Write a POSIX launcher script that runs the provider CLI against a profile
+ * home. Unix only; on Windows use `sidekick accounts env --shell powershell`.
+ */
 export declare function writeLauncher(name: string, provider: AccountProviderId, profileHome: string): void;
 export declare function removeLauncher(name: string): void;

package/dist/terminalSync.js

@@ -33,130 +33,20 @@ var __importStar = (this && this.__importStar) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.setTerminalActiveProfile = setTerminalActiveProfile;
-exports.installShellHook = installShellHook;
-exports.uninstallShellHook = uninstallShellHook;
-exports.isShellHookInstalled = isShellHookInstalled;
 exports.writeLauncher = writeLauncher;
 exports.removeLauncher = removeLauncher;
 const fs = __importStar(require("fs"));
 const os = __importStar(require("os"));
 const path = __importStar(require("path"));
-const accountRegistry_1 = require("./accountRegistry");
-const HOOK_START = '# >>> sidekick >>>';
-const HOOK_END = '# <<< sidekick <<<';
+const atomic_1 = require("./writers/atomic");
 const LAUNCHER_MARKER = '# sidekick-launcher v1';
 const LAUNCHER_NAME_PATTERN = /^[a-zA-Z0-9_-]+$/;
-function providerPointerName(provider) {
-    return provider === 'claude-code' ? 'claude' : 'codex';
-}
 function providerEnvVar(provider) {
     return provider === 'claude-code' ? 'CLAUDE_CONFIG_DIR' : 'CODEX_HOME';
 }
 function providerBinary(provider) {
     return provider === 'claude-code' ? 'claude' : 'codex';
 }
-function getActiveProfilesDir() {
-    return path.join((0, accountRegistry_1.getAccountsDir)(), 'active');
-}
-function getActiveProfilePath(provider) {
-    return path.join(getActiveProfilesDir(), `${providerPointerName(provider)}.profile`);
-}
-function atomicWriteFile(filePath, content, mode = 0o600) {
-    fs.mkdirSync(path.dirname(filePath), { recursive: true, mode: 0o700 });
-    const tmp = `${filePath}.tmp`;
-    try {
-        fs.writeFileSync(tmp, content, { encoding: 'utf8', mode });
-        fs.renameSync(tmp, filePath);
-    }
-    catch (err) {
-        try {
-            fs.rmSync(tmp, { force: true });
-        }
-        catch {
-            /* nothing to clean up */
-        }
-        throw err;
-    }
-}
-function setTerminalActiveProfile(provider, home) {
-    const pointerPath = getActiveProfilePath(provider);
-    if (home === null) {
-        fs.rmSync(pointerPath, { force: true });
-        return;
-    }
-    atomicWriteFile(pointerPath, `${home}\n`);
-}
-function shellQuote(value) {
-    return `'${value.replace(/'/g, `'\\''`)}'`;
-}
-function buildShellHookBlock() {
-    const claudePointer = getActiveProfilePath('claude-code');
-    const codexPointer = getActiveProfilePath('codex');
-    return [
-        HOOK_START,
-        'sidekick_sync() {',
-        `  if [ -r ${shellQuote(claudePointer)} ]; then export CLAUDE_CONFIG_DIR="$(cat ${shellQuote(claudePointer)})"; else unset CLAUDE_CONFIG_DIR; fi`,
-        `  if [ -r ${shellQuote(codexPointer)} ]; then export CODEX_HOME="$(cat ${shellQuote(codexPointer)})"; else unset CODEX_HOME; fi`,
-        '}',
-        'sidekick_sync >/dev/null 2>&1',
-        HOOK_END,
-        '',
-    ].join('\n');
-}
-function getShellRcPaths() {
-    const zshrc = path.join(os.homedir(), '.zshrc');
-    const bashrc = path.join(os.homedir(), '.bashrc');
-    const existing = [zshrc, bashrc].filter((filePath) => fs.existsSync(filePath));
-    if (existing.length > 0)
-        return existing;
-    const shell = path.basename(process.env.SHELL ?? 'zsh');
-    return shell === 'bash' ? [bashrc] : [zshrc];
-}
-function resolveShellRcTarget(filePath) {
-    if (!fs.existsSync(filePath))
-        return { filePath, mode: 0o600 };
-    const realPath = fs.realpathSync(filePath);
-    return { filePath: realPath, mode: fs.statSync(realPath).mode & 0o777 };
-}
-function stripShellHook(content) {
-    const pattern = new RegExp(`${HOOK_START}[\\s\\S]*?${HOOK_END}\\n?`, 'g');
-    return content.replace(pattern, '').replace(/\n{3,}/g, '\n\n');
-}
-function installHookInFile(filePath) {
-    const target = resolveShellRcTarget(filePath);
-    const existing = fs.existsSync(target.filePath) ? fs.readFileSync(target.filePath, 'utf8') : '';
-    const cleaned = stripShellHook(existing).replace(/\s*$/, '');
-    const next = cleaned ? `${cleaned}\n\n${buildShellHookBlock()}` : buildShellHookBlock();
-    atomicWriteFile(target.filePath, next, target.mode);
-}
-function installShellHook() {
-    for (const rcPath of getShellRcPaths()) {
-        installHookInFile(rcPath);
-    }
-}
-function uninstallHookInFile(filePath) {
-    if (!fs.existsSync(filePath))
-        return;
-    const target = resolveShellRcTarget(filePath);
-    atomicWriteFile(target.filePath, stripShellHook(fs.readFileSync(target.filePath, 'utf8')), target.mode);
-}
-function uninstallShellHook() {
-    for (const rcPath of getShellRcPaths()) {
-        uninstallHookInFile(rcPath);
-    }
-}
-function isShellHookInstalled() {
-    return getShellRcPaths().some((rcPath) => {
-        try {
-            const content = fs.readFileSync(rcPath, 'utf8');
-            return content.includes(HOOK_START) && content.includes(HOOK_END);
-        }
-        catch {
-            return false;
-        }
-    });
-}
 function getLauncherDir() {
     return path.join(os.homedir(), '.local', 'bin');
 }
@@ -189,6 +79,10 @@ function assertNoLauncherCollision(name, targetPath) {
         }
     }
 }
+/**
+ * Write a POSIX launcher script that runs the provider CLI against a profile
+ * home. Unix only; on Windows use `sidekick accounts env --shell powershell`.
+ */
 function writeLauncher(name, provider, profileHome) {
     assertValidLauncherName(name);
     const launcherPath = getLauncherPath(name);
@@ -199,10 +93,11 @@ function writeLauncher(name, provider, profileHome) {
         '#!/bin/sh',
         LAUNCHER_MARKER,
         `export ${envVar}=${JSON.stringify(profileHome)}`,
+        ...(provider === 'claude-code' ? ['unset CLAUDE_SECURESTORAGE_CONFIG_DIR'] : []),
         `exec ${binary} "$@"`,
         '',
     ].join('\n');
-    atomicWriteFile(launcherPath, script, 0o755);
+    (0, atomic_1.atomicWriteFileSync)(launcherPath, script, 0o755);
 }
 function removeLauncher(name) {
     assertValidLauncherName(name);

package/dist/writers/atomic.d.ts

@@ -1,3 +1,5 @@
+export declare function renameSyncWithRetry(from: string, to: string): void;
+export declare function renameWithRetry(from: string, to: string): Promise<void>;
 export declare function atomicWriteJson(filePath: string, value: unknown): Promise<void>;
 export declare function atomicWriteJsonSync(filePath: string, value: unknown): void;
 /** Raw-string sibling of {@link atomicWriteJsonSync} for non-JSON payloads. */

package/dist/writers/atomic.js

@@ -33,6 +33,8 @@ var __importStar = (this && this.__importStar) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.renameSyncWithRetry = renameSyncWithRetry;
+exports.renameWithRetry = renameWithRetry;
 exports.atomicWriteJson = atomicWriteJson;
 exports.atomicWriteJsonSync = atomicWriteJsonSync;
 exports.atomicWriteFileSync = atomicWriteFileSync;
@@ -71,6 +73,51 @@ const LOCK_ABANDONED_MS = 120_000;
 const SYNC_LOCK_MAX_WAIT_MS = 15_000;
 const LOCK_WAIT_INTERVAL_MS = 15;
 const lockSleepView = new Int32Array(new SharedArrayBuffer(4));
+/**
+ * Windows refuses to replace a file another process holds open (antivirus
+ * scanners, an editor extension re-reading `auth.json`) with EPERM/EBUSY/EACCES
+ * even though the rename would succeed a few milliseconds later. Retry with a
+ * short back-off on that platform only; other platforms surface the error.
+ */
+const WIN32_RENAME_RETRY_CODES = new Set(['EPERM', 'EBUSY', 'EACCES']);
+const WIN32_RENAME_MAX_ATTEMPTS = 10;
+function renameRetryDelayMs(attempt) {
+    return Math.min(320, 20 * 2 ** attempt);
+}
+function shouldRetryRename(error, attempt) {
+    if (process.platform !== 'win32')
+        return false;
+    if (attempt >= WIN32_RENAME_MAX_ATTEMPTS - 1)
+        return false;
+    const code = error.code ?? '';
+    return WIN32_RENAME_RETRY_CODES.has(code);
+}
+function renameSyncWithRetry(from, to) {
+    for (let attempt = 0;; attempt++) {
+        try {
+            fs.renameSync(from, to);
+            return;
+        }
+        catch (error) {
+            if (!shouldRetryRename(error, attempt))
+                throw error;
+            Atomics.wait(lockSleepView, 0, 0, renameRetryDelayMs(attempt));
+        }
+    }
+}
+async function renameWithRetry(from, to) {
+    for (let attempt = 0;; attempt++) {
+        try {
+            await fs.promises.rename(from, to);
+            return;
+        }
+        catch (error) {
+            if (!shouldRetryRename(error, attempt))
+                throw error;
+            await new Promise((resolve) => setTimeout(resolve, renameRetryDelayMs(attempt)));
+        }
+    }
+}
 async function syncDirectory(directory) {
     let handle;
     try {
@@ -112,7 +159,7 @@ async function atomicWriteJson(filePath, value) {
         await handle.sync();
         await handle.close();
         handle = undefined;
-        await fs.promises.rename(tempPath, filePath);
+        await renameWithRetry(tempPath, filePath);
         await syncDirectory(path.dirname(filePath));
     }
     catch (error) {
@@ -135,7 +182,7 @@ function atomicWriteFileSync(filePath, content, mode = 0o600) {
         fs.fsyncSync(descriptor);
         fs.closeSync(descriptor);
         descriptor = undefined;
-        fs.renameSync(tempPath, filePath);
+        renameSyncWithRetry(tempPath, filePath);
         syncDirectorySync(path.dirname(filePath));
     }
     catch (error) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sidekick-shared",
-  "version": "0.26.4",
+  "version": "0.26.6",
   "description": "Shared data access layer for Sidekick — readers, types, providers, credentials, quota",
   "keywords": [
     "claude-code",