@jait/gateway 0.1.477 → 0.1.481

package/dist/routes/channels.js

@@ -0,0 +1,77 @@
+/**
+ * Channel management REST routes.
+ *
+ * GET    /api/channels            — list channels with status + QR
+ * GET    /api/channels/:id/status — current status + QR (for polling during linking)
+ * POST   /api/channels/:id/start  — start/link a channel
+ * POST   /api/channels/:id/stop   — stop a channel
+ * PATCH  /api/channels/:id/config — update channel config (allowed senders, tools, …)
+ */
+import { requireAuth } from "../security/http-auth.js";
+export function registerChannelRoutes(app, config, channelManager) {
+    async function requireChannelAuth(req, reply) {
+        return requireAuth(req, reply, config.jwtSecret);
+    }
+    /** List channels + status. */
+    app.get("/api/channels", async (req, reply) => {
+        const authUser = await requireChannelAuth(req, reply);
+        if (!authUser)
+            return;
+        return channelManager.list();
+    });
+    /** Poll status + QR for one channel (used by the linking UI). */
+    app.get("/api/channels/:id/status", async (req, reply) => {
+        const authUser = await requireChannelAuth(req, reply);
+        if (!authUser)
+            return;
+        const managed = channelManager.get(req.params.id);
+        if (!managed)
+            return reply.status(404).send({ error: "Channel not found" });
+        return {
+            id: managed.connector.id,
+            status: managed.status,
+            qr: managed.detail.qr ?? managed.connector.currentQr(),
+            error: managed.detail.error,
+        };
+    });
+    /** Start / link a channel. */
+    app.post("/api/channels/:id/start", async (req, reply) => {
+        const authUser = await requireChannelAuth(req, reply);
+        if (!authUser)
+            return;
+        try {
+            await channelManager.start(req.params.id);
+            const managed = channelManager.get(req.params.id);
+            return { ok: true, status: managed?.status, qr: managed?.detail.qr ?? managed?.connector.currentQr() ?? null };
+        }
+        catch (err) {
+            return reply.status(400).send({ error: err instanceof Error ? err.message : String(err) });
+        }
+    });
+    /** Stop a channel. */
+    app.post("/api/channels/:id/stop", async (req, reply) => {
+        const authUser = await requireChannelAuth(req, reply);
+        if (!authUser)
+            return;
+        try {
+            await channelManager.stop(req.params.id);
+            return { ok: true };
+        }
+        catch (err) {
+            return reply.status(400).send({ error: err instanceof Error ? err.message : String(err) });
+        }
+    });
+    /** Update channel config. */
+    app.patch("/api/channels/:id/config", async (req, reply) => {
+        const authUser = await requireChannelAuth(req, reply);
+        if (!authUser)
+            return;
+        const managed = channelManager.get(req.params.id);
+        if (!managed)
+            return reply.status(404).send({ error: "Channel not found" });
+        const body = req.body ?? {};
+        const next = channelManager.setConfig(req.params.id, body);
+        return next;
+    });
+}
+//# sourceMappingURL=channels.js.map

package/dist/routes/channels.js.map

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

package/dist/routes/chat.d.ts

@@ -14,6 +14,8 @@ import type { SessionStateService } from "../services/session-state.js";
 import type { ProjectService } from "../services/projects.js";
 import type { ProviderRegistry } from "../providers/registry.js";
 import type { SkillRegistry } from "../skills/index.js";
+import type { ArchitectureDiagramService } from "../services/architecture-diagrams.js";
+export declare function normalizeProviderSessionError(message: string): string;
 export declare function isSourceVisible(entry: MemoryEntry): boolean;
 export declare function getExternalFileMutationPath(tool: string, args: unknown): string | null;
 export interface ChatRouteDeps {
@@ -29,6 +31,7 @@ export interface ChatRouteDeps {
     projectService?: ProjectService;
     providerRegistry?: ProviderRegistry;
     skillRegistry?: SkillRegistry;
+    architectureDiagrams?: ArchitectureDiagramService;
     toolExecutor?: (toolName: string, input: unknown, context: ToolContext, options?: {
         dryRun?: boolean;
         consentTimeoutMs?: number;

package/dist/routes/chat.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"chat.d.ts","sourceRoot":"","sources":["../../src/routes/chat.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,eAAe,EAAkB,MAAM,SAAS,CAAC;AAC/D,OAAO,EAAE,KAAK,SAAS,EAAE,MAAM,cAAc,CAAC;AAC9C,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAC;AAC7C,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AAC9D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACxD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACzD,OAAO,KAAK,EAAE,WAAW,EAA4B,MAAM,uBAAuB,CAAC;AACnF,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACxD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AACxD,OAAO,KAAK,EAAE,WAAW,EAAe,aAAa,EAAE,MAAM,wBAAwB,CAAC;AACtF,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAE/D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,UAAU,CAAC;AAC/C,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,8BAA8B,CAAC;AACxE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AAC9D,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAgCjE,OAAO,KAAK,EAAS,aAAa,EAAE,MAAM,oBAAoB,CAAC;AA6H/D,wBAAgB,eAAe,CAAC,KAAK,EAAE,WAAW,GAAG,OAAO,CAE3D;AAyUD,wBAAgB,2BAA2B,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,GAAG,MAAM,GAAG,IAAI,CAyCtF;AAiZD,MAAM,WAAW,aAAa;IAC5B,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,cAAc,CAAC,EAAE,cAAc,CAAC;IAChC,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B,YAAY,CAAC,EAAE,YAAY,CAAC;IAC5B,eAAe,CAAC,EAAE,eAAe,CAAC;IAClC,KAAK,CAAC,EAAE,WAAW,CAAC;IACpB,aAAa,CAAC,EAAE,aAAa,CAAC;IAC9B,EAAE,CAAC,EAAE,cAAc,CAAC;IACpB,YAAY,CAAC,EAAE,mBAAmB,CAAC;IACnC,cAAc,CAAC,EAAE,cAAc,CAAC;IAChC,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;IACpC,aAAa,CAAC,EAAE,aAAa,CAAC;IAC9B,YAAY,CAAC,EAAE,CACb,QAAQ,EAAE,MAAM,EAChB,KAAK,EAAE,OAAO,EACd,OAAO,EAAE,WAAW,EACpB,OAAO,CAAC,EAAE;QAAE,MAAM,CAAC,EAAE,OAAO,CAAC;QAAC,gBAAgB,CAAC,EAAE,MAAM,CAAA;KAAE,KACtD,OAAO,CAAC,UAAU,CAAC,CAAC;CAC1B;AAED,wBAAgB,kBAAkB,CAChC,GAAG,EAAE,eAAe,EACpB,MAAM,EAAE,SAAS,EACjB,QAAQ,CAAC,EAAE,MAAM,GAAG,aAAa,EACjC,iBAAiB,CAAC,EAAE,cAAc,QA83DnC"}
+{"version":3,"file":"chat.d.ts","sourceRoot":"","sources":["../../src/routes/chat.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,eAAe,EAAkB,MAAM,SAAS,CAAC;AAC/D,OAAO,EAAE,KAAK,SAAS,EAAE,MAAM,cAAc,CAAC;AAC9C,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAC;AAC7C,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AAC9D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACxD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACzD,OAAO,KAAK,EAAE,WAAW,EAA4B,MAAM,uBAAuB,CAAC;AACnF,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACxD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AACxD,OAAO,KAAK,EAAE,WAAW,EAAe,aAAa,EAAE,MAAM,wBAAwB,CAAC;AACtF,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAE/D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,UAAU,CAAC;AAC/C,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,8BAA8B,CAAC;AACxE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AAC9D,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAgCjE,OAAO,KAAK,EAAS,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAC/D,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,sCAAsC,CAAC;AAgGvF,wBAAgB,6BAA6B,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAmBrE;AAyED,wBAAgB,eAAe,CAAC,KAAK,EAAE,WAAW,GAAG,OAAO,CAE3D;AAyUD,wBAAgB,2BAA2B,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,GAAG,MAAM,GAAG,IAAI,CAyCtF;AAiZD,MAAM,WAAW,aAAa;IAC5B,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,cAAc,CAAC,EAAE,cAAc,CAAC;IAChC,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B,YAAY,CAAC,EAAE,YAAY,CAAC;IAC5B,eAAe,CAAC,EAAE,eAAe,CAAC;IAClC,KAAK,CAAC,EAAE,WAAW,CAAC;IACpB,aAAa,CAAC,EAAE,aAAa,CAAC;IAC9B,EAAE,CAAC,EAAE,cAAc,CAAC;IACpB,YAAY,CAAC,EAAE,mBAAmB,CAAC;IACnC,cAAc,CAAC,EAAE,cAAc,CAAC;IAChC,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;IACpC,aAAa,CAAC,EAAE,aAAa,CAAC;IAC9B,oBAAoB,CAAC,EAAE,0BAA0B,CAAC;IAClD,YAAY,CAAC,EAAE,CACb,QAAQ,EAAE,MAAM,EAChB,KAAK,EAAE,OAAO,EACd,OAAO,EAAE,WAAW,EACpB,OAAO,CAAC,EAAE;QAAE,MAAM,CAAC,EAAE,OAAO,CAAC;QAAC,gBAAgB,CAAC,EAAE,MAAM,CAAA;KAAE,KACtD,OAAO,CAAC,UAAU,CAAC,CAAC;CAC1B;AAED,wBAAgB,kBAAkB,CAChC,GAAG,EAAE,eAAe,EACpB,MAAM,EAAE,SAAS,EACjB,QAAQ,CAAC,EAAE,MAAM,GAAG,aAAa,EACjC,iBAAiB,CAAC,EAAE,cAAc,QAq5DnC"}

package/dist/routes/chat.js

@@ -17,17 +17,74 @@ import { matchSkills } from "../services/thread-router.js";
 import { isValidChatMode, } from "../tools/chat-modes.js";
 import { buildSystemPrompt } from "../tools/prompts/index.js";
 import { getResponseStyleInstructions, isResponseStyle } from "../tools/prompts/shared-sections.js";
-function formatExternalProviderFirstTurn(systemPrompt, userContent) {
-    return [
+function formatExternalProviderFirstTurn(systemPrompt, userContent, recentContextBlock) {
+    const parts = [
         "Jait session instructions:",
         "<system>",
         systemPrompt,
         "</system>",
         "",
-        "User request:",
-        userContent,
+    ];
+    if (recentContextBlock) {
+        parts.push(recentContextBlock, "");
+    }
+    parts.push("User request:", userContent);
+    return parts.join("\n");
+}
+function normalizeExternalContextContent(content) {
+    if (typeof content === "string")
+        return content;
+    if (content === null || content === undefined)
+        return "";
+    try {
+        return JSON.stringify(content);
+    }
+    catch {
+        return String(content);
+    }
+}
+function truncateExternalContextContent(content, max = 1200) {
+    const compact = content.replace(/\s+/g, " ").trim();
+    if (compact.length <= max)
+        return compact;
+    return `${compact.slice(0, max - 3)}...`;
+}
+function buildExternalProviderRecentContext(history, limit = 4) {
+    const visibleMessages = history
+        .slice(0, -1)
+        .filter((message) => ((message.role === "user" || message.role === "assistant")
+        && normalizeExternalContextContent(message.content).trim().length > 0))
+        .slice(-limit);
+    if (visibleMessages.length === 0)
+        return null;
+    return [
+        `Recent active chat context (last ${limit} messages before this turn):`,
+        ...visibleMessages.map((message) => {
+            const roleLabel = message.role === "user" ? "User" : "Assistant";
+            return `${roleLabel}: ${truncateExternalContextContent(normalizeExternalContextContent(message.content))}`;
+        }),
     ].join("\n");
 }
+export function normalizeProviderSessionError(message) {
+    const compact = message.trim() || "Session error";
+    const lower = compact.toLowerCase();
+    const isAuthOrLimitError = [
+        "authentication required",
+        "auth required",
+        "not authenticated",
+        "not logged in",
+        "login required",
+        "please log in",
+        "credentials",
+        "api key",
+        "usage limit",
+        "rate limit",
+        "quota",
+        "limit reached",
+        "limit exceeded",
+    ].some((needle) => lower.includes(needle));
+    return isAuthOrLimitError ? "Authentication required" : compact;
+}
 function buildCliProviderSystemPrompt(provider, model, mode, promptCtx) {
     return buildSystemPrompt(mode, {
         model: model?.trim() || provider,
@@ -40,13 +97,16 @@ function buildCliProviderSystemPrompt(provider, model, mode, promptCtx) {
         backend: provider,
     });
 }
-function buildExternalProviderContextFlow(requestProvider, model, setupMessage, systemPrompt, userContent, sentAt, note, memory) {
+function buildExternalProviderContextFlow(requestProvider, model, setupMessage, systemPrompt, userContent, sentAt, note, memory, recentContextBlock) {
     const messages = [
         { role: "system", content: setupMessage },
     ];
     if (systemPrompt) {
         messages.push({ role: "system", content: systemPrompt });
     }
+    if (recentContextBlock) {
+        messages.push({ role: "system", content: recentContextBlock });
+    }
     messages.push({ role: "user", content: userContent });
     return {
         provider: requestProvider,
@@ -707,6 +767,7 @@ export function registerChatRoutes(app, config, depsOrDb, sessionServiceArg) {
     let projectService;
     let providerRegistry;
     let skillRegistry;
+    let architectureDiagrams;
     if (depsOrDb && typeof depsOrDb === "object" && "sessionService" in depsOrDb) {
         const deps = depsOrDb;
         db = deps.db;
@@ -722,6 +783,7 @@ export function registerChatRoutes(app, config, depsOrDb, sessionServiceArg) {
         projectService = deps.projectService;
         providerRegistry = deps.providerRegistry;
         skillRegistry = deps.skillRegistry;
+        architectureDiagrams = deps.architectureDiagrams;
     }
     else {
         db = depsOrDb;
@@ -1105,9 +1167,22 @@ export function registerChatRoutes(app, config, depsOrDb, sessionServiceArg) {
         const wsRoot = surfaceRegistry
             ? resolveProjectRoot(surfaceRegistry, sessionId, projectRecord?.rootPath ?? sessionRecord?.projectPath)
             : ((projectRecord?.rootPath ?? sessionRecord?.projectPath)?.trim() || process.cwd());
+        // Graphify: surface the saved project architecture graph so the agent
+        // understands the codebase layout up front (generated via architecture.generate).
+        let architectureGraph;
+        if (architectureDiagrams && wsRoot) {
+            try {
+                architectureGraph = architectureDiagrams.getByProject(wsRoot, authUser.id)?.diagram
+                    ?? architectureDiagrams.getByProject(wsRoot)?.diagram;
+            }
+            catch {
+                architectureGraph = undefined;
+            }
+        }
         const promptCtx = {
             projectRoot: wsRoot,
             skills: skillRegistry?.listEnabled(),
+            architectureGraph,
             responseStyle,
             backend: llmRuntime.backend,
         };
@@ -1497,18 +1572,19 @@ export function registerChatRoutes(app, config, depsOrDb, sessionServiceArg) {
                                 }
                                 break;
                             case "session.error":
-                                sessionError = event.error;
-                                safeWrite(`data: ${JSON.stringify({ type: "error", message: event.error })}\n\n`);
-                                emitToSubscribers(sessionId, { type: "error", message: event.error });
+                                sessionError = normalizeProviderSessionError(event.error);
+                                safeWrite(`data: ${JSON.stringify({ type: "error", message: sessionError })}\n\n`);
+                                emitToSubscribers(sessionId, { type: "error", message: sessionError });
                                 break;
                         }
                     });
                     const responseStyleBlock = getResponseStyleInstructions(responseStyle);
                     const cliSystemPrompt = buildCliProviderSystemPrompt(requestProvider, typeof body["model"] === "string" ? body["model"] : undefined, chatMode, promptCtx);
                     const cliUserContent = memoryBlock ? `${memoryBlock}\n\n${content}` : content;
+                    const recentContextBlock = isNewCliSession ? buildExternalProviderRecentContext(history) : null;
                     let cliContent = cliUserContent;
                     if (isNewCliSession) {
-                        cliContent = formatExternalProviderFirstTurn(cliSystemPrompt, cliUserContent);
+                        cliContent = formatExternalProviderFirstTurn(cliSystemPrompt, cliUserContent, recentContextBlock);
                     }
                     else if (responseStyleBlock) {
                         cliContent = `<responseStyle>\n${responseStyleBlock}\n</responseStyle>\n\n${cliContent}`;
@@ -1549,7 +1625,7 @@ export function registerChatRoutes(app, config, depsOrDb, sessionServiceArg) {
                                 : "Jait did not paste its internal system prompt into this provider turn.",
                             "Provider-native hidden system prompts may still exist inside the CLI provider and are not visible to Jait.",
                         ].join("\n");
-                        const cliContextFlow = buildExternalProviderContextFlow(requestProvider, typeof body["model"] === "string" ? body["model"] : undefined, setupContent, cliSystemPrompt, cliUserContent, sentAt, "CLI providers keep their own session context. This captures the Jait setup metadata, the external-provider system prompt, and the user turn content. On reused CLI sessions, the system prompt is shown for inspection even though it was only sent when Jait initialized or recovered the provider session.", memoryFlow);
+                        const cliContextFlow = buildExternalProviderContextFlow(requestProvider, typeof body["model"] === "string" ? body["model"] : undefined, setupContent, cliSystemPrompt, cliUserContent, sentAt, "CLI providers keep their own session context. This captures the Jait setup metadata, the external-provider system prompt, and the user turn content. On reused CLI sessions, the system prompt is shown for inspection even though it was only sent when Jait initialized or recovered the provider session.", memoryFlow, recentContextBlock);
                         contextFlowJson = JSON.stringify(cliContextFlow);
                         safeWrite(`data: ${JSON.stringify({ type: "context_flow", ...cliContextFlow })}\n\n`);
                         emitToSubscribers(sessionId, { type: "context_flow", ...cliContextFlow });
@@ -1584,8 +1660,8 @@ export function registerChatRoutes(app, config, depsOrDb, sessionServiceArg) {
                             }
                         });
                         const refreshedSystemPrompt = buildCliProviderSystemPrompt(requestProvider, typeof body["model"] === "string" ? body["model"] : undefined, chatMode, promptCtx);
-                        let recoveryContent = content;
-                        recoveryContent = formatExternalProviderFirstTurn(refreshedSystemPrompt, cliUserContent);
+                        const recoveryContextBlock = buildExternalProviderRecentContext(history);
+                        const recoveryContent = formatExternalProviderFirstTurn(refreshedSystemPrompt, cliUserContent, recoveryContextBlock);
                         const sentAt = new Date().toISOString();
                         const setupContent = [
                             "CLI provider recovery session setup captured by Jait.",
@@ -1598,7 +1674,7 @@ export function registerChatRoutes(app, config, depsOrDb, sessionServiceArg) {
                             "Jait pasted its external-provider system prompt into this recovery provider session turn.",
                             "Provider-native hidden system prompts may still exist inside the CLI provider and are not visible to Jait.",
                         ].join("\n");
-                        const cliContextFlow = buildExternalProviderContextFlow(requestProvider, typeof body["model"] === "string" ? body["model"] : undefined, setupContent, refreshedSystemPrompt, cliUserContent, sentAt, "CLI providers keep their own session context. This captures the Jait recovery setup metadata, the current Jait session system prompt, and the user turn content.", memoryFlow);
+                        const cliContextFlow = buildExternalProviderContextFlow(requestProvider, typeof body["model"] === "string" ? body["model"] : undefined, setupContent, refreshedSystemPrompt, cliUserContent, sentAt, "CLI providers keep their own session context. This captures the Jait recovery setup metadata, the current Jait session system prompt, and the user turn content.", memoryFlow, recoveryContextBlock);
                         contextFlowJson = JSON.stringify(cliContextFlow);
                         safeWrite(`data: ${JSON.stringify({ type: "context_flow", ...cliContextFlow })}\n\n`);
                         emitToSubscribers(sessionId, { type: "context_flow", ...cliContextFlow });
@@ -1623,7 +1699,11 @@ export function registerChatRoutes(app, config, depsOrDb, sessionServiceArg) {
                                 return;
                             if (event.type === "session.completed" || event.type === "session.error" || event.type === "turn.completed") {
                                 if (event.type === "session.error") {
-                                    sessionError = typeof event.message === "string" ? event.message : "Session error";
+                                    sessionError = normalizeProviderSessionError(typeof event.error === "string"
+                                        ? event.error
+                                        : typeof event.message === "string"
+                                            ? event.message
+                                            : "Session error");
                                     activeCliSessions.delete(sessionId);
                                 }
                                 unsubSteerDone();