@skaile/workspaces 4.30.1 → 4.32.0

package/dist/{chunk-FRX2BO3V.js → chunk-MJUDVEFN.js}

@@ -1,33 +1,33 @@
-import { WorkspacePlugin } from './chunk-ZVVZ67EH.js';
-import { buildWorkspaceToolDefs } from './chunk-RXTKWTZV.js';
+import { WorkspacePlugin } from './chunk-JYWEWJ46.js';
+import { buildWorkspaceToolDefs } from './chunk-BU53MUL5.js';
 import { findAiAssetsRoot } from './chunk-7IH3RKKK.js';
 import { WebSocketServerTransport } from './chunk-5LKOAX7I.js';
 import { assembleSystemPrompt, buildCapabilitiesPromptSection } from './chunk-W3UDISS2.js';
-import { prepareNativePolicy, codexInstanceEnvironment, parseCodexCredential, parseCodexRefreshInput, parseCodexRefreshResult } from './chunk-PE3A6FFW.js';
-import { resolveFlowPath } from './chunk-7HJ3YLRF.js';
+import { prepareNativePolicy, codexInstanceEnvironment, parseCodexCredential, parseCodexRefreshInput, parseCodexRefreshResult } from './chunk-HCYS7GFP.js';
+import { resolveFlowPath } from './chunk-SMZT7QMT.js';
 import { findAiAssetsRoot as findAiAssetsRoot$1, deployCatalogEntry, undeployCatalogEntry } from './chunk-Q6NDQ6BH.js';
-import { registerBuiltinConnectors, buildConnectorPromptSection, findMissingPackages, installNpmPackages, ConnectorManager, buildSdkConnectorTools, buildLazySdkFlowTools, describeFlowOperations, buildConnectorToolDefs, buildFlowToolDefs, SessionNodeExecutor, SessionSubpromptRunner, ClassifierSubpromptRunner, SessionInlineSubFlowRunner, driveOrchestratorTurn, buildSdkFlowTools } from './chunk-NQCQTAMQ.js';
+import { registerBuiltinConnectors, buildConnectorPromptSection, findMissingPackages, installNpmPackages, ConnectorManager, buildSdkConnectorTools, buildLazySdkFlowTools, describeFlowOperations, buildConnectorToolDefs, buildFlowToolDefs, SessionNodeExecutor, SessionSubpromptRunner, ClassifierSubpromptRunner, SessionInlineSubFlowRunner, driveOrchestratorTurn, buildSdkFlowTools } from './chunk-223FKFTC.js';
 import { loadYamlConnectorDeclarations, withMaterializedConnectorDeclarations, SecretProviderChain, ConnectorStartupError, PreMintedSecretProvider, InMemorySecretProvider, resolvedConfigToDeclarations, isKnownSecretRef, deriveSingleMaterializedConnectorDeclaration } from './chunk-2JANXYTJ.js';
-import { EventNormalizer } from './chunk-PM6DO25W.js';
-import { probeResumeTranscript, transcriptStoreForRuntime } from './chunk-6S5KL76M.js';
-import { scopeReconfigureModel } from './chunk-TJRNJVGU.js';
+import { EventNormalizer } from './chunk-MNA22VPT.js';
+import { probeResumeTranscript, transcriptStoreForRuntime } from './chunk-LX3FKVLL.js';
+import { scopeReconfigureModel } from './chunk-EINLFFP6.js';
 import { CodexNativeStateUnavailable } from './chunk-LOO5CB5M.js';
-import { dispatchCapability } from './chunk-FF5L6IV3.js';
+import { dispatchCapability } from './chunk-XVGB3K4B.js';
 import { classifyClaudeSdkError } from './chunk-XBSQ4KMC.js';
 import { agentExecRequested } from './chunk-YROR332M.js';
-import { toAgentEffort, createDriver, catalogLayer, providerCredentialEnvName, toMergedRegistry, registryCredentialEnv, AI_PROVIDER_PRESETS, AgentDriver } from './chunk-FAQRNZ44.js';
-import { loadFlow } from './chunk-YVWUHPQW.js';
+import { toAgentEffort, createDriver, catalogLayer, providerCredentialEnvName, toMergedRegistry, registryCredentialEnv, AI_PROVIDER_PRESETS, AgentDriver } from './chunk-MVSF6AB4.js';
+import { loadFlow } from './chunk-JULFGNQN.js';
 import { parseFlowDefinition } from './chunk-DIQDYNXZ.js';
 import { renderStimulusPrompt } from './chunk-K3IBZ2UZ.js';
-import { withActivityLabelJsonSchema, TOOL_ACTIVITY_PROMPT_SECTION, SESSION_ROOT_CONNECTOR_ID, PROTOCOL_VERSION } from './chunk-MX7LCQUQ.js';
-import { resolveSettings, loadProviderRegistry } from './chunk-UWU572Q6.js';
+import { withActivityLabelJsonSchema, TOOL_ACTIVITY_PROMPT_SECTION, SESSION_ROOT_CONNECTOR_ID, PROTOCOL_VERSION } from './chunk-34ZVTPDV.js';
+import { resolveSettings, loadProviderRegistry } from './chunk-WPISSDEI.js';
 import { resolveRuntimeAssets } from './chunk-5RHPNNWP.js';
 import { resolveDriverPaths } from './chunk-K5GBV4SA.js';
-import { resolveSkWorkspaceConfig, resolveAgentDir, loadMcpServerDeclarations, COMPACTION_DEFAULTS, resolveCompactionThresholdPercent, validateAssetRecipeAttr, deriveSingleMaterializedMcpDeclaration, stageMaterializedSkills, readSkillAllowList, isStagedSkillMarkerFor, unstageSkill } from './chunk-DF7C3KZK.js';
+import { resolveSkWorkspaceConfig, resolveAgentDir, loadMcpServerDeclarations, COMPACTION_DEFAULTS, resolveCompactionThresholdPercent, validateAssetRecipeAttr, deriveSingleMaterializedMcpDeclaration, stageMaterializedSkills, readSkillAllowList, isStagedSkillMarkerFor, unstageSkill, STAGED_SKILL_MARKER } from './chunk-DF7C3KZK.js';
 import { withFsDeadline, FsDeadlineError, fsDeadlineMs, parseFrontmatter, tryWithFsDeadline } from './chunk-2FBPAR2V.js';
 import { parseAssetRef } from './chunk-GEEW6SY2.js';
 import { resolveLogStoreConfig, createLogStoreFromConfig, OnLogBridgeSink, WsLogSink, resolveLogsRetention, enforceLogsRetention } from './chunk-JMKB7IB4.js';
-import { registryEntries, resolveEntryBaseUrl, parseModelRef, isEntryEnabled, parseCredentialRef } from './chunk-GZZPKAV5.js';
+import { pickRegistryEntries, registryEntries, resolveEntryBaseUrl, parseModelRef, isEntryEnabled, parseCredentialRef } from './chunk-MJHSLODD.js';
 import { getLogStore, registerLogStore, createLogger, resetLogStore, isUnwritableStreamError, markStreamBroken, isBrokenPipeError, redactCredentials } from './chunk-BOFL7GIF.js';
 import { __require } from './chunk-NSBPE2FW.js';
 import pc from 'picocolors';
@@ -36,7 +36,7 @@ import { Marked } from 'marked';
 import { markedTerminal } from 'marked-terminal';
 import fs4, { readFile, readdir, lstat, stat, rm, unlink, mkdir, writeFile, realpath, rename, open, readlink, mkdtemp } from 'fs/promises';
 import { createHash, randomBytes, timingSafeEqual, randomUUID } from 'crypto';
-import { unlinkSync, readFileSync, existsSync, lstatSync, realpathSync, mkdirSync, writeFileSync, watch, chmodSync, accessSync, constants } from 'fs';
+import { constants, unlinkSync, readFileSync, existsSync, lstatSync, realpathSync, mkdirSync, writeFileSync, watch, chmodSync, accessSync } from 'fs';
 import { homedir } from 'os';
 import * as z7 from 'zod';
 import { z } from 'zod';
@@ -2622,7 +2622,7 @@ async function createAgentSession(config) {
   });
   const driverType = managed ? "codex" : settings.driver ?? "omp";
   const model = managed ? config.model : settings.model;
-  const registry = loadSessionRegistry(projectDir, config.registry, sessionLog);
+  const registry = loadSessionRegistry(projectDir, config.registry, config.providers, sessionLog);
   const modelRef = config.modelRef?.trim() || model?.trim() || void 0;
   const credentialEnv = { ...config.credentialEnv };
   const manifest = agentDir ? await loadAgentManifest(agentDir) : void 0;
@@ -2813,7 +2813,7 @@ function createManagedCodexSubpromptDriver(config, model, cwd, privateDirectory)
     }
   });
 }
-function loadSessionRegistry(projectDir, sessionRegistry, log) {
+function loadSessionRegistry(projectDir, sessionRegistry, providers, log) {
   const extraLayers = [];
   if (sessionRegistry && Object.keys(sessionRegistry).length > 0)
     extraLayers.push({ layer: "session", providers: sessionRegistry });
@@ -2825,7 +2825,14 @@ function loadSessionRegistry(projectDir, sessionRegistry, log) {
     if (diagnostic.severity === "error") log.error(message, void 0, { code: diagnostic.code });
     else log.warn(message, { code: diagnostic.code });
   }
-  return final.registry;
+  if (providers === void 0 || providers.length === 0) return final.registry;
+  for (const id of providers) {
+    if (final.registry.providers[id] === void 0)
+      log.warn(`providers registry: --providers names '${id}' which no layer defines`, {
+        code: "unknown_provider"
+      });
+  }
+  return pickRegistryEntries(final.registry, providers);
 }
 async function loadPromptExtensions(paths, projectDir, log) {
   if (!paths?.length) return [];
@@ -3659,6 +3666,74 @@ var MOUNT_LIST_MAX_DEPTH = 32;
 var MOUNT_LIST_MAX_ENTRIES = 1e4;
 var MOUNT_TREE_OP_DEADLINE_FACTOR = 4;
 var MOUNT_READ_DEADLINE_FACTOR = 4;
+var MOUNT_READ_MAX_CHUNK_BYTES = 8 * 1024 * 1024;
+function parseReadRange(options) {
+  const offset = options?.offset;
+  const length = options?.length;
+  if (offset === void 0 && length === void 0) return null;
+  for (const [name, value] of [
+    ["offset", offset],
+    ["length", length]
+  ]) {
+    if (value !== void 0 && !(Number.isSafeInteger(value) && value >= 0)) {
+      throw new ResourceOperationError(
+        `Invalid read range: ${name} must be a non-negative integer`,
+        "invalid_range"
+      );
+    }
+  }
+  return {
+    offset: offset ?? 0,
+    length: Math.min(length ?? MOUNT_READ_MAX_CHUNK_BYTES, MOUNT_READ_MAX_CHUNK_BYTES)
+  };
+}
+async function readMountRange(targetPath, range, authoritativeSize) {
+  const authSize = authoritativeSize ? await authoritativeSize() : null;
+  const opening = open(targetPath, "r");
+  let fh;
+  try {
+    fh = await withFsDeadline(`open ${targetPath}`, () => opening);
+  } catch (err) {
+    void opening.then((h) => h.close()).catch(() => {
+    });
+    throw err;
+  }
+  try {
+    const st = await withFsDeadline(`fstat ${targetPath}`, () => fh.stat());
+    if (!st.isFile()) {
+      throw new Error(`Not a file: ${targetPath}`);
+    }
+    let size = st.size;
+    if (authSize !== null && authSize >= 0 && authSize < size) size = authSize;
+    const want = Math.max(0, Math.min(range.length, size - range.offset));
+    const buf = Buffer.alloc(want);
+    let filled = 0;
+    await withFsDeadline(
+      `read ${targetPath} @${range.offset}+${want}`,
+      async () => {
+        while (filled < want) {
+          const { bytesRead } = await fh.read(buf, filled, want - filled, range.offset + filled);
+          if (bytesRead === 0) break;
+          filled += bytesRead;
+        }
+      },
+      fsDeadlineMs() * MOUNT_READ_DEADLINE_FACTOR
+    );
+    const modifiedAt = isoTime(st.mtime);
+    return {
+      bytes: buf.subarray(0, filled),
+      range: {
+        offset: range.offset,
+        length: filled,
+        size,
+        ...modifiedAt ? { modifiedAt } : {}
+      }
+    };
+  } finally {
+    void fh.close().catch(() => {
+    });
+  }
+}
 var MOUNT_STAT_MAX_ENTRIES = 5e4;
 var MOUNT_STAT_BUDGET_MS = 1e4;
 var MOUNT_STAT_CONCURRENCY = 16;
@@ -3824,6 +3899,22 @@ async function handleMountResourceRequest(command, manager, emit) {
       }
       case "read": {
         const contentType = getMimeType(basename(targetPath));
+        const readRange = parseReadRange(options);
+        if (readRange) {
+          const sizeFn2 = getAuthoritativeSize(entry.handle.state);
+          const chunk = await readMountRange(
+            targetPath,
+            readRange,
+            sizeFn2 ? () => sizeFn2(reqPath ?? "") : void 0
+          );
+          data = {
+            data: chunk.bytes.toString("base64"),
+            contentType,
+            encoding: "binary",
+            range: chunk.range
+          };
+          break;
+        }
         const buf = await withFsDeadline(
           `readFile ${targetPath}`,
           () => readFile(targetPath),
@@ -4953,13 +5044,88 @@ async function isStillOurs(record2, path6, timeoutMs) {
   const st = await tryWithFsDeadline(`lstat ${path6}`, () => lstat(path6), null, timeoutMs);
   return st?.isDirectory() === true && st.dev === record2.dev && st.ino === record2.ino && st.birthtimeMs === record2.birthtimeMs;
 }
+async function recordLoadedSkillDigests(loaded, projectDir, skillsDir, names, opts) {
+  for (const name of names) {
+    if (opts.driverUp && opts.previouslyStaged.has(name)) continue;
+    const path6 = join(projectDir, skillsDir, name);
+    loaded.set(name, { path: path6, digest: await stagedSkillDigest(path6) });
+  }
+}
+var DIGEST_DEADLINE_FACTOR = 4;
+var DIGEST_MAX_BYTES = 64 * 1024 * 1024;
+var DIGEST_CHUNK_BYTES = 64 * 1024;
+var DIGEST_OPEN_FLAGS = constants.O_RDONLY | constants.O_NOFOLLOW | constants.O_NONBLOCK;
+async function stagedSkillDigest(dir, timeoutMs) {
+  return tryWithFsDeadline(
+    `digest ${dir}`,
+    async () => {
+      const hash = createHash("sha256");
+      let budget = DIGEST_MAX_BYTES;
+      const hashFile = async (path6) => {
+        const fh = await open(path6, DIGEST_OPEN_FLAGS);
+        try {
+          const st = await fh.stat();
+          if (!st.isFile()) throw new Error(`not a regular file: ${path6}`);
+          if (st.size > budget) throw new Error("skill too large to digest");
+          const buf = Buffer.alloc(DIGEST_CHUNK_BYTES);
+          let total = 0;
+          for (; ; ) {
+            const { bytesRead } = await fh.read(buf, 0, buf.length, null);
+            if (bytesRead === 0) break;
+            total += bytesRead;
+            if (total > budget) throw new Error("skill too large to digest");
+            hash.update(buf.subarray(0, bytesRead));
+          }
+          budget -= total;
+          hash.update(`\0${total}\0`);
+        } finally {
+          await fh.close();
+        }
+      };
+      const walk = async (rel) => {
+        const here = rel ? join(dir, rel) : dir;
+        if (rel && !(await lstat(here)).isDirectory()) throw new Error(`not a dir: ${here}`);
+        const entries = await readdir(here, { withFileTypes: true });
+        entries.sort((a, b) => a.name < b.name ? -1 : a.name > b.name ? 1 : 0);
+        for (const entry of entries) {
+          if (!rel && entry.name === STAGED_SKILL_MARKER) continue;
+          const path6 = rel ? `${rel}/${entry.name}` : entry.name;
+          if (entry.isDirectory()) {
+            hash.update(`d\0${path6}\0`);
+            await walk(path6);
+          } else if (entry.isSymbolicLink()) {
+            hash.update(`l\0${path6}\0${await readlink(join(dir, path6))}\0`);
+          } else if (entry.isFile()) {
+            hash.update(`f\0${path6}\0`);
+            await hashFile(join(dir, path6));
+          } else {
+            hash.update(`o\0${path6}\0`);
+          }
+        }
+      };
+      await walk("");
+      return hash.digest("hex");
+    },
+    null,
+    fsDeadlineMs() * DIGEST_DEADLINE_FACTOR
+  );
+}
 async function attachStagedSkill(deps, name) {
   try {
     const skillsDir = deps.skillsDir();
-    const staged = await deps.withSkillFsLock(async () => {
+    const dirName = name.includes("/") ? name.split("/").pop() : name;
+    const { staged, unchanged } = await deps.withSkillFsLock(async () => {
+      const dest = join(deps.projectDir, skillsDir, dirName);
+      const loaded = deps.stagedSkillDirs.has(dirName) ? deps.loadedSkillDigests.get(dirName) : void 0;
       const names = await stageMaterializedSkills(deps.projectDir, skillsDir, { declared: [name] });
+      let same = false;
+      if (names.includes(dirName)) {
+        const digest = await stagedSkillDigest(dest);
+        same = digest !== null && loaded?.path === dest && loaded.digest === digest;
+        if (!same) deps.loadedSkillDigests.set(dirName, { path: dest, digest });
+      }
       await recordStagedSkills(deps.stagedSkillDirs, deps.projectDir, skillsDir, names);
-      return names;
+      return { staged: names, unchanged: same ? dirName : null };
     });
     if (staged.length === 0) {
       return {
@@ -4968,9 +5134,16 @@ async function attachStagedSkill(deps, name) {
         message: `no materialized skill matching "${name}" under .skaile/assets/skill`
       };
     }
-    deps.log(`[serve] runner.attach_instance staged skill(s): ${staged.join(", ")}`);
     const live = deps.driverStarted();
-    deps.scheduleSkillRestart(staged.map((s) => ({ name: s, action: "add" })));
+    const toRestart = staged.filter((s) => s !== unchanged);
+    if (toRestart.length === 0) {
+      deps.log(
+        `[serve] runner.attach_instance: skill ${staged.join(", ")} already staged and unchanged \u2014 no driver restart`
+      );
+      return { ok: true, id: name, live, toolCount: 0 };
+    }
+    deps.log(`[serve] runner.attach_instance staged skill(s): ${toRestart.join(", ")}`);
+    deps.scheduleSkillRestart(toRestart.map((s) => ({ name: s, action: "add" })));
     return { ok: true, id: name, live, toolCount: 0 };
   } catch (err) {
     return {
@@ -8640,6 +8813,9 @@ async function startAgentServer(opts) {
       // The control-plane registry layer, normalized to the bare `id → entry`
       // map the session builder layers `providers.yml` under.
       ...wireAgentConfig?.registry ? { registry: toMergedRegistry(wireAgentConfig.registry).providers } : {},
+      // `--providers`: narrow the registry to these entry ids. Managed codex
+      // runs on the host's own credentials, so it never takes the filter.
+      ...!managedCodex && opts.providers && opts.providers.length > 0 ? { providers: opts.providers } : {},
       ...wireAgentConfig?.modelRef ? { modelRef: wireAgentConfig.modelRef } : {},
       promptsDir: opts.promptsDir,
       sessionId,
@@ -8777,7 +8953,10 @@ async function startAgentServer(opts) {
   let appliedWireAgentConfigKey;
   let liveReconfigurePatch;
   let wireConnectorDeclarationsApplied = false;
+  let lastInitSharedState;
   const stagedSkillDirs = /* @__PURE__ */ new Map();
+  const loadedSkillDigests = /* @__PURE__ */ new Map();
+  let bootRestageDone = false;
   const withSkillFsLock = createSerialLock();
   const stageDeclaredSkills = createCoalescedTask(
     withSkillFsLock,
@@ -8787,11 +8966,17 @@ async function startAgentServer(opts) {
         skillsDir
       );
       const names = declared.length > 0 ? await stageMaterializedSkills(opts.projectDir, skillsDir, { declared }) : [];
+      const previouslyStaged = new Set(stagedSkillDirs.keys());
+      await recordLoadedSkillDigests(loadedSkillDigests, opts.projectDir, skillsDir, names, {
+        driverUp: bootRestageDone && driverStarted,
+        previouslyStaged
+      });
       await recordStagedSkills(stagedSkillDirs, opts.projectDir, skillsDir, names);
       return { removed, staged: names };
     }
   );
   await restageMaterializedSkills(false);
+  bootRestageDone = true;
   async function restageMaterializedSkills(allowRestart) {
     if (managedHost) return;
     try {
@@ -8819,10 +9004,15 @@ async function startAgentServer(opts) {
       }
       if (removed.length === 0 && newlyStaged.length === 0) return;
       if (allowRestart && driverStarted) {
-        await restartDriverForSkillChanges([
-          ...removed.map((s) => ({ name: s, action: "remove" })),
-          ...newlyStaged.map((s) => ({ name: s, action: "add" }))
-        ]);
+        try {
+          await restartDriverForSkillChanges([
+            ...removed.map((s) => ({ name: s, action: "remove" })),
+            ...newlyStaged.map((s) => ({ name: s, action: "add" }))
+          ]);
+        } catch (err) {
+          for (const s of newlyStaged) loadedSkillDigests.delete(s);
+          throw err;
+        }
       }
     } catch (err) {
       log(
@@ -9639,6 +9829,7 @@ async function startAgentServer(opts) {
   }
   async function rebuildAgentSession(overrides) {
     const disposedManager = agentSession.resourceManager;
+    const sharedStateSnapshots = await snapshotInitSharedState();
     const disposeStartedAt = Date.now();
     await agentSession.dispose();
     if (managedHost && managedBootstrapClosed) throw new Error("CODEX_RUNTIME_UNSUPPORTED");
@@ -9663,14 +9854,67 @@ async function startAgentServer(opts) {
       resourceManager,
       disposedManager
     );
-    if (resourceManager !== null && resourceManager !== disposedManager && repointed !== resourceManager) {
-      log(
-        "[serve] WARNING: recreate displaced a lazily-created sharedState resource manager \u2014 registered shared-state stores were dropped and must be re-registered"
-      );
-    }
     resourceManager = repointed;
+    await reRegisterInitSharedState(sharedStateSnapshots);
     agentSession.startWatching();
   }
+  async function snapshotInitSharedState() {
+    const snapshots = /* @__PURE__ */ new Map();
+    if (!lastInitSharedState || !resourceManager) return snapshots;
+    for (const stateConfig of lastInitSharedState) {
+      if (!resourceManager.has(stateConfig.id)) continue;
+      try {
+        const raw = await resourceManager.executeOp(stateConfig.id, "get", {});
+        const state = raw ? JSON.parse(raw) : {};
+        if (state && typeof state === "object" && !Array.isArray(state)) {
+          snapshots.set(stateConfig.id, state);
+        }
+      } catch (err) {
+        serverLog.warn("shared-state store could not be read before the driver recreate", {
+          id: stateConfig.id,
+          error: err instanceof Error ? err.message : String(err)
+        });
+      }
+    }
+    return snapshots;
+  }
+  async function reRegisterInitSharedState(snapshots) {
+    if (!lastInitSharedState) return;
+    const missing = lastInitSharedState.filter((c) => !resourceManager?.has(c.id));
+    if (missing.length === 0 || !ensureResourceManagerForSharedState()) return;
+    const ids = [];
+    const restored = [];
+    for (const stateConfig of missing) {
+      if (!await registerSharedStateStore(stateConfig)) continue;
+      ids.push(stateConfig.id);
+      const snapshot = snapshots.get(stateConfig.id);
+      if (snapshot && await restoreSharedStateSnapshot(stateConfig, snapshot)) {
+        restored.push(stateConfig.id);
+      }
+    }
+    if (ids.length > 0) {
+      serverLog.info("shared-state stores re-registered after the driver recreate", {
+        ids,
+        restored
+      });
+    }
+    await rebuildMcpToolsForNewStores(ids.length);
+  }
+  async function restoreSharedStateSnapshot(stateConfig, snapshot) {
+    try {
+      await resourceManager.executeOp(stateConfig.id, "merge", { data: snapshot });
+      for (const key of Object.keys(stateConfig.initialState ?? {})) {
+        if (!(key in snapshot)) await resourceManager.executeOp(stateConfig.id, "delete", { key });
+      }
+      return true;
+    } catch (err) {
+      serverLog.warn("shared-state store state could not be restored after the driver recreate", {
+        id: stateConfig.id,
+        error: err instanceof Error ? err.message : String(err)
+      });
+      return false;
+    }
+  }
   async function recreateSessionForInit(pendingResumeSessionId) {
     await recreateAgentSession({
       ...aiProviderConfigId ? { aiProviderConfigId } : {},
@@ -9680,6 +9924,7 @@ async function startAgentServer(opts) {
     });
   }
   async function applyInitSharedState(sharedState) {
+    lastInitSharedState = sharedState;
     if (!ensureResourceManagerForSharedState()) {
       sendEvent({ type: "configured" });
       return false;
@@ -9834,8 +10079,12 @@ async function startAgentServer(opts) {
     projectDir: opts.projectDir,
     skillsDir: () => activeSkillsDir(),
     stagedSkillDirs,
+    loadedSkillDigests,
     withSkillFsLock,
-    scheduleSkillRestart: (actions) => scheduleDriverRestartForSkillChanges(actions),
+    // A failed restart never loaded the new copy; forget it so a re-attach restarts.
+    scheduleSkillRestart: (actions) => scheduleDriverRestartForSkillChanges(actions, () => {
+      for (const a of actions) loadedSkillDigests.delete(a.name);
+    }),
     driverStarted: () => driverStarted,
     log
   };
@@ -9885,8 +10134,9 @@ async function startAgentServer(opts) {
       }))
     });
   }
-  function scheduleDriverRestartForSkillChanges(catalogActions) {
+  function scheduleDriverRestartForSkillChanges(catalogActions, onFailed) {
     void restartDriverForSkillChanges(catalogActions).catch((err) => {
+      onFailed?.();
       serverLog.warn(
         `[serve] background driver restart for skill changes failed: ${err instanceof Error ? err.message : String(err)}`
       );
@@ -10069,6 +10319,7 @@ async function startAgentServer(opts) {
       log(
         `[serve] configure cfg keys=${Object.keys(cfg).join(",")} sharedState=${cfg.sharedState ? cfg.sharedState.length : "undefined"} resourceManager=${resourceManager ? "set" : "null"}`
       );
+      if (cfg.sharedState) lastInitSharedState = cfg.sharedState;
       if (!managedCodex && aiProviderConfigId) {
         aiCredentialRefreshScheduler.ensureArmed();
       }
@@ -10867,6 +11118,6 @@ function touchSession(state) {
   return { ...state, updatedAt: (/* @__PURE__ */ new Date()).toISOString() };
 }
 
-export { CLAUDE_CODE_CREDENTIALS_KEY, COMPILE_MANIFEST_FILENAME, CONNECTOR_MUTATE_NOT_READY, CapabilityRegistry, DEFAULT_CAPABILITY_CALL_TIMEOUT_MS, DEFAULT_COALESCE_MS, DEFAULT_FLOW_MUTATE_CONNECTOR_WAIT_MS, MOUNT_LIST_MAX_DEPTH, MOUNT_LIST_MAX_ENTRIES, MOUNT_READ_DEADLINE_FACTOR, MOUNT_STAT_BUDGET_MS, MOUNT_STAT_MAX_ENTRIES, MOUNT_TREE_OP_DEADLINE_FACTOR, MarkdownStreamer, PreInitRingSink, ResourceOperationError, SESSION_ROOT_WRITABLE_DIRS, SESSION_ROOT_WRITABLE_FILES, WS_AUTH_TOKEN_ENV, WS_AUTH_TOKEN_FILE_ENV, agentDefinitionExists, bootstrapCapabilityRegistry, bootstrapRunnerLogStore, buildAgentResources, buildClientCapabilityHandler, buildConnectorTokenMediator, buildContextSection, buildEnvironmentSection, buildResourcesAvailablePayload, buildStoreSnapshotReplay, builtinCapabilities, capabilityLogInstance, clearPreInitRingSink, clearSession, compileComposition, computeCapabilitySignature, computeDirectoryTotals, connectorRefreshKind, createAgentSession, createFlowConnectorReadiness, createManagedCodexSubpromptDriver, createSessionStimulusBus, defineCapability, deleteSession, dispatchResourceRequest, dispatchRunnerCapabilityInvocation, emitSystemPromptComposed, ensureClaudeSettingsDisablesConnectors, ensureGitConfigInclude, executeConnectorMutate, extractClaudeAiOauthExpiresAt, flowRunDrivesTurns, flowStartNeedsDriverRestart, getPreInitRingSink, handleMountResourceRequest, handleResourceRequest, handleSessionRootResourceRequest, hasNonTerminalFlow, hostOpResumeStimulus, installPreInitRingSink, isSessionRootPathAllowed, isTerminalFlowStatus, listSessions, loadAgentManifest, loadCompileManifest, loadCompileManifestFromDir, loadManagedCodexHostConfig, loadSession, loadSessionById, mcpAuthSecretKey, newSession, nulTailPaddingLength, pickChatFlowTarget, pickFlowToolTarget, pickRepointedManager, planFlowMutate, prepareCodexTools, reconcilePendingDecisions, recreateKeepingLiveFlows, registerActiveFlow, registerCompositionCapabilities, rejectCapabilityOnApprovalDeny, rejectPendingCapabilityCallsOnDisconnect, resetRunnerLogStore, resolveAgentComposition, resolveAgentMixins, resolveBinding, resolveCapabilityCallTimeoutMs, resolveCapabilityResult, resolveComposition, resolveFlowMutateConnectorWaitMs, resolveMixin, restoredRunHasWorkToResume, runAgentChat, saveSession, setCurrentSession, setUpFlowConnector, startAgentServer, stimulusFromMetas, supportsLiveToolUpdates, takeRunnerWsAuthToken, toActiveFlowTarget, touchSession, validateInputResponse, writeClaudeCodeCredentialsFile };
-//# sourceMappingURL=chunk-FRX2BO3V.js.map
-//# sourceMappingURL=chunk-FRX2BO3V.js.map
+export { CLAUDE_CODE_CREDENTIALS_KEY, COMPILE_MANIFEST_FILENAME, CONNECTOR_MUTATE_NOT_READY, CapabilityRegistry, DEFAULT_CAPABILITY_CALL_TIMEOUT_MS, DEFAULT_COALESCE_MS, DEFAULT_FLOW_MUTATE_CONNECTOR_WAIT_MS, MOUNT_LIST_MAX_DEPTH, MOUNT_LIST_MAX_ENTRIES, MOUNT_READ_DEADLINE_FACTOR, MOUNT_READ_MAX_CHUNK_BYTES, MOUNT_STAT_BUDGET_MS, MOUNT_STAT_MAX_ENTRIES, MOUNT_TREE_OP_DEADLINE_FACTOR, MarkdownStreamer, PreInitRingSink, ResourceOperationError, SESSION_ROOT_WRITABLE_DIRS, SESSION_ROOT_WRITABLE_FILES, WS_AUTH_TOKEN_ENV, WS_AUTH_TOKEN_FILE_ENV, agentDefinitionExists, bootstrapCapabilityRegistry, bootstrapRunnerLogStore, buildAgentResources, buildClientCapabilityHandler, buildConnectorTokenMediator, buildContextSection, buildEnvironmentSection, buildResourcesAvailablePayload, buildStoreSnapshotReplay, builtinCapabilities, capabilityLogInstance, clearPreInitRingSink, clearSession, compileComposition, computeCapabilitySignature, computeDirectoryTotals, connectorRefreshKind, createAgentSession, createFlowConnectorReadiness, createManagedCodexSubpromptDriver, createSessionStimulusBus, defineCapability, deleteSession, dispatchResourceRequest, dispatchRunnerCapabilityInvocation, emitSystemPromptComposed, ensureClaudeSettingsDisablesConnectors, ensureGitConfigInclude, executeConnectorMutate, extractClaudeAiOauthExpiresAt, flowRunDrivesTurns, flowStartNeedsDriverRestart, getPreInitRingSink, handleMountResourceRequest, handleResourceRequest, handleSessionRootResourceRequest, hasNonTerminalFlow, hostOpResumeStimulus, installPreInitRingSink, isSessionRootPathAllowed, isTerminalFlowStatus, listSessions, loadAgentManifest, loadCompileManifest, loadCompileManifestFromDir, loadManagedCodexHostConfig, loadSession, loadSessionById, mcpAuthSecretKey, newSession, nulTailPaddingLength, pickChatFlowTarget, pickFlowToolTarget, pickRepointedManager, planFlowMutate, prepareCodexTools, reconcilePendingDecisions, recreateKeepingLiveFlows, registerActiveFlow, registerCompositionCapabilities, rejectCapabilityOnApprovalDeny, rejectPendingCapabilityCallsOnDisconnect, resetRunnerLogStore, resolveAgentComposition, resolveAgentMixins, resolveBinding, resolveCapabilityCallTimeoutMs, resolveCapabilityResult, resolveComposition, resolveFlowMutateConnectorWaitMs, resolveMixin, restoredRunHasWorkToResume, runAgentChat, saveSession, setCurrentSession, setUpFlowConnector, startAgentServer, stimulusFromMetas, supportsLiveToolUpdates, takeRunnerWsAuthToken, toActiveFlowTarget, touchSession, validateInputResponse, writeClaudeCodeCredentialsFile };
+//# sourceMappingURL=chunk-MJUDVEFN.js.map
+//# sourceMappingURL=chunk-MJUDVEFN.js.map