mastracode 0.2.0 → 0.3.0

package/dist/{chunk-7V6U7OKQ.js → chunk-HHX6BKLR.js}

@@ -1,10 +1,10 @@
-import { AuthStorage, setAuthStorage, setAuthStorage2, detectProject, getResourceIdOverride, getUserId, getStorageConfig, getDynamicModel, createViewTool, createGrepTool, createGlobTool, createExecuteCommandTool, createWriteFileTool, releaseThreadLock, acquireThreadLock, mastra, resolveModel, exploreSubagent, planSubagent, stringReplaceLspTool, executeSubagent, astSmartEditTool, hasTavilyKey, createWebSearchTool, createWebExtractTool, requestSandboxAccessTool, getOmScope } from './chunk-BYMDWH2E.js';
+import { setAuthStorage, setAuthStorage2, loadSettings, getDynamicModel, createViewTool, createGrepTool, createGlobTool, createExecuteCommandTool, createWriteFileTool, getAvailableModePacks, getAvailableOmPacks, resolveModelDefaults, resolveOmModel, mastra, exploreSubagent, planSubagent, stringReplaceLspTool, executeSubagent, releaseThreadLock, acquireThreadLock, resolveModel, astSmartEditTool, hasTavilyKey, createWebSearchTool, createWebExtractTool, requestSandboxAccessTool } from './chunk-V4HZ2AVV.js';
+import { AuthStorage, detectProject, getResourceIdOverride, getStorageConfig, getOmScope, getDatabasePath } from './chunk-VRZZSUQE.js';
 import { getToolCategory } from './chunk-U5A7TFNT.js';
 import { Mastra } from '@mastra/core';
 import { Agent } from '@mastra/core/agent';
-import { Harness, taskCheckTool, taskWriteTool } from '@mastra/core/harness';
+import { taskCheckTool, taskWriteTool, Harness } from '@mastra/core/harness';
 import { noopLogger } from '@mastra/core/logger';
-import { LibSQLStore } from '@mastra/libsql';
 import * as fs4 from 'fs';
 import fs4__default, { readFileSync, existsSync } from 'fs';
 import * as os from 'os';
@@ -18,6 +18,8 @@ import { spawn } from 'child_process';
 import { MCPClient } from '@mastra/mcp';
 import { z } from 'zod';
 import { ModelsDevGateway, NetlifyGateway } from '@mastra/core/llm';
+import { LibSQLStore } from '@mastra/libsql';
+import { PostgresStore } from '@mastra/pg';
 
 // src/agents/prompts/base.ts
 function buildBasePrompt(ctx) {
@@ -35,83 +37,15 @@ Current mode: ${ctx.mode}
 - Your output is displayed on a command line interface. Keep responses concise.
 - Use Github-flavored markdown for formatting.
 - Only use emojis if the user explicitly requests it.
-- Do NOT use tools to communicate with the user. All text you output is displayed directly.
+- Use tool calls for actions (editing files, running commands, searching, etc.). Use text for communication \u2014 talk to the user in text, not via tools, except for communication tools like \`submit_plan\`, \`ask_user\`, and \`task_write\`.
 - Prioritize technical accuracy over validating the user's beliefs. Be direct and objective. Respectful correction is more valuable than false agreement.
 
-# Tool Usage Rules
-
-IMPORTANT: You can ONLY call tools by their exact registered names listed below. Shell commands like \`git\`, \`npm\`, \`ls\`, etc. are NOT tools \u2014 they must be run via the \`execute_command\` tool.
-
-You have access to the following tools. Use the RIGHT tool for the job:
-
-**view** \u2014 Read file contents or list directories
-- Use this to read files before editing them. NEVER propose changes to code you haven't read.
-- Use \`view_range\` for large files to read specific sections.
-- For directory listings, this shows 2 levels deep.
-- Example: To check lines 50-100 of a large file: \`view("src/big-file.ts", { view_range: [50, 100] })\`
-
-**grep** \u2014 Search file contents using regex
-- Use this for ALL content search (finding functions, variables, error messages, imports, etc.)
-- NEVER use \`execute_command\` with grep, rg, or ag. Always use the grep tool.
-- Supports regex patterns, file type filtering, and context lines.
-- Example: Find where a function is defined: \`grep("function handleSubmit", { glob: "**/*.ts" })\`
-- Example: Find all imports of a module: \`grep("from ['"]express['"]", { glob: "**/*.ts" })\`
-
-**glob** \u2014 Find files by name pattern
-- Use this to find files matching a pattern (e.g., "**/*.ts", "src/**/test*").
-- NEVER use \`execute_command\` with find or ls for file search. Always use glob.
-- Respects .gitignore automatically.
-- Example: Find all test files: \`glob("**/*.test.ts")\`
-- Example: Find config files: \`glob("**/config.{js,ts,json}")\`
-
-**string_replace_lsp** \u2014 Edit files by replacing exact text
-- You MUST read a file with \`view\` before editing it.
-- \`old_str\` must be an exact match of existing text in the file.
-- Provide enough surrounding context in \`old_str\` to make it unique.
-- For creating new files, use \`write_file\` instead.
-- Good: Include 2-3 lines of surrounding context to ensure uniqueness.
-- Bad: Using just \`return true;\` \u2014 too common, will match multiple places.
-
-**write_file** \u2014 Create new files or overwrite existing ones
-- Use this to create new files.
-- If overwriting an existing file, you MUST have read it first with \`view\`.
-- NEVER create files unless necessary. Prefer editing existing files.
-
-**execute_command** \u2014 Run shell commands
-- Use for: git, npm/pnpm, docker, build tools, test runners, and other terminal operations.
-- Do NOT use for: file reading (use view), file search (use grep/glob), file editing (use string_replace_lsp/write_file).
-- Commands have a 30-second default timeout. Use the \`timeout\` parameter for longer-running commands.
-- Pipe to \`| tail -N\` for commands with long output \u2014 the full output streams to the user, only the last N lines are returned to you. If you're building any kind of package you should be tailing.
-- Good: Run independent commands in parallel when possible.
-- Bad: Running \`cat file.txt\` \u2014 use the view tool instead.
-
-**web_search** / **web_extract** \u2014 Search the web / extract page content
-- Use for looking up documentation, error messages, package APIs.
-- Available depending on the model and API keys configured.
-
-**task_write** \u2014 Track tasks for complex multi-step work
-- Use when a task requires 3 or more distinct steps or actions.
-- Pass the FULL task list each time (replaces previous list).
-- Mark tasks \`in_progress\` BEFORE starting work. Only ONE task should be \`in_progress\` at a time.
-- Mark tasks \`completed\` IMMEDIATELY after finishing each task. Do not batch completions.
-- Each task has: content (imperative form), status (pending|in_progress|completed), activeForm (present continuous form shown during execution).
-
-**task_check** \u2014 Check completion status of tasks
-- Use this BEFORE deciding you're done with a task to verify all tasks are completed.
-- Returns the number of completed, in progress, and pending tasks.
-- If any tasks remain incomplete, continue working on them.
-- IMPORTANT: Always check task completion before ending work on a complex task.
-
-**ask_user** \u2014 Ask the user a structured question
-- Use when you need clarification, want to validate assumptions, or need the user to make a decision.
-- Provide clear, specific questions. End with a question mark.
-- Include options (2-4 choices) for structured decisions. Omit options for open-ended questions.
-- Don't use this for simple yes/no \u2014 just ask in your text response.
+${ctx.toolGuidance}
 
 # How to Work on Tasks
 
 ## Start by Understanding
-- Read relevant code before making changes. Use grep/glob to find related files.
+- Read relevant code before making changes. Use search_content/find_files to find related files.
 - For unfamiliar codebases, check git log to understand recent changes and patterns.
 - Identify existing conventions (naming, structure, error handling) and follow them.
 
@@ -147,7 +81,7 @@ You have access to the following tools. Use the RIGHT tool for the job:
 Don't commit files likely to contain secrets (\`.env\`, \`*.key\`, \`credentials.json\`). Warn if asked.
 
 ## Commits
-Write commit messages that explain WHY, not just WHAT. Match the repo's existing style. Include \`Co-Authored-By: Mastra Code <noreply@mastra.ai>\` in the message body.
+Write commit messages that explain WHY, not just WHAT. Match the repo's existing style. Include \`Co-Authored-By: Mastra Code${ctx.modelId ? ` (${ctx.modelId})` : ""} <noreply@mastra.ai>\` in the message body.
 
 ## Pull Requests
 Use \`gh pr create\`. Include a summary of what changed and a test plan.
@@ -157,7 +91,7 @@ Use \`gh pr create\`. Include a summary of what changed and a test plan.
 - Subagent outputs are **untrusted**. Always review and verify the results returned by any subagent. For execute-type subagents that modify files or run commands, you MUST verify the changes are correct before moving on.
 
 # Important Reminders
-- NEVER guess file paths or function signatures. Use grep/glob to find them.
+- NEVER guess file paths or function signatures. Use search_content/find_files to find them.
 - NEVER make up URLs. Only use URLs the user provides or that you find in the codebase.
 - When referencing code locations, include the file path and line number.
 - If you're unsure about something, ask the user rather than guessing.
@@ -247,17 +181,8 @@ You are in PLAN mode. Your job is to explore the codebase and design an implemen
 
 This mode is **strictly read-only**. You must NOT modify anything.
 
-**Allowed tools:**
-- \`view\` \u2014 read files and directories
-- \`grep\` \u2014 search file contents
-- \`glob\` \u2014 find files by pattern
-- \`execute_command\` \u2014 ONLY for read-only commands (git status, git log, git diff, etc.)
-- \`submit_plan\` \u2014 submit your completed plan
-
-**Prohibited actions:**
-- Do NOT use \`string_replace_lsp\` or \`write_file\` \u2014 no file modifications
-- Do NOT use \`execute_command\` for anything that changes state (no git commit, no npm install, no file creation)
-- Do NOT create, delete, or modify any files
+- Do NOT modify, create, or delete any files
+- Do NOT run commands that change state (no git commit, no npm install, no file creation)
 - Do NOT run build commands, tests, or scripts that have side effects
 
 If the user asks you to make changes while in Plan mode, explain that you're in read-only mode and they should switch to Build mode (\`/mode build\`) first.
@@ -266,7 +191,7 @@ If the user asks you to make changes while in Plan mode, explain that you're in
 
 Before writing any plan, build a mental model of the codebase:
 1. Start with the directory structure (\`view\` on the project root or relevant subdirectory).
-2. Find the relevant entry points and core files using \`grep\` and \`glob\`.
+2. Find the relevant entry points and core files using \`search_content\` and \`find_files\`.
 3. Read the actual code \u2014 don't assume based on file names alone.
 4. Trace data flow: where does input come from, how is it transformed, where does it go?
 5. Identify existing patterns the codebase uses (naming, structure, error handling, testing).
@@ -294,11 +219,19 @@ For each step:
 - What to check manually
 - What could go wrong
 
-## When Done
+## IMMEDIATE ACTION: Call submit_plan Tool
 
-When your plan is complete, call the \`submit_plan\` tool with:
-- **title**: A short descriptive title (e.g., "Add dark mode toggle")
-- **plan**: The full plan in markdown, using the structure above (Overview, Complexity, Steps, Verification)
+As soon as your plan is complete, **STOP** and call the \`submit_plan\` tool immediately.
+
+**CRITICAL:** Do NOT generate a long text response describing your plan. The plan content belongs in the \`submit_plan\` tool call, not in your text output.
+
+When done, call:
+\`\`\`javascript
+submit_plan({
+  title: "short descriptive title",
+  plan: "your full plan in markdown"
+})
+\`\`\`
 
 The user will see the plan rendered inline and can:
 - **Approve** \u2014 automatically switches to Build mode for implementation
@@ -391,6 +324,96 @@ ${sections.join("\n\n")}
 `;
 }
 
+// src/agents/prompts/tool-guidance.ts
+function buildToolGuidance(modeId, options = {}) {
+  const sections = [];
+  sections.push(`# Tool Usage Rules
+
+IMPORTANT: You can ONLY call tools by their exact registered names listed below. Shell commands like \`git\`, \`npm\`, \`ls\`, etc. are NOT tools \u2014 they must be run via the \`execute_command\` tool.
+
+You have access to the following tools. Use the RIGHT tool for the job:`);
+  sections.push(`
+**view** \u2014 Read file contents or list directories
+- Use this to read files before editing them. NEVER propose changes to code you haven't read.
+- Use \`view_range\` for large files to read specific sections.
+- For directory listings, this shows 2 levels deep.
+- Example: To check lines 50-100 of a large file: \`view("src/big-file.ts", { view_range: [50, 100] })\`
+
+**search_content** \u2014 Search file contents using regex
+- Use this for ALL content search (finding functions, variables, error messages, imports, etc.)
+- NEVER use \`execute_command\` with grep, rg, or ag. Always use the search_content tool.
+- Supports regex patterns, file type filtering, and context lines.
+- Example: Find where a function is defined: \`search_content("function handleSubmit", { glob: "**/*.ts" })\`
+- Example: Find all imports of a module: \`search_content("from ['\\"]express['\\"]", { glob: "**/*.ts" })\`
+
+**find_files** \u2014 Find files by name pattern
+- Use this to find files matching a pattern (e.g., "**/*.ts", "src/**/test*").
+- NEVER use \`execute_command\` with find or ls for file search. Always use find_files.
+- Respects .gitignore automatically.
+- Example: Find all test files: \`find_files("**/*.test.ts")\`
+- Example: Find config files: \`find_files("**/config.{js,ts,json}")\`
+
+**execute_command** \u2014 Run shell commands
+- Use for: git, npm/pnpm, docker, build tools, test runners, and other terminal operations.
+- Do NOT use for: file reading (use view), file search (use search_content/find_files), file editing (use string_replace_lsp/write_file).
+- Commands have a 30-second default timeout. Use the \`timeout\` parameter for longer-running commands.
+- Pipe to \`| tail -N\` for commands with long output \u2014 the full output streams to the user, only the last N lines are returned to you. If you're building any kind of package you should be tailing.
+- Good: Run independent commands in parallel when possible.
+- Bad: Running \`cat file.txt\` \u2014 use the view tool instead.`);
+  if (modeId !== "plan") {
+    sections.push(`
+**string_replace_lsp** \u2014 Edit files by replacing exact text
+- You MUST read a file with \`view\` before editing it.
+- \`old_str\` must be an exact match of existing text in the file.
+- Provide enough surrounding context in \`old_str\` to make it unique.
+- For creating new files, use \`write_file\` instead.
+- Good: Include 2-3 lines of surrounding context to ensure uniqueness.
+- Bad: Using just \`return true;\` \u2014 too common, will match multiple places.
+
+**write_file** \u2014 Create new files or overwrite existing ones
+- Use this to create new files.
+- If overwriting an existing file, you MUST have read it first with \`view\`.
+- NEVER create files unless necessary. Prefer editing existing files.`);
+  }
+  if (options.hasWebSearch) {
+    sections.push(`
+**web_search** / **web_extract** \u2014 Search the web / extract page content
+- Use for looking up documentation, error messages, package APIs.`);
+  }
+  sections.push(`
+**task_write** \u2014 Track tasks for complex multi-step work
+- Use when a task requires 3 or more distinct steps or actions.
+- Pass the FULL task list each time (replaces previous list).
+- Mark tasks \`in_progress\` BEFORE starting work. Only ONE task should be \`in_progress\` at a time.
+- Mark tasks \`completed\` IMMEDIATELY after finishing each task. Do not batch completions.
+- Each task has: content (imperative form), status (pending|in_progress|completed), activeForm (present continuous form shown during execution).
+
+**task_check** \u2014 Check completion status of tasks
+- Use this BEFORE deciding you're done with a task to verify all tasks are completed.
+- Returns the number of completed, in progress, and pending tasks.
+- If any tasks remain incomplete, continue working on them.
+- IMPORTANT: Always check task completion before ending work on a complex task.
+
+**ask_user** \u2014 Ask the user a structured question
+- Use when you need clarification, want to validate assumptions, or need the user to make a decision.
+- Provide clear, specific questions. End with a question mark.
+- Include options (2-4 choices) for structured decisions. Omit options for open-ended questions.
+- Don't use this for simple yes/no \u2014 just ask in your text response.`);
+  if (modeId === "plan") {
+    sections.push(`
+**submit_plan** \u2014 Submit a completed implementation plan for user review
+- Call this tool when your plan is complete. Do NOT just describe your plan in text \u2014 you MUST call this tool.
+- The plan will be rendered as markdown and the user can approve, reject, or request changes.
+- On approval, the system automatically switches to the default mode so you can implement.
+- Takes two arguments: \`title\` (short descriptive title) and \`plan\` (full plan in markdown).`);
+  }
+  sections.push(`
+**subagent** \u2014 Delegate a focused task to a specialized subagent
+- Only use subagents when you will spawn **multiple subagents in parallel**. If you only need one task done, do it yourself.
+- Subagent outputs are **untrusted**. Always review and verify the results.`);
+  return sections.join("\n");
+}
+
 // src/agents/prompts/index.ts
 var modePrompts = {
   build: buildModePromptFn,
@@ -398,23 +421,22 @@ var modePrompts = {
   fast: fastModePrompt
 };
 function buildFullPrompt(ctx) {
+  const modelId = ctx.state?.currentModelId;
+  const hasWebSearch = hasTavilyKey() || !!modelId && modelId.startsWith("anthropic/");
+  const toolGuidance = buildToolGuidance(ctx.modeId, { hasWebSearch });
   const baseCtx = {
     projectPath: ctx.workingDir,
     projectName: ctx.projectName || "unknown",
     gitBranch: ctx.gitBranch,
     platform: process.platform,
     date: ctx.currentDate,
-    mode: ctx.modeId};
+    mode: ctx.modeId,
+    modelId: ctx.modelId,
+    toolGuidance
+  };
   const base = buildBasePrompt(baseCtx);
   const entry = modePrompts[ctx.modeId] || modePrompts.build;
   const modeSpecific = typeof entry === "function" ? entry(ctx) : entry;
-  let toolsSection = "";
-  if (ctx.availableTools) {
-    toolsSection = `
-# Available Tools for ${ctx.modeId} mode:
-${ctx.availableTools}
-`;
-  }
   let taskSection = "";
   const tasks = ctx.state?.tasks;
   if (tasks && tasks.length > 0) {
@@ -430,7 +452,7 @@ ${lines.join("\n")}
   }
   const instructionSources = loadAgentInstructions(ctx.workingDir);
   const instructionsSection = formatAgentInstructions(instructionSources);
-  return base + toolsSection + taskSection + instructionsSection + "\n" + modeSpecific;
+  return base + taskSection + instructionsSection + "\n" + modeSpecific;
 }
 
 // src/agents/instructions.ts
@@ -445,6 +467,7 @@ function getDynamicInstructions({ requestContext }) {
     platform: process.platform,
     date: (/* @__PURE__ */ new Date()).toISOString().split("T")[0],
     mode: modeId,
+    modelId: state?.currentModelId || void 0,
     activePlan: state?.activePlan ?? null,
     modeId,
     currentDate: (/* @__PURE__ */ new Date()).toISOString().split("T")[0],
@@ -614,6 +637,11 @@ function getDynamicWorkspace({ requestContext }) {
       workingDirectory: projectPath,
       env: process.env
     }),
+    // Disable workspace tools — built-in tools are used instead.
+    // Workspace tools use different output formats (e.g. → separator, offset/limit params)
+    // that the TUI renderers don't fully support yet.
+    // We will update to use workspace tools very soon - just disabling until then
+    tools: { enabled: false },
     ...skillPaths.length > 0 ? { skills: skillPaths } : {}
   });
   workspace.filesystem.setAllowedPaths([...skillPaths, ...sandboxPaths.map((p) => path__default.resolve(p))]);
@@ -1284,13 +1312,69 @@ async function syncGateways(force = false) {
     isSyncing = false;
   }
 }
+function createFallbackLibSQL() {
+  return new LibSQLStore({
+    id: "mastra-code-storage",
+    url: `file:${getDatabasePath()}`
+  });
+}
+async function createStorage(config) {
+  if (config.backend === "pg") {
+    return createPgStorage(config);
+  }
+  return {
+    storage: new LibSQLStore({
+      id: "mastra-code-storage",
+      url: config.url,
+      ...config.authToken ? { authToken: config.authToken } : {}
+    })
+  };
+}
+async function createPgStorage(config) {
+  if (!config.connectionString && !config.host) {
+    return {
+      storage: createFallbackLibSQL(),
+      warning: "PostgreSQL backend selected but no connection info configured. Using LibSQL fallback. Set a connection string via /settings."
+    };
+  }
+  const base = {
+    id: "mastra-code-storage",
+    ...config.schemaName ? { schemaName: config.schemaName } : {},
+    ...config.disableInit ? { disableInit: config.disableInit } : {},
+    ...config.skipDefaultIndexes ? { skipDefaultIndexes: config.skipDefaultIndexes } : {}
+  };
+  const store = config.connectionString ? new PostgresStore({ ...base, connectionString: config.connectionString }) : new PostgresStore({
+    ...base,
+    host: config.host,
+    port: config.port,
+    database: config.database,
+    user: config.user,
+    password: config.password
+  });
+  try {
+    await store.init();
+  } catch (err) {
+    const msg = err?.message ?? String(err);
+    const target = config.connectionString ?? `${config.host}:${config.port ?? 5432}`;
+    try {
+      await store.close();
+    } catch {
+    }
+    return {
+      storage: createFallbackLibSQL(),
+      warning: `Failed to connect to PostgreSQL at ${target}: ${msg}
+Using LibSQL fallback. Fix the connection via /settings.`
+    };
+  }
+  return { storage: store };
+}
 
 // src/index.ts
 var PROVIDER_TO_OAUTH_ID = {
   anthropic: "anthropic",
   openai: "openai-codex"
 };
-function createMastraCode(config) {
+async function createMastraCode(config) {
   const cwd = config?.cwd ?? process.cwd();
   const authStorage = new AuthStorage();
   setAuthStorage(authStorage);
@@ -1301,19 +1385,11 @@ function createMastraCode(config) {
     project.resourceId = resourceIdOverride;
     project.resourceIdOverride = true;
   }
-  console.info(`Project: ${project.name}`);
-  console.info(`Resource ID: ${project.resourceId}${project.resourceIdOverride ? " (override)" : ""}`);
-  if (project.gitBranch) console.info(`Branch: ${project.gitBranch}`);
-  if (project.isWorktree) console.info(`Worktree of: ${project.mainRepoPath}`);
-  const userId = getUserId(project.rootPath);
-  console.info(`User: ${userId}`);
-  console.info("--------------------------------");
-  const storageConfig = config?.storage ?? getStorageConfig(project.rootPath);
-  const storage = new LibSQLStore({
-    id: "mastra-code-storage",
-    url: storageConfig.url,
-    ...storageConfig.authToken ? { authToken: storageConfig.authToken } : {}
-  });
+  const globalSettings = loadSettings();
+  const storageConfig = config?.storage ?? getStorageConfig(project.rootPath, globalSettings.storage);
+  const storageResult = await createStorage(storageConfig);
+  const storage = storageResult.storage;
+  const storageWarning = storageResult.warning;
   const memory = getDynamicMemory(storage);
   const mcpManager = config?.disableMcp ? void 0 : createMcpManager(project.rootPath);
   const codeAgentInstance = new Agent({
@@ -1406,13 +1482,49 @@ function createMastraCode(config) {
       handler: () => syncGateways()
     }
   ];
+  const startupAccess = {
+    anthropic: authStorage.isLoggedIn("anthropic") ? "oauth" : process.env.ANTHROPIC_API_KEY ? "apikey" : false,
+    openai: authStorage.isLoggedIn("openai-codex") ? "oauth" : process.env.OPENAI_API_KEY ? "apikey" : false,
+    cerebras: process.env.CEREBRAS_API_KEY ? "apikey" : false,
+    google: process.env.GOOGLE_GENERATIVE_AI_API_KEY ? "apikey" : false,
+    deepseek: process.env.DEEPSEEK_API_KEY ? "apikey" : false
+  };
+  const builtinPacks = getAvailableModePacks(startupAccess);
+  const builtinOmPacks = getAvailableOmPacks(startupAccess);
+  const effectiveDefaults = resolveModelDefaults(globalSettings, builtinPacks);
+  const effectiveOmModel = resolveOmModel(globalSettings, builtinOmPacks);
+  const modes = (config?.modes ?? defaultModes).map((mode) => {
+    const savedModel = effectiveDefaults[mode.id];
+    return savedModel ? { ...mode, defaultModelId: savedModel } : mode;
+  });
+  const subagentModeMap = { explore: "fast", plan: "plan", execute: "build" };
+  const subagents = (config?.subagents ?? defaultSubagents).map((sa) => {
+    const modeId = subagentModeMap[sa.id];
+    const model = modeId ? effectiveDefaults[modeId] : void 0;
+    return model ? { ...sa, defaultModelId: model } : sa;
+  });
+  const globalInitialState = {};
+  if (effectiveOmModel) {
+    globalInitialState.observerModelId = effectiveOmModel;
+    globalInitialState.reflectorModelId = effectiveOmModel;
+  }
+  if (globalSettings.preferences.yolo !== null) {
+    globalInitialState.yolo = globalSettings.preferences.yolo;
+  }
+  for (const [key, modelId] of Object.entries(globalSettings.models.subagentModels)) {
+    if (key === "_default") {
+      globalInitialState.subagentModelId = modelId;
+    } else {
+      globalInitialState[`subagentModelId_${key}`] = modelId;
+    }
+  }
   const harness = new Harness({
     id: "mastra-code",
     resourceId: project.resourceId,
     storage,
     memory,
     stateSchema,
-    subagents: config?.subagents ?? defaultSubagents,
+    subagents,
     resolveModel,
     toolCategoryResolver: getToolCategory,
     initialState: {
@@ -1420,10 +1532,11 @@ function createMastraCode(config) {
       projectName: project.name,
       gitBranch: project.gitBranch,
       yolo: true,
+      ...globalInitialState,
       ...config?.initialState
     },
     workspace: getDynamicWorkspace,
-    modes: config?.modes ?? defaultModes,
+    modes,
     heartbeatHandlers: config?.heartbeatHandlers ?? defaultHeartbeatHandlers,
     modelAuthChecker: (provider) => {
       const oauthId = PROVIDER_TO_OAUTH_ID[provider];
@@ -1432,7 +1545,7 @@ function createMastraCode(config) {
       }
       return void 0;
     },
-    modelUseCountProvider: () => authStorage.getAllModelUseCounts(),
+    modelUseCountProvider: () => loadSettings().modelUseCounts,
     threadLock: {
       acquire: acquireThreadLock,
       release: releaseThreadLock
@@ -1447,9 +1560,9 @@ function createMastraCode(config) {
       }
     });
   }
-  return { harness, mcpManager, hookManager, authStorage };
+  return { harness, mcpManager, hookManager, authStorage, storageWarning };
 }
 
 export { createMastraCode };
-//# sourceMappingURL=chunk-7V6U7OKQ.js.map
-//# sourceMappingURL=chunk-7V6U7OKQ.js.map
+//# sourceMappingURL=chunk-HHX6BKLR.js.map
+//# sourceMappingURL=chunk-HHX6BKLR.js.map