@dexto/core 1.6.14 → 1.6.16

package/dist/agent/DextoAgent.cjs

@@ -1466,7 +1466,7 @@ Either:
       this.logger.debug(`Compaction skipped for session ${sessionId} - history too short`);
       return null;
     }
-    const contributorContext = await this.toolManager.buildContributorContext();
+    const contributorContext = await this.toolManager.buildContributorContext({ sessionId });
     const tools = await llmService.getEnabledTools();
     const beforeEstimate = await contextManager.getContextTokenEstimate(
       contributorContext,
@@ -1544,7 +1544,7 @@ Either:
       throw import_session.SessionError.notFound(sessionId);
     }
     const contextManager = session.getContextManager();
-    const contributorContext = await this.toolManager.buildContributorContext();
+    const contributorContext = await this.toolManager.buildContributorContext({ sessionId });
     const llmService = session.getLLMService();
     const tools = await llmService.getEnabledTools();
     const tokenEstimate = await contextManager.getContextTokenEstimate(

package/dist/agent/DextoAgent.js

@@ -1401,7 +1401,7 @@ Either:
       this.logger.debug(`Compaction skipped for session ${sessionId} - history too short`);
       return null;
     }
-    const contributorContext = await this.toolManager.buildContributorContext();
+    const contributorContext = await this.toolManager.buildContributorContext({ sessionId });
     const tools = await llmService.getEnabledTools();
     const beforeEstimate = await contextManager.getContextTokenEstimate(
       contributorContext,
@@ -1479,7 +1479,7 @@ Either:
       throw SessionError.notFound(sessionId);
     }
     const contextManager = session.getContextManager();
-    const contributorContext = await this.toolManager.buildContributorContext();
+    const contributorContext = await this.toolManager.buildContributorContext({ sessionId });
     const llmService = session.getLLMService();
     const tools = await llmService.getEnabledTools();
     const tokenEstimate = await contextManager.getContextTokenEstimate(

package/dist/agent/schemas.d.ts

@@ -781,10 +781,6 @@ export declare const AgentCardSchema: z.ZodObject<{
         stateTransitionHistory: boolean;
         pushNotifications?: boolean | undefined;
     };
-    protocolVersion: string;
-    preferredTransport: "JSONRPC" | "GRPC" | "HTTP+JSON";
-    defaultInputModes: string[];
-    defaultOutputModes: string[];
     skills: {
         description: string;
         name: string;
@@ -794,6 +790,10 @@ export declare const AgentCardSchema: z.ZodObject<{
         outputModes: string[];
         examples?: string[] | undefined;
     }[];
+    protocolVersion: string;
+    preferredTransport: "JSONRPC" | "GRPC" | "HTTP+JSON";
+    defaultInputModes: string[];
+    defaultOutputModes: string[];
     metadata?: z.objectOutputType<{
         dexto: z.ZodOptional<z.ZodObject<{
             authentication: z.ZodOptional<z.ZodObject<{
@@ -1021,10 +1021,6 @@ export declare const AgentCardSchema: z.ZodObject<{
         url: string;
         organization: string;
     } | undefined;
-    protocolVersion?: string | undefined;
-    preferredTransport?: "JSONRPC" | "GRPC" | "HTTP+JSON" | undefined;
-    defaultInputModes?: string[] | undefined;
-    defaultOutputModes?: string[] | undefined;
     skills?: {
         description: string;
         name: string;
@@ -1034,6 +1030,10 @@ export declare const AgentCardSchema: z.ZodObject<{
         inputModes?: string[] | undefined;
         outputModes?: string[] | undefined;
     }[] | undefined;
+    protocolVersion?: string | undefined;
+    preferredTransport?: "JSONRPC" | "GRPC" | "HTTP+JSON" | undefined;
+    defaultInputModes?: string[] | undefined;
+    defaultOutputModes?: string[] | undefined;
     iconUrl?: string | undefined;
     documentationUrl?: string | undefined;
     additionalInterfaces?: {

package/dist/llm/providers/codex-app-server.cjs

@@ -1,7 +1,9 @@
 "use strict";
+var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
   for (var name in all)
@@ -15,6 +17,14 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var codex_app_server_exports = {};
 __export(codex_app_server_exports, {
@@ -22,10 +32,13 @@ __export(codex_app_server_exports, {
   createCodexLanguageModel: () => createCodexLanguageModel
 });
 module.exports = __toCommonJS(codex_app_server_exports);
+var fs = __toESM(require("node:fs"), 1);
 var import_node_child_process = require("node:child_process");
+var import_node_path = __toESM(require("node:path"), 1);
 var import_node_readline = require("node:readline");
 var import_DextoRuntimeError = require("../../errors/DextoRuntimeError.js");
 var import_types = require("../../errors/types.js");
+var import_path = require("../../utils/path.js");
 var import_safe_stringify = require("../../utils/safe-stringify.js");
 var import_error_codes = require("../error-codes.js");
 var import_errors = require("../errors.js");
@@ -66,6 +79,7 @@ const DEFAULT_CLIENT_INFO = {
   title: "Dexto",
   version: "1.0.0"
 };
+const MANAGED_CODEX_BINARY = process.platform === "win32" ? "codex.cmd" : "codex";
 const CODEX_DEVELOPER_INSTRUCTIONS = [
   "You are providing model responses for a host application.",
   "Treat the provided input as the full conversation transcript.",
@@ -98,6 +112,39 @@ function getArray(value) {
 function normalizeError(error) {
   return error instanceof Error ? error : createCodexClientRuntimeError(String(error));
 }
+function isMissingCodexCliError(error) {
+  const missingCodexError = error;
+  if (missingCodexError.isMissingCodexError === true) {
+    return true;
+  }
+  const code = missingCodexError.code;
+  return error.message.includes("Codex CLI not found on PATH") || code === "ENOENT" && (error.message.includes("spawn codex ENOENT") || error.message.includes("Codex CLI command '"));
+}
+function normalizeCodexStartupError(error, command) {
+  const normalized = normalizeError(error);
+  const errno = normalized;
+  if (errno.code !== "ENOENT" || !normalized.message.includes(`spawn ${command} ENOENT`)) {
+    return normalized;
+  }
+  const message = command === "codex" ? "Codex CLI not found on PATH. Install Codex to use ChatGPT Login in Dexto." : `Codex CLI command '${command}' not found on PATH. Install Codex to use ChatGPT Login in Dexto.`;
+  const startupError = new Error(message);
+  startupError.code = "ENOENT";
+  startupError.isMissingCodexError = true;
+  return startupError;
+}
+function getManagedCodexCommand() {
+  try {
+    const candidate = import_node_path.default.join(
+      (0, import_path.getDextoGlobalPath)("deps"),
+      "node_modules",
+      ".bin",
+      MANAGED_CODEX_BINARY
+    );
+    return fs.existsSync(candidate) ? candidate : null;
+  } catch {
+    return null;
+  }
+}
 function parseCodexAccount(value) {
   if (!isRecord(value)) {
     return null;
@@ -543,7 +590,7 @@ function toCodexFailureMessage(error, modelId) {
     return error;
   }
   const normalized = normalizeError(error);
-  if (normalized.message.includes("spawn codex ENOENT")) {
+  if (isMissingCodexCliError(normalized)) {
     return import_errors.LLMError.missingConfig(
       "openai-compatible",
       "the Codex CLI on PATH (install Codex to use ChatGPT Login in Dexto)"
@@ -632,7 +679,7 @@ class CodexAppServerClient {
   started = false;
   closed = false;
   constructor(options = {}) {
-    this.command = options.command ?? "codex";
+    this.command = options.command ?? getManagedCodexCommand() ?? "codex";
     this.cwd = options.cwd;
     this.requestTimeoutMs = options.requestTimeoutMs ?? DEFAULT_REQUEST_TIMEOUT_MS;
     this.clientInfo = options.clientInfo ?? DEFAULT_CLIENT_INFO;
@@ -848,7 +895,7 @@ class CodexAppServerClient {
     const drainStderr = () => void 0;
     child.stderr.on("data", drainStderr);
     child.on("error", (error) => {
-      this.rejectPending(error);
+      this.rejectPending(normalizeCodexStartupError(error, this.command));
     });
     child.on("exit", (code, signal) => {
       const wasClosed = this.closed;

package/dist/llm/providers/codex-app-server.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"codex-app-server.d.ts","sourceRoot":"","sources":["../../../src/llm/providers/codex-app-server.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"codex-app-server.d.ts","sourceRoot":"","sources":["../../../src/llm/providers/codex-app-server.ts"],"names":[],"mappings":"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"}

package/dist/llm/providers/codex-app-server.js

@@ -1,8 +1,11 @@
 import "../../chunk-PTJYTZNU.js";
+import * as fs from "node:fs";
 import { spawn } from "node:child_process";
+import path from "node:path";
 import { createInterface } from "node:readline";
 import { DextoRuntimeError } from "../../errors/DextoRuntimeError.js";
 import { ErrorScope, ErrorType } from "../../errors/types.js";
+import { getDextoGlobalPath } from "../../utils/path.js";
 import { safeStringify } from "../../utils/safe-stringify.js";
 import { LLMErrorCode } from "../error-codes.js";
 import { LLMError } from "../errors.js";
@@ -43,6 +46,7 @@ const DEFAULT_CLIENT_INFO = {
   title: "Dexto",
   version: "1.0.0"
 };
+const MANAGED_CODEX_BINARY = process.platform === "win32" ? "codex.cmd" : "codex";
 const CODEX_DEVELOPER_INSTRUCTIONS = [
   "You are providing model responses for a host application.",
   "Treat the provided input as the full conversation transcript.",
@@ -75,6 +79,39 @@ function getArray(value) {
 function normalizeError(error) {
   return error instanceof Error ? error : createCodexClientRuntimeError(String(error));
 }
+function isMissingCodexCliError(error) {
+  const missingCodexError = error;
+  if (missingCodexError.isMissingCodexError === true) {
+    return true;
+  }
+  const code = missingCodexError.code;
+  return error.message.includes("Codex CLI not found on PATH") || code === "ENOENT" && (error.message.includes("spawn codex ENOENT") || error.message.includes("Codex CLI command '"));
+}
+function normalizeCodexStartupError(error, command) {
+  const normalized = normalizeError(error);
+  const errno = normalized;
+  if (errno.code !== "ENOENT" || !normalized.message.includes(`spawn ${command} ENOENT`)) {
+    return normalized;
+  }
+  const message = command === "codex" ? "Codex CLI not found on PATH. Install Codex to use ChatGPT Login in Dexto." : `Codex CLI command '${command}' not found on PATH. Install Codex to use ChatGPT Login in Dexto.`;
+  const startupError = new Error(message);
+  startupError.code = "ENOENT";
+  startupError.isMissingCodexError = true;
+  return startupError;
+}
+function getManagedCodexCommand() {
+  try {
+    const candidate = path.join(
+      getDextoGlobalPath("deps"),
+      "node_modules",
+      ".bin",
+      MANAGED_CODEX_BINARY
+    );
+    return fs.existsSync(candidate) ? candidate : null;
+  } catch {
+    return null;
+  }
+}
 function parseCodexAccount(value) {
   if (!isRecord(value)) {
     return null;
@@ -520,7 +557,7 @@ function toCodexFailureMessage(error, modelId) {
     return error;
   }
   const normalized = normalizeError(error);
-  if (normalized.message.includes("spawn codex ENOENT")) {
+  if (isMissingCodexCliError(normalized)) {
     return LLMError.missingConfig(
       "openai-compatible",
       "the Codex CLI on PATH (install Codex to use ChatGPT Login in Dexto)"
@@ -609,7 +646,7 @@ class CodexAppServerClient {
   started = false;
   closed = false;
   constructor(options = {}) {
-    this.command = options.command ?? "codex";
+    this.command = options.command ?? getManagedCodexCommand() ?? "codex";
     this.cwd = options.cwd;
     this.requestTimeoutMs = options.requestTimeoutMs ?? DEFAULT_REQUEST_TIMEOUT_MS;
     this.clientInfo = options.clientInfo ?? DEFAULT_CLIENT_INFO;
@@ -825,7 +862,7 @@ class CodexAppServerClient {
     const drainStderr = () => void 0;
     child.stderr.on("data", drainStderr);
     child.on("error", (error) => {
-      this.rejectPending(error);
+      this.rejectPending(normalizeCodexStartupError(error, this.command));
     });
     child.on("exit", (code, signal) => {
       const wasClosed = this.closed;

package/dist/llm/services/vercel.cjs

@@ -199,7 +199,9 @@ class VercelLLMService {
       const parts = typeof content === "string" ? [{ type: "text", text: content }] : content;
       await this.contextManager.addUserMessage(parts);
       const executor = this.createTurnExecutor(options?.signal);
-      const contributorContext = await this.toolManager.buildContributorContext();
+      const contributorContext = await this.toolManager.buildContributorContext({
+        sessionId: this.sessionId
+      });
       const result = await executor.execute(contributorContext, true);
       return {
         text: result.text ?? ""

package/dist/llm/services/vercel.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"vercel.d.ts","sourceRoot":"","sources":["../../../src/llm/services/vercel.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAqB,MAAM,IAAI,CAAC;AACtD,OAAO,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAC1D,OAAO,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AAC9C,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,0BAA0B,CAAC;AAEvD,OAAO,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAC;AAC/C,OAAO,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAI1D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAC7D,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,gCAAgC,CAAC;AAClF,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,+BAA+B,CAAC;AAEzE,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAC;AAIxD,OAAO,EAAE,mBAAmB,EAAE,MAAM,gCAAgC,CAAC;AACrE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAC;AAGhE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAEzD;;;;;;;;;;;;;GAaG;AACH,qBAIa,gBAAgB;IACzB,OAAO,CAAC,KAAK,CAAgB;IAC7B,OAAO,CAAC,MAAM,CAAqB;IACnC,OAAO,CAAC,WAAW,CAAc;IACjC,OAAO,CAAC,cAAc,CAA+B;IACrD,OAAO,CAAC,eAAe,CAAkB;IACzC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAS;IACnC,OAAO,CAAC,MAAM,CAAS;IACvB,OAAO,CAAC,eAAe,CAAkB;IACzC,OAAO,CAAC,YAAY,CAAsB;IAC1C,OAAO,CAAC,kBAAkB,CAEf;IACX,OAAO,CAAC,WAAW,CAAC,CAAc;IAElC;;OAEG;IACH,OAAO,CAAC,UAAU;gBAKd,WAAW,EAAE,WAAW,EACxB,KAAK,EAAE,aAAa,EACpB,mBAAmB,EAAE,mBAAmB,EACxC,eAAe,EAAE,2BAA2B,EAC5C,eAAe,EAAE,eAAe,EAChC,MAAM,EAAE,kBAAkB,EAC1B,SAAS,EAAE,MAAM,EACjB,eAAe,EAAE,eAAe,EAChC,MAAM,EAAE,MAAM,EACd,kBAAkB,CAAC,EAAE,OAAO,mCAAmC,EAAE,kBAAkB,GAAG,IAAI;IAuC9F,WAAW,IAAI,OAAO,CAAC,OAAO,CAAC;IAI/B,eAAe,IAAI,OAAO,CAAC,OAAO,CAAC;IAMnC;;OAEG;IACH,OAAO,CAAC,kBAAkB;IAyB1B;;OAEG;IACH,OAAc,YAAY,EAAE;QAAE,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC;IAE7C;;;;;;;OAOG;IACG,MAAM,CACR,OAAO,EAAE,YAAY,EACrB,OAAO,CAAC,EAAE;QAAE,MAAM,CAAC,EAAE,WAAW,CAAA;KAAE,GACnC,OAAO,CAAC;QAAE,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC;IAwD5B;;;OAGG;IACH,SAAS,IAAI,gBAAgB;IA+B7B;;OAEG;IACH,iBAAiB,IAAI,cAAc,CAAC,OAAO,CAAC;IAI5C;;OAEG;IACH,eAAe,IAAI,mBAAmB;IAItC;;OAEG;IACH,qBAAqB,IAAI,OAAO,mCAAmC,EAAE,kBAAkB,GAAG,IAAI;IAI9F,gBAAgB,IAAI,aAAa;CAGpC"}
+{"version":3,"file":"vercel.d.ts","sourceRoot":"","sources":["../../../src/llm/services/vercel.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAqB,MAAM,IAAI,CAAC;AACtD,OAAO,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAC1D,OAAO,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AAC9C,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,0BAA0B,CAAC;AAEvD,OAAO,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAC;AAC/C,OAAO,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAI1D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAC7D,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,gCAAgC,CAAC;AAClF,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,+BAA+B,CAAC;AAEzE,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAC;AAIxD,OAAO,EAAE,mBAAmB,EAAE,MAAM,gCAAgC,CAAC;AACrE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAC;AAGhE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAEzD;;;;;;;;;;;;;GAaG;AACH,qBAIa,gBAAgB;IACzB,OAAO,CAAC,KAAK,CAAgB;IAC7B,OAAO,CAAC,MAAM,CAAqB;IACnC,OAAO,CAAC,WAAW,CAAc;IACjC,OAAO,CAAC,cAAc,CAA+B;IACrD,OAAO,CAAC,eAAe,CAAkB;IACzC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAS;IACnC,OAAO,CAAC,MAAM,CAAS;IACvB,OAAO,CAAC,eAAe,CAAkB;IACzC,OAAO,CAAC,YAAY,CAAsB;IAC1C,OAAO,CAAC,kBAAkB,CAEf;IACX,OAAO,CAAC,WAAW,CAAC,CAAc;IAElC;;OAEG;IACH,OAAO,CAAC,UAAU;gBAKd,WAAW,EAAE,WAAW,EACxB,KAAK,EAAE,aAAa,EACpB,mBAAmB,EAAE,mBAAmB,EACxC,eAAe,EAAE,2BAA2B,EAC5C,eAAe,EAAE,eAAe,EAChC,MAAM,EAAE,kBAAkB,EAC1B,SAAS,EAAE,MAAM,EACjB,eAAe,EAAE,eAAe,EAChC,MAAM,EAAE,MAAM,EACd,kBAAkB,CAAC,EAAE,OAAO,mCAAmC,EAAE,kBAAkB,GAAG,IAAI;IAuC9F,WAAW,IAAI,OAAO,CAAC,OAAO,CAAC;IAI/B,eAAe,IAAI,OAAO,CAAC,OAAO,CAAC;IAMnC;;OAEG;IACH,OAAO,CAAC,kBAAkB;IAyB1B;;OAEG;IACH,OAAc,YAAY,EAAE;QAAE,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC;IAE7C;;;;;;;OAOG;IACG,MAAM,CACR,OAAO,EAAE,YAAY,EACrB,OAAO,CAAC,EAAE;QAAE,MAAM,CAAC,EAAE,WAAW,CAAA;KAAE,GACnC,OAAO,CAAC;QAAE,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC;IA0D5B;;;OAGG;IACH,SAAS,IAAI,gBAAgB;IA+B7B;;OAEG;IACH,iBAAiB,IAAI,cAAc,CAAC,OAAO,CAAC;IAI5C;;OAEG;IACH,eAAe,IAAI,mBAAmB;IAItC;;OAEG;IACH,qBAAqB,IAAI,OAAO,mCAAmC,EAAE,kBAAkB,GAAG,IAAI;IAI9F,gBAAgB,IAAI,aAAa;CAGpC"}

package/dist/llm/services/vercel.js

@@ -136,7 +136,9 @@ class VercelLLMService {
       const parts = typeof content === "string" ? [{ type: "text", text: content }] : content;
       await this.contextManager.addUserMessage(parts);
       const executor = this.createTurnExecutor(options?.signal);
-      const contributorContext = await this.toolManager.buildContributorContext();
+      const contributorContext = await this.toolManager.buildContributorContext({
+        sessionId: this.sessionId
+      });
       const result = await executor.execute(contributorContext, true);
       return {
         text: result.text ?? ""

package/dist/systemPrompt/types.d.ts

@@ -6,10 +6,14 @@ export type EnvironmentContext = {
     shell?: string;
     isGitRepo?: boolean;
 };
+export type SessionContext = {
+    id: string;
+};
 export interface DynamicContributorContext {
     mcpManager: MCPManager;
     workspace?: WorkspaceContext | null;
     environment?: EnvironmentContext;
+    session?: SessionContext | null;
 }
 export type DynamicContributorContextOverrides = Partial<DynamicContributorContext>;
 export type DynamicContributorContextFactory = () => DynamicContributorContextOverrides | Promise<DynamicContributorContextOverrides>;

package/dist/systemPrompt/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/systemPrompt/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAC/C,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAE9D,MAAM,MAAM,kBAAkB,GAAG;IAC7B,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,SAAS,CAAC,EAAE,OAAO,CAAC;CACvB,CAAC;AAGF,MAAM,WAAW,yBAAyB;IACtC,UAAU,EAAE,UAAU,CAAC;IACvB,SAAS,CAAC,EAAE,gBAAgB,GAAG,IAAI,CAAC;IACpC,WAAW,CAAC,EAAE,kBAAkB,CAAC;CACpC;AAED,MAAM,MAAM,kCAAkC,GAAG,OAAO,CAAC,yBAAyB,CAAC,CAAC;AACpF,MAAM,MAAM,gCAAgC,GAAG,MACzC,kCAAkC,GAClC,OAAO,CAAC,kCAAkC,CAAC,CAAC;AAGlD,MAAM,WAAW,uBAAuB;IACpC,EAAE,EAAE,MAAM,CAAC;IACX,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,CAAC,OAAO,EAAE,yBAAyB,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;CACnE"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/systemPrompt/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAC/C,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAE9D,MAAM,MAAM,kBAAkB,GAAG;IAC7B,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,SAAS,CAAC,EAAE,OAAO,CAAC;CACvB,CAAC;AAEF,MAAM,MAAM,cAAc,GAAG;IACzB,EAAE,EAAE,MAAM,CAAC;CACd,CAAC;AAGF,MAAM,WAAW,yBAAyB;IACtC,UAAU,EAAE,UAAU,CAAC;IACvB,SAAS,CAAC,EAAE,gBAAgB,GAAG,IAAI,CAAC;IACpC,WAAW,CAAC,EAAE,kBAAkB,CAAC;IACjC,OAAO,CAAC,EAAE,cAAc,GAAG,IAAI,CAAC;CACnC;AAED,MAAM,MAAM,kCAAkC,GAAG,OAAO,CAAC,yBAAyB,CAAC,CAAC;AACpF,MAAM,MAAM,gCAAgC,GAAG,MACzC,kCAAkC,GAClC,OAAO,CAAC,kCAAkC,CAAC,CAAC;AAGlD,MAAM,WAAW,uBAAuB;IACpC,EAAE,EAAE,MAAM,CAAC;IACX,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,CAAC,OAAO,EAAE,yBAAyB,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;CACnE"}

package/dist/tools/tool-manager.cjs

@@ -214,15 +214,15 @@ let _ToolManager = class _ToolManager {
   /**
    * Set workspace manager for tool execution context propagation.
    */
-  setWorkspaceManager(workspaceManager) {
+  async setWorkspaceManager(workspaceManager) {
     this.workspaceManager = workspaceManager;
-    void this.refreshWorkspace();
     if (!this.workspaceListenerAttached) {
       this.workspaceListenerAttached = true;
       this.agentEventBus.on(
         "workspace:changed",
         (payload) => {
           this.currentWorkspace = payload.workspace ?? void 0;
+          this.invalidateCache();
         },
         { signal: this.workspaceListenerAbort.signal }
       );
@@ -232,6 +232,7 @@ let _ToolManager = class _ToolManager {
         }
       });
     }
+    await this.refreshWorkspace();
     this.logger.debug("WorkspaceManager reference configured for ToolManager");
   }
   async refreshWorkspace() {
@@ -239,7 +240,11 @@ let _ToolManager = class _ToolManager {
       return;
     }
     try {
+      const previousWorkspacePath = this.currentWorkspace?.path;
       this.currentWorkspace = await this.workspaceManager.getWorkspace();
+      if (previousWorkspacePath !== this.currentWorkspace?.path) {
+        this.invalidateCache();
+      }
     } catch (error) {
       this.logger.debug(
         `Failed to refresh workspace context: ${error instanceof Error ? error.message : String(error)}`
@@ -465,6 +470,31 @@ let _ToolManager = class _ToolManager {
     this.cacheValid = false;
     this.toolsCache = {};
   }
+  async refreshDynamicToolDescriptions() {
+    if (!this.cacheValid) {
+      return;
+    }
+    for (const [toolName, tool] of this.agentTools) {
+      if (!tool.getDescription) {
+        continue;
+      }
+      const cachedTool = this.toolsCache[toolName];
+      if (!cachedTool) {
+        continue;
+      }
+      try {
+        const fallbackDescription = tool.description.trim() ? tool.description : "";
+        const dynamicDescription = await tool.getDescription(
+          this.buildToolExecutionContext({})
+        );
+        cachedTool.description = dynamicDescription.trim() ? dynamicDescription : fallbackDescription;
+      } catch (error) {
+        this.logger.warn(
+          `Failed to refresh dynamic description for '${toolName}': ${error instanceof Error ? error.message : String(error)}`
+        );
+      }
+    }
+  }
   /**
    * Set up listeners for MCP notifications to invalidate cache on changes
    */
@@ -807,11 +837,13 @@ let _ToolManager = class _ToolManager {
   setContributorContextFactory(factory) {
     this.contributorContextFactory = factory ?? void 0;
   }
-  async buildContributorContext() {
+  async buildContributorContext(options) {
     const baseWorkspace = this.currentWorkspace ?? null;
+    const sessionId = typeof options?.sessionId === "string" && options.sessionId.length > 0 ? options.sessionId : void 0;
     const baseContext = {
       mcpManager: this.mcpManager,
-      workspace: baseWorkspace
+      workspace: baseWorkspace,
+      ...sessionId !== void 0 ? { session: { id: sessionId } } : {}
     };
     if (!this.contributorContextFactory) {
       return baseContext;
@@ -820,11 +852,13 @@ let _ToolManager = class _ToolManager {
       const overrides = await this.contributorContextFactory() ?? {};
       const workspace = overrides.workspace !== void 0 ? overrides.workspace : baseWorkspace;
       const environment = overrides.environment !== void 0 ? overrides.environment : baseContext.environment;
+      const session = overrides.session !== void 0 ? overrides.session : baseContext.session;
       const mcpManager = overrides.mcpManager ?? baseContext.mcpManager;
       return {
         mcpManager,
         workspace,
-        ...environment !== void 0 ? { environment } : {}
+        ...environment !== void 0 ? { environment } : {},
+        ...session !== void 0 ? { session } : {}
       };
     } catch (error) {
       this.logger.warn(
@@ -921,9 +955,24 @@ let _ToolManager = class _ToolManager {
       mcpTools = {};
     }
     for (const [toolName, tool] of this.agentTools) {
+      let description = tool.description || "No description provided";
+      if (tool.getDescription) {
+        try {
+          const dynamicDescription = await tool.getDescription(
+            this.buildToolExecutionContext({})
+          );
+          if (dynamicDescription.trim()) {
+            description = dynamicDescription;
+          }
+        } catch (error) {
+          this.logger.warn(
+            `Failed to build dynamic description for '${toolName}': ${error instanceof Error ? error.message : String(error)}`
+          );
+        }
+      }
       allTools[toolName] = {
         name: toolName,
-        description: tool.description || "No description provided",
+        description,
         parameters: (0, import_tool_call_metadata.wrapToolParametersSchema)(
           (0, import_schema.convertZodSchemaToJsonSchema)(tool.inputSchema, this.logger)
         )
@@ -953,6 +1002,7 @@ let _ToolManager = class _ToolManager {
    */
   async getAllTools() {
     if (this.cacheValid) {
+      await this.refreshDynamicToolDescriptions();
       return this.toolsCache;
     }
     this.toolsCache = await this.buildAllTools();

package/dist/tools/tool-manager.d.ts

@@ -83,7 +83,7 @@ export declare class ToolManager {
     /**
      * Set workspace manager for tool execution context propagation.
      */
-    setWorkspaceManager(workspaceManager: WorkspaceManager): void;
+    setWorkspaceManager(workspaceManager: WorkspaceManager): Promise<void>;
     private refreshWorkspace;
     /**
      * Set session-level auto-approve tools.
@@ -174,6 +174,7 @@ export declare class ToolManager {
      * Invalidate the tools cache when tool sources change
      */
     private invalidateCache;
+    private refreshDynamicToolDescriptions;
     /**
      * Set up listeners for MCP notifications to invalidate cache on changes
      */
@@ -213,7 +214,9 @@ export declare class ToolManager {
     private autoApprovePendingDirectoryRequests;
     getMcpManager(): MCPManager;
     setContributorContextFactory(factory?: DynamicContributorContextFactory | null): void;
-    buildContributorContext(): Promise<DynamicContributorContext>;
+    buildContributorContext(options?: {
+        sessionId?: string | null;
+    }): Promise<DynamicContributorContext>;
     /**
      * Get all MCP tools (delegates to mcpManager.getAllTools())
      * This provides access to MCP tools while maintaining separation of concerns

package/dist/tools/tool-manager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tool-manager.d.ts","sourceRoot":"","sources":["../../src/tools/tool-manager.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"tool-manager.d.ts","sourceRoot":"","sources":["../../src/tools/tool-manager.ts"],"names":[],"mappings":"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"}

package/dist/tools/tool-manager.js

@@ -151,15 +151,15 @@ let _ToolManager = class _ToolManager {
   /**
    * Set workspace manager for tool execution context propagation.
    */
-  setWorkspaceManager(workspaceManager) {
+  async setWorkspaceManager(workspaceManager) {
     this.workspaceManager = workspaceManager;
-    void this.refreshWorkspace();
     if (!this.workspaceListenerAttached) {
       this.workspaceListenerAttached = true;
       this.agentEventBus.on(
         "workspace:changed",
         (payload) => {
           this.currentWorkspace = payload.workspace ?? void 0;
+          this.invalidateCache();
         },
         { signal: this.workspaceListenerAbort.signal }
       );
@@ -169,6 +169,7 @@ let _ToolManager = class _ToolManager {
         }
       });
     }
+    await this.refreshWorkspace();
     this.logger.debug("WorkspaceManager reference configured for ToolManager");
   }
   async refreshWorkspace() {
@@ -176,7 +177,11 @@ let _ToolManager = class _ToolManager {
       return;
     }
     try {
+      const previousWorkspacePath = this.currentWorkspace?.path;
       this.currentWorkspace = await this.workspaceManager.getWorkspace();
+      if (previousWorkspacePath !== this.currentWorkspace?.path) {
+        this.invalidateCache();
+      }
     } catch (error) {
       this.logger.debug(
         `Failed to refresh workspace context: ${error instanceof Error ? error.message : String(error)}`
@@ -402,6 +407,31 @@ let _ToolManager = class _ToolManager {
     this.cacheValid = false;
     this.toolsCache = {};
   }
+  async refreshDynamicToolDescriptions() {
+    if (!this.cacheValid) {
+      return;
+    }
+    for (const [toolName, tool] of this.agentTools) {
+      if (!tool.getDescription) {
+        continue;
+      }
+      const cachedTool = this.toolsCache[toolName];
+      if (!cachedTool) {
+        continue;
+      }
+      try {
+        const fallbackDescription = tool.description.trim() ? tool.description : "";
+        const dynamicDescription = await tool.getDescription(
+          this.buildToolExecutionContext({})
+        );
+        cachedTool.description = dynamicDescription.trim() ? dynamicDescription : fallbackDescription;
+      } catch (error) {
+        this.logger.warn(
+          `Failed to refresh dynamic description for '${toolName}': ${error instanceof Error ? error.message : String(error)}`
+        );
+      }
+    }
+  }
   /**
    * Set up listeners for MCP notifications to invalidate cache on changes
    */
@@ -744,11 +774,13 @@ let _ToolManager = class _ToolManager {
   setContributorContextFactory(factory) {
     this.contributorContextFactory = factory ?? void 0;
   }
-  async buildContributorContext() {
+  async buildContributorContext(options) {
     const baseWorkspace = this.currentWorkspace ?? null;
+    const sessionId = typeof options?.sessionId === "string" && options.sessionId.length > 0 ? options.sessionId : void 0;
     const baseContext = {
       mcpManager: this.mcpManager,
-      workspace: baseWorkspace
+      workspace: baseWorkspace,
+      ...sessionId !== void 0 ? { session: { id: sessionId } } : {}
     };
     if (!this.contributorContextFactory) {
       return baseContext;
@@ -757,11 +789,13 @@ let _ToolManager = class _ToolManager {
       const overrides = await this.contributorContextFactory() ?? {};
       const workspace = overrides.workspace !== void 0 ? overrides.workspace : baseWorkspace;
       const environment = overrides.environment !== void 0 ? overrides.environment : baseContext.environment;
+      const session = overrides.session !== void 0 ? overrides.session : baseContext.session;
       const mcpManager = overrides.mcpManager ?? baseContext.mcpManager;
       return {
         mcpManager,
         workspace,
-        ...environment !== void 0 ? { environment } : {}
+        ...environment !== void 0 ? { environment } : {},
+        ...session !== void 0 ? { session } : {}
       };
     } catch (error) {
       this.logger.warn(
@@ -858,9 +892,24 @@ let _ToolManager = class _ToolManager {
       mcpTools = {};
     }
     for (const [toolName, tool] of this.agentTools) {
+      let description = tool.description || "No description provided";
+      if (tool.getDescription) {
+        try {
+          const dynamicDescription = await tool.getDescription(
+            this.buildToolExecutionContext({})
+          );
+          if (dynamicDescription.trim()) {
+            description = dynamicDescription;
+          }
+        } catch (error) {
+          this.logger.warn(
+            `Failed to build dynamic description for '${toolName}': ${error instanceof Error ? error.message : String(error)}`
+          );
+        }
+      }
       allTools[toolName] = {
         name: toolName,
-        description: tool.description || "No description provided",
+        description,
         parameters: wrapToolParametersSchema(
           convertZodSchemaToJsonSchema(tool.inputSchema, this.logger)
         )
@@ -890,6 +939,7 @@ let _ToolManager = class _ToolManager {
    */
   async getAllTools() {
     if (this.cacheValid) {
+      await this.refreshDynamicToolDescriptions();
       return this.toolsCache;
     }
     this.toolsCache = await this.buildAllTools();

package/dist/tools/types.d.ts

@@ -195,6 +195,11 @@ export interface Tool<TSchema extends ZodTypeAny = ZodTypeAny> {
     id: string;
     /** Human-readable description of what the tool does */
     description: string;
+    /**
+     * Optional dynamic description for LLM tool discovery.
+     * Use when the tool description depends on runtime context such as the active workspace.
+     */
+    getDescription?: ((context: ToolExecutionContext) => Promise<string> | string) | undefined;
     /** Zod schema defining the input parameters */
     inputSchema: TSchema;
     /** The actual function that executes the tool - input is validated by Zod before execution */

package/dist/tools/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/tools/types.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/tools/types.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC/C,OAAO,KAAK,EAAE,CAAC,EAAE,UAAU,EAAE,MAAM,KAAK,CAAC;AACzC,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAC1D,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAC9D,OAAO,KAAK,EAAE,sBAAsB,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AACrF,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAC9D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AACzD,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,2BAA2B,CAAC;AACvD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,0BAA0B,CAAC;AAC1D,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,8BAA8B,CAAC;AAC7D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAClE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAC/D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AACjE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAEpD;;;;;GAKG;AACH,MAAM,WAAW,UAAU;IACvB,IAAI,CAAC,OAAO,EAAE;QACV,IAAI,EAAE,MAAM,CAAC;QACb,YAAY,EAAE,MAAM,CAAC;QACrB,OAAO,CAAC,EAAE,MAAM,CAAC;QACjB,WAAW,CAAC,EAAE,OAAO,CAAC;QACtB,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,SAAS,CAAC,EAAE,MAAM,CAAC;KACtB,GAAG,OAAO,CAAC;QACR,OAAO,EAAE,OAAO,CAAC;QACjB,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,KAAK,CAAC,EAAE,MAAM,CAAC;KAClB,CAAC,CAAC;CACN;AAOD,MAAM,MAAM,eAAe,GAAG,UAAU,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AAEhE,MAAM,WAAW,YAAY;IACzB,QAAQ,EAAE,eAAe,CAAC;IAC1B,MAAM,EAAE,aAAa,CAAC;IACtB,SAAS,EAAE,eAAe,CAAC;IAC3B,OAAO,EAAE,aAAa,CAAC;IACvB,GAAG,EAAE,UAAU,CAAC;IAChB,UAAU,EAAE,UAAU,GAAG,IAAI,CAAC;CACjC;AAED;;GAEG;AACH,MAAM,WAAW,wBAAwB;IACrC,8BAA8B;IAC9B,SAAS,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC/B,gCAAgC;IAChC,WAAW,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IACjC,qCAAqC;IACrC,SAAS,CAAC,EAAE,gBAAgB,GAAG,SAAS,CAAC;IACzC,4CAA4C;IAC5C,WAAW,CAAC,EAAE,WAAW,GAAG,SAAS,CAAC;IACtC,2DAA2D;IAC3D,UAAU,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAEhC;;OAEG;IACH,MAAM,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,oBAAqB,SAAQ,wBAAwB;IAClE;;OAEG;IACH,KAAK,CAAC,EAAE,UAAU,GAAG,SAAS,CAAC;IAE/B;;OAEG;IACH,OAAO,CAAC,EACF;QACI,IAAI,EAAE,SAAS,CAAC;QAChB,QAAQ,EAAE,QAAQ,CAAC;QACnB,KAAK,EAAE,KAAK,CAAC;KAChB,GACD,SAAS,CAAC;IAEhB;;;OAGG;IACH,QAAQ,CAAC,EAAE,YAAY,GAAG,SAAS,CAAC;CACvC;AAED;;GAEG;AACH,MAAM,WAAW,mBAAmB;IAChC,iDAAiD;IACjD,MAAM,EAAE,OAAO,CAAC;IAChB,sEAAsE;IACtE,oBAAoB,CAAC,EAAE,0BAA0B,CAAC;IAClD,gEAAgE;IAChE,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,oEAAoE;IACpE,cAAc,CAAC,EAAE,UAAU,GAAG,UAAU,CAAC;CAC5C;AAMD;;;;;;;;;;;GAWG;AACH,MAAM,MAAM,0BAA0B,GAAG;IACrC,OAAO,EAAE,CAAC,CAAC;IAEX,iGAAiG;IACjG,MAAM,CAAC,EAAE;QACL,IAAI,EAAE,OAAO,GAAG,KAAK,CAAC;QACtB,aAAa,CAAC,EAAE,MAAM,CAAC;KAC1B,CAAC;IAEF,2EAA2E;IAC3E,MAAM,CAAC,EAAE;QACL,KAAK,CAAC,EAAE,MAAM,CAAC;QACf;;;WAGG;QACH,QAAQ,CAAC,EAAE,MAAM,CAAC;KACrB,CAAC;IAEF,8DAA8D;IAC9D,KAAK,CAAC,EAAE,KAAK,CAAC;QACV,IAAI,EAAE,SAAS,GAAG,MAAM,GAAG,SAAS,GAAG,QAAQ,GAAG,SAAS,CAAC;QAC5D,IAAI,EAAE,MAAM,CAAC;KAChB,CAAC,CAAC;IAEH,oFAAoF;IACpF,IAAI,CAAC,EAAE;QACH,OAAO,CAAC,EAAE,KAAK,CAAC;YACZ,KAAK,EAAE,MAAM,CAAC;YACd,OAAO,EAAE,MAAM,CAAC;YAChB,IAAI,CAAC,EAAE,MAAM,GAAG,SAAS,GAAG,KAAK,GAAG,MAAM,GAAG,MAAM,CAAC;YACpD,SAAS,CAAC,EAAE,OAAO,CAAC;SACvB,CAAC,CAAC;QAEH,MAAM,CAAC,EAAE,KAAK,CAAC;YACX,EAAE,EAAE,MAAM,CAAC;YACX,KAAK,EAAE,MAAM,CAAC;YACd,kBAAkB,CAAC,EAAE,OAAO,CAAC;YAC7B,KAAK,EAAE,KAAK,CAAC;gBACT,KAAK,EAAE,MAAM,CAAC;gBACd,OAAO,EAAE,MAAM,CAAC;gBAChB,IAAI,CAAC,EAAE,MAAM,GAAG,SAAS,GAAG,KAAK,GAAG,MAAM,GAAG,MAAM,CAAC;gBACpD,SAAS,CAAC,EAAE,OAAO,CAAC;aACvB,CAAC,CAAC;SACN,CAAC,CAAC;KACN,CAAC;IAEF,yFAAyF;IACzF,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC;IAExB,4FAA4F;IAC5F,QAAQ,CAAC,EAAE;QACP,OAAO,CAAC,EAAE,KAAK,CACT;YACI,EAAE,EAAE,MAAM,CAAC;YACX,KAAK,EAAE,MAAM,CAAC;YACd,IAAI,CAAC,EAAE,SAAS,GAAG,WAAW,GAAG,QAAQ,CAAC;YAC1C,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;YACvC,SAAS,CAAC,EAAE,QAAQ,EAAE,CAAC;SAC1B,GACD;YACI,EAAE,EAAE,MAAM,CAAC;YACX,KAAK,EAAE,MAAM,CAAC;YACd,IAAI,CAAC,EAAE,QAAQ,CAAC;YAChB,gBAAgB,CAAC,EAAE;gBACf,WAAW,CAAC,EAAE,MAAM,CAAC;gBACrB,eAAe,CAAC,EAAE,MAAM,CAAC;aAC5B,CAAC;SACL,CACN,CAAC;KACL,CAAC;IAEF,wDAAwD;IACxD,MAAM,CAAC,EAAE;QACL,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,SAAS,CAAC,EAAE,QAAQ,EAAE,CAAC;KAC1B,CAAC;CACL,CAAC;AAEF;;;;;GAKG;AACH,MAAM,MAAM,QAAQ,GACd;IACI,IAAI,EAAE,SAAS,CAAC;IAChB,IAAI,EAAE,kBAAkB,GAAG,gBAAgB,GAAG,qBAAqB,CAAC;IACpE,KAAK,EAAE,OAAO,CAAC;CAClB,GACD;IACI,IAAI,EAAE,OAAO,CAAC;IACd,IAAI,EAAE,MAAM,GAAG,SAAS,GAAG,SAAS,GAAG,OAAO,CAAC;IAC/C,OAAO,EAAE,MAAM,CAAC;CACnB,CAAC;AAMR;;GAEG;AACH,MAAM,WAAW,IAAI,CAAC,OAAO,SAAS,UAAU,GAAG,UAAU;IACzD,qCAAqC;IACrC,EAAE,EAAE,MAAM,CAAC;IAEX,uDAAuD;IACvD,WAAW,EAAE,MAAM,CAAC;IAEpB;;;OAGG;IACH,cAAc,CAAC,EAAE,CAAC,CAAC,OAAO,EAAE,oBAAoB,KAAK,OAAO,CAAC,MAAM,CAAC,GAAG,MAAM,CAAC,GAAG,SAAS,CAAC;IAE3F,+CAA+C;IAC/C,WAAW,EAAE,OAAO,CAAC;IAErB,8FAA8F;IAC9F,OAAO,CAAC,KAAK,EAAE,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,OAAO,EAAE,oBAAoB,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,OAAO,CAAC;IAE7F;;OAEG;IACH,QAAQ,CAAC,EAAE,YAAY,CAAC,OAAO,CAAC,GAAG,SAAS,CAAC;IAE7C;;OAEG;IACH,YAAY,CAAC,EAAE,gBAAgB,CAAC,OAAO,CAAC,GAAG,SAAS,CAAC;IAErD;;;;;;OAMG;IACH,OAAO,CAAC,EAAE,MAAM,EAAE,GAAG,SAAS,CAAC;CAIlC;AAED,MAAM,WAAW,YAAY,CAAC,OAAO,SAAS,UAAU,GAAG,UAAU;IACjE,QAAQ,CAAC,CACL,KAAK,EAAE,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,EACxB,OAAO,EAAE,oBAAoB,GAC9B,OAAO,CAAC,sBAAsB,GAAG,IAAI,CAAC,GAAG,sBAAsB,GAAG,IAAI,CAAC;IAE1E,SAAS,CAAC,CACN,QAAQ,EAAE,gBAAgB,EAC1B,OAAO,EAAE,oBAAoB,EAC7B,eAAe,EAAE,sBAAsB,GACxC,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;IAExB,UAAU,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,GAAG,MAAM,GAAG,IAAI,CAAC;IAErD,eAAe,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,GAAG,MAAM,EAAE,CAAC;CACxD;AAED,MAAM,WAAW,gBAAgB,CAAC,OAAO,SAAS,UAAU,GAAG,UAAU;IACrE;;;;;;;OAOG;IACH,OAAO,CAAC,CACJ,KAAK,EAAE,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,EACxB,OAAO,EAAE,oBAAoB,GAC9B,OAAO,CAAC,eAAe,GAAG,IAAI,CAAC,GAAG,eAAe,GAAG,IAAI,CAAC;IAE5D;;;;;;OAMG;IACH,cAAc,CAAC,CACX,KAAK,EAAE,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,EACxB,OAAO,EAAE,oBAAoB,GAE3B,OAAO,CAAC,0BAA0B,CAAC,QAAQ,CAAC,GAAG,IAAI,CAAC,GACpD,0BAA0B,CAAC,QAAQ,CAAC,GACpC,IAAI,CAAC;IAEX;;;;;;;;;OASG;IACH,YAAY,CAAC,CACT,KAAK,EAAE,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,EACxB,OAAO,EAAE,oBAAoB,GAE3B,OAAO,CAAC,0BAA0B,CAAC,MAAM,CAAC,GAAG,IAAI,CAAC,GAClD,0BAA0B,CAAC,MAAM,CAAC,GAClC,IAAI,CAAC;IAEX;;;;;;;;OAQG;IACH,cAAc,CAAC,CACX,MAAM,EAAE,OAAO,EACf,KAAK,EAAE,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,EACxB,OAAO,EAAE,oBAAoB,GAE3B,OAAO,CAAC,0BAA0B,CAAC,QAAQ,CAAC,GAAG,IAAI,CAAC,GACpD,0BAA0B,CAAC,QAAQ,CAAC,GACpC,IAAI,CAAC;CACd;AAED;;;GAGG;AACH,MAAM,WAAW,OAAO;IACpB,CAAC,GAAG,EAAE,MAAM,GAAG;QACX,IAAI,CAAC,EAAE,MAAM,CAAC;QACd,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,UAAU,EAAE,WAAW,CAAC;QACxB,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;KACnC,CAAC;CACL;AAMD;;GAEG;AACH,MAAM,WAAW,UAAU;IACvB,OAAO,EAAE,OAAO,CAAC;IACjB,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,KAAK,CAAC,EAAE,MAAM,CAAC;CAClB;AAED;;GAEG;AACH,MAAM,WAAW,YAAY;IACzB,QAAQ,IAAI,OAAO,CAAC,OAAO,CAAC,CAAC;IAC7B,QAAQ,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;CAC/E"}

package/dist/utils/execution-context.cjs

@@ -36,22 +36,84 @@ module.exports = __toCommonJS(execution_context_exports);
 var import_fs_walk = require("./fs-walk.js");
 var import_fs = require("fs");
 var path = __toESM(require("path"), 1);
-function isDextoSourceDirectory(dirPath) {
-  const packageJsonPath = path.join(dirPath, "package.json");
+const DIRECT_PROJECT_ROOT_MARKERS = [
+  path.join(".dexto", "deploy.json"),
+  path.join(".dexto", "cloud", "bootstrap.json"),
+  "coding-agent.yml",
+  "coding-agent.yaml",
+  path.join("agents", "registry.json"),
+  path.join("agents", "agent-registry.json"),
+  path.join("agents", "coding-agent.yml"),
+  path.join("agents", "coding-agent.yaml"),
+  path.join("agents", "coding-agent", "coding-agent.yml"),
+  path.join("agents", "coding-agent", "coding-agent.yaml"),
+  path.join("src", "dexto", "agents", "coding-agent.yml"),
+  path.join("src", "dexto", "agents", "coding-agent.yaml")
+];
+function getCaseInsensitiveRootFilename(dirPath, filename) {
+  try {
+    return (0, import_fs.readdirSync)(dirPath).find((entry) => entry.toLowerCase() === filename.toLowerCase()) ?? null;
+  } catch {
+    return null;
+  }
+}
+function hasWorkspaceAuthoringDirectory(dirPath, name) {
+  try {
+    return (0, import_fs.statSync)(path.join(dirPath, name)).isDirectory();
+  } catch {
+    return false;
+  }
+}
+function hasDextoWorkspaceAgentsFile(dirPath) {
+  const agentsFilename = getCaseInsensitiveRootFilename(dirPath, "agents.md");
+  if (!agentsFilename) {
+    return false;
+  }
   try {
-    const pkg = JSON.parse((0, import_fs.readFileSync)(packageJsonPath, "utf-8"));
-    return pkg.name === "dexto-monorepo";
+    const content = (0, import_fs.readFileSync)(path.join(dirPath, agentsFilename), "utf-8").toLowerCase();
+    return content.includes("dexto workspace") || content.includes("dexto-workspace");
   } catch {
     return false;
   }
 }
+function hasWorkspaceScaffoldMarker(dirPath) {
+  return hasDextoWorkspaceAgentsFile(dirPath) && (hasWorkspaceAuthoringDirectory(dirPath, "agents") || hasWorkspaceAuthoringDirectory(dirPath, "skills"));
+}
+function readPackageName(dirPath) {
+  try {
+    const pkg = JSON.parse((0, import_fs.readFileSync)(path.join(dirPath, "package.json"), "utf-8"));
+    return typeof pkg.name === "string" ? pkg.name : null;
+  } catch {
+    return null;
+  }
+}
+function isInternalDextoPackage(dirPath) {
+  const packageName = readPackageName(dirPath);
+  return packageName === "dexto" || packageName?.startsWith("@dexto/") === true;
+}
+function hasProjectRootMarker(dirPath) {
+  if (hasWorkspaceScaffoldMarker(dirPath)) {
+    return true;
+  }
+  return DIRECT_PROJECT_ROOT_MARKERS.some(
+    (relativePath) => (0, import_fs.existsSync)(path.join(dirPath, relativePath))
+  );
+}
+function isDextoSourceDirectory(dirPath) {
+  return readPackageName(dirPath) === "dexto-monorepo";
+}
 function isDextoProjectDirectory(dirPath) {
-  const packageJsonPath = path.join(dirPath, "package.json");
+  if (isDextoSourceDirectory(dirPath)) {
+    return false;
+  }
+  if (isInternalDextoPackage(dirPath)) {
+    return false;
+  }
+  if (hasProjectRootMarker(dirPath)) {
+    return true;
+  }
   try {
-    const pkg = JSON.parse((0, import_fs.readFileSync)(packageJsonPath, "utf-8"));
-    if (pkg.name === "dexto" || pkg.name === "@dexto/core" || pkg.name === "@dexto/webui") {
-      return false;
-    }
+    const pkg = JSON.parse((0, import_fs.readFileSync)(path.join(dirPath, "package.json"), "utf-8"));
     const allDeps = {
       ...pkg.dependencies ?? {},
       ...pkg.devDependencies ?? {},

package/dist/utils/execution-context.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"execution-context.d.ts","sourceRoot":"","sources":["../../src/utils/execution-context.ts"],"names":[],"mappings":"AAQA,MAAM,MAAM,gBAAgB,GAAG,cAAc,GAAG,eAAe,GAAG,YAAY,CAAC;AAgD/E;;;;GAIG;AACH,wBAAgB,mBAAmB,CAAC,SAAS,GAAE,MAAsB,GAAG,MAAM,GAAG,IAAI,CAEpF;AAED;;;;GAIG;AACH,wBAAgB,oBAAoB,CAAC,SAAS,GAAE,MAAsB,GAAG,MAAM,GAAG,IAAI,CAErF;AAED;;;;GAIG;AACH,wBAAgB,mBAAmB,CAAC,SAAS,GAAE,MAAsB,GAAG,gBAAgB,CAavF"}
+{"version":3,"file":"execution-context.d.ts","sourceRoot":"","sources":["../../src/utils/execution-context.ts"],"names":[],"mappings":"AAQA,MAAM,MAAM,gBAAgB,GAAG,cAAc,GAAG,eAAe,GAAG,YAAY,CAAC;AA2H/E;;;;GAIG;AACH,wBAAgB,mBAAmB,CAAC,SAAS,GAAE,MAAsB,GAAG,MAAM,GAAG,IAAI,CAEpF;AAED;;;;GAIG;AACH,wBAAgB,oBAAoB,CAAC,SAAS,GAAE,MAAsB,GAAG,MAAM,GAAG,IAAI,CAErF;AAED;;;;GAIG;AACH,wBAAgB,mBAAmB,CAAC,SAAS,GAAE,MAAsB,GAAG,gBAAgB,CAavF"}

package/dist/utils/execution-context.js

@@ -1,23 +1,85 @@
 import "../chunk-PTJYTZNU.js";
 import { walkUpDirectories } from "./fs-walk.js";
-import { readFileSync } from "fs";
+import { existsSync, readFileSync, readdirSync, statSync } from "fs";
 import * as path from "path";
-function isDextoSourceDirectory(dirPath) {
-  const packageJsonPath = path.join(dirPath, "package.json");
+const DIRECT_PROJECT_ROOT_MARKERS = [
+  path.join(".dexto", "deploy.json"),
+  path.join(".dexto", "cloud", "bootstrap.json"),
+  "coding-agent.yml",
+  "coding-agent.yaml",
+  path.join("agents", "registry.json"),
+  path.join("agents", "agent-registry.json"),
+  path.join("agents", "coding-agent.yml"),
+  path.join("agents", "coding-agent.yaml"),
+  path.join("agents", "coding-agent", "coding-agent.yml"),
+  path.join("agents", "coding-agent", "coding-agent.yaml"),
+  path.join("src", "dexto", "agents", "coding-agent.yml"),
+  path.join("src", "dexto", "agents", "coding-agent.yaml")
+];
+function getCaseInsensitiveRootFilename(dirPath, filename) {
+  try {
+    return readdirSync(dirPath).find((entry) => entry.toLowerCase() === filename.toLowerCase()) ?? null;
+  } catch {
+    return null;
+  }
+}
+function hasWorkspaceAuthoringDirectory(dirPath, name) {
+  try {
+    return statSync(path.join(dirPath, name)).isDirectory();
+  } catch {
+    return false;
+  }
+}
+function hasDextoWorkspaceAgentsFile(dirPath) {
+  const agentsFilename = getCaseInsensitiveRootFilename(dirPath, "agents.md");
+  if (!agentsFilename) {
+    return false;
+  }
   try {
-    const pkg = JSON.parse(readFileSync(packageJsonPath, "utf-8"));
-    return pkg.name === "dexto-monorepo";
+    const content = readFileSync(path.join(dirPath, agentsFilename), "utf-8").toLowerCase();
+    return content.includes("dexto workspace") || content.includes("dexto-workspace");
   } catch {
     return false;
   }
 }
+function hasWorkspaceScaffoldMarker(dirPath) {
+  return hasDextoWorkspaceAgentsFile(dirPath) && (hasWorkspaceAuthoringDirectory(dirPath, "agents") || hasWorkspaceAuthoringDirectory(dirPath, "skills"));
+}
+function readPackageName(dirPath) {
+  try {
+    const pkg = JSON.parse(readFileSync(path.join(dirPath, "package.json"), "utf-8"));
+    return typeof pkg.name === "string" ? pkg.name : null;
+  } catch {
+    return null;
+  }
+}
+function isInternalDextoPackage(dirPath) {
+  const packageName = readPackageName(dirPath);
+  return packageName === "dexto" || packageName?.startsWith("@dexto/") === true;
+}
+function hasProjectRootMarker(dirPath) {
+  if (hasWorkspaceScaffoldMarker(dirPath)) {
+    return true;
+  }
+  return DIRECT_PROJECT_ROOT_MARKERS.some(
+    (relativePath) => existsSync(path.join(dirPath, relativePath))
+  );
+}
+function isDextoSourceDirectory(dirPath) {
+  return readPackageName(dirPath) === "dexto-monorepo";
+}
 function isDextoProjectDirectory(dirPath) {
-  const packageJsonPath = path.join(dirPath, "package.json");
+  if (isDextoSourceDirectory(dirPath)) {
+    return false;
+  }
+  if (isInternalDextoPackage(dirPath)) {
+    return false;
+  }
+  if (hasProjectRootMarker(dirPath)) {
+    return true;
+  }
   try {
-    const pkg = JSON.parse(readFileSync(packageJsonPath, "utf-8"));
-    if (pkg.name === "dexto" || pkg.name === "@dexto/core" || pkg.name === "@dexto/webui") {
-      return false;
-    }
+    const pkg = JSON.parse(readFileSync(path.join(dirPath, "package.json"), "utf-8"));
     const allDeps = {
       ...pkg.dependencies ?? {},
       ...pkg.devDependencies ?? {},

package/dist/utils/service-initializer.cjs

@@ -144,7 +144,7 @@ async function createAgentServices(config, logger, agentEventBus, overrides, com
     [],
     logger
   );
-  toolManager.setWorkspaceManager(workspaceManager);
+  await toolManager.setWorkspaceManager(workspaceManager);
   const mcpServerCount = Object.keys(config.mcpServers).length;
   if (mcpServerCount === 0) {
     logger.info("Agent initialized without MCP servers - only built-in capabilities available");

package/dist/utils/service-initializer.js

@@ -112,7 +112,7 @@ async function createAgentServices(config, logger, agentEventBus, overrides, com
     [],
     logger
   );
-  toolManager.setWorkspaceManager(workspaceManager);
+  await toolManager.setWorkspaceManager(workspaceManager);
   const mcpServerCount = Object.keys(config.mcpServers).length;
   if (mcpServerCount === 0) {
     logger.info("Agent initialized without MCP servers - only built-in capabilities available");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dexto/core",
-  "version": "1.6.14",
+  "version": "1.6.16",
   "private": false,
   "type": "module",
   "main": "./dist/index.js",