@skaile/workspaces 5.15.0 → 5.16.0

package/dist/{chunk-DP6YRAPZ.js → chunk-OJHPG6HK.js}

@@ -1,21 +1,21 @@
 import { declaredConnectErrorKind, ClassifiedConnectError, withConnectErrorKind } from './chunk-ZIW34FGO.js';
-import { readUnavailableMarker, OAuthRequiredError, ConnectorFieldMissingError, LegacyAuthGrammarError, ConnectorStartupError, resolveAuthRef } from './chunk-MKTJZLQM.js';
-import { EventNormalizer } from './chunk-PQF5QHVS.js';
-import { resolveModelTier } from './chunk-GLMKS6V6.js';
-import { createDriver } from './chunk-GQ5OYFVD.js';
+import { readUnavailableMarker, OAuthRequiredError, ConnectorFieldMissingError, LegacyAuthGrammarError, ConnectorStartupError, resolveAuthRef } from './chunk-FSSRBWYL.js';
+import { EventNormalizer } from './chunk-TKI7YDWE.js';
+import { resolveModelTier } from './chunk-RTNWU2UD.js';
+import { createDriver } from './chunk-6Q7NKTDG.js';
 import { pluginRegistry } from './chunk-6E6PKKAD.js';
 import { computeStimulus } from './chunk-IFGTRL2I.js';
-import { resolveFlowOutputFields, interpolateNodeInstruction, resolveNodeBindings, validateConsumedNodeOutput, appendAttempt, resolveTerminalFailureStatus, remainingActiveExecutionMs, deriveCheckEvidence, computeFlowStateFromSnapshots, availableRouterFrontier, evaluateRouterSelection, routerSelectionOutput, planRouterSkips, unsettledRouterBranchIds, countFailedAttempts, hasAutomaticRetryBudget, persistedRouterSelection } from './chunk-N36S36OZ.js';
+import { resolveFlowOutputFields, interpolateNodeInstruction, resolveNodeBindings, validateConsumedNodeOutput, appendAttempt, resolveTerminalFailureStatus, remainingActiveExecutionMs, deriveCheckEvidence, computeFlowStateFromSnapshots, availableRouterFrontier, evaluateRouterSelection, routerSelectionOutput, planRouterSkips, unsettledRouterBranchIds, countFailedAttempts, hasAutomaticRetryBudget, persistedRouterSelection } from './chunk-SPV2CXJ3.js';
 import { undeclaredSubFlowOutputReads, mismatchedSubFlowOutputTypes, INPUT_SCHEMA_SHAPES_HINT, coerceInputSchema } from './chunk-LNFKL23K.js';
 import { parseFlowDefinition } from './chunk-X3RMRJNR.js';
 import { describeStimulus, buildOrchestratorPrompt, renderSubpromptPrompt, renderStimulusPrompt } from './chunk-M3WPBTGJ.js';
 import { deterministicNodeKindLabel, nodeInstruction, flowDefaults, isAgentNode, isGateNode, isCheckNode, nodeRequiresApproval, isSubFlowNode, isActiveRuntimeNode, isFunctionNode, isSubpromptNode, isRouterNode, nodeIsOptional, nodeLabel, nodeAssets } from './chunk-7RGTAEG6.js';
 import { classifierDecision, getConsumedOutputSchema, withoutReservedClassifierFields, FLOW_CAPTURE_CHANNELS, captureDestinationFieldName, invalidCaptureDestinationMessage } from './chunk-NUELZWCF.js';
 import { withActivityLabelDefs } from './chunk-D5WTOVLG.js';
-import { loadDriverSdk } from './chunk-4QINFQ27.js';
+import { loadDriverSdk } from './chunk-PIC23DDE.js';
 import { processAlive } from './chunk-4GY63JU6.js';
-import { isInsideProject } from './chunk-J76LDUDS.js';
-import { withFsDeadline, FsDeadlineError, fsDeadlineMs, tryWithFsDeadline } from './chunk-SP5NGNBV.js';
+import { isInsideProject } from './chunk-ZVZTCDUN.js';
+import { withFsDeadline, FsDeadlineError, fsDeadlineMs, tryWithFsDeadline } from './chunk-YW2BNDSE.js';
 import { portableSpawn } from './chunk-ICSCSM5D.js';
 import { createLogger, redactCredentials } from './chunk-BOFL7GIF.js';
 import { resolve, relative, sep, isAbsolute, join, dirname } from 'path';
@@ -2694,6 +2694,9 @@ async function acquireGitCredentials(init) {
 
 // factory-assets/connectors/git/lifecycle.ts
 var READ_ONLY_HOOK_DETAIL = "read-only mount: nothing committed or pushed";
+function notOnMountBranchDetail(repo) {
+  return `checkout is not on ${repo.activeBranch}: nothing committed, pushed or merged; changes left in the working tree`;
+}
 var GitLifecycle = class {
   repo;
   sync;
@@ -2779,6 +2782,7 @@ var GitLifecycle = class {
   async hibernateSave() {
     const { repo, config: lc } = this;
     if (!lc.commitOnHibernate) return void 0;
+    if (!await repo.headIsActiveBranch("hibernate save")) return notOnMountBranchDetail(repo);
     const sha = await repo.commit(`skaile: hibernate snapshot`);
     if (sha === null) return this.pushUnpushedOnHibernate();
     if (lc.pushOnHibernate) {
@@ -2820,6 +2824,7 @@ var GitLifecycle = class {
     const details = [];
     return repo.withLock(async () => {
       if (repo.readOnly) return READ_ONLY_HOOK_DETAIL;
+      if (!await repo.headIsActiveBranch("session close")) return notOnMountBranchDetail(repo);
       const sha = await repo.commit(`skaile: session close`);
       if (sha !== null) details.push(`Committed ${sha}`);
       if (lc.pushOnClose || lc.mergeOnClose) {
@@ -2966,6 +2971,8 @@ var GitRepo = class {
   onChange;
   /** Active branch (differs from the base branch when session branching is active). */
   _activeBranch;
+  /** Per skipped step, the HEAD it was last logged for (see {@link headIsActiveBranch}). */
+  loggedHeadSkips = /* @__PURE__ */ new Map();
   /** Outcome of the last connect-time fetch of the session branch. */
   sessionBranchFetch;
   /** True when this connect cut the session branch from the base or `fromRef` (it holds no work yet). */
@@ -3159,8 +3166,17 @@ var GitRepo = class {
     }
   }
   // -- Driver operations -------------------------------------------------------------
-  /** `git pull` of the active branch by merge, then align submodule checkouts with the merged pins. */
+  /**
+   * `git pull` of the active branch by merge, then align submodule checkouts with the merged pins.
+   * Throws when HEAD is not on the active branch: the merge would land on the agent's branch.
+   */
   async pull() {
+    const head = await gitOrNull(["symbolic-ref", "--quiet", "--short", "HEAD"], this.dir);
+    if (head !== this.activeBranch) {
+      throw new Error(
+        `sync: the checkout is on ${head === null ? "a detached HEAD" : `"${head}"`}, but this mount pulls only "${this.activeBranch}". Check it out first.`
+      );
+    }
     await pullByMerge(this.activeBranch, this.dir, this.auth, 6e4);
     await syncSubmodules(this.dir, this.log, this.auth);
   }
@@ -3172,16 +3188,41 @@ var GitRepo = class {
     if (!await commitAll(this.dir, message, this.log)) return null;
     return git(["rev-parse", "--short", "HEAD"], this.dir);
   }
+  /**
+   * Whether HEAD is on the branch this mount saves (`activeBranch`). The
+   * driver's own commits, merges and pulls run only then: any other branch,
+   * or a detached HEAD, is one the agent checked out, and its work is the
+   * agent's to commit. Logs `skipped` (the step it left out) when not, once
+   * per step and HEAD: the periodic tick would otherwise log it every interval.
+   */
+  async headIsActiveBranch(skipped) {
+    const head = await gitOrNull(["symbolic-ref", "--quiet", "--short", "HEAD"], this.dir);
+    if (head === this.activeBranch) {
+      this.loggedHeadSkips.delete(skipped);
+      return true;
+    }
+    const shown = head ?? "(detached)";
+    if (this.loggedHeadSkips.get(skipped) !== shown) {
+      this.loggedHeadSkips.set(skipped, shown);
+      this.log.info(`${skipped} skipped: the checkout is not on the mount's branch`, {
+        branch: this.activeBranch,
+        head: shown
+      });
+    }
+    return false;
+  }
   /**
    * One idle auto-commit: commit what changed under a message naming the files,
    * and push it when `push` is set. Best-effort - a failure leaves the work
-   * staged and is logged, never thrown. Skips a read-only checkout, an
-   * unfinished merge or rebase, and a repo disposed meanwhile.
+   * staged and is logged, never thrown. Skips a read-only checkout, a HEAD
+   * the agent moved off the mount's branch, an unfinished merge or rebase, and
+   * a repo disposed meanwhile.
    */
   async autoCommit(opts) {
     if (this.readOnly) return;
     const mountPath = this.dir;
     try {
+      if (!await this.headIsActiveBranch("auto-commit")) return;
       if (await refuseUnfinishedOperation(mountPath, this.log)) return;
       const message = await this.generateCommitMessage();
       if (this.disposed) return;
@@ -3228,6 +3269,9 @@ var GitRepo = class {
     const mountPath = this.dir;
     await this.fetchOrigin();
     if (this.disposed) return;
+    if ((opts.autoRebase || opts.autoPull) && !await this.headIsActiveBranch("base branch sync")) {
+      return;
+    }
     if (opts.autoRebase && this.activeBranch !== this.branch) {
       const onOrigin = await this.trackSessionBranch(this.activeBranch);
       if (this.disposed) return;
@@ -13564,5 +13608,5 @@ function describeFlowOperations() {
 }
 
 export { AbstractConnector, BUILTIN_CONNECTOR_CATALOG, BoxConnector, CONNECT_FAILURE_CARRY_OVER_TTL_MS, ClassifierSubpromptRunner, ConnectFailureCarryOver, ConnectorManager, DeployConnector, DevServerConnector, FlowAdapter, GitConnector, GmailConnector, GoogleDriveConnector, LocalConnector, LogBuffer, ManagedGitconfigCollisionError, MattermostConnector, MemoryConnector, MinIOConnector, NO_ACTIVE_FLOW_ERROR, PortPool, PostgresConnector, S3Connector, S3FetchStoppedError, S3PresignedRequestError, S3_PRESIGN_BATCH, SQLiteConnector, SessionInlineSubFlowRunner, SessionNodeExecutor, SessionSubpromptRunner, SharePointConnector, StaticServerConnector, SubFlowContractError, TunnelConnector, WebDAVConnector, XStateConnector, XStateStoreConnector, atomicReplaceCredential, buildConnectorListPayload, buildConnectorPromptSection, buildConnectorToolDefs, buildFlowPromptEvent, buildFlowToolDefs, buildLazyFlowToolDefs, buildLazySdkFlowTools, buildSdkConnectorTools, buildSdkFlowTools, checkFleetMountLiveness, classifierQuestion, classifyConnectError, createConnector, createConnector10, createConnector11, createConnector12, createConnector13, createConnector14, createConnector15, createConnector16, createConnector17, createConnector18, createConnector19, createConnector2, createConnector20, createConnector3, createConnector4, createConnector5, createConnector6, createConnector7, createConnector8, createConnector9, createFsWatcher, createWorktree, defaultSpawn, describeFlowOperations, driveOrchestratorTurn, ensureDirMode, ensureFleetMounted, ensureRefreshAttemptStamp, findGitRoot, findMissingPackages, getConnector, installNpmPackages, isFleetManaged, isPackageResolvable, listConnectors, listWorktrees, missingTokenMediatorMessage, normalizeRuntimeFlow, parseListObjectsV2, presignScopePrefix, presignableKey, readGitSyncStatus, registerBuiltinConnectors, removeMountBlock, removeUnavailableMountBlock, renderCredentialHelperScript, resolveAccessPolicy, tryGetConnector, worktreeRegistry, writeHelperScript, writeMountBlock, writeUnavailableMountBlock };
-//# sourceMappingURL=chunk-DP6YRAPZ.js.map
-//# sourceMappingURL=chunk-DP6YRAPZ.js.map
+//# sourceMappingURL=chunk-OJHPG6HK.js.map
+//# sourceMappingURL=chunk-OJHPG6HK.js.map