@superblocksteam/vite-plugin-file-sync 2.0.96 → 2.0.97-next.0

package/dist/parsing/sdk-registry.js

@@ -0,0 +1,128 @@
+import { parse } from "@babel/parser";
+export async function parseSdkRegistryFromContent(registryContent, resolveImportPath) {
+    const result = new Map();
+    if (registryContent.trim() === "") {
+        return result;
+    }
+    let ast;
+    try {
+        ast = parse(registryContent, {
+            sourceType: "module",
+            plugins: ["typescript"],
+        });
+    }
+    catch {
+        return result;
+    }
+    const importMap = new Map();
+    for (const node of ast.program.body) {
+        if (node.type !== "ImportDeclaration")
+            continue;
+        const specifier = node.specifiers[0];
+        if (!specifier || specifier.type !== "ImportDefaultSpecifier")
+            continue;
+        const localName = specifier.local?.name;
+        const source = node.source?.value;
+        if (typeof localName !== "string" || typeof source !== "string")
+            continue;
+        const resolved = await resolveImportPath(source);
+        if (resolved) {
+            importMap.set(localName, resolved);
+        }
+    }
+    const exportedObject = findExportedObject(ast);
+    if (!exportedObject) {
+        return result;
+    }
+    for (const prop of exportedObject.properties) {
+        if (prop.type !== "ObjectProperty")
+            continue;
+        const key = getPropertyKey(prop);
+        if (!key)
+            continue;
+        const value = prop.value;
+        let resolvedPath;
+        if (value.type === "Identifier") {
+            resolvedPath = importMap.get(value.name ?? "");
+        }
+        else if (value.type === "CallExpression") {
+            resolvedPath = await resolveImportPathFromCall(value, resolveImportPath);
+        }
+        else if (value.type === "ArrowFunctionExpression") {
+            const body = value.body;
+            if (body?.type === "CallExpression") {
+                resolvedPath = await resolveImportPathFromCall(body, resolveImportPath);
+            }
+        }
+        if (resolvedPath) {
+            result.set(key, resolvedPath);
+        }
+    }
+    return result;
+}
+async function resolveImportPathFromCall(call, resolveImportPath) {
+    if (call.callee.type !== "Import") {
+        return undefined;
+    }
+    const arg = call.arguments[0];
+    if (arg?.type !== "StringLiteral" || typeof arg.value !== "string") {
+        return undefined;
+    }
+    return resolveImportPath(arg.value);
+}
+function getPropertyKey(prop) {
+    if (prop.key.type === "Identifier")
+        return prop.key.name;
+    if (prop.key.type === "StringLiteral")
+        return prop.key.value;
+    return undefined;
+}
+function findExportedObject(ast) {
+    for (const node of ast.program.body) {
+        if (node.type !== "ExportDefaultDeclaration")
+            continue;
+        const declaration = node.declaration;
+        const objectExpression = getObjectExpression(declaration);
+        if (objectExpression) {
+            return objectExpression;
+        }
+        if (declaration.type !== "Identifier" || !declaration.name)
+            continue;
+        const variableDeclaration = findVariableDeclaration(ast, declaration.name);
+        if (variableDeclaration?.init) {
+            return variableDeclaration.init;
+        }
+    }
+    return undefined;
+}
+function getObjectExpression(node) {
+    if (node.type === "ObjectExpression") {
+        return node;
+    }
+    if ((node.type === "TSAsExpression" || node.type === "TSSatisfiesExpression") &&
+        "expression" in node) {
+        const expression = node.expression;
+        if (expression?.type === "ObjectExpression") {
+            return expression;
+        }
+    }
+    return undefined;
+}
+function findVariableDeclaration(ast, name) {
+    for (const node of ast.program.body) {
+        if (node.type !== "VariableDeclaration")
+            continue;
+        for (const declarator of node.declarations) {
+            if (declarator.id.type === "Identifier" &&
+                declarator.id.name === name &&
+                declarator.init) {
+                const objectExpression = getObjectExpression(declarator.init);
+                if (objectExpression) {
+                    return { init: objectExpression };
+                }
+            }
+        }
+    }
+    return undefined;
+}
+//# sourceMappingURL=sdk-registry.js.map

package/dist/parsing/sdk-registry.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"sdk-registry.js","sourceRoot":"","sources":["../../src/parsing/sdk-registry.ts"],"names":[],"mappings":"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"}

package/dist/socket-manager.d.ts

@@ -1,4 +1,5 @@
 import { TracedEventEmitter } from "@superblocksteam/shared";
+import { type GitOperationLock } from "./git-operation-lock.js";
 import type { AiService } from "./ai-service/index.js";
 import type { FileSystemManager } from "./file-system-manager.js";
 import type { GitService } from "./git-service/index.js";
@@ -25,7 +26,7 @@ declare class SocketManager extends TracedEventEmitter<SocketManagerEvents> {
     private _disposer;
     constructor(tracer: Tracer);
     private socketServer;
-    startSocketServer({ server, fileSyncManager, syncService, lockService, aiService, gitService, activateGitService, checkAuthorization, path, tracer, }: {
+    startSocketServer({ server, fileSyncManager, syncService, lockService, aiService, gitService, activateGitService, checkAuthorization, path, tracer, gitOperationLock, }: {
         server: http.Server;
         fileSyncManager: FileSystemManager;
         syncService?: SyncService;
@@ -36,6 +37,7 @@ declare class SocketManager extends TracedEventEmitter<SocketManagerEvents> {
         checkAuthorization: CheckAuthorization;
         path: string;
         tracer: Tracer;
+        gitOperationLock?: GitOperationLock;
     }): void;
     callEditorClients(fn: (socket: ISocketClient<EditorClientMethods>) => Promise<void>): void;
     callLibraryClients(fn: (socket: ISocketClient<LibraryClientMethods>) => Promise<void>): void;

package/dist/socket-manager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"socket-manager.d.ts","sourceRoot":"","sources":["../src/socket-manager.ts"],"names":[],"mappings":"AAKA,OAAO,EAGL,kBAAkB,EAEnB,MAAM,yBAAyB,CAAC;AAYjC,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AACvD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAClE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AACzD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAC3D,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AAC9D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAC3D,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AACjD,OAAO,KAAK,EAGV,mBAAmB,EACnB,oBAAoB,EAGrB,MAAM,uCAAuC,CAAC;AAC/C,OAAO,KAAK,EAEV,aAAa,EAEd,MAAM,yBAAyB,CAAC;AACjC,OAAO,KAAK,IAAI,MAAM,WAAW,CAAC;AAIlC,KAAK,mBAAmB,GAAG;IACzB,gBAAgB,EAAE,CAAC,aAAa,CAAC,mBAAmB,CAAC,EAAE,MAAM,CAAC,CAAC;IAC/D,iBAAiB,EAAE,CAAC,aAAa,CAAC,oBAAoB,CAAC,CAAC,CAAC;IACzD,mBAAmB,EAAE,CAAC,MAAM,CAAC,CAAC;CAC/B,CAAC;AAOF,wBAAgB,yBAAyB,IAAI,OAAO,CAEnD;AAED,wBAAgB,0BAA0B,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,CAEjE;AAED,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,MAAM,iBAIjD;AAED,wBAAgB,oBAAoB,SAGnC;AAED,cAAM,aAAc,SAAQ,kBAAkB,CAAC,mBAAmB,CAAC;IACjE,OAAO,CAAC,OAAO,CAA8C;IAE7D,OAAO,CAAC,aAAa,CAAiD;IACtE,OAAO,CAAC,cAAc,CAAkD;IACxE,OAAO,CAAC,SAAS,CAAwB;gBAE7B,MAAM,EAAE,MAAM;IAI1B,OAAO,CAAC,YAAY,CAA8B;IAClD,iBAAiB,CAAC,EAChB,MAAM,EACN,eAAe,EACf,WAAW,EACX,WAAW,EACX,SAAS,EACT,UAAU,EACV,kBAAkB,EAClB,kBAAkB,EAClB,IAAI,EACJ,MAAM,GACP,EAAE;QACD,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC;QACpB,eAAe,EAAE,iBAAiB,CAAC;QACnC,WAAW,CAAC,EAAE,WAAW,CAAC;QAC1B,WAAW,CAAC,EAAE,WAAW,CAAC;QAC1B,SAAS,CAAC,EAAE,SAAS,CAAC;QACtB,UAAU,CAAC,EAAE,UAAU,CAAC;QACxB,kBAAkB,CAAC,EAAE,MAAM,OAAO,CAAC,UAAU,GAAG,SAAS,CAAC,CAAC;QAC3D,kBAAkB,EAAE,kBAAkB,CAAC;QACvC,IAAI,EAAE,MAAM,CAAC;QACb,MAAM,EAAE,MAAM,CAAC;KAChB;IAs8BD,iBAAiB,CACf,EAAE,EAAE,CAAC,MAAM,EAAE,aAAa,CAAC,mBAAmB,CAAC,KAAK,OAAO,CAAC,IAAI,CAAC;IAOnE,kBAAkB,CAChB,EAAE,EAAE,CAAC,MAAM,EAAE,aAAa,CAAC,oBAAoB,CAAC,KAAK,OAAO,CAAC,IAAI,CAAC;IAOpE,mBAAmB;IAInB,gBAAgB,IAAI,QAAQ,CAAC,aAAa,CAAC,mBAAmB,CAAC,CAAC;IAIhE,eAAe;IASf,OAAO;CAGR"}
+{"version":3,"file":"socket-manager.d.ts","sourceRoot":"","sources":["../src/socket-manager.ts"],"names":[],"mappings":"AAKA,OAAO,EAGL,kBAAkB,EAEnB,MAAM,yBAAyB,CAAC;AAKjC,OAAO,EAEL,KAAK,gBAAgB,EACtB,MAAM,yBAAyB,CAAC;AASjC,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AACvD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAClE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AACzD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAC3D,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AAC9D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAC3D,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AACjD,OAAO,KAAK,EAGV,mBAAmB,EACnB,oBAAoB,EAGrB,MAAM,uCAAuC,CAAC;AAC/C,OAAO,KAAK,EAEV,aAAa,EAEd,MAAM,yBAAyB,CAAC;AACjC,OAAO,KAAK,IAAI,MAAM,WAAW,CAAC;AAIlC,KAAK,mBAAmB,GAAG;IACzB,gBAAgB,EAAE,CAAC,aAAa,CAAC,mBAAmB,CAAC,EAAE,MAAM,CAAC,CAAC;IAC/D,iBAAiB,EAAE,CAAC,aAAa,CAAC,oBAAoB,CAAC,CAAC,CAAC;IACzD,mBAAmB,EAAE,CAAC,MAAM,CAAC,CAAC;CAC/B,CAAC;AAOF,wBAAgB,yBAAyB,IAAI,OAAO,CAEnD;AAED,wBAAgB,0BAA0B,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,CAEjE;AAED,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,MAAM,iBAIjD;AAED,wBAAgB,oBAAoB,SAGnC;AAED,cAAM,aAAc,SAAQ,kBAAkB,CAAC,mBAAmB,CAAC;IACjE,OAAO,CAAC,OAAO,CAA8C;IAE7D,OAAO,CAAC,aAAa,CAAiD;IACtE,OAAO,CAAC,cAAc,CAAkD;IACxE,OAAO,CAAC,SAAS,CAAwB;gBAE7B,MAAM,EAAE,MAAM;IAI1B,OAAO,CAAC,YAAY,CAA8B;IAClD,iBAAiB,CAAC,EAChB,MAAM,EACN,eAAe,EACf,WAAW,EACX,WAAW,EACX,SAAS,EACT,UAAU,EACV,kBAAkB,EAClB,kBAAkB,EAClB,IAAI,EACJ,MAAM,EACN,gBAAgB,GACjB,EAAE;QACD,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC;QACpB,eAAe,EAAE,iBAAiB,CAAC;QACnC,WAAW,CAAC,EAAE,WAAW,CAAC;QAC1B,WAAW,CAAC,EAAE,WAAW,CAAC;QAC1B,SAAS,CAAC,EAAE,SAAS,CAAC;QACtB,UAAU,CAAC,EAAE,UAAU,CAAC;QACxB,kBAAkB,CAAC,EAAE,MAAM,OAAO,CAAC,UAAU,GAAG,SAAS,CAAC,CAAC;QAC3D,kBAAkB,EAAE,kBAAkB,CAAC;QACvC,IAAI,EAAE,MAAM,CAAC;QACb,MAAM,EAAE,MAAM,CAAC;QACf,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;KACrC;IA8mCD,iBAAiB,CACf,EAAE,EAAE,CAAC,MAAM,EAAE,aAAa,CAAC,mBAAmB,CAAC,KAAK,OAAO,CAAC,IAAI,CAAC;IAOnE,kBAAkB,CAChB,EAAE,EAAE,CAAC,MAAM,EAAE,aAAa,CAAC,oBAAoB,CAAC,KAAK,OAAO,CAAC,IAAI,CAAC;IAOpE,mBAAmB;IAInB,gBAAgB,IAAI,QAAQ,CAAC,aAAa,CAAC,mBAAmB,CAAC,CAAC;IAIhE,eAAe;IASf,OAAO;CAGR"}

package/dist/socket-manager.js

@@ -6,6 +6,8 @@ import { createISocketClient, SUPERBLOCKS_LIVE_GIT_BRANCH, TracedEventEmitter, T
 import { WebSocketServer } from "ws";
 import { uploadContextToBucketeer } from "./ai-service/context-upload.js";
 import { createSocketRecordingMiddleware } from "./ai-service/recording/recorders/socket-recorder.js";
+import { GIT_OPERATION_BUSY_MESSAGE, } from "./git-operation-lock.js";
+import { ensureGithubWorkflowFile } from "./git-service/github-workflow.js";
 import { GitConflictError } from "./git-service/index.js";
 import { ensureLiveBranchCheckedOut, pushLiveBranchWithAutoRecreate, rollbackLastCommit, } from "./git-service/live-branch.js";
 import { getErrorMeta, getLogger } from "./util/logger.js";
@@ -37,7 +39,7 @@ class SocketManager extends TracedEventEmitter {
         super(tracer);
     }
     socketServer;
-    startSocketServer({ server, fileSyncManager, syncService, lockService, aiService, gitService, activateGitService, checkAuthorization, path, tracer, }) {
+    startSocketServer({ server, fileSyncManager, syncService, lockService, aiService, gitService, activateGitService, checkAuthorization, path, tracer, gitOperationLock, }) {
         if (this.socketServer) {
             throw new Error("Socket server already started");
         }
@@ -47,6 +49,7 @@ class SocketManager extends TracedEventEmitter {
         const getActiveGitService = async () => {
             if (activeGitService) {
                 await ensureLiveBranchCheckedOut(activeGitService);
+                aiService?.setRuntimeGitServices(activeGitService, syncService, gitOperationLock);
                 return activeGitService;
             }
             if (!activateGitService) {
@@ -60,13 +63,21 @@ class SocketManager extends TracedEventEmitter {
                     activeGitService = await activateGitService();
                     if (activeGitService) {
                         await ensureLiveBranchCheckedOut(activeGitService);
+                        aiService?.setRuntimeGitServices(activeGitService, syncService, gitOperationLock);
                         return activeGitService;
                     }
                 }
                 catch (error) {
-                    getLogger().warn(`[git] getActiveGitService: activation attempt ${attempt}/${maxAttempts} failed: ${error instanceof Error ? error.message : String(error)}`);
+                    getLogger().warn("[git] activation attempt failed", {
+                        gitCategory: "setup",
+                        gitOperation: "activate",
+                        gitOutcome: "failed",
+                        gitAttempt: attempt,
+                        gitMaxAttempts: maxAttempts,
+                        ...getErrorMeta(error),
+                    });
                     if (attempt === maxAttempts) {
-                        getLogger().error(`[git] getActiveGitService: all ${maxAttempts} activation attempts exhausted`, getErrorMeta(error));
+                        getLogger().error(`[git] activation attempts exhausted (${attempt}/${maxAttempts})`, getErrorMeta(error));
                         throw error;
                     }
                 }
@@ -78,6 +89,21 @@ class SocketManager extends TracedEventEmitter {
             }
             return undefined;
         };
+        async function runWithGitLock(fn) {
+            if (!gitOperationLock) {
+                return fn();
+            }
+            const result = gitOperationLock.tryAcquire();
+            if (!result.acquired) {
+                throw new Error(GIT_OPERATION_BUSY_MESSAGE);
+            }
+            try {
+                return await fn();
+            }
+            finally {
+                result.release();
+            }
+        }
         const handleUpgrade = (req, socket, head) => {
             if (!req.url) {
                 return;
@@ -214,6 +240,7 @@ class SocketManager extends TracedEventEmitter {
                                                 branchName: syncService.branchName,
                                                 appRootDirPath: aiService.appRootDirPath,
                                                 userId: contextId.userId,
+                                                useServerUpload: aiService.isAiFileUploadEnabled,
                                                 superblocksBaseUrl: aiService.superblocksBaseUrl,
                                                 logger: getLogger(),
                                                 jwt,
@@ -317,6 +344,14 @@ class SocketManager extends TracedEventEmitter {
                             return { fact };
                         },
                     ],
+                    aiMoveAppKnowledge: [
+                        async (request) => {
+                            if (!aiService) {
+                                throw new Error("AI service not available");
+                            }
+                            return await aiService.moveAppFact(request);
+                        },
+                    ],
                     aiRestoreToCommit: [
                         async (request, _context) => {
                             // Update clark.context.jwt from socket if missing (for restore operations)
@@ -379,37 +414,57 @@ class SocketManager extends TracedEventEmitter {
                         },
                     ],
                     gitCommitLocal: [
-                        async (request) => {
-                            const readyGitService = await getActiveGitService();
-                            if (!readyGitService) {
-                                throw new Error("Git is not configured for this application");
-                            }
-                            await readyGitService
-                                .fetch("origin", SUPERBLOCKS_LIVE_GIT_BRANCH)
-                                .catch((fetchErr) => {
-                                const msg = fetchErr instanceof Error
-                                    ? fetchErr.message
-                                    : String(fetchErr);
-                                if (!msg.includes("couldn't find remote ref")) {
-                                    throw fetchErr;
+                        async (request) => runWithGitLock(async () => {
+                            try {
+                                const readyGitService = await getActiveGitService();
+                                if (!readyGitService) {
+                                    throw new Error("Git is not configured for this application");
                                 }
-                            });
-                            await readyGitService.add(".");
-                            const result = await readyGitService.commit(request.message);
-                            return { sha: result.commit };
-                        },
+                                await readyGitService
+                                    .fetch("origin", SUPERBLOCKS_LIVE_GIT_BRANCH)
+                                    .catch((fetchErr) => {
+                                    const msg = fetchErr instanceof Error
+                                        ? fetchErr.message
+                                        : String(fetchErr);
+                                    if (!msg.includes("couldn't find remote ref")) {
+                                        throw fetchErr;
+                                    }
+                                });
+                                await ensureGithubWorkflowFile(readyGitService, aiService?.superblocksBaseUrl).catch((error) => {
+                                    getLogger().warn("[git] gitCommitLocal failed to ensure GitHub workflow file", {
+                                        gitCategory: "setup",
+                                        gitOperation: "ensure-github-workflow-file",
+                                        gitOutcome: "failed",
+                                        ...getErrorMeta(error),
+                                    });
+                                });
+                                await readyGitService.add(".");
+                                const result = await readyGitService.commit(request.message);
+                                return { sha: result.commit };
+                            }
+                            catch (error) {
+                                getLogger().error("[git] gitCommitLocal failed", getErrorMeta(error));
+                                throw error;
+                            }
+                        }),
                     ],
                     gitPushLiveBranch: [
-                        async () => {
-                            const readyGitService = await getActiveGitService();
-                            if (!readyGitService) {
-                                throw new Error("Git is not configured for this application");
+                        async () => runWithGitLock(async () => {
+                            try {
+                                const readyGitService = await getActiveGitService();
+                                if (!readyGitService) {
+                                    throw new Error("Git is not configured for this application");
+                                }
+                                await pushLiveBranchWithAutoRecreate(readyGitService);
                             }
-                            await pushLiveBranchWithAutoRecreate(readyGitService);
-                        },
+                            catch (error) {
+                                getLogger().error("[git] gitPushLiveBranch failed", getErrorMeta(error));
+                                throw error;
+                            }
+                        }),
                     ],
                     gitRollbackLastCommit: [
-                        async (request) => {
+                        async (request) => runWithGitLock(async () => {
                             const readyGitService = await getActiveGitService();
                             if (!readyGitService) {
                                 throw new Error("Git is not configured for this application");
@@ -418,10 +473,10 @@ class SocketManager extends TracedEventEmitter {
                                 gitService: readyGitService,
                                 expectedSha: request.expectedSha,
                             });
-                        },
+                        }),
                     ],
                     gitPull: [
-                        async (_request, _context) => {
+                        async (_request, _context) => runWithGitLock(async () => {
                             const readyGitService = await getActiveGitService();
                             if (!readyGitService) {
                                 throw new Error("Git is not configured for this application");
@@ -489,10 +544,18 @@ class SocketManager extends TracedEventEmitter {
                             }
                             if (hasConflicts) {
                                 const conflictedFiles = await readyGitService.getConflictedFiles();
+                                getLogger().warn("[git] pull conflict detected", {
+                                    gitCategory: "pull",
+                                    gitOperation: "pull",
+                                    gitOutcome: "conflict",
+                                    branch: SUPERBLOCKS_LIVE_GIT_BRANCH,
+                                    conflictedFileCount: conflictedFiles.length,
+                                    conflictedFiles,
+                                });
                                 return { merged: false, conflictedFiles };
                             }
                             return { merged };
-                        },
+                        }),
                     ],
                     gitSyncStatus: [
                         async () => {
@@ -506,7 +569,13 @@ class SocketManager extends TracedEventEmitter {
                                 hasUncommittedChanges = status.files.length > 0;
                             }
                             catch (statusErr) {
-                                getLogger().warn("[git] gitSyncStatus: git status failed — .git may be corrupted, treating as not configured", getErrorMeta(statusErr));
+                                getLogger().warn("[git] gitSyncStatus status failed", {
+                                    gitCategory: "status",
+                                    gitOperation: "syncStatus",
+                                    gitOutcome: "failed",
+                                    gitErrorKind: "status_failed",
+                                    ...getErrorMeta(statusErr),
+                                });
                                 return null;
                             }
                             let ahead = 0;
@@ -518,9 +587,34 @@ class SocketManager extends TracedEventEmitter {
                                 behind = counts.behind;
                             }
                             catch (fetchErr) {
-                                getLogger().warn(`[git] gitSyncStatus: fetch/revList failed (remote unreachable or tracking branch missing): ${fetchErr instanceof Error ? fetchErr.message : String(fetchErr)}`);
+                                getLogger().warn("[git] gitSyncStatus fetch/revList failed", {
+                                    gitCategory: "status",
+                                    gitOperation: "syncStatus",
+                                    gitOutcome: "failed",
+                                    gitErrorKind: "fetch_or_rev_list_failed",
+                                    branch: SUPERBLOCKS_LIVE_GIT_BRANCH,
+                                    remote: "origin",
+                                    ...getErrorMeta(fetchErr),
+                                });
                             }
-                            return { ahead, behind, hasUncommittedChanges };
+                            let aheadOfDefaultBranch = false;
+                            try {
+                                const defaultBranch = await readyGitService.getDefaultBranch();
+                                if (defaultBranch) {
+                                    await readyGitService.fetch("origin", defaultBranch);
+                                    const defaultCounts = await readyGitService.revList("HEAD", `origin/${defaultBranch}`);
+                                    aheadOfDefaultBranch = defaultCounts.ahead > 0;
+                                }
+                            }
+                            catch {
+                                // Optional: enable Open PR when branch has commits vs default.
+                            }
+                            return {
+                                ahead,
+                                behind,
+                                hasUncommittedChanges,
+                                aheadOfDefaultBranch,
+                            };
                         },
                     ],
                     gitChangedFiles: [
@@ -540,25 +634,49 @@ class SocketManager extends TracedEventEmitter {
                                 }));
                             }
                             catch (err) {
-                                getLogger().warn("[git] gitChangedFiles: git status failed", getErrorMeta(err));
+                                getLogger().warn("[git] gitChangedFiles status failed", {
+                                    gitCategory: "status",
+                                    gitOperation: "changed-files",
+                                    gitOutcome: "failed",
+                                    gitErrorKind: "status_failed",
+                                    ...getErrorMeta(err),
+                                });
                                 return [];
                             }
                         },
                     ],
                     gitActivate: [
-                        async () => {
+                        async () => runWithGitLock(async () => {
                             const service = await getActiveGitService();
                             return { activated: !!service };
-                        },
+                        }),
                     ],
                     gitDisconnect: [
-                        async () => {
+                        async () => runWithGitLock(async () => {
+                            // Native git disconnect should move runtime lock context back
+                            // to default branch before clients reconnect.
+                            if (lockService) {
+                                try {
+                                    await lockService.switchBranch("main", {
+                                        reacquireLock: true,
+                                    });
+                                }
+                                catch (err) {
+                                    getLogger().warn("[git] gitDisconnect failed to switch lock branch back to main", {
+                                        gitCategory: "setup",
+                                        gitOperation: "disconnect",
+                                        gitOutcome: "failed",
+                                        gitErrorKind: "switch_lock_branch_failed",
+                                        ...getErrorMeta(err),
+                                    });
+                                }
+                            }
                             if (activeGitService) {
                                 const gitDir = join(activeGitService.workDir, ".git");
                                 activeGitService = undefined;
                                 await rm(gitDir, { recursive: true, force: true });
                             }
-                        },
+                        }),
                     ],
                     gitDefaultBranch: [
                         async () => {
@@ -569,7 +687,13 @@ class SocketManager extends TracedEventEmitter {
                                 return await readyGitService.getDefaultBranch();
                             }
                             catch (err) {
-                                getLogger().warn("[git] gitDefaultBranch: failed to detect default branch", getErrorMeta(err));
+                                getLogger().warn("[git] gitDefaultBranch failed", {
+                                    gitCategory: "branch",
+                                    gitOperation: "default-branch",
+                                    gitOutcome: "failed",
+                                    gitErrorKind: "default_branch_detection_failed",
+                                    ...getErrorMeta(err),
+                                });
                                 return null;
                             }
                         },
@@ -598,7 +722,15 @@ class SocketManager extends TracedEventEmitter {
                                     await readyGitService.fetch("origin", branch);
                                 }
                                 catch (fetchErr) {
-                                    getLogger().warn(`[git] gitBranchLog: fetch origin/${branch} failed: ${fetchErr instanceof Error ? fetchErr.message : String(fetchErr)}`);
+                                    getLogger().warn("[git] gitBranchLog fetch failed", {
+                                        gitCategory: "branch",
+                                        gitOperation: "branch-log",
+                                        gitOutcome: "failed",
+                                        gitErrorKind: "branch_log_fetch_failed",
+                                        branch,
+                                        remote: "origin",
+                                        ...getErrorMeta(fetchErr),
+                                    });
                                 }
                             }
                             const SEP = "<<SEP>>";
@@ -627,7 +759,7 @@ class SocketManager extends TracedEventEmitter {
                         },
                     ],
                     gitPrepareMainCommit: [
-                        async (request) => {
+                        async (request) => runWithGitLock(async () => {
                             const readyGitService = await getActiveGitService();
                             if (!readyGitService) {
                                 throw new Error("Git service is not available");
@@ -644,7 +776,15 @@ class SocketManager extends TracedEventEmitter {
                                 await readyGitService.fetch("origin", defaultBranch);
                             }
                             catch (fetchErr) {
-                                getLogger().warn(`[git] gitPrepareMainCommit: fetch origin/${defaultBranch} failed: ${fetchErr instanceof Error ? fetchErr.message : String(fetchErr)}`);
+                                getLogger().warn("[git] gitPrepareMainCommit fetch failed", {
+                                    gitCategory: "build",
+                                    gitOperation: "prepare-main-commit",
+                                    gitOutcome: "failed",
+                                    gitErrorKind: "prepare_main_commit_fetch_failed",
+                                    defaultBranch,
+                                    remote: "origin",
+                                    ...getErrorMeta(fetchErr),
+                                });
                             }
                             const worktreeBase = await mkdtemp(join(tmpdir(), "sb-main-deploy-"));
                             const worktreePath = join(worktreeBase, "worktree");
@@ -687,14 +827,21 @@ class SocketManager extends TracedEventEmitter {
                                     ]);
                                 }
                                 catch (cleanupErr) {
-                                    getLogger().warn(`[git] gitPrepareMainCommit: worktree cleanup failed: ${cleanupErr instanceof Error ? cleanupErr.message : String(cleanupErr)}`);
+                                    getLogger().warn("[git] gitPrepareMainCommit worktree cleanup failed", {
+                                        gitCategory: "build",
+                                        gitOperation: "prepare-main-commit",
+                                        gitOutcome: "failed",
+                                        gitErrorKind: "worktree_cleanup_failed",
+                                        worktreePath,
+                                        ...getErrorMeta(cleanupErr),
+                                    });
                                 }
                                 await rm(worktreeBase, {
                                     recursive: true,
                                     force: true,
                                 });
                             }
-                        },
+                        }),
                     ],
                 },
             }, middlewares, tracer, {