@ricsam/r5d-api 0.0.71 → 0.0.73

package/README.md

@@ -66,9 +66,9 @@ Trusted server-side callers that authenticate through custom headers, such as a
 - `sessions.delete(sessionId)`
 - `sessions.conversation(sessionId)`
 - `sessions.events(sessionId, { signal? })`
-- `sessions.conversationOverview(sessionId)`
+- `sessions.conversationOverview(sessionId, { view? })`
 - `sessions.inspectConversationNode(sessionId, nodeId)`
-- `sessions.inspectConversationWork(sessionId, workId, { detail? })`
+- `sessions.inspectConversationWork(sessionId, workId, { detail?, calls?, polls? })`
 - `sessions.status(sessionId)`
 - `sessions.prompt(sessionId, { prompt, worker, mode, model, requestId })`
 - `sessions.stop(sessionId)`

package/dist/cjs/index.cjs

@@ -378,6 +378,10 @@ class R5dctlClient {
         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)}`
       })
     }
   };
@@ -414,9 +418,12 @@ class R5dctlClient {
         system: input.includeSystem === void 0 ? void 0 : input.includeSystem ? "include" : "exclude"
       }
     }),
-    conversationOverview: (sessionId) => this.request({
+    conversationOverview: (sessionId, input = {}) => this.request({
       method: "GET",
-      path: `/api/r5dctl/sessions/${encodeURIComponent(sessionId)}/conversation/overview`
+      path: `/api/r5dctl/sessions/${encodeURIComponent(sessionId)}/conversation/overview`,
+      query: {
+        view: input.view
+      }
     }),
     inspectConversationNode: (sessionId, nodeId) => this.request({
       method: "GET",
@@ -426,7 +433,9 @@ class R5dctlClient {
       method: "GET",
       path: `/api/r5dctl/sessions/${encodeURIComponent(sessionId)}/conversation/work/${encodeURIComponent(workId)}`,
       query: {
-        detail: input.detail
+        detail: input.detail,
+        calls: input.calls,
+        polls: input.polls
       }
     }),
     moveConversationHead: (sessionId, nodeId) => this.request({

package/dist/cjs/package.json

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

package/dist/mjs/index.mjs

@@ -354,6 +354,10 @@ class R5dctlClient {
         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)}`
       })
     }
   };
@@ -390,9 +394,12 @@ class R5dctlClient {
         system: input.includeSystem === void 0 ? void 0 : input.includeSystem ? "include" : "exclude"
       }
     }),
-    conversationOverview: (sessionId) => this.request({
+    conversationOverview: (sessionId, input = {}) => this.request({
       method: "GET",
-      path: `/api/r5dctl/sessions/${encodeURIComponent(sessionId)}/conversation/overview`
+      path: `/api/r5dctl/sessions/${encodeURIComponent(sessionId)}/conversation/overview`,
+      query: {
+        view: input.view
+      }
     }),
     inspectConversationNode: (sessionId, nodeId) => this.request({
       method: "GET",
@@ -402,7 +409,9 @@ class R5dctlClient {
       method: "GET",
       path: `/api/r5dctl/sessions/${encodeURIComponent(sessionId)}/conversation/work/${encodeURIComponent(workId)}`,
       query: {
-        detail: input.detail
+        detail: input.detail,
+        calls: input.calls,
+        polls: input.polls
       }
     }),
     moveConversationHead: (sessionId, nodeId) => this.request({

package/dist/mjs/package.json

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

package/dist/types/index.d.ts

@@ -1,5 +1,5 @@
-export type ChatMode = "ask" | "plan" | "build" | "agent" | "security_review" | "large_diff_remediation" | "merge_conflict_resolution";
-export type R5dctlSessionMode = "ask" | "plan" | "build" | "agent";
+export type ChatMode = "ask" | "plan" | "agent" | "large_diff_remediation" | "merge_conflict_resolution";
+export type R5dctlSessionMode = "ask" | "plan" | "agent";
 export type ModelTier = "low" | "medium" | "high" | "max";
 export type R5dctlWorktreeSource = {
     type: "worktree";
@@ -145,14 +145,24 @@ export type R5dctlSessionEvent = {
     [key: string]: unknown;
 };
 export type R5dctlConversationWorkDetail = "compact" | "summary" | "full";
+export type R5dctlConversationOverviewView = "standard" | "skeleton";
+export type R5dctlConversationWorkPolls = "fold" | "include";
 export type R5dctlConversationWorkMetadata = {
     id: string;
     callCount: number;
     thinkingCount: number;
 };
+export type R5dctlConversationTurnInProgress = {
+    state: "pending_user_message" | "pending_tools" | "pending_tool_results";
+    pendingCallCount: number;
+    lastNodeTimestamp: string;
+    lastNodeId: string;
+};
 export type R5dctlConversationOverviewResponse = {
     session: R5dctlSessionDescription;
     overviewText: string;
+    view?: R5dctlConversationOverviewView;
+    turnInProgress?: R5dctlConversationTurnInProgress | null;
     works: R5dctlConversationWorkMetadata[];
     pendingQuestions: R5dctlPendingQuestion[];
     requestedEnvs: R5dctlRequestedEnv[];
@@ -171,6 +181,10 @@ export type R5dctlConversationWorkResponse = {
     session: R5dctlSessionDescription;
     work: R5dctlConversationWorkMetadata;
     detail: R5dctlConversationWorkDetail;
+    calls?: {
+        first: number;
+        last: number;
+    };
     workText: string;
 };
 export type R5dctlConversationHeadResponse = {
@@ -186,7 +200,7 @@ export type R5dctlConversationForkResponse = {
 };
 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";
+    status: "merged" | "up_to_date" | "conflicts" | "provisioning" | "conflict_worktree_created" | "resolving" | "failed" | "stale";
     attemptId?: string;
     sourceWorktree: string;
     targetWorktree: string;
@@ -198,6 +212,8 @@ export type R5dctlWorktreeMergeResponse = {
     conflictedFiles?: string[];
     failureReason?: string;
     message?: string;
+    worktreeReady?: boolean;
+    resolverAgentRunning?: boolean;
 };
 export type R5dctlMergeConflictMode = "none" | "worktree" | "agent";
 export type R5dctlSessionRunResponse = {
@@ -653,6 +669,7 @@ export declare class R5dctlClient {
                 worker: string;
                 summary?: string;
             }) => Promise<R5dctlWorktreeMergeResponse>;
+            mergeAttempt: (projectRef: string, attemptId: string) => Promise<R5dctlWorktreeMergeResponse>;
         };
     };
     readonly sessions: {
@@ -669,10 +686,14 @@ export declare class R5dctlClient {
             signal?: AbortSignal;
         }) => AsyncGenerator<R5dctlSessionEvent, any, any>;
         conversation: (sessionId: string, input?: R5dctlConversationRenderOptions) => Promise<R5dctlConversationResponse>;
-        conversationOverview: (sessionId: string) => Promise<R5dctlConversationOverviewResponse>;
+        conversationOverview: (sessionId: string, input?: {
+            view?: R5dctlConversationOverviewView;
+        }) => Promise<R5dctlConversationOverviewResponse>;
         inspectConversationNode: (sessionId: string, nodeId: string) => Promise<R5dctlConversationNodeResponse>;
         inspectConversationWork: (sessionId: string, workId: string, input?: {
             detail?: R5dctlConversationWorkDetail;
+            calls?: string;
+            polls?: R5dctlConversationWorkPolls;
         }) => Promise<R5dctlConversationWorkResponse>;
         moveConversationHead: (sessionId: string, nodeId: string) => Promise<R5dctlConversationHeadResponse>;
         forkConversation: (sessionId: string, nodeId: string, input?: {

package/package.json

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