@superblocksteam/vite-plugin-file-sync 2.0.93 → 2.0.94-next.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/ai-service/agent/prompts/api-prompts.d.ts.map +1 -1
- package/dist/ai-service/agent/prompts/api-prompts.js +9 -1
- package/dist/ai-service/agent/prompts/api-prompts.js.map +1 -1
- package/dist/ai-service/agent/prompts/build-base-system-prompt.d.ts.map +1 -1
- package/dist/ai-service/agent/prompts/build-base-system-prompt.js +14 -1
- package/dist/ai-service/agent/prompts/build-base-system-prompt.js.map +1 -1
- package/dist/ai-service/agent/tools/apis/analysis.js +4 -4
- package/dist/ai-service/agent/tools/apis/analysis.js.map +1 -1
- package/dist/ai-service/agent/tools/apis/get-api-docs.d.ts.map +1 -1
- package/dist/ai-service/agent/tools/apis/get-api-docs.js +3 -1
- package/dist/ai-service/agent/tools/apis/get-api-docs.js.map +1 -1
- package/dist/ai-service/agent/tools.d.ts.map +1 -1
- package/dist/ai-service/agent/tools.js +20 -6
- package/dist/ai-service/agent/tools.js.map +1 -1
- package/dist/ai-service/agent/tools2/access-control.d.ts.map +1 -1
- package/dist/ai-service/agent/tools2/access-control.js +5 -26
- package/dist/ai-service/agent/tools2/access-control.js.map +1 -1
- package/dist/ai-service/agent/tools2/tools/git-commit.d.ts +15 -0
- package/dist/ai-service/agent/tools2/tools/git-commit.d.ts.map +1 -0
- package/dist/ai-service/agent/tools2/tools/git-commit.js +105 -0
- package/dist/ai-service/agent/tools2/tools/git-commit.js.map +1 -0
- package/dist/ai-service/agent/tools2/tools/git-diff.d.ts +9 -0
- package/dist/ai-service/agent/tools2/tools/git-diff.d.ts.map +1 -0
- package/dist/ai-service/agent/tools2/tools/git-diff.js +23 -0
- package/dist/ai-service/agent/tools2/tools/git-diff.js.map +1 -0
- package/dist/ai-service/agent/tools2/tools/git-log.d.ts +12 -0
- package/dist/ai-service/agent/tools2/tools/git-log.d.ts.map +1 -0
- package/dist/ai-service/agent/tools2/tools/git-log.js +27 -0
- package/dist/ai-service/agent/tools2/tools/git-log.js.map +1 -0
- package/dist/ai-service/agent/tools2/tools/git-merge-abort.d.ts +7 -0
- package/dist/ai-service/agent/tools2/tools/git-merge-abort.d.ts.map +1 -0
- package/dist/ai-service/agent/tools2/tools/git-merge-abort.js +42 -0
- package/dist/ai-service/agent/tools2/tools/git-merge-abort.js.map +1 -0
- package/dist/ai-service/agent/tools2/tools/git-pull.d.ts +20 -0
- package/dist/ai-service/agent/tools2/tools/git-pull.d.ts.map +1 -0
- package/dist/ai-service/agent/tools2/tools/git-pull.js +80 -0
- package/dist/ai-service/agent/tools2/tools/git-pull.js.map +1 -0
- package/dist/ai-service/agent/tools2/tools/git-stage.d.ts +9 -0
- package/dist/ai-service/agent/tools2/tools/git-stage.d.ts.map +1 -0
- package/dist/ai-service/agent/tools2/tools/git-stage.js +34 -0
- package/dist/ai-service/agent/tools2/tools/git-stage.js.map +1 -0
- package/dist/ai-service/agent/tools2/tools/git-status.d.ts +9 -0
- package/dist/ai-service/agent/tools2/tools/git-status.d.ts.map +1 -0
- package/dist/ai-service/agent/tools2/tools/git-status.js +18 -0
- package/dist/ai-service/agent/tools2/tools/git-status.js.map +1 -0
- package/dist/ai-service/agent/tools2/tools/grep-metadata.d.ts +1 -1
- package/dist/ai-service/agent/tools2/tools/index.d.ts +7 -0
- package/dist/ai-service/agent/tools2/tools/index.d.ts.map +1 -1
- package/dist/ai-service/agent/tools2/tools/index.js +8 -0
- package/dist/ai-service/agent/tools2/tools/index.js.map +1 -1
- package/dist/ai-service/agent/tools2/types.d.ts +2 -3
- package/dist/ai-service/agent/tools2/types.d.ts.map +1 -1
- package/dist/ai-service/agent/tools2/types.js +1 -0
- package/dist/ai-service/agent/tools2/types.js.map +1 -1
- package/dist/ai-service/chat/chat-session-store.d.ts.map +1 -1
- package/dist/ai-service/chat/chat-session-store.js +2 -0
- package/dist/ai-service/chat/chat-session-store.js.map +1 -1
- package/dist/ai-service/features.d.ts +5 -0
- package/dist/ai-service/features.d.ts.map +1 -1
- package/dist/ai-service/features.js +5 -0
- package/dist/ai-service/features.js.map +1 -1
- package/dist/ai-service/index.d.ts +2 -1
- package/dist/ai-service/index.d.ts.map +1 -1
- package/dist/ai-service/index.js +135 -2
- package/dist/ai-service/index.js.map +1 -1
- package/dist/ai-service/prompts/summarize-api-usage.d.ts +18 -0
- package/dist/ai-service/prompts/summarize-api-usage.d.ts.map +1 -0
- package/dist/ai-service/prompts/summarize-api-usage.js +30 -0
- package/dist/ai-service/prompts/summarize-api-usage.js.map +1 -0
- package/dist/ai-service/skills/system/_registry.generated.d.ts.map +1 -1
- package/dist/ai-service/skills/system/_registry.generated.js +0 -1
- package/dist/ai-service/skills/system/_registry.generated.js.map +1 -1
- package/dist/ai-service/skills/system/superblocks-api/references/code-blocks.generated.d.ts +1 -1
- package/dist/ai-service/skills/system/superblocks-api/references/code-blocks.generated.d.ts.map +1 -1
- package/dist/ai-service/skills/system/superblocks-api/references/code-blocks.generated.js +51 -37
- package/dist/ai-service/skills/system/superblocks-api/references/code-blocks.generated.js.map +1 -1
- package/dist/ai-service/skills/system/superblocks-api/references/rest-apis.generated.d.ts +1 -1
- package/dist/ai-service/skills/system/superblocks-api/references/rest-apis.generated.d.ts.map +1 -1
- package/dist/ai-service/skills/system/superblocks-api/references/rest-apis.generated.js +100 -93
- package/dist/ai-service/skills/system/superblocks-api/references/rest-apis.generated.js.map +1 -1
- package/dist/ai-service/skills/system/superblocks-api/references/sql-databases.generated.d.ts +1 -1
- package/dist/ai-service/skills/system/superblocks-api/references/sql-databases.generated.d.ts.map +1 -1
- package/dist/ai-service/skills/system/superblocks-api/references/sql-databases.generated.js +72 -49
- package/dist/ai-service/skills/system/superblocks-api/references/sql-databases.generated.js.map +1 -1
- package/dist/ai-service/skills/system/superblocks-frontend/references/embedding.generated.d.ts +1 -1
- package/dist/ai-service/skills/system/superblocks-frontend/references/embedding.generated.d.ts.map +1 -1
- package/dist/ai-service/skills/system/superblocks-frontend/references/embedding.generated.js +7 -7
- package/dist/ai-service/skills/system/superblocks-frontend/skill.generated.d.ts +1 -1
- package/dist/ai-service/skills/system/superblocks-frontend/skill.generated.d.ts.map +1 -1
- package/dist/ai-service/skills/system/superblocks-frontend/skill.generated.js +88 -28
- package/dist/ai-service/skills/system/superblocks-frontend/skill.generated.js.map +1 -1
- package/dist/ai-service/state-machine/clark-fsm.d.ts.map +1 -1
- package/dist/ai-service/state-machine/clark-fsm.js +0 -2
- package/dist/ai-service/state-machine/clark-fsm.js.map +1 -1
- package/dist/ai-service/state-machine/handlers/llm-generating.d.ts.map +1 -1
- package/dist/ai-service/state-machine/handlers/llm-generating.js +9 -0
- package/dist/ai-service/state-machine/handlers/llm-generating.js.map +1 -1
- package/dist/file-sync-vite-plugin.d.ts.map +1 -1
- package/dist/file-sync-vite-plugin.js +4 -0
- package/dist/file-sync-vite-plugin.js.map +1 -1
- package/dist/git-service/errors.d.ts +18 -0
- package/dist/git-service/errors.d.ts.map +1 -0
- package/dist/git-service/errors.js +27 -0
- package/dist/git-service/errors.js.map +1 -0
- package/dist/git-service/index.d.ts +30 -0
- package/dist/git-service/index.d.ts.map +1 -0
- package/dist/git-service/index.js +135 -0
- package/dist/git-service/index.js.map +1 -0
- package/dist/git-service/live-branch.d.ts +10 -0
- package/dist/git-service/live-branch.d.ts.map +1 -0
- package/dist/git-service/live-branch.js +63 -0
- package/dist/git-service/live-branch.js.map +1 -0
- package/dist/lock-service/index.d.ts +5 -1
- package/dist/lock-service/index.d.ts.map +1 -1
- package/dist/lock-service/index.js +83 -16
- package/dist/lock-service/index.js.map +1 -1
- package/dist/plugin-options.d.ts +3 -0
- package/dist/plugin-options.d.ts.map +1 -1
- package/dist/plugin-options.js.map +1 -1
- package/dist/socket-manager.d.ts +4 -1
- package/dist/socket-manager.d.ts.map +1 -1
- package/dist/socket-manager.js +378 -3
- package/dist/socket-manager.js.map +1 -1
- package/dist/sync-service/index.d.ts +12 -1
- package/dist/sync-service/index.d.ts.map +1 -1
- package/dist/sync-service/index.js +37 -6
- package/dist/sync-service/index.js.map +1 -1
- package/package.json +21 -16
package/dist/socket-manager.js
CHANGED
|
@@ -1,7 +1,13 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { cp, mkdir, mkdtemp, rm } from "node:fs/promises";
|
|
2
|
+
import { tmpdir } from "node:os";
|
|
3
|
+
import { join } from "node:path";
|
|
4
|
+
const SB_WORKTREE_SNAPSHOTS_DIR = join(tmpdir(), "sb-worktree-snapshots");
|
|
5
|
+
import { createISocketClient, SUPERBLOCKS_LIVE_GIT_BRANCH, TracedEventEmitter, TracedSocket, } from "@superblocksteam/shared";
|
|
2
6
|
import { WebSocketServer } from "ws";
|
|
3
7
|
import { uploadContextToBucketeer } from "./ai-service/context-upload.js";
|
|
4
8
|
import { createSocketRecordingMiddleware } from "./ai-service/recording/recorders/socket-recorder.js";
|
|
9
|
+
import { GitConflictError } from "./git-service/index.js";
|
|
10
|
+
import { ensureLiveBranchCheckedOut, pushLiveBranchWithAutoRecreate, rollbackLastCommit, } from "./git-service/live-branch.js";
|
|
5
11
|
import { getErrorMeta, getLogger } from "./util/logger.js";
|
|
6
12
|
let _socketManager;
|
|
7
13
|
// Global flag for Clark log forwarding to browser console.
|
|
@@ -31,12 +37,47 @@ class SocketManager extends TracedEventEmitter {
|
|
|
31
37
|
super(tracer);
|
|
32
38
|
}
|
|
33
39
|
socketServer;
|
|
34
|
-
startSocketServer({ server, fileSyncManager, syncService, lockService, aiService, checkAuthorization, path, tracer, }) {
|
|
40
|
+
startSocketServer({ server, fileSyncManager, syncService, lockService, aiService, gitService, activateGitService, checkAuthorization, path, tracer, }) {
|
|
35
41
|
if (this.socketServer) {
|
|
36
42
|
throw new Error("Socket server already started");
|
|
37
43
|
}
|
|
38
44
|
const wss = new WebSocketServer({ path, noServer: true });
|
|
39
45
|
this.socketServer = wss;
|
|
46
|
+
let activeGitService = gitService;
|
|
47
|
+
const getActiveGitService = async () => {
|
|
48
|
+
if (activeGitService) {
|
|
49
|
+
await ensureLiveBranchCheckedOut(activeGitService);
|
|
50
|
+
return activeGitService;
|
|
51
|
+
}
|
|
52
|
+
if (!activateGitService) {
|
|
53
|
+
return undefined;
|
|
54
|
+
}
|
|
55
|
+
// Post-connect git activation may race with server-side persistence.
|
|
56
|
+
// Retry briefly so users don't need a manual dev server restart.
|
|
57
|
+
const maxAttempts = 5;
|
|
58
|
+
for (let attempt = 1; attempt <= maxAttempts; attempt += 1) {
|
|
59
|
+
try {
|
|
60
|
+
activeGitService = await activateGitService();
|
|
61
|
+
if (activeGitService) {
|
|
62
|
+
await ensureLiveBranchCheckedOut(activeGitService);
|
|
63
|
+
return activeGitService;
|
|
64
|
+
}
|
|
65
|
+
}
|
|
66
|
+
catch (error) {
|
|
67
|
+
getLogger().warn(`[git] getActiveGitService: activation attempt ${attempt}/${maxAttempts} failed: ${error instanceof Error ? error.message : String(error)}`);
|
|
68
|
+
if (attempt === maxAttempts) {
|
|
69
|
+
getLogger().error(`[git] getActiveGitService: all ${maxAttempts} activation attempts exhausted`, getErrorMeta(error));
|
|
70
|
+
throw error;
|
|
71
|
+
}
|
|
72
|
+
}
|
|
73
|
+
if (attempt < maxAttempts) {
|
|
74
|
+
await new Promise((resolve) => {
|
|
75
|
+
setTimeout(resolve, 750);
|
|
76
|
+
});
|
|
77
|
+
}
|
|
78
|
+
}
|
|
79
|
+
return undefined;
|
|
80
|
+
};
|
|
40
81
|
const handleUpgrade = (req, socket, head) => {
|
|
41
82
|
if (!req.url) {
|
|
42
83
|
return;
|
|
@@ -117,6 +158,7 @@ class SocketManager extends TracedEventEmitter {
|
|
|
117
158
|
if (!syncService) {
|
|
118
159
|
throw new Error("Syncing is disabled, cannot ensure files are synced");
|
|
119
160
|
}
|
|
161
|
+
await getActiveGitService().catch(() => undefined);
|
|
120
162
|
const result = await syncService.uploadDirectoryNowIfNeeded("requestedFilesSync");
|
|
121
163
|
return result.directoryHash;
|
|
122
164
|
},
|
|
@@ -187,7 +229,8 @@ class SocketManager extends TracedEventEmitter {
|
|
|
187
229
|
commitId: result.commitId,
|
|
188
230
|
};
|
|
189
231
|
}
|
|
190
|
-
|
|
232
|
+
getLogger().info("[aiAcceptDraft] No new checkpoint created for ai:accept (no hash changes from last checkpoint)");
|
|
233
|
+
return { commitId: "" };
|
|
191
234
|
},
|
|
192
235
|
],
|
|
193
236
|
aiClearDraftState: [
|
|
@@ -210,6 +253,11 @@ class SocketManager extends TracedEventEmitter {
|
|
|
210
253
|
await aiService?.handleAiExplainCode(request, peer);
|
|
211
254
|
},
|
|
212
255
|
],
|
|
256
|
+
aiSummarizeApiUsage: [
|
|
257
|
+
async (request, _context, peer) => {
|
|
258
|
+
await aiService?.handleAiSummarizeApiUsage(request, peer);
|
|
259
|
+
},
|
|
260
|
+
],
|
|
213
261
|
aiSkipTestCase: [
|
|
214
262
|
async (request) => {
|
|
215
263
|
await aiService?.handleSkipTestCase(request.testRunId, request.testCaseId);
|
|
@@ -330,6 +378,324 @@ class SocketManager extends TracedEventEmitter {
|
|
|
330
378
|
getLogger().info(`Clark log forwarding ${request.enabled ? "enabled" : "disabled"}`);
|
|
331
379
|
},
|
|
332
380
|
],
|
|
381
|
+
gitCommitLocal: [
|
|
382
|
+
async (request) => {
|
|
383
|
+
const readyGitService = await getActiveGitService();
|
|
384
|
+
if (!readyGitService) {
|
|
385
|
+
throw new Error("Git is not configured for this application");
|
|
386
|
+
}
|
|
387
|
+
await readyGitService
|
|
388
|
+
.fetch("origin", SUPERBLOCKS_LIVE_GIT_BRANCH)
|
|
389
|
+
.catch((fetchErr) => {
|
|
390
|
+
const msg = fetchErr instanceof Error
|
|
391
|
+
? fetchErr.message
|
|
392
|
+
: String(fetchErr);
|
|
393
|
+
if (!msg.includes("couldn't find remote ref")) {
|
|
394
|
+
throw fetchErr;
|
|
395
|
+
}
|
|
396
|
+
});
|
|
397
|
+
await readyGitService.add(".");
|
|
398
|
+
const result = await readyGitService.commit(request.message);
|
|
399
|
+
return { sha: result.commit };
|
|
400
|
+
},
|
|
401
|
+
],
|
|
402
|
+
gitPushLiveBranch: [
|
|
403
|
+
async () => {
|
|
404
|
+
const readyGitService = await getActiveGitService();
|
|
405
|
+
if (!readyGitService) {
|
|
406
|
+
throw new Error("Git is not configured for this application");
|
|
407
|
+
}
|
|
408
|
+
await pushLiveBranchWithAutoRecreate(readyGitService);
|
|
409
|
+
},
|
|
410
|
+
],
|
|
411
|
+
gitRollbackLastCommit: [
|
|
412
|
+
async (request) => {
|
|
413
|
+
const readyGitService = await getActiveGitService();
|
|
414
|
+
if (!readyGitService) {
|
|
415
|
+
throw new Error("Git is not configured for this application");
|
|
416
|
+
}
|
|
417
|
+
return rollbackLastCommit({
|
|
418
|
+
gitService: readyGitService,
|
|
419
|
+
expectedSha: request.expectedSha,
|
|
420
|
+
});
|
|
421
|
+
},
|
|
422
|
+
],
|
|
423
|
+
gitPull: [
|
|
424
|
+
async (_request, _context) => {
|
|
425
|
+
const readyGitService = await getActiveGitService();
|
|
426
|
+
if (!readyGitService) {
|
|
427
|
+
throw new Error("Git is not configured for this application");
|
|
428
|
+
}
|
|
429
|
+
await readyGitService.fetch();
|
|
430
|
+
const status = await readyGitService.status();
|
|
431
|
+
const hasLocalChanges = status.files.length > 0;
|
|
432
|
+
if (hasLocalChanges) {
|
|
433
|
+
await readyGitService.add(".");
|
|
434
|
+
await readyGitService.stash();
|
|
435
|
+
}
|
|
436
|
+
let hasConflicts = false;
|
|
437
|
+
let merged = false;
|
|
438
|
+
try {
|
|
439
|
+
const mergeResult = await readyGitService.mergeRef(`origin/${SUPERBLOCKS_LIVE_GIT_BRANCH}`);
|
|
440
|
+
merged = !mergeResult.alreadyUpToDate;
|
|
441
|
+
if (merged) {
|
|
442
|
+
const unmerged = await readyGitService.getConflictedFiles();
|
|
443
|
+
if (unmerged.length > 0) {
|
|
444
|
+
hasConflicts = true;
|
|
445
|
+
}
|
|
446
|
+
}
|
|
447
|
+
}
|
|
448
|
+
catch (mergeError) {
|
|
449
|
+
if (!(mergeError instanceof GitConflictError)) {
|
|
450
|
+
getLogger().error("[git] gitPull: merge failed (non-conflict), aborting", getErrorMeta(mergeError));
|
|
451
|
+
try {
|
|
452
|
+
await readyGitService.raw(["merge", "--abort"]);
|
|
453
|
+
}
|
|
454
|
+
catch (abortErr) {
|
|
455
|
+
getLogger().warn(`[git] gitPull: merge --abort failed: ${abortErr instanceof Error ? abortErr.message : String(abortErr)}`);
|
|
456
|
+
}
|
|
457
|
+
if (hasLocalChanges) {
|
|
458
|
+
try {
|
|
459
|
+
await readyGitService.stashPop();
|
|
460
|
+
}
|
|
461
|
+
catch (popErr) {
|
|
462
|
+
getLogger().warn(`[git] gitPull: stash pop after merge abort failed: ${popErr instanceof Error ? popErr.message : String(popErr)}`);
|
|
463
|
+
}
|
|
464
|
+
}
|
|
465
|
+
throw mergeError;
|
|
466
|
+
}
|
|
467
|
+
merged = true;
|
|
468
|
+
hasConflicts = true;
|
|
469
|
+
}
|
|
470
|
+
if (hasLocalChanges) {
|
|
471
|
+
try {
|
|
472
|
+
await readyGitService.stashPop();
|
|
473
|
+
}
|
|
474
|
+
catch (popError) {
|
|
475
|
+
if (popError instanceof GitConflictError) {
|
|
476
|
+
hasConflicts = true;
|
|
477
|
+
}
|
|
478
|
+
else {
|
|
479
|
+
getLogger().error("[git] gitPull: stash pop failed (non-conflict)", getErrorMeta(popError));
|
|
480
|
+
throw popError;
|
|
481
|
+
}
|
|
482
|
+
}
|
|
483
|
+
if (!hasConflicts) {
|
|
484
|
+
const unmerged = await readyGitService.getConflictedFiles();
|
|
485
|
+
if (unmerged.length > 0) {
|
|
486
|
+
hasConflicts = true;
|
|
487
|
+
}
|
|
488
|
+
}
|
|
489
|
+
}
|
|
490
|
+
if (hasConflicts) {
|
|
491
|
+
const conflictedFiles = await readyGitService.getConflictedFiles();
|
|
492
|
+
return { merged: false, conflictedFiles };
|
|
493
|
+
}
|
|
494
|
+
return { merged };
|
|
495
|
+
},
|
|
496
|
+
],
|
|
497
|
+
gitSyncStatus: [
|
|
498
|
+
async () => {
|
|
499
|
+
const readyGitService = await getActiveGitService();
|
|
500
|
+
if (!readyGitService) {
|
|
501
|
+
return null;
|
|
502
|
+
}
|
|
503
|
+
let hasUncommittedChanges = false;
|
|
504
|
+
try {
|
|
505
|
+
const status = await readyGitService.status();
|
|
506
|
+
hasUncommittedChanges = status.files.length > 0;
|
|
507
|
+
}
|
|
508
|
+
catch (statusErr) {
|
|
509
|
+
getLogger().warn("[git] gitSyncStatus: git status failed — .git may be corrupted, treating as not configured", getErrorMeta(statusErr));
|
|
510
|
+
return null;
|
|
511
|
+
}
|
|
512
|
+
let ahead = 0;
|
|
513
|
+
let behind = 0;
|
|
514
|
+
try {
|
|
515
|
+
await readyGitService.fetch("origin", SUPERBLOCKS_LIVE_GIT_BRANCH);
|
|
516
|
+
const counts = await readyGitService.revList("HEAD", `origin/${SUPERBLOCKS_LIVE_GIT_BRANCH}`);
|
|
517
|
+
ahead = counts.ahead;
|
|
518
|
+
behind = counts.behind;
|
|
519
|
+
}
|
|
520
|
+
catch (fetchErr) {
|
|
521
|
+
getLogger().warn(`[git] gitSyncStatus: fetch/revList failed (remote unreachable or tracking branch missing): ${fetchErr instanceof Error ? fetchErr.message : String(fetchErr)}`);
|
|
522
|
+
}
|
|
523
|
+
return { ahead, behind, hasUncommittedChanges };
|
|
524
|
+
},
|
|
525
|
+
],
|
|
526
|
+
gitChangedFiles: [
|
|
527
|
+
async () => {
|
|
528
|
+
const readyGitService = await getActiveGitService();
|
|
529
|
+
if (!readyGitService)
|
|
530
|
+
return [];
|
|
531
|
+
try {
|
|
532
|
+
const status = await readyGitService.status();
|
|
533
|
+
return status.files.map((f) => ({
|
|
534
|
+
path: f.path,
|
|
535
|
+
status: f.working_dir === "D" || f.index === "D"
|
|
536
|
+
? "deleted"
|
|
537
|
+
: f.working_dir === "?" || f.index === "A"
|
|
538
|
+
? "added"
|
|
539
|
+
: "modified",
|
|
540
|
+
}));
|
|
541
|
+
}
|
|
542
|
+
catch (err) {
|
|
543
|
+
getLogger().warn("[git] gitChangedFiles: git status failed", getErrorMeta(err));
|
|
544
|
+
return [];
|
|
545
|
+
}
|
|
546
|
+
},
|
|
547
|
+
],
|
|
548
|
+
gitActivate: [
|
|
549
|
+
async () => {
|
|
550
|
+
const service = await getActiveGitService();
|
|
551
|
+
return { activated: !!service };
|
|
552
|
+
},
|
|
553
|
+
],
|
|
554
|
+
gitDisconnect: [
|
|
555
|
+
async () => {
|
|
556
|
+
if (activeGitService) {
|
|
557
|
+
const gitDir = join(activeGitService.workDir, ".git");
|
|
558
|
+
activeGitService = undefined;
|
|
559
|
+
await rm(gitDir, { recursive: true, force: true });
|
|
560
|
+
}
|
|
561
|
+
},
|
|
562
|
+
],
|
|
563
|
+
gitDefaultBranch: [
|
|
564
|
+
async () => {
|
|
565
|
+
const readyGitService = await getActiveGitService();
|
|
566
|
+
if (!readyGitService)
|
|
567
|
+
return null;
|
|
568
|
+
try {
|
|
569
|
+
return await readyGitService.getDefaultBranch();
|
|
570
|
+
}
|
|
571
|
+
catch (err) {
|
|
572
|
+
getLogger().warn("[git] gitDefaultBranch: failed to detect default branch", getErrorMeta(err));
|
|
573
|
+
return null;
|
|
574
|
+
}
|
|
575
|
+
},
|
|
576
|
+
],
|
|
577
|
+
gitBranchLog: [
|
|
578
|
+
async (request) => {
|
|
579
|
+
const readyGitService = await getActiveGitService();
|
|
580
|
+
if (!readyGitService)
|
|
581
|
+
return [];
|
|
582
|
+
const limit = (request && "limit" in request
|
|
583
|
+
? request.limit
|
|
584
|
+
: undefined) ?? 50;
|
|
585
|
+
const remote = request && "remote" in request
|
|
586
|
+
? (request.remote ?? true)
|
|
587
|
+
: true;
|
|
588
|
+
let branch;
|
|
589
|
+
if (request && "branch" in request && request.branch) {
|
|
590
|
+
branch = request.branch;
|
|
591
|
+
}
|
|
592
|
+
else {
|
|
593
|
+
branch = await readyGitService.getDefaultBranch();
|
|
594
|
+
}
|
|
595
|
+
const logRef = remote ? `origin/${branch}` : branch;
|
|
596
|
+
if (remote) {
|
|
597
|
+
try {
|
|
598
|
+
await readyGitService.fetch("origin", branch);
|
|
599
|
+
}
|
|
600
|
+
catch (fetchErr) {
|
|
601
|
+
getLogger().warn(`[git] gitBranchLog: fetch origin/${branch} failed: ${fetchErr instanceof Error ? fetchErr.message : String(fetchErr)}`);
|
|
602
|
+
}
|
|
603
|
+
}
|
|
604
|
+
const SEP = "<<SEP>>";
|
|
605
|
+
const format = ["%H", "%s", "%an", "%aI"].join(SEP);
|
|
606
|
+
const raw = await readyGitService.raw([
|
|
607
|
+
"log",
|
|
608
|
+
logRef,
|
|
609
|
+
`--format=${format}`,
|
|
610
|
+
`-n`,
|
|
611
|
+
String(limit),
|
|
612
|
+
]);
|
|
613
|
+
if (!raw.trim())
|
|
614
|
+
return [];
|
|
615
|
+
return raw
|
|
616
|
+
.trimEnd()
|
|
617
|
+
.split("\n")
|
|
618
|
+
.map((line) => {
|
|
619
|
+
const parts = line.split(SEP);
|
|
620
|
+
return {
|
|
621
|
+
sha: parts[0] ?? "",
|
|
622
|
+
message: parts[1] ?? "",
|
|
623
|
+
author: parts[2] ?? "",
|
|
624
|
+
date: parts[3] ?? "",
|
|
625
|
+
};
|
|
626
|
+
});
|
|
627
|
+
},
|
|
628
|
+
],
|
|
629
|
+
gitPrepareMainCommit: [
|
|
630
|
+
async (request) => {
|
|
631
|
+
const readyGitService = await getActiveGitService();
|
|
632
|
+
if (!readyGitService) {
|
|
633
|
+
throw new Error("Git service is not available");
|
|
634
|
+
}
|
|
635
|
+
if (!syncService) {
|
|
636
|
+
throw new Error("Sync service is not available");
|
|
637
|
+
}
|
|
638
|
+
const { sha } = request;
|
|
639
|
+
if (!sha || !/^[0-9a-f]{5,40}$/i.test(sha)) {
|
|
640
|
+
throw new Error("sha must be a valid git SHA");
|
|
641
|
+
}
|
|
642
|
+
const defaultBranch = await readyGitService.getDefaultBranch();
|
|
643
|
+
try {
|
|
644
|
+
await readyGitService.fetch("origin", defaultBranch);
|
|
645
|
+
}
|
|
646
|
+
catch (fetchErr) {
|
|
647
|
+
getLogger().warn(`[git] gitPrepareMainCommit: fetch origin/${defaultBranch} failed: ${fetchErr instanceof Error ? fetchErr.message : String(fetchErr)}`);
|
|
648
|
+
}
|
|
649
|
+
const worktreeBase = await mkdtemp(join(tmpdir(), "sb-main-deploy-"));
|
|
650
|
+
const worktreePath = join(worktreeBase, "worktree");
|
|
651
|
+
try {
|
|
652
|
+
await readyGitService.raw([
|
|
653
|
+
"worktree",
|
|
654
|
+
"add",
|
|
655
|
+
"--detach",
|
|
656
|
+
worktreePath,
|
|
657
|
+
sha,
|
|
658
|
+
]);
|
|
659
|
+
// Remove .git metadata from worktree so it doesn't affect the hash
|
|
660
|
+
await rm(join(worktreePath, ".git"), {
|
|
661
|
+
force: true,
|
|
662
|
+
recursive: true,
|
|
663
|
+
});
|
|
664
|
+
const { directoryHash } = await syncService.uploadSnapshotToDbfs(worktreePath);
|
|
665
|
+
// Persist the worktree snapshot so the SABS build can
|
|
666
|
+
// use the commit-specific files instead of the live sandbox.
|
|
667
|
+
const snapshotPath = join(SB_WORKTREE_SNAPSHOTS_DIR, encodeURIComponent(directoryHash));
|
|
668
|
+
await mkdir(SB_WORKTREE_SNAPSHOTS_DIR, {
|
|
669
|
+
recursive: true,
|
|
670
|
+
});
|
|
671
|
+
await rm(snapshotPath, {
|
|
672
|
+
recursive: true,
|
|
673
|
+
force: true,
|
|
674
|
+
});
|
|
675
|
+
await cp(worktreePath, snapshotPath, {
|
|
676
|
+
recursive: true,
|
|
677
|
+
});
|
|
678
|
+
return { directoryHash, sha };
|
|
679
|
+
}
|
|
680
|
+
finally {
|
|
681
|
+
try {
|
|
682
|
+
await readyGitService.raw([
|
|
683
|
+
"worktree",
|
|
684
|
+
"remove",
|
|
685
|
+
"--force",
|
|
686
|
+
worktreePath,
|
|
687
|
+
]);
|
|
688
|
+
}
|
|
689
|
+
catch (cleanupErr) {
|
|
690
|
+
getLogger().warn(`[git] gitPrepareMainCommit: worktree cleanup failed: ${cleanupErr instanceof Error ? cleanupErr.message : String(cleanupErr)}`);
|
|
691
|
+
}
|
|
692
|
+
await rm(worktreeBase, {
|
|
693
|
+
recursive: true,
|
|
694
|
+
force: true,
|
|
695
|
+
});
|
|
696
|
+
}
|
|
697
|
+
},
|
|
698
|
+
],
|
|
333
699
|
},
|
|
334
700
|
}, middlewares, tracer, {
|
|
335
701
|
onClose: () => {
|
|
@@ -363,6 +729,15 @@ class SocketManager extends TracedEventEmitter {
|
|
|
363
729
|
lockService?.markActivity(true);
|
|
364
730
|
void lockService?.restartInactivityTimer();
|
|
365
731
|
}
|
|
732
|
+
// When a new editor connects after git was enabled, the lock may
|
|
733
|
+
// still be on 'main'. Trigger git activation which calls
|
|
734
|
+
// ensureRuntimeDbfsBranchConsistency → lockService.switchBranch
|
|
735
|
+
// to transfer the lock to superblocks/live.
|
|
736
|
+
if (activateGitService) {
|
|
737
|
+
void activateGitService().catch((err) => {
|
|
738
|
+
getLogger().warn(`[socket-manager] post-connect git activation failed: ${err instanceof Error ? err.message : String(err)}`);
|
|
739
|
+
});
|
|
740
|
+
}
|
|
366
741
|
}
|
|
367
742
|
else {
|
|
368
743
|
this.librarySockets.add(socket);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"socket-manager.js","sourceRoot":"","sources":["../src/socket-manager.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"socket-manager.js","sourceRoot":"","sources":["../src/socket-manager.ts"],"names":[],"mappings":"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"}
|
|
@@ -52,7 +52,7 @@ interface EventMap extends ErrorEventMap, DraftEventMap {
|
|
|
52
52
|
export declare class SyncService extends TracedEventEmitter<EventMap> implements DraftInterface {
|
|
53
53
|
private readonly appRootDirPath;
|
|
54
54
|
readonly applicationId: string;
|
|
55
|
-
|
|
55
|
+
private _branchName;
|
|
56
56
|
generationNumberSequence: GenerationNumberSequence | undefined;
|
|
57
57
|
private lastSyncedGenerationNumber;
|
|
58
58
|
private hashCache;
|
|
@@ -72,6 +72,9 @@ export declare class SyncService extends TracedEventEmitter<EventMap> implements
|
|
|
72
72
|
private _moduleInvalidationCallback?;
|
|
73
73
|
constructor(config: SyncServiceConfig);
|
|
74
74
|
private getLogger;
|
|
75
|
+
get branchName(): string;
|
|
76
|
+
get currentBranchName(): string;
|
|
77
|
+
setBranchName(nextBranchName: string): void;
|
|
75
78
|
/** The current status of the sync service, which indicates what the service is currently doing */
|
|
76
79
|
get status(): SyncServiceStatus;
|
|
77
80
|
private set status(value);
|
|
@@ -115,6 +118,14 @@ export declare class SyncService extends TracedEventEmitter<EventMap> implements
|
|
|
115
118
|
}>;
|
|
116
119
|
private scheduleUploadDirectory;
|
|
117
120
|
cancelPendingSync(): void;
|
|
121
|
+
/**
|
|
122
|
+
* Takes a snapshot of an arbitrary local directory and uploads it to DBFS.
|
|
123
|
+
* Used by the git deploy flow to upload a worktree snapshot for a main branch commit.
|
|
124
|
+
* Does NOT create any internal commits — the caller is responsible for that.
|
|
125
|
+
*/
|
|
126
|
+
uploadSnapshotToDbfs(localDirectoryPath: string): Promise<{
|
|
127
|
+
directoryHash: string;
|
|
128
|
+
}>;
|
|
118
129
|
/**
|
|
119
130
|
* Uploads the local application directory to the server, retrying if the server returns a BadRequestError.
|
|
120
131
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/sync-service/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,uCAAuC,CAAC;AAC7E,OAAO,EAEL,KAAK,YAAY,EACjB,KAAK,2BAA2B,EAChC,kBAAkB,EACnB,MAAM,yBAAyB,CAAC;AAIjC,OAAO,EAEL,KAAK,aAAa,EACnB,MAAM,4BAA4B,CAAC;AAGpC,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/sync-service/index.ts"],"names":[],"mappings":"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"}
|