@ricsam/r5dctl 0.0.60 → 0.0.61

package/dist/mjs/package.json

@@ -1,5 +1,5 @@
 {
   "name": "@ricsam/r5dctl",
-  "version": "0.0.60",
+  "version": "0.0.61",
   "type": "module"
 }

package/dist/types/cli.d.ts

@@ -1,4 +1,4 @@
-import { R5dctlClient, type R5dctlConversationRenderOptions, type R5dctlConversationResponse, type R5dctlConversationNodeResponse, type R5dctlConversationOverviewResponse, type R5dctlConversationWorkDetail, type R5dctlConversationWorkResponse, type R5dctlEnvData, type R5dctlK8sResourceHistory, type R5dctlK8sUsage, type R5dctlK8sWorkload, type R5dctlProcessInspection, type R5dctlProcessListInput, type R5dctlProcessRun, type R5dctlWorkspaceStatus, type R5dctlWorkspaceSyncResult, type R5dctlAgentSource, type R5dctlAgentType, type ChatMode, type ModelTier } from "@ricsam/r5d-api";
+import { R5dctlClient, type R5dctlConversationRenderOptions, type R5dctlConversationResponse, type R5dctlConversationNodeResponse, type R5dctlConversationOverviewResponse, type R5dctlConversationWorkDetail, type R5dctlConversationWorkResponse, type R5dctlEnvData, type R5dctlK8sResourceHistory, type R5dctlK8sUsage, type R5dctlK8sWorkload, type R5dctlProcessInspection, type R5dctlProcessListInput, type R5dctlProcessRun, type R5dctlSessionEvent, type R5dctlSessionStartInput, type R5dctlWorkspaceStatus, type R5dctlWorkspaceSyncResult, type R5dctlWorktreeSource, type R5dctlMergeConflictMode, type R5dctlSessionMode, type ChatMode, type ModelTier } from "@ricsam/r5d-api";
 export type GlobalOptions = {
     baseUrl?: string;
     json: boolean;
@@ -30,23 +30,42 @@ type CommandExecutionPlan = {
     kind: "shell";
     command?: string;
 } | {
-    kind: "agent";
-    command: R5dctlBranchAgentCommand;
+    kind: "session-run";
+    command: R5dctlSessionRunCommand;
+} | {
+    kind: "merge";
+    command: R5dctlMergeCommand;
+} | {
+    kind: "conversation-follow";
+    sessionId: string;
+    renderOptions: ConversationRenderOptions;
 } | {
     kind: "cli-help";
     text: string;
 };
-type ConversationRenderOptions = Required<R5dctlConversationRenderOptions>;
+type ConversationRenderOptions = Required<R5dctlConversationRenderOptions> & {
+    follow: boolean;
+};
 export declare function getCliHelpText(): string;
 export declare function getR5dctlVersion(): string;
-export type R5dctlBranchAgentCommand = {
+type R5dctlSessionStartCommand = {
     kind: "start";
     project: string;
     worker: string;
-    source: R5dctlAgentSource;
-    agentType: R5dctlAgentType;
+    model: ModelTier;
     prompt: string;
+    follow: boolean;
+    includeTools: boolean;
+} & ({
+    worktree: string;
+    newWorktree?: never;
+    source?: never;
 } | {
+    worktree?: never;
+    newWorktree: string;
+    source: R5dctlWorktreeSource;
+});
+export type R5dctlSessionRunCommand = R5dctlSessionStartCommand | {
     kind: "status";
     sessionId: string;
 } | {
@@ -54,26 +73,41 @@ export type R5dctlBranchAgentCommand = {
     worker: string;
     sessionId: string;
     prompt: string;
-} | {
-    kind: "merge";
-    worker: string;
-    sessionId: string;
+    mode: R5dctlSessionMode;
+    model: ModelTier;
 } | {
     kind: "stop";
     sessionId: string;
+};
+export type R5dctlMergeCommand = {
+    kind: "merge";
+    project: string;
+    sourceWorktree: string;
+    worker?: string;
+    conflictMode: R5dctlMergeConflictMode;
 } | {
-    kind: "finish-merge";
+    kind: "finish";
+    project: string;
+    conflictWorktree: string;
     worker: string;
-    resolverSessionId: string;
-    summary: string;
+    summary?: string;
 };
-export declare function parseBranchAgentCommand(options: Pick<GlobalOptions, "project" | "branch" | "session">, args: string[]): R5dctlBranchAgentCommand;
+export declare function parseSessionRunCommand(options: Pick<GlobalOptions, "project" | "branch" | "session">, args: string[]): R5dctlSessionRunCommand;
+export declare function parseMergeCommand(options: Pick<GlobalOptions, "project" | "branch" | "session">, args: string[]): R5dctlMergeCommand;
 export declare function parseGlobalArgs(argv: string[]): {
     options: GlobalOptions;
     rest: string[];
 };
 export declare function writeConfig(configPath: string, config: R5dctlConfig): void;
 export declare function parseAnswerFlags(args: string[]): string[];
+type InteractiveExecutionContext = {
+    worker: string;
+    mode: ChatMode;
+    model: ModelTier;
+};
+export declare function parseAnswerQuestionsCommandArgs(args: string[]): InteractiveExecutionContext & {
+    answers: string[];
+};
 export type SetEnvOptions = {
     assignments: string[];
     fromEnvFile?: string;
@@ -88,6 +122,10 @@ export declare function parseEnvRequestResponseArgs(args: string[]): {
     envs?: string[];
     additionalContext?: string;
 };
+export declare function parseAnswerEnvRequestCommandArgs(args: string[]): InteractiveExecutionContext & {
+    envs?: string[];
+    additionalContext?: string;
+};
 export declare function parsePromptArgs(args: string[]): {
     mode: ChatMode;
     model: ModelTier;
@@ -166,11 +204,10 @@ export declare function parseGetEnvsArgs(args: string[]): {
 };
 export declare function renderEnvValues(data: R5dctlEnvData): string;
 export declare function getProjectEnvValue(data: R5dctlEnvData, name: string): string;
-export type R5dctlBranchAgentResponse = {
+export type R5dctlCommandResponse = {
     sessionId?: string;
     sessionUrl?: string;
     branchName?: string;
-    source?: R5dctlAgentSource;
     baselineCommit?: string | null;
     workspaceHead?: string | null;
     worker?: string;
@@ -182,56 +219,85 @@ export type R5dctlBranchAgentResponse = {
     error?: string;
     summary?: string;
     diffSummary?: string;
-    merge?: unknown;
     attemptId?: string;
-    sourceBranch?: string;
-    targetBranch?: string;
+    sourceWorktree?: string;
+    targetWorktree?: string;
     commitHash?: string;
     resolverSessionId?: string;
-    resolverBranch?: string;
+    conflictWorktree?: string;
     folderPath?: string;
     conflictedFiles?: string[];
     failureReason?: string;
     message?: string;
 };
-export type R5dctlBranchAgentClient = {
+export type R5dctlSessionRunClient = {
     projects: {
-        agents: {
-            start: (projectRef: string, input: {
-                source: R5dctlAgentSource;
-                agentType: R5dctlAgentType;
-                prompt: string;
-                worker: string;
-                requestId: string;
-            }) => Promise<R5dctlBranchAgentResponse>;
+        sessions: {
+            start: (projectRef: string, input: R5dctlSessionStartInput) => Promise<R5dctlCommandResponse>;
         };
     };
-    agents: {
-        status: (sessionId: string) => Promise<R5dctlBranchAgentResponse>;
-        sendPrompt: (sessionId: string, input: {
+    sessions: {
+        status: (sessionId: string) => Promise<R5dctlCommandResponse>;
+        prompt: (sessionId: string, input: {
             prompt: string;
             worker: string;
-        }) => Promise<R5dctlBranchAgentResponse>;
-        merge: (sessionId: string, input: {
-            worker: string;
-        }) => Promise<R5dctlBranchAgentResponse>;
-        stop: (sessionId: string) => Promise<R5dctlBranchAgentResponse>;
-        finishMerge: (resolverSessionId: string, input: {
-            worker: string;
-            summary: string;
-        }) => Promise<R5dctlBranchAgentResponse>;
+            mode: R5dctlSessionMode;
+            model: ModelTier;
+            requestId: string;
+        }) => Promise<R5dctlCommandResponse>;
+        stop: (sessionId: string) => Promise<R5dctlCommandResponse>;
+    };
+};
+export type R5dctlMergeClient = {
+    projects: {
+        worktrees: {
+            merge: (projectRef: string, sourceWorktree: string, input: {
+                worker?: string;
+                conflictMode: R5dctlMergeConflictMode;
+            }) => Promise<R5dctlCommandResponse>;
+            finishMerge: (projectRef: string, conflictWorktree: string, input: {
+                worker: string;
+                summary?: string;
+            }) => Promise<R5dctlCommandResponse>;
+        };
     };
 };
-export declare function renderBranchAgentStart(agent: R5dctlBranchAgentResponse): string;
-export declare function renderBranchAgentStatus(agent: R5dctlBranchAgentResponse): string;
-export declare function renderBranchAgentMerge(result: R5dctlBranchAgentResponse): string;
-export type R5dctlBranchAgentDispatchResult = {
-    data: R5dctlBranchAgentResponse;
+export declare function renderSessionRunStart(session: R5dctlCommandResponse): string;
+export declare function renderSessionRunStatus(session: R5dctlCommandResponse): string;
+export declare function renderWorktreeMerge(result: R5dctlCommandResponse, input: {
+    project: string;
+    worker?: string;
+}): string;
+export type R5dctlCommandDispatchResult = {
+    data: R5dctlCommandResponse;
     human: string;
 };
-export declare function dispatchBranchAgentCommand(client: R5dctlBranchAgentClient, command: R5dctlBranchAgentCommand): Promise<R5dctlBranchAgentDispatchResult>;
+export declare function dispatchSessionRunCommand(client: R5dctlSessionRunClient, command: R5dctlSessionRunCommand): Promise<R5dctlCommandDispatchResult>;
+export declare function dispatchMergeCommand(client: R5dctlMergeClient, command: R5dctlMergeCommand): Promise<R5dctlCommandDispatchResult>;
 export declare function parseConversationRenderArgs(args: string[]): ConversationRenderOptions;
 export declare function renderConversationResponse(read: R5dctlConversationResponse): string;
+type R5dctlFollowClient = {
+    sessions: {
+        conversation: (sessionId: string, input?: R5dctlConversationRenderOptions) => Promise<R5dctlConversationResponse>;
+        status: (sessionId: string) => Promise<R5dctlCommandResponse>;
+        events: (sessionId: string, input?: {
+            signal?: AbortSignal;
+        }) => AsyncIterable<R5dctlSessionEvent>;
+    };
+};
+export type R5dctlFollowOptions = {
+    json: boolean;
+    includeTools: boolean;
+    renderOptions?: R5dctlConversationRenderOptions;
+    initialConversation?: R5dctlConversationResponse;
+    printInitialTranscript?: boolean;
+    signal?: AbortSignal;
+    stdout?: (text: string) => void;
+    stderr?: (text: string) => void;
+    reconnectDelayMs?: number;
+    maxReconnects?: number;
+};
+export declare function followR5dctlSession(client: R5dctlFollowClient, sessionId: string, options: R5dctlFollowOptions): Promise<number>;
 export declare function parseConversationWorkDetailArgs(args: string[]): R5dctlConversationWorkDetail;
 export declare function renderConversationOverviewResponse(read: R5dctlConversationOverviewResponse): string;
 export declare function renderConversationNodeResponse(read: R5dctlConversationNodeResponse): string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ricsam/r5dctl",
-  "version": "0.0.60",
+  "version": "0.0.61",
   "type": "module",
   "main": "./dist/cjs/cli.cjs",
   "module": "./dist/mjs/cli.mjs",
@@ -26,7 +26,7 @@
     "r5dctl": "dist/cjs/main.cjs"
   },
   "dependencies": {
-    "@ricsam/r5d-api": "^0.0.60",
+    "@ricsam/r5d-api": "^0.0.61",
     "dotenv": "^17",
     "qrcode": "^1.5.4",
     "ws": "^8.18.3"