@ricsam/r5d-api 0.0.74 → 0.0.76

package/README.md

@@ -50,7 +50,7 @@ Trusted server-side callers that authenticate through custom headers, such as a
 - `processes.list({ project?, branch?, session?, worker? })`
 - `processes.stop(runId)`
 - `projects.list()`
-- `projects.create({ name?, orgId? })`
+- `projects.create({ repositoryId })`
 - `projects.describe(projectRef)`
 - `projects.update(projectRef, { name?, mode? })`
 - `projects.delete(projectRef)`
@@ -59,8 +59,6 @@ Trusted server-side callers that authenticate through custom headers, such as a
 - `projects.sessions.list(projectRef, { branch? })`
 - `projects.sessions.create(projectRef, { branchName, name? })`
 - `projects.sessions.start(projectRef, { worker, model, prompt, requestId, worktree?, newWorktree?, source? })`
-- `projects.worktrees.merge(projectRef, sourceWorktree, { worker?, conflictMode })`
-- `projects.worktrees.finishMerge(projectRef, conflictWorktree, { worker, summary? })`
 - `sessions.describe(sessionId)`
 - `sessions.update(sessionId, { name })`
 - `sessions.delete(sessionId)`
@@ -77,7 +75,7 @@ Trusted server-side callers that authenticate through custom headers, such as a
 
 `sessions.prompt(...)` returns `promptDisposition: "queued" | "started"`, so callers can distinguish delivery to an active generation from a newly started generation. Session commands never rebind a session to another worker implicitly.
 
-`projects.sessions.start(...)` selects either an existing `worktree`, or a `newWorktree` plus `source: { type: "worktree", branchName }`. Session events are exposed as an authenticated async iterable over the raw `/api/sessions/:sessionId/events` SSE stream.
+`projects.sessions.start(...)` selects either an existing `worktree`, or a `newWorktree` plus `source: { type: "worktree", branchName }`. It returns a durable `provisioning` handle immediately; poll `sessions.status(...)` until the run is queued, running, failed, or stopped before attaching to events. Reusing the same `requestId` and request body is idempotent. Session events are exposed as an authenticated async iterable over the raw `/api/sessions/:sessionId/events` SSE stream.
 
 ## Errors
 

package/dist/cjs/index.cjs

@@ -397,22 +397,6 @@ class R5dctlClient {
         path: `/api/r5dctl/projects/${encodeURIComponent(projectRef)}/sessions/start`,
         body: input
       })
-    },
-    worktrees: {
-      merge: (projectRef, sourceWorktree, input) => this.request({
-        method: "POST",
-        path: `/api/r5dctl/projects/${encodeURIComponent(projectRef)}/worktrees/${encodeURIComponent(sourceWorktree)}/merge`,
-        body: input
-      }),
-      finishMerge: (projectRef, conflictWorktree, input) => this.request({
-        method: "POST",
-        path: `/api/r5dctl/projects/${encodeURIComponent(projectRef)}/worktrees/${encodeURIComponent(conflictWorktree)}/merge/finish`,
-        body: input
-      }),
-      mergeAttempt: (projectRef, attemptId) => this.request({
-        method: "GET",
-        path: `/api/r5dctl/projects/${encodeURIComponent(projectRef)}/merge-attempts/${encodeURIComponent(attemptId)}`
-      })
     }
   };
   sessions = {

package/dist/cjs/package.json

@@ -1,5 +1,5 @@
 {
   "name": "@ricsam/r5d-api",
-  "version": "0.0.74",
+  "version": "0.0.76",
   "type": "commonjs"
 }

package/dist/mjs/index.mjs

@@ -373,22 +373,6 @@ class R5dctlClient {
         path: `/api/r5dctl/projects/${encodeURIComponent(projectRef)}/sessions/start`,
         body: input
       })
-    },
-    worktrees: {
-      merge: (projectRef, sourceWorktree, input) => this.request({
-        method: "POST",
-        path: `/api/r5dctl/projects/${encodeURIComponent(projectRef)}/worktrees/${encodeURIComponent(sourceWorktree)}/merge`,
-        body: input
-      }),
-      finishMerge: (projectRef, conflictWorktree, input) => this.request({
-        method: "POST",
-        path: `/api/r5dctl/projects/${encodeURIComponent(projectRef)}/worktrees/${encodeURIComponent(conflictWorktree)}/merge/finish`,
-        body: input
-      }),
-      mergeAttempt: (projectRef, attemptId) => this.request({
-        method: "GET",
-        path: `/api/r5dctl/projects/${encodeURIComponent(projectRef)}/merge-attempts/${encodeURIComponent(attemptId)}`
-      })
     }
   };
   sessions = {

package/dist/mjs/package.json

@@ -1,5 +1,5 @@
 {
   "name": "@ricsam/r5d-api",
-  "version": "0.0.74",
+  "version": "0.0.76",
   "type": "module"
 }

package/dist/types/index.d.ts

@@ -1,4 +1,4 @@
-export type ChatMode = "ask" | "plan" | "agent" | "large_diff_remediation" | "merge_conflict_resolution";
+export type ChatMode = "ask" | "plan" | "agent" | "large_diff_remediation";
 export type R5dctlSessionMode = "ask" | "plan" | "agent";
 export type ModelTier = "low" | "medium" | "high" | "max";
 export type R5dctlWorktreeSource = {
@@ -14,9 +14,7 @@ export type R5dctlProject = {
     createdAt: string;
     updatedAt: string;
 };
-export type R5dctlProjectDescription = R5dctlProject & {
-    orgId: string | null;
-};
+export type R5dctlProjectDescription = R5dctlProject;
 export type R5dctlBranch = {
     branchName: string;
     sessionCount: number;
@@ -199,23 +197,6 @@ export type R5dctlConversationForkResponse = {
     copiedNodeCount: number;
 };
 export type R5dctlSessionRunStatus = "idle" | "provisioning" | "queued" | "running" | "completed" | "failed" | "stopped";
-export type R5dctlWorktreeMergeResponse = {
-    status: "merged" | "up_to_date" | "conflicts" | "provisioning" | "conflict_worktree_created" | "resolving" | "failed" | "stale";
-    attemptId?: string;
-    sourceWorktree: string;
-    targetWorktree: string;
-    conflictWorktree?: string;
-    commitHash?: string;
-    resolverSessionId?: string;
-    folderPath?: string;
-    worker?: string;
-    conflictedFiles?: string[];
-    failureReason?: string;
-    message?: string;
-    worktreeReady?: boolean;
-    resolverAgentRunning?: boolean;
-};
-export type R5dctlMergeConflictMode = "none" | "worktree" | "agent";
 export type R5dctlSessionRunResponse = {
     sessionId: string;
     branchName: string;
@@ -357,24 +338,25 @@ export type R5dctlWorkspaceSyncResult = {
         toolCallId?: string;
         projectId?: string;
         branchName?: string;
-        canonicalCheckoutOnly?: boolean;
         detail?: string;
     };
-    outcome: "no_change" | "candidate_ready" | "published" | "updated" | "conflict_reset" | "large_diff_blocked" | "conflict_blocked" | "reset" | "failed";
+    outcome: "no_change" | "published" | "updated" | "conflict_reset" | "large_diff_blocked" | "conflict_blocked" | "reset" | "failed";
     startingHead: string | null;
-    expectedHead?: string | null;
-    candidateHead?: string;
-    quarantineRef?: string;
+    localHead?: string;
     publishedHead?: string;
     rebaseCount: number;
     diffSizeBytes: number;
     gitStatus: string;
     affectedProjects: string[];
     affectedPaths: string[];
+    conflictPaths?: string[];
+    conflictSnapshotRefs?: {
+        local: string;
+        remote: string;
+    };
     discardedPaths: string[];
     localChangesDiscarded: boolean;
     dirtyGeneration?: number;
-    sampledCanonicalCheckoutTreeHash?: string;
     telemetry?: {
         totalMs: number;
         queueMs: number;
@@ -388,36 +370,18 @@ export type R5dctlWorkspaceStatus = {
     latestSync: R5dctlWorkspaceSyncResult | null;
     workers: Array<{
         workerLabel: string;
-        ready: boolean;
-        manifestRevision: string | null;
+        configured: boolean;
         pendingCheckouts: Array<{
             projectId: string;
             branchName: string;
         }>;
         localHead: string | null;
-        desiredCanonicalHead: string | null;
-        dirtyGeneration: number;
-        publishedGeneration: number;
-        publicationState: "idle" | "scheduled" | "preparing" | "submitting" | "blocked";
-        casRetries: number;
-        lastNotifiedHead: string | null;
-        lastNotifiedAt: string | null;
-        fanoutLag: boolean;
-        fanoutLagMs: number | null;
+        aheadOfOriginBranches: Array<{
+            projectId: string;
+            branchName: string;
+            ahead: number;
+        }>;
     }>;
-    materialization: {
-        desiredHead: string | null;
-        materializedHead: string | null;
-        state: "idle" | "pending" | "running" | "failed";
-        retryCount: number;
-        nextRetryAt: string | null;
-        lastError: string | null;
-        startedAt: string | null;
-        completedAt: string | null;
-        updatedAt: string;
-        lag: boolean;
-        lagMs: number;
-    } | null;
     incident: {
         id: string;
         kind: "large_diff" | "sync_conflict";
@@ -670,8 +634,8 @@ export declare class R5dctlClient {
     };
     readonly projects: {
         list: () => Promise<R5dctlProject[]>;
-        describe: (projectRef: string) => Promise<R5dctlProjectDescription>;
-        update: (projectRef: string, input: R5dctlProjectUpdateInput) => Promise<R5dctlProjectDescription>;
+        describe: (projectRef: string) => Promise<R5dctlProject>;
+        update: (projectRef: string, input: R5dctlProjectUpdateInput) => Promise<R5dctlProject>;
         delete: (projectRef: string) => Promise<{
             success: boolean;
         }>;
@@ -699,17 +663,6 @@ export declare class R5dctlClient {
             create: (projectRef: string, input: R5dctlSessionCreateInput) => Promise<R5dctlSessionDescription>;
             start: (projectRef: string, input: R5dctlSessionStartInput) => Promise<R5dctlSessionRunResponse>;
         };
-        worktrees: {
-            merge: (projectRef: string, sourceWorktree: string, input: {
-                worker?: string;
-                conflictMode: R5dctlMergeConflictMode;
-            }) => Promise<R5dctlWorktreeMergeResponse>;
-            finishMerge: (projectRef: string, conflictWorktree: string, input: {
-                worker: string;
-                summary?: string;
-            }) => Promise<R5dctlWorktreeMergeResponse>;
-            mergeAttempt: (projectRef: string, attemptId: string) => Promise<R5dctlWorktreeMergeResponse>;
-        };
     };
     readonly sessions: {
         recent: (input?: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ricsam/r5d-api",
-  "version": "0.0.74",
+  "version": "0.0.76",
   "type": "module",
   "main": "./dist/cjs/index.cjs",
   "module": "./dist/mjs/index.mjs",