@skaile/workspaces 4.6.0 → 4.7.0

package/dist/{chunk-SAXTWLXZ.js → chunk-HVTU3CVF.js}

@@ -1,27 +1,27 @@
-import { WorkspacePlugin } from './chunk-2HZJKDLG.js';
-import { buildWorkspaceToolDefs } from './chunk-6ZQU5WKJ.js';
+import { WorkspacePlugin } from './chunk-7UM46L33.js';
+import { buildWorkspaceToolDefs } from './chunk-HBBVWZ4T.js';
 import { findAiAssetsRoot } from './chunk-7IRJ4K4F.js';
 import { WebSocketServerTransport } from './chunk-73ZXUUL6.js';
 import { assembleSystemPrompt, buildCapabilitiesPromptSection } from './chunk-W3UDISS2.js';
 import { prepareNativePolicy, codexInstanceEnvironment, parseCodexCredential, parseCodexRefreshInput, parseCodexRefreshResult } from './chunk-45LLHKQ2.js';
-import { resolveFlowPath } from './chunk-D3332IMQ.js';
+import { resolveFlowPath } from './chunk-P2PXD3AF.js';
 import { findAiAssetsRoot as findAiAssetsRoot$1, deployCatalogEntry, undeployCatalogEntry } from './chunk-7BUZQVRR.js';
-import { registerBuiltinConnectors, buildConnectorPromptSection, findMissingPackages, installNpmPackages, ConnectorManager, ConnectorStartupError, buildSdkConnectorTools, buildLazySdkFlowTools, describeFlowOperations, buildConnectorToolDefs, buildFlowToolDefs, driveOrchestratorTurn, SessionNodeExecutor, SessionSubpromptRunner, ClassifierSubpromptRunner, SessionInlineSubFlowRunner, buildSdkFlowTools } from './chunk-TRGMQUAZ.js';
-import { loadConnectorDeclarations, SecretProviderChain, PreMintedSecretProvider, InMemorySecretProvider, resolvedConfigToDeclarations, isKnownSecretRef, deriveSingleMaterializedConnectorDeclaration } from './chunk-KW7YIRYL.js';
-import { EventNormalizer } from './chunk-V7SHQXDI.js';
+import { registerBuiltinConnectors, buildConnectorPromptSection, findMissingPackages, installNpmPackages, ConnectorManager, buildSdkConnectorTools, buildLazySdkFlowTools, describeFlowOperations, buildConnectorToolDefs, buildFlowToolDefs, driveOrchestratorTurn, SessionNodeExecutor, SessionSubpromptRunner, ClassifierSubpromptRunner, SessionInlineSubFlowRunner, buildSdkFlowTools } from './chunk-NYRLSXTB.js';
+import { loadConnectorDeclarations, SecretProviderChain, ConnectorStartupError, PreMintedSecretProvider, InMemorySecretProvider, resolvedConfigToDeclarations, isKnownSecretRef, deriveSingleMaterializedConnectorDeclaration } from './chunk-DYT3AQBM.js';
+import { EventNormalizer } from './chunk-U4LC6PLI.js';
 import { probeResumeTranscript } from './chunk-OUJVFZWJ.js';
 import { CodexNativeStateUnavailable } from './chunk-LOO5CB5M.js';
 import { dispatchCapability } from './chunk-3GKBSHUG.js';
 import { classifyClaudeSdkError } from './chunk-GAH4YRCI.js';
-import { createDriver, catalogLayer, providerCredentialEnvName, toMergedRegistry, registryCredentialEnv } from './chunk-KMFZVPYR.js';
-import { loadFlow } from './chunk-NWZQMJTI.js';
+import { createDriver, catalogLayer, providerCredentialEnvName, toMergedRegistry, registryCredentialEnv } from './chunk-5GYFYGVW.js';
+import { loadFlow } from './chunk-NIHNZC6E.js';
 import { parseFlowDefinition } from './chunk-53ORCYPJ.js';
 import { renderStimulusPrompt } from './chunk-2D5BYAL6.js';
 import { withActivityLabelJsonSchema, TOOL_ACTIVITY_PROMPT_SECTION, SESSION_ROOT_CONNECTOR_ID, PROTOCOL_VERSION } from './chunk-QAH24E5U.js';
-import { resolveSettings, loadProviderRegistry } from './chunk-UJPVUN6H.js';
-import { resolveRuntimeAssets } from './chunk-REILIKVM.js';
+import { resolveSettings, loadProviderRegistry } from './chunk-BCXZ74DM.js';
+import { resolveRuntimeAssets } from './chunk-SU5LVG6T.js';
 import { resolveDriverPaths } from './chunk-K5GBV4SA.js';
-import { resolveSkWorkspaceConfig, resolveAgentDir, stageMaterializedSkills, loadMcpServerDeclarations, COMPACTION_DEFAULTS, validateAssetRecipeAttr, deriveSingleMaterializedMcpDeclaration } from './chunk-K27T47OO.js';
+import { resolveSkWorkspaceConfig, resolveAgentDir, loadMcpServerDeclarations, COMPACTION_DEFAULTS, validateAssetRecipeAttr, deriveSingleMaterializedMcpDeclaration, stageMaterializedSkills, unstageSkill } from './chunk-HKOC273F.js';
 import { withFsDeadline, FsDeadlineError, fsDeadlineMs, tryWithFsDeadline } from './chunk-MKZOK4JU.js';
 import { parseAssetRef } from './chunk-GEEW6SY2.js';
 import { resolveLogStoreConfig, createLogStoreFromConfig, OnLogBridgeSink, WsLogSink } from './chunk-FTG7CRFD.js';
@@ -4258,6 +4258,104 @@ var DriverSwapGate = class {
   }
 };
 
+// runner/src/serial-lock.ts
+function createSerialLock() {
+  let tail = Promise.resolve();
+  return (fn) => {
+    const run = tail.then(fn, fn);
+    tail = run.catch(() => void 0);
+    return run;
+  };
+}
+function createCoalescedTask(lock, fn) {
+  let waiting = null;
+  return (...args) => {
+    if (waiting) return waiting;
+    const run = lock(() => {
+      waiting = null;
+      return fn(...args);
+    });
+    waiting = run;
+    return run;
+  };
+}
+async function recordStagedSkills(staged, projectDir, skillsDir, names, timeoutMs) {
+  for (const name of names) {
+    const path5 = join(projectDir, skillsDir, name);
+    const st = await tryWithFsDeadline(`lstat ${path5}`, () => lstat(path5), null, timeoutMs);
+    staged.set(
+      name,
+      st?.isDirectory() && st.birthtimeMs > 0 ? { path: path5, dev: st.dev, ino: st.ino, birthtimeMs: st.birthtimeMs } : null
+    );
+  }
+}
+async function isStillOurs(record2, path5, timeoutMs) {
+  if (!record2 || record2.path !== path5) return false;
+  const st = await tryWithFsDeadline(`lstat ${path5}`, () => lstat(path5), null, timeoutMs);
+  return st?.isDirectory() === true && st.dev === record2.dev && st.ino === record2.ino && st.birthtimeMs === record2.birthtimeMs;
+}
+async function attachStagedSkill(deps, name) {
+  try {
+    const skillsDir = deps.skillsDir();
+    const staged = await deps.withSkillFsLock(async () => {
+      const names = await stageMaterializedSkills(deps.projectDir, skillsDir, { declared: [name] });
+      await recordStagedSkills(deps.stagedSkillDirs, deps.projectDir, skillsDir, names);
+      return names;
+    });
+    if (staged.length === 0) {
+      return {
+        ok: false,
+        code: "skill_not_materialized",
+        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" })));
+    return { ok: true, id: name, live, toolCount: 0 };
+  } catch (err) {
+    return {
+      ok: false,
+      code: "skill_attach_failed",
+      message: err instanceof Error ? err.message : String(err)
+    };
+  }
+}
+async function detachStagedSkill(deps, name) {
+  try {
+    const skillsDir = deps.skillsDir();
+    const dirName = name.split("/").pop() ?? name;
+    const result = await deps.withSkillFsLock(async () => {
+      const knownStaged = await isStillOurs(
+        deps.stagedSkillDirs.get(dirName),
+        join(deps.projectDir, skillsDir, dirName)
+      );
+      return unstageSkill(deps.projectDir, skillsDir, name, { knownStaged });
+    });
+    const live = deps.driverStarted();
+    if ("reason" in result) {
+      deps.log(
+        `[serve] runner.detach_instance: "${result.name}" exists but was not staged by the runner \u2014 left in place`
+      );
+      return { ok: true, id: result.name, removed: false, live, reason: result.reason };
+    }
+    const wasTracked = deps.stagedSkillDirs.delete(result.name);
+    if (!result.removedStaged && !wasTracked) {
+      deps.log(`[serve] runner.detach_instance: skill "${result.name}" was not staged`);
+      return { ok: true, id: result.name, removed: result.removedAsset, live };
+    }
+    deps.log(`[serve] runner.detach_instance unstaged skill: ${result.name}`);
+    deps.scheduleSkillRestart([{ name: result.name, action: "remove" }]);
+    return { ok: true, id: result.name, removed: true, live };
+  } catch (err) {
+    return {
+      ok: false,
+      code: "skill_detach_failed",
+      message: err instanceof Error ? err.message : String(err)
+    };
+  }
+}
+
 // runner/src/flow-turn-dispatch.ts
 var FLOW_TURN_COMPACTION_TIMEOUT = "Flow turn abandoned: a compaction held the driver";
 async function dispatchFlowTurn(deps, prompt, timeoutMs) {
@@ -5189,6 +5287,13 @@ function asDeclaration(declaration) {
   }
   return null;
 }
+function isLive(rm3, id) {
+  try {
+    return typeof rm3.has === "function" && rm3.has(id);
+  } catch {
+    return false;
+  }
+}
 function toPreMinted(token) {
   return { ok: true, token: token.token, expiresAt: token.expiresAt ?? null };
 }
@@ -5209,12 +5314,14 @@ function buildSessionResourceHandlers(deps) {
           `[session-resource] preMintedToken provided but secret store not ready \u2014 ${kind}:${decl.id}`
         );
     }
+    const wasLive = isLive(rm3, decl.id);
     try {
       await rm3.connect(decl);
     } catch (err) {
       if (input.preMintedToken) {
         getPreMintedSecrets()?.unset(kind, decl.id);
       }
+      if (wasLive && !isLive(rm3, decl.id)) emitResourcesAvailable();
       const message = err instanceof Error ? err.message : String(err);
       log(`[session-resource] runner.add_${kind} failed for ${decl.id}: ${message}`);
       return { ok: false, code: "connect_failed", message };
@@ -5257,12 +5364,14 @@ function buildSessionResourceHandlers(deps) {
           `[session-resource] preMintedToken provided but secret store not ready \u2014 connector:${decl.id}`
         );
     }
+    const wasLive = isLive(rm3, decl.id);
     try {
       await rm3.connect(decl);
     } catch (err) {
       if (preMintedToken) {
         getPreMintedSecrets()?.unset("connector", decl.id);
       }
+      if (wasLive && !isLive(rm3, decl.id)) emitResourcesAvailable();
       const message = err instanceof Error ? err.message : String(err);
       log(`[session-resource] runner.attach_instance connector failed for ${decl.id}: ${message}`);
       return { ok: false, code: "connector_connect_failed", message };
@@ -5446,6 +5555,10 @@ var attachInstanceInputSchema = z7.strictObject({
   name: z7.string(),
   preMintedToken: preMintedTokenSchema
 });
+var detachInstanceInputSchema = z7.strictObject({
+  kind: z7.string(),
+  name: z7.string()
+});
 var removeResourceInput = z7.strictObject({
   id: z7.string()
 });
@@ -5542,6 +5655,20 @@ function buildRunnerCapabilities(handlers) {
         });
       }
     }),
+    defineCapability({
+      name: "runner.detach_instance",
+      displayName: "Detach instance",
+      description: "Unload an instance the platform unassigned from the live session. Skills only: removes the runner-staged copy and materialized asset, then restarts the driver without killing an in-flight turn. A same-named dir the runner did not stage is left in place (reason: not_staged).",
+      side: "agent",
+      origin: RUNNER_CAP_ORIGIN,
+      audience: ["runtime"],
+      kind: "effect",
+      input: detachInstanceInputSchema,
+      handler: async (input) => {
+        if (!handlers.detachInstance) return notImplemented("runner.detach_instance");
+        return handlers.detachInstance({ kind: input.kind, name: input.name });
+      }
+    }),
     defineCapability({
       name: "runner.remove_resource",
       displayName: "Remove resource",
@@ -5646,6 +5773,7 @@ function wireSessionCapabilities(deps) {
     getCompactionOrchestrator,
     getProjectDir,
     attachSkillInstance,
+    detachSkillInstance,
     registerLiveAttachedMcp,
     scheduleDriverRestartForToolChanges,
     log
@@ -5687,6 +5815,18 @@ function wireSessionCapabilities(deps) {
         message: "attach_instance handler not configured"
       };
     },
+    // Only skills have a live unload path; a connector or mount detaches
+    // through remove_resource, and MCP servers have no detach yet.
+    detachInstance: async (input) => {
+      if (input.kind === "skill") {
+        return detachSkillInstance(input.name);
+      }
+      return {
+        ok: false,
+        code: "unsupported_kind",
+        message: `detach_instance does not support kind "${input.kind}"`
+      };
+    },
     // setLogLevel left undefined (the cap self-falls-back to getLogStore);
     // setState remains a stub (not resource hot-plug).
     lifecycle: buildLifecycleHandler({
@@ -6912,14 +7052,21 @@ async function startAgentServer(opts) {
   let managedInitFingerprint;
   let managedInitComplete = false;
   let appliedWireAgentConfigKey;
-  const stagedSkillDirs = /* @__PURE__ */ new Set();
+  const stagedSkillDirs = /* @__PURE__ */ new Map();
+  const withSkillFsLock = createSerialLock();
+  const stageDeclaredSkills = createCoalescedTask(
+    withSkillFsLock,
+    async (skillsDir, declared) => {
+      const names = await stageMaterializedSkills(opts.projectDir, skillsDir, { declared });
+      await recordStagedSkills(stagedSkillDirs, opts.projectDir, skillsDir, names);
+      return names;
+    }
+  );
   await restageMaterializedSkills(false);
   async function restageMaterializedSkills(allowRestart) {
     if (managedHost) return;
     try {
-      const { skillsDir } = resolveDriverPaths({
-        driver: opts.driver ?? wsConfig.agent_config?.default?.driver ?? wireAgentConfig?.driver ?? "claude-sdk"
-      });
+      const skillsDir = activeSkillsDir();
       const declared = (wsConfig.dependencies ?? []).flatMap((dep) => {
         try {
           const ref = parseAssetRef(dep);
@@ -6929,9 +7076,9 @@ async function startAgentServer(opts) {
         }
       });
       if (declared.length === 0) return;
-      const staged = await stageMaterializedSkills(opts.projectDir, skillsDir, { declared });
-      const newlyStaged = staged.filter((s) => !stagedSkillDirs.has(s));
-      for (const s of staged) stagedSkillDirs.add(s);
+      const previouslyStaged = new Set(stagedSkillDirs.keys());
+      const staged = await stageDeclaredSkills(skillsDir, declared);
+      const newlyStaged = staged.filter((s) => !previouslyStaged.has(s));
       if (newlyStaged.length === 0) return;
       log(`[serve] staged ${newlyStaged.length} materialized skill(s): ${newlyStaged.join(", ")}`);
       if (allowRestart && driverStarted) {
@@ -7648,6 +7795,7 @@ async function startAgentServer(opts) {
       getCompactionOrchestrator: () => compactionOrchestrator,
       getProjectDir: () => opts.projectDir,
       attachSkillInstance,
+      detachSkillInstance,
       registerLiveAttachedMcp,
       scheduleDriverRestartForToolChanges,
       log
@@ -7855,34 +8003,25 @@ async function startAgentServer(opts) {
       log(`[serve] ${removed ? "removed" : "not found"} skill: ${res.name}`);
     }
   }
-  async function attachSkillInstance(name) {
-    try {
-      const { skillsDir } = resolveDriverPaths({
-        driver: opts.driver ?? wsConfig.agent_config?.default?.driver ?? wireAgentConfig?.driver ?? "claude-sdk"
-      });
-      const staged = await stageMaterializedSkills(opts.projectDir, skillsDir, {
-        declared: [name]
-      });
-      if (staged.length === 0) {
-        return {
-          ok: false,
-          code: "skill_not_materialized",
-          message: `no materialized skill matching "${name}" under .skaile/assets/skill`
-        };
-      }
-      log(`[serve] runner.attach_instance staged skill(s): ${staged.join(", ")}`);
-      const live = driverStarted;
-      scheduleDriverRestartForSkillChanges(
-        staged.map((s) => ({ name: s, action: "add" }))
-      );
-      return { ok: true, id: name, live, toolCount: 0 };
-    } catch (err) {
-      return {
-        ok: false,
-        code: "skill_attach_failed",
-        message: err instanceof Error ? err.message : String(err)
-      };
-    }
+  function activeSkillsDir() {
+    return resolveDriverPaths({
+      driver: opts.driver ?? wsConfig.agent_config?.default?.driver ?? wireAgentConfig?.driver ?? "claude-sdk"
+    }).skillsDir;
+  }
+  const skillStagingDeps = {
+    projectDir: opts.projectDir,
+    skillsDir: () => activeSkillsDir(),
+    stagedSkillDirs,
+    withSkillFsLock,
+    scheduleSkillRestart: (actions) => scheduleDriverRestartForSkillChanges(actions),
+    driverStarted: () => driverStarted,
+    log
+  };
+  function attachSkillInstance(name) {
+    return attachStagedSkill(skillStagingDeps, name);
+  }
+  function detachSkillInstance(name) {
+    return detachStagedSkill(skillStagingDeps, name);
   }
   async function restartDriverForToolChanges(reason) {
     if (!driverStarted) {
@@ -8825,5 +8964,5 @@ function touchSession(state) {
 }
 
 export { CLAUDE_CODE_CREDENTIALS_KEY, COMPILE_MANIFEST_FILENAME, 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, 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, flowStartNeedsDriverRestart, getPreInitRingSink, handleMountResourceRequest, handleResourceRequest, handleSessionRootResourceRequest, hasNonTerminalFlow, hostOpResumeStimulus, installPreInitRingSink, isSessionRootPathAllowed, isTerminalFlowStatus, listSessions, loadAgentManifest, loadCompileManifest, loadCompileManifestFromDir, loadManagedCodexHostConfig, loadSession, loadSessionById, mcpAuthSecretKey, newSession, nulTailPaddingLength, pickFlowToolTarget, pickRepointedManager, planFlowMutate, prepareCodexTools, reconcilePendingDecisions, registerActiveFlow, registerCompositionCapabilities, rejectCapabilityOnApprovalDeny, resetRunnerLogStore, resolveAgentComposition, resolveAgentMixins, resolveBinding, resolveCapabilityCallTimeoutMs, resolveCapabilityResult, resolveComposition, resolveFlowMutateConnectorWaitMs, resolveMixin, runAgentChat, saveSession, setCurrentSession, setUpFlowConnector, startAgentServer, stimulusFromMetas, supportsLiveToolUpdates, touchSession, validateInputResponse, writeClaudeCodeCredentialsFile };
-//# sourceMappingURL=chunk-SAXTWLXZ.js.map
-//# sourceMappingURL=chunk-SAXTWLXZ.js.map
+//# sourceMappingURL=chunk-HVTU3CVF.js.map
+//# sourceMappingURL=chunk-HVTU3CVF.js.map