@junctionpanel/server 0.1.76 → 0.1.78
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/server/client/daemon-client-terminal-stream-manager.d.ts +1 -0
- package/dist/server/client/daemon-client-terminal-stream-manager.d.ts.map +1 -1
- package/dist/server/client/daemon-client-terminal-stream-manager.js +20 -5
- package/dist/server/client/daemon-client-terminal-stream-manager.js.map +1 -1
- package/dist/server/client/daemon-client.d.ts.map +1 -1
- package/dist/server/client/daemon-client.js +44 -33
- package/dist/server/client/daemon-client.js.map +1 -1
- package/dist/server/server/agent/providers/gemini-agent.d.ts.map +1 -1
- package/dist/server/server/agent/providers/gemini-agent.js +272 -56
- package/dist/server/server/agent/providers/gemini-agent.js.map +1 -1
- package/dist/server/server/agent/timeline-projection.d.ts.map +1 -1
- package/dist/server/server/agent/timeline-projection.js +68 -52
- package/dist/server/server/agent/timeline-projection.js.map +1 -1
- package/dist/server/server/session.d.ts +0 -2
- package/dist/server/server/session.d.ts.map +1 -1
- package/dist/server/server/session.js +157 -33
- package/dist/server/server/session.js.map +1 -1
- package/dist/server/utils/checkout-git.d.ts +8 -5
- package/dist/server/utils/checkout-git.d.ts.map +1 -1
- package/dist/server/utils/checkout-git.js +91 -37
- package/dist/server/utils/checkout-git.js.map +1 -1
- package/package.json +2 -2
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session.d.ts","sourceRoot":"","sources":["../../../src/server/session.ts"],"names":[],"mappings":"AAQA,OAAO,EAGL,KAAK,qBAAqB,EAC1B,KAAK,sBAAsB,EA0B5B,MAAM,eAAe,CAAA;AACtB,OAAO,KAAK,EAAE,eAAe,EAAyB,MAAM,iCAAiC,CAAA;AAE7F,OAAO,EAIL,KAAK,cAAc,EACpB,MAAM,yBAAyB,CAAA;AAQhC,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,+CAA+C,CAAA;AAE9E,MAAM,MAAM,wBAAwB,GAAG,MAAM,OAAO,CAAC,SAAS,CAAC,CAAA;AAE/D,OAAO,EAEL,KAAK,+BAA+B,EACrC,MAAM,mCAAmC,CAAA;AAC1C,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAA;AAkDvD,OAAO,EAAE,YAAY,EAA0B,MAAM,0BAA0B,CAAA;AAQ/E,OAAO,EAAE,kBAAkB,EAAE,MAAM,gCAAgC,CAAA;AACnE,OAAO,KAAK,EACV,4BAA4B,EAC5B,sBAAsB,EACvB,MAAM,uBAAuB,CAAA;AAkD9B,OAAO,KAAK,IAAI,MAAM,MAAM,CAAA;
|
|
1
|
+
{"version":3,"file":"session.d.ts","sourceRoot":"","sources":["../../../src/server/session.ts"],"names":[],"mappings":"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"}
|
|
@@ -112,6 +112,143 @@ function cloneSessionError(error) {
|
|
|
112
112
|
function normalizeSessionError(error) {
|
|
113
113
|
return error instanceof Error ? error : new Error(String(error));
|
|
114
114
|
}
|
|
115
|
+
function areCheckoutErrorsEqual(left, right) {
|
|
116
|
+
return (left?.code ?? null) === (right?.code ?? null)
|
|
117
|
+
&& (left?.message ?? null) === (right?.message ?? null);
|
|
118
|
+
}
|
|
119
|
+
function areWorkspaceGitSnapshotsEqual(left, right) {
|
|
120
|
+
if (left.isGit !== right.isGit) {
|
|
121
|
+
return false;
|
|
122
|
+
}
|
|
123
|
+
if (!left.isGit || !right.isGit) {
|
|
124
|
+
return true;
|
|
125
|
+
}
|
|
126
|
+
return (left.currentBranch === right.currentBranch
|
|
127
|
+
&& left.repoRoot === right.repoRoot
|
|
128
|
+
&& left.isDirty === right.isDirty
|
|
129
|
+
&& left.baseRef === right.baseRef
|
|
130
|
+
&& (left.aheadBehind?.ahead ?? null) === (right.aheadBehind?.ahead ?? null)
|
|
131
|
+
&& (left.aheadBehind?.behind ?? null) === (right.aheadBehind?.behind ?? null)
|
|
132
|
+
&& left.aheadOfOrigin === right.aheadOfOrigin
|
|
133
|
+
&& left.behindOfOrigin === right.behindOfOrigin
|
|
134
|
+
&& left.hasUpstream === right.hasUpstream
|
|
135
|
+
&& left.upstreamBranch === right.upstreamBranch
|
|
136
|
+
&& left.hasRemote === right.hasRemote
|
|
137
|
+
&& left.remoteUrl === right.remoteUrl
|
|
138
|
+
&& left.isJunctionOwnedWorktree === right.isJunctionOwnedWorktree
|
|
139
|
+
&& (left.isJunctionOwnedWorktree ? left.mainRepoRoot : null)
|
|
140
|
+
=== (right.isJunctionOwnedWorktree ? right.mainRepoRoot : null));
|
|
141
|
+
}
|
|
142
|
+
function areWorkspacePullRequestsEqual(left, right) {
|
|
143
|
+
if (!left || !right) {
|
|
144
|
+
return left === right;
|
|
145
|
+
}
|
|
146
|
+
return (left.number === right.number
|
|
147
|
+
&& left.url === right.url
|
|
148
|
+
&& left.title === right.title
|
|
149
|
+
&& left.state === right.state
|
|
150
|
+
&& left.baseRefName === right.baseRefName
|
|
151
|
+
&& left.headRefName === right.headRefName
|
|
152
|
+
&& left.isMerged === right.isMerged
|
|
153
|
+
&& left.detailLevel === right.detailLevel
|
|
154
|
+
&& left.checksState === right.checksState
|
|
155
|
+
&& left.requiredChecksPassed === right.requiredChecksPassed
|
|
156
|
+
&& left.canMerge === right.canMerge
|
|
157
|
+
&& left.hasConflicts === right.hasConflicts);
|
|
158
|
+
}
|
|
159
|
+
function areWorkspaceStatusSnapshotsEqual(left, right) {
|
|
160
|
+
if (!left) {
|
|
161
|
+
return false;
|
|
162
|
+
}
|
|
163
|
+
return (left.cwd === right.cwd
|
|
164
|
+
&& (left.remoteName ?? null) === (right.remoteName ?? null)
|
|
165
|
+
&& areWorkspaceGitSnapshotsEqual(left.git, right.git)
|
|
166
|
+
&& areCheckoutErrorsEqual(left.gitError, right.gitError)
|
|
167
|
+
&& areWorkspacePullRequestsEqual(left.pullRequest, right.pullRequest)
|
|
168
|
+
&& areCheckoutErrorsEqual(left.pullRequestError, right.pullRequestError)
|
|
169
|
+
&& left.githubFeaturesEnabled === right.githubFeaturesEnabled);
|
|
170
|
+
}
|
|
171
|
+
function areCheckoutDiffLinesEqual(left, right) {
|
|
172
|
+
if (left.length !== right.length) {
|
|
173
|
+
return false;
|
|
174
|
+
}
|
|
175
|
+
for (let index = 0; index < left.length; index += 1) {
|
|
176
|
+
const leftLine = left[index];
|
|
177
|
+
const rightLine = right[index];
|
|
178
|
+
if (!leftLine || !rightLine) {
|
|
179
|
+
return false;
|
|
180
|
+
}
|
|
181
|
+
if (leftLine.type !== rightLine.type || leftLine.content !== rightLine.content) {
|
|
182
|
+
return false;
|
|
183
|
+
}
|
|
184
|
+
const leftTokens = leftLine.tokens ?? [];
|
|
185
|
+
const rightTokens = rightLine.tokens ?? [];
|
|
186
|
+
if (leftTokens.length !== rightTokens.length) {
|
|
187
|
+
return false;
|
|
188
|
+
}
|
|
189
|
+
for (let tokenIndex = 0; tokenIndex < leftTokens.length; tokenIndex += 1) {
|
|
190
|
+
const leftToken = leftTokens[tokenIndex];
|
|
191
|
+
const rightToken = rightTokens[tokenIndex];
|
|
192
|
+
if (!leftToken || !rightToken) {
|
|
193
|
+
return false;
|
|
194
|
+
}
|
|
195
|
+
if (leftToken.text !== rightToken.text || leftToken.style !== rightToken.style) {
|
|
196
|
+
return false;
|
|
197
|
+
}
|
|
198
|
+
}
|
|
199
|
+
}
|
|
200
|
+
return true;
|
|
201
|
+
}
|
|
202
|
+
function areCheckoutDiffHunksEqual(left, right) {
|
|
203
|
+
if (left.length !== right.length) {
|
|
204
|
+
return false;
|
|
205
|
+
}
|
|
206
|
+
for (let index = 0; index < left.length; index += 1) {
|
|
207
|
+
const leftHunk = left[index];
|
|
208
|
+
const rightHunk = right[index];
|
|
209
|
+
if (!leftHunk || !rightHunk) {
|
|
210
|
+
return false;
|
|
211
|
+
}
|
|
212
|
+
if (leftHunk.oldStart !== rightHunk.oldStart
|
|
213
|
+
|| leftHunk.oldCount !== rightHunk.oldCount
|
|
214
|
+
|| leftHunk.newStart !== rightHunk.newStart
|
|
215
|
+
|| leftHunk.newCount !== rightHunk.newCount
|
|
216
|
+
|| !areCheckoutDiffLinesEqual(leftHunk.lines, rightHunk.lines)) {
|
|
217
|
+
return false;
|
|
218
|
+
}
|
|
219
|
+
}
|
|
220
|
+
return true;
|
|
221
|
+
}
|
|
222
|
+
function areCheckoutDiffFilesEqual(left, right) {
|
|
223
|
+
if (left.length !== right.length) {
|
|
224
|
+
return false;
|
|
225
|
+
}
|
|
226
|
+
for (let index = 0; index < left.length; index += 1) {
|
|
227
|
+
const leftFile = left[index];
|
|
228
|
+
const rightFile = right[index];
|
|
229
|
+
if (!leftFile || !rightFile) {
|
|
230
|
+
return false;
|
|
231
|
+
}
|
|
232
|
+
if (leftFile.path !== rightFile.path
|
|
233
|
+
|| leftFile.isNew !== rightFile.isNew
|
|
234
|
+
|| leftFile.isDeleted !== rightFile.isDeleted
|
|
235
|
+
|| leftFile.additions !== rightFile.additions
|
|
236
|
+
|| leftFile.deletions !== rightFile.deletions
|
|
237
|
+
|| (leftFile.status ?? 'ok') !== (rightFile.status ?? 'ok')
|
|
238
|
+
|| !areCheckoutDiffHunksEqual(leftFile.hunks, rightFile.hunks)) {
|
|
239
|
+
return false;
|
|
240
|
+
}
|
|
241
|
+
}
|
|
242
|
+
return true;
|
|
243
|
+
}
|
|
244
|
+
function areCheckoutDiffSnapshotsEqual(left, right) {
|
|
245
|
+
if (!left) {
|
|
246
|
+
return false;
|
|
247
|
+
}
|
|
248
|
+
return (left.cwd === right.cwd
|
|
249
|
+
&& areCheckoutErrorsEqual(left.error, right.error)
|
|
250
|
+
&& areCheckoutDiffFilesEqual(left.files, right.files));
|
|
251
|
+
}
|
|
115
252
|
const DIRTY_WORKTREE_CONFIRMATION_REQUIRED = 'dirty_worktree_confirmation_required';
|
|
116
253
|
class SessionRequestError extends Error {
|
|
117
254
|
constructor(code, message) {
|
|
@@ -3318,12 +3455,14 @@ export class Session {
|
|
|
3318
3455
|
remoteName,
|
|
3319
3456
|
maxAgeMs: options?.maxAgeMs,
|
|
3320
3457
|
forceRefresh: options?.forceRefresh,
|
|
3458
|
+
currentBranchHint: options?.currentBranchHint,
|
|
3321
3459
|
})
|
|
3322
3460
|
: await getPullRequestSnapshot(expandTilde(cwd), {
|
|
3323
3461
|
remoteName,
|
|
3324
3462
|
detailLevel,
|
|
3325
3463
|
maxAgeMs: options?.maxAgeMs,
|
|
3326
3464
|
forceRefresh: options?.forceRefresh,
|
|
3465
|
+
currentBranchHint: options?.currentBranchHint,
|
|
3327
3466
|
});
|
|
3328
3467
|
return {
|
|
3329
3468
|
pullRequest: prStatus.status,
|
|
@@ -3824,17 +3963,6 @@ export class Session {
|
|
|
3824
3963
|
void this.refreshWorkspaceStatusTarget(target);
|
|
3825
3964
|
}, WORKSPACE_STATUS_WATCH_DEBOUNCE_MS);
|
|
3826
3965
|
}
|
|
3827
|
-
workspaceStatusSnapshotFingerprint(snapshot) {
|
|
3828
|
-
return JSON.stringify({
|
|
3829
|
-
cwd: snapshot.cwd,
|
|
3830
|
-
remoteName: snapshot.remoteName,
|
|
3831
|
-
git: snapshot.git,
|
|
3832
|
-
gitError: snapshot.gitError,
|
|
3833
|
-
pullRequest: snapshot.pullRequest,
|
|
3834
|
-
pullRequestError: snapshot.pullRequestError,
|
|
3835
|
-
githubFeaturesEnabled: snapshot.githubFeaturesEnabled,
|
|
3836
|
-
});
|
|
3837
|
-
}
|
|
3838
3966
|
emitWorkspaceStatusChanged(_target, snapshot) {
|
|
3839
3967
|
this.emit({
|
|
3840
3968
|
type: 'workspace_status_changed',
|
|
@@ -3865,6 +3993,7 @@ export class Session {
|
|
|
3865
3993
|
? WORKSPACE_STATUS_PR_ACTIVE_CACHE_MAX_AGE_MS
|
|
3866
3994
|
: WORKSPACE_STATUS_PR_PASSIVE_CACHE_MAX_AGE_MS,
|
|
3867
3995
|
forceRefresh: gitIdentityChanged,
|
|
3996
|
+
currentBranchHint: gitSnapshot.git.currentBranch,
|
|
3868
3997
|
});
|
|
3869
3998
|
pullRequest = prSnapshot.pullRequest;
|
|
3870
3999
|
pullRequestError = prSnapshot.pullRequestError;
|
|
@@ -3948,9 +4077,8 @@ export class Session {
|
|
|
3948
4077
|
|| includePr
|
|
3949
4078
|
|| (previousHasLoadedPullRequest && !gitIdentityChanged);
|
|
3950
4079
|
target.latestPayloadHasFullGitData = !snapshot.git.isGit || fullGit;
|
|
3951
|
-
|
|
3952
|
-
|
|
3953
|
-
target.latestFingerprint = fingerprint;
|
|
4080
|
+
if (!areWorkspaceStatusSnapshotsEqual(target.latestComparablePayload, snapshot)) {
|
|
4081
|
+
target.latestComparablePayload = snapshot;
|
|
3954
4082
|
this.emitWorkspaceStatusChanged(target, snapshot);
|
|
3955
4083
|
}
|
|
3956
4084
|
} while (target.pendingGitRefresh || target.pendingPrRefresh);
|
|
@@ -3989,7 +4117,7 @@ export class Session {
|
|
|
3989
4117
|
pendingPrRefresh: false,
|
|
3990
4118
|
prRefreshGeneration: 0,
|
|
3991
4119
|
latestPayload: null,
|
|
3992
|
-
|
|
4120
|
+
latestComparablePayload: null,
|
|
3993
4121
|
hasLoadedPullRequest: false,
|
|
3994
4122
|
latestPayloadHasFullGitData: false,
|
|
3995
4123
|
};
|
|
@@ -4054,7 +4182,7 @@ export class Session {
|
|
|
4054
4182
|
this.updateWorkspaceStatusPrPolling(target);
|
|
4055
4183
|
const fullGit = this.workspaceStatusHasActiveSubscribers(target);
|
|
4056
4184
|
const includePr = fullGit || !target.latestPayload;
|
|
4057
|
-
const
|
|
4185
|
+
const previousComparablePayload = target.latestComparablePayload;
|
|
4058
4186
|
const hadExistingSubscribers = target.subscriptions.size > 1;
|
|
4059
4187
|
const snapshot = target.latestPayload
|
|
4060
4188
|
&& (!includePr || target.hasLoadedPullRequest)
|
|
@@ -4067,8 +4195,7 @@ export class Session {
|
|
|
4067
4195
|
target.hasLoadedPullRequest = hasLoadedPullRequest;
|
|
4068
4196
|
target.latestPayloadHasFullGitData = !snapshot.git.isGit || fullGit;
|
|
4069
4197
|
this.updateWorkspaceStatusPrPolling(target);
|
|
4070
|
-
|
|
4071
|
-
target.latestFingerprint = nextFingerprint;
|
|
4198
|
+
target.latestComparablePayload = snapshot;
|
|
4072
4199
|
this.emit({
|
|
4073
4200
|
type: 'subscribe_workspace_status_response',
|
|
4074
4201
|
payload: {
|
|
@@ -4077,7 +4204,7 @@ export class Session {
|
|
|
4077
4204
|
requestId: msg.requestId,
|
|
4078
4205
|
},
|
|
4079
4206
|
});
|
|
4080
|
-
if (hadExistingSubscribers &&
|
|
4207
|
+
if (hadExistingSubscribers && !areWorkspaceStatusSnapshotsEqual(previousComparablePayload, snapshot)) {
|
|
4081
4208
|
this.emitWorkspaceStatusChanged(target, snapshot);
|
|
4082
4209
|
}
|
|
4083
4210
|
if (!fullGit && snapshot.git.isGit && !hasLoadedPullRequest) {
|
|
@@ -4299,9 +4426,6 @@ export class Session {
|
|
|
4299
4426
|
});
|
|
4300
4427
|
}
|
|
4301
4428
|
}
|
|
4302
|
-
checkoutDiffSnapshotFingerprint(snapshot) {
|
|
4303
|
-
return JSON.stringify(snapshot);
|
|
4304
|
-
}
|
|
4305
4429
|
async computeCheckoutDiffSnapshot(cwd, compare, options) {
|
|
4306
4430
|
const diffCwd = options?.diffCwd ?? cwd;
|
|
4307
4431
|
const detail = options?.detail ?? 'full';
|
|
@@ -4311,12 +4435,13 @@ export class Session {
|
|
|
4311
4435
|
baseRef: compare.baseRef,
|
|
4312
4436
|
includeStructured: true,
|
|
4313
4437
|
}, { junctionHome: this.junctionHome }));
|
|
4314
|
-
const
|
|
4315
|
-
|
|
4438
|
+
const structuredFiles = diffResult.structured ?? [];
|
|
4439
|
+
const files = detail === 'summary'
|
|
4440
|
+
? structuredFiles.map((file) => ({
|
|
4316
4441
|
...file,
|
|
4317
4442
|
hunks: [],
|
|
4318
|
-
}
|
|
4319
|
-
:
|
|
4443
|
+
}))
|
|
4444
|
+
: structuredFiles;
|
|
4320
4445
|
files.sort((a, b) => {
|
|
4321
4446
|
if (a.path === b.path)
|
|
4322
4447
|
return 0;
|
|
@@ -4349,9 +4474,8 @@ export class Session {
|
|
|
4349
4474
|
detail: target.detail,
|
|
4350
4475
|
});
|
|
4351
4476
|
target.latestPayload = snapshot;
|
|
4352
|
-
|
|
4353
|
-
|
|
4354
|
-
target.latestFingerprint = fingerprint;
|
|
4477
|
+
if (!areCheckoutDiffSnapshotsEqual(target.latestComparablePayload, snapshot)) {
|
|
4478
|
+
target.latestComparablePayload = snapshot;
|
|
4355
4479
|
this.emitCheckoutDiffUpdate(target, snapshot);
|
|
4356
4480
|
}
|
|
4357
4481
|
} while (target.refreshQueued);
|
|
@@ -4386,7 +4510,7 @@ export class Session {
|
|
|
4386
4510
|
refreshQueued: false,
|
|
4387
4511
|
refreshQueuedAfterWrite: false,
|
|
4388
4512
|
latestPayload: null,
|
|
4389
|
-
|
|
4513
|
+
latestComparablePayload: null,
|
|
4390
4514
|
};
|
|
4391
4515
|
const repoWatchPath = watchRoot ?? cwd;
|
|
4392
4516
|
const watchPaths = new Set([repoWatchPath]);
|
|
@@ -4440,7 +4564,7 @@ export class Session {
|
|
|
4440
4564
|
const canReuseLatestPayload = target.latestPayload !== null &&
|
|
4441
4565
|
!target.refreshQueuedAfterWrite &&
|
|
4442
4566
|
!this.isWorkspaceGitWritePending(target.workspaceGitKey);
|
|
4443
|
-
const
|
|
4567
|
+
const shouldPreserveQueuedComparablePayload = !canReuseLatestPayload && target.refreshQueuedAfterWrite;
|
|
4444
4568
|
const snapshot = canReuseLatestPayload
|
|
4445
4569
|
? target.latestPayload
|
|
4446
4570
|
: await this.computeCheckoutDiffSnapshot(cwd, compare, {
|
|
@@ -4451,8 +4575,8 @@ export class Session {
|
|
|
4451
4575
|
throw new Error('Checkout diff snapshot was unavailable');
|
|
4452
4576
|
}
|
|
4453
4577
|
target.latestPayload = snapshot;
|
|
4454
|
-
if (!
|
|
4455
|
-
target.
|
|
4578
|
+
if (!shouldPreserveQueuedComparablePayload) {
|
|
4579
|
+
target.latestComparablePayload = snapshot;
|
|
4456
4580
|
}
|
|
4457
4581
|
this.emit({
|
|
4458
4582
|
type: 'subscribe_checkout_diff_response',
|