@gramatr/mcp 0.7.5 → 0.7.10

package/dist/hooks/lib/routing.js

@@ -1,4 +1,5 @@
-import { callMcpToolDetailed, resolveMcpUrl, saveLastClassification, } from './gramatr-hook-utils.js';
+import { setLatestClassification } from './hook-state.js';
+import { callTool } from '../../proxy/local-client.js';
 export const MIN_PROMPT_LENGTH = 10;
 export const TRIVIAL_PATTERNS = /^(hi|hey|hello|yo|ok|yes|no|thanks|thank you|sure|yep|nope|k|bye|quit|exit)\b/i;
 export function shouldSkipPromptRouting(prompt) {
@@ -6,23 +7,53 @@ export function shouldSkipPromptRouting(prompt) {
     return trimmed.length < MIN_PROMPT_LENGTH || TRIVIAL_PATTERNS.test(trimmed);
 }
 export async function routePrompt(options) {
-    const result = await callMcpToolDetailed('gramatr_route_request', {
+    const timeoutMs = options.timeoutMs ?? 15000;
+    const args = {
         prompt: options.prompt,
         ...(options.projectId ? { project_id: options.projectId } : {}),
         ...(options.sessionId ? { session_id: options.sessionId } : {}),
         ...(options.includeStatusline ? { include_statusline: true } : {}),
         ...(options.statuslineSize ? { statusline_size: options.statuslineSize } : {}),
-    }, options.timeoutMs ?? 15000);
-    return {
-        route: result.data,
-        error: result.error,
     };
+    try {
+        const timeoutPromise = new Promise((_, reject) => setTimeout(() => reject(new Error(`timeout after ${timeoutMs}ms`)), timeoutMs));
+        const raw = await Promise.race([
+            callTool('gramatr_route_request', args),
+            timeoutPromise,
+        ]);
+        const text = raw?.content?.[0]?.text;
+        if (!text) {
+            return { route: null, error: { reason: 'parse_error', detail: 'Empty response from proxy' } };
+        }
+        return { route: JSON.parse(text), error: null };
+    }
+    catch (error) {
+        const detail = error instanceof Error ? error.message : String(error);
+        if (detail.includes('timeout')) {
+            return { route: null, error: { reason: 'timeout', detail } };
+        }
+        if (detail.includes('401') || detail.toLowerCase().includes('unauthorized')) {
+            return { route: null, error: { reason: 'auth', detail } };
+        }
+        if (detail.includes('ECONNREFUSED') || detail.includes('fetch') || detail.includes('network')) {
+            return { route: null, error: { reason: 'network_error', detail } };
+        }
+        return { route: null, error: { reason: 'http_error', detail } };
+    }
 }
-export async function fetchEnrichment(enrichmentId, timeoutMs = 2000) {
+export async function fetchEnrichment(enrichmentId, timeoutMs = 5000) {
     try {
-        const result = await callMcpToolDetailed('gramatr_get_enrichment', { enrichment_id: enrichmentId, timeout_ms: timeoutMs }, timeoutMs + 1000);
-        if (result.data && result.data.status === 'ready') {
-            return result.data;
+        const timeoutPromise = new Promise((_, reject) => setTimeout(() => reject(new Error(`timeout after ${timeoutMs + 1000}ms`)), timeoutMs + 1000));
+        const raw = await Promise.race([
+            callTool('gramatr_get_enrichment', { enrichment_id: enrichmentId, timeout_ms: timeoutMs }),
+            timeoutPromise,
+        ]);
+        const text = raw?.content?.[0]?.text;
+        if (!text)
+            return null;
+        const result = JSON.parse(text);
+        if (result.status === 'ready') {
+            return result;
         }
         return null;
     }
@@ -48,7 +79,7 @@ export function describeRoutingFailure(error) {
             return {
                 title: 'Routing request could not reach the gramatr MCP endpoint.',
                 detail: error.detail,
-                action: `Verify connectivity to ${resolveMcpUrl()}.`,
+                action: 'Verify connectivity to the gramatr server (GRAMATR_URL env or ~/.gramatr.json).',
             };
         case 'http_error':
         case 'mcp_error':
@@ -58,27 +89,42 @@ export function describeRoutingFailure(error) {
             return {
                 title: 'Routing request failed before intelligence could be injected.',
                 detail: error.detail,
-                action: `Inspect the response from ${resolveMcpUrl()} and the gramatr_route_request handler.`,
+                action: 'Inspect the gramatr_route_request handler response. Check GRAMATR_URL and auth token.',
             };
     }
 }
 export function persistClassificationResult(options) {
-    saveLastClassification(options.rootDir, {
-        timestamp: new Date().toISOString(),
-        original_prompt: options.prompt,
-        effort_level: options.route?.classification?.effort_level || null,
-        intent_type: options.route?.classification?.intent_type || null,
-        confidence: options.route?.classification?.confidence ?? null,
-        memory_tier: options.route?.classification?.memory_tier || null,
-        memory_scope: options.route?.classification?.memory_scope
-            || options.route?.routing_signals?.memory_scope
-            || null,
-        classifier_model: options.route?.execution_summary?.classifier_model || null,
+    const packet1 = options.route?.packet_1;
+    const classification = packet1?.classification || options.route?.classification;
+    const executionSummary = packet1?.execution_summary || options.route?.execution_summary;
+    const routingSignals = packet1?.routing_signals || options.route?.routing_signals;
+    const tokenSavings = packet1?.token_savings || options.route?.token_savings;
+    const memoryContext = packet1?.memory_context || options.route?.memory_context;
+    setLatestClassification({
+        session_id: options.sessionId,
+        classifier_model: executionSummary?.classifier_model || null,
+        classifier_time_ms: executionSummary?.classifier_time_ms || null,
+        tokens_saved: tokenSavings?.total_saved || tokenSavings?.tokens_saved || 0,
+        savings_ratio: tokenSavings?.savings_ratio || null,
+        effort: classification?.effort_level || null,
+        intent: classification?.intent_type || null,
+        confidence: classification?.confidence ?? null,
+        memory_delivered: memoryContext?.results?.length || null,
         downstream_model: options.downstreamModel || null,
-        client_type: options.clientType,
-        agent_name: options.agentName,
+        server_version: executionSummary?.server_version || null,
+        stage_timing: executionSummary?.stage_timing
+            ? JSON.stringify(executionSummary.stage_timing)
+            : null,
+        recorded_at: Date.now(),
+        original_prompt: options.prompt,
         pending_feedback: true,
         feedback_submitted_at: null,
+        client_type: options.clientType,
+        agent_name: options.agentName,
+        memory_tier: classification?.memory_tier || null,
+        memory_scope: classification?.memory_scope
+            || routingSignals?.memory_scope
+            || null,
     });
 }
 //# sourceMappingURL=routing.js.map

package/dist/hooks/lib/routing.js.map

@@ -1 +1 @@
-{"version":3,"file":"routing.js","sourceRoot":"","sources":["../../../src/hooks/lib/routing.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"routing.js","sourceRoot":"","sources":["../../../src/hooks/lib/routing.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,uBAAuB,EAAE,MAAM,iBAAiB,CAAC;AAE1D,OAAO,EAAE,QAAQ,EAAE,MAAM,6BAA6B,CAAC;AAGvD,MAAM,CAAC,MAAM,iBAAiB,GAAG,EAAE,CAAC;AACpC,MAAM,CAAC,MAAM,gBAAgB,GAC3B,gFAAgF,CAAC;AAEnF,MAAM,UAAU,uBAAuB,CAAC,MAAc;IACpD,MAAM,OAAO,GAAG,MAAM,CAAC,IAAI,EAAE,CAAC;IAC9B,OAAO,OAAO,CAAC,MAAM,GAAG,iBAAiB,IAAI,gBAAgB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;AAC9E,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,WAAW,CAAC,OAOjC;IACC,MAAM,SAAS,GAAG,OAAO,CAAC,SAAS,IAAI,KAAK,CAAC;IAC7C,MAAM,IAAI,GAA4B;QACpC,MAAM,EAAE,OAAO,CAAC,MAAM;QACtB,GAAG,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,UAAU,EAAE,OAAO,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAC/D,GAAG,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,UAAU,EAAE,OAAO,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAC/D,GAAG,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAC,CAAC,EAAE,kBAAkB,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAClE,GAAG,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC,CAAC,EAAE,eAAe,EAAE,OAAO,CAAC,cAAc,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;KAC/E,CAAC;IAEF,IAAI,CAAC;QACH,MAAM,cAAc,GAAG,IAAI,OAAO,CAAQ,CAAC,CAAC,EAAE,MAAM,EAAE,EAAE,CACtD,UAAU,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,iBAAiB,SAAS,IAAI,CAAC,CAAC,EAAE,SAAS,CAAC,CAC/E,CAAC;QACF,MAAM,GAAG,GAAG,MAAM,OAAO,CAAC,IAAI,CAAC;YAC7B,QAAQ,CAAC,uBAAuB,EAAE,IAAI,CAAC;YACvC,cAAc;SACf,CAAwD,CAAC;QAE1D,MAAM,IAAI,GAAG,GAAG,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC;QACrC,IAAI,CAAC,IAAI,EAAE,CAAC;YACV,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,EAAE,2BAA2B,EAAE,EAAE,CAAC;QAChG,CAAC;QACD,OAAO,EAAE,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAkB,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC;IACnE,CAAC;IAAC,OAAO,KAAc,EAAE,CAAC;QACxB,MAAM,MAAM,GAAG,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QACtE,IAAI,MAAM,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE,CAAC;YAC/B,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,EAAE,CAAC;QAC/D,CAAC;QACD,IAAI,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,MAAM,CAAC,WAAW,EAAE,CAAC,QAAQ,CAAC,cAAc,CAAC,EAAE,CAAC;YAC5E,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE,CAAC;QAC5D,CAAC;QACD,IAAI,MAAM,CAAC,QAAQ,CAAC,cAAc,CAAC,IAAI,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,MAAM,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE,CAAC;YAC9F,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,EAAE,EAAE,CAAC;QACrE,CAAC;QACD,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,EAAE,CAAC;IAClE,CAAC;AACH,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,eAAe,CACnC,YAAoB,EACpB,YAAoB,IAAI;IAExB,IAAI,CAAC;QACH,MAAM,cAAc,GAAG,IAAI,OAAO,CAAQ,CAAC,CAAC,EAAE,MAAM,EAAE,EAAE,CACtD,UAAU,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,iBAAiB,SAAS,GAAG,IAAI,IAAI,CAAC,CAAC,EAAE,SAAS,GAAG,IAAI,CAAC,CAC7F,CAAC;QACF,MAAM,GAAG,GAAG,MAAM,OAAO,CAAC,IAAI,CAAC;YAC7B,QAAQ,CAAC,wBAAwB,EAAE,EAAE,aAAa,EAAE,YAAY,EAAE,UAAU,EAAE,SAAS,EAAE,CAAC;YAC1F,cAAc;SACf,CAAwD,CAAC;QAC1D,MAAM,IAAI,GAAG,GAAG,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC;QACrC,IAAI,CAAC,IAAI;YAAE,OAAO,IAAI,CAAC;QACvB,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAA4B,CAAC;QAC3D,IAAI,MAAM,CAAC,MAAM,KAAK,OAAO,EAAE,CAAC;YAC9B,OAAO,MAAM,CAAC;QAChB,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,IAAI,CAAC;IACd,CAAC;AACH,CAAC;AAED,MAAM,UAAU,sBAAsB,CAAC,KAAuB;IAK5D,QAAQ,KAAK,CAAC,MAAM,EAAE,CAAC;QACrB,KAAK,MAAM;YACT,OAAO;gBACL,KAAK,EAAE,+CAA+C;gBACtD,MAAM,EAAE,KAAK,CAAC,MAAM;gBACpB,MAAM,EAAE,0DAA0D;aACnE,CAAC;QACJ,KAAK,SAAS;YACZ,OAAO;gBACL,KAAK,EAAE,4BAA4B;gBACnC,MAAM,EAAE,KAAK,CAAC,MAAM;gBACpB,MAAM,EAAE,4DAA4D;aACrE,CAAC;QACJ,KAAK,eAAe;YAClB,OAAO;gBACL,KAAK,EAAE,2DAA2D;gBAClE,MAAM,EAAE,KAAK,CAAC,MAAM;gBACpB,MAAM,EAAE,iFAAiF;aAC1F,CAAC;QACJ,KAAK,YAAY,CAAC;QAClB,KAAK,WAAW,CAAC;QACjB,KAAK,aAAa,CAAC;QACnB,KAAK,SAAS,CAAC;QACf;YACE,OAAO;gBACL,KAAK,EAAE,+DAA+D;gBACtE,MAAM,EAAE,KAAK,CAAC,MAAM;gBACpB,MAAM,EAAE,uFAAuF;aAChG,CAAC;IACN,CAAC;AACH,CAAC;AAED,MAAM,UAAU,2BAA2B,CAAC,OAO3C;IACC,MAAM,OAAO,GAAG,OAAO,CAAC,KAAK,EAAE,QAAQ,CAAC;IACxC,MAAM,cAAc,GAAG,OAAO,EAAE,cAAc,IAAI,OAAO,CAAC,KAAK,EAAE,cAAc,CAAC;IAChF,MAAM,gBAAgB,GAAG,OAAO,EAAE,iBAAiB,IAAI,OAAO,CAAC,KAAK,EAAE,iBAAiB,CAAC;IACxF,MAAM,cAAc,GAAG,OAAO,EAAE,eAAe,IAAI,OAAO,CAAC,KAAK,EAAE,eAAe,CAAC;IAClF,MAAM,YAAY,GAAG,OAAO,EAAE,aAAa,IAAI,OAAO,CAAC,KAAK,EAAE,aAAa,CAAC;IAC5E,MAAM,aAAa,GAAG,OAAO,EAAE,cAAc,IAAI,OAAO,CAAC,KAAK,EAAE,cAAc,CAAC;IAC/E,uBAAuB,CAAC;QACtB,UAAU,EAAE,OAAO,CAAC,SAAS;QAC7B,gBAAgB,EAAE,gBAAgB,EAAE,gBAAgB,IAAI,IAAI;QAC5D,kBAAkB,EAAE,gBAAgB,EAAE,kBAAkB,IAAI,IAAI;QAChE,YAAY,EAAE,YAAY,EAAE,WAAW,IAAI,YAAY,EAAE,YAAY,IAAI,CAAC;QAC1E,aAAa,EAAE,YAAY,EAAE,aAAa,IAAI,IAAI;QAClD,MAAM,EAAE,cAAc,EAAE,YAAY,IAAI,IAAI;QAC5C,MAAM,EAAE,cAAc,EAAE,WAAW,IAAI,IAAI;QAC3C,UAAU,EAAE,cAAc,EAAE,UAAU,IAAI,IAAI;QAC9C,gBAAgB,EAAE,aAAa,EAAE,OAAO,EAAE,MAAM,IAAI,IAAI;QACxD,gBAAgB,EAAE,OAAO,CAAC,eAAe,IAAI,IAAI;QACjD,cAAc,EAAE,gBAAgB,EAAE,cAAc,IAAI,IAAI;QACxD,YAAY,EAAE,gBAAgB,EAAE,YAAY;YAC1C,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,gBAAgB,CAAC,YAAY,CAAC;YAC/C,CAAC,CAAC,IAAI;QACR,WAAW,EAAE,IAAI,CAAC,GAAG,EAAE;QACvB,eAAe,EAAE,OAAO,CAAC,MAAM;QAC/B,gBAAgB,EAAE,IAAI;QACtB,qBAAqB,EAAE,IAAI;QAC3B,WAAW,EAAE,OAAO,CAAC,UAAU;QAC/B,UAAU,EAAE,OAAO,CAAC,SAAS;QAC7B,WAAW,EAAE,cAAc,EAAE,WAAW,IAAI,IAAI;QAChD,YAAY,EAAE,cAAc,EAAE,YAAY;eACrC,cAAc,EAAE,YAAY;eAC5B,IAAI;KACV,CAAC,CAAC;AACL,CAAC"}

package/dist/hooks/lib/session-end.d.ts

@@ -10,6 +10,13 @@ export interface EndRemoteSessionOptions {
     projectId: string;
     summary: string;
     toolCallCount: number;
+    reason?: string;
+    gitBranch?: string;
+    gitRemote?: string;
+    clientType?: string;
+    agentName?: string;
+    startedAt?: string;
+    commitLog?: string | null;
 }
 export interface SessionEndResult {
     ok: boolean;

package/dist/hooks/lib/session-end.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"session-end.d.ts","sourceRoot":"","sources":["../../../src/hooks/lib/session-end.ts"],"names":[],"mappings":"AAEA,MAAM,WAAW,iBAAiB;IAChC,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,OAAO,EAAE,CAAC;CAClB;AAED,MAAM,WAAW,uBAAuB;IACtC,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;IAClB,aAAa,EAAE,MAAM,CAAC;IACtB,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,aAAa,EAAE,MAAM,CAAC;CACvB;AAED,MAAM,WAAW,gBAAgB;IAC/B,EAAE,EAAE,OAAO,CAAC;IACZ,QAAQ,EAAE,OAAO,CAAC;CACnB;AAED,wBAAsB,UAAU,CAAC,OAAO,EAAE,iBAAiB,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAWtF;AAED,wBAAsB,gBAAgB,CACpC,OAAO,EAAE,uBAAuB,GAC/B,OAAO,CAAC,gBAAgB,CAAC,CAc3B"}
+{"version":3,"file":"session-end.d.ts","sourceRoot":"","sources":["../../../src/hooks/lib/session-end.ts"],"names":[],"mappings":"AAEA,MAAM,WAAW,iBAAiB;IAChC,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,OAAO,EAAE,CAAC;CAClB;AAED,MAAM,WAAW,uBAAuB;IACtC,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;IAClB,aAAa,EAAE,MAAM,CAAC;IACtB,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,aAAa,EAAE,MAAM,CAAC;IAEtB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CAC3B;AAED,MAAM,WAAW,gBAAgB;IAC/B,EAAE,EAAE,OAAO,CAAC;IACZ,QAAQ,EAAE,OAAO,CAAC;CACnB;AAED,wBAAsB,UAAU,CAAC,OAAO,EAAE,iBAAiB,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAWtF;AAED,wBAAsB,gBAAgB,CACpC,OAAO,EAAE,uBAAuB,GAC/B,OAAO,CAAC,gBAAgB,CAAC,CAqB3B"}

package/dist/hooks/lib/session-end.js

@@ -1,21 +1,38 @@
-import { callMcpToolDetailed } from './gramatr-hook-utils.js';
+import { callTool } from '../../proxy/local-client.js';
 export async function flushTurns(options) {
-    const result = await callMcpToolDetailed('gramatr_batch_save_turns', {
-        session_id: options.sessionId,
-        project_id: options.projectId,
-        turns: options.turns,
-    }, 15000);
-    return { ok: result.data !== null, hadError: result.error !== null };
+    try {
+        await callTool('gramatr_batch_save_turns', {
+            session_id: options.sessionId,
+            project_id: options.projectId,
+            turns: options.turns,
+        });
+        return { ok: true, hadError: false };
+    }
+    catch {
+        return { ok: false, hadError: true };
+    }
 }
 export async function endRemoteSession(options) {
-    const result = await callMcpToolDetailed('gramatr_session_end', {
-        entity_id: options.entityId,
-        session_id: options.sessionId,
-        interaction_id: options.interactionId,
-        project_id: options.projectId,
-        summary: options.summary,
-        tool_call_count: options.toolCallCount,
-    }, 15000);
-    return { ok: result.data !== null, hadError: result.error !== null };
+    try {
+        await callTool('gramatr_session_end', {
+            entity_id: options.entityId,
+            session_id: options.sessionId,
+            interaction_id: options.interactionId,
+            project_id: options.projectId,
+            summary: options.summary,
+            tool_call_count: options.toolCallCount,
+            ...(options.reason !== undefined && { reason: options.reason }),
+            ...(options.gitBranch !== undefined && { git_branch: options.gitBranch }),
+            ...(options.gitRemote !== undefined && { git_remote: options.gitRemote }),
+            ...(options.clientType !== undefined && { client_type: options.clientType }),
+            ...(options.agentName !== undefined && { agent_name: options.agentName }),
+            ...(options.startedAt !== undefined && { started_at: options.startedAt }),
+            ...(options.commitLog !== undefined && { commit_log: options.commitLog }),
+        });
+        return { ok: true, hadError: false };
+    }
+    catch {
+        return { ok: false, hadError: true };
+    }
 }
 //# sourceMappingURL=session-end.js.map

package/dist/hooks/lib/session-end.js.map

@@ -1 +1 @@
-{"version":3,"file":"session-end.js","sourceRoot":"","sources":["../../../src/hooks/lib/session-end.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAsB9D,MAAM,CAAC,KAAK,UAAU,UAAU,CAAC,OAA0B;IACzD,MAAM,MAAM,GAAG,MAAM,mBAAmB,CACtC,0BAA0B,EAC1B;QACE,UAAU,EAAE,OAAO,CAAC,SAAS;QAC7B,UAAU,EAAE,OAAO,CAAC,SAAS;QAC7B,KAAK,EAAE,OAAO,CAAC,KAAK;KACrB,EACD,KAAK,CACN,CAAC;IACF,OAAO,EAAE,EAAE,EAAE,MAAM,CAAC,IAAI,KAAK,IAAI,EAAE,QAAQ,EAAE,MAAM,CAAC,KAAK,KAAK,IAAI,EAAE,CAAC;AACvE,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,gBAAgB,CACpC,OAAgC;IAEhC,MAAM,MAAM,GAAG,MAAM,mBAAmB,CACtC,qBAAqB,EACrB;QACE,SAAS,EAAE,OAAO,CAAC,QAAQ;QAC3B,UAAU,EAAE,OAAO,CAAC,SAAS;QAC7B,cAAc,EAAE,OAAO,CAAC,aAAa;QACrC,UAAU,EAAE,OAAO,CAAC,SAAS;QAC7B,OAAO,EAAE,OAAO,CAAC,OAAO;QACxB,eAAe,EAAE,OAAO,CAAC,aAAa;KACvC,EACD,KAAK,CACN,CAAC;IACF,OAAO,EAAE,EAAE,EAAE,MAAM,CAAC,IAAI,KAAK,IAAI,EAAE,QAAQ,EAAE,MAAM,CAAC,KAAK,KAAK,IAAI,EAAE,CAAC;AACvE,CAAC"}
+{"version":3,"file":"session-end.js","sourceRoot":"","sources":["../../../src/hooks/lib/session-end.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,6BAA6B,CAAC;AA8BvD,MAAM,CAAC,KAAK,UAAU,UAAU,CAAC,OAA0B;IACzD,IAAI,CAAC;QACH,MAAM,QAAQ,CAAC,0BAA0B,EAAE;YACzC,UAAU,EAAE,OAAO,CAAC,SAAS;YAC7B,UAAU,EAAE,OAAO,CAAC,SAAS;YAC7B,KAAK,EAAE,OAAO,CAAC,KAAK;SACrB,CAAC,CAAC;QACH,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC;IACvC,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;IACvC,CAAC;AACH,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,gBAAgB,CACpC,OAAgC;IAEhC,IAAI,CAAC;QACH,MAAM,QAAQ,CAAC,qBAAqB,EAAE;YACpC,SAAS,EAAE,OAAO,CAAC,QAAQ;YAC3B,UAAU,EAAE,OAAO,CAAC,SAAS;YAC7B,cAAc,EAAE,OAAO,CAAC,aAAa;YACrC,UAAU,EAAE,OAAO,CAAC,SAAS;YAC7B,OAAO,EAAE,OAAO,CAAC,OAAO;YACxB,eAAe,EAAE,OAAO,CAAC,aAAa;YACtC,GAAG,CAAC,OAAO,CAAC,MAAM,KAAK,SAAS,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,MAAM,EAAE,CAAC;YAC/D,GAAG,CAAC,OAAO,CAAC,SAAS,KAAK,SAAS,IAAI,EAAE,UAAU,EAAE,OAAO,CAAC,SAAS,EAAE,CAAC;YACzE,GAAG,CAAC,OAAO,CAAC,SAAS,KAAK,SAAS,IAAI,EAAE,UAAU,EAAE,OAAO,CAAC,SAAS,EAAE,CAAC;YACzE,GAAG,CAAC,OAAO,CAAC,UAAU,KAAK,SAAS,IAAI,EAAE,WAAW,EAAE,OAAO,CAAC,UAAU,EAAE,CAAC;YAC5E,GAAG,CAAC,OAAO,CAAC,SAAS,KAAK,SAAS,IAAI,EAAE,UAAU,EAAE,OAAO,CAAC,SAAS,EAAE,CAAC;YACzE,GAAG,CAAC,OAAO,CAAC,SAAS,KAAK,SAAS,IAAI,EAAE,UAAU,EAAE,OAAO,CAAC,SAAS,EAAE,CAAC;YACzE,GAAG,CAAC,OAAO,CAAC,SAAS,KAAK,SAAS,IAAI,EAAE,UAAU,EAAE,OAAO,CAAC,SAAS,EAAE,CAAC;SAC1E,CAAC,CAAC;QACH,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC;IACvC,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;IACvC,CAAC;AACH,CAAC"}

package/dist/hooks/lib/session.d.ts

@@ -8,36 +8,15 @@ export interface PreparedProjectSession {
     hasRestoreContext: boolean;
     created: boolean;
 }
-export interface CurrentProjectContextPayload {
-    type: 'git_project' | 'non_git';
-    session_id: string;
-    project_name: string;
-    working_directory: string;
-    session_start: string;
-    gramatr_config_path: string;
-    project_entity_id: string | null;
-    action_required: string;
-    project_id?: string;
-    git_root?: string;
-    git_branch?: string;
-    git_commit?: string;
-    git_remote?: string;
-    restore_needed?: boolean;
-}
-export declare function getSharedStateDir(): string;
-export declare function getCurrentProjectContextPath(): string;
-export declare function getLastSessionCommitsPath(): string;
-export declare function getSessionHistoryLogPath(): string;
 export declare function normalizeSessionStartResponse(response: SessionStartResponse | null | undefined): {
     interactionId: string | null;
     entityId: string | null;
     resumed: boolean;
     handoffContext: string | null;
+    recentSessions: import('./types.js').RemoteSessionRecord[];
 };
 export declare function prepareProjectSessionState(options: {
     git: GitContext;
-    sessionId: string;
-    transcriptPath: string;
 }): PreparedProjectSession;
 export declare function startRemoteSession(options: {
     clientType: string;
@@ -45,24 +24,14 @@ export declare function startRemoteSession(options: {
     projectId: string;
     projectName?: string;
     gitRemote: string;
+    gitBranch?: string;
     directory: string;
 }): Promise<SessionStartResponse | null>;
 export declare function loadProjectHandoff(projectId: string): Promise<HandoffResponse | null>;
+/**
+ * Persist the server-resolved project_id back to settings.json.
+ * The server may assign a stable UUID the first time a project is registered;
+ * storing it locally ensures all subsequent sessions use the same ID.
+ */
 export declare function persistSessionRegistration(rootDir: string, response: SessionStartResponse | null): GmtrConfig | null;
-export declare function writeCurrentProjectContextFile(payload: CurrentProjectContextPayload): void;
-export declare function buildGitProjectContextPayload(options: {
-    git: GitContext;
-    sessionId: string;
-    workingDirectory: string;
-    sessionStart: string;
-    projectId: string;
-    projectEntityId: string | null;
-    restoreNeeded: boolean;
-}): CurrentProjectContextPayload;
-export declare function buildNonGitProjectContextPayload(options: {
-    cwd: string;
-    sessionId: string;
-    sessionStart: string;
-    projectEntityId: string | null;
-}): CurrentProjectContextPayload;
 //# sourceMappingURL=session.d.ts.map

package/dist/hooks/lib/session.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"session.d.ts","sourceRoot":"","sources":["../../../src/hooks/lib/session.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"session.d.ts","sourceRoot":"","sources":["../../../src/hooks/lib/session.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,KAAK,UAAU,EACf,KAAK,UAAU,EAKhB,MAAM,yBAAyB,CAAC;AAEjC,OAAO,KAAK,EAAE,eAAe,EAAE,oBAAoB,EAAE,MAAM,YAAY,CAAC;AAGxE,MAAM,WAAW,sBAAsB;IACrC,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,UAAU,CAAC;IACnB,eAAe,EAAE,MAAM,GAAG,IAAI,CAAC;IAC/B,aAAa,EAAE,OAAO,CAAC;IACvB,iBAAiB,EAAE,OAAO,CAAC;IAC3B,OAAO,EAAE,OAAO,CAAC;CAClB;AAED,wBAAgB,6BAA6B,CAC3C,QAAQ,EAAE,oBAAoB,GAAG,IAAI,GAAG,SAAS,GAChD;IACD,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,OAAO,EAAE,OAAO,CAAC;IACjB,cAAc,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,cAAc,EAAE,OAAO,YAAY,EAAE,mBAAmB,EAAE,CAAC;CAC5D,CAQA;AAED,wBAAgB,0BAA0B,CAAC,OAAO,EAAE;IAClD,GAAG,EAAE,UAAU,CAAC;CACjB,GAAG,sBAAsB,CA2CzB;AAED,wBAAsB,kBAAkB,CAAC,OAAO,EAAE;IAChD,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;CACnB,GAAG,OAAO,CAAC,oBAAoB,GAAG,IAAI,CAAC,CAgBvC;AAED,wBAAsB,kBAAkB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,eAAe,GAAG,IAAI,CAAC,CAW3F;AAED;;;;GAIG;AACH,wBAAgB,0BAA0B,CAAC,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,oBAAoB,GAAG,IAAI,GAAG,UAAU,GAAG,IAAI,CAcpH"}

package/dist/hooks/lib/session.js

@@ -1,29 +1,17 @@
-import { existsSync, mkdirSync, writeFileSync } from 'fs';
-import { basename, join } from 'path';
-import { callMcpTool, createDefaultConfig, deriveProjectId, migrateConfig, now, readGmtrConfig, writeGmtrConfig, } from './gramatr-hook-utils.js';
-import { getGramatrDirFromEnv, getHomeDir } from '../../config-runtime.js';
-export function getSharedStateDir() {
-    return join(getGramatrDirFromEnv() || join(getHomeDir(), '.gramatr'), '.state');
-}
-export function getCurrentProjectContextPath() {
-    return join(getSharedStateDir(), 'current-project-context.json');
-}
-export function getLastSessionCommitsPath() {
-    return join(getSharedStateDir(), 'last-session-commits.txt');
-}
-export function getSessionHistoryLogPath() {
-    return join(getSharedStateDir(), 'session-history.log');
-}
+import { createDefaultConfig, deriveProjectId, migrateConfig, now, readGmtrConfig, writeGmtrConfig, } from './gramatr-hook-utils.js';
+import { callTool } from '../../proxy/local-client.js';
+import { migrateProjectId } from './hook-state.js';
 export function normalizeSessionStartResponse(response) {
     return {
         interactionId: response?.interaction_id || response?.interactionId || null,
         entityId: response?.entity_id || response?.entityId || null,
         resumed: response?.interaction_resumed === true || response?.interactionResumed === true,
         handoffContext: response?.handoff_context || response?.handoffContext || null,
+        recentSessions: response?.recent_sessions ?? [],
     };
 }
 export function prepareProjectSessionState(options) {
-    const { git, sessionId, transcriptPath } = options;
+    const { git } = options;
     const timestamp = now();
     let config = readGmtrConfig(git.root);
     let created = false;
@@ -33,7 +21,6 @@ export function prepareProjectSessionState(options) {
     const projectId = existingProjectId || deriveProjectId(git.remote, git.projectName);
     if (config) {
         config = migrateConfig(config, projectId);
-        config.last_session_id = sessionId;
         config.project_id = projectId;
         // Store reference metadata alongside the project_id so we can
         // reconnect to the right project even if the UUID is opaque.
@@ -42,15 +29,6 @@ export function prepareProjectSessionState(options) {
             local_path: git.root,
             display_name: git.projectName,
         };
-        config.current_session = {
-            ...config.current_session,
-            session_id: sessionId,
-            transcript_path: transcriptPath,
-            last_updated: timestamp,
-            token_limit: 200000,
-        };
-        config.continuity_stats = config.continuity_stats || {};
-        config.continuity_stats.total_sessions = (config.continuity_stats.total_sessions || 0) + 1;
         config.metadata = config.metadata || {};
         config.metadata.updated = timestamp;
     }
@@ -59,8 +37,6 @@ export function prepareProjectSessionState(options) {
             projectId,
             projectName: git.projectName,
             gitRemote: git.remote,
-            sessionId,
-            transcriptPath,
         });
         created = true;
     }
@@ -75,74 +51,54 @@ export function prepareProjectSessionState(options) {
     };
 }
 export async function startRemoteSession(options) {
-    return (await callMcpTool('gramatr_session_start', {
-        client_type: options.clientType,
-        project_id: options.projectId,
-        ...(options.projectName ? { project_name: options.projectName } : {}),
-        git_remote: options.gitRemote,
-        directory: options.directory,
-        ...(options.sessionId ? { session_id: options.sessionId } : {}),
-    }, 15000));
+    try {
+        const raw = await callTool('gramatr_session_start', {
+            client_type: options.clientType,
+            project_id: options.projectId,
+            ...(options.projectName ? { project_name: options.projectName } : {}),
+            git_remote: options.gitRemote,
+            ...(options.gitBranch ? { git_branch: options.gitBranch } : {}),
+            directory: options.directory,
+            ...(options.sessionId ? { session_id: options.sessionId } : {}),
+        });
+        const text = raw?.content?.[0]?.text;
+        return text ? JSON.parse(text) : null;
+    }
+    catch {
+        return null;
+    }
 }
 export async function loadProjectHandoff(projectId) {
-    return (await callMcpTool('gramatr_load_handoff', { project_id: projectId }, 15000));
+    try {
+        const raw = await callTool('gramatr_load_handoff', { project_id: projectId });
+        const text = raw?.content?.[0]?.text;
+        return text ? JSON.parse(text) : null;
+    }
+    catch {
+        return null;
+    }
 }
+/**
+ * Persist the server-resolved project_id back to settings.json.
+ * The server may assign a stable UUID the first time a project is registered;
+ * storing it locally ensures all subsequent sessions use the same ID.
+ */
 export function persistSessionRegistration(rootDir, response) {
-    const normalized = normalizeSessionStartResponse(response);
-    if (!normalized.interactionId && !normalized.entityId)
-        return readGmtrConfig(rootDir);
     const config = readGmtrConfig(rootDir);
     if (!config)
         return null;
-    config.current_session = config.current_session || {};
-    if (normalized.interactionId)
-        config.current_session.interaction_id = normalized.interactionId;
-    if (normalized.entityId)
-        config.current_session.gramatr_entity_id = normalized.entityId;
-    // Persist server-resolved project_id (may be a UUID assigned by the server).
-    // This is the key migration point: once the server returns a UUID, we store
-    // it locally so all subsequent sessions use the stable ID.
     if (response?.project_id && response.project_id !== config.project_id) {
+        const oldProjectId = config.project_id;
         config.project_id = response.project_id;
+        writeGmtrConfig(rootDir, config);
+        // Backfill local session_log rows so count/lookup queries use the stable UUID
+        if (oldProjectId) {
+            try {
+                migrateProjectId(oldProjectId, response.project_id);
+            }
+            catch { /* non-critical */ }
+        }
     }
-    writeGmtrConfig(rootDir, config);
     return config;
 }
-export function writeCurrentProjectContextFile(payload) {
-    const stateDir = getSharedStateDir();
-    if (!existsSync(stateDir))
-        mkdirSync(stateDir, { recursive: true });
-    const contextFile = getCurrentProjectContextPath();
-    writeFileSync(contextFile, JSON.stringify(payload, null, 2) + '\n');
-}
-export function buildGitProjectContextPayload(options) {
-    return {
-        type: 'git_project',
-        session_id: options.sessionId,
-        project_name: options.git.projectName,
-        project_id: options.projectId,
-        git_root: options.git.root,
-        git_branch: options.git.branch,
-        git_commit: options.git.commit,
-        git_remote: options.git.remote,
-        working_directory: options.workingDirectory,
-        session_start: options.sessionStart,
-        gramatr_config_path: join(options.git.root, '.gramatr', 'settings.json'),
-        project_entity_id: options.projectEntityId,
-        restore_needed: options.restoreNeeded,
-        action_required: 'check_or_create_project_entity',
-    };
-}
-export function buildNonGitProjectContextPayload(options) {
-    return {
-        type: 'non_git',
-        session_id: options.sessionId,
-        project_name: basename(options.cwd),
-        working_directory: options.cwd,
-        session_start: options.sessionStart,
-        gramatr_config_path: join(options.cwd, '.gramatr', 'settings.json'),
-        project_entity_id: options.projectEntityId,
-        action_required: 'gramatr_init_needed',
-    };
-}
 //# sourceMappingURL=session.js.map

package/dist/hooks/lib/session.js.map

@@ -1 +1 @@
-{"version":3,"file":"session.js","sourceRoot":"","sources":["../../../src/hooks/lib/session.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"session.js","sourceRoot":"","sources":["../../../src/hooks/lib/session.ts"],"names":[],"mappings":"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"}