deepdebug-local-agent 1.12.1 → 1.13.1

package/src/la-protocol-v2/llm/client.js

@@ -281,12 +281,32 @@ export function createLlmClient({ holder, config, tenantId, agentId, env = proce
         }));
     }
 
+    const SAFE_ID = /^[A-Za-z0-9_-]{1,64}$/;      // same rule as the agents' LiteLlmScopeTags: a crafted id must never smuggle a second tag
+    const SAFE_TAG_VALUE = /^[A-Za-z0-9._-]{1,64}$/;
+
+    /**
+     * The `metadata` of every LiteLLM request (chat/completions AND /v1/messages). vh-litellm's scope-tag guard needs the caller ids IN the body
+     * (`vh_tenant_id`, `vh_workspace_id`) and the scope tags to agree with them. The tenant is this agent's own (session); the workspace is the job's
+     * (the one this agent serves); nothing here comes from agent2 or a job payload. Tags are unique by value. null = nothing to send.
+     */
+    function requestMetadata(job) {
+        const md = {};
+        const tags = new Set();
+        if (SAFE_ID.test(String(tenantId))) { md.vh_tenant_id = String(tenantId); tags.add(`vh-tenant:${tenantId}`); }
+        const ws = typeof job?.workspaceId === "string" ? job.workspaceId.trim() : "";
+        if (md.vh_tenant_id && SAFE_ID.test(ws)) { md.vh_workspace_id = ws; tags.add(`vh-ws:${ws}`); }
+        if (SAFE_TAG_VALUE.test(String(agentId))) tags.add(`vh-la:${agentId}`);
+        if (job?.jobId && SAFE_TAG_VALUE.test(String(job.jobId))) tags.add(`vh-job:${job.jobId}`);
+        if (job?.agent && /^[a-z0-9][a-z0-9._-]{0,31}$/.test(job.agent)) tags.add(`vh-agent:${job.agent}`);
+        return { ...md, tags: [...tags] };
+    }
+
     /** The slot, the HTTP call with its retries and the bookkeeping, shared by chat() and messages(). `hooks` = { path, parseJson } of the API in use. */
     async function dispatch(o, ctx, hooks, makeBody) {
         if (active >= config.maxConcurrent) return fail("busy", ctx);
         active++;
         try {
-            const tags = config.tags ? { tags: [`vh-tenant:${tenantId}`, `vh-la:${agentId}`, ...(o.job?.jobId ? [`vh-job:${o.job.jobId}`] : []), ...(o.job?.agent && /^[a-z0-9][a-z0-9._-]{0,31}$/.test(o.job.agent) ? [`vh-agent:${o.job.agent}`] : [])] } : null;
+            const tags = config.tags ? requestMetadata(o.job) : null;
             const bodyText = makeBody(tags);
             stats.bytesOut += byteLength(bodyText);
             let attempts = 0;

package/src/la-protocol-v2/runtime.js

@@ -13,6 +13,7 @@ import { resolveWebhookConfig } from "./webhooks/config.js";
 import { resolveLlmClientConfig } from "./llm/config.js";
 import { resolveJobsConfig } from "./jobs/config.js";
 import { loadContract } from "./contract.js";
+import { resolveChatConfig, chatRequested } from "./chat/config.js";
 
 const UUID = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/;
 const WORKSPACE_ID = /^[A-Za-z0-9_.-]{0,64}$/;
@@ -86,6 +87,10 @@ export async function buildV2Link({ tenantId, agentId, signing, wsManager, getWo
     // ./jobs/agent2 is loaded. It needs jobs, the LLM client (agent2 reaches the model ONLY through this agent: DLP + key holder) and DLP enforce; when one is
     // missing the job receiver is NOT installed (never silently another runner).
     let agent2Runner = null;
+    // LA-1/LA-3 (contract 2.3, LOCAL_AGENT_CHAT, default off): chat on the Local Agent. It rides on the agent2 runner and on the content handlers (job.stream / chat.session are
+    // served by them), so it exists only when both do; otherwise it says why and stays off (never a half-working chat: `job.chat` is announced only by a complete one).
+    let chat = null;
+    let chatReported = false;
     if (String(env.LOCAL_AGENT_RUNNER ?? "").trim().toLowerCase() === "agent2") {
         const a2 = await import("./jobs/agent2/config.js");
         const a2cfg = a2.resolveAgent2RunnerConfig(env, (m) => log.warn(m));
@@ -97,12 +102,23 @@ export async function buildV2Link({ tenantId, agentId, signing, wsManager, getWo
         else {
             const { createAgent2Runner } = await import("./jobs/agent2/runner.js");
             const { makeWorkspaceResolver } = await import("./jobs/install.js");
+            const chatCfg = resolveChatConfig(env, (m) => log.warn(m));
+            if (chatCfg.enabled) {
+                chatReported = true;
+                if (!contentCfg.enabled) err("[la-chat] ERROR: LOCAL_AGENT_CHAT=true but the content handlers are not on (LOCAL_AGENT_CONTENT_HANDLERS=true and LOCAL_AGENT_DLP_MODE=enforce): nothing could serve job.stream / chat.session. The chat stays off");
+                else {
+                    const { createChat } = await import("./chat/index.js");
+                    try { chat = createChat({ config: chatCfg, tenantId: tenant, env, log, isActive: (id) => !!(link.jobs && link.jobs.isActiveChat(id)) }); } catch { err("[la-chat] ERROR: the chat store could not be created (LOCAL_AGENT_CHAT_DIR): the chat stays off"); }
+                }
+            }
+            a2cfg.chat = !!chat;
             const resolveWs = makeWorkspaceResolver({ wsManager, getWorkspaceRoot, tenantId: tenant });
-            agent2Runner = createAgent2Runner({ config: a2cfg, tenantId: tenant, resolveWorkspaceRoot: (id) => resolveWs(id)?.root || null, getSession: () => link.session, signing, env, log });
+            agent2Runner = createAgent2Runner({ config: a2cfg, tenantId: tenant, resolveWorkspaceRoot: (id) => resolveWs(id)?.root || null, getSession: () => link.session, signing, env, log, chat });
             jobRunner = agent2Runner;
             if (jobsCfg.maxConcurrent !== 1) { log.warn("[la-agent2] agent2 runs one job at a time: LOCAL_AGENT_JOBS_MAX_CONCURRENT is forced to 1"); jobsCfg = { ...jobsCfg, maxConcurrent: 1 }; }
         }
     }
+    if (chatRequested(env) && !chat && !chatReported) err("[la-chat] ERROR: LOCAL_AGENT_CHAT=true needs LOCAL_AGENT_JOBS, LOCAL_AGENT_RUNNER=agent2 (with the LLM client and DLP enforce) and the content handlers: the chat stays off");
     if (jobsCfg.enabled) {
         const { validateRunner } = await import("./jobs/manager.js");
         const given = jobRunner && validateRunner(jobRunner) ? jobRunner : null;
@@ -138,7 +154,10 @@ export async function buildV2Link({ tenantId, agentId, signing, wsManager, getWo
             capabilities: ["protocol.v2", "v1.commands", "chunk.base64", ...contentCaps, ...incidentCaps, ...webhookCaps, ...llmCaps, ...jobCaps, ...jobOptionCaps, ...policyCaps, ...v21Caps],
             // contract 2.1 (e): `llm.key.held` is a snapshot taken at every connect (register and hello alike): announced only while the holder has a
             // valid, unexpired key (a revoked or expired one is not announced from the next connection on). `link` is assigned below, before any attach.
-            dynamicCapabilities: () => (llmCfg.enabled && link.llm && link.llm.holder.held ? ["llm.key.held"] : []),
+            // contract 2.3: `job.chat` (+ `job.inline.16k`, a prompt of 16 KiB) only from a complete chat: the store, the content handlers, the agent2 runner and an agent2 whose /health
+            // listed `chat` (probeChat below). The CP sends kind:"chat" and a long inline input only to a session that announced them.
+            dynamicCapabilities: () => [...(llmCfg.enabled && link.llm && link.llm.holder.held ? ["llm.key.held"] : []),
+                ...(chat && agent2Runner && runner === agent2Runner && agent2Runner.chatReady ? ["job.chat", "job.inline.16k"] : [])],
             getWorkspaces: () => {
                 const open = (wsManager?.list?.() || []).map((w) => ({
                     workspaceId: String(w.id || ""),
@@ -158,7 +177,12 @@ export async function buildV2Link({ tenantId, agentId, signing, wsManager, getWo
     });
     if (contentCfg.enabled) {
         const { installContentHandlers } = await import("./content-handlers/install.js");
-        installContentHandlers({ link, tenantId: tenant, wsManager, getWorkspaceRoot, config: contentCfg, env, log });
+        installContentHandlers({ link, tenantId: tenant, wsManager, getWorkspaceRoot, config: contentCfg, env, log, chat: chat ? chat.content : null });
+    }
+    if (chat) {
+        link.chat = chat;
+        const closeBase = link.close.bind(link);
+        link.close = () => { chat.close(); closeBase(); };
     }
     if (llmCfg.enabled) {
         const { installLlmKey } = await import("./llm-key/install.js");
@@ -182,6 +206,11 @@ export async function buildV2Link({ tenantId, agentId, signing, wsManager, getWo
             link.close = () => { closeJobs(); agent2Runner.close().catch(() => {}); };
         }
     }
+    if (chat && agent2Runner && runner === agent2Runner) {
+        // which kinds does agent2 run? (/health). Waits at most LOCAL_AGENT_CHAT_PROBE_MS so the first register already says `job.chat`; in spawn mode this starts agent2 now
+        const probe = agent2Runner.probeChat();
+        if (chat.config.probeWaitMs > 0) await Promise.race([probe, new Promise((r) => { const t = setTimeout(r, chat.config.probeWaitMs); if (t.unref) t.unref(); })]);
+    }
     let webhookSource = null;
     if (webhookCfg.enabled) {
         const { createWebhookSource } = await import("../incident-detector/sources/webhook-source.js");