mastracode 0.25.0 → 0.25.1-alpha.1

package/CHANGELOG.md

@@ -1,5 +1,25 @@
 # mastracode
 
+## 0.25.1-alpha.1
+
+### Patch Changes
+
+- MastraCode now passes a deterministic session `id` and `ownerId` to the Harness session. The session id is derived from the project resource ID and is stable across restarts for the same project directory. The owner id is derived from the machine hostname and project root path, tying the session to the local machine. ([#18372](https://github.com/mastra-ai/mastra/pull/18372))
+
+- Expand `${VAR}`, `${VAR:-default}`, and bare `$VAR` references in MCP server HTTP headers. Header values such as `"x-api-key": "${MY_API_KEY}"` in `mcp.json` are now resolved from the environment when the config is loaded, instead of being sent verbatim. This matches how Claude Code reads `.mcp.json` and lets header-authenticated HTTP servers pull secrets from the environment. ([#18240](https://github.com/mastra-ai/mastra/pull/18240))
+
+- Updated dependencies [[`7f9ae70`](https://github.com/mastra-ai/mastra/commit/7f9ae70826b047e5a66218f9e92f20e54a2d791f), [`1505c07`](https://github.com/mastra-ai/mastra/commit/1505c07603f6346bae12aa82f140e8b88ffea9ab), [`e940f09`](https://github.com/mastra-ai/mastra/commit/e940f099ef5d18b403e6f2b4937e086a4da857b1)]:
+  - @mastra/core@1.46.1-alpha.1
+  - @mastra/memory@1.21.2-alpha.0
+
+## 0.25.1-alpha.0
+
+### Patch Changes
+
+- Updated dependencies [[`fbeda0c`](https://github.com/mastra-ai/mastra/commit/fbeda0c0f35def07e6837936dd3a003b2b7c5172), [`fbeda0c`](https://github.com/mastra-ai/mastra/commit/fbeda0c0f35def07e6837936dd3a003b2b7c5172), [`307573b`](https://github.com/mastra-ai/mastra/commit/307573b9ff3149b70c79540dbc86f1319b180f29)]:
+  - @mastra/core@1.46.1-alpha.0
+  - @mastra/github-signals@0.2.2-alpha.0
+
 ## 0.25.0
 
 ### Minor Changes

package/dist/{acp-QYEYP4OZ.cjs → acp-2SQWNEWR.cjs}

@@ -1,7 +1,7 @@
 'use strict';
 
-var chunk6C4I2JKA_cjs = require('./chunk-6C4I2JKA.cjs');
-var chunkIUWPEYVZ_cjs = require('./chunk-IUWPEYVZ.cjs');
+var chunkGQBMYJWP_cjs = require('./chunk-GQBMYJWP.cjs');
+var chunkFJDEUQWY_cjs = require('./chunk-FJDEUQWY.cjs');
 var chunkDPRNPXVC_cjs = require('./chunk-DPRNPXVC.cjs');
 var stream = require('stream');
 var sdk = require('@agentclientprotocol/sdk');
@@ -41,7 +41,7 @@ async function acpMain(options) {
   };
   let result;
   try {
-    result = await chunk6C4I2JKA_cjs.createMastraCode({
+    result = await chunkGQBMYJWP_cjs.createMastraCode({
       unixSocketPubSub: false,
       disableMcp: false,
       disableHooks: false
@@ -53,7 +53,7 @@ async function acpMain(options) {
       { id: "fast", name: "Fast" }
     ];
     const cleanup = async () => {
-      chunkIUWPEYVZ_cjs.releaseAllThreadLocks();
+      chunkFJDEUQWY_cjs.releaseAllThreadLocks();
       const closeSignalsPubSub = signalsPubSub?.close;
       await Promise.allSettled([
         mcpManager?.disconnect(),
@@ -79,5 +79,5 @@ async function acpMain(options) {
 }
 
 exports.acpMain = acpMain;
-//# sourceMappingURL=acp-QYEYP4OZ.cjs.map
-//# sourceMappingURL=acp-QYEYP4OZ.cjs.map
+//# sourceMappingURL=acp-2SQWNEWR.cjs.map
+//# sourceMappingURL=acp-2SQWNEWR.cjs.map

package/dist/{acp-QYEYP4OZ.cjs.map → acp-2SQWNEWR.cjs.map}

@@ -1 +1 @@
-{"version":3,"sources":["../src/acp/server.ts","../src/acp/index.ts"],"names":["Readable","Writable","stream","ndJsonStream","AgentSideConnection","MastraCodeAcpAgent","setAutoApprove","createMastraCode","releaseAllThreadLocks"],"mappings":"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","file":"acp-QYEYP4OZ.cjs","sourcesContent":["import { Readable, Writable } from 'node:stream';\nimport { AgentSideConnection, ndJsonStream } from '@agentclientprotocol/sdk';\nimport type { Harness, HarnessMode, Session } from '@mastra/core/harness';\nimport { MastraCodeAcpAgent } from './agent.js';\n\n/**\n * Run the ACP server over stdio.\n * This sets up the JSON-RPC stream and keeps the process alive until the client disconnects.\n */\nexport async function runAcpServer(\n  harness: Harness,\n  modes: HarnessMode[],\n  cleanup?: () => Promise<void>,\n): Promise<void> {\n  // Create the ndJSON stream from stdin/stdout\n  const input = Readable.toWeb(process.stdin) as ReadableStream<Uint8Array>;\n  const output = Writable.toWeb(process.stdout) as WritableStream<Uint8Array>;\n  const stream = ndJsonStream(output, input);\n  let session: Session | undefined;\n  let agent: MastraCodeAcpAgent | undefined;\n\n  // Handle cleanup on disconnect (success or error)\n  try {\n    session = await harness.createSession();\n    const activeSession = session;\n\n    // Create the agent-side connection\n    const connection = new AgentSideConnection(conn => {\n      agent = new MastraCodeAcpAgent(conn, harness, activeSession, modes);\n      return agent;\n    }, stream);\n\n    await connection.closed;\n  } finally {\n    agent?.dispose();\n    session?.thread.detachFromCurrent();\n    await session?.thread.clearAndReleaseLock();\n    if (cleanup) {\n      await cleanup();\n    }\n  }\n}\n","import type { HarnessMode } from '@mastra/core/harness';\n\nimport { createMastraCode } from '../index.js';\nimport { releaseAllThreadLocks } from '../utils/thread-lock.js';\nimport { setAutoApprove } from './event-mapper.js';\nimport { runAcpServer } from './server.js';\n\n/**\n * Entry point for ACP server mode.\n * Initializes mastracode and runs the ACP protocol over stdio.\n */\nexport async function acpMain(options?: { dangerousAutoApprove?: boolean }): Promise<void> {\n  if (options?.dangerousAutoApprove) {\n    setAutoApprove(true);\n  }\n  // Redirect console.log to stderr to avoid polluting the JSON-RPC stream on stdout.\n  // eslint-disable-next-line no-console\n  const originalConsoleLog = console.log;\n  // eslint-disable-next-line no-console\n  console.log = (...args: unknown[]) => {\n    process.stderr.write(args.map(String).join(' ') + '\\n');\n  };\n\n  let result: Awaited<ReturnType<typeof createMastraCode>> | undefined;\n\n  try {\n    result = await createMastraCode({\n      unixSocketPubSub: false,\n      disableMcp: false,\n      disableHooks: false,\n    });\n\n    const { harness, mcpManager, signalsPubSub } = result;\n\n    // Default modes (same as createMastraCode defaults)\n    const modes: HarnessMode[] = [\n      { id: 'build', name: 'Build' },\n      { id: 'plan', name: 'Plan' },\n      { id: 'fast', name: 'Fast' },\n    ];\n\n    // Cleanup function (mirrors main.ts asyncCleanup)\n    const cleanup = async () => {\n      releaseAllThreadLocks();\n      const closeSignalsPubSub = (signalsPubSub as { close?: () => Promise<void> | void } | undefined)?.close;\n      await Promise.allSettled([\n        mcpManager?.disconnect(),\n        harness?.getMastra()?.stopWorkers(),\n        harness?.stopHeartbeats(),\n        closeSignalsPubSub?.(),\n      ]);\n\n      // Restore console.log\n      // eslint-disable-next-line no-console\n      console.log = originalConsoleLog;\n    };\n\n    // Handle signals\n    const handleSignal = async () => {\n      await cleanup();\n      process.exit(0);\n    };\n\n    process.on('SIGINT', handleSignal);\n    process.on('SIGTERM', handleSignal);\n\n    await runAcpServer(harness, modes, cleanup);\n  } catch (error) {\n    process.stderr.write(`[acp] Fatal error: ${error}\\n`);\n    // eslint-disable-next-line no-console\n    console.log = originalConsoleLog;\n    process.exit(1);\n  }\n}\n"]}
+{"version":3,"sources":["../src/acp/server.ts","../src/acp/index.ts"],"names":["Readable","Writable","stream","ndJsonStream","AgentSideConnection","MastraCodeAcpAgent","setAutoApprove","createMastraCode","releaseAllThreadLocks"],"mappings":"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","file":"acp-2SQWNEWR.cjs","sourcesContent":["import { Readable, Writable } from 'node:stream';\nimport { AgentSideConnection, ndJsonStream } from '@agentclientprotocol/sdk';\nimport type { Harness, HarnessMode, Session } from '@mastra/core/harness';\nimport { MastraCodeAcpAgent } from './agent.js';\n\n/**\n * Run the ACP server over stdio.\n * This sets up the JSON-RPC stream and keeps the process alive until the client disconnects.\n */\nexport async function runAcpServer(\n  harness: Harness,\n  modes: HarnessMode[],\n  cleanup?: () => Promise<void>,\n): Promise<void> {\n  // Create the ndJSON stream from stdin/stdout\n  const input = Readable.toWeb(process.stdin) as ReadableStream<Uint8Array>;\n  const output = Writable.toWeb(process.stdout) as WritableStream<Uint8Array>;\n  const stream = ndJsonStream(output, input);\n  let session: Session | undefined;\n  let agent: MastraCodeAcpAgent | undefined;\n\n  // Handle cleanup on disconnect (success or error)\n  try {\n    session = await harness.createSession();\n    const activeSession = session;\n\n    // Create the agent-side connection\n    const connection = new AgentSideConnection(conn => {\n      agent = new MastraCodeAcpAgent(conn, harness, activeSession, modes);\n      return agent;\n    }, stream);\n\n    await connection.closed;\n  } finally {\n    agent?.dispose();\n    session?.thread.detachFromCurrent();\n    await session?.thread.clearAndReleaseLock();\n    if (cleanup) {\n      await cleanup();\n    }\n  }\n}\n","import type { HarnessMode } from '@mastra/core/harness';\n\nimport { createMastraCode } from '../index.js';\nimport { releaseAllThreadLocks } from '../utils/thread-lock.js';\nimport { setAutoApprove } from './event-mapper.js';\nimport { runAcpServer } from './server.js';\n\n/**\n * Entry point for ACP server mode.\n * Initializes mastracode and runs the ACP protocol over stdio.\n */\nexport async function acpMain(options?: { dangerousAutoApprove?: boolean }): Promise<void> {\n  if (options?.dangerousAutoApprove) {\n    setAutoApprove(true);\n  }\n  // Redirect console.log to stderr to avoid polluting the JSON-RPC stream on stdout.\n  // eslint-disable-next-line no-console\n  const originalConsoleLog = console.log;\n  // eslint-disable-next-line no-console\n  console.log = (...args: unknown[]) => {\n    process.stderr.write(args.map(String).join(' ') + '\\n');\n  };\n\n  let result: Awaited<ReturnType<typeof createMastraCode>> | undefined;\n\n  try {\n    result = await createMastraCode({\n      unixSocketPubSub: false,\n      disableMcp: false,\n      disableHooks: false,\n    });\n\n    const { harness, mcpManager, signalsPubSub } = result;\n\n    // Default modes (same as createMastraCode defaults)\n    const modes: HarnessMode[] = [\n      { id: 'build', name: 'Build' },\n      { id: 'plan', name: 'Plan' },\n      { id: 'fast', name: 'Fast' },\n    ];\n\n    // Cleanup function (mirrors main.ts asyncCleanup)\n    const cleanup = async () => {\n      releaseAllThreadLocks();\n      const closeSignalsPubSub = (signalsPubSub as { close?: () => Promise<void> | void } | undefined)?.close;\n      await Promise.allSettled([\n        mcpManager?.disconnect(),\n        harness?.getMastra()?.stopWorkers(),\n        harness?.stopHeartbeats(),\n        closeSignalsPubSub?.(),\n      ]);\n\n      // Restore console.log\n      // eslint-disable-next-line no-console\n      console.log = originalConsoleLog;\n    };\n\n    // Handle signals\n    const handleSignal = async () => {\n      await cleanup();\n      process.exit(0);\n    };\n\n    process.on('SIGINT', handleSignal);\n    process.on('SIGTERM', handleSignal);\n\n    await runAcpServer(harness, modes, cleanup);\n  } catch (error) {\n    process.stderr.write(`[acp] Fatal error: ${error}\\n`);\n    // eslint-disable-next-line no-console\n    console.log = originalConsoleLog;\n    process.exit(1);\n  }\n}\n"]}

package/dist/{acp-LBM2JPPW.js → acp-UJJECLRJ.js}

@@ -1,5 +1,5 @@
-import { createMastraCode } from './chunk-VZLHNA6F.js';
-import { releaseAllThreadLocks } from './chunk-5FIPMH3Y.js';
+import { createMastraCode } from './chunk-7EJGM23M.js';
+import { releaseAllThreadLocks } from './chunk-JKKDPFQD.js';
 import { setAutoApprove, MastraCodeAcpAgent } from './chunk-IU477VVQ.js';
 import { Readable, Writable } from 'stream';
 import { ndJsonStream, AgentSideConnection } from '@agentclientprotocol/sdk';
@@ -77,5 +77,5 @@ async function acpMain(options) {
 }
 
 export { acpMain };
-//# sourceMappingURL=acp-LBM2JPPW.js.map
-//# sourceMappingURL=acp-LBM2JPPW.js.map
+//# sourceMappingURL=acp-UJJECLRJ.js.map
+//# sourceMappingURL=acp-UJJECLRJ.js.map

package/dist/{acp-LBM2JPPW.js.map → acp-UJJECLRJ.js.map}

@@ -1 +1 @@
-{"version":3,"sources":["../src/acp/server.ts","../src/acp/index.ts"],"names":[],"mappings":"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","file":"acp-LBM2JPPW.js","sourcesContent":["import { Readable, Writable } from 'node:stream';\nimport { AgentSideConnection, ndJsonStream } from '@agentclientprotocol/sdk';\nimport type { Harness, HarnessMode, Session } from '@mastra/core/harness';\nimport { MastraCodeAcpAgent } from './agent.js';\n\n/**\n * Run the ACP server over stdio.\n * This sets up the JSON-RPC stream and keeps the process alive until the client disconnects.\n */\nexport async function runAcpServer(\n  harness: Harness,\n  modes: HarnessMode[],\n  cleanup?: () => Promise<void>,\n): Promise<void> {\n  // Create the ndJSON stream from stdin/stdout\n  const input = Readable.toWeb(process.stdin) as ReadableStream<Uint8Array>;\n  const output = Writable.toWeb(process.stdout) as WritableStream<Uint8Array>;\n  const stream = ndJsonStream(output, input);\n  let session: Session | undefined;\n  let agent: MastraCodeAcpAgent | undefined;\n\n  // Handle cleanup on disconnect (success or error)\n  try {\n    session = await harness.createSession();\n    const activeSession = session;\n\n    // Create the agent-side connection\n    const connection = new AgentSideConnection(conn => {\n      agent = new MastraCodeAcpAgent(conn, harness, activeSession, modes);\n      return agent;\n    }, stream);\n\n    await connection.closed;\n  } finally {\n    agent?.dispose();\n    session?.thread.detachFromCurrent();\n    await session?.thread.clearAndReleaseLock();\n    if (cleanup) {\n      await cleanup();\n    }\n  }\n}\n","import type { HarnessMode } from '@mastra/core/harness';\n\nimport { createMastraCode } from '../index.js';\nimport { releaseAllThreadLocks } from '../utils/thread-lock.js';\nimport { setAutoApprove } from './event-mapper.js';\nimport { runAcpServer } from './server.js';\n\n/**\n * Entry point for ACP server mode.\n * Initializes mastracode and runs the ACP protocol over stdio.\n */\nexport async function acpMain(options?: { dangerousAutoApprove?: boolean }): Promise<void> {\n  if (options?.dangerousAutoApprove) {\n    setAutoApprove(true);\n  }\n  // Redirect console.log to stderr to avoid polluting the JSON-RPC stream on stdout.\n  // eslint-disable-next-line no-console\n  const originalConsoleLog = console.log;\n  // eslint-disable-next-line no-console\n  console.log = (...args: unknown[]) => {\n    process.stderr.write(args.map(String).join(' ') + '\\n');\n  };\n\n  let result: Awaited<ReturnType<typeof createMastraCode>> | undefined;\n\n  try {\n    result = await createMastraCode({\n      unixSocketPubSub: false,\n      disableMcp: false,\n      disableHooks: false,\n    });\n\n    const { harness, mcpManager, signalsPubSub } = result;\n\n    // Default modes (same as createMastraCode defaults)\n    const modes: HarnessMode[] = [\n      { id: 'build', name: 'Build' },\n      { id: 'plan', name: 'Plan' },\n      { id: 'fast', name: 'Fast' },\n    ];\n\n    // Cleanup function (mirrors main.ts asyncCleanup)\n    const cleanup = async () => {\n      releaseAllThreadLocks();\n      const closeSignalsPubSub = (signalsPubSub as { close?: () => Promise<void> | void } | undefined)?.close;\n      await Promise.allSettled([\n        mcpManager?.disconnect(),\n        harness?.getMastra()?.stopWorkers(),\n        harness?.stopHeartbeats(),\n        closeSignalsPubSub?.(),\n      ]);\n\n      // Restore console.log\n      // eslint-disable-next-line no-console\n      console.log = originalConsoleLog;\n    };\n\n    // Handle signals\n    const handleSignal = async () => {\n      await cleanup();\n      process.exit(0);\n    };\n\n    process.on('SIGINT', handleSignal);\n    process.on('SIGTERM', handleSignal);\n\n    await runAcpServer(harness, modes, cleanup);\n  } catch (error) {\n    process.stderr.write(`[acp] Fatal error: ${error}\\n`);\n    // eslint-disable-next-line no-console\n    console.log = originalConsoleLog;\n    process.exit(1);\n  }\n}\n"]}
+{"version":3,"sources":["../src/acp/server.ts","../src/acp/index.ts"],"names":[],"mappings":"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","file":"acp-UJJECLRJ.js","sourcesContent":["import { Readable, Writable } from 'node:stream';\nimport { AgentSideConnection, ndJsonStream } from '@agentclientprotocol/sdk';\nimport type { Harness, HarnessMode, Session } from '@mastra/core/harness';\nimport { MastraCodeAcpAgent } from './agent.js';\n\n/**\n * Run the ACP server over stdio.\n * This sets up the JSON-RPC stream and keeps the process alive until the client disconnects.\n */\nexport async function runAcpServer(\n  harness: Harness,\n  modes: HarnessMode[],\n  cleanup?: () => Promise<void>,\n): Promise<void> {\n  // Create the ndJSON stream from stdin/stdout\n  const input = Readable.toWeb(process.stdin) as ReadableStream<Uint8Array>;\n  const output = Writable.toWeb(process.stdout) as WritableStream<Uint8Array>;\n  const stream = ndJsonStream(output, input);\n  let session: Session | undefined;\n  let agent: MastraCodeAcpAgent | undefined;\n\n  // Handle cleanup on disconnect (success or error)\n  try {\n    session = await harness.createSession();\n    const activeSession = session;\n\n    // Create the agent-side connection\n    const connection = new AgentSideConnection(conn => {\n      agent = new MastraCodeAcpAgent(conn, harness, activeSession, modes);\n      return agent;\n    }, stream);\n\n    await connection.closed;\n  } finally {\n    agent?.dispose();\n    session?.thread.detachFromCurrent();\n    await session?.thread.clearAndReleaseLock();\n    if (cleanup) {\n      await cleanup();\n    }\n  }\n}\n","import type { HarnessMode } from '@mastra/core/harness';\n\nimport { createMastraCode } from '../index.js';\nimport { releaseAllThreadLocks } from '../utils/thread-lock.js';\nimport { setAutoApprove } from './event-mapper.js';\nimport { runAcpServer } from './server.js';\n\n/**\n * Entry point for ACP server mode.\n * Initializes mastracode and runs the ACP protocol over stdio.\n */\nexport async function acpMain(options?: { dangerousAutoApprove?: boolean }): Promise<void> {\n  if (options?.dangerousAutoApprove) {\n    setAutoApprove(true);\n  }\n  // Redirect console.log to stderr to avoid polluting the JSON-RPC stream on stdout.\n  // eslint-disable-next-line no-console\n  const originalConsoleLog = console.log;\n  // eslint-disable-next-line no-console\n  console.log = (...args: unknown[]) => {\n    process.stderr.write(args.map(String).join(' ') + '\\n');\n  };\n\n  let result: Awaited<ReturnType<typeof createMastraCode>> | undefined;\n\n  try {\n    result = await createMastraCode({\n      unixSocketPubSub: false,\n      disableMcp: false,\n      disableHooks: false,\n    });\n\n    const { harness, mcpManager, signalsPubSub } = result;\n\n    // Default modes (same as createMastraCode defaults)\n    const modes: HarnessMode[] = [\n      { id: 'build', name: 'Build' },\n      { id: 'plan', name: 'Plan' },\n      { id: 'fast', name: 'Fast' },\n    ];\n\n    // Cleanup function (mirrors main.ts asyncCleanup)\n    const cleanup = async () => {\n      releaseAllThreadLocks();\n      const closeSignalsPubSub = (signalsPubSub as { close?: () => Promise<void> | void } | undefined)?.close;\n      await Promise.allSettled([\n        mcpManager?.disconnect(),\n        harness?.getMastra()?.stopWorkers(),\n        harness?.stopHeartbeats(),\n        closeSignalsPubSub?.(),\n      ]);\n\n      // Restore console.log\n      // eslint-disable-next-line no-console\n      console.log = originalConsoleLog;\n    };\n\n    // Handle signals\n    const handleSignal = async () => {\n      await cleanup();\n      process.exit(0);\n    };\n\n    process.on('SIGINT', handleSignal);\n    process.on('SIGTERM', handleSignal);\n\n    await runAcpServer(harness, modes, cleanup);\n  } catch (error) {\n    process.stderr.write(`[acp] Fatal error: ${error}\\n`);\n    // eslint-disable-next-line no-console\n    console.log = originalConsoleLog;\n    process.exit(1);\n  }\n}\n"]}

package/dist/{chunk-VZLHNA6F.js → chunk-7EJGM23M.js}

@@ -1,6 +1,9 @@
-import { setAuthStorage, loadSettings, MEMORY_GATEWAY_PROVIDER, getAvailableModePacks, getAvailableOmPacks, resolveModelDefaults, resolveOmRoleModel, releaseThreadLock, acquireThreadLock, saveSettings, OBSERVABILITY_AUTH_PREFIX, mastra, getCustomProviderId, getEffectiveThinkingLevel, createCodexMiddleware, THINKING_LEVEL_TO_REASONING_EFFORT, buildOpenAICodexOAuthFetch, openaiCodexProvider } from './chunk-5FIPMH3Y.js';
+import { setAuthStorage, loadSettings, MEMORY_GATEWAY_PROVIDER, getAvailableModePacks, getAvailableOmPacks, resolveModelDefaults, resolveOmRoleModel, releaseThreadLock, acquireThreadLock, saveSettings, OBSERVABILITY_AUTH_PREFIX, mastra, getCustomProviderId, getEffectiveThinkingLevel, createCodexMiddleware, THINKING_LEVEL_TO_REASONING_EFFORT, buildOpenAICodexOAuthFetch, openaiCodexProvider } from './chunk-JKKDPFQD.js';
 import { AuthStorage, DEFAULT_OM_MODEL_ID, DEFAULT_CONFIG_DIR, validateConfigDirName, detectProject, getResourceIdOverride, getStorageConfig, getObservabilityDatabasePath, getVectorDatabasePath, getCurrentGitBranchAsync, getOmScope, DEFAULT_REF_THRESHOLD, DEFAULT_OBS_THRESHOLD, getGitHubCopilotBaseUrl, fetchCopilotModels, getDatabasePath, COPILOT_HEADERS, getAppDataDir } from './chunk-Z5EMG7I2.js';
 import { getToolCategory, MC_TOOLS, TOOL_NAME_OVERRIDES } from './chunk-UOFNLVKF.js';
+import { createHash } from 'crypto';
+import * as os from 'os';
+import os__default, { hostname, homedir } from 'os';
 import * as path from 'path';
 import path__default, { normalize, join, dirname } from 'path';
 import { Agent } from '@mastra/core/agent';
@@ -17,8 +20,6 @@ import { Observability, SensitiveDataFilter, MastraStorageExporter, MastraPlatfo
 import { spawn, execFile } from 'child_process';
 import { createTavilySearchTool, createTavilyExtractTool } from '@mastra/tavily';
 import { estimateTokenCount, sliceByTokens } from 'tokenx';
-import * as os from 'os';
-import os__default, { homedir } from 'os';
 import { LocalFilesystem, createWorkspaceTools, Workspace, LocalSandbox } from '@mastra/core/workspace';
 import { z } from 'zod';
 import * as fs from 'fs';
@@ -34,7 +35,6 @@ import { GoogleSchemaCompatLayer, applyCompatLayer } from '@mastra/schema-compat
 import { createNotificationInboxTool, NotificationsStorage } from '@mastra/core/notifications';
 import { createScorer, filterRun } from '@mastra/core/evals';
 import { MCPClient, MCPOAuthClientProvider } from '@mastra/mcp';
-import { createHash } from 'crypto';
 import { mkdir } from 'fs/promises';
 import { PubSub, UnixSocketPubSub } from '@mastra/core/events';
 import { LibSQLStore, LibSQLVector } from '@mastra/libsql';
@@ -3122,6 +3122,24 @@ function loadClaudeSettings(projectDir) {
     return {};
   }
 }
+function expandEnvVars(value, env = process.env) {
+  return value.replace(
+    /\$\{([A-Za-z_][A-Za-z0-9_]*)(?::-([^}]*))?\}|\$([A-Za-z_][A-Za-z0-9_]*)/g,
+    (_match, bracedName, fallback, bareName) => {
+      const name = bracedName ?? bareName;
+      const resolved = env[name];
+      if (resolved !== void 0 && resolved !== "") return resolved;
+      return fallback ?? "";
+    }
+  );
+}
+function expandHeaderEnvVars(headers) {
+  const expanded = {};
+  for (const [key, value] of Object.entries(headers)) {
+    if (typeof value === "string") expanded[key] = expandEnvVars(value);
+  }
+  return expanded;
+}
 function classifyServerEntry(raw) {
   if (!raw || typeof raw !== "object") {
     return { kind: "skip", reason: "Invalid entry: expected an object" };
@@ -3170,7 +3188,7 @@ function validateConfig2(raw) {
       }
       servers[name] = {
         url: e.url,
-        headers: typeof e.headers === "object" && e.headers !== null ? e.headers : void 0,
+        headers: typeof e.headers === "object" && e.headers !== null ? expandHeaderEnvVars(e.headers) : void 0,
         oauth: oauthResult.config
       };
     } else {
@@ -3902,6 +3920,9 @@ function isECONNRESETError(error) {
   if (typeof message === "string" && ECONNRESET_MESSAGE_PATTERN.test(message)) return true;
   return false;
 }
+function shortHash(input) {
+  return createHash("sha256").update(input).digest("hex").slice(0, 12);
+}
 function applyEffectiveDefaultsToModes(modes, effectiveDefaults) {
   return modes.map((mode) => {
     const savedModel = effectiveDefaults[mode.id];
@@ -3989,6 +4010,8 @@ async function createMastraCode(config) {
     project.resourceId = resourceIdOverride;
     project.resourceIdOverride = true;
   }
+  const sessionId = `mastracode-session-${shortHash(project.resourceId)}`;
+  const ownerId = `mastracode-${shortHash(`${hostname()}\0${project.rootPath}`)}`;
   const configuredPubSub = config?.pubsub;
   const useUnixSocketPubSub = (config?.unixSocketPubSub ?? globalSettings.signals?.unixSocketPubSub ?? false) && process.platform !== "win32";
   const signalsPubSub = configuredPubSub ?? (useUnixSocketPubSub ? createSignalsPubSub(project.resourceId) : void 0);
@@ -4105,6 +4128,8 @@ async function createMastraCode(config) {
         threadId,
         resourceId,
         session: {
+          id: session2.identity.getId(),
+          ownerId: session2.identity.getOwnerId(),
           modeId,
           modelId,
           state: {
@@ -4353,7 +4378,7 @@ async function createMastraCode(config) {
   });
   await harness.init();
   await harness.getMastra()?.startWorkers();
-  const session = await harness.createSession();
+  const session = await harness.createSession({ id: sessionId, ownerId });
   activeSession = session;
   if (hookManager) {
     session.subscribe((event) => {
@@ -4410,5 +4435,5 @@ async function createMastraCode(config) {
 }
 
 export { createAuthStorage, createMastraCode };
-//# sourceMappingURL=chunk-VZLHNA6F.js.map
-//# sourceMappingURL=chunk-VZLHNA6F.js.map
+//# sourceMappingURL=chunk-7EJGM23M.js.map
+//# sourceMappingURL=chunk-7EJGM23M.js.map