@skaile/workspaces 4.15.0 → 4.16.1

package/dist/{chunk-IOFPX6OO.js → chunk-VE2KMHG6.js}

@@ -1,27 +1,27 @@
-import { WorkspacePlugin } from './chunk-2E3EGCQ3.js';
-import { buildWorkspaceToolDefs } from './chunk-ZXPIKQAN.js';
+import { WorkspacePlugin } from './chunk-WDBEHNOJ.js';
+import { buildWorkspaceToolDefs } from './chunk-PQE2MYB6.js';
 import { findAiAssetsRoot } from './chunk-7IH3RKKK.js';
 import { WebSocketServerTransport } from './chunk-73ZXUUL6.js';
 import { assembleSystemPrompt, buildCapabilitiesPromptSection } from './chunk-W3UDISS2.js';
 import { prepareNativePolicy, codexInstanceEnvironment, parseCodexCredential, parseCodexRefreshInput, parseCodexRefreshResult } from './chunk-PE3A6FFW.js';
-import { resolveFlowPath } from './chunk-RDOEZBVB.js';
+import { resolveFlowPath } from './chunk-K2S4ECDJ.js';
 import { findAiAssetsRoot as findAiAssetsRoot$1, deployCatalogEntry, undeployCatalogEntry } from './chunk-Q6NDQ6BH.js';
-import { registerBuiltinConnectors, buildConnectorPromptSection, findMissingPackages, installNpmPackages, ConnectorManager, buildSdkConnectorTools, buildLazySdkFlowTools, describeFlowOperations, buildConnectorToolDefs, buildFlowToolDefs, driveOrchestratorTurn, SessionNodeExecutor, SessionSubpromptRunner, ClassifierSubpromptRunner, SessionInlineSubFlowRunner, buildSdkFlowTools } from './chunk-E4Q5GKO2.js';
-import { loadConnectorDeclarations, SecretProviderChain, ConnectorStartupError, PreMintedSecretProvider, InMemorySecretProvider, resolvedConfigToDeclarations, isKnownSecretRef, deriveSingleMaterializedConnectorDeclaration } from './chunk-MK3OCWBG.js';
-import { EventNormalizer } from './chunk-W64ZXABT.js';
+import { registerBuiltinConnectors, buildConnectorPromptSection, findMissingPackages, installNpmPackages, ConnectorManager, buildSdkConnectorTools, buildLazySdkFlowTools, describeFlowOperations, buildConnectorToolDefs, buildFlowToolDefs, driveOrchestratorTurn, SessionNodeExecutor, SessionSubpromptRunner, ClassifierSubpromptRunner, SessionInlineSubFlowRunner, buildSdkFlowTools } from './chunk-MY5TANRN.js';
+import { loadYamlConnectorDeclarations, withMaterializedConnectorDeclarations, SecretProviderChain, ConnectorStartupError, PreMintedSecretProvider, InMemorySecretProvider, resolvedConfigToDeclarations, isKnownSecretRef, deriveSingleMaterializedConnectorDeclaration } from './chunk-MC2MF4U5.js';
+import { EventNormalizer } from './chunk-TEQDWOBS.js';
 import { probeResumeTranscript } from './chunk-4SIMGJIU.js';
 import { CodexNativeStateUnavailable } from './chunk-LOO5CB5M.js';
 import { dispatchCapability } from './chunk-TOXPRXAK.js';
 import { classifyClaudeSdkError } from './chunk-GAH4YRCI.js';
-import { createDriver, catalogLayer, providerCredentialEnvName, toMergedRegistry, registryCredentialEnv, AI_PROVIDER_PRESETS } from './chunk-LQMALDDB.js';
-import { loadFlow } from './chunk-A2T4WIZL.js';
+import { createDriver, catalogLayer, providerCredentialEnvName, toMergedRegistry, registryCredentialEnv, AI_PROVIDER_PRESETS } from './chunk-CJGNYHPG.js';
+import { loadFlow } from './chunk-KTCMBEEB.js';
 import { parseFlowDefinition } from './chunk-ALLCAFHQ.js';
 import { renderStimulusPrompt } from './chunk-RQLL7L72.js';
 import { withActivityLabelJsonSchema, TOOL_ACTIVITY_PROMPT_SECTION, SESSION_ROOT_CONNECTOR_ID, PROTOCOL_VERSION } from './chunk-QQ3G5N7X.js';
-import { resolveSettings, loadProviderRegistry } from './chunk-7NRF7BQB.js';
-import { resolveRuntimeAssets } from './chunk-NXTLDFLA.js';
+import { resolveSettings, loadProviderRegistry } from './chunk-UWU572Q6.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-QWGSKDD7.js';
+import { resolveSkWorkspaceConfig, resolveAgentDir, loadMcpServerDeclarations, COMPACTION_DEFAULTS, resolveCompactionThresholdPercent, validateAssetRecipeAttr, deriveSingleMaterializedMcpDeclaration, stageMaterializedSkills, readSkillAllowList, isStagedSkillMarkerFor, unstageSkill } from './chunk-DF7C3KZK.js';
 import { withFsDeadline, FsDeadlineError, fsDeadlineMs, tryWithFsDeadline } from './chunk-2FBPAR2V.js';
 import { parseAssetRef } from './chunk-GEEW6SY2.js';
 import { resolveLogStoreConfig, createLogStoreFromConfig, OnLogBridgeSink, WsLogSink, resolveLogsRetention, enforceLogsRetention } from './chunk-JMKB7IB4.js';
@@ -2249,11 +2249,16 @@ async function buildAgentResources(projectDir, driverType, _onLog, watch, secret
     }
     if (!sessionMeta?.managedCodex)
       await maybeInstallNpmPeerDeps(runtimeAssets, projectDir, resLog);
-    const diskDeclarations = loadConnectorDeclarations(projectDir);
-    const connectorDeclarations = diskDeclarations.length > 0 ? diskDeclarations : fallbackConnectorDeclarations ?? [];
-    if (diskDeclarations.length === 0 && connectorDeclarations.length > 0) {
-      resLog.info("no disk connector declarations \u2014 using session_init resolvedConfig fallback", {
-        count: connectorDeclarations.length
+    const yamlDeclarations = loadYamlConnectorDeclarations(projectDir);
+    const wireDeclarations = fallbackConnectorDeclarations ?? [];
+    const usesWire = yamlDeclarations.length === 0 && wireDeclarations.length > 0;
+    const connectorDeclarations = withMaterializedConnectorDeclarations(
+      usesWire ? wireDeclarations : yamlDeclarations,
+      projectDir
+    );
+    if (usesWire) {
+      resLog.info("no skaile.yaml connector declarations \u2014 using session_init resolvedConfig", {
+        count: wireDeclarations.length
       });
     }
     let resourceManager = null;
@@ -7591,6 +7596,7 @@ async function startAgentServer(opts) {
   let managedInitFingerprint;
   let managedInitComplete = false;
   let appliedWireAgentConfigKey;
+  let wireConnectorDeclarationsApplied = false;
   const stagedSkillDirs = /* @__PURE__ */ new Map();
   const withSkillFsLock = createSerialLock();
   const stageDeclaredSkills = createCoalescedTask(
@@ -8296,6 +8302,16 @@ async function startAgentServer(opts) {
     }
     return initialAiCredentialExpiresAt;
   }
+  function yamlDeclaresNoConnectors() {
+    try {
+      return loadYamlConnectorDeclarations(opts.projectDir).length === 0;
+    } catch (err) {
+      log(
+        `[serve] session_init: skaile.yaml connectors unreadable, wire connector set not applied: ${err instanceof Error ? err.message : String(err)}`
+      );
+      return false;
+    }
+  }
   async function buildSessionFromInit(secrets, fallbackConnectorDeclarations) {
     const wireRegistry = managedCodex ? void 0 : wireAgentConfig?.registry;
     const credentialEnv = wireRegistry ? registryCredentialEnv(wireRegistry, {
@@ -8325,10 +8341,11 @@ async function startAgentServer(opts) {
       emitResourcesAvailable();
       agentSession.startWatching();
       appliedWireAgentConfigKey = wireAgentConfig ? JSON.stringify(wireAgentConfig) : void 0;
+      wireConnectorDeclarationsApplied = (fallbackConnectorDeclarations?.length ?? 0) > 0;
       log("[serve] session built from session_init envelope");
-    } else if ((fallbackConnectorDeclarations?.length ?? 0) > 0 && !agentSession.resourceManager) {
+    } else if ((fallbackConnectorDeclarations?.length ?? 0) > 0 && !wireConnectorDeclarationsApplied && yamlDeclaresNoConnectors()) {
       log(
-        `[serve] session_init: recreating eagerly-built session to apply ${fallbackConnectorDeclarations.length} wire connector declaration(s) (no disk declarations)`
+        `[serve] session_init: recreating eagerly-built session to apply ${fallbackConnectorDeclarations.length} wire connector declaration(s) (no skaile.yaml declarations)`
       );
       needsWireFallbackRecreate = true;
     }
@@ -8833,6 +8850,7 @@ async function startAgentServer(opts) {
         log("[serve] session_init: consolidated session recreate");
         const recreateStartedAt = Date.now();
         await recreateSessionForInit(pendingResumeSessionId);
+        if (needsWireFallbackRecreate) wireConnectorDeclarationsApplied = true;
         logPhase("session_recreate", recreateStartedAt, {
           resuming: !!pendingResumeSessionId
         });
@@ -9544,5 +9562,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-IOFPX6OO.js.map
-//# sourceMappingURL=chunk-IOFPX6OO.js.map
+//# sourceMappingURL=chunk-VE2KMHG6.js.map
+//# sourceMappingURL=chunk-VE2KMHG6.js.map