mastracode 0.22.0 → 0.22.1

package/dist/{chunk-Y5AUV6T3.js → chunk-G76EJQC6.js}

@@ -1,4 +1,4 @@
-import { setAuthStorage, setAuthStorage3, setAuthStorage2, loadSettings, MEMORY_GATEWAY_PROVIDER, GithubSignals, getDynamicModel, getAvailableModePacks, getAvailableOmPacks, resolveModelDefaults, resolveOmRoleModel, resolveModel, releaseThreadLock, acquireThreadLock, getCustomProviderId, toCustomProviderModelId, getCopilotModelCatalog, saveSettings, mastra, OBSERVABILITY_AUTH_PREFIX } from './chunk-7ZTY5SBK.js';
+import { setAuthStorage, setAuthStorage3, setAuthStorage2, loadSettings, MEMORY_GATEWAY_PROVIDER, GithubSignals, getDynamicModel, getAvailableModePacks, getAvailableOmPacks, resolveModelDefaults, resolveOmRoleModel, releaseThreadLock, acquireThreadLock, getCustomProviderId, toCustomProviderModelId, getCopilotModelCatalog, saveSettings, resolveModel, mastra, OBSERVABILITY_AUTH_PREFIX } from './chunk-7ZTY5SBK.js';
 import { DEFAULT_OM_MODEL_ID, DEFAULT_CONFIG_DIR, AuthStorage, validateConfigDirName, detectProject, getResourceIdOverride, getStorageConfig, getObservabilityDatabasePath, getVectorDatabasePath, getCurrentGitBranchAsync, getOmScope, DEFAULT_REF_THRESHOLD, DEFAULT_OBS_THRESHOLD, getDatabasePath, getAppDataDir } from './chunk-5FT2NNFO.js';
 import { MC_TOOLS, getToolCategory, TOOL_NAME_OVERRIDES } from './chunk-UOFNLVKF.js';
 import { createHash } from 'crypto';
@@ -1030,7 +1030,7 @@ ${lines.join("\n")}
 // src/agents/instructions.ts
 async function getDynamicInstructions({ requestContext }) {
   const harnessContext = requestContext.get("harness");
-  const state = harnessContext?.getState?.();
+  const state = harnessContext?.state;
   const modeId = harnessContext?.modeId ?? "build";
   const projectPath = state?.projectPath ?? process.cwd();
   const promptCtx = {
@@ -1380,7 +1380,7 @@ function wrapToolWithHooks(toolName, tool, hookManager) {
 function createDynamicTools(mcpManager, extraTools, hookManager, disabledTools, storage) {
   return function getDynamicTools({ requestContext }) {
     const ctx = requestContext.get("harness");
-    const state = ctx?.getState?.();
+    const state = ctx?.getState();
     const modelId = state?.currentModelId;
     const isAnthropicModel = modelId?.startsWith("anthropic/");
     const isOpenAIModel = modelId?.startsWith("openai/");
@@ -1961,62 +1961,15 @@ var HarnessCompat = class extends Harness$1 {
     super(args);
     this.#harnessV1 = harnessV1;
   }
-  getState() {
-    const state = super.getState();
-    let session;
-    try {
-      session = this.#session;
-    } catch {
-      session = void 0;
-    }
-    if (!session) {
-      return state;
-    }
-    return {
-      ...state,
-      ...session.getState(),
-      currentModelId: session.getModelId(),
-      modeId: session.getMode().id
-    };
-  }
-  async setState(updates) {
-    const { currentModelId, modeId, ...harnessUpdates } = updates;
-    let session;
-    try {
-      session = this.#session;
-    } catch {
-      session = void 0;
-    }
-    if (session) {
-      if (typeof currentModelId === "string") {
-        session.setModelId(currentModelId);
-      }
-      if (typeof modeId === "string" && modeId !== session.getMode().id) {
-        await this.switchMode({ modeId });
-      }
-    }
-    if (Object.keys(harnessUpdates).length > 0) {
-      if (session) {
-        await session.setState(harnessUpdates);
-      }
-      await super.setState(harnessUpdates);
-    }
-  }
-  getSubagentModelId({ agentType } = {}) {
-    return super.getSubagentModelId({ agentType });
-  }
-  async setSubagentModelId({ modelId, agentType }) {
-    await super.setSubagentModelId({ modelId, agentType });
-  }
   async switchThread({ threadId }) {
-    const currentModelId = this.getState().currentModelId;
-    const session = await this.#harnessV1.session({
+    const modes = this.listModes();
+    this.#session = await this.#harnessV1.session({
       threadId,
       resourceId: this.getResourceId()
     });
-    this.#session = session;
-    if (typeof currentModelId === "string" && currentModelId.length > 0) {
-      session.setModelId(currentModelId);
+    const defaultModelId = modes.find((mode) => mode.id === this.#session.getMode().id)?.defaultModelId;
+    if (defaultModelId) {
+      this.#session.setModelId(defaultModelId);
     }
     await super.switchThread({ threadId });
   }
@@ -2116,19 +2069,6 @@ var HarnessCompat = class extends Harness$1 {
     }
     await super.switchMode({ modeId });
   }
-  /**
-   * Activate a skill on the current v1 session.
-   *
-   * Pass-through to `Session.useSkill` — returns the resolved instructions
-   * string, or throws `HarnessSkillNotFoundError` if the skill is missing.
-   * Throws if there is no active session.
-   */
-  async useSkill(name, opts) {
-    if (!this.#session) {
-      throw new Error("No active session to use skill");
-    }
-    return this.#session.useSkill(name, opts);
-  }
 };
 var VALID_EVENTS = [
   "PreToolUse",
@@ -2973,12 +2913,15 @@ function createMcpManager(projectDir, configDirName = DEFAULT_CONFIG_DIR, extraS
   };
 }
 var stateSchema = z.object({
-  subagentModelId: z.string().optional(),
   projectPath: z.string().optional(),
   projectName: z.string().optional(),
   configDir: z.string().default(DEFAULT_CONFIG_DIR),
   gitBranch: z.string().optional(),
   lastCommand: z.string().optional(),
+  currentModelId: z.string().default(""),
+  // Subagent model settings (per-thread/per-mode)
+  subagentModelId: z.string().optional(),
+  // Thread-level default for subagents
   // Observational Memory model settings
   observerModelId: z.string().default(DEFAULT_OM_MODEL_ID),
   reflectorModelId: z.string().default(DEFAULT_OM_MODEL_ID),
@@ -3390,7 +3333,7 @@ async function createMastraCode(config) {
         // Environment & project:
         //   state.projectName, state.gitBranch
         // Model configuration:
-        //   state.currentModelId
+        //   state.currentModelId, state.subagentModelId
         // Agent settings:
         //   state.yolo, state.thinkingLevel, state.smartEditing
         // Observational memory settings:
@@ -3407,6 +3350,7 @@ async function createMastraCode(config) {
           "harness.state.gitBranch",
           // Model configuration
           "harness.state.currentModelId",
+          "harness.state.subagentModelId",
           // Agent settings
           "harness.state.yolo",
           "harness.state.thinkingLevel",
@@ -3656,32 +3600,15 @@ async function createMastraCode(config) {
       });
     })
   );
-  const typedStateSchema = stateSchema;
-  const initialState = {
-    projectPath: project.rootPath,
-    projectName: project.name,
-    gitBranch: project.gitBranch,
-    yolo: true,
-    ...globalInitialState,
-    ...config?.initialState,
-    // configDir must always win over initialState spreads to stay in sync
-    // with MCP/hooks/storage which were already initialized with this value.
-    configDir
-  };
-  const workspace = config?.workspace ?? getDynamicWorkspace;
   const harnessV1 = new Harness({
     ownerId,
     agents: { [CODE_AGENT_ID]: codeAgent },
     memory,
     modes: modesV1,
     defaultModeId,
-    storage: harnessStorage,
-    stateSchema: typedStateSchema,
-    initialState,
-    workspace,
-    resolveModel: (modelId) => resolveModel(modelId),
-    toolCategoryResolver: (name) => getToolCategory(name) ?? null
+    storage: harnessStorage
   });
+  const typedStateSchema = stateSchema;
   const harness = new HarnessCompat(
     {
       id: "mastra-code",
@@ -3694,8 +3621,18 @@ async function createMastraCode(config) {
       subagents,
       resolveModel: (modelId) => resolveModel(modelId),
       toolCategoryResolver: getToolCategory,
-      initialState,
-      workspace,
+      initialState: {
+        projectPath: project.rootPath,
+        projectName: project.name,
+        gitBranch: project.gitBranch,
+        yolo: true,
+        ...globalInitialState,
+        ...config?.initialState,
+        // configDir must always win over initialState spreads to stay in sync
+        // with MCP/hooks/storage which were already initialized with this value.
+        configDir
+      },
+      workspace: config?.workspace ?? getDynamicWorkspace,
       browser: config?.browser,
       modes,
       heartbeatHandlers,
@@ -3834,5 +3771,5 @@ async function createMastraCode(config) {
 }
 
 export { createAuthStorage, createMastraCode };
-//# sourceMappingURL=chunk-Y5AUV6T3.js.map
-//# sourceMappingURL=chunk-Y5AUV6T3.js.map
+//# sourceMappingURL=chunk-G76EJQC6.js.map
+//# sourceMappingURL=chunk-G76EJQC6.js.map