@ricsam/r5d-api 0.0.59 → 0.0.61

package/README.md

@@ -58,16 +58,26 @@ 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.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)`
 - `sessions.conversation(sessionId)`
+- `sessions.events(sessionId, { signal? })`
 - `sessions.conversationOverview(sessionId)`
 - `sessions.inspectConversationNode(sessionId, nodeId)`
 - `sessions.inspectConversationWork(sessionId, workId, { detail? })`
-- `sessions.prompt(sessionId, { message, mode, model })`
-- `sessions.answerQuestions(sessionId, { answers })`
-- `sessions.answerEnvRequest(sessionId, { envs?, additionalContext? })`
+- `sessions.status(sessionId)`
+- `sessions.prompt(sessionId, { prompt, worker, mode, model, requestId })`
+- `sessions.stop(sessionId)`
+- `sessions.answerQuestions(sessionId, { answers, worker, mode, model, requestId })`
+- `sessions.answerEnvRequest(sessionId, { envs?, additionalContext?, worker, mode, model, requestId })`
+
+`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.
 
 ## Errors
 

package/dist/cjs/index.cjs

@@ -49,6 +49,56 @@ function withQuery(path, query) {
   const queryString = params.toString();
   return queryString.length > 0 ? `${path}?${queryString}` : path;
 }
+function parseSseFrame(frame) {
+  const dataLines = [];
+  let eventType;
+  for (const line of frame.split(/\r?\n/)) {
+    if (line.length === 0 || line.startsWith(":")) continue;
+    const separator = line.indexOf(":");
+    const field = separator < 0 ? line : line.slice(0, separator);
+    const value = separator < 0 ? "" : line.slice(separator + 1).replace(/^ /, "");
+    if (field === "event") eventType = value;
+    if (field === "data") dataLines.push(value);
+  }
+  if (dataLines.length === 0) return null;
+  const parsed = safeJsonParse(dataLines.join("\n"));
+  if (typeof parsed === "object" && parsed !== null) {
+    const record = parsed;
+    if (typeof record.type !== "string" && eventType) record.type = eventType;
+    if (typeof record.type === "string") return record;
+  }
+  return eventType ? { type: eventType, data: parsed } : null;
+}
+async function* parseSseStream(stream) {
+  const reader = stream.getReader();
+  const decoder = new TextDecoder();
+  let buffer = "";
+  let completed = false;
+  try {
+    while (true) {
+      const { done, value } = await reader.read();
+      buffer += decoder.decode(value, { stream: !done });
+      let boundary = buffer.search(/\r?\n\r?\n/);
+      while (boundary >= 0) {
+        const frame = buffer.slice(0, boundary);
+        const separator = buffer.slice(boundary).match(/^\r?\n\r?\n/)?.[0] ?? "\n\n";
+        buffer = buffer.slice(boundary + separator.length);
+        const event2 = parseSseFrame(frame);
+        if (event2) yield event2;
+        boundary = buffer.search(/\r?\n\r?\n/);
+      }
+      if (done) {
+        completed = true;
+        break;
+      }
+    }
+    const event = parseSseFrame(buffer);
+    if (event) yield event;
+  } finally {
+    if (!completed) await reader.cancel().catch(() => void 0);
+    reader.releaseLock();
+  }
+}
 class R5dctlClient {
   fetchImpl;
   baseUrl;
@@ -76,26 +126,25 @@ class R5dctlClient {
   resolveBearerToken() {
     return this.token ?? this.apiKey;
   }
-  async request(input) {
-    const authMode = input.auth ?? "auto";
+  authHeaders(path, accept, auth = "auto") {
+    const headers = { ...this.extraHeaders, Accept: accept };
+    if (auth === "none") return headers;
     const bearerToken = this.resolveBearerToken();
-    const headers = {
-      ...this.extraHeaders,
-      Accept: "application/json"
-    };
-    if (authMode === "auto") {
-      if (!bearerToken) {
-        if (this.authMode !== "headers") {
-          throw new R5dctlApiError("Authentication required. Set token or apiKey in R5dctlClient.", {
-            status: 401,
-            path: input.path,
-            body: { error: "Missing credentials" }
-          });
-        }
-      } else {
-        headers.Authorization = `Bearer ${bearerToken}`;
+    if (!bearerToken) {
+      if (this.authMode !== "headers") {
+        throw new R5dctlApiError("Authentication required. Set token or apiKey in R5dctlClient.", {
+          status: 401,
+          path,
+          body: { error: "Missing credentials" }
+        });
       }
+    } else {
+      headers.Authorization = `Bearer ${bearerToken}`;
     }
+    return headers;
+  }
+  async request(input) {
+    const headers = this.authHeaders(input.path, "application/json", input.auth ?? "auto");
     const hasBody = input.body !== void 0;
     if (hasBody) {
       headers["Content-Type"] = "application/json";
@@ -118,6 +167,24 @@ class R5dctlClient {
     }
     return payload;
   }
+  async *events(sessionId, input = {}) {
+    const path = `/api/sessions/${encodeURIComponent(sessionId)}/events`;
+    const response = await this.fetchImpl(`${this.baseUrl}${path}`, {
+      method: "GET",
+      headers: this.authHeaders(path, "text/event-stream"),
+      signal: input.signal
+    });
+    if (!response.ok) {
+      const text = await response.text();
+      const payload = text.length > 0 ? safeJsonParse(text) : null;
+      const message = typeof payload === "object" && payload && "error" in payload && typeof payload.error === "string" ? payload.error : `Request failed (${response.status})`;
+      throw new R5dctlApiError(message, { status: response.status, path, body: payload });
+    }
+    if (!response.body) {
+      throw new R5dctlApiError("Session event stream returned no body", { status: response.status, path, body: null });
+    }
+    yield* parseSseStream(response.body);
+  }
   auth = {
     deviceStart: (input) => this.request({
       method: "POST",
@@ -294,41 +361,25 @@ class R5dctlClient {
         method: "POST",
         path: `/api/r5dctl/projects/${encodeURIComponent(projectRef)}/sessions`,
         body: input
-      })
-    },
-    agents: {
+      }),
       start: (projectRef, input) => this.request({
         method: "POST",
-        path: `/api/r5dctl/projects/${encodeURIComponent(projectRef)}/agents`,
+        path: `/api/r5dctl/projects/${encodeURIComponent(projectRef)}/sessions/start`,
         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({
-      method: "GET",
-      path: `/api/r5dctl/agents/${encodeURIComponent(sessionId)}`
-    }),
-    sendPrompt: (sessionId, input) => this.request({
-      method: "POST",
-      path: `/api/r5dctl/agents/${encodeURIComponent(sessionId)}/prompt`,
-      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
+      })
+    }
   };
   sessions = {
     recent: (input = {}) => this.request({
@@ -349,6 +400,11 @@ class R5dctlClient {
       method: "DELETE",
       path: `/api/r5dctl/sessions/${encodeURIComponent(sessionId)}`
     }),
+    status: (sessionId) => this.request({
+      method: "GET",
+      path: `/api/r5dctl/sessions/${encodeURIComponent(sessionId)}/status`
+    }),
+    events: (sessionId, input = {}) => this.events(sessionId, input),
     conversation: (sessionId, input = {}) => this.request({
       method: "GET",
       path: `/api/r5dctl/sessions/${encodeURIComponent(sessionId)}/conversation`,
@@ -378,6 +434,11 @@ class R5dctlClient {
       path: `/api/r5dctl/sessions/${encodeURIComponent(sessionId)}/prompt`,
       body: input
     }),
+    stop: (sessionId) => this.request({
+      method: "POST",
+      path: `/api/r5dctl/sessions/${encodeURIComponent(sessionId)}/stop`,
+      body: {}
+    }),
     answerQuestions: (sessionId, input) => this.request({
       method: "POST",
       path: `/api/r5dctl/sessions/${encodeURIComponent(sessionId)}/answer-questions`,

package/dist/cjs/package.json

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

package/dist/mjs/index.mjs

@@ -25,6 +25,56 @@ function withQuery(path, query) {
   const queryString = params.toString();
   return queryString.length > 0 ? `${path}?${queryString}` : path;
 }
+function parseSseFrame(frame) {
+  const dataLines = [];
+  let eventType;
+  for (const line of frame.split(/\r?\n/)) {
+    if (line.length === 0 || line.startsWith(":")) continue;
+    const separator = line.indexOf(":");
+    const field = separator < 0 ? line : line.slice(0, separator);
+    const value = separator < 0 ? "" : line.slice(separator + 1).replace(/^ /, "");
+    if (field === "event") eventType = value;
+    if (field === "data") dataLines.push(value);
+  }
+  if (dataLines.length === 0) return null;
+  const parsed = safeJsonParse(dataLines.join("\n"));
+  if (typeof parsed === "object" && parsed !== null) {
+    const record = parsed;
+    if (typeof record.type !== "string" && eventType) record.type = eventType;
+    if (typeof record.type === "string") return record;
+  }
+  return eventType ? { type: eventType, data: parsed } : null;
+}
+async function* parseSseStream(stream) {
+  const reader = stream.getReader();
+  const decoder = new TextDecoder();
+  let buffer = "";
+  let completed = false;
+  try {
+    while (true) {
+      const { done, value } = await reader.read();
+      buffer += decoder.decode(value, { stream: !done });
+      let boundary = buffer.search(/\r?\n\r?\n/);
+      while (boundary >= 0) {
+        const frame = buffer.slice(0, boundary);
+        const separator = buffer.slice(boundary).match(/^\r?\n\r?\n/)?.[0] ?? "\n\n";
+        buffer = buffer.slice(boundary + separator.length);
+        const event2 = parseSseFrame(frame);
+        if (event2) yield event2;
+        boundary = buffer.search(/\r?\n\r?\n/);
+      }
+      if (done) {
+        completed = true;
+        break;
+      }
+    }
+    const event = parseSseFrame(buffer);
+    if (event) yield event;
+  } finally {
+    if (!completed) await reader.cancel().catch(() => void 0);
+    reader.releaseLock();
+  }
+}
 class R5dctlClient {
   fetchImpl;
   baseUrl;
@@ -52,26 +102,25 @@ class R5dctlClient {
   resolveBearerToken() {
     return this.token ?? this.apiKey;
   }
-  async request(input) {
-    const authMode = input.auth ?? "auto";
+  authHeaders(path, accept, auth = "auto") {
+    const headers = { ...this.extraHeaders, Accept: accept };
+    if (auth === "none") return headers;
     const bearerToken = this.resolveBearerToken();
-    const headers = {
-      ...this.extraHeaders,
-      Accept: "application/json"
-    };
-    if (authMode === "auto") {
-      if (!bearerToken) {
-        if (this.authMode !== "headers") {
-          throw new R5dctlApiError("Authentication required. Set token or apiKey in R5dctlClient.", {
-            status: 401,
-            path: input.path,
-            body: { error: "Missing credentials" }
-          });
-        }
-      } else {
-        headers.Authorization = `Bearer ${bearerToken}`;
+    if (!bearerToken) {
+      if (this.authMode !== "headers") {
+        throw new R5dctlApiError("Authentication required. Set token or apiKey in R5dctlClient.", {
+          status: 401,
+          path,
+          body: { error: "Missing credentials" }
+        });
       }
+    } else {
+      headers.Authorization = `Bearer ${bearerToken}`;
     }
+    return headers;
+  }
+  async request(input) {
+    const headers = this.authHeaders(input.path, "application/json", input.auth ?? "auto");
     const hasBody = input.body !== void 0;
     if (hasBody) {
       headers["Content-Type"] = "application/json";
@@ -94,6 +143,24 @@ class R5dctlClient {
     }
     return payload;
   }
+  async *events(sessionId, input = {}) {
+    const path = `/api/sessions/${encodeURIComponent(sessionId)}/events`;
+    const response = await this.fetchImpl(`${this.baseUrl}${path}`, {
+      method: "GET",
+      headers: this.authHeaders(path, "text/event-stream"),
+      signal: input.signal
+    });
+    if (!response.ok) {
+      const text = await response.text();
+      const payload = text.length > 0 ? safeJsonParse(text) : null;
+      const message = typeof payload === "object" && payload && "error" in payload && typeof payload.error === "string" ? payload.error : `Request failed (${response.status})`;
+      throw new R5dctlApiError(message, { status: response.status, path, body: payload });
+    }
+    if (!response.body) {
+      throw new R5dctlApiError("Session event stream returned no body", { status: response.status, path, body: null });
+    }
+    yield* parseSseStream(response.body);
+  }
   auth = {
     deviceStart: (input) => this.request({
       method: "POST",
@@ -270,41 +337,25 @@ class R5dctlClient {
         method: "POST",
         path: `/api/r5dctl/projects/${encodeURIComponent(projectRef)}/sessions`,
         body: input
-      })
-    },
-    agents: {
+      }),
       start: (projectRef, input) => this.request({
         method: "POST",
-        path: `/api/r5dctl/projects/${encodeURIComponent(projectRef)}/agents`,
+        path: `/api/r5dctl/projects/${encodeURIComponent(projectRef)}/sessions/start`,
         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({
-      method: "GET",
-      path: `/api/r5dctl/agents/${encodeURIComponent(sessionId)}`
-    }),
-    sendPrompt: (sessionId, input) => this.request({
-      method: "POST",
-      path: `/api/r5dctl/agents/${encodeURIComponent(sessionId)}/prompt`,
-      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
+      })
+    }
   };
   sessions = {
     recent: (input = {}) => this.request({
@@ -325,6 +376,11 @@ class R5dctlClient {
       method: "DELETE",
       path: `/api/r5dctl/sessions/${encodeURIComponent(sessionId)}`
     }),
+    status: (sessionId) => this.request({
+      method: "GET",
+      path: `/api/r5dctl/sessions/${encodeURIComponent(sessionId)}/status`
+    }),
+    events: (sessionId, input = {}) => this.events(sessionId, input),
     conversation: (sessionId, input = {}) => this.request({
       method: "GET",
       path: `/api/r5dctl/sessions/${encodeURIComponent(sessionId)}/conversation`,
@@ -354,6 +410,11 @@ class R5dctlClient {
       path: `/api/r5dctl/sessions/${encodeURIComponent(sessionId)}/prompt`,
       body: input
     }),
+    stop: (sessionId) => this.request({
+      method: "POST",
+      path: `/api/r5dctl/sessions/${encodeURIComponent(sessionId)}/stop`,
+      body: {}
+    }),
     answerQuestions: (sessionId, input) => this.request({
       method: "POST",
       path: `/api/r5dctl/sessions/${encodeURIComponent(sessionId)}/answer-questions`,

package/dist/mjs/package.json

@@ -1,5 +1,5 @@
 {
   "name": "@ricsam/r5d-api",
-  "version": "0.0.59",
+  "version": "0.0.61",
   "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 ChatMode = "ask" | "plan" | "build" | "agent" | "security_review" | "large_diff_remediation" | "merge_conflict_resolution";
+export type R5dctlSessionMode = "ask" | "plan" | "build" | "agent";
 export type ModelTier = "low" | "medium" | "high" | "max";
-export type R5dctlAgentType = "research" | "debug" | "test";
+export type R5dctlWorktreeSource = {
+    type: "worktree";
+    branchName: string;
+};
 export type R5dctlProject = {
     id: string;
     namespace: string;
@@ -65,6 +69,86 @@ export type R5dctlConversationResponse = {
     pendingQuestions: R5dctlPendingQuestion[];
     requestedEnvs: R5dctlRequestedEnv[];
 };
+export type R5dctlSessionEvent = {
+    type: "text_delta";
+    text: string;
+} | {
+    type: "thinking_delta";
+    text: string;
+} | {
+    type: "tool_use_start";
+    toolCallId: string;
+    toolName: string;
+} | {
+    type: "input_json_delta";
+    toolCallId: string;
+    partial_json: string;
+} | {
+    type: "stream_reset";
+    attempt: number;
+    maxAttempts: number;
+} | {
+    type: "tool_call";
+    data: unknown;
+} | {
+    type: "tool_progress";
+    toolCallId: string;
+    progress: unknown;
+} | {
+    type: "response";
+    data: {
+        node: unknown;
+        optimisticResponseId?: string;
+        conversationRevision: number;
+    };
+} | {
+    type: "session";
+    data: unknown;
+} | {
+    type: "status";
+    status: unknown;
+    statusVersion: number;
+} | {
+    type: "files_updated";
+    files: unknown[];
+} | {
+    type: "token_usage";
+    input: number;
+    output: number;
+    contextWindow?: number;
+} | {
+    type: "queue_updated";
+    queue: unknown;
+    queueVersion: unknown;
+} | {
+    type: "done";
+} | {
+    type: "stopped";
+} | {
+    type: "error";
+    message: string;
+} | {
+    type: "agent_running";
+    running: boolean;
+} | {
+    type: "context_continued";
+    sessionId: string;
+    target: unknown;
+    partNumber: number;
+} | {
+    type: "context_handoff_failed";
+    message: string;
+} | {
+    type: "shell_result";
+    stdout: string;
+    stderr: string;
+    exitCode: number;
+    fileChanges: unknown[];
+    cwd: string;
+} | {
+    type: string;
+    [key: string]: unknown;
+};
 export type R5dctlConversationWorkDetail = "compact" | "summary" | "full";
 export type R5dctlConversationWorkMetadata = {
     id: string;
@@ -94,54 +178,70 @@ export type R5dctlConversationWorkResponse = {
     detail: R5dctlConversationWorkDetail;
     workText: string;
 };
-export type R5dctlAgentStartResponse = {
-    sessionId: string;
-    branchName: string;
-    baseBranch: string;
-    baseCommit: string;
-    status: "running";
+export type R5dctlSessionRunStatus = "idle" | "provisioning" | "queued" | "running" | "completed" | "failed" | "stopped";
+export type R5dctlWorktreeMergeResponse = {
+    status: "merged" | "up_to_date" | "conflicts" | "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;
 };
-export type R5dctlAgentStatusResponse = {
+export type R5dctlMergeConflictMode = "none" | "worktree" | "agent";
+export type R5dctlSessionRunResponse = {
     sessionId: string;
     branchName: string;
-    baseBranch: string | null;
-    baseCommit: string | null;
-    status: "running" | "completed" | "failed";
-    startedAt: string;
+    baselineCommit: string | null;
+    workspaceHead: string | null;
+    worker: string;
+    status: R5dctlSessionRunStatus;
+    runStatus: R5dctlSessionRunStatus;
+    generation: number;
+    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;
 };
-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 R5dctlSessionStartResponse = R5dctlSessionRunResponse;
+export type R5dctlSessionStatusResponse = R5dctlSessionRunResponse;
+export type R5dctlSessionPromptResponse = R5dctlSessionRunResponse & {
+    promptDisposition: "queued" | "started";
 };
-export type R5dctlContinueMergeResult = {
-    type: "continue_merge";
-    status: "committed";
-    commitHash: string;
-    message: string;
+export type R5dctlSessionStopResponse = {
+    sessionId: string;
+    status: "stopped";
 };
-export type R5dctlAbortMergeResult = {
-    type: "abort_merge";
-    status: "aborted";
-    message: string;
+type R5dctlSessionStartBaseInput = {
+    worker: string;
+    model: ModelTier;
+    prompt: string;
+    requestId: string;
 };
+export type R5dctlSessionStartInput = R5dctlSessionStartBaseInput & ({
+    worktree: string;
+    newWorktree?: never;
+    source?: never;
+} | {
+    worktree?: never;
+    newWorktree: string;
+    source: R5dctlWorktreeSource;
+});
 export type DeviceAuthorizationStartResponse = {
     requestId: string;
     deviceCode: string;
@@ -256,7 +356,7 @@ export type R5dctlWorkspaceStatus = {
         desiredCanonicalHead: string | null;
         dirtyGeneration: number;
         publishedGeneration: number;
-        checkpointState: "idle" | "scheduled" | "preparing" | "submitting" | "blocked";
+        publicationState: "idle" | "scheduled" | "preparing" | "submitting" | "blocked";
         casRetries: number;
         lastNotifiedHead: string | null;
         lastNotifiedAt: string | null;
@@ -431,7 +531,9 @@ export declare class R5dctlClient {
     setToken(token?: string): void;
     setApiKey(apiKey?: string): void;
     private resolveBearerToken;
+    private authHeaders;
     private request;
+    private events;
     readonly auth: {
         deviceStart: (input: {
             deviceName: string;
@@ -534,30 +636,18 @@ export declare class R5dctlClient {
                 branch?: string;
             }) => Promise<R5dctlSessionSummary[]>;
             create: (projectRef: string, input: R5dctlSessionCreateInput) => Promise<R5dctlSessionDescription>;
+            start: (projectRef: string, input: R5dctlSessionStartInput) => Promise<R5dctlSessionRunResponse>;
         };
-        agents: {
-            start: (projectRef: string, input: {
-                sourceBranch: string;
-                agentType: R5dctlAgentType;
-                prompt: string;
-            }) => Promise<R5dctlAgentStartResponse>;
+        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>;
         };
-        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;
-        }) => Promise<R5dctlAgentStatusResponse>;
     };
     readonly sessions: {
         recent: (input?: {
@@ -568,6 +658,10 @@ export declare class R5dctlClient {
         delete: (sessionId: string) => Promise<{
             success: boolean;
         }>;
+        status: (sessionId: string) => Promise<R5dctlSessionRunResponse>;
+        events: (sessionId: string, input?: {
+            signal?: AbortSignal;
+        }) => AsyncGenerator<R5dctlSessionEvent, any, any>;
         conversation: (sessionId: string, input?: R5dctlConversationRenderOptions) => Promise<R5dctlConversationResponse>;
         conversationOverview: (sessionId: string) => Promise<R5dctlConversationOverviewResponse>;
         inspectConversationNode: (sessionId: string, nodeId: string) => Promise<R5dctlConversationNodeResponse>;
@@ -575,16 +669,28 @@ export declare class R5dctlClient {
             detail?: R5dctlConversationWorkDetail;
         }) => Promise<R5dctlConversationWorkResponse>;
         prompt: (sessionId: string, input: {
-            message: string;
-            mode: ChatMode;
+            prompt: string;
+            worker: string;
+            mode: R5dctlSessionMode;
             model: ModelTier;
-        }) => Promise<R5dctlConversationResponse>;
+            requestId: string;
+        }) => Promise<R5dctlSessionPromptResponse>;
+        stop: (sessionId: string) => Promise<R5dctlSessionStopResponse>;
         answerQuestions: (sessionId: string, input: {
             answers: string[];
-        }) => Promise<R5dctlConversationResponse>;
+            worker: string;
+            mode: ChatMode;
+            model: ModelTier;
+            requestId: string;
+        }) => Promise<R5dctlSessionPromptResponse>;
         answerEnvRequest: (sessionId: string, input: {
             envs?: string[];
             additionalContext?: string;
-        }) => Promise<R5dctlConversationResponse>;
+            worker: string;
+            mode: ChatMode;
+            model: ModelTier;
+            requestId: string;
+        }) => Promise<R5dctlSessionPromptResponse>;
     };
 }
+export {};

package/package.json

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