@siftd/connect-agent 0.2.51 → 0.2.53

package/README.md

@@ -133,6 +133,22 @@ export function buildWorkerPrompt(task, options) { ... }
 - `VOYAGE_API_KEY` - (Optional) For better semantic search embeddings
 - `DATABASE_URL` - (Optional) PostgreSQL for cloud memory persistence
 
+### Model + Cost Controls (Optional)
+
+- `LIA_FORCE_OPUS` - Defaults to `1`; set to `0` to allow model overrides
+- `LIA_MODEL` - Explicit model override (defaults to Opus 4.5 when forced)
+- `LIA_MAX_BUDGET_USD` - Per-worker budget cap (USD) for Claude Code CLI
+- `LIA_TOOL_MAX_TOKENS` - Max tokens for `/todo` + `/cal` tool calls
+- `LIA_WORKER_VERBOSE` - Set to `1` for verbose worker logging
+
+### Usage Logging
+
+Anthropic usage is logged per channel in:
+
+```
+~/Lia-Hub/shared/outputs/.lia/usage.jsonl
+```
+
 ## Requirements
 
 - Node.js 18+

package/dist/agent.js

@@ -423,46 +423,63 @@ export async function runAgent(pollInterval = 2000) {
     });
     if (wsConnected) {
         console.log('[AGENT] Using WebSocket for real-time communication\n');
-        // Handle messages via WebSocket
-        wsClient.onMessage(async (wsMsg) => {
-            if (wsMsg.type === 'message' && wsMsg.content && wsMsg.id) {
-                const message = {
-                    id: wsMsg.id,
-                    content: wsMsg.content,
-                    timestamp: wsMsg.timestamp || Date.now()
-                };
-                const response = await processMessage(message);
+    }
+    else {
+        console.log('[AGENT] WebSocket unavailable, using HTTP polling\n');
+    }
+    // Handle messages via WebSocket
+    wsClient.onMessage(async (wsMsg) => {
+        if (wsMsg.type === 'message' && wsMsg.content && wsMsg.id) {
+            const message = {
+                id: wsMsg.id,
+                content: wsMsg.content,
+                timestamp: wsMsg.timestamp || Date.now()
+            };
+            const response = await processMessage(message);
+            if (wsClient?.connected()) {
                 // Send response via WebSocket
                 wsClient.sendResponse(wsMsg.id, response);
                 console.log(`[AGENT] Response sent via WebSocket (${response.length} chars)`);
             }
-        });
-        // Keep process alive - WebSocket handles messages
-        console.log('[AGENT] Listening for WebSocket messages...\n');
-        // Poll only if WebSocket is not connected (WS input is preferred for latency).
-        while (true) {
-            await new Promise(resolve => setTimeout(resolve, pollInterval));
-            if (!wsClient?.connected()) {
-                try {
-                    const { messages } = await pollMessages();
-                    for (const msg of messages) {
-                        const response = await processMessage(msg);
-                        await sendResponse(msg.id, response);
-                        console.log(`[AGENT] Response sent (${response.length} chars)`);
-                    }
-                }
-                catch (error) {
-                    console.error('[AGENT] Poll error:', error.message);
-                }
+            else {
+                await sendResponse(wsMsg.id, response);
+                console.log(`[AGENT] Response sent via HTTP (${response.length} chars)`);
             }
         }
-    }
-    else {
-        // Fall back to polling
-        console.log('[AGENT] WebSocket unavailable, using HTTP polling\n');
-        while (true) {
+    });
+    console.log('[AGENT] Listening for WebSocket messages...\n');
+    const sleep = (ms) => new Promise(resolve => setTimeout(resolve, ms));
+    const basePollInterval = pollInterval;
+    const maxPollBackoff = 30000;
+    const wsReconnectInterval = 30000;
+    let pollErrorCount = 0;
+    let lastPollErrorLog = 0;
+    let lastWsReconnectAttempt = Date.now();
+    let nextPollDelay = basePollInterval;
+    const logPollError = (message) => {
+        const now = Date.now();
+        if (now - lastPollErrorLog > 10000) {
+            lastPollErrorLog = now;
+            console.error('[AGENT] Poll error:', message);
+        }
+    };
+    const computeBackoff = (count) => {
+        const exponent = Math.min(count, 5);
+        const delay = Math.min(maxPollBackoff, basePollInterval * Math.pow(2, exponent));
+        const jitter = delay * 0.1 * (Math.random() * 2 - 1);
+        return Math.max(basePollInterval, Math.round(delay + jitter));
+    };
+    while (true) {
+        const now = Date.now();
+        if (!wsClient?.connected() && now - lastWsReconnectAttempt > wsReconnectInterval) {
+            lastWsReconnectAttempt = now;
+            void wsClient.connect();
+        }
+        if (!wsClient?.connected()) {
             try {
                 const { messages } = await pollMessages();
+                pollErrorCount = 0;
+                nextPollDelay = basePollInterval;
                 for (const msg of messages) {
                     const response = await processMessage(msg);
                     await sendResponse(msg.id, response);
@@ -470,11 +487,22 @@ export async function runAgent(pollInterval = 2000) {
                 }
             }
             catch (error) {
-                if (error instanceof Error && !error.message.includes('ECONNREFUSED')) {
-                    console.error('[AGENT] Poll error:', error.message);
+                pollErrorCount += 1;
+                const status = error.status;
+                const message = error instanceof Error ? error.message : String(error);
+                logPollError(message);
+                if (status === 401 || status === 403) {
+                    nextPollDelay = maxPollBackoff;
+                }
+                else {
+                    nextPollDelay = computeBackoff(pollErrorCount);
                 }
             }
-            await new Promise(resolve => setTimeout(resolve, pollInterval));
         }
+        else {
+            pollErrorCount = 0;
+            nextPollDelay = basePollInterval;
+        }
+        await sleep(nextPollDelay);
     }
 }

package/dist/api.js

@@ -26,7 +26,9 @@ export async function connectWithPairingCode(code) {
 export async function pollMessages() {
     const res = await fetchWithAuth('/api/agent/messages');
     if (!res.ok) {
-        throw new Error(`Failed to poll messages: ${res.status}`);
+        const error = new Error(`Failed to poll messages: ${res.status}`);
+        error.status = res.status;
+        throw error;
     }
     return res.json();
 }

package/dist/orchestrator.d.ts

@@ -49,6 +49,7 @@ export declare class MasterOrchestrator {
     private client;
     private model;
     private maxTokens;
+    private toolMaxTokens;
     private memory;
     private contextGraph;
     private orgMemory?;
@@ -202,6 +203,7 @@ export declare class MasterOrchestrator {
     private getLocalTimeZone;
     private getTodoCalSystemPrompt;
     private getToolChoice;
+    private recordUsage;
     private withAttachments;
     private updateFileScope;
     private getTeamFilesDir;

package/dist/orchestrator.js

@@ -6,7 +6,7 @@
  */
 import Anthropic from '@anthropic-ai/sdk';
 import { spawn, execSync } from 'child_process';
-import { existsSync, readFileSync, mkdirSync, writeFileSync } from 'fs';
+import { existsSync, readFileSync, mkdirSync, writeFileSync, appendFileSync } from 'fs';
 import { join, resolve, dirname, sep } from 'path';
 import { AdvancedMemoryStore } from './core/memory-advanced.js';
 import { PostgresMemoryStore, isPostgresConfigured } from './core/memory-postgres.js';
@@ -22,6 +22,35 @@ import { getKnowledgeForPrompt } from './genesis/index.js';
 import { loadHubContext, formatHubContext, logAction, logWorker, getSharedOutputPath } from './core/hub.js';
 import { buildWorkerPrompt } from './prompts/worker-system.js';
 import { LiaTaskQueue } from './core/task-queue.js';
+const DEFAULT_CLAUDE_MODEL = 'claude-opus-4-5-20251101';
+const DEFAULT_TOOL_MAX_TOKENS = 1024;
+function readBooleanEnv(value, fallback) {
+    if (value === undefined)
+        return fallback;
+    return !['0', 'false', 'no', 'off'].includes(value.trim().toLowerCase());
+}
+function resolveClaudeModel() {
+    const raw = (process.env.LIA_MODEL || process.env.ANTHROPIC_MODEL || DEFAULT_CLAUDE_MODEL).trim();
+    if (!raw)
+        return DEFAULT_CLAUDE_MODEL;
+    if (readBooleanEnv(process.env.LIA_FORCE_OPUS, true) && raw !== DEFAULT_CLAUDE_MODEL) {
+        return DEFAULT_CLAUDE_MODEL;
+    }
+    return raw;
+}
+function resolveClaudeBudgetUsd() {
+    const raw = process.env.LIA_MAX_BUDGET_USD || process.env.CLAUDE_MAX_BUDGET_USD;
+    if (!raw)
+        return null;
+    const trimmed = raw.trim();
+    return trimmed ? trimmed : null;
+}
+function resolveToolMaxTokens() {
+    const raw = Number(process.env.LIA_TOOL_MAX_TOKENS);
+    if (Number.isFinite(raw) && raw >= 256)
+        return Math.min(raw, 4096);
+    return DEFAULT_TOOL_MAX_TOKENS;
+}
 /**
  * Extract file paths from worker output
  * Workers naturally mention files they create: "Created /tmp/foo.html", "Saved to /path/file"
@@ -203,6 +232,7 @@ export class MasterOrchestrator {
     client;
     model;
     maxTokens;
+    toolMaxTokens;
     memory;
     contextGraph;
     orgMemory;
@@ -244,8 +274,14 @@ export class MasterOrchestrator {
     todoUpdateCallback;
     constructor(options) {
         this.client = new Anthropic({ apiKey: options.apiKey });
-        this.model = options.model || process.env.ANTHROPIC_MODEL || 'claude-opus-4-5-20251101';
+        const requestedModel = options.model?.trim();
+        this.model = requestedModel
+            ? (readBooleanEnv(process.env.LIA_FORCE_OPUS, true) && requestedModel !== DEFAULT_CLAUDE_MODEL
+                ? DEFAULT_CLAUDE_MODEL
+                : requestedModel)
+            : resolveClaudeModel();
         this.maxTokens = options.maxTokens || 4096;
+        this.toolMaxTokens = resolveToolMaxTokens();
         this.userId = options.userId;
         this.orgId = options.orgId;
         this.orgRole = options.orgRole;
@@ -698,7 +734,7 @@ export class MasterOrchestrator {
     }
     hasCalendarMutation(message) {
         const lower = this.stripTodoSnapshot(message).toLowerCase();
-        const target = /(^|\s)\/cal\b|\/calendar\b|\bcalendar\b/.test(lower);
+        const target = /(^|\s)\/cal\b|\/calendar\b|\bcalendar\b|\bcal\b/.test(lower);
         const action = /\b(add|create|schedule|book|move|reschedule|update|change|cancel|delete|remove)\b/.test(lower);
         const query = /\b(what|show|list|open|view|see)\b/.test(lower);
         return target && action && !query;
@@ -789,6 +825,32 @@ export class MasterOrchestrator {
         }
         return undefined;
     }
+    recordUsage(response, meta) {
+        const usage = response.usage;
+        if (!usage)
+            return;
+        try {
+            const usageDir = join(getSharedOutputPath(), '.lia');
+            mkdirSync(usageDir, { recursive: true });
+            const entry = {
+                ts: new Date().toISOString(),
+                model: this.model,
+                input_tokens: usage.input_tokens,
+                output_tokens: usage.output_tokens,
+                cache_creation_input_tokens: usage.cache_creation_input_tokens,
+                cache_read_input_tokens: usage.cache_read_input_tokens,
+                tool_choice: meta.toolChoice || null,
+                iterations: meta.iterations,
+                messages: meta.messages,
+                stop_reason: response.stop_reason || null,
+                response_id: response.id || null,
+            };
+            appendFileSync(join(usageDir, 'usage.jsonl'), `${JSON.stringify(entry)}\n`, 'utf8');
+        }
+        catch (error) {
+            console.warn('[ORCHESTRATOR] Usage log failed:', error);
+        }
+    }
     withAttachments(task, context) {
         if (!this.attachmentContext)
             return { task, context };
@@ -1385,12 +1447,13 @@ ${hubContextStr}
         while (iterations < maxIterations) {
             iterations++;
             const toolChoice = forcedToolChoice ?? this.getToolChoice(currentMessages);
+            const requestMaxTokens = wantsTodoOrCal ? this.toolMaxTokens : this.maxTokens;
             const requestStart = Date.now();
             console.log(`[ORCHESTRATOR] Anthropic request ${iterations}/${maxIterations} (model: ${this.model})`);
             const response = await Promise.race([
                 this.client.messages.create({
                     model: this.model,
-                    max_tokens: this.maxTokens,
+                    max_tokens: requestMaxTokens,
                     system,
                     tools,
                     messages: currentMessages,
@@ -1403,6 +1466,11 @@ ${hubContextStr}
                 })
             ]);
             console.log(`[ORCHESTRATOR] Anthropic response ${iterations}/${maxIterations} in ${Date.now() - requestStart}ms`);
+            this.recordUsage(response, {
+                iterations,
+                messages: currentMessages.length,
+                toolChoice: toolChoice?.name
+            });
             // Check if done
             if (response.stop_reason === 'end_turn' || !this.hasToolUse(response.content)) {
                 if (forcedToolChoice && !retriedForcedTool) {
@@ -2347,7 +2415,9 @@ Unlike lia_plan (internal only), this creates a VISIBLE todo list that appears i
         };
         // Escape single quotes in prompt for shell safety
         const escapedPrompt = prompt.replace(/'/g, "'\\''");
-        const claudeCmd = `${this.claudePath} -p '${escapedPrompt}' --output-format text --dangerously-skip-permissions`;
+        const budget = resolveClaudeBudgetUsd();
+        const budgetArg = budget ? ` --max-budget-usd ${budget}` : '';
+        const claudeCmd = `${this.claudePath} -p '${escapedPrompt}' --output-format text --dangerously-skip-permissions --model ${this.model}${budgetArg}`;
         const isRoot = process.getuid?.() === 0;
         const shellCmd = isRoot
             ? `runuser -u lia -m -- /bin/bash -l -c "${claudeCmd.replace(/"/g, '\\"')}"`

package/dist/prompts/worker-system.d.ts

@@ -12,7 +12,7 @@ export declare const WORKER_IDENTITY = "## Worker Identity\nYou are a Claude Cod
 /**
  * Output format workers should follow
  */
-export declare const WORKER_OUTPUT_FORMAT = "## Output Format\nWhen done, clearly list:\n- Files created: /path/to/file.ext\n- Files modified: /path/to/file.ext\n- Key findings: brief summary\n\nBe concise. Execute efficiently.";
+export declare const WORKER_OUTPUT_FORMAT = "## Output Format\nWhen done, clearly list:\n- Files created: /path/to/file.ext\n- Files modified: /path/to/file.ext\n- Key findings: 1-3 short bullets\n\nBe concise. Do not restate the task.";
 /**
  * Instructions for workers to contribute back to memory
  * Workers can add to orchestrator's memory using these patterns

package/dist/prompts/worker-system.js

@@ -44,9 +44,9 @@ export const WORKER_OUTPUT_FORMAT = `## Output Format
 When done, clearly list:
 - Files created: /path/to/file.ext
 - Files modified: /path/to/file.ext
-- Key findings: brief summary
+- Key findings: 1-3 short bullets
 
-Be concise. Execute efficiently.`;
+Be concise. Do not restate the task.`;
 /**
  * Instructions for workers to contribute back to memory
  * Workers can add to orchestrator's memory using these patterns
@@ -71,6 +71,15 @@ Share data with other workers:
  */
 export function getWorkerLoggingInstructions(jobId) {
     const logFile = `/tmp/worker-${jobId}-log.txt`;
+    const verbose = process.env.LIA_WORKER_VERBOSE === '1';
+    if (!verbose) {
+        return `## Progress & Logging
+- Keep output minimal; report only key steps and final results
+
+REQUIRED - Log Export:
+At the END of your work, create a final log file at: ${logFile}
+Include: job_id=${jobId}, timestamp, summary of work done, files modified, key findings.`;
+    }
     return `## Progress & Logging
 - Output findings as you go, don't wait until the end
 - Print discoveries and insights immediately as you find them

package/dist/websocket.d.ts

@@ -35,6 +35,8 @@ export declare class AgentWebSocket {
     private reconnectDelay;
     private pingInterval;
     private isConnected;
+    private connecting;
+    private connectPromise;
     private pendingResponses;
     private cloudflareBlocked;
     private pendingMessages;

package/dist/websocket.js

@@ -19,6 +19,8 @@ export class AgentWebSocket {
     reconnectDelay = 1000;
     pingInterval = null;
     isConnected = false;
+    connecting = false;
+    connectPromise = null;
     pendingResponses = new Map();
     cloudflareBlocked = false; // Track if Cloudflare is blocking WebSockets
     pendingMessages = [];
@@ -40,7 +42,32 @@ export class AgentWebSocket {
      * Connect to the WebSocket server
      */
     async connect() {
-        return new Promise((resolve) => {
+        if (this.connected()) {
+            return Promise.resolve(true);
+        }
+        if (this.connecting && this.connectPromise) {
+            return this.connectPromise;
+        }
+        if (this.ws && this.ws.readyState !== WebSocket.OPEN) {
+            try {
+                this.ws.terminate();
+            }
+            catch {
+                // Ignore terminate errors
+            }
+            this.ws = null;
+        }
+        this.connecting = true;
+        this.connectPromise = new Promise((resolve) => {
+            let settled = false;
+            const finalize = (value) => {
+                if (settled)
+                    return;
+                settled = true;
+                this.connecting = false;
+                this.connectPromise = null;
+                resolve(value);
+            };
             try {
                 console.log('[WS] Connecting to', this.serverUrl);
                 this.ws = new WebSocket(this.serverUrl, {
@@ -59,7 +86,7 @@ export class AgentWebSocket {
                     else {
                         this.readyPending = true;
                     }
-                    resolve(true);
+                    finalize(true);
                 });
                 this.ws.on('message', (data) => {
                     this.handleMessage(data.toString());
@@ -72,6 +99,7 @@ export class AgentWebSocket {
                     this.isConnected = false;
                     this.stopPingInterval();
                     this.attemptReconnect();
+                    finalize(false);
                 });
                 this.ws.on('error', (error) => {
                     // Check for Cloudflare 524 timeout - don't spam logs
@@ -85,22 +113,23 @@ export class AgentWebSocket {
                         console.error('[WS] Error:', error.message);
                     }
                     if (!this.isConnected) {
-                        resolve(false);
+                        finalize(false);
                     }
                 });
                 // Timeout for initial connection
                 setTimeout(() => {
                     if (!this.isConnected) {
                         console.log('[WS] Connection timeout');
-                        resolve(false);
+                        finalize(false);
                     }
                 }, 10000);
             }
             catch (error) {
                 console.error('[WS] Connection failed:', error);
-                resolve(false);
+                finalize(false);
             }
         });
+        return this.connectPromise;
     }
     /**
      * Set handler for incoming messages
@@ -339,7 +368,9 @@ export class AgentWebSocket {
         this.reconnectAttempts++;
         const delay = this.reconnectDelay * Math.pow(2, this.reconnectAttempts - 1);
         setTimeout(() => {
-            this.connect();
+            if (!this.connecting) {
+                this.connect();
+            }
         }, delay);
     }
 }

package/dist/workers/manager.js

@@ -48,6 +48,28 @@ function getFileType(ext) {
         return 'text';
     return 'other';
 }
+const DEFAULT_CLAUDE_MODEL = 'claude-opus-4-5-20251101';
+function readBooleanEnv(value, fallback) {
+    if (value === undefined)
+        return fallback;
+    return !['0', 'false', 'no', 'off'].includes(value.trim().toLowerCase());
+}
+function resolveClaudeModel() {
+    const raw = (process.env.LIA_MODEL || process.env.ANTHROPIC_MODEL || DEFAULT_CLAUDE_MODEL).trim();
+    if (!raw)
+        return DEFAULT_CLAUDE_MODEL;
+    if (readBooleanEnv(process.env.LIA_FORCE_OPUS, true) && raw !== DEFAULT_CLAUDE_MODEL) {
+        return DEFAULT_CLAUDE_MODEL;
+    }
+    return raw;
+}
+function resolveClaudeBudgetUsd() {
+    const raw = process.env.LIA_MAX_BUDGET_USD || process.env.CLAUDE_MAX_BUDGET_USD;
+    if (!raw)
+        return null;
+    const trimmed = raw.trim();
+    return trimmed ? trimmed : null;
+}
 export class WorkerManager {
     config;
     activeWorkers = new Map();
@@ -166,22 +188,30 @@ export class WorkerManager {
         try {
             // Add checkpoint and logging instructions to prevent data loss
             const logFile = `/tmp/worker-${jobId}-log.txt`;
-            const enhancedTask = `${task}
-
-IMPORTANT - Progress & Logging:
+            const verbose = process.env.LIA_WORKER_VERBOSE === '1';
+            const loggingBlock = verbose
+                ? `IMPORTANT - Progress & Logging:
 - Output findings as you go, don't wait until the end
 - Print discoveries and insights immediately as you find them
 - Report on each file/step before moving to the next
-- Do NOT open browsers or start servers - just create files and report paths
+- Do NOT open browsers or start servers - just create files and report paths`
+                : `IMPORTANT - Progress & Logging:
+- Keep output minimal; report only key steps and final results
+- Do NOT open browsers or start servers - just create files and report paths`;
+            const enhancedTask = `${task}
+
+${loggingBlock}
 
 REQUIRED - Log Export:
 At the END of your work, create a final log file at: ${logFile}
-Include: job_id=${jobId}, timestamp, summary of work done, files modified, key findings.
-This ensures nothing is lost even if your output gets truncated.`;
+Include: job_id=${jobId}, timestamp, summary of work done, files modified, key findings.`;
             // Escape single quotes in task for shell safety
             const escapedTask = enhancedTask.replace(/'/g, "'\\''");
             // Build the claude command
-            const claudeCmd = `claude -p '${escapedTask}' --output-format text --dangerously-skip-permissions`;
+            const model = resolveClaudeModel();
+            const budget = resolveClaudeBudgetUsd();
+            const budgetArg = budget ? ` --max-budget-usd ${budget}` : '';
+            const claudeCmd = `claude -p '${escapedTask}' --output-format text --dangerously-skip-permissions --model ${model}${budgetArg}`;
             // If running as root, run workers as 'lia' user to avoid --dangerously-skip-permissions being blocked
             // The Claude CLI blocks this flag for root users as a security measure
             const isRoot = process.getuid?.() === 0;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@siftd/connect-agent",
-  "version": "0.2.51",
+  "version": "0.2.53",
   "description": "Master orchestrator agent - control Claude Code remotely via web",
   "type": "module",
   "main": "dist/index.js",