opentasks 0.0.5 → 0.0.7

package/dist/context-files/context-files.js.map

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

package/dist/context-files/index.d.ts

@@ -0,0 +1,16 @@
+/**
+ * Context Files
+ *
+ * Support for context nodes that reference codebase files (code, markdown, etc.).
+ * Context-file nodes are lightweight pointers with versioning metadata (commit SHA,
+ * content hash). File content is resolved on demand, not stored in the graph.
+ *
+ * @packageDocumentation
+ */
+export type { ContextFileMetadata, ContextFileType, ContextFileResolution, DriftResult, CreateContextFileInput, SyncContextFileOptions, } from './types.js';
+export { contentHash, getHeadCommit, readFileFromWorktree, readFileAtCommit, resolveContextFile, fileExists, fileExistsAtCommit, inferFileType, } from './resolver.js';
+export type { ContextFileManager } from './context-files.js';
+export { isContextFileNode, getContextFileMetadata, createContextFileManager, } from './context-files.js';
+export type { ContextFileWatcherOptions } from './watcher-integration.js';
+export { createContextFileChangeHandler } from './watcher-integration.js';
+//# sourceMappingURL=index.d.ts.map

package/dist/context-files/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/context-files/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAGH,YAAY,EACV,mBAAmB,EACnB,eAAe,EACf,qBAAqB,EACrB,WAAW,EACX,sBAAsB,EACtB,sBAAsB,GACvB,MAAM,YAAY,CAAC;AAGpB,OAAO,EACL,WAAW,EACX,aAAa,EACb,oBAAoB,EACpB,gBAAgB,EAChB,kBAAkB,EAClB,UAAU,EACV,kBAAkB,EAClB,aAAa,GACd,MAAM,eAAe,CAAC;AAGvB,YAAY,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAC;AAC7D,OAAO,EACL,iBAAiB,EACjB,sBAAsB,EACtB,wBAAwB,GACzB,MAAM,oBAAoB,CAAC;AAG5B,YAAY,EAAE,yBAAyB,EAAE,MAAM,0BAA0B,CAAC;AAC1E,OAAO,EAAE,8BAA8B,EAAE,MAAM,0BAA0B,CAAC"}

package/dist/context-files/index.js

@@ -0,0 +1,14 @@
+/**
+ * Context Files
+ *
+ * Support for context nodes that reference codebase files (code, markdown, etc.).
+ * Context-file nodes are lightweight pointers with versioning metadata (commit SHA,
+ * content hash). File content is resolved on demand, not stored in the graph.
+ *
+ * @packageDocumentation
+ */
+// Resolver
+export { contentHash, getHeadCommit, readFileFromWorktree, readFileAtCommit, resolveContextFile, fileExists, fileExistsAtCommit, inferFileType, } from './resolver.js';
+export { isContextFileNode, getContextFileMetadata, createContextFileManager, } from './context-files.js';
+export { createContextFileChangeHandler } from './watcher-integration.js';
+//# sourceMappingURL=index.js.map

package/dist/context-files/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/context-files/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAYH,WAAW;AACX,OAAO,EACL,WAAW,EACX,aAAa,EACb,oBAAoB,EACpB,gBAAgB,EAChB,kBAAkB,EAClB,UAAU,EACV,kBAAkB,EAClB,aAAa,GACd,MAAM,eAAe,CAAC;AAIvB,OAAO,EACL,iBAAiB,EACjB,sBAAsB,EACtB,wBAAwB,GACzB,MAAM,oBAAoB,CAAC;AAI5B,OAAO,EAAE,8BAA8B,EAAE,MAAM,0BAA0B,CAAC"}

package/dist/context-files/resolver.d.ts

@@ -0,0 +1,43 @@
+/**
+ * Context Files — Resolver
+ *
+ * Resolves file content from the working tree or at a specific git commit.
+ * Computes content hashes for drift detection.
+ */
+import type { ContextFileResolution, ContextFileType } from './types.js';
+/**
+ * Compute SHA-256 hex hash of content.
+ */
+export declare function contentHash(content: string): string;
+/**
+ * Get the current HEAD commit SHA for a repository.
+ */
+export declare function getHeadCommit(repoRoot: string): Promise<string>;
+/**
+ * Read file content from the working tree.
+ */
+export declare function readFileFromWorktree(repoRoot: string, filePath: string): Promise<string>;
+/**
+ * Read file content at a specific git commit via `git show <sha>:<path>`.
+ */
+export declare function readFileAtCommit(repoRoot: string, filePath: string, commit: string): Promise<string>;
+/**
+ * Resolve a context file — read content and compute hashes.
+ *
+ * If `atCommit` is provided, reads the file at that specific commit.
+ * Otherwise reads from the working tree and uses HEAD as the commit.
+ */
+export declare function resolveContextFile(repoRoot: string, filePath: string, capturedHash?: string, atCommit?: string): Promise<ContextFileResolution>;
+/**
+ * Check if a file exists in the working tree.
+ */
+export declare function fileExists(repoRoot: string, filePath: string): Promise<boolean>;
+/**
+ * Check if a file exists at a specific git commit.
+ */
+export declare function fileExistsAtCommit(repoRoot: string, filePath: string, commit: string): Promise<boolean>;
+/**
+ * Infer the context-file type from a file path.
+ */
+export declare function inferFileType(filePath: string): ContextFileType;
+//# sourceMappingURL=resolver.d.ts.map

package/dist/context-files/resolver.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"resolver.d.ts","sourceRoot":"","sources":["../../src/context-files/resolver.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAQH,OAAO,KAAK,EAAE,qBAAqB,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAQzE;;GAEG;AACH,wBAAgB,WAAW,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAEnD;AAED;;GAEG;AACH,wBAAsB,aAAa,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAKrE;AAED;;GAEG;AACH,wBAAsB,oBAAoB,CACxC,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,MAAM,CAAC,CAGjB;AAED;;GAEG;AACH,wBAAsB,gBAAgB,CACpC,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,MAAM,CAAC,CAQjB;AAED;;;;;GAKG;AACH,wBAAsB,kBAAkB,CACtC,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,MAAM,EAChB,YAAY,CAAC,EAAE,MAAM,EACrB,QAAQ,CAAC,EAAE,MAAM,GAChB,OAAO,CAAC,qBAAqB,CAAC,CAsBhC;AAED;;GAEG;AACH,wBAAsB,UAAU,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAOrF;AAED;;GAEG;AACH,wBAAsB,kBAAkB,CACtC,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,OAAO,CAAC,CAUlB;AAED;;GAEG;AACH,wBAAgB,aAAa,CAAC,QAAQ,EAAE,MAAM,GAAG,eAAe,CAuB/D"}

package/dist/context-files/resolver.js

@@ -0,0 +1,127 @@
+/**
+ * Context Files — Resolver
+ *
+ * Resolves file content from the working tree or at a specific git commit.
+ * Computes content hashes for drift detection.
+ */
+import { createHash } from 'node:crypto';
+import { execFile } from 'node:child_process';
+import { readFile } from 'node:fs/promises';
+import * as path from 'node:path';
+import { promisify } from 'node:util';
+const execFileAsync = promisify(execFile);
+// ============================================================================
+// Public API
+// ============================================================================
+/**
+ * Compute SHA-256 hex hash of content.
+ */
+export function contentHash(content) {
+    return createHash('sha256').update(content, 'utf8').digest('hex');
+}
+/**
+ * Get the current HEAD commit SHA for a repository.
+ */
+export async function getHeadCommit(repoRoot) {
+    const { stdout } = await execFileAsync('git', ['rev-parse', 'HEAD'], {
+        cwd: repoRoot,
+    });
+    return stdout.trim();
+}
+/**
+ * Read file content from the working tree.
+ */
+export async function readFileFromWorktree(repoRoot, filePath) {
+    const absolute = path.resolve(repoRoot, filePath);
+    return readFile(absolute, 'utf8');
+}
+/**
+ * Read file content at a specific git commit via `git show <sha>:<path>`.
+ */
+export async function readFileAtCommit(repoRoot, filePath, commit) {
+    // Normalize to forward-slash for git
+    const gitPath = filePath.split(path.sep).join('/');
+    const { stdout } = await execFileAsync('git', ['show', `${commit}:${gitPath}`], {
+        cwd: repoRoot,
+        maxBuffer: 10 * 1024 * 1024, // 10 MB
+    });
+    return stdout;
+}
+/**
+ * Resolve a context file — read content and compute hashes.
+ *
+ * If `atCommit` is provided, reads the file at that specific commit.
+ * Otherwise reads from the working tree and uses HEAD as the commit.
+ */
+export async function resolveContextFile(repoRoot, filePath, capturedHash, atCommit) {
+    let content;
+    let commit;
+    if (atCommit) {
+        content = await readFileAtCommit(repoRoot, filePath, atCommit);
+        commit = atCommit;
+    }
+    else {
+        content = await readFileFromWorktree(repoRoot, filePath);
+        commit = await getHeadCommit(repoRoot);
+    }
+    const hash = contentHash(content);
+    const drifted = capturedHash !== undefined && hash !== capturedHash;
+    return {
+        content,
+        commit,
+        contentHash: hash,
+        drifted,
+        filePath,
+    };
+}
+/**
+ * Check if a file exists in the working tree.
+ */
+export async function fileExists(repoRoot, filePath) {
+    try {
+        await readFile(path.resolve(repoRoot, filePath));
+        return true;
+    }
+    catch {
+        return false;
+    }
+}
+/**
+ * Check if a file exists at a specific git commit.
+ */
+export async function fileExistsAtCommit(repoRoot, filePath, commit) {
+    try {
+        const gitPath = filePath.split(path.sep).join('/');
+        await execFileAsync('git', ['cat-file', '-e', `${commit}:${gitPath}`], {
+            cwd: repoRoot,
+        });
+        return true;
+    }
+    catch {
+        return false;
+    }
+}
+/**
+ * Infer the context-file type from a file path.
+ */
+export function inferFileType(filePath) {
+    const ext = path.extname(filePath).toLowerCase();
+    if (ext === '.md' || ext === '.mdx') {
+        return 'markdown';
+    }
+    const codeExtensions = new Set([
+        '.ts', '.tsx', '.js', '.jsx', '.mjs', '.cjs',
+        '.py', '.rb', '.go', '.rs', '.java', '.kt', '.kts',
+        '.c', '.cpp', '.cc', '.h', '.hpp',
+        '.cs', '.swift', '.scala', '.clj', '.cljs',
+        '.sh', '.bash', '.zsh', '.fish',
+        '.sql', '.graphql', '.gql',
+        '.yaml', '.yml', '.toml', '.json', '.jsonl',
+        '.html', '.css', '.scss', '.less', '.vue', '.svelte',
+    ]);
+    if (codeExtensions.has(ext)) {
+        return 'code';
+    }
+    return 'text';
+}
+//# sourceMappingURL=resolver.js.map

package/dist/context-files/resolver.js.map

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

package/dist/context-files/types.d.ts

@@ -0,0 +1,94 @@
+/**
+ * Context Files — Types
+ *
+ * Metadata schema for context nodes that reference files in the codebase.
+ * A context-file node stores a lightweight pointer to a repo file plus
+ * versioning info (commit SHA, content hash). The actual file content is
+ * resolved on access rather than duplicated into the graph store.
+ */
+/**
+ * Metadata fields added to a context node that references a codebase file.
+ *
+ * These live inside `node.metadata` alongside any other metadata.
+ */
+export interface ContextFileMetadata {
+    /** Marker — distinguishes context-file nodes from plain context nodes */
+    context_file: true;
+    /** Repo-relative path to the file (e.g. "src/auth/middleware.ts", "docs/arch.md") */
+    context_file_path: string;
+    /**
+     * File type hint.
+     * - "markdown" for .md files
+     * - "code" for source files
+     * - "text" for other text files
+     */
+    context_file_type: ContextFileType;
+    /** Git commit SHA when the file was last synced/captured */
+    context_file_commit?: string;
+    /** SHA-256 hash of the file content at the synced commit */
+    context_file_content_hash?: string;
+    /** ISO 8601 timestamp of last sync from file */
+    context_file_synced_at?: string;
+}
+/**
+ * File type classification
+ */
+export type ContextFileType = 'markdown' | 'code' | 'text';
+/**
+ * Result of resolving a context file's content.
+ */
+export interface ContextFileResolution {
+    /** The resolved file content */
+    content: string;
+    /** Commit SHA the content was read from (HEAD if worktree) */
+    commit: string;
+    /** SHA-256 of the resolved content */
+    contentHash: string;
+    /** Whether content differs from what was captured (hash mismatch) */
+    drifted: boolean;
+    /** Repo-relative file path */
+    filePath: string;
+}
+/**
+ * Drift detection result for a context-file node.
+ */
+export interface DriftResult {
+    /** Whether the file has changed since the node was synced */
+    drifted: boolean;
+    /** Current commit SHA (HEAD) */
+    currentCommit: string;
+    /** Commit SHA stored in the node */
+    capturedCommit?: string;
+    /** Current content hash */
+    currentHash: string;
+    /** Content hash stored in the node */
+    capturedHash?: string;
+}
+/**
+ * Input for creating a context-file node.
+ */
+export interface CreateContextFileInput {
+    /** Repo-relative file path */
+    filePath: string;
+    /**
+     * Optional title. If omitted, derived from the file path
+     * (e.g. "src/auth/middleware.ts" → "auth/middleware.ts")
+     */
+    title?: string;
+    /** Optional tags */
+    tags?: string[];
+    /** Optional priority */
+    priority?: number;
+    /**
+     * Pin to a specific commit SHA. If omitted, uses current HEAD.
+     */
+    commit?: string;
+}
+/**
+ * Options for syncing a context-file node with the current file state.
+ */
+export interface SyncContextFileOptions {
+    /** Force sync even if content hash hasn't changed */
+    force?: boolean;
+}
+//# sourceMappingURL=types.d.ts.map

package/dist/context-files/types.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/context-files/types.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAMH;;;;GAIG;AACH,MAAM,WAAW,mBAAmB;IAClC,yEAAyE;IACzE,YAAY,EAAE,IAAI,CAAC;IAEnB,qFAAqF;IACrF,iBAAiB,EAAE,MAAM,CAAC;IAE1B;;;;;OAKG;IACH,iBAAiB,EAAE,eAAe,CAAC;IAEnC,4DAA4D;IAC5D,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAE7B,4DAA4D;IAC5D,yBAAyB,CAAC,EAAE,MAAM,CAAC;IAEnC,gDAAgD;IAChD,sBAAsB,CAAC,EAAE,MAAM,CAAC;CACjC;AAED;;GAEG;AACH,MAAM,MAAM,eAAe,GAAG,UAAU,GAAG,MAAM,GAAG,MAAM,CAAC;AAM3D;;GAEG;AACH,MAAM,WAAW,qBAAqB;IACpC,gCAAgC;IAChC,OAAO,EAAE,MAAM,CAAC;IAEhB,8DAA8D;IAC9D,MAAM,EAAE,MAAM,CAAC;IAEf,sCAAsC;IACtC,WAAW,EAAE,MAAM,CAAC;IAEpB,qEAAqE;IACrE,OAAO,EAAE,OAAO,CAAC;IAEjB,8BAA8B;IAC9B,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED;;GAEG;AACH,MAAM,WAAW,WAAW;IAC1B,6DAA6D;IAC7D,OAAO,EAAE,OAAO,CAAC;IAEjB,gCAAgC;IAChC,aAAa,EAAE,MAAM,CAAC;IAEtB,oCAAoC;IACpC,cAAc,CAAC,EAAE,MAAM,CAAC;IAExB,2BAA2B;IAC3B,WAAW,EAAE,MAAM,CAAC;IAEpB,sCAAsC;IACtC,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAMD;;GAEG;AACH,MAAM,WAAW,sBAAsB;IACrC,8BAA8B;IAC9B,QAAQ,EAAE,MAAM,CAAC;IAEjB;;;OAGG;IACH,KAAK,CAAC,EAAE,MAAM,CAAC;IAEf,oBAAoB;IACpB,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;IAEhB,wBAAwB;IACxB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAElB;;OAEG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED;;GAEG;AACH,MAAM,WAAW,sBAAsB;IACrC,qDAAqD;IACrD,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB"}

package/dist/context-files/types.js

@@ -0,0 +1,10 @@
+/**
+ * Context Files — Types
+ *
+ * Metadata schema for context nodes that reference files in the codebase.
+ * A context-file node stores a lightweight pointer to a repo file plus
+ * versioning info (commit SHA, content hash). The actual file content is
+ * resolved on access rather than duplicated into the graph store.
+ */
+export {};
+//# sourceMappingURL=types.js.map

package/dist/context-files/types.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/context-files/types.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG"}

package/dist/context-files/watcher-integration.d.ts

@@ -0,0 +1,47 @@
+/**
+ * Context Files — Watcher Integration
+ *
+ * Bridges the daemon file watcher with context-file nodes.
+ * When a watched file changes, marks the corresponding context-file node
+ * as potentially drifted so callers can decide whether to re-sync.
+ */
+import type { FileChangeEvent, ChangeHandler } from '../daemon/watcher.js';
+import type { GraphStore } from '../graph/store.js';
+import type { Node } from '../schema/index.js';
+/**
+ * Options for the context-file watcher handler.
+ */
+export interface ContextFileWatcherOptions {
+    /** The graph store to query for context-file nodes */
+    store: GraphStore;
+    /**
+     * Root of the repository (to compute repo-relative paths).
+     * The watcher emits absolute paths; we compare against
+     * `context_file_path` which is repo-relative.
+     */
+    repoRoot: string;
+    /**
+     * Callback invoked when a context-file node's source file changes.
+     * Receives the node and the change event.
+     */
+    onDrift?: (node: Node, event: FileChangeEvent) => void;
+    /**
+     * Auto-sync context-file nodes when their source file changes.
+     * Default: false (only fires onDrift callback).
+     */
+    autoSync?: boolean;
+}
+/**
+ * Create a ChangeHandler that reacts to context-file source changes.
+ *
+ * Wire this into the daemon file watcher:
+ * ```ts
+ * const handler = createContextFileChangeHandler({ store, repoRoot });
+ * fileWatcher.onchange(handler);
+ * ```
+ *
+ * The handler scans context-file nodes for any whose `context_file_path`
+ * matches the changed file, then fires the onDrift callback.
+ */
+export declare function createContextFileChangeHandler(options: ContextFileWatcherOptions): ChangeHandler;
+//# sourceMappingURL=watcher-integration.d.ts.map

package/dist/context-files/watcher-integration.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"watcher-integration.d.ts","sourceRoot":"","sources":["../../src/context-files/watcher-integration.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,KAAK,EAAE,eAAe,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAC3E,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,oBAAoB,CAAC;AAI/C;;GAEG;AACH,MAAM,WAAW,yBAAyB;IACxC,sDAAsD;IACtD,KAAK,EAAE,UAAU,CAAC;IAElB;;;;OAIG;IACH,QAAQ,EAAE,MAAM,CAAC;IAEjB;;;OAGG;IACH,OAAO,CAAC,EAAE,CAAC,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,eAAe,KAAK,IAAI,CAAC;IAEvD;;;OAGG;IACH,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,8BAA8B,CAC5C,OAAO,EAAE,yBAAyB,GACjC,aAAa,CA0Bf"}

package/dist/context-files/watcher-integration.js

@@ -0,0 +1,47 @@
+/**
+ * Context Files — Watcher Integration
+ *
+ * Bridges the daemon file watcher with context-file nodes.
+ * When a watched file changes, marks the corresponding context-file node
+ * as potentially drifted so callers can decide whether to re-sync.
+ */
+import { isContextFileNode, getContextFileMetadata } from './context-files.js';
+import * as path from 'node:path';
+/**
+ * Create a ChangeHandler that reacts to context-file source changes.
+ *
+ * Wire this into the daemon file watcher:
+ * ```ts
+ * const handler = createContextFileChangeHandler({ store, repoRoot });
+ * fileWatcher.onchange(handler);
+ * ```
+ *
+ * The handler scans context-file nodes for any whose `context_file_path`
+ * matches the changed file, then fires the onDrift callback.
+ */
+export function createContextFileChangeHandler(options) {
+    const { store, repoRoot, onDrift } = options;
+    return async (event) => {
+        // Only react to file additions and changes (not unlinks for now)
+        if (event.type === 'unlink')
+            return;
+        // Compute repo-relative path from the absolute watcher path
+        const repoRelative = path.relative(repoRoot, event.path);
+        // Find context-file nodes that reference this file
+        const contextNodes = await store.query.nodes({ type: 'context' });
+        for (const node of contextNodes) {
+            if (!isContextFileNode(node))
+                continue;
+            const meta = getContextFileMetadata(node);
+            if (!meta)
+                continue;
+            // Normalize for comparison (forward slashes)
+            const metaPath = meta.context_file_path.split(path.sep).join('/');
+            const eventPath = repoRelative.split(path.sep).join('/');
+            if (metaPath === eventPath) {
+                onDrift?.(node, event);
+            }
+        }
+    };
+}
+//# sourceMappingURL=watcher-integration.js.map

package/dist/context-files/watcher-integration.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"watcher-integration.js","sourceRoot":"","sources":["../../src/context-files/watcher-integration.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAKH,OAAO,EAAE,iBAAiB,EAAE,sBAAsB,EAAE,MAAM,oBAAoB,CAAC;AAC/E,OAAO,KAAK,IAAI,MAAM,WAAW,CAAC;AA6BlC;;;;;;;;;;;GAWG;AACH,MAAM,UAAU,8BAA8B,CAC5C,OAAkC;IAElC,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC;IAE7C,OAAO,KAAK,EAAE,KAAsB,EAAE,EAAE;QACtC,iEAAiE;QACjE,IAAI,KAAK,CAAC,IAAI,KAAK,QAAQ;YAAE,OAAO;QAEpC,4DAA4D;QAC5D,MAAM,YAAY,GAAG,IAAI,CAAC,QAAQ,CAAC,QAAQ,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC;QAEzD,mDAAmD;QACnD,MAAM,YAAY,GAAG,MAAM,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC,CAAC;QAClE,KAAK,MAAM,IAAI,IAAI,YAAY,EAAE,CAAC;YAChC,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC;gBAAE,SAAS;YACvC,MAAM,IAAI,GAAG,sBAAsB,CAAC,IAAI,CAAC,CAAC;YAC1C,IAAI,CAAC,IAAI;gBAAE,SAAS;YAEpB,6CAA6C;YAC7C,MAAM,QAAQ,GAAG,IAAI,CAAC,iBAAiB,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YAClE,MAAM,SAAS,GAAG,YAAY,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YAEzD,IAAI,QAAQ,KAAK,SAAS,EAAE,CAAC;gBAC3B,OAAO,EAAE,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;YACzB,CAAC;QACH,CAAC;IACH,CAAC,CAAC;AACJ,CAAC"}

package/dist/core/merge-driver.d.ts

@@ -29,6 +29,11 @@ export declare function deepEqual(a: unknown, b: unknown): boolean;
  * - Both sides agree → use that value
  * - Only one side changed → use the changed value
  * - Both changed differently → last-writer-wins by updated_at
+ *
+ * For provider-authoritative nodes where both sides modified:
+ * - Structural fields (id, type, metadata) merge normally
+ * - Cached data fields (title, content, status, priority) take whichever side
+ *   but are marked for re-fetch via provider_needs_reconcile
  */
 export declare function fieldLevelMerge(base: JsonLine, ours: JsonLine, theirs: JsonLine): JsonLine;
 /**
@@ -43,8 +48,12 @@ export declare function mergeJsonl(basePath: string, oursPath: string, theirsPat
 /**
  * Install the merge driver in git config and .gitattributes
  *
- * @param worktreePath - Path to the worktree root
+ * Places .gitattributes inside the opentasks directory so it doesn't
+ * pollute the project root. Git supports .gitattributes in subdirectories;
+ * patterns are matched relative to the directory containing the file.
+ *
+ * @param opentasksDir - Path to the opentasks data directory
  */
-export declare function installMergeDriver(worktreePath: string): void;
+export declare function installMergeDriver(opentasksDir: string): void;
 export {};
 //# sourceMappingURL=merge-driver.d.ts.map

package/dist/core/merge-driver.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"merge-driver.d.ts","sourceRoot":"","sources":["../../src/core/merge-driver.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAKH;;GAEG;AACH,KAAK,QAAQ,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;AAExC;;;;GAIG;AACH,wBAAgB,eAAe,CAAC,QAAQ,EAAE,MAAM,GAAG,GAAG,CAAC,MAAM,EAAE,QAAQ,CAAC,CA6BvE;AAED;;GAEG;AACH,wBAAgB,iBAAiB,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,CAAC,MAAM,EAAE,QAAQ,CAAC,GAAG,IAAI,CAoBxF;AAED;;GAEG;AACH,wBAAgB,SAAS,CAAC,CAAC,EAAE,OAAO,EAAE,CAAC,EAAE,OAAO,GAAG,OAAO,CAsBzD;AAWD;;;;;;;GAOG;AACH,wBAAgB,eAAe,CAAC,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAE,QAAQ,GAAG,QAAQ,CAmD1F;AAED;;;;;;;GAOG;AACH,wBAAgB,UAAU,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,MAAM,CA0DzF;AAED;;;;GAIG;AACH,wBAAgB,kBAAkB,CAAC,YAAY,EAAE,MAAM,GAAG,IAAI,CA6B7D"}
+{"version":3,"file":"merge-driver.d.ts","sourceRoot":"","sources":["../../src/core/merge-driver.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAKH;;GAEG;AACH,KAAK,QAAQ,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;AAExC;;;;GAIG;AACH,wBAAgB,eAAe,CAAC,QAAQ,EAAE,MAAM,GAAG,GAAG,CAAC,MAAM,EAAE,QAAQ,CAAC,CA6BvE;AAED;;GAEG;AACH,wBAAgB,iBAAiB,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,CAAC,MAAM,EAAE,QAAQ,CAAC,GAAG,IAAI,CAoBxF;AAED;;GAEG;AACH,wBAAgB,SAAS,CAAC,CAAC,EAAE,OAAO,EAAE,CAAC,EAAE,OAAO,GAAG,OAAO,CAsBzD;AA0BD;;;;;;;;;;;;GAYG;AACH,wBAAgB,eAAe,CAAC,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAE,QAAQ,GAAG,QAAQ,CAsE1F;AAED;;;;;;;GAOG;AACH,wBAAgB,UAAU,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,MAAM,CA0DzF;AAED;;;;;;;;GAQG;AACH,wBAAgB,kBAAkB,CAAC,YAAY,EAAE,MAAM,GAAG,IAAI,CA6B7D"}

package/dist/core/merge-driver.js

@@ -99,6 +99,19 @@ function pickByNewerTimestamp(a, b) {
     const bTime = b.updated_at || b.created_at || '';
     return aTime >= bTime ? a : b;
 }
+/**
+ * Fields that contain cached provider data.
+ * When both sides modify a provider-authoritative node, these fields are
+ * NOT three-way merged — instead the node is flagged for reconciliation.
+ */
+const PROVIDER_CACHED_FIELDS = new Set(['title', 'content', 'status', 'priority']);
+/**
+ * Check if a JSONL entry is a provider-authoritative node
+ */
+function isProviderAuthoritative(entry) {
+    const metadata = entry.metadata;
+    return metadata?.provider_authoritative === true;
+}
 /**
  * Field-level three-way merge
  *
@@ -106,6 +119,11 @@ function pickByNewerTimestamp(a, b) {
  * - Both sides agree → use that value
  * - Only one side changed → use the changed value
  * - Both changed differently → last-writer-wins by updated_at
+ *
+ * For provider-authoritative nodes where both sides modified:
+ * - Structural fields (id, type, metadata) merge normally
+ * - Cached data fields (title, content, status, priority) take whichever side
+ *   but are marked for re-fetch via provider_needs_reconcile
  */
 export function fieldLevelMerge(base, ours, theirs) {
     const result = { ...base };
@@ -159,6 +177,23 @@ export function fieldLevelMerge(base, ours, theirs) {
     if (times.length > 0) {
         result.updated_at = times.sort().pop();
     }
+    // Provider-authoritative handling: if both sides modified cached data fields,
+    // mark for reconciliation instead of trusting the merge result.
+    if (isProviderAuthoritative(result)) {
+        const hasCachedFieldConflict = [...PROVIDER_CACHED_FIELDS].some((key) => {
+            const bVal = base[key];
+            const oVal = ours[key];
+            const tVal = theirs[key];
+            // True conflict: both changed differently from base
+            return !deepEqual(bVal, oVal) && !deepEqual(bVal, tVal) && !deepEqual(oVal, tVal);
+        });
+        if (hasCachedFieldConflict) {
+            const metadata = (result.metadata ?? {});
+            metadata.provider_needs_reconcile = true;
+            metadata.provider_cached_at = null;
+            result.metadata = metadata;
+        }
+    }
     return result;
 }
 /**
@@ -224,11 +259,15 @@ export function mergeJsonl(basePath, oursPath, theirsPath) {
 /**
  * Install the merge driver in git config and .gitattributes
  *
- * @param worktreePath - Path to the worktree root
+ * Places .gitattributes inside the opentasks directory so it doesn't
+ * pollute the project root. Git supports .gitattributes in subdirectories;
+ * patterns are matched relative to the directory containing the file.
+ *
+ * @param opentasksDir - Path to the opentasks data directory
  */
-export function installMergeDriver(worktreePath) {
-    // 1. Add to .gitattributes
-    const attrPath = `${worktreePath}/.gitattributes`;
+export function installMergeDriver(opentasksDir) {
+    // 1. Add .gitattributes inside the opentasks directory
+    const attrPath = `${opentasksDir}/.gitattributes`;
     let attrContent = '';
     try {
         attrContent = fs.readFileSync(attrPath, 'utf-8');
@@ -237,17 +276,17 @@ export function installMergeDriver(worktreePath) {
         // File doesn't exist yet
     }
     if (!attrContent.includes('merge=opentasks')) {
-        const addition = '\n# OpenTasks merge driver for graph.jsonl\n' + '.opentasks/graph.jsonl merge=opentasks\n';
+        const addition = '\n# OpenTasks merge driver for graph.jsonl\n' + 'graph.jsonl merge=opentasks\n';
         fs.writeFileSync(attrPath, attrContent + addition, 'utf-8');
     }
     // 2. Configure merge driver in git config
     try {
         execSync('git config merge.opentasks.name "OpenTasks JSONL merge driver"', {
-            cwd: worktreePath,
+            cwd: opentasksDir,
             stdio: ['pipe', 'pipe', 'pipe'],
         });
         execSync('git config merge.opentasks.driver "opentasks merge-driver %O %A %B %L %P"', {
-            cwd: worktreePath,
+            cwd: opentasksDir,
             stdio: ['pipe', 'pipe', 'pipe'],
         });
     }

package/dist/core/merge-driver.js.map

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

package/dist/core/worktree.js

@@ -306,7 +306,7 @@ export function worktreeSetup(targetPath, managerOpentasksPath, options = {}) {
     }
     // 7. Install merge driver
     try {
-        installMergeDriver(resolvedTarget);
+        installMergeDriver(workerOpentasksDir);
     }
     catch {
         // Non-fatal: merge driver installation might fail