@scolladon/tsgit 1.0.0 → 1.1.0

package/dist/types/commands/index.d.ts

@@ -1,5 +1,5 @@
-import { d as FilePath, b as Context, R as RefName, O as ObjectId } from '../chunks/context-CTaXSPiP.js';
-import { A as AuthorIdentity, T as TreeDiff } from '../chunks/diff-change-D7xSeCn9.js';
+import { d as FilePath, b as Context, R as RefName, O as ObjectId } from '../chunks/context-o5TPfMB2.js';
+import { A as AuthorIdentity, T as TreeDiff } from '../chunks/diff-change-alGRzD_j.js';
 import '../chunks/http-transport-DirKfK2S.js';
 
 interface AddOptions {
@@ -13,14 +13,17 @@ interface AddResult {
     readonly removed: ReadonlyArray<FilePath>;
 }
 /**
- * Add the given pathspecs to the index. Performs:
- * 1. Repo + bare + pending-op preflight checks.
- * 2. Path validation for every input (no I/O on rejection).
- * 3. Read working-tree contents → write blob → produce IndexEntry.
- * 4. Atomically replace `.git/index` under the index lock.
+ * Stage paths in the index. Two modes:
  *
- * Bulk mode (`all: true`) is not yet implemented — this is the literal-paths
- * happy path used by `init`/`commit` integration tests.
+ * - **Literal-path mode** (`paths` non-empty, `all` falsy): every path is
+ *  validated, read, hashed, and staged. Missing paths reject the whole call.
+ * - **Bulk mode** (`paths` empty, `all === true`): walk the working tree,
+ *  stage every modified/new tracked file plus every untracked, non-ignored
+ *  file. Files missing from disk but present in the prior index land in
+ *  `removed`. `.git` and embedded repositories are skipped.
+ *
+ * Both modes acquire `.git/index.lock` once, read the existing index under
+ * the lock, and commit a single replacement — no partial writes.
  */
 declare const add: (ctx: Context, paths: ReadonlyArray<string>, opts?: AddOptions) => Promise<AddResult>;
 
@@ -63,15 +66,21 @@ type BranchResult = {
 };
 declare const branch: (ctx: Context, action: BranchAction) => Promise<BranchResult>;
 
-interface CheckoutOptions {
+interface CheckoutSwitchOptions {
     readonly target: string;
     readonly detach?: boolean;
     readonly force?: boolean;
 }
+interface CheckoutPathsOptions {
+    readonly paths: ReadonlyArray<string>;
+    readonly source?: 'index' | 'HEAD' | ObjectId;
+}
+type CheckoutOptions = CheckoutSwitchOptions | CheckoutPathsOptions;
 interface CheckoutResult {
     readonly branch: RefName | undefined;
     readonly id: ObjectId;
     readonly detached: boolean;
+    readonly changedPaths: number;
 }
 declare const checkout: (ctx: Context, opts: CheckoutOptions) => Promise<CheckoutResult>;
 
@@ -82,6 +91,10 @@ interface CloneOptions {
     readonly url: string;
     readonly bare?: boolean;
     readonly initialBranch?: string;
+    /**
+     * Shallow clone depth. When set, sends `deepen N` and persists the
+     * resulting shallow boundaries to `.git/shallow`.
+     */
     readonly depth?: number;
     /** DNS resolver injected by the caller; required to enforce SSRF guards. */
     readonly resolver?: DnsResolver;
@@ -122,6 +135,8 @@ interface CommitResult {
  */
 declare const commit: (ctx: Context, opts: CommitOptions) => Promise<CommitResult>;
 
+type ConflictType = 'content' | 'add-add' | 'modify-delete' | 'type-change' | 'rename-rename' | 'gitlink' | 'binary';
+
 interface DiffOptions {
     /** Resolve to a tree. Accepts ref name, oid, or 'HEAD'. */
     readonly from?: string;
@@ -139,15 +154,24 @@ interface FetchOptions {
     readonly remote?: string;
     readonly refspecs?: ReadonlyArray<string>;
     readonly prune?: boolean;
+    /** Shallow clone depth. Delegates to fetchPack's deepen path. */
+    readonly depth?: number;
+}
+interface FetchUpdate {
+    readonly name: RefName;
+    readonly oldId: ObjectId | undefined;
+    readonly newId: ObjectId;
 }
 interface FetchResult {
     readonly remote: string;
     readonly url: string;
-    readonly updatedRefs: ReadonlyArray<{
-        readonly name: RefName;
-        readonly oldId: ObjectId | undefined;
-        readonly newId: ObjectId;
-    }>;
+    readonly updatedRefs: ReadonlyArray<FetchUpdate>;
+    /** Refs deleted because the server no longer advertises them (prune semantics). */
+    readonly prunedRefs: ReadonlyArray<RefName>;
+    /** New shallow boundaries written to `.git/shallow` during this fetch. */
+    readonly shallow: ReadonlyArray<ObjectId>;
+    /** Commits that crossed the shallow → non-shallow boundary during this fetch. */
+    readonly unshallow: ReadonlyArray<ObjectId>;
 }
 declare const fetch: (ctx: Context, opts?: FetchOptions) => Promise<FetchResult>;
 
@@ -167,7 +191,7 @@ interface InitResult {
  *
  * For non-bare repos, the gitDir is `<workDir>/.git`. For bare, gitDir IS the
  * working dir — callers must construct a Context with `bare: true` for that
- * shape (Phase 10 facade will derive this automatically).
+ * shape.
  */
 declare const init: (ctx: Context, opts?: InitOptions) => Promise<InitResult>;
 
@@ -200,6 +224,10 @@ interface MergeOptions {
     readonly author?: AuthorIdentity;
     readonly committer?: AuthorIdentity;
 }
+interface MergeConflictDescriptor {
+    readonly path: FilePath;
+    readonly type: ConflictType;
+}
 type MergeResult = {
     readonly kind: 'up-to-date';
     readonly id: ObjectId;
@@ -212,14 +240,24 @@ type MergeResult = {
     readonly id: ObjectId;
     readonly branch: RefName;
     readonly parents: ReadonlyArray<ObjectId>;
+} | {
+    readonly kind: 'conflict';
+    readonly conflicts: ReadonlyArray<MergeConflictDescriptor>;
+    readonly mergeHead: ObjectId;
+    readonly origHead: ObjectId;
 };
 /**
- * Merge `target` into the current HEAD branch. v1 supports:
- * - Up-to-date detection (target is ancestor of HEAD).
- * - Fast-forward (HEAD is ancestor of target → branch advances).
- * - True merge for diverged histories: writes a merge commit using HEAD's tree
- *   (callers must run `add` to incorporate target's content). Conflict
- *   resolution and three-way tree merge land in Phase 11.
+ * Merge `target` into the current HEAD branch.
+ *
+ * - Up-to-date: target is ancestor of HEAD → no-op.
+ * - Fast-forward: HEAD is ancestor of target → branch advances.
+ * - True merge for diverged histories:.4a wired the three-way
+ *  tree merge (`mergeTrees` + `mergeContent`) so a CLEAN merge commits
+ *  the merged tree directly.4b persists conflict state on
+ *  disk (marker files, stage-1/2/3 index entries, MERGE_HEAD /
+ *  MERGE_MSG / ORIG_HEAD) and returns `{ kind: 'conflict',... }`.
+ *  Resolution path: edit the marker files, `repo.add(paths)`,
+ *  `repo.commit({ message })` — the resulting commit has two parents.
  */
 declare const merge: (ctx: Context, opts: MergeOptions) => Promise<MergeResult>;
 
@@ -229,14 +267,17 @@ interface PushOptions {
     readonly force?: boolean;
     readonly forceWithLease?: ObjectId | 'auto';
 }
+interface PushedRef {
+    readonly name: RefName;
+    readonly oldId: ObjectId;
+    readonly newId: ObjectId;
+    readonly status: 'ok' | 'rejected';
+    readonly reason?: string;
+}
 interface PushResult {
     readonly remote: string;
     readonly url: string;
-    readonly pushedRefs: ReadonlyArray<{
-        readonly name: RefName;
-        readonly newId: ObjectId;
-        readonly status: 'ok' | 'rejected';
-    }>;
+    readonly pushedRefs: ReadonlyArray<PushedRef>;
 }
 declare const push: (ctx: Context, opts?: PushOptions) => Promise<PushResult>;
 
@@ -253,13 +294,18 @@ interface ResetResult {
 /**
  * Reset HEAD (and optionally index/working tree) to `target`.
  *
- * - `soft`:  HEAD only.
- * - `mixed`: HEAD + clears the index (Phase 9 stub: index cleared via lock release).
- * - `hard`:  HEAD + index + working tree (working-tree mutation deferred to Phase 11).
+ * - `soft`: HEAD only.
+ * - `mixed`: HEAD + rebuild the index from the target commit's tree
+ *  (stat-cache donor strategy preserves cache for unchanged paths —
+ * ). Working tree is NOT touched.
+ * - `hard`: HEAD + index + working tree — materialise the target tree onto
+ *  the working tree with `force: true`, then commit the post-write
+ *  index entries. Bare repos are rejected upfront.
  *
- * v1 implements the HEAD-update path; index/working-tree side effects beyond
- * the HEAD move land in subsequent passes once `materializeFile`/`removeFile`
- * orchestration is in place.
+ * Ordering: working tree → index → HEAD. The index lock wraps both the
+ * working-tree write AND the index commit, matching tightened
+ * pattern. A crash between the index commit and HEAD update leaves the index
+ * ahead of HEAD — same recoverable hazard as canonical git.
  */
 declare const reset: (ctx: Context, opts: ResetOptions) => Promise<ResetResult>;
 
@@ -293,10 +339,10 @@ interface StatusResult {
 /**
  * Summarize the state of the working tree relative to the index, and the
  * branch HEAD points at. Working-tree-vs-HEAD diff (Git's "staged" column)
- * is approximated via index-vs-working-tree comparisons until Phase 11
+ * is approximated via index-vs-working-tree comparisons until
  * adds the stat-cache fast path.
  *
- * Progress reporting (Phase 10 §6.2): emits `status:scan` start before the
+ * Progress reporting: emits `status:scan` start before the
  * fan-out, updates at every 100 lstat completions, and end in a finally
  * block so the consumer always pairs start with end. `total` is undefined
  * — design choice that prevents revealing repository size to non-trusted

package/dist/types/index.browser.d.cts

@@ -1,9 +1,9 @@
-import { O as OpenRepositoryOptions, R as Repository } from './chunks/repository-CFT9j9H6.cjs';
+import { O as OpenRepositoryOptions, R as Repository } from './chunks/repository-23evW2h-.cjs';
 export { AdapterSet, consoleProgress, detectRuntime, isBrowser, isNode, noopProgress } from './index.cjs';
-export { P as ProgressReporter } from './chunks/context-d36639-i.cjs';
+export { P as ProgressReporter } from './chunks/context-D84z1i5F.cjs';
 import './commands/index.cjs';
-import './chunks/diff-change-B09vxnxy.cjs';
-import './primitives/index.cjs';
+import './chunks/diff-change-Bm1zvVsC.cjs';
+import './chunks/write-tree-DVp0RJ_r.cjs';
 import './chunks/http-transport-DirKfK2S.cjs';
 
 /**

package/dist/types/index.browser.d.ts

@@ -1,9 +1,9 @@
-import { O as OpenRepositoryOptions, R as Repository } from './chunks/repository-ntg7eXb2.js';
+import { O as OpenRepositoryOptions, R as Repository } from './chunks/repository-BT7Xq1kJ.js';
 export { AdapterSet, consoleProgress, detectRuntime, isBrowser, isNode, noopProgress } from './index.js';
-export { P as ProgressReporter } from './chunks/context-CTaXSPiP.js';
+export { P as ProgressReporter } from './chunks/context-o5TPfMB2.js';
 import './commands/index.js';
-import './chunks/diff-change-D7xSeCn9.js';
-import './primitives/index.js';
+import './chunks/diff-change-alGRzD_j.js';
+import './chunks/write-tree-DNjhjS3t.js';
 import './chunks/http-transport-DirKfK2S.js';
 
 /**

package/dist/types/index.d.cts

@@ -1,9 +1,9 @@
-import { f as FileSystem, H as HashService, C as Compressor, P as ProgressReporter } from './chunks/context-d36639-i.cjs';
-export { A as AuthStrategy, a as AuthorIdentity, b as Context, c as CreateContextParts, D as DirEntry, e as FileStat, g as Hasher, L as Logger, h as RepositoryConfig, i as RepositoryLayout, j as createContext, n as noopLogger, w as wrapLoggerSanitizer } from './chunks/context-d36639-i.cjs';
+import { f as FileSystem, H as HashService, C as Compressor, P as ProgressReporter } from './chunks/context-D84z1i5F.cjs';
+export { A as AuthStrategy, a as AuthorIdentity, b as Context, c as CreateContextParts, D as DirEntry, e as FileStat, g as Hasher, L as Logger, h as RepositoryConfig, i as RepositoryLayout, j as createContext, n as noopLogger, w as wrapLoggerSanitizer } from './chunks/context-D84z1i5F.cjs';
 import { b as HttpTransport } from './chunks/http-transport-DirKfK2S.cjs';
 export { H as HttpRequest, a as HttpResponse } from './chunks/http-transport-DirKfK2S.cjs';
 export { AddOptions, AddResult, BranchAction, BranchInfo, BranchResult, ChangeEntry, ChangeKind, CheckoutOptions, CheckoutResult, CloneOptions, CloneResult, CommitOptions, CommitResult, DiffOptions, FetchOptions, FetchResult, InitOptions, InitResult, LogEntry, LogOptions, MergeOptions, MergeResult, PushOptions, PushResult, ResetMode, ResetOptions, ResetResult, RmOptions, RmResult, StatusResult, TagAction, TagInfo, TagResult, add, branch, checkout, clone, commit, diff, fetch, init, log, merge, push, reset, revParse, rm, status, tag } from './commands/index.cjs';
-import './chunks/diff-change-B09vxnxy.cjs';
+import './chunks/diff-change-Bm1zvVsC.cjs';
 
 /**
  * The four adapter ports the facade plumbs into the Context. Each runtime

package/dist/types/index.d.ts

@@ -1,9 +1,9 @@
-import { f as FileSystem, H as HashService, C as Compressor, P as ProgressReporter } from './chunks/context-CTaXSPiP.js';
-export { A as AuthStrategy, a as AuthorIdentity, b as Context, c as CreateContextParts, D as DirEntry, e as FileStat, g as Hasher, L as Logger, h as RepositoryConfig, i as RepositoryLayout, j as createContext, n as noopLogger, w as wrapLoggerSanitizer } from './chunks/context-CTaXSPiP.js';
+import { f as FileSystem, H as HashService, C as Compressor, P as ProgressReporter } from './chunks/context-o5TPfMB2.js';
+export { A as AuthStrategy, a as AuthorIdentity, b as Context, c as CreateContextParts, D as DirEntry, e as FileStat, g as Hasher, L as Logger, h as RepositoryConfig, i as RepositoryLayout, j as createContext, n as noopLogger, w as wrapLoggerSanitizer } from './chunks/context-o5TPfMB2.js';
 import { b as HttpTransport } from './chunks/http-transport-DirKfK2S.js';
 export { H as HttpRequest, a as HttpResponse } from './chunks/http-transport-DirKfK2S.js';
 export { AddOptions, AddResult, BranchAction, BranchInfo, BranchResult, ChangeEntry, ChangeKind, CheckoutOptions, CheckoutResult, CloneOptions, CloneResult, CommitOptions, CommitResult, DiffOptions, FetchOptions, FetchResult, InitOptions, InitResult, LogEntry, LogOptions, MergeOptions, MergeResult, PushOptions, PushResult, ResetMode, ResetOptions, ResetResult, RmOptions, RmResult, StatusResult, TagAction, TagInfo, TagResult, add, branch, checkout, clone, commit, diff, fetch, init, log, merge, push, reset, revParse, rm, status, tag } from './commands/index.js';
-import './chunks/diff-change-D7xSeCn9.js';
+import './chunks/diff-change-alGRzD_j.js';
 
 /**
  * The four adapter ports the facade plumbs into the Context. Each runtime

package/dist/types/index.default.d.cts

@@ -1,9 +1,9 @@
-import { O as OpenRepositoryOptions, R as Repository } from './chunks/repository-CFT9j9H6.cjs';
+import { O as OpenRepositoryOptions, R as Repository } from './chunks/repository-23evW2h-.cjs';
 export { AdapterSet, consoleProgress, detectRuntime, isBrowser, isNode, noopProgress } from './index.cjs';
-export { P as ProgressReporter } from './chunks/context-d36639-i.cjs';
+export { P as ProgressReporter } from './chunks/context-D84z1i5F.cjs';
 import './commands/index.cjs';
-import './chunks/diff-change-B09vxnxy.cjs';
-import './primitives/index.cjs';
+import './chunks/diff-change-Bm1zvVsC.cjs';
+import './chunks/write-tree-DVp0RJ_r.cjs';
 import './chunks/http-transport-DirKfK2S.cjs';
 
 /**

package/dist/types/index.default.d.ts

@@ -1,9 +1,9 @@
-import { O as OpenRepositoryOptions, R as Repository } from './chunks/repository-ntg7eXb2.js';
+import { O as OpenRepositoryOptions, R as Repository } from './chunks/repository-BT7Xq1kJ.js';
 export { AdapterSet, consoleProgress, detectRuntime, isBrowser, isNode, noopProgress } from './index.js';
-export { P as ProgressReporter } from './chunks/context-CTaXSPiP.js';
+export { P as ProgressReporter } from './chunks/context-o5TPfMB2.js';
 import './commands/index.js';
-import './chunks/diff-change-D7xSeCn9.js';
-import './primitives/index.js';
+import './chunks/diff-change-alGRzD_j.js';
+import './chunks/write-tree-DNjhjS3t.js';
 import './chunks/http-transport-DirKfK2S.js';
 
 /**

package/dist/types/index.node.d.cts

@@ -1,9 +1,9 @@
-import { O as OpenRepositoryOptions, R as Repository } from './chunks/repository-CFT9j9H6.cjs';
+import { O as OpenRepositoryOptions, R as Repository } from './chunks/repository-23evW2h-.cjs';
 export { AdapterSet, consoleProgress, detectRuntime, isBrowser, isNode, noopProgress } from './index.cjs';
-export { P as ProgressReporter } from './chunks/context-d36639-i.cjs';
+export { P as ProgressReporter } from './chunks/context-D84z1i5F.cjs';
 import './commands/index.cjs';
-import './chunks/diff-change-B09vxnxy.cjs';
-import './primitives/index.cjs';
+import './chunks/diff-change-Bm1zvVsC.cjs';
+import './chunks/write-tree-DVp0RJ_r.cjs';
 import './chunks/http-transport-DirKfK2S.cjs';
 
 /**

package/dist/types/index.node.d.ts

@@ -1,9 +1,9 @@
-import { O as OpenRepositoryOptions, R as Repository } from './chunks/repository-ntg7eXb2.js';
+import { O as OpenRepositoryOptions, R as Repository } from './chunks/repository-BT7Xq1kJ.js';
 export { AdapterSet, consoleProgress, detectRuntime, isBrowser, isNode, noopProgress } from './index.js';
-export { P as ProgressReporter } from './chunks/context-CTaXSPiP.js';
+export { P as ProgressReporter } from './chunks/context-o5TPfMB2.js';
 import './commands/index.js';
-import './chunks/diff-change-D7xSeCn9.js';
-import './primitives/index.js';
+import './chunks/diff-change-alGRzD_j.js';
+import './chunks/write-tree-DNjhjS3t.js';
 import './chunks/http-transport-DirKfK2S.js';
 
 /**

package/dist/types/operators/index.d.cts

@@ -28,9 +28,25 @@ declare function pipe<A, B, C, D, E, F, G, H>(a: A, ab: UnaryFn<A, B>, bc: Unary
 declare function pipe<A, B, C, D, E, F, G, H, I>(a: A, ab: UnaryFn<A, B>, bc: UnaryFn<B, C>, cd: UnaryFn<C, D>, de: UnaryFn<D, E>, ef: UnaryFn<E, F>, fg: UnaryFn<F, G>, gh: UnaryFn<G, H>, hi: UnaryFn<H, I>): I;
 declare function pipe<A, B, C, D, E, F, G, H, I, J>(a: A, ab: UnaryFn<A, B>, bc: UnaryFn<B, C>, cd: UnaryFn<C, D>, de: UnaryFn<D, E>, ef: UnaryFn<E, F>, fg: UnaryFn<F, G>, gh: UnaryFn<G, H>, hi: UnaryFn<H, I>, ij: UnaryFn<I, J>): J;
 
+/**
+ * Adapt a Web `ReadableStream<Uint8Array>` (the type `fetch` returns on
+ * `Response.body`) to an `AsyncIterable<Uint8Array>` that the pkt-line
+ * decoder and other AsyncIterable consumers can drive.
+ *
+ * Why this lives in `src/operators/`: both the `fetch-pack` primitive and
+ * the `commands/internal/upload-pack-client` helper need it, and a primitive
+ * cannot import from `commands/`. The operators module is the natural home —
+ * it owns AsyncIterable composition helpers with zero domain dependencies.
+ *
+ * Lifecycle: on early exit (consumer throws or breaks) the iterator's
+ * `return` hook calls `cancel()` so the stream + underlying socket close
+ * cleanly. `releaseLock` alone leaves the stream open.
+ */
+declare const readableStreamToAsyncIterable: (stream: ReadableStream<Uint8Array>) => AsyncIterable<Uint8Array>;
+
 declare function take<T>(count: number): (source: AsyncIterable<T>) => AsyncIterable<T>;
 
 declare function toArray<T>(source: AsyncIterable<T>, limit?: number): Promise<T[]>;
 
-export { filter, find, flatMap, groupBy, map, pipe, take, toArray };
+export { filter, find, flatMap, groupBy, map, pipe, readableStreamToAsyncIterable, take, toArray };
 export type { Awaitable };

package/dist/types/operators/index.d.ts

@@ -28,9 +28,25 @@ declare function pipe<A, B, C, D, E, F, G, H>(a: A, ab: UnaryFn<A, B>, bc: Unary
 declare function pipe<A, B, C, D, E, F, G, H, I>(a: A, ab: UnaryFn<A, B>, bc: UnaryFn<B, C>, cd: UnaryFn<C, D>, de: UnaryFn<D, E>, ef: UnaryFn<E, F>, fg: UnaryFn<F, G>, gh: UnaryFn<G, H>, hi: UnaryFn<H, I>): I;
 declare function pipe<A, B, C, D, E, F, G, H, I, J>(a: A, ab: UnaryFn<A, B>, bc: UnaryFn<B, C>, cd: UnaryFn<C, D>, de: UnaryFn<D, E>, ef: UnaryFn<E, F>, fg: UnaryFn<F, G>, gh: UnaryFn<G, H>, hi: UnaryFn<H, I>, ij: UnaryFn<I, J>): J;
 
+/**
+ * Adapt a Web `ReadableStream<Uint8Array>` (the type `fetch` returns on
+ * `Response.body`) to an `AsyncIterable<Uint8Array>` that the pkt-line
+ * decoder and other AsyncIterable consumers can drive.
+ *
+ * Why this lives in `src/operators/`: both the `fetch-pack` primitive and
+ * the `commands/internal/upload-pack-client` helper need it, and a primitive
+ * cannot import from `commands/`. The operators module is the natural home —
+ * it owns AsyncIterable composition helpers with zero domain dependencies.
+ *
+ * Lifecycle: on early exit (consumer throws or breaks) the iterator's
+ * `return` hook calls `cancel()` so the stream + underlying socket close
+ * cleanly. `releaseLock` alone leaves the stream open.
+ */
+declare const readableStreamToAsyncIterable: (stream: ReadableStream<Uint8Array>) => AsyncIterable<Uint8Array>;
+
 declare function take<T>(count: number): (source: AsyncIterable<T>) => AsyncIterable<T>;
 
 declare function toArray<T>(source: AsyncIterable<T>, limit?: number): Promise<T[]>;
 
-export { filter, find, flatMap, groupBy, map, pipe, take, toArray };
+export { filter, find, flatMap, groupBy, map, pipe, readableStreamToAsyncIterable, take, toArray };
 export type { Awaitable };