@adhd/agent-mcp 2.1.0 → 2.1.2

package/drizzle/meta/_journal.json

@@ -0,0 +1,76 @@
+{
+  "version": "7",
+  "dialect": "sqlite",
+  "entries": [
+    {
+      "idx": 0,
+      "version": "6",
+      "when": 1778793918653,
+      "tag": "0000_nifty_sasquatch",
+      "breakpoints": true
+    },
+    {
+      "idx": 1,
+      "version": "6",
+      "when": 1781059973506,
+      "tag": "0001_task_usage",
+      "breakpoints": true
+    },
+    {
+      "idx": 2,
+      "version": "6",
+      "when": 1781068864364,
+      "tag": "0002_lumpy_silver_centurion",
+      "breakpoints": true
+    },
+    {
+      "idx": 3,
+      "version": "6",
+      "when": 1781069217143,
+      "tag": "0003_nifty_shriek",
+      "breakpoints": true
+    },
+    {
+      "idx": 4,
+      "version": "6",
+      "when": 1781408344547,
+      "tag": "0004_brief_shocker",
+      "breakpoints": true
+    },
+    {
+      "idx": 5,
+      "version": "6",
+      "when": 1781497705486,
+      "tag": "0005_clear_lenny_balinger",
+      "breakpoints": true
+    },
+    {
+      "idx": 6,
+      "version": "6",
+      "when": 1781497706486,
+      "tag": "0006_composed_prompts_cache",
+      "breakpoints": true
+    },
+    {
+      "idx": 7,
+      "version": "6",
+      "when": 1782874595963,
+      "tag": "0007_smart_callisto",
+      "breakpoints": true
+    },
+    {
+      "idx": 8,
+      "version": "6",
+      "when": 1782874595964,
+      "tag": "0008_cache_and_peak_context_usage",
+      "breakpoints": true
+    },
+    {
+      "idx": 9,
+      "version": "6",
+      "when": 1782874595965,
+      "tag": "0009_restore_sessions_agent_fk",
+      "breakpoints": true
+    }
+  ]
+}

package/package.json

@@ -1,28 +1,26 @@
 {
   "name": "@adhd/agent-mcp",
-  "version": "2.1.0",
+  "version": "2.1.2",
   "type": "module",
   "bin": {
     "agent-mcp": "./src/index.js",
     "agent-mcp-tail": "./src/scripts/agent-mcp-tail.js"
   },
   "dependencies": {
-    "@adhd/agent-store-runtime": "^2.1.0",
-    "@adhd/agent-store-prompts": "^2.1.0",
-    "@adhd/agent-engine-orchestrator": "^2.1.0",
-    "@modelcontextprotocol/sdk": "*",
-    "pino": "*",
-    "drizzle-orm": "*",
-    "better-sqlite3": "*",
-    "dotenv": "*",
-    "zod": "*",
-    "@adhd/agent-base-types": "^2.1.0",
-    "@adhd/agent-engine-compiler": "^2.1.0",
+    "@adhd/agent-store-runtime": "^2.1.1",
+    "@adhd/agent-store-prompts": "^2.1.1",
+    "@adhd/agent-engine-orchestrator": "^2.1.1",
+    "@modelcontextprotocol/sdk": "^1.29.0",
+    "pino": "^10.3.1",
+    "drizzle-orm": "^0.45.2",
+    "better-sqlite3": "^12.10.0",
+    "zod": "^4.4.3",
+    "@adhd/environment": "^0.0.1",
+    "@adhd/environment-base-spec": "^0.0.1",
+    "@adhd/agent-base-types": "^2.1.1",
+    "@adhd/agent-engine-compiler": "^2.1.1",
     "tslib": "^2.3.0"
   },
-  "devDependencies": {
-    "@adhd/agent-base-types": "^2.1.0"
-  },
   "main": "./src/index.js",
   "license": "MIT",
   "repository": {
@@ -36,6 +34,5 @@
   },
   "publishConfig": {
     "access": "public"
-  },
-  "module": "./src/index.js"
+  }
 }

package/src/config.d.ts

@@ -1,27 +1,21 @@
+import { Environment } from "@adhd/environment";
+import type { EnvironmentSpec } from "@adhd/environment-base-spec";
 import type { EngineConfig } from "@adhd/agent-engine-orchestrator";
-export type GetProviderConfigOpts = {
-    provider: "openai" | "anthropic" | "claudecli";
-    secret?: string;
-    url?: string;
-    model?: string;
-    inlineBaseURL?: string;
-    inlineModel?: string;
-};
-export type ProviderConfigResolved = {
-    secret?: string;
-    baseURL?: string;
-    model?: string;
-};
-export interface Config extends EngineConfig {
+export interface AgentMcpConfig {
     readonly db: {
-        readonly path: string;
+        readonly path: string | undefined;
     };
     readonly logging: {
         readonly level: string;
     };
-    readonly server: EngineConfig["server"] & {
+    readonly queue: {
+        readonly concurrency: number;
+    };
+    readonly server: {
         readonly maxDepth: number;
         readonly maxToolLoops: number;
+        readonly defaultMaxTokens: number;
+        readonly contextLimit: number;
         readonly allowedAgents: readonly string[] | undefined;
         readonly registryDbPath: string;
     };
@@ -29,23 +23,58 @@ export interface Config extends EngineConfig {
         readonly kind: string;
         readonly port: number;
     };
-    readonly sse: EngineConfig["sse"] & {
+    readonly sse: {
         readonly port: number;
         readonly host: string;
+        readonly baseUrl: string | undefined;
     };
-    readonly security: {
-        readonly envAllowlist: readonly string[];
-    };
-    readonly queue: EngineConfig["queue"];
-    readonly plugins: EngineConfig["plugins"];
-    getProviderConfig(opts: GetProviderConfigOpts): ProviderConfigResolved;
-    resolveEnvRef(name: string): string | undefined;
-    verifyEnvRefs(names: string[]): {
-        missing: string[];
-        disallowed: string[];
+    readonly plugins: {
+        readonly configPath: string | undefined;
+        readonly entries: readonly string[];
     };
-    subprocessEnv(): Record<string, string>;
 }
-export declare function loadConfig(env?: NodeJS.ProcessEnv): Config;
-export declare const config: Config;
+/**
+ * Exported so tests (and any other real consumer that needs an isolated
+ * instance — e.g. `__tests__/integration/harness.ts`) can construct their
+ * own `new Environment<AgentMcpConfig>('agent-mcp', agentMcpEnvironmentSpec, {...})`
+ * against a temp `adhdRoot` without touching the real machine's `~/.adhd`.
+ */
+export declare const agentMcpEnvironmentSpec: EnvironmentSpec<AgentMcpConfig>;
+export type GetProviderConfigOpts = {
+    provider: "openai" | "anthropic" | "claudecli";
+    secret?: string;
+    url?: string;
+    model?: string;
+    inlineBaseURL?: string;
+    inlineModel?: string;
+};
+export type ProviderConfigResolved = {
+    secret?: string;
+    baseURL?: string;
+    model?: string;
+};
+declare function getProviderConfig(opts: GetProviderConfigOpts): ProviderConfigResolved;
+/**
+ * Snapshot of the current `process.env`, for subprocess spawning
+ * (`EngineConfig.subprocessEnv`, consumed by the `claudecli` provider and
+ * the stdio MCP-client transport to forward the parent's environment to a
+ * spawned child). Matches the pre-redesign `Config.subprocessEnv()`
+ * behavior exactly: the full current env snapshot, not prefix-filtered.
+ */
+declare function subprocessEnv(): Record<string, string>;
+export declare const env: Environment<AgentMcpConfig> & {
+    getProviderConfig: typeof getProviderConfig;
+    subprocessEnv: typeof subprocessEnv;
+};
+/**
+ * Builds the `EngineConfig`-shaped adapter the orchestrator layer (`server.ts`,
+ * `index.ts`) is injected with — the engine MUST NOT import `config.ts`
+ * directly (`packages/agent/agent-engine-orchestrator/src/interfaces.ts`).
+ * Derived live from `env.config` plus `env`'s own methods
+ * (`getProviderConfig`/`isEnvNameAllowed`/`subprocessEnv`) on every call, so
+ * it always reflects the current cascade (relevant for `at:'runtime'`/
+ * `secret` fields, though this spec declares none).
+ */
+export declare function toEngineConfig(): EngineConfig;
+export {};
 //# sourceMappingURL=config.d.ts.map

package/src/config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../../../entrypoint/agent-mcp/src/config.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAIpE,MAAM,MAAM,qBAAqB,GAAG;IAChC,QAAQ,EAAE,QAAQ,GAAG,WAAW,GAAG,WAAW,CAAC;IAC/C,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,WAAW,CAAC,EAAE,MAAM,CAAC;CACxB,CAAC;AAEF,MAAM,MAAM,sBAAsB,GAAG;IACjC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,CAAC;CAClB,CAAC;AAEF,MAAM,WAAW,MAAO,SAAQ,YAAY;IACxC,QAAQ,CAAC,EAAE,EAAE;QAAE,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC;IACvC,QAAQ,CAAC,OAAO,EAAE;QAAE,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC;IAC7C,QAAQ,CAAC,MAAM,EAAE,YAAY,CAAC,QAAQ,CAAC,GAAG;QACtC,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;QAC1B,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC;QAC9B,QAAQ,CAAC,aAAa,EAAE,SAAS,MAAM,EAAE,GAAG,SAAS,CAAC;QACtD,QAAQ,CAAC,cAAc,EAAE,MAAM,CAAC;KACnC,CAAC;IACF,QAAQ,CAAC,SAAS,EAAE;QAAE,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC;IACrE,QAAQ,CAAC,GAAG,EAAE,YAAY,CAAC,KAAK,CAAC,GAAG;QAChC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;QACtB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;KACzB,CAAC;IACF,QAAQ,CAAC,QAAQ,EAAE;QAAE,QAAQ,CAAC,YAAY,EAAE,SAAS,MAAM,EAAE,CAAA;KAAE,CAAC;IAChE,QAAQ,CAAC,KAAK,EAAE,YAAY,CAAC,OAAO,CAAC,CAAC;IACtC,QAAQ,CAAC,OAAO,EAAE,YAAY,CAAC,SAAS,CAAC,CAAC;IAC1C,iBAAiB,CAAC,IAAI,EAAE,qBAAqB,GAAG,sBAAsB,CAAC;IACvE,aAAa,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAAC;IAChD,aAAa,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG;QAAE,OAAO,EAAE,MAAM,EAAE,CAAC;QAAC,UAAU,EAAE,MAAM,EAAE,CAAA;KAAE,CAAC;IAC5E,aAAa,IAAI,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAC3C;AA0ID,wBAAgB,UAAU,CAAC,GAAG,GAAE,MAAM,CAAC,UAAwB,GAAG,MAAM,CAkHvE;AAED,eAAO,MAAM,MAAM,EAAE,MAAqB,CAAC"}
+{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/config.ts"],"names":[],"mappings":"AAuBA,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AACnE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAMpE,MAAM,WAAW,cAAc;IAC7B,QAAQ,CAAC,EAAE,EAAE;QAAE,QAAQ,CAAC,IAAI,EAAE,MAAM,GAAG,SAAS,CAAA;KAAE,CAAC;IACnD,QAAQ,CAAC,OAAO,EAAE;QAAE,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC;IAC7C,QAAQ,CAAC,KAAK,EAAE;QAAE,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAA;KAAE,CAAC;IACjD,QAAQ,CAAC,MAAM,EAAE;QACf,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;QAC1B,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC;QAC9B,QAAQ,CAAC,gBAAgB,EAAE,MAAM,CAAC;QAClC,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC;QAC9B,QAAQ,CAAC,aAAa,EAAE,SAAS,MAAM,EAAE,GAAG,SAAS,CAAC;QACtD,QAAQ,CAAC,cAAc,EAAE,MAAM,CAAC;KACjC,CAAC;IACF,QAAQ,CAAC,SAAS,EAAE;QAAE,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC;IACrE,QAAQ,CAAC,GAAG,EAAE;QAAE,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,OAAO,EAAE,MAAM,GAAG,SAAS,CAAA;KAAE,CAAC;IACrG,QAAQ,CAAC,OAAO,EAAE;QAAE,QAAQ,CAAC,UAAU,EAAE,MAAM,GAAG,SAAS,CAAC;QAAC,QAAQ,CAAC,OAAO,EAAE,SAAS,MAAM,EAAE,CAAA;KAAE,CAAC;CACpG;AAMD;;;;;GAKG;AACH,eAAO,MAAM,uBAAuB,EAAE,eAAe,CAAC,cAAc,CAsGnE,CAAC;AAMF,MAAM,MAAM,qBAAqB,GAAG;IAClC,QAAQ,EAAE,QAAQ,GAAG,WAAW,GAAG,WAAW,CAAC;IAC/C,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB,CAAC;AAEF,MAAM,MAAM,sBAAsB,GAAG;IACnC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,CAAC;AAyBF,iBAAS,iBAAiB,CAAC,IAAI,EAAE,qBAAqB,GAAG,sBAAsB,CAuB9E;AAED;;;;;;GAMG;AACH,iBAAS,aAAa,IAAI,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAM/C;AAMD,eAAO,MAAM,GAAG;;;CAGf,CAAC;AAEF;;;;;;;;GAQG;AACH,wBAAgB,cAAc,IAAI,YAAY,CAiB7C"}