@j0hanz/cortex-mcp 1.6.0 → 1.7.0

package/dist/engine/context.d.ts

@@ -1,5 +1,4 @@
 export interface EngineContext {
     readonly sessionId: string;
-    readonly abortSignal?: AbortSignal;
 }
 export declare function runWithContext<T>(ctx: EngineContext, fn: () => T): T;

package/dist/engine/events.d.ts

@@ -26,6 +26,12 @@ interface EngineEvents {
         sessionId: string;
         level: ReasoningLevel;
     }];
+    'session:completed': [{
+        sessionId: string;
+    }];
+    'session:cancelled': [{
+        sessionId: string;
+    }];
     'session:expired': [{
         sessionId: string;
     }];

package/dist/engine/reasoner.js

@@ -20,7 +20,7 @@ export async function reason(query, level, options) {
     const session = resolveSession(level, sessionId, query, targetThoughts);
     const config = getLevelConfig(session.level);
     const { totalThoughts } = session;
-    return runWithContext({ sessionId: session.id, ...(abortSignal ? { abortSignal } : {}) }, () => withSessionLock(session.id, async () => {
+    return runWithContext({ sessionId: session.id }, () => withSessionLock(session.id, async () => {
         throwIfReasoningAborted(abortSignal);
         if (rollbackToStep !== undefined) {
             sessionStore.rollback(session.id, rollbackToStep);
@@ -53,7 +53,7 @@ export async function reason(query, level, options) {
             content: addedThought.content,
         });
         const updated = getSessionOrThrow(session.id);
-        void emitBudgetExhaustedIfNeeded({
+        emitBudgetExhaustedIfNeeded({
             session: updated,
             tokenBudget: config.tokenBudget,
             generatedThoughts: addedThought.index + 1,
@@ -129,7 +129,7 @@ function resolveSession(level, sessionId, query, targetThoughts) {
     }
     const config = getLevelConfig(level);
     const totalThoughts = resolveThoughtCount(level, query, config, targetThoughts);
-    const session = sessionStore.create(level, totalThoughts);
+    const session = sessionStore.create(level, totalThoughts, query);
     engineEvents.emit('session:created', {
         sessionId: session.id,
         level,

package/dist/engine/session-store.d.ts

@@ -16,7 +16,7 @@ export declare class SessionStore {
     constructor(ttlMs?: number, maxSessions?: number, maxTotalTokens?: number);
     ensureCleanupTimer(): void;
     dispose(): void;
-    create(level: ReasoningLevel, totalThoughts?: number): Readonly<Session>;
+    create(level: ReasoningLevel, totalThoughts?: number, query?: string): Readonly<Session>;
     get(id: string): Readonly<Session> | undefined;
     getSummary(id: string): Readonly<SessionSummary> | undefined;
     list(): Readonly<Session>[];
@@ -28,7 +28,7 @@ export declare class SessionStore {
     delete(id: string): boolean;
     addThought(sessionId: string, content: string, stepSummary?: string): Thought;
     rollback(sessionId: string, toIndex: number): void;
-    reviseThought(sessionId: string, thoughtIndex: number, content: string): Thought;
+    reviseThought(sessionId: string, thoughtIndex: number, content: string, stepSummary?: string): Thought;
     markCompleted(sessionId: string): void;
     markCancelled(sessionId: string): void;
     private updateSessionStatus;
@@ -49,9 +49,9 @@ export declare class SessionStore {
     private snapshotThought;
     private snapshotSession;
     private snapshotSessionSummary;
-    private emitSessionsListChanged;
-    private emitSessionsResourceUpdated;
-    private emitSessionsCollectionUpdated;
+    private emitListChanged;
+    private emitListResourceUpdated;
+    private emitCollectionUpdated;
     private emitSessionEvicted;
-    private emitSessionResourcesUpdated;
+    private emitSessionResourceUpdated;
 }

package/dist/engine/session-store.js

@@ -1,11 +1,12 @@
 import { Buffer } from 'node:buffer';
 import { randomUUID } from 'node:crypto';
+import { SessionNotFoundError } from '../lib/errors.js';
 import { getLevelConfig } from './config.js';
 import { engineEvents } from './events.js';
 export const DEFAULT_SESSION_TTL_MS = 30 * 60 * 1000; // 30 minutes
 export const DEFAULT_MAX_SESSIONS = 100;
 export const DEFAULT_MAX_TOTAL_TOKENS = 500_000;
-const TOKEN_ESTIMATE_DIVISOR = 4;
+const TOKEN_ESTIMATE_DIVISOR = 3.5;
 const MIN_SWEEP_INTERVAL_MS = 10;
 const MAX_SWEEP_INTERVAL_MS = 60_000;
 function estimateTokens(text) {
@@ -52,7 +53,7 @@ export class SessionStore {
         clearInterval(this.cleanupInterval);
         this.cleanupInterval = undefined;
     }
-    create(level, totalThoughts) {
+    create(level, totalThoughts, query) {
         this.evictIfAtCapacity();
         const config = getLevelConfig(level);
         const now = Date.now();
@@ -66,12 +67,13 @@ export class SessionStore {
             tokensUsed: 0,
             createdAt: now,
             updatedAt: now,
+            ...(query !== undefined ? { query } : {}),
         };
         this.sessions.set(session.id, session);
         this.addToOrder(session.id);
         this.sortedSessionIdsCache = null;
-        this.emitSessionsListChanged();
-        this.emitSessionsResourceUpdated();
+        this.emitListChanged();
+        this.emitListResourceUpdated();
         return this.snapshotSession(session);
     }
     get(id) {
@@ -111,13 +113,13 @@ export class SessionStore {
             return false;
         }
         engineEvents.emit('session:deleted', { sessionId: id });
-        this.emitSessionsCollectionUpdated();
+        this.emitCollectionUpdated();
         return true;
     }
     addThought(sessionId, content, stepSummary) {
         const session = this.sessions.get(sessionId);
         if (!session) {
-            throw new Error(`Session not found: ${sessionId}`);
+            throw new SessionNotFoundError(sessionId);
         }
         const tokens = estimateTokens(content);
         this.evictForTokenHeadroom(tokens, sessionId);
@@ -137,7 +139,7 @@ export class SessionStore {
     rollback(sessionId, toIndex) {
         const session = this.sessions.get(sessionId);
         if (!session) {
-            throw new Error(`Session not found: ${sessionId}`);
+            throw new SessionNotFoundError(sessionId);
         }
         // If toIndex is out of bounds or implies no change, return.
         // We keep thoughts up to and including toIndex.
@@ -154,10 +156,10 @@ export class SessionStore {
         this.totalTokens -= removedTokens;
         this.markSessionTouched(session);
     }
-    reviseThought(sessionId, thoughtIndex, content) {
+    reviseThought(sessionId, thoughtIndex, content, stepSummary) {
         const session = this.sessions.get(sessionId);
         if (!session) {
-            throw new Error(`Session not found: ${sessionId}`);
+            throw new SessionNotFoundError(sessionId);
         }
         const existing = session.thoughts[thoughtIndex];
         if (!existing) {
@@ -169,13 +171,14 @@ export class SessionStore {
         if (delta > 0) {
             this.evictForTokenHeadroom(delta, sessionId);
         }
+        const effectiveStepSummary = stepSummary ?? existing.stepSummary;
         const revised = {
             index: thoughtIndex,
             content,
             revision: existing.revision + 1,
             tokenCount: newTokens,
-            ...(existing.stepSummary !== undefined
-                ? { stepSummary: existing.stepSummary }
+            ...(effectiveStepSummary !== undefined
+                ? { stepSummary: effectiveStepSummary }
                 : {}),
         };
         session.thoughts[thoughtIndex] = revised;
@@ -202,6 +205,12 @@ export class SessionStore {
         if (session?.status === 'active') {
             session.status = status;
             this.markSessionTouched(session);
+            if (status === 'completed') {
+                engineEvents.emit('session:completed', { sessionId });
+            }
+            else {
+                engineEvents.emit('session:cancelled', { sessionId });
+            }
         }
     }
     evictIfAtCapacity() {
@@ -254,7 +263,7 @@ export class SessionStore {
             currentId = nextId;
         }
         if (changed) {
-            this.emitSessionsCollectionUpdated();
+            this.emitCollectionUpdated();
         }
     }
     buildSortedSessionIdsCache() {
@@ -362,7 +371,7 @@ export class SessionStore {
         session._cachedSummary = undefined;
         this.touchOrder(session.id);
         this.sortedSessionIdsCache = null;
-        this.emitSessionResourcesUpdated(session.id);
+        this.emitSessionResourceUpdated(session.id);
     }
     getSessionIdsForIteration() {
         this.sortedSessionIdsCache ??= this.buildSortedSessionIdsCache();
@@ -405,6 +414,7 @@ export class SessionStore {
             tokensUsed: session.tokensUsed,
             createdAt: session.createdAt,
             updatedAt: session.updatedAt,
+            ...(session.query !== undefined ? { query: session.query } : {}),
         };
         Object.freeze(snapshot);
         Object.freeze(snapshot.thoughts);
@@ -430,27 +440,27 @@ export class SessionStore {
         session._cachedSummary = summary;
         return summary;
     }
-    emitSessionsListChanged() {
+    emitListChanged() {
         engineEvents.emit('resources:changed', { uri: 'reasoning://sessions' });
     }
-    emitSessionsResourceUpdated() {
+    emitListResourceUpdated() {
         engineEvents.emit('resource:updated', { uri: 'reasoning://sessions' });
     }
-    emitSessionsCollectionUpdated() {
-        this.emitSessionsListChanged();
-        this.emitSessionsResourceUpdated();
+    emitCollectionUpdated() {
+        this.emitListChanged();
+        this.emitListResourceUpdated();
     }
     emitSessionEvicted(sessionId, reason) {
         engineEvents.emit('session:evicted', {
             sessionId,
             reason,
         });
-        this.emitSessionsCollectionUpdated();
+        this.emitCollectionUpdated();
     }
-    emitSessionResourcesUpdated(sessionId) {
+    emitSessionResourceUpdated(sessionId) {
         engineEvents.emit('resource:updated', {
             uri: `reasoning://sessions/${sessionId}`,
         });
-        this.emitSessionsResourceUpdated();
+        this.emitListResourceUpdated();
     }
 }

package/dist/lib/tool-contracts.js

@@ -79,7 +79,7 @@ const TOOL_CONTRACTS = [
                 constraints: 'optional',
             },
         ],
-        outputShape: '{ok, result: {sessionId, level, status, thoughts[], generatedThoughts, requestedThoughts, totalThoughts, remainingThoughts, tokenBudget, tokensUsed, ttlMs, expiresAt, createdAt, updatedAt, summary}}',
+        outputShape: '{ok, result: {sessionId, query?, level, status, thoughts[], generatedThoughts, requestedThoughts, totalThoughts, remainingThoughts, tokenBudget, tokensUsed, ttlMs, expiresAt, createdAt, updatedAt, summary}}',
     },
 ];
 export function getToolContracts() {

package/dist/lib/types.d.ts

@@ -40,6 +40,7 @@ export interface Thought {
 }
 export interface Session extends SessionBase {
     readonly thoughts: readonly Thought[];
+    readonly query?: string;
 }
 export interface SessionSummary extends SessionBase {
     readonly generatedThoughts: number;

package/dist/schemas/outputs.d.ts

@@ -3,6 +3,7 @@ declare const ReasoningThinkSuccessSchema: z.ZodObject<{
     ok: z.ZodLiteral<true>;
     result: z.ZodObject<{
         sessionId: z.ZodString;
+        query: z.ZodOptional<z.ZodString>;
         level: z.ZodEnum<{
             basic: "basic";
             normal: "normal";
@@ -40,6 +41,7 @@ export declare const ReasoningThinkToolOutputSchema: z.ZodObject<{
     ok: z.ZodBoolean;
     result: z.ZodOptional<z.ZodObject<{
         sessionId: z.ZodString;
+        query: z.ZodOptional<z.ZodString>;
         level: z.ZodEnum<{
             basic: "basic";
             normal: "normal";
@@ -90,6 +92,7 @@ export declare const ReasoningThinkResultSchema: z.ZodUnion<readonly [z.ZodObjec
     ok: z.ZodLiteral<true>;
     result: z.ZodObject<{
         sessionId: z.ZodString;
+        query: z.ZodOptional<z.ZodString>;
         level: z.ZodEnum<{
             basic: "basic";
             normal: "normal";

package/dist/schemas/outputs.js

@@ -19,6 +19,10 @@ const ReasoningThinkSuccessSchema = z.strictObject({
     ok: z.literal(true),
     result: z.strictObject({
         sessionId: z.string(),
+        query: z
+            .string()
+            .optional()
+            .describe('Original query text for this session.'),
         level: z.enum(REASONING_LEVELS),
         status: z.enum(SESSION_STATUSES),
         thoughts: z.array(ThoughtSchema),

package/dist/server.js

@@ -121,9 +121,22 @@ function attachEngineEventHandlers(server) {
             process.stderr.write(`[cortex-mcp.server] Failed to log budget_exhausted: ${getErrorMessage(err)}\n`);
         });
     };
+    const onSessionLifecycle = (data) => {
+        void server.server.sendResourceListChanged().catch((err) => {
+            logNotificationFailure(RESOURCE_LIST_CHANGED_METHOD, err, {
+                sessionId: data.sessionId,
+            });
+        });
+    };
     engineEvents.on('resources:changed', onResourcesChanged);
     engineEvents.on('resource:updated', onResourceUpdated);
     engineEvents.on('thought:budget-exhausted', onBudgetExhausted);
+    engineEvents.on('session:created', onSessionLifecycle);
+    engineEvents.on('session:completed', onSessionLifecycle);
+    engineEvents.on('session:cancelled', onSessionLifecycle);
+    engineEvents.on('session:expired', onSessionLifecycle);
+    engineEvents.on('session:evicted', onSessionLifecycle);
+    engineEvents.on('session:deleted', onSessionLifecycle);
     let detached = false;
     return () => {
         if (detached) {
@@ -133,6 +146,12 @@ function attachEngineEventHandlers(server) {
         engineEvents.off('resources:changed', onResourcesChanged);
         engineEvents.off('resource:updated', onResourceUpdated);
         engineEvents.off('thought:budget-exhausted', onBudgetExhausted);
+        engineEvents.off('session:created', onSessionLifecycle);
+        engineEvents.off('session:completed', onSessionLifecycle);
+        engineEvents.off('session:cancelled', onSessionLifecycle);
+        engineEvents.off('session:expired', onSessionLifecycle);
+        engineEvents.off('session:evicted', onSessionLifecycle);
+        engineEvents.off('session:deleted', onSessionLifecycle);
     };
 }
 function installCloseCleanup(server, cleanup) {

package/dist/tools/reasoning-think.js

@@ -27,7 +27,7 @@ function buildTraceResource(session) {
         }
         : session;
     return {
-        uri: `file:///cortex/sessions/${session.id}/trace.md`,
+        uri: `reasoning://sessions/${session.id}/trace.md`,
         mimeType: 'text/markdown',
         text: formatThoughtsToMarkdown(sessionView),
     };
@@ -86,7 +86,7 @@ function isReasoningTaskExtra(value) {
     }
     return true;
 }
-function parseReasoningTaskExtra(rawExtra) {
+function assertReasoningTaskExtra(rawExtra) {
     if (!isReasoningTaskExtra(rawExtra)) {
         throw new Error('Invalid task context in request handler.');
     }
@@ -241,6 +241,7 @@ function buildStructuredResult(session, generatedThoughts, targetThoughts) {
         ok: true,
         result: {
             sessionId: session.id,
+            ...(session.query !== undefined ? { query: session.query } : {}),
             level: session.level,
             status: session.status,
             thoughts: [...session.thoughts],
@@ -260,7 +261,7 @@ function buildStructuredResult(session, generatedThoughts, targetThoughts) {
 }
 function buildSummary(session, remainingThoughts) {
     if (session.status === 'completed') {
-        return `Reasoning complete — ${String(session.thoughts.length)} thoughts at [${session.level}] level. Session ${session.id}.`;
+        return `Reasoning complete — ${String(session.thoughts.length)} thought${session.thoughts.length === 1 ? '' : 's'} at [${session.level}] level. Session ${session.id}.`;
     }
     if (session.status === 'cancelled') {
         return `Reasoning cancelled at thought ${String(session.thoughts.length)}/${String(session.totalThoughts)}. Session ${session.id}.`;
@@ -354,7 +355,7 @@ function createProgressHandler(args) {
         const message = formatProgressMessage({
             toolName: `꩜ ${TOOL_NAME}`,
             context: 'Thought',
-            metadata: `[${String(displayProgress)}/${String(batchTotal)}]${summary ? ` ${summary}` : ''}`,
+            ...(summary ? { metadata: summary } : {}),
             ...(isTerminal ? { outcome: 'complete' } : {}),
         });
         await notifyProgress({
@@ -569,7 +570,7 @@ async function runReasoningTask(args) {
 }
 function getTaskId(extra) {
     if (typeof extra.taskId !== 'string' || extra.taskId.length === 0) {
-        throw new Error('Task ID missing in request context.');
+        throw new InvalidRunModeArgsError('Task ID missing in request context.');
     }
     return extra.taskId;
 }
@@ -612,7 +613,7 @@ Protocol validation: malformed task metadata/arguments fail at request level bef
                 throw new Error(`Invalid reasoning_think params: ${parseResult.error.message}`);
             }
             const params = parseResult.data;
-            const extra = parseReasoningTaskExtra(rawExtra);
+            const extra = assertReasoningTaskExtra(rawExtra);
             const progressToken = extra._meta?.progressToken;
             if (!reasoningTaskLimiter.tryAcquire()) {
                 throw new ServerBusyError();
@@ -649,11 +650,11 @@ Protocol validation: malformed task metadata/arguments fail at request level bef
             return { task };
         },
         getTask(_params, rawExtra) {
-            const extra = parseReasoningTaskExtra(rawExtra);
+            const extra = assertReasoningTaskExtra(rawExtra);
             return extra.taskStore.getTask(getTaskId(extra));
         },
         async getTaskResult(_params, rawExtra) {
-            const extra = parseReasoningTaskExtra(rawExtra);
+            const extra = assertReasoningTaskExtra(rawExtra);
             const result = await extra.taskStore.getTaskResult(getTaskId(extra));
             assertCallToolResult(result);
             return result;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@j0hanz/cortex-mcp",
-  "version": "1.6.0",
+  "version": "1.7.0",
   "mcpName": "io.github.j0hanz/cortex-mcp",
   "author": "Johanz",
   "license": "MIT",