@skaile/workspaces 1.11.0 → 1.12.0

package/dist/{chunk-MTNGINBO.js → chunk-SORYPIC3.js}

@@ -9,7 +9,7 @@ import { deployCatalogEntry, undeployCatalogEntry } from './chunk-LV2HPH3C.js';
 import { registerBuiltinConnectors, buildConnectorPromptSection, findMissingPackages, installNpmPackages, ConnectorManager, ConnectorStartupError, buildSdkConnectorTools, buildSdkFlowTools } from './chunk-UFGWIXRA.js';
 import { loadConnectorDeclarations, SecretProviderChain, PreMintedSecretProvider, InMemorySecretProvider, resolvedConfigToDeclarations, deriveSingleMaterializedConnectorDeclaration } from './chunk-Y6FV73IH.js';
 import { renderStimulusPrompt, buildOrchestratorPrompt } from './chunk-3EBFDMZC.js';
-import { PROTOCOL_VERSION } from './chunk-XJOPAGZX.js';
+import { PROTOCOL_VERSION } from './chunk-TSB46BHR.js';
 import { resolveSettings, resolveApiKey, providerEnvKey } from './chunk-5NZ56R63.js';
 import { resolveRuntimeAssets } from './chunk-7J7LQP6T.js';
 import { resolveSkWorkspaceConfig, resolveAgentDir, cloudConfigFromProfile, stageMaterializedSkills, loadMcpServerDeclarations, COMPACTION_DEFAULTS, validateAssetRecipeAttr, deriveSingleMaterializedMcpDeclaration } from './chunk-ISA7R7PK.js';
@@ -4545,13 +4545,23 @@ async function startAgentServer(opts) {
     );
   }
   const effectiveCloudConfig = cloudConfigFromProfile(profile);
+  const diskProfileHasAgentSettings = (p) => !!p && !!(p.driver || p.provider || p.model || p.cloud || p.cloud_config || p.thinking || p.effort);
+  function resolveEffectiveCloudForSession() {
+    if (effectiveCloud !== "default" || !wireAgentConfig) {
+      return { cloud: effectiveCloud, cloudConfig: effectiveCloudConfig };
+    }
+    const raw = wireAgentConfig.cloud ?? "default";
+    const cloud = SUPPORTED_CLOUDS.includes(raw) ? raw : "default";
+    return { cloud, cloudConfig: wireAgentConfig.cloudConfig };
+  }
   function buildSessionConfig(secretProvider2, apiKey, cloudSecrets, fallbackConnectorDeclarations) {
+    const { cloud: sessionCloud, cloudConfig: sessionCloudConfig } = resolveEffectiveCloudForSession();
     return {
       projectDir: opts.projectDir,
       agentDir,
-      driver: opts.driver,
-      model: opts.model,
-      provider: opts.provider,
+      driver: opts.driver ?? wireAgentConfig?.driver,
+      model: opts.model ?? wireAgentConfig?.model,
+      provider: opts.provider ?? wireAgentConfig?.provider,
       promptsDir: opts.promptsDir,
       sessionId,
       resumeSessionId,
@@ -4565,9 +4575,11 @@ async function startAgentServer(opts) {
       // plus the platform-resolved credential bundle (Vertex SA JSON already
       // materialized to a file path by resolveCloudSecretBundle). Omitted
       // entirely for `default` so the session config stays byte-identical.
-      ...effectiveCloud !== "default" ? { cloud: effectiveCloud } : {},
-      ...effectiveCloudConfig ? { cloudConfig: effectiveCloudConfig } : {},
+      ...sessionCloud !== "default" ? { cloud: sessionCloud } : {},
+      ...sessionCloudConfig ? { cloudConfig: sessionCloudConfig } : {},
       ...cloudSecrets ? { cloudSecrets } : {},
+      ...wireAgentConfig?.thinking ? { thinking: wireAgentConfig.thinking } : {},
+      ...wireAgentConfig?.effort ? { effort: wireAgentConfig.effort } : {},
       // Protocol v2 `<CAPABILITIES>` block — joins each registered capability's
       // `promptFragment` (framework first, then client, then agent-side
       // surfaces). Built lazily inside `buildSessionConfig` so newly registered
@@ -4645,12 +4657,14 @@ async function startAgentServer(opts) {
   let secretProvider;
   let runtimeIdentity;
   let preMintedSecrets;
+  let wireAgentConfig;
+  let appliedWireAgentConfigKey;
   const stagedSkillDirs = /* @__PURE__ */ new Set();
   await restageMaterializedSkills(false);
   async function restageMaterializedSkills(allowRestart) {
     try {
       const { skillsDir } = resolveDriverPaths({
-        driver: opts.driver ?? wsConfig.agent_config?.default?.driver ?? "claude-sdk"
+        driver: opts.driver ?? wsConfig.agent_config?.default?.driver ?? wireAgentConfig?.driver ?? "claude-sdk"
       });
       const declared = (wsConfig.dependencies ?? []).flatMap((dep) => {
         try {
@@ -5152,13 +5166,14 @@ async function startAgentServer(opts) {
   async function buildSessionFromInit(secrets, fallbackConnectorDeclarations) {
     let apiKeyFromSecrets;
     let cloudSecrets;
-    if (effectiveCloud === "default") {
-      const effectiveProvider = opts.provider ?? "anthropic";
+    const { cloud: initCloud } = resolveEffectiveCloudForSession();
+    if (initCloud === "default") {
+      const effectiveProvider = opts.provider ?? wireAgentConfig?.provider ?? "anthropic";
       const envKey = providerEnvKey(effectiveProvider);
       apiKeyFromSecrets = secrets?.[envKey];
     } else {
       ({ cloudSecrets } = resolveCloudSecretBundle({
-        cloud: effectiveCloud,
+        cloud: initCloud,
         secrets,
         projectDir: opts.projectDir
       }));
@@ -5170,6 +5185,7 @@ async function startAgentServer(opts) {
       fallbackConnectorDeclarations
     );
     let needsWireFallbackRecreate = false;
+    const agentSessionExistedBeforeThisInit = !!agentSession;
     if (!agentSession) {
       agentSession = await createAgentSession(sessionConfig);
       emitSystemPromptComposed(agentSession, sendEvent);
@@ -5180,6 +5196,7 @@ async function startAgentServer(opts) {
       captureBakedMcpServers();
       emitResourcesAvailable();
       agentSession.startWatching();
+      appliedWireAgentConfigKey = wireAgentConfig ? JSON.stringify(wireAgentConfig) : void 0;
       log("[serve] session built from session_init envelope");
     } else if ((fallbackConnectorDeclarations?.length ?? 0) > 0 && !agentSession.resourceManager) {
       log(
@@ -5187,6 +5204,15 @@ async function startAgentServer(opts) {
       );
       needsWireFallbackRecreate = true;
     }
+    const wireKey = wireAgentConfig ? JSON.stringify(wireAgentConfig) : void 0;
+    let needsWireAgentConfigRecreate = false;
+    if (agentSessionExistedBeforeThisInit && wireKey && wireKey !== appliedWireAgentConfigKey) {
+      log(
+        `[serve] session_init: recreating eagerly-built session to apply wire agentConfig (driver=${wireAgentConfig.driver ?? "(default)"} model=${wireAgentConfig.model ?? "(default)"})`
+      );
+      needsWireAgentConfigRecreate = true;
+      appliedWireAgentConfigKey = wireKey;
+    }
     wireSessionCapabilities({
       capabilityRegistry,
       remoteCapabilityInvoker,
@@ -5200,7 +5226,7 @@ async function startAgentServer(opts) {
       attachSkillInstance,
       log
     });
-    return { needsWireFallbackRecreate };
+    return { needsWireFallbackRecreate, needsWireAgentConfigRecreate };
   }
   async function recreateAgentSession(overrides) {
     const disposedManager = agentSession.resourceManager;
@@ -5379,7 +5405,7 @@ async function startAgentServer(opts) {
   async function attachSkillInstance(name) {
     try {
       const { skillsDir } = resolveDriverPaths({
-        driver: opts.driver ?? wsConfig.agent_config?.default?.driver ?? "claude-sdk"
+        driver: opts.driver ?? wsConfig.agent_config?.default?.driver ?? wireAgentConfig?.driver ?? "claude-sdk"
       });
       const staged = stageMaterializedSkills(opts.projectDir, skillsDir, {
         declared: [name]
@@ -5455,6 +5481,7 @@ async function startAgentServer(opts) {
       aiProviderConfigId = cmd.resolvedConfig.aiProviderConfigId;
       log(`[serve] stashed aiProviderConfigId=${aiProviderConfigId}`);
     }
+    wireAgentConfig = diskProfileHasAgentSettings(profile) ? void 0 : cmd.resolvedConfig.agentConfig ?? wireAgentConfig;
     if (aiProviderConfigId && initialAiCredentialExpiresAt) {
       aiCredentialRefreshScheduler.schedule(initialAiCredentialExpiresAt);
     }
@@ -5463,10 +5490,7 @@ async function startAgentServer(opts) {
       capabilitySignature: computeCapabilitySignature(capabilityRegistry.list())
     });
     const buildSession = async () => {
-      const { needsWireFallbackRecreate } = await buildSessionFromInit(
-        cmd.secrets,
-        resolvedConfigToDeclarations(cmd.resolvedConfig)
-      );
+      const { needsWireFallbackRecreate, needsWireAgentConfigRecreate } = await buildSessionFromInit(cmd.secrets, resolvedConfigToDeclarations(cmd.resolvedConfig));
       const cfg = {
         aiResources: cmd.resolvedConfig.aiResources,
         subagents: cmd.resolvedConfig.subagents,
@@ -5505,7 +5529,8 @@ async function startAgentServer(opts) {
           pendingResumeSessionId = cfgResumeSessionId;
         }
       }
-      if (pendingResumeSessionId || cfg.subagents || needsWireFallbackRecreate) {
+      if (pendingResumeSessionId || cfg.subagents || needsWireFallbackRecreate || needsWireAgentConfigRecreate) {
+        log("[serve] session_init: consolidated session recreate");
         await recreateSessionForInit(pendingResumeSessionId);
       }
       if (cfg.sharedState) {
@@ -6178,5 +6203,5 @@ function touchSession(state) {
 }
 
 export { CLAUDE_CODE_CREDENTIALS_KEY, COMPILE_MANIFEST_FILENAME, CapabilityRegistry, DEFAULT_CAPABILITY_CALL_TIMEOUT_MS, DEFAULT_COALESCE_MS, MarkdownStreamer, PreInitRingSink, agentDefinitionExists, bootstrapCapabilityRegistry, bootstrapRunnerLogStore, buildAgentResources, buildClientCapabilityHandler, buildConnectorTokenMediator, buildContextSection, buildEnvironmentSection, buildResourcesAvailablePayload, buildStoreSnapshotReplay, builtinCapabilities, capabilityLogInstance, clearPreInitRingSink, clearSession, compileComposition, computeCapabilitySignature, connectorRefreshKind, createAgentSession, createSessionStimulusBus, defineCapability, deleteSession, dispatchRunnerCapabilityInvocation, emitSystemPromptComposed, ensureGitConfigInclude, extractClaudeAiOauthExpiresAt, getPreInitRingSink, handleMountResourceRequest, handleResourceRequest, hostOpResumeStimulus, installPreInitRingSink, listSessions, loadAgentManifest, loadCompileManifest, loadCompileManifestFromDir, loadSession, loadSessionById, mcpAuthSecretKey, newSession, pickRepointedManager, planFlowMutate, registerCompositionCapabilities, rejectCapabilityOnApprovalDeny, resetRunnerLogStore, resolveAgentComposition, resolveAgentMixins, resolveBinding, resolveCapabilityCallTimeoutMs, resolveCapabilityResult, resolveComposition, resolveMixin, runAgentChat, saveSession, setCurrentSession, startAgentServer, stimulusFromMetas, touchSession, writeClaudeCodeCredentialsFile };
-//# sourceMappingURL=chunk-MTNGINBO.js.map
-//# sourceMappingURL=chunk-MTNGINBO.js.map
+//# sourceMappingURL=chunk-SORYPIC3.js.map
+//# sourceMappingURL=chunk-SORYPIC3.js.map