@skaile/workspaces 3.22.0 → 3.23.0

package/dist/{chunk-PLLVREB2.js → chunk-YFBDJWRA.js}

@@ -1384,6 +1384,83 @@ var BOOTSTRAP_COMMIT_EMAIL = "skaile@local";
 function gitPrefix(cwd) {
   return ["-c", `safe.directory=${cwd}`];
 }
+var SKAILE_INTERNAL_DIR = ".skaile";
+var SKAILE_EXCLUDE_MARKER = "# skaile: platform-internal session state (git connector)";
+var UNSTAGE_BATCH = 500;
+async function commitIdentityArgs(cwd) {
+  try {
+    await git(["var", "GIT_COMMITTER_IDENT"], cwd, 5e3);
+    return [];
+  } catch (err) {
+    if (typeof err.code !== "number") return [];
+    return [
+      "-c",
+      `user.name=${BOOTSTRAP_COMMIT_NAME}`,
+      "-c",
+      `user.email=${BOOTSTRAP_COMMIT_EMAIL}`
+    ];
+  }
+}
+function gitCommitting(args, cwd, timeout = 3e4) {
+  return commitIdentityArgs(cwd).then((identity) => git([...identity, ...args], cwd, timeout));
+}
+async function ensureSkaileExcluded(cwd, log) {
+  try {
+    const commonDir = await git(["rev-parse", "--git-common-dir"], cwd, 5e3);
+    const excludePath = resolve(cwd, commonDir, "info", "exclude");
+    let current = "";
+    try {
+      current = await readFile(excludePath, "utf-8");
+    } catch (err) {
+      if (err.code !== "ENOENT") throw err;
+      await mkdir(dirname(excludePath), { recursive: true });
+    }
+    if (!current.includes(SKAILE_EXCLUDE_MARKER)) {
+      const sep3 = current === "" || current.endsWith("\n") ? "" : "\n";
+      await writeFile(
+        excludePath,
+        `${current}${sep3}${SKAILE_EXCLUDE_MARKER}
+/${SKAILE_INTERNAL_DIR}/
+`
+      );
+      log.info("excluded platform-internal state from the checkout", { excludePath });
+    }
+    const born = await gitOrNull(["rev-parse", "--verify", "--quiet", "HEAD"], cwd) !== null;
+    const listed = await gitOrNull(
+      // Pathspec, not a gitignore pattern: a leading "/" is not anchoring
+      // syntax here. These run with cwd at the checkout root, so the bare name
+      // already means the root one — which is what the anchored rule above
+      // excludes. The two halves have to agree about that.
+      // `-z` because git C-quotes any path carrying a non-ASCII byte, a
+      // control character, `"` or `\` (core.quotePath, on by default), and the
+      // quoted form fed back as a pathspec matches nothing. The two paths then
+      // fail differently and both badly: `rm --cached` goes fatal and the catch
+      // below drops the whole batch, while `reset` exits 0 having unstaged
+      // nothing at all — no throw, no warning, and `add -A` re-stages it into
+      // the commit this function exists to keep it out of.
+      born ? ["diff", "--cached", "--name-only", "-z", "--diff-filter=A", "--", SKAILE_INTERNAL_DIR] : ["ls-files", "--cached", "-z", "--", SKAILE_INTERNAL_DIR],
+      cwd
+    );
+    const staged = (listed ?? "").split("\0").filter(Boolean);
+    if (staged.length > 0) {
+      for (let i = 0; i < staged.length; i += UNSTAGE_BATCH) {
+        const batch = staged.slice(i, i + UNSTAGE_BATCH);
+        await git(
+          born ? ["reset", "--quiet", "--", ...batch] : ["rm", "--cached", "--quiet", "--", ...batch],
+          cwd,
+          15e3
+        );
+      }
+      log.warn("unstaged platform-internal state left in the index by an earlier session", {
+        entries: staged.length
+      });
+    }
+  } catch (err) {
+    log.warn("could not exclude platform-internal state \u2014 it may reach the remote", {
+      error: err instanceof Error ? err.message : String(err)
+    });
+  }
+}
 async function runGit(args, options) {
   const { stdout } = await execFileAsync2("git", args, {
     encoding: "utf-8",
@@ -1508,7 +1585,7 @@ async function isDirEmpty(dir) {
 async function commitAll(cwd, message) {
   if (!await hasChanges(cwd)) return null;
   await git(["add", "-A"], cwd);
-  return git(["commit", "-m", message], cwd);
+  return gitCommitting(["commit", "-m", message], cwd);
 }
 var TokenMediatorError = class extends Error {
   code;
@@ -1622,6 +1699,7 @@ var GitConnector = class extends AbstractConnector {
           this.scheduleRefresh(declaration.id, state, initial.expiresAt);
         }
       }
+      await ensureSkaileExcluded(targetDir, this.log);
       this.log.info("mount ok", {
         targetDir,
         activeBranch: state.activeBranch,
@@ -1915,7 +1993,7 @@ var GitConnector = class extends AbstractConnector {
     }
     this.log.debug("sync (pull) start", { branch: s.activeBranch });
     try {
-      await git(["pull", "origin", s.activeBranch], handle.mountPath, 6e4);
+      await gitCommitting(["pull", "origin", s.activeBranch], handle.mountPath, 6e4);
       await syncSubmodules(handle.mountPath, this.log);
       this.log.debug("sync ok");
     } catch (err) {
@@ -2001,20 +2079,29 @@ var GitConnector = class extends AbstractConnector {
       }
       if (lc.mergeOnClose && s.activeBranch !== s.branch) {
         await git(["checkout", s.branch], handle.mountPath);
-        await git(["pull", "origin", s.branch], handle.mountPath, 6e4);
+        await gitCommitting(["pull", "origin", s.branch], handle.mountPath, 6e4);
         await syncSubmodules(handle.mountPath, this.log);
+        let merged = true;
         try {
-          await git(["merge", s.activeBranch], handle.mountPath);
-        } catch {
+          await gitCommitting(["merge", s.activeBranch], handle.mountPath);
+        } catch (err) {
+          this.log.warn("merge failed", {
+            branch: s.activeBranch,
+            error: redactUrlAuth(err instanceof Error ? err.message : String(err))
+          });
           const resolved = await this.resolveConflictsOrAbort(s, handle.mountPath, "merge");
           if (resolved) {
             details.push("Resolved merge conflicts (created .conflict files)");
+          } else {
+            merged = false;
           }
         }
         if (lc.pushOnClose) {
           await git(["push", "origin", s.branch], handle.mountPath, 6e4);
         }
-        details.push(`Merged ${s.activeBranch} into ${s.branch}`);
+        details.push(
+          merged ? `Merged ${s.activeBranch} into ${s.branch}` : `Merge of ${s.activeBranch} into ${s.branch} FAILED`
+        );
       }
       return details.join("; ") || void 0;
     } finally {
@@ -2660,14 +2747,18 @@ var GitConnector = class extends AbstractConnector {
     if (s.disposed) return;
     if (s.sync.autoRebase && s.activeBranch !== s.branch) {
       try {
-        await git(["rebase", `origin/${s.branch}`], mountPath, 6e4);
-      } catch {
+        await gitCommitting(["rebase", `origin/${s.branch}`], mountPath, 6e4);
+      } catch (err) {
+        this.log.warn("rebase failed", {
+          branch: s.branch,
+          error: redactUrlAuth(err instanceof Error ? err.message : String(err))
+        });
         await this.resolveConflictsOrAbort(s, mountPath, "rebase");
       }
       if (s.disposed) return;
       await syncSubmodules(mountPath, this.log);
     } else if (s.sync.autoPull) {
-      await git(["pull", "origin", s.activeBranch], mountPath, 6e4);
+      await gitCommitting(["pull", "origin", s.activeBranch], mountPath, 6e4);
       if (s.disposed) return;
       await syncSubmodules(mountPath, this.log);
     }
@@ -2686,9 +2777,9 @@ var GitConnector = class extends AbstractConnector {
         await this.resolveFileConflict(mountPath, file);
       }
       if (mode === "rebase") {
-        await git(["-c", "core.editor=true", "rebase", "--continue"], mountPath, 3e4);
+        await gitCommitting(["-c", "core.editor=true", "rebase", "--continue"], mountPath, 3e4);
       } else {
-        await git(["commit", "--no-edit"], mountPath);
+        await gitCommitting(["commit", "--no-edit"], mountPath);
       }
       for (const file of conflicted) {
         const ext = file.includes(".") ? file.slice(file.lastIndexOf(".")) : "";
@@ -10718,5 +10809,5 @@ function createConnector() {
 }
 
 export { AbstractConnector, BUILTIN_CONNECTOR_CATALOG, BoxConnector, ConnectorFieldMissingError, ConnectorManager, ConnectorStartupError, DeployConnector, DevServerConnector, FlowAdapter, GitConnector, GmailConnector, GoogleDriveConnector, LocalConnector, LogBuffer, ManagedGitconfigCollisionError, MattermostConnector, MemoryConnector, MinIOConnector, PortPool, PostgresConnector, S3Connector, SQLiteConnector, SessionInlineSubFlowRunner, SessionNodeExecutor, SessionSubpromptRunner, SharePointConnector, StaticServerConnector, TunnelConnector, WebDAVConnector, XStateConnector, XStateStoreConnector, __test, atomicReplaceCredential, buildConnectorPromptSection, buildConnectorToolDefs, buildFlowPromptEvent, buildFlowToolDefs, buildSdkConnectorTools, buildSdkFlowTools, createConnector, createConnector10, createConnector11, createConnector12, createConnector13, createConnector14, createConnector15, createConnector16, createConnector17, createConnector18, createConnector19, createConnector2, createConnector20, createConnector3, createConnector4, createConnector5, createConnector6, createConnector7, createConnector8, createConnector9, createFsWatcher, createWorktree, defaultSpawn, driveOrchestratorTurn, ensureDirMode, ensureFleetMounted, ensureRefreshAttemptStamp, findGitRoot, findMissingPackages, getConnector, installNpmPackages, isFleetManaged, isPackageResolvable, listConnectors, listWorktrees, readGitSyncStatus, registerBuiltinConnectors, removeMountBlock, removeUnavailableMountBlock, renderCredentialHelperScript, tryGetConnector, worktreeRegistry, writeHelperScript, writeMountBlock, writeUnavailableMountBlock };
-//# sourceMappingURL=chunk-PLLVREB2.js.map
-//# sourceMappingURL=chunk-PLLVREB2.js.map
+//# sourceMappingURL=chunk-YFBDJWRA.js.map
+//# sourceMappingURL=chunk-YFBDJWRA.js.map