@ricsam/r5d-api 0.0.72 → 0.0.73
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/cjs/index.cjs +4 -0
- package/dist/cjs/package.json +1 -1
- package/dist/mjs/index.mjs +4 -0
- package/dist/mjs/package.json +1 -1
- package/dist/types/index.d.ts +6 -3
- package/package.json +1 -1
package/dist/cjs/index.cjs
CHANGED
|
@@ -378,6 +378,10 @@ class R5dctlClient {
|
|
|
378
378
|
method: "POST",
|
|
379
379
|
path: `/api/r5dctl/projects/${encodeURIComponent(projectRef)}/worktrees/${encodeURIComponent(conflictWorktree)}/merge/finish`,
|
|
380
380
|
body: input
|
|
381
|
+
}),
|
|
382
|
+
mergeAttempt: (projectRef, attemptId) => this.request({
|
|
383
|
+
method: "GET",
|
|
384
|
+
path: `/api/r5dctl/projects/${encodeURIComponent(projectRef)}/merge-attempts/${encodeURIComponent(attemptId)}`
|
|
381
385
|
})
|
|
382
386
|
}
|
|
383
387
|
};
|
package/dist/cjs/package.json
CHANGED
package/dist/mjs/index.mjs
CHANGED
|
@@ -354,6 +354,10 @@ class R5dctlClient {
|
|
|
354
354
|
method: "POST",
|
|
355
355
|
path: `/api/r5dctl/projects/${encodeURIComponent(projectRef)}/worktrees/${encodeURIComponent(conflictWorktree)}/merge/finish`,
|
|
356
356
|
body: input
|
|
357
|
+
}),
|
|
358
|
+
mergeAttempt: (projectRef, attemptId) => this.request({
|
|
359
|
+
method: "GET",
|
|
360
|
+
path: `/api/r5dctl/projects/${encodeURIComponent(projectRef)}/merge-attempts/${encodeURIComponent(attemptId)}`
|
|
357
361
|
})
|
|
358
362
|
}
|
|
359
363
|
};
|
package/dist/mjs/package.json
CHANGED
package/dist/types/index.d.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
export type ChatMode = "ask" | "plan" | "
|
|
2
|
-
export type R5dctlSessionMode = "ask" | "plan" | "
|
|
1
|
+
export type ChatMode = "ask" | "plan" | "agent" | "large_diff_remediation" | "merge_conflict_resolution";
|
|
2
|
+
export type R5dctlSessionMode = "ask" | "plan" | "agent";
|
|
3
3
|
export type ModelTier = "low" | "medium" | "high" | "max";
|
|
4
4
|
export type R5dctlWorktreeSource = {
|
|
5
5
|
type: "worktree";
|
|
@@ -200,7 +200,7 @@ export type R5dctlConversationForkResponse = {
|
|
|
200
200
|
};
|
|
201
201
|
export type R5dctlSessionRunStatus = "idle" | "provisioning" | "queued" | "running" | "completed" | "failed" | "stopped";
|
|
202
202
|
export type R5dctlWorktreeMergeResponse = {
|
|
203
|
-
status: "merged" | "up_to_date" | "conflicts" | "conflict_worktree_created" | "resolving" | "failed" | "stale";
|
|
203
|
+
status: "merged" | "up_to_date" | "conflicts" | "provisioning" | "conflict_worktree_created" | "resolving" | "failed" | "stale";
|
|
204
204
|
attemptId?: string;
|
|
205
205
|
sourceWorktree: string;
|
|
206
206
|
targetWorktree: string;
|
|
@@ -212,6 +212,8 @@ export type R5dctlWorktreeMergeResponse = {
|
|
|
212
212
|
conflictedFiles?: string[];
|
|
213
213
|
failureReason?: string;
|
|
214
214
|
message?: string;
|
|
215
|
+
worktreeReady?: boolean;
|
|
216
|
+
resolverAgentRunning?: boolean;
|
|
215
217
|
};
|
|
216
218
|
export type R5dctlMergeConflictMode = "none" | "worktree" | "agent";
|
|
217
219
|
export type R5dctlSessionRunResponse = {
|
|
@@ -667,6 +669,7 @@ export declare class R5dctlClient {
|
|
|
667
669
|
worker: string;
|
|
668
670
|
summary?: string;
|
|
669
671
|
}) => Promise<R5dctlWorktreeMergeResponse>;
|
|
672
|
+
mergeAttempt: (projectRef: string, attemptId: string) => Promise<R5dctlWorktreeMergeResponse>;
|
|
670
673
|
};
|
|
671
674
|
};
|
|
672
675
|
readonly sessions: {
|