@skaile/workspaces 0.31.0 → 0.32.0

package/dist/{chunk-QF6LBS2C.js → chunk-GXHJDQ37.js}

@@ -1,11 +1,11 @@
 import { renderGoogleDriveConfig, renderOneDriveConfig, renderWebDAVConfig } from './chunk-OVRSNIKJ.js';
-import { resolveAuthRef, resolveAuth, resolveMountCredentialString } from './chunk-VO7QQ76S.js';
+import { resolveAuthRef, resolveAuth, resolveMountCredentialString } from './chunk-2RQ3KLY3.js';
 import { PortPool, createFsWatcher, RcloneProcessManager, ensureDirMode } from './chunk-74UKG2LA.js';
 import { pluginRegistry } from './chunk-6E6PKKAD.js';
 import { computeFlowStateFromSnapshots } from './chunk-X46FY45B.js';
 import { renderStimulusPrompt } from './chunk-DEYYRFQU.js';
 import { computeStimulus } from './chunk-IFGTRL2I.js';
-import { portableSpawn } from './chunk-G247J4MC.js';
+import { portableSpawn } from './chunk-7WHBI3I6.js';
 import { createLogger } from './chunk-JB35MVBN.js';
 import { existsSync, mkdirSync, renameSync, writeFileSync, readFileSync, cpSync, statSync, createReadStream, readdirSync, openSync, writeSync, closeSync, chmodSync } from 'fs';
 import path, { join, dirname, resolve, sep } from 'path';
@@ -713,35 +713,83 @@ function instanceToStatus(inst) {
 function createConnector3() {
   return new DevServerConnector();
 }
-function parseSessionConfig(opts) {
+var LEGACY_DEFAULTS = {
+  session: { enabled: false },
+  sync: { fetchIntervalSec: 0, autoRebase: false, autoPull: false },
+  lifecycle: {
+    commitOnHibernate: true,
+    pushOnHibernate: true,
+    mergeOnClose: true,
+    pushOnClose: true,
+    autoCommitIdleMs: 3e4,
+    pushAfterCommit: false
+  }
+};
+var MODE_DEFAULTS = {
+  agent: {
+    session: { enabled: true },
+    sync: { fetchIntervalSec: 0, autoRebase: false, autoPull: false },
+    lifecycle: {
+      ...LEGACY_DEFAULTS.lifecycle,
+      // Agent owns its own merge — connector must not auto-merge the session branch.
+      mergeOnClose: false,
+      autoCommitIdleMs: 0,
+      pushAfterCommit: false
+    }
+  },
+  sync: {
+    session: { enabled: false },
+    sync: { fetchIntervalSec: 30, autoRebase: true, autoPull: true },
+    lifecycle: {
+      ...LEGACY_DEFAULTS.lifecycle,
+      autoCommitIdleMs: 3e4,
+      pushAfterCommit: true
+    }
+  }
+};
+function parseSessionConfig(opts, defaults) {
   const raw = opts?.session ?? {};
   return {
-    enabled: Boolean(raw.enabled ?? false),
+    enabled: Boolean(raw.enabled ?? defaults.enabled),
     slug: raw.slug != null ? String(raw.slug) : void 0,
     isMain: Boolean(raw.isMain ?? true),
     branchPrefix: String(raw.branchPrefix ?? "session/"),
     fromRef: raw.fromRef != null ? String(raw.fromRef) : void 0
   };
 }
-function parseSyncConfig(opts) {
+function parseSyncConfig(opts, defaults) {
   const raw = opts?.sync ?? {};
   return {
-    fetchIntervalSec: Number(raw.fetchIntervalSec ?? 0),
-    autoRebase: Boolean(raw.autoRebase ?? false),
-    autoPull: Boolean(raw.autoPull ?? false)
+    fetchIntervalSec: Number(raw.fetchIntervalSec ?? defaults.fetchIntervalSec),
+    autoRebase: Boolean(raw.autoRebase ?? defaults.autoRebase),
+    autoPull: Boolean(raw.autoPull ?? defaults.autoPull)
   };
 }
-function parseLifecycleConfig(opts) {
+function parseLifecycleConfig(opts, defaults) {
   const raw = opts?.lifecycle ?? {};
   return {
-    commitOnHibernate: Boolean(raw.commitOnHibernate ?? true),
-    pushOnHibernate: Boolean(raw.pushOnHibernate ?? true),
-    mergeOnClose: Boolean(raw.mergeOnClose ?? true),
-    pushOnClose: Boolean(raw.pushOnClose ?? true),
-    autoCommitIdleMs: Number(raw.autoCommitIdleMs ?? 3e4),
-    pushAfterCommit: Boolean(raw.pushAfterCommit ?? false)
+    commitOnHibernate: Boolean(raw.commitOnHibernate ?? defaults.commitOnHibernate),
+    pushOnHibernate: Boolean(raw.pushOnHibernate ?? defaults.pushOnHibernate),
+    mergeOnClose: Boolean(raw.mergeOnClose ?? defaults.mergeOnClose),
+    pushOnClose: Boolean(raw.pushOnClose ?? defaults.pushOnClose),
+    autoCommitIdleMs: Number(raw.autoCommitIdleMs ?? defaults.autoCommitIdleMs),
+    pushAfterCommit: Boolean(raw.pushAfterCommit ?? defaults.pushAfterCommit)
   };
 }
+function resolveGitConfig(args) {
+  let mode = args.mode;
+  if (mode && !(mode in MODE_DEFAULTS)) {
+    modeLog.warn("unknown git mode \u2014 falling back to legacy defaults", { mode });
+    mode = void 0;
+  }
+  const defaults = mode ? MODE_DEFAULTS[mode] : LEGACY_DEFAULTS;
+  return {
+    session: parseSessionConfig(args.options, defaults.session),
+    sync: parseSyncConfig(args.options, defaults.sync),
+    lifecycle: parseLifecycleConfig(args.options, defaults.lifecycle)
+  };
+}
+var modeLog = createLogger({ kind: "connector", subkind: "git" });
 function git(cmd, cwd, timeout = 3e4) {
   return execSync(`git ${cmd}`, { cwd, encoding: "utf-8", timeout, stdio: "pipe" }).trim();
 }
@@ -822,9 +870,10 @@ var GitConnector = class extends AbstractConnector {
     }
     this.log.info("mount start", { url, branch, targetDir });
     const initial = await this.acquireInitialToken(declaration, secrets, tokenMediator);
-    const session = parseSessionConfig(opts);
-    const sync = parseSyncConfig(opts);
-    const lifecycle = parseLifecycleConfig(opts);
+    const { session, sync, lifecycle } = resolveGitConfig({
+      mode: declaration.mode,
+      options: opts
+    });
     const state = {
       url,
       branch,
@@ -988,13 +1037,17 @@ var GitConnector = class extends AbstractConnector {
       activeBranch = git("rev-parse --abbrev-ref HEAD", targetDir, 5e3);
     } catch {
     }
+    const fleetConfig = resolveGitConfig({
+      mode: declaration.mode,
+      options: declaration.options
+    });
     const state = {
       url: String(declaration.mount?.source ?? ""),
       branch: activeBranch,
       activeBranch,
-      session: parseSessionConfig(declaration.options),
-      sync: parseSyncConfig(declaration.options),
-      lifecycle: parseLifecycleConfig(declaration.options),
+      session: fleetConfig.session,
+      sync: fleetConfig.sync,
+      lifecycle: fleetConfig.lifecycle,
       fleetManaged: true
     };
     const dispatch = (event) => {
@@ -1706,6 +1759,7 @@ var GitConnector = class extends AbstractConnector {
 function createConnector4() {
   return new GitConnector();
 }
+var __test = { resolveGitConfig };
 
 // factory-assets/connectors/gmail/adapter.ts
 var GmailConnector = class extends AbstractConnector {
@@ -7948,6 +8002,6 @@ function createConnector() {
   return new FlowAdapter();
 }
 
-export { AbstractConnector, BUILTIN_CONNECTOR_CATALOG, ConnectorFieldMissingError, ConnectorManager, ConnectorStartupError, DeployConnector, DevServerConnector, FlowAdapter, GitConnector, GmailConnector, GoogleDriveConnector, LocalConnector, LogBuffer, ManagedGitconfigCollisionError, MattermostConnector, MemoryConnector, MinIOConnector, NOT_READY_SENTINEL, PostgresConnector, RoMountPlaceholderBarrier, S3Connector, SQLiteConnector, SharePointConnector, StaticServerConnector, TunnelConnector, WebDAVConnector, XStateConnector, XStateStoreConnector, atomicReplaceCredential, buildConnectorPromptSection, buildSdkConnectorTools, createConnector, createConnector10, createConnector11, createConnector12, createConnector13, createConnector14, createConnector15, createConnector16, createConnector17, createConnector18, createConnector19, createConnector2, createConnector3, createConnector4, createConnector5, createConnector6, createConnector7, createConnector8, createConnector9, createWorktree, defaultMountPlaceholderBarrier, defaultSpawn, ensureFleetMounted, findGitRoot, findMissingPackages, getConnector, installNpmPackages, isFleetManaged, isPackageResolvable, listConnectors, listWorktrees, registerBuiltinConnectors, removeMountBlock, renderCredentialHelperScript, tryGetConnector, worktreeRegistry, writeHelperScript, writeMountBlock };
-//# sourceMappingURL=chunk-QF6LBS2C.js.map
-//# sourceMappingURL=chunk-QF6LBS2C.js.map
+export { AbstractConnector, BUILTIN_CONNECTOR_CATALOG, ConnectorFieldMissingError, ConnectorManager, ConnectorStartupError, DeployConnector, DevServerConnector, FlowAdapter, GitConnector, GmailConnector, GoogleDriveConnector, LocalConnector, LogBuffer, ManagedGitconfigCollisionError, MattermostConnector, MemoryConnector, MinIOConnector, NOT_READY_SENTINEL, PostgresConnector, RoMountPlaceholderBarrier, S3Connector, SQLiteConnector, SharePointConnector, StaticServerConnector, TunnelConnector, WebDAVConnector, XStateConnector, XStateStoreConnector, __test, atomicReplaceCredential, buildConnectorPromptSection, buildSdkConnectorTools, createConnector, createConnector10, createConnector11, createConnector12, createConnector13, createConnector14, createConnector15, createConnector16, createConnector17, createConnector18, createConnector19, createConnector2, createConnector3, createConnector4, createConnector5, createConnector6, createConnector7, createConnector8, createConnector9, createWorktree, defaultMountPlaceholderBarrier, defaultSpawn, ensureFleetMounted, findGitRoot, findMissingPackages, getConnector, installNpmPackages, isFleetManaged, isPackageResolvable, listConnectors, listWorktrees, registerBuiltinConnectors, removeMountBlock, renderCredentialHelperScript, tryGetConnector, worktreeRegistry, writeHelperScript, writeMountBlock };
+//# sourceMappingURL=chunk-GXHJDQ37.js.map
+//# sourceMappingURL=chunk-GXHJDQ37.js.map