sessionlog 0.0.1

package/dist/strategy/common.js

@@ -0,0 +1,156 @@
+/**
+ * Strategy Common Infrastructure
+ *
+ * Shared utilities used by strategy implementations for metadata branch
+ * operations, repository validation, and setup.
+ *
+ * Ported from Go: strategy/common.go
+ */
+import { git, gitSafe, refExists, isGitRepository, getWorktreeRoot, getHead, showFile, commitTree, mktree, getGitAuthor, } from '../git-operations.js';
+import { CHECKPOINTS_BRANCH, checkpointIDPath, } from '../types.js';
+import { ensureGitignore } from '../config.js';
+// ============================================================================
+// Repository Validation
+// ============================================================================
+/**
+ * Validates that the repository is suitable for the manual-commit strategy.
+ * Throws if the repository is bare, has no commits, or is not a git repo.
+ */
+export async function validateRepository(cwd) {
+    const isRepo = await isGitRepository(cwd);
+    if (!isRepo) {
+        throw new Error('Not a git repository');
+    }
+    // Check that it's not a bare repository
+    const isBare = await gitSafe(['rev-parse', '--is-bare-repository'], { cwd });
+    if (isBare?.trim() === 'true') {
+        throw new Error('Cannot operate on a bare repository');
+    }
+    // Check that we can access the worktree
+    try {
+        await getWorktreeRoot(cwd);
+    }
+    catch {
+        throw new Error('Failed to access worktree');
+    }
+}
+/**
+ * Check if the repository has any commits.
+ */
+export async function isEmptyRepository(cwd) {
+    try {
+        await getHead(cwd);
+        return false;
+    }
+    catch {
+        return true;
+    }
+}
+/**
+ * Check if commit `ancestor` is an ancestor of commit `descendant`.
+ * Uses a bounded traversal to prevent runaway history walks.
+ */
+export async function isAncestorOf(ancestor, descendant, _maxDepth = 1000, cwd) {
+    const result = await gitSafe(['merge-base', '--is-ancestor', ancestor, descendant], { cwd });
+    // git merge-base --is-ancestor exits 0 if true, 1 if not
+    return result !== null;
+}
+/**
+ * Check if we're inside a git worktree (not the main repo).
+ */
+export async function isInsideWorktree(cwd) {
+    const result = await gitSafe(['rev-parse', '--git-common-dir'], { cwd });
+    const gitDir = await gitSafe(['rev-parse', '--git-dir'], { cwd });
+    if (!result || !gitDir)
+        return false;
+    return result.trim() !== gitDir.trim();
+}
+// ============================================================================
+// Metadata Branch Operations
+// ============================================================================
+/**
+ * Ensure the metadata branch (entire/checkpoints/v1) exists.
+ * Creates it with an initial empty-tree commit if it doesn't exist.
+ */
+export async function ensureMetadataBranch(cwd) {
+    const branchRef = `refs/heads/${CHECKPOINTS_BRANCH}`;
+    const exists = await refExists(branchRef, cwd);
+    if (exists)
+        return;
+    // Create an empty tree
+    const emptyTree = await mktree([], cwd);
+    const author = await getGitAuthor(cwd);
+    const commitHash = await commitTree(emptyTree, null, 'Initialize Entire checkpoints branch', author, cwd);
+    // Create the branch pointing to this commit
+    await git(['branch', CHECKPOINTS_BRANCH, commitHash], { cwd });
+}
+/**
+ * Read checkpoint metadata from the metadata branch.
+ */
+export async function readCheckpointMetadata(checkpointID, cwd) {
+    const checkpointPath = checkpointIDPath(checkpointID);
+    try {
+        const content = await showFile(CHECKPOINTS_BRANCH, `${checkpointPath}/metadata.json`, cwd);
+        return JSON.parse(content);
+    }
+    catch {
+        return null;
+    }
+}
+/**
+ * Read a session prompt from the metadata branch tree.
+ */
+export async function readSessionPromptFromTree(checkpointID, sessionIndex, cwd) {
+    const checkpointPath = checkpointIDPath(checkpointID);
+    try {
+        return await showFile(CHECKPOINTS_BRANCH, `${checkpointPath}/${sessionIndex}/prompt.txt`, cwd);
+    }
+    catch {
+        return '';
+    }
+}
+/**
+ * Read the agent type from checkpoint metadata.
+ */
+export async function readAgentTypeFromTree(checkpointID, cwd) {
+    const metadata = await readCheckpointMetadata(checkpointID, cwd);
+    return metadata?.agent ?? '';
+}
+/**
+ * Extract the first user prompt from a transcript or prompt file.
+ */
+export function extractFirstPrompt(prompts) {
+    if (!prompts)
+        return '';
+    // Split on the prompt separator
+    const parts = prompts.split('\n---\n');
+    const first = parts[0]?.trim() ?? '';
+    // Truncate to 200 chars
+    return first.length > 200 ? first.slice(0, 200) + '...' : first;
+}
+// ============================================================================
+// Setup
+// ============================================================================
+/**
+ * Full strategy setup: create metadata branch, ensure .gitignore, etc.
+ */
+export async function ensureSetup(cwd) {
+    await validateRepository(cwd);
+    await ensureMetadataBranch(cwd);
+    await ensureGitignore(cwd);
+}
+/**
+ * Get the root directory of the main repository (not a worktree).
+ */
+export async function getMainRepoRoot(cwd) {
+    const commonDir = await gitSafe(['rev-parse', '--git-common-dir'], { cwd });
+    if (!commonDir) {
+        throw new Error('Not inside a git repository');
+    }
+    const { resolve, dirname } = await import('node:path');
+    // Common dir is typically <repo>/.git or <repo>/.git/worktrees/<name>
+    // For the main repo, --git-common-dir returns .git
+    const absCommon = resolve(cwd ?? process.cwd(), commonDir.trim());
+    return dirname(absCommon);
+}
+//# sourceMappingURL=common.js.map

package/dist/strategy/common.js.map

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

package/dist/strategy/content-overlap.d.ts

@@ -0,0 +1,33 @@
+/**
+ * Content Overlap Detection
+ *
+ * Determines whether a commit contains session-related work by comparing
+ * file content (not just filenames) against the shadow branch. This enables
+ * accurate detection of the "reverted and replaced" scenario.
+ */
+/**
+ * Check if any file in filesTouched overlaps with the committed content.
+ * Uses content-aware comparison to detect the "reverted and replaced" scenario.
+ *
+ * For modified files (exist in parent), always counts as overlap.
+ * For new files, requires content match against shadow branch.
+ */
+export declare function filesOverlapWithContent(shadowBranchName: string, headCommitHash: string, parentCommitHash: string | null, filesTouched: string[], cwd?: string): Promise<boolean>;
+/**
+ * Check if any staged file overlaps with filesTouched using content comparison.
+ */
+export declare function stagedFilesOverlapWithContent(shadowBranchName: string, stagedFiles: string[], filesTouched: string[], cwd?: string): Promise<boolean>;
+/**
+ * Return files from filesTouched that still have uncommitted agent changes.
+ */
+export declare function filesWithRemainingAgentChanges(shadowBranchName: string, headCommitHash: string, filesTouched: string[], committedFiles: Set<string>, cwd?: string): Promise<string[]>;
+/**
+ * Check if two file contents share significant lines.
+ * Distinguishes partial staging from "reverted and replaced".
+ */
+export declare function hasSignificantContentOverlap(stagedContent: string, shadowContent: string): boolean;
+/**
+ * Simple filename-based overlap check (fallback).
+ */
+export declare function hasOverlappingFiles(stagedFiles: string[], filesTouched: string[]): boolean;
+//# sourceMappingURL=content-overlap.d.ts.map

package/dist/strategy/content-overlap.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"content-overlap.d.ts","sourceRoot":"","sources":["../../src/strategy/content-overlap.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAQH;;;;;;GAMG;AACH,wBAAsB,uBAAuB,CAC3C,gBAAgB,EAAE,MAAM,EACxB,cAAc,EAAE,MAAM,EACtB,gBAAgB,EAAE,MAAM,GAAG,IAAI,EAC/B,YAAY,EAAE,MAAM,EAAE,EACtB,GAAG,CAAC,EAAE,MAAM,GACX,OAAO,CAAC,OAAO,CAAC,CAmDlB;AAED;;GAEG;AACH,wBAAsB,6BAA6B,CACjD,gBAAgB,EAAE,MAAM,EACxB,WAAW,EAAE,MAAM,EAAE,EACrB,YAAY,EAAE,MAAM,EAAE,EACtB,GAAG,CAAC,EAAE,MAAM,GACX,OAAO,CAAC,OAAO,CAAC,CAwClB;AAED;;GAEG;AACH,wBAAsB,8BAA8B,CAClD,gBAAgB,EAAE,MAAM,EACxB,cAAc,EAAE,MAAM,EACtB,YAAY,EAAE,MAAM,EAAE,EACtB,cAAc,EAAE,GAAG,CAAC,MAAM,CAAC,EAC3B,GAAG,CAAC,EAAE,MAAM,GACX,OAAO,CAAC,MAAM,EAAE,CAAC,CA6BnB;AAMD;;;GAGG;AACH,wBAAgB,4BAA4B,CAC1C,aAAa,EAAE,MAAM,EACrB,aAAa,EAAE,MAAM,GACpB,OAAO,CAkBT;AAiBD;;GAEG;AACH,wBAAgB,mBAAmB,CAAC,WAAW,EAAE,MAAM,EAAE,EAAE,YAAY,EAAE,MAAM,EAAE,GAAG,OAAO,CAG1F"}

package/dist/strategy/content-overlap.js

@@ -0,0 +1,176 @@
+/**
+ * Content Overlap Detection
+ *
+ * Determines whether a commit contains session-related work by comparing
+ * file content (not just filenames) against the shadow branch. This enables
+ * accurate detection of the "reverted and replaced" scenario.
+ */
+import { gitSafe } from '../git-operations.js';
+// ============================================================================
+// Content Overlap
+// ============================================================================
+/**
+ * Check if any file in filesTouched overlaps with the committed content.
+ * Uses content-aware comparison to detect the "reverted and replaced" scenario.
+ *
+ * For modified files (exist in parent), always counts as overlap.
+ * For new files, requires content match against shadow branch.
+ */
+export async function filesOverlapWithContent(shadowBranchName, headCommitHash, parentCommitHash, filesTouched, cwd) {
+    if (filesTouched.length === 0)
+        return false;
+    for (const filePath of filesTouched) {
+        // Get file from HEAD (committed content)
+        const headContent = await gitSafe(['show', `${headCommitHash}:${filePath}`], { cwd });
+        if (headContent === null) {
+            // File not in HEAD commit - check if it's a deletion
+            if (parentCommitHash) {
+                const parentContent = await gitSafe(['show', `${parentCommitHash}:${filePath}`], { cwd });
+                if (parentContent !== null) {
+                    // File existed in parent but not in HEAD = deletion = overlap
+                    return true;
+                }
+            }
+            continue;
+        }
+        // Check if this is a modified file (exists in parent) or new file
+        let isModified = false;
+        if (parentCommitHash) {
+            const parentContent = await gitSafe(['show', `${parentCommitHash}:${filePath}`], { cwd });
+            isModified = parentContent !== null;
+        }
+        // Modified files always count as overlap
+        if (isModified)
+            return true;
+        // For new files, check content against shadow branch
+        const shadowContent = await gitSafe(['show', `refs/heads/${shadowBranchName}:${filePath}`], {
+            cwd,
+        });
+        if (shadowContent === null)
+            continue;
+        // Compare by hashing - get blob hashes
+        const headHash = await gitSafe(['rev-parse', `${headCommitHash}:${filePath}`], { cwd });
+        const shadowHash = await gitSafe(['rev-parse', `refs/heads/${shadowBranchName}:${filePath}`], {
+            cwd,
+        });
+        if (headHash !== null && shadowHash !== null && headHash.trim() === shadowHash.trim()) {
+            return true;
+        }
+        // Check for significant content overlap if hashes differ
+        if (headContent && shadowContent && hasSignificantContentOverlap(headContent, shadowContent)) {
+            return true;
+        }
+    }
+    return false;
+}
+/**
+ * Check if any staged file overlaps with filesTouched using content comparison.
+ */
+export async function stagedFilesOverlapWithContent(shadowBranchName, stagedFiles, filesTouched, cwd) {
+    const touchedSet = new Set(filesTouched);
+    for (const stagedPath of stagedFiles) {
+        if (!touchedSet.has(stagedPath))
+            continue;
+        // Check if modified (exists in HEAD) or new
+        const headContent = await gitSafe(['show', `HEAD:${stagedPath}`], { cwd });
+        const isModified = headContent !== null;
+        if (isModified)
+            return true;
+        // For new files, compare staged content with shadow
+        const shadowContent = await gitSafe(['show', `refs/heads/${shadowBranchName}:${stagedPath}`], {
+            cwd,
+        });
+        if (shadowContent === null)
+            continue;
+        // Get staged content
+        const stagedContent = await gitSafe(['show', `:${stagedPath}`], { cwd });
+        if (stagedContent === null)
+            continue;
+        // Compare hashes
+        const stagedHash = await gitSafe(['rev-parse', `:${stagedPath}`], { cwd });
+        const shadowHash = await gitSafe(['rev-parse', `refs/heads/${shadowBranchName}:${stagedPath}`], { cwd });
+        if (stagedHash && shadowHash && stagedHash.trim() === shadowHash.trim()) {
+            return true;
+        }
+        // Check significant overlap
+        if (hasSignificantContentOverlap(stagedContent, shadowContent)) {
+            return true;
+        }
+    }
+    return false;
+}
+/**
+ * Return files from filesTouched that still have uncommitted agent changes.
+ */
+export async function filesWithRemainingAgentChanges(shadowBranchName, headCommitHash, filesTouched, committedFiles, cwd) {
+    const remaining = [];
+    for (const filePath of filesTouched) {
+        if (!committedFiles.has(filePath)) {
+            remaining.push(filePath);
+            continue;
+        }
+        // File was committed - check if committed content matches shadow
+        const commitHash = await gitSafe(['rev-parse', `${headCommitHash}:${filePath}`], { cwd });
+        const shadowHash = await gitSafe(['rev-parse', `refs/heads/${shadowBranchName}:${filePath}`], {
+            cwd,
+        });
+        if (commitHash === null || shadowHash === null)
+            continue;
+        if (commitHash.trim() === shadowHash.trim())
+            continue;
+        // Content differs - check if working tree is clean for this file
+        const workingDiff = await gitSafe(['diff', '--name-only', 'HEAD', '--', filePath], { cwd });
+        if (workingDiff !== null && workingDiff.trim() === '') {
+            // Working tree is clean - user intentionally wrote different content
+            continue;
+        }
+        remaining.push(filePath);
+    }
+    return remaining;
+}
+// ============================================================================
+// Content Overlap Helpers
+// ============================================================================
+/**
+ * Check if two file contents share significant lines.
+ * Distinguishes partial staging from "reverted and replaced".
+ */
+export function hasSignificantContentOverlap(stagedContent, shadowContent) {
+    const shadowLines = extractSignificantLines(shadowContent);
+    const stagedLines = extractSignificantLines(stagedContent);
+    if (shadowLines.size === 0 || stagedLines.size === 0)
+        return false;
+    const isVerySmallFile = shadowLines.size < 2 || stagedLines.size < 2;
+    const requiredMatches = isVerySmallFile ? 1 : 2;
+    let matchCount = 0;
+    for (const line of stagedLines) {
+        if (shadowLines.has(line)) {
+            matchCount++;
+            if (matchCount >= requiredMatches)
+                return true;
+        }
+    }
+    return false;
+}
+/**
+ * Extract significant lines from content (>= 10 chars after trimming).
+ * Short lines like `{`, `}`, `});` are filtered as common boilerplate.
+ */
+function extractSignificantLines(content) {
+    const lines = new Set();
+    for (const line of content.split('\n')) {
+        const trimmed = line.trim();
+        if (trimmed.length >= 10) {
+            lines.add(trimmed);
+        }
+    }
+    return lines;
+}
+/**
+ * Simple filename-based overlap check (fallback).
+ */
+export function hasOverlappingFiles(stagedFiles, filesTouched) {
+    const touchedSet = new Set(filesTouched);
+    return stagedFiles.some((f) => touchedSet.has(f));
+}
+//# sourceMappingURL=content-overlap.js.map

package/dist/strategy/content-overlap.js.map

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

package/dist/strategy/manual-commit.d.ts

@@ -0,0 +1,36 @@
+/**
+ * Manual Commit Strategy
+ *
+ * Core strategy implementation that orchestrates session tracking,
+ * checkpoint creation, condensation, and git hook integration.
+ *
+ * Data flow:
+ * 1. InitializeSession -> Creates SessionState, calculates initial attribution
+ * 2. SaveStep/SaveTaskStep -> Writes to shadow branch via CheckpointStore
+ * 3. PrepareCommitMsg -> Adds Entire-Checkpoint trailer to commit messages
+ * 4. PostCommit -> Condenses session data, handles carry-forward
+ * 5. PrePush -> Pushes metadata branch alongside user push
+ */
+import type { SessionStore } from '../store/session-store.js';
+import type { CheckpointStore } from '../store/checkpoint-store.js';
+import type { Strategy } from './types.js';
+export interface ManualCommitStrategyConfig {
+    sessionStore: SessionStore;
+    checkpointStore: CheckpointStore;
+    cwd?: string;
+    /** When a separate session repo is configured, this is its working directory.
+     *  Used for pushing the checkpoints branch from the correct repo. */
+    sessionRepoCwd?: string;
+    /** Override for the checkpoints branch name (e.g. project-namespaced). */
+    checkpointsBranch?: string;
+}
+export declare function createManualCommitStrategy(config: ManualCommitStrategyConfig): Strategy;
+/**
+ * Check if a commit message has any content besides comments and our trailer.
+ */
+export declare function hasUserContent(message: string): boolean;
+/**
+ * Remove the Entire-Checkpoint trailer line from a commit message.
+ */
+export declare function stripCheckpointTrailer(message: string): string;
+//# sourceMappingURL=manual-commit.d.ts.map

package/dist/strategy/manual-commit.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"manual-commit.d.ts","sourceRoot":"","sources":["../../src/strategy/manual-commit.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAIH,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAC9D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAgCpE,OAAO,KAAK,EACV,QAAQ,EAMT,MAAM,YAAY,CAAC;AAOpB,MAAM,WAAW,0BAA0B;IACzC,YAAY,EAAE,YAAY,CAAC;IAC3B,eAAe,EAAE,eAAe,CAAC;IACjC,GAAG,CAAC,EAAE,MAAM,CAAC;IACb;yEACqE;IACrE,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,0EAA0E;IAC1E,iBAAiB,CAAC,EAAE,MAAM,CAAC;CAC5B;AAED,wBAAgB,0BAA0B,CAAC,MAAM,EAAE,0BAA0B,GAAG,QAAQ,CA8vBvF;AAiCD;;GAEG;AACH,wBAAgB,cAAc,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAUvD;AAED;;GAEG;AACH,wBAAgB,sBAAsB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAM9D"}