codekin 0.3.7 → 0.4.1

package/server/dist/session-manager.js

@@ -16,6 +16,10 @@
  * - SessionPersistence: disk I/O for session state
  */
 import { randomUUID } from 'crypto';
+import { execFile } from 'child_process';
+import { promises as fs } from 'fs';
+import path from 'path';
+import { promisify } from 'util';
 import { ClaudeProcess } from './claude-process.js';
 import { SessionArchive } from './session-archive.js';
 import { cleanupWorkspace } from './webhook-workspace.js';
@@ -24,6 +28,79 @@ import { ApprovalManager } from './approval-manager.js';
 import { SessionNaming } from './session-naming.js';
 import { SessionPersistence } from './session-persistence.js';
 import { deriveSessionToken } from './crypto-utils.js';
+import { parseDiff, createUntrackedFileDiff } from './diff-parser.js';
+const execFileAsync = promisify(execFile);
+/** Max stdout for git commands (2 MB). */
+const GIT_MAX_BUFFER = 2 * 1024 * 1024;
+/** Timeout for git commands (10 seconds). */
+const GIT_TIMEOUT_MS = 10_000;
+/** Max paths per git command to stay under ARG_MAX (~128 KB on Linux). */
+const GIT_PATH_CHUNK_SIZE = 200;
+/** Run a git command as a fixed argv array (no shell interpolation). */
+async function execGit(args, cwd) {
+    const { stdout } = await execFileAsync('git', args, {
+        cwd,
+        maxBuffer: GIT_MAX_BUFFER,
+        timeout: GIT_TIMEOUT_MS,
+    });
+    return stdout;
+}
+/** Run a git command with paths chunked to avoid E2BIG. Concatenates stdout. */
+async function execGitChunked(baseArgs, paths, cwd) {
+    let result = '';
+    for (let i = 0; i < paths.length; i += GIT_PATH_CHUNK_SIZE) {
+        const chunk = paths.slice(i, i + GIT_PATH_CHUNK_SIZE);
+        result += await execGit([...baseArgs, '--', ...chunk], cwd);
+    }
+    return result;
+}
+/** Get file statuses from `git status --porcelain` for given paths (or all). */
+async function getFileStatuses(cwd, paths) {
+    const args = ['status', '--porcelain', '-z'];
+    if (paths)
+        args.push('--', ...paths);
+    const raw = await execGit(args, cwd);
+    const result = {};
+    // git status --porcelain=v1 -z format: XY NUL path NUL
+    // XY is a two-character status code: X = index status, Y = worktree status.
+    // Examples: " M" = unstaged modification, "A " = staged addition, "??" = untracked.
+    // For renames/copies: XY NUL oldpath NUL newpath NUL
+    const parts = raw.split('\0');
+    let i = 0;
+    while (i < parts.length) {
+        const entry = parts[i];
+        if (entry.length < 3) {
+            i++;
+            continue;
+        } // skip empty trailing entries
+        const x = entry[0]; // index status
+        const y = entry[1]; // worktree status
+        const filePath = entry.slice(3);
+        if (x === 'R' || x === 'C') {
+            // Rename/copy: next NUL-separated part is the new path
+            const newPath = parts[i + 1] ?? filePath;
+            result[newPath] = 'renamed';
+            i += 2;
+        }
+        else if (x === 'D' || y === 'D') {
+            result[filePath] = 'deleted';
+            i++;
+        }
+        else if (x === '?' && y === '?') {
+            result[filePath] = 'added';
+            i++;
+        }
+        else if (x === 'A') {
+            result[filePath] = 'added';
+            i++;
+        }
+        else {
+            result[filePath] = 'modified';
+            i++;
+        }
+    }
+    return result;
+}
 /** Max messages retained in a session's output history buffer. */
 const MAX_HISTORY = 2000;
 /** Max auto-restart attempts before requiring manual intervention. */
@@ -50,22 +127,25 @@ const API_RETRY_PATTERNS = [
     /503/,
 ];
 export class SessionManager {
+    /** All active (non-archived) sessions, keyed by session UUID. */
     sessions = new Map();
-    /** SQLite archive for closed sessions. */
+    /** Reverse lookup: WebSocket → session ID for O(1) client-to-session resolution. */
+    clientSessionMap = new Map();
+    /** SQLite archive for closed sessions (persists conversation summaries across restarts). */
     archive;
     /** Exposed so ws-server can pass its port to child Claude processes. */
     _serverPort = PORT;
     /** Exposed so ws-server can pass the auth token to child Claude processes. */
     _authToken = '';
-    /** Callback to broadcast a message to ALL connected WebSocket clients (set by ws-server). */
+    /** Callback to broadcast a message to ALL connected WebSocket clients (set by ws-server on startup). */
     _globalBroadcast = null;
-    /** Registered listeners notified when a session's Claude process exits. */
+    /** Registered listeners notified when a session's Claude process exits (used by webhook-handler for chained workflows). */
     _exitListeners = [];
-    /** Delegated approval logic. */
+    /** Delegated approval logic (auto-approve patterns, deny-lists, pattern management). */
     approvalManager;
-    /** Delegated naming logic. */
+    /** Delegated auto-naming logic (generates session names from first user message via Claude API). */
     sessionNaming;
-    /** Delegated persistence logic. */
+    /** Delegated persistence logic (saves/restores session metadata to disk across server restarts). */
     sessionPersistence;
     constructor() {
         this.archive = new SessionArchive();
@@ -94,6 +174,10 @@ export class SessionManager {
     getApprovals(workingDir) {
         return this.approvalManager.getApprovals(workingDir);
     }
+    /** Return approvals effective globally via cross-repo inference. */
+    getGlobalApprovals() {
+        return this.approvalManager.getGlobalApprovals();
+    }
     /** Remove an auto-approval rule for a repo (workingDir) and persist to disk. */
     removeApproval(workingDir, opts, skipPersist = false) {
         return this.approvalManager.removeApproval(workingDir, opts, skipPersist);
@@ -157,6 +241,7 @@ export class SessionManager {
             isProcessing: false,
             pendingControlRequests: new Map(),
             pendingToolApprovals: new Map(),
+            _leaveGraceTimer: null,
         };
         this.sessions.set(id, session);
         this.persistToDisk();
@@ -201,7 +286,13 @@ export class SessionManager {
         const session = this.sessions.get(sessionId);
         if (!session)
             return undefined;
+        // Cancel pending auto-deny from leave grace period
+        if (session._leaveGraceTimer) {
+            clearTimeout(session._leaveGraceTimer);
+            session._leaveGraceTimer = null;
+        }
         session.clients.add(ws);
+        this.clientSessionMap.set(ws, sessionId);
         // Re-broadcast pending tool approval prompts (PreToolUse hook path)
         for (const pending of session.pendingToolApprovals.values()) {
             if (pending.promptMsg) {
@@ -218,28 +309,38 @@ export class SessionManager {
         }
         return session;
     }
-    /** Remove a WebSocket client from a session. Auto-denies pending prompts if last client leaves. */
+    /** Remove a WebSocket client from a session. Auto-denies pending prompts if last client leaves (after grace period). */
     leave(sessionId, ws) {
         const session = this.sessions.get(sessionId);
         if (session) {
             session.clients.delete(ws);
-            // If no clients remain, auto-deny all pending prompts to prevent hangs
+            this.clientSessionMap.delete(ws);
+            // If no clients remain, wait a grace period before auto-denying.
+            // This prevents false denials when the user is just refreshing the page.
             if (session.clients.size === 0) {
-                if (session.pendingControlRequests.size > 0) {
-                    console.log(`[session] last client left, auto-denying ${session.pendingControlRequests.size} pending control requests`);
-                    for (const [requestId] of session.pendingControlRequests) {
-                        session.claudeProcess?.sendControlResponse(requestId, 'deny');
-                    }
-                    session.pendingControlRequests.clear();
-                }
-                if (session.pendingToolApprovals.size > 0) {
-                    console.log(`[session] last client left, auto-denying ${session.pendingToolApprovals.size} pending tool approval(s)`);
-                    for (const [reqId, pending] of session.pendingToolApprovals) {
-                        pending.resolve({ allow: false, always: false });
-                        this.broadcast(session, { type: 'prompt_dismiss', requestId: reqId });
+                if (session._leaveGraceTimer)
+                    clearTimeout(session._leaveGraceTimer);
+                session._leaveGraceTimer = setTimeout(() => {
+                    session._leaveGraceTimer = null;
+                    // Re-check: if still no clients after grace period, auto-deny
+                    if (session.clients.size === 0) {
+                        if (session.pendingControlRequests.size > 0) {
+                            console.log(`[session] last client left, auto-denying ${session.pendingControlRequests.size} pending control requests`);
+                            for (const [requestId] of session.pendingControlRequests) {
+                                session.claudeProcess?.sendControlResponse(requestId, 'deny');
+                            }
+                            session.pendingControlRequests.clear();
+                        }
+                        if (session.pendingToolApprovals.size > 0) {
+                            console.log(`[session] last client left, auto-denying ${session.pendingToolApprovals.size} pending tool approval(s)`);
+                            for (const [reqId, pending] of session.pendingToolApprovals) {
+                                pending.resolve({ allow: false, always: false });
+                                this.broadcast(session, { type: 'prompt_dismiss', requestId: reqId });
+                            }
+                            session.pendingToolApprovals.clear();
+                        }
                     }
-                    session.pendingToolApprovals.clear();
-                }
+                }, 3000);
             }
         }
     }
@@ -255,6 +356,8 @@ export class SessionManager {
             clearTimeout(session._apiRetryTimer);
         if (session._namingTimer)
             clearTimeout(session._namingTimer);
+        if (session._leaveGraceTimer)
+            clearTimeout(session._leaveGraceTimer);
         // Kill claude process if running
         if (session.claudeProcess) {
             session.claudeProcess.stop();
@@ -670,10 +773,40 @@ export class SessionManager {
         if (!session)
             return;
         // Check for pending tool approval from PreToolUse hook
-        // Match by requestId if provided, otherwise fall back to oldest pending approval
-        const approval = requestId
-            ? session.pendingToolApprovals.get(requestId)
-            : session.pendingToolApprovals.values().next().value; // fallback: oldest
+        if (!requestId) {
+            const totalPending = session.pendingToolApprovals.size + session.pendingControlRequests.size;
+            if (totalPending === 1) {
+                // Exactly one pending prompt — safe to infer the target
+                const soleApproval = session.pendingToolApprovals.size === 1
+                    ? session.pendingToolApprovals.values().next().value
+                    : undefined;
+                if (soleApproval) {
+                    console.warn(`[prompt_response] no requestId, routing to sole pending tool approval: ${soleApproval.toolName}`);
+                    this.resolveToolApproval(session, soleApproval, value);
+                    return;
+                }
+                const soleControl = session.pendingControlRequests.size === 1
+                    ? session.pendingControlRequests.values().next().value
+                    : undefined;
+                if (soleControl) {
+                    console.warn(`[prompt_response] no requestId, routing to sole pending control request: ${soleControl.toolName}`);
+                    requestId = soleControl.requestId;
+                }
+            }
+            else if (totalPending > 1) {
+                console.warn(`[prompt_response] no requestId with ${totalPending} pending prompts — rejecting to prevent misrouted response`);
+                this.broadcast(session, {
+                    type: 'system_message',
+                    subtype: 'error',
+                    text: 'Prompt response could not be routed: multiple prompts pending. Please refresh and try again.',
+                });
+                return;
+            }
+            else {
+                console.warn(`[prompt_response] no requestId, no pending prompts — forwarding as user message`);
+            }
+        }
+        const approval = requestId ? session.pendingToolApprovals.get(requestId) : undefined;
         if (approval) {
             this.resolveToolApproval(session, approval, value);
             return;
@@ -681,9 +814,7 @@ export class SessionManager {
         if (!session.claudeProcess?.isAlive())
             return;
         // Find matching pending control request
-        const pending = requestId
-            ? session.pendingControlRequests.get(requestId)
-            : session.pendingControlRequests.values().next().value; // fallback: oldest
+        const pending = requestId ? session.pendingControlRequests.get(requestId) : undefined;
         if (pending) {
             session.pendingControlRequests.delete(pending.requestId);
             // Dismiss prompt on all other clients viewing this session
@@ -1028,19 +1159,228 @@ export class SessionManager {
             }
         }
     }
-    // Find which session a WebSocket is connected to
+    // Find which session a WebSocket is connected to (O(1) via reverse map)
     findSessionForClient(ws) {
-        for (const session of this.sessions.values()) {
-            if (session.clients.has(ws))
-                return session;
-        }
+        const sessionId = this.clientSessionMap.get(ws);
+        if (sessionId)
+            return this.sessions.get(sessionId);
         return undefined;
     }
-    // Remove a client from all sessions
+    // Remove a client from all sessions (iterates for safety since a ws
+    // could theoretically appear in multiple session client sets)
     removeClient(ws) {
         for (const session of this.sessions.values()) {
             session.clients.delete(ws);
         }
+        this.clientSessionMap.delete(ws);
+    }
+    // ---------------------------------------------------------------------------
+    // Diff viewer
+    // ---------------------------------------------------------------------------
+    /**
+     * Run git diff in a session's workingDir and return structured results.
+     * Includes untracked file discovery for 'unstaged' and 'all' scopes.
+     */
+    async getDiff(sessionId, scope = 'all') {
+        const session = this.sessions.get(sessionId);
+        if (!session)
+            return { type: 'diff_error', message: 'Session not found' };
+        const cwd = session.workingDir;
+        try {
+            // Get branch name
+            let branch;
+            try {
+                const branchResult = await execGit(['rev-parse', '--abbrev-ref', 'HEAD'], cwd);
+                branch = branchResult.trim();
+                if (branch === 'HEAD') {
+                    const shaResult = await execGit(['rev-parse', '--short', 'HEAD'], cwd);
+                    branch = `detached at ${shaResult.trim()}`;
+                }
+            }
+            catch {
+                branch = 'unknown';
+            }
+            // Build diff command based on scope
+            const diffArgs = ['diff', '--find-renames', '--no-color', '--unified=3'];
+            if (scope === 'staged') {
+                diffArgs.push('--cached');
+            }
+            else if (scope === 'all') {
+                diffArgs.push('HEAD');
+            }
+            // 'unstaged' uses bare `git diff` (working tree vs index)
+            let rawDiff;
+            try {
+                rawDiff = await execGit(diffArgs, cwd);
+            }
+            catch {
+                // git diff HEAD fails if no commits yet — fall back to staged + unstaged
+                if (scope === 'all') {
+                    const [staged, unstaged] = await Promise.all([
+                        execGit(['diff', '--cached', '--find-renames', '--no-color', '--unified=3'], cwd).catch(() => ''),
+                        execGit(['diff', '--find-renames', '--no-color', '--unified=3'], cwd).catch(() => ''),
+                    ]);
+                    rawDiff = staged + unstaged;
+                }
+                else {
+                    rawDiff = '';
+                }
+            }
+            const { files, truncated, truncationReason } = parseDiff(rawDiff);
+            // Discover untracked files for 'unstaged' and 'all' scopes
+            if (scope !== 'staged') {
+                try {
+                    const untrackedRaw = await execGit(['ls-files', '--others', '--exclude-standard'], cwd);
+                    const untrackedPaths = untrackedRaw.trim().split('\n').filter(Boolean);
+                    for (const relPath of untrackedPaths) {
+                        try {
+                            const fullPath = path.join(cwd, relPath);
+                            // Check if binary by attempting to read as utf-8
+                            const content = await fs.readFile(fullPath, 'utf-8');
+                            files.push(createUntrackedFileDiff(relPath, content));
+                        }
+                        catch {
+                            // Binary or unreadable — add as binary
+                            files.push({
+                                path: relPath,
+                                status: 'added',
+                                isBinary: true,
+                                additions: 0,
+                                deletions: 0,
+                                hunks: [],
+                            });
+                        }
+                    }
+                }
+                catch {
+                    // ls-files failed — skip untracked
+                }
+            }
+            const summary = {
+                filesChanged: files.length,
+                insertions: files.reduce((sum, f) => sum + f.additions, 0),
+                deletions: files.reduce((sum, f) => sum + f.deletions, 0),
+                truncated,
+                truncationReason,
+            };
+            return { type: 'diff_result', files, summary, branch, scope };
+        }
+        catch (err) {
+            const message = err instanceof Error ? err.message : 'Failed to get diff';
+            return { type: 'diff_error', message };
+        }
+    }
+    /**
+     * Discard changes in a session's workingDir per the given scope and paths.
+     * Returns a fresh diff_result after discarding.
+     */
+    async discardChanges(sessionId, scope, paths, statuses) {
+        const session = this.sessions.get(sessionId);
+        if (!session)
+            return { type: 'diff_error', message: 'Session not found' };
+        const cwd = session.workingDir;
+        try {
+            // Validate paths — enforce separator boundary to prevent /repoX matching /repo
+            if (paths) {
+                const root = path.join(path.resolve(cwd), path.sep);
+                for (const p of paths) {
+                    if (p.includes('..') || path.isAbsolute(p)) {
+                        return { type: 'diff_error', message: `Invalid path: ${p}` };
+                    }
+                    const resolved = path.resolve(cwd, p);
+                    if (resolved !== path.resolve(cwd) && !resolved.startsWith(root)) {
+                        return { type: 'diff_error', message: `Path escapes working directory: ${p}` };
+                    }
+                }
+            }
+            // Determine file statuses if not provided
+            let fileStatuses = statuses ?? {};
+            if (!statuses && paths) {
+                fileStatuses = await getFileStatuses(cwd, paths);
+            }
+            else if (!statuses && !paths) {
+                fileStatuses = await getFileStatuses(cwd);
+            }
+            const targetPaths = paths ?? Object.keys(fileStatuses);
+            // Separate files by status for different handling
+            const trackedPaths = [];
+            const untrackedPaths = [];
+            const stagedNewPaths = [];
+            for (const p of targetPaths) {
+                const status = fileStatuses[p];
+                if (status === 'added') {
+                    // Determine if untracked or staged-new by checking the index
+                    try {
+                        const indexEntry = (await execGit(['ls-files', '--stage', '--', p], cwd)).trim();
+                        if (indexEntry) {
+                            stagedNewPaths.push(p);
+                        }
+                        else {
+                            untrackedPaths.push(p);
+                        }
+                    }
+                    catch {
+                        untrackedPaths.push(p);
+                    }
+                }
+                else {
+                    trackedPaths.push(p);
+                }
+            }
+            // Handle tracked files (modified, deleted, renamed) with git restore
+            if (trackedPaths.length > 0) {
+                const restoreArgs = ['restore'];
+                if (scope === 'staged') {
+                    restoreArgs.push('--staged');
+                }
+                else if (scope === 'all') {
+                    restoreArgs.push('--staged', '--worktree');
+                }
+                else {
+                    restoreArgs.push('--worktree');
+                }
+                try {
+                    await execGitChunked(restoreArgs, trackedPaths, cwd);
+                }
+                catch (err) {
+                    // Fallback for Git < 2.23
+                    console.warn('[discard] git restore failed, trying fallback:', err);
+                    if (scope === 'staged' || scope === 'all') {
+                        await execGitChunked(['reset', 'HEAD'], trackedPaths, cwd);
+                    }
+                    if (scope === 'unstaged' || scope === 'all') {
+                        await execGitChunked(['checkout'], trackedPaths, cwd);
+                    }
+                }
+            }
+            // Handle staged new files
+            if (stagedNewPaths.length > 0) {
+                if (scope === 'staged') {
+                    // Unstage only — leave on disk
+                    await execGitChunked(['rm', '--cached'], stagedNewPaths, cwd);
+                }
+                else if (scope === 'all') {
+                    // Remove from index and disk
+                    await execGitChunked(['rm', '--cached'], stagedNewPaths, cwd);
+                    for (const p of stagedNewPaths) {
+                        await fs.unlink(path.join(cwd, p)).catch(() => { });
+                    }
+                }
+                // 'unstaged' scope: N/A for staged-new files
+            }
+            // Handle untracked files (delete from disk)
+            if (untrackedPaths.length > 0 && scope !== 'staged') {
+                for (const p of untrackedPaths) {
+                    await fs.unlink(path.join(cwd, p)).catch(() => { });
+                }
+            }
+            // Return fresh diff
+            return await this.getDiff(sessionId, scope);
+        }
+        catch (err) {
+            const message = err instanceof Error ? err.message : 'Failed to discard changes';
+            return { type: 'diff_error', message };
+        }
     }
     /** Graceful shutdown: complete in-progress tasks, persist state, kill all processes. */
     shutdown() {