@ricsam/r5d-api 0.0.58 → 0.0.60

package/README.md

@@ -58,6 +58,8 @@ Trusted server-side callers that authenticate through custom headers, such as a
 - `projects.env.get/update/remove(projectId, ...)`
 - `projects.sessions.list(projectRef, { branch? })`
 - `projects.sessions.create(projectRef, { branchName, name? })`
+- `projects.agents.start(projectRef, { source, agentType, prompt, worker, requestId })`
+- `agents.status/sendPrompt/merge/stop/finishMerge(...)`
 - `sessions.describe(sessionId)`
 - `sessions.update(sessionId, { name })`
 - `sessions.delete(sessionId)`
@@ -69,6 +71,10 @@ Trusted server-side callers that authenticate through custom headers, such as a
 - `sessions.answerQuestions(sessionId, { answers })`
 - `sessions.answerEnvRequest(sessionId, { envs?, additionalContext? })`
 
+`agents.sendPrompt(...)` returns `promptDisposition: "queued" | "started"`, so callers can distinguish delivery to an active generation from a newly started generation. Agent commands never rebind a session to another worker implicitly.
+
+`projects.agents.start(...)` requires `source: { type: "worktree", branchName }`. The source is the named branch worktree, including its committed and uncommitted files.
+
 ## Errors
 
 Non-2xx responses throw `R5dctlApiError` with:

package/dist/cjs/index.cjs

@@ -302,22 +302,7 @@ class R5dctlClient {
         path: `/api/r5dctl/projects/${encodeURIComponent(projectRef)}/agents`,
         body: input
       })
-    },
-    mergeChanges: (projectRef, input) => this.request({
-      method: "POST",
-      path: `/api/r5dctl/projects/${encodeURIComponent(projectRef)}/merge-changes`,
-      body: input
-    }),
-    continueMerge: (projectRef, input) => this.request({
-      method: "POST",
-      path: `/api/r5dctl/projects/${encodeURIComponent(projectRef)}/continue-merge`,
-      body: input
-    }),
-    abortMerge: (projectRef, input) => this.request({
-      method: "POST",
-      path: `/api/r5dctl/projects/${encodeURIComponent(projectRef)}/abort-merge`,
-      body: input
-    })
+    }
   };
   agents = {
     status: (sessionId) => this.request({
@@ -328,6 +313,20 @@ class R5dctlClient {
       method: "POST",
       path: `/api/r5dctl/agents/${encodeURIComponent(sessionId)}/prompt`,
       body: input
+    }),
+    merge: (sessionId, input) => this.request({
+      method: "POST",
+      path: `/api/r5dctl/agents/${encodeURIComponent(sessionId)}/merge`,
+      body: input
+    }),
+    stop: (sessionId) => this.request({
+      method: "POST",
+      path: `/api/r5dctl/agents/${encodeURIComponent(sessionId)}/stop`
+    }),
+    finishMerge: (sessionId, input) => this.request({
+      method: "POST",
+      path: `/api/r5dctl/agents/${encodeURIComponent(sessionId)}/finish-merge`,
+      body: input
     })
   };
   sessions = {

package/dist/cjs/package.json

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

package/dist/mjs/index.mjs

@@ -278,22 +278,7 @@ class R5dctlClient {
         path: `/api/r5dctl/projects/${encodeURIComponent(projectRef)}/agents`,
         body: input
       })
-    },
-    mergeChanges: (projectRef, input) => this.request({
-      method: "POST",
-      path: `/api/r5dctl/projects/${encodeURIComponent(projectRef)}/merge-changes`,
-      body: input
-    }),
-    continueMerge: (projectRef, input) => this.request({
-      method: "POST",
-      path: `/api/r5dctl/projects/${encodeURIComponent(projectRef)}/continue-merge`,
-      body: input
-    }),
-    abortMerge: (projectRef, input) => this.request({
-      method: "POST",
-      path: `/api/r5dctl/projects/${encodeURIComponent(projectRef)}/abort-merge`,
-      body: input
-    })
+    }
   };
   agents = {
     status: (sessionId) => this.request({
@@ -304,6 +289,20 @@ class R5dctlClient {
       method: "POST",
       path: `/api/r5dctl/agents/${encodeURIComponent(sessionId)}/prompt`,
       body: input
+    }),
+    merge: (sessionId, input) => this.request({
+      method: "POST",
+      path: `/api/r5dctl/agents/${encodeURIComponent(sessionId)}/merge`,
+      body: input
+    }),
+    stop: (sessionId) => this.request({
+      method: "POST",
+      path: `/api/r5dctl/agents/${encodeURIComponent(sessionId)}/stop`
+    }),
+    finishMerge: (sessionId, input) => this.request({
+      method: "POST",
+      path: `/api/r5dctl/agents/${encodeURIComponent(sessionId)}/finish-merge`,
+      body: input
     })
   };
   sessions = {

package/dist/mjs/package.json

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

package/dist/types/index.d.ts

@@ -1,6 +1,10 @@
 export type ChatMode = "ask" | "plan" | "build" | "agent" | "explore" | "test" | "research" | "security_review" | "large_diff_remediation" | "merge_conflict_resolution";
 export type ModelTier = "low" | "medium" | "high" | "max";
 export type R5dctlAgentType = "research" | "debug" | "test";
+export type R5dctlAgentSource = {
+    type: "worktree";
+    branchName: string;
+};
 export type R5dctlProject = {
     id: string;
     namespace: string;
@@ -94,53 +98,50 @@ export type R5dctlConversationWorkResponse = {
     detail: R5dctlConversationWorkDetail;
     workText: string;
 };
-export type R5dctlAgentStartResponse = {
-    sessionId: string;
-    branchName: string;
-    baseBranch: string;
-    baseCommit: string;
-    status: "running";
+export type R5dctlAgentRunStatus = "provisioning" | "queued" | "running" | "completed" | "failed" | "stopped";
+export type R5dctlAgentMergeStatus = {
+    status: "merged" | "up_to_date" | "conflicts" | "resolving" | "failed" | "stale";
+    attemptId?: string;
+    sourceBranch: string;
+    targetBranch: string;
+    commitHash?: string;
+    resolverSessionId?: string;
+    resolverBranch?: string;
+    folderPath?: string;
+    worker?: string;
+    conflictedFiles?: string[];
+    failureReason?: string;
+    message?: string;
 };
 export type R5dctlAgentStatusResponse = {
     sessionId: string;
     branchName: string;
-    baseBranch: string | null;
-    baseCommit: string | null;
-    status: "running" | "completed" | "failed";
-    startedAt: string;
+    source: R5dctlAgentSource;
+    baselineCommit: string | null;
+    workspaceHead: string | null;
+    worker: string;
+    status: R5dctlAgentRunStatus;
+    runStatus: R5dctlAgentRunStatus;
+    kind: R5dctlAgentType;
+    createdAt: string;
     updatedAt: string;
+    queuedAt?: string;
+    startedAt?: string;
     completedAt?: string;
     failedAt?: string;
+    stoppedAt?: string;
     error?: string;
-    headCommit: string;
+    headCommit: string | null;
+    headCommitError?: string;
     summary: string;
     diffSummary: string;
+    sessionPath: string;
+    sessionUrl?: string;
+    merge?: R5dctlAgentMergeStatus;
 };
-export type R5dctlMergeResult = {
-    type: "merge_branch";
-    status: "merged";
-    sourceBranch: string;
-    targetBranch: string;
-    commitHash: string;
-    message: string;
-} | {
-    type: "merge_branch";
-    status: "conflicts";
-    sourceBranch: string;
-    targetBranch: string;
-    conflictedFiles: string[];
-    message: string;
-};
-export type R5dctlContinueMergeResult = {
-    type: "continue_merge";
-    status: "committed";
-    commitHash: string;
-    message: string;
-};
-export type R5dctlAbortMergeResult = {
-    type: "abort_merge";
-    status: "aborted";
-    message: string;
+export type R5dctlAgentStartResponse = R5dctlAgentStatusResponse;
+export type R5dctlAgentPromptResponse = R5dctlAgentStatusResponse & {
+    promptDisposition: "queued" | "started";
 };
 export type DeviceAuthorizationStartResponse = {
     requestId: string;
@@ -215,11 +216,14 @@ export type R5dctlWorkspaceSyncResult = {
         toolCallId?: string;
         projectId?: string;
         branchName?: string;
+        canonicalCheckoutOnly?: boolean;
         detail?: string;
     };
-    outcome: "no_change" | "published" | "updated" | "conflict_reset" | "large_diff_blocked" | "conflict_blocked" | "reset" | "failed";
+    outcome: "no_change" | "candidate_ready" | "published" | "updated" | "conflict_reset" | "large_diff_blocked" | "conflict_blocked" | "reset" | "failed";
     startingHead: string | null;
+    expectedHead?: string | null;
     candidateHead?: string;
+    quarantineRef?: string;
     publishedHead?: string;
     rebaseCount: number;
     diffSizeBytes: number;
@@ -228,24 +232,54 @@ export type R5dctlWorkspaceSyncResult = {
     affectedPaths: string[];
     discardedPaths: string[];
     localChangesDiscarded: boolean;
+    dirtyGeneration?: number;
+    sampledCanonicalCheckoutTreeHash?: string;
     telemetry?: {
         totalMs: number;
         queueMs: number;
         prepareMs: number;
         synchronizeMs: number;
-        fastPath: {
-            hit: boolean;
-            reason: string;
-            proofAgeMs?: number;
-        };
     };
     error?: string;
 };
 export type R5dctlWorkspaceStatus = {
     head: string | null;
     latestSync: R5dctlWorkspaceSyncResult | null;
+    workers: Array<{
+        workerLabel: string;
+        ready: boolean;
+        manifestRevision: string | null;
+        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;
+    }>;
+    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";
         originWorkerLabel: string;
         remediationSessionId: string;
         status: "remediating" | "waiting_for_worker";
@@ -504,26 +538,27 @@ export declare class R5dctlClient {
         };
         agents: {
             start: (projectRef: string, input: {
-                sourceBranch: string;
+                source: R5dctlAgentSource;
                 agentType: R5dctlAgentType;
                 prompt: string;
-            }) => Promise<R5dctlAgentStartResponse>;
+                worker: string;
+                requestId: string;
+            }) => Promise<R5dctlAgentStatusResponse>;
         };
-        mergeChanges: (projectRef: string, input: {
-            targetBranch: string;
-            sourceBranch: string;
-        }) => Promise<R5dctlMergeResult>;
-        continueMerge: (projectRef: string, input: {
-            targetBranch: string;
-        }) => Promise<R5dctlContinueMergeResult>;
-        abortMerge: (projectRef: string, input: {
-            targetBranch: string;
-        }) => Promise<R5dctlAbortMergeResult>;
     };
     readonly agents: {
         status: (sessionId: string) => Promise<R5dctlAgentStatusResponse>;
         sendPrompt: (sessionId: string, input: {
             prompt: string;
+            worker: string;
+        }) => Promise<R5dctlAgentPromptResponse>;
+        merge: (sessionId: string, input: {
+            worker: string;
+        }) => Promise<R5dctlAgentStatusResponse>;
+        stop: (sessionId: string) => Promise<R5dctlAgentStatusResponse>;
+        finishMerge: (sessionId: string, input: {
+            worker: string;
+            summary: string;
         }) => Promise<R5dctlAgentStatusResponse>;
     };
     readonly sessions: {

package/package.json

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