@co0ontty/wand 1.7.0 → 1.10.0
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/git-worktree.d.ts +17 -1
- package/dist/git-worktree.js +244 -0
- package/dist/resume-policy.d.ts +0 -77
- package/dist/resume-policy.js +0 -162
- package/dist/server-session-routes.js +153 -0
- package/dist/server.js +27 -1
- package/dist/storage.d.ts +1 -0
- package/dist/storage.js +205 -141
- package/dist/types.d.ts +34 -0
- package/dist/web-ui/content/scripts.js +850 -174
- package/dist/web-ui/content/styles.css +854 -144
- package/dist/web-ui/scripts.js +3 -6
- package/package.json +1 -1
package/dist/types.d.ts
CHANGED
|
@@ -69,6 +69,38 @@ interface WorktreeInfo {
|
|
|
69
69
|
branch: string;
|
|
70
70
|
path: string;
|
|
71
71
|
}
|
|
72
|
+
export interface WorktreeMergeInfo {
|
|
73
|
+
targetBranch?: string;
|
|
74
|
+
mergedAt?: string;
|
|
75
|
+
mergeCommit?: string;
|
|
76
|
+
cleanupDone?: boolean;
|
|
77
|
+
lastError?: string;
|
|
78
|
+
conflict?: boolean;
|
|
79
|
+
}
|
|
80
|
+
export interface WorktreeMergeCheckResult {
|
|
81
|
+
ok: boolean;
|
|
82
|
+
sourceBranch: string;
|
|
83
|
+
targetBranch: string;
|
|
84
|
+
worktreePath: string;
|
|
85
|
+
repoRoot: string;
|
|
86
|
+
hasUncommittedChanges: boolean;
|
|
87
|
+
aheadCount: number;
|
|
88
|
+
hasConflicts: boolean;
|
|
89
|
+
recommendedAction: "merge" | "noop" | "resolve-conflict";
|
|
90
|
+
reason?: string;
|
|
91
|
+
}
|
|
92
|
+
export interface WorktreeMergeResult {
|
|
93
|
+
ok: boolean;
|
|
94
|
+
sourceBranch: string;
|
|
95
|
+
targetBranch: string;
|
|
96
|
+
repoRoot: string;
|
|
97
|
+
mergeCommit?: string;
|
|
98
|
+
mergedAt?: string;
|
|
99
|
+
cleanupDone: boolean;
|
|
100
|
+
conflict: boolean;
|
|
101
|
+
errorCode?: string;
|
|
102
|
+
reason?: string;
|
|
103
|
+
}
|
|
72
104
|
export interface CommandRequest {
|
|
73
105
|
command: string;
|
|
74
106
|
provider?: SessionProvider;
|
|
@@ -167,6 +199,8 @@ export interface SessionSnapshot {
|
|
|
167
199
|
mode: ExecutionMode;
|
|
168
200
|
worktreeEnabled?: boolean;
|
|
169
201
|
worktree?: WorktreeInfo | null;
|
|
202
|
+
worktreeMergeStatus?: "ready" | "checking" | "merging" | "merged" | "failed";
|
|
203
|
+
worktreeMergeInfo?: WorktreeMergeInfo | null;
|
|
170
204
|
autonomyPolicy?: AutonomyPolicy;
|
|
171
205
|
approvalPolicy?: ApprovalPolicy;
|
|
172
206
|
allowedScopes?: EscalationScope[];
|