codekin 0.3.7 → 0.4.1

package/server/dist/diff-parser.js

@@ -0,0 +1,242 @@
+/**
+ * Parses raw `git diff` output into structured DiffFile[] objects.
+ *
+ * Handles unified diff format with rename detection, binary files,
+ * and optional size-based truncation.
+ */
+/** 2 MB default cap on raw diff output before truncation. */
+const DEFAULT_MAX_BYTES = 2 * 1024 * 1024;
+/**
+ * Parse raw unified diff output into structured file/hunk/line objects.
+ * If `maxBytes` is provided and the input exceeds it, parsing stops early
+ * and `truncated` is set to true.
+ */
+export function parseDiff(raw, maxBytes = DEFAULT_MAX_BYTES) {
+    let truncated = false;
+    let truncationReason;
+    let input = raw;
+    if (Buffer.byteLength(raw, 'utf-8') > maxBytes) {
+        truncated = true;
+        truncationReason = `Diff output exceeded ${Math.round(maxBytes / (1024 * 1024))} MB limit`;
+        // Truncate to roughly maxBytes — walk back to a valid UTF-8 boundary
+        // to avoid splitting multibyte characters (emoji, CJK, etc.)
+        const buf = Buffer.from(raw, 'utf-8');
+        let end = maxBytes;
+        // UTF-8 continuation bytes start with 0b10xxxxxx (0x80–0xBF).
+        // Walk back past any continuation bytes so we don't split a code point.
+        while (end > 0 && (buf[end] & 0xC0) === 0x80)
+            end--;
+        const sliced = buf.subarray(0, end).toString('utf-8');
+        const lastNewline = sliced.lastIndexOf('\n');
+        input = lastNewline > 0 ? sliced.slice(0, lastNewline) : sliced;
+    }
+    const files = [];
+    // Split on diff headers: "diff --git a/... b/..."
+    const fileSections = input.split(/^diff --git /m);
+    for (let i = 1; i < fileSections.length; i++) {
+        const section = fileSections[i];
+        const file = parseFileSection(section);
+        if (file)
+            files.push(file);
+    }
+    return { files, truncated, truncationReason };
+}
+function parseFileSection(section) {
+    const lines = section.split('\n');
+    if (lines.length === 0)
+        return null;
+    // First line: "a/path b/path"
+    const headerLine = lines[0];
+    const pathMatch = headerLine.match(/^a\/(.+?) b\/(.+?)$/);
+    if (!pathMatch)
+        return null;
+    const bPath = pathMatch[2];
+    let status = 'modified';
+    let oldPath;
+    let isBinary = false;
+    const hunks = [];
+    let additions = 0;
+    let deletions = 0;
+    let lineIdx = 1;
+    // Parse extended header lines (new file, deleted file, rename, binary, etc.)
+    while (lineIdx < lines.length) {
+        const line = lines[lineIdx];
+        if (line.startsWith('new file mode')) {
+            status = 'added';
+        }
+        else if (line.startsWith('deleted file mode')) {
+            status = 'deleted';
+        }
+        else if (line.startsWith('rename from ')) {
+            status = 'renamed';
+            oldPath = line.slice('rename from '.length);
+        }
+        else if (line.startsWith('similarity index') || line.startsWith('dissimilarity index')) {
+            // part of rename/copy header, skip
+        }
+        else if (line.startsWith('rename to ')) {
+            // already captured via bPath
+        }
+        else if (line.startsWith('index ')) {
+            // index line, skip
+        }
+        else if (line === 'GIT binary patch' || line.startsWith('Binary files ')) {
+            isBinary = true;
+        }
+        else if (line.startsWith('--- ') || line.startsWith('+++ ')) {
+            // file marker lines — skip but keep going for hunks
+        }
+        else if (line.startsWith('@@')) {
+            // Start of hunks — break out to hunk parsing
+            break;
+        }
+        else if (line.startsWith('old mode') || line.startsWith('new mode')) {
+            // mode change, skip
+        }
+        else {
+            // Unknown header line or empty — if we hit content, stop
+            if (!line.startsWith('\\') && line !== '') {
+                break;
+            }
+        }
+        lineIdx++;
+    }
+    // Parse hunks
+    if (!isBinary) {
+        while (lineIdx < lines.length) {
+            const line = lines[lineIdx];
+            if (line.startsWith('@@')) {
+                const hunkResult = parseHunk(lines, lineIdx);
+                if (hunkResult) {
+                    hunks.push(hunkResult.hunk);
+                    additions += hunkResult.additions;
+                    deletions += hunkResult.deletions;
+                    lineIdx = hunkResult.nextIdx;
+                }
+                else {
+                    lineIdx++;
+                }
+            }
+            else {
+                lineIdx++;
+            }
+        }
+    }
+    return {
+        path: bPath,
+        status,
+        oldPath: status === 'renamed' ? oldPath : undefined,
+        isBinary,
+        additions,
+        deletions,
+        hunks,
+    };
+}
+function parseHunk(lines, startIdx) {
+    const headerLine = lines[startIdx];
+    // Parse "@@ -10,7 +10,8 @@ optional context"
+    const hunkMatch = headerLine.match(/^@@ -(\d+)(?:,(\d+))? \+(\d+)(?:,(\d+))? @@(.*)$/);
+    if (!hunkMatch)
+        return null;
+    const oldStart = parseInt(hunkMatch[1], 10);
+    const oldLines = hunkMatch[2] !== undefined ? parseInt(hunkMatch[2], 10) : 1;
+    const newStart = parseInt(hunkMatch[3], 10);
+    const newLines = hunkMatch[4] !== undefined ? parseInt(hunkMatch[4], 10) : 1;
+    const diffLines = [];
+    let additions = 0;
+    let deletions = 0;
+    let oldLineNo = oldStart;
+    let newLineNo = newStart;
+    let idx = startIdx + 1;
+    while (idx < lines.length) {
+        const line = lines[idx];
+        // Next hunk or next file
+        if (line.startsWith('@@') || line.startsWith('diff --git '))
+            break;
+        if (line.startsWith('+')) {
+            diffLines.push({
+                type: 'add',
+                content: line.slice(1),
+                newLineNo: newLineNo,
+            });
+            additions++;
+            newLineNo++;
+        }
+        else if (line.startsWith('-')) {
+            diffLines.push({
+                type: 'delete',
+                content: line.slice(1),
+                oldLineNo: oldLineNo,
+            });
+            deletions++;
+            oldLineNo++;
+        }
+        else if (line.startsWith(' ')) {
+            diffLines.push({
+                type: 'context',
+                content: line.slice(1),
+                oldLineNo: oldLineNo,
+                newLineNo: newLineNo,
+            });
+            oldLineNo++;
+            newLineNo++;
+        }
+        else if (line.startsWith('\\')) {
+            // "" — skip
+        }
+        else if (line === '') {
+            // Unified diff always prefixes lines with ' ', '+', or '-'.
+            // An empty string means end-of-section (from split at file boundaries).
+            break;
+        }
+        else {
+            break;
+        }
+        idx++;
+    }
+    return {
+        hunk: {
+            header: headerLine,
+            oldStart,
+            oldLines,
+            newStart,
+            newLines,
+            lines: diffLines,
+        },
+        additions,
+        deletions,
+        nextIdx: idx,
+    };
+}
+/**
+ * Generate a synthetic diff for an untracked file, treating it as fully added.
+ * Reads the file content and produces a single hunk with all lines as additions.
+ */
+export function createUntrackedFileDiff(relativePath, content) {
+    const fileLines = content.split('\n');
+    // Remove trailing empty line from split if file ends with newline
+    if (fileLines.length > 0 && fileLines[fileLines.length - 1] === '') {
+        fileLines.pop();
+    }
+    const diffLines = fileLines.map((line, i) => ({
+        type: 'add',
+        content: line,
+        newLineNo: i + 1,
+    }));
+    return {
+        path: relativePath,
+        status: 'added',
+        isBinary: false,
+        additions: fileLines.length,
+        deletions: 0,
+        hunks: fileLines.length > 0 ? [{
+                header: `@@ -0,0 +1,${fileLines.length} @@`,
+                oldStart: 0,
+                oldLines: 0,
+                newStart: 1,
+                newLines: fileLines.length,
+                lines: diffLines,
+            }] : [],
+    };
+}
+//# sourceMappingURL=diff-parser.js.map

package/server/dist/diff-parser.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"diff-parser.js","sourceRoot":"","sources":["../diff-parser.ts"],"names":[],"mappings":"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"}

package/server/dist/session-manager.d.ts

@@ -17,7 +17,7 @@
  */
 import type { WebSocket } from 'ws';
 import { SessionArchive } from './session-archive.js';
-import type { Session, SessionInfo, WsServerMessage } from './types.js';
+import type { DiffFileStatus, DiffScope, Session, SessionInfo, WsServerMessage } from './types.js';
 export interface CreateSessionOptions {
     source?: 'manual' | 'webhook' | 'workflow' | 'stepflow';
     id?: string;
@@ -25,22 +25,25 @@ export interface CreateSessionOptions {
     model?: string;
 }
 export declare class SessionManager {
+    /** All active (non-archived) sessions, keyed by session UUID. */
     private sessions;
-    /** SQLite archive for closed sessions. */
+    /** Reverse lookup: WebSocket → session ID for O(1) client-to-session resolution. */
+    private clientSessionMap;
+    /** SQLite archive for closed sessions (persists conversation summaries across restarts). */
     readonly archive: SessionArchive;
     /** Exposed so ws-server can pass its port to child Claude processes. */
     _serverPort: number;
     /** Exposed so ws-server can pass the auth token to child Claude processes. */
     _authToken: string;
-    /** 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: ((msg: WsServerMessage) => void) | 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). */
     private _exitListeners;
-    /** Delegated approval logic. */
+    /** Delegated approval logic (auto-approve patterns, deny-lists, pattern management). */
     private approvalManager;
-    /** Delegated naming logic. */
+    /** Delegated auto-naming logic (generates session names from first user message via Claude API). */
     private sessionNaming;
-    /** Delegated persistence logic. */
+    /** Delegated persistence logic (saves/restores session metadata to disk across server restarts). */
     private sessionPersistence;
     constructor();
     /** Check if a tool/command is auto-approved for a repo. */
@@ -53,6 +56,12 @@ export declare class SessionManager {
         commands: string[];
         patterns: string[];
     };
+    /** Return approvals effective globally via cross-repo inference. */
+    getGlobalApprovals(): {
+        tools: Record<string, string[]>;
+        commands: Record<string, string[]>;
+        patterns: Record<string, string[]>;
+    };
     /** Remove an auto-approval rule for a repo (workingDir) and persist to disk. */
     removeApproval(workingDir: string, opts: {
         tool?: string;
@@ -81,7 +90,7 @@ export declare class SessionManager {
     /** Add a WebSocket client to a session. Returns the session or undefined if not found.
      *  Re-broadcasts any pending approval/control prompts so the joining client sees them. */
     join(sessionId: string, ws: WebSocket): Session | undefined;
-    /** 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: string, ws: WebSocket): void;
     /** Delete a session: kill its process, notify clients, remove from memory and disk. */
     delete(sessionId: string): boolean;
@@ -183,6 +192,16 @@ export declare class SessionManager {
     broadcast(session: Session, msg: WsServerMessage): void;
     findSessionForClient(ws: WebSocket): Session | undefined;
     removeClient(ws: WebSocket): void;
+    /**
+     * Run git diff in a session's workingDir and return structured results.
+     * Includes untracked file discovery for 'unstaged' and 'all' scopes.
+     */
+    getDiff(sessionId: string, scope?: DiffScope): Promise<WsServerMessage>;
+    /**
+     * Discard changes in a session's workingDir per the given scope and paths.
+     * Returns a fresh diff_result after discarding.
+     */
+    discardChanges(sessionId: string, scope: DiffScope, paths?: string[], statuses?: Record<string, DiffFileStatus>): Promise<WsServerMessage>;
     /** Graceful shutdown: complete in-progress tasks, persist state, kill all processes. */
     shutdown(): void;
     /**