@visorcraft/idlehands 1.1.0 → 1.1.3

package/dist/agent.js

@@ -1408,6 +1408,41 @@ export async function createSession(opts) {
     const clearPlan = () => {
         planSteps = [];
     };
+    // Session-level vault context injection: search vault for entries relevant to
+    // the last user message and inject them into the conversation. Used after any
+    // compaction to restore context the model lost when messages were dropped.
+    let lastVaultInjectionQuery = '';
+    const injectVaultContext = async () => {
+        if (!vault)
+            return;
+        let lastUser = null;
+        for (let j = messages.length - 1; j >= 0; j--) {
+            if (messages[j].role === 'user') {
+                lastUser = messages[j];
+                break;
+            }
+        }
+        const userText = userContentToText((lastUser?.content ?? '')).trim();
+        if (!userText)
+            return;
+        const query = userText.slice(0, 200);
+        if (query === lastVaultInjectionQuery)
+            return;
+        const hits = await vault.search(query, 4);
+        if (!hits.length)
+            return;
+        const lines = hits.map((r) => `${r.updatedAt} ${r.kind} ${r.key ?? r.tool ?? r.id} ${String(r.value ?? r.snippet ?? '').replace(/\s+/g, ' ').slice(0, 180)}`);
+        if (!lines.length)
+            return;
+        lastVaultInjectionQuery = query;
+        const vaultContextHeader = vaultMode === 'passive'
+            ? '[Trifecta Vault (passive)]'
+            : '[Vault context after compaction]';
+        messages.push({
+            role: 'user',
+            content: `${vaultContextHeader} Relevant entries for "${query}":\n${lines.join('\n')}`
+        });
+    };
     const compactHistory = async (opts) => {
         const beforeMessages = messages.length;
         const beforeTokens = estimateTokensFromMessages(messages);
@@ -1422,9 +1457,10 @@ export async function createSession(opts) {
                 messages,
                 contextWindow,
                 maxTokens,
-                minTailMessages: 12,
-                compactAt: cfg.compact_at ?? 0.8,
+                minTailMessages: opts?.force ? 2 : 12,
+                compactAt: opts?.force ? 0.5 : (cfg.compact_at ?? 0.8),
                 toolSchemaTokens: estimateToolSchemaTokens(getToolsSchema()),
+                force: opts?.force,
             });
         }
         const compactedByRefs = new Set(compacted);
@@ -1452,6 +1488,7 @@ export async function createSession(opts) {
             messages = compacted;
             if (dropped.length) {
                 messages.push({ role: 'system', content: `[compacted: ${dropped.length} messages archived to Vault - vault_search to recall]` });
+                await injectVaultContext().catch(() => { });
             }
         }
         return {
@@ -1810,7 +1847,6 @@ export async function createSession(opts) {
         // that happen back-to-back with no other tool calls in between.
         let lastTurnSigs = new Set();
         const consecutiveCounts = new Map();
-        let lastPassiveVaultQuery = '';
         let malformedCount = 0;
         let noProgressTurns = 0;
         const NO_PROGRESS_TURN_CAP = 3;
@@ -1823,34 +1859,6 @@ export async function createSession(opts) {
         let lastSuccessfulTestRun = null;
         // One-time nudge to prevent post-success churn after green test runs.
         let finalizeAfterTestsNudgeUsed = false;
-        const maybeInjectVaultContext = async () => {
-            if (!vault || vaultMode !== 'passive')
-                return;
-            let lastUser = null;
-            for (let j = messages.length - 1; j >= 0; j--) {
-                if (messages[j].role === 'user') {
-                    lastUser = messages[j];
-                    break;
-                }
-            }
-            const userText = userContentToText((lastUser?.content ?? '')).trim();
-            if (!userText)
-                return;
-            const query = userText.slice(0, 200);
-            if (query === lastPassiveVaultQuery)
-                return;
-            const hits = await vault.search(query, 4);
-            if (!hits.length)
-                return;
-            const lines = hits.map((r) => `${r.updatedAt} ${r.kind} ${r.key ?? r.tool ?? r.id} ${String(r.value ?? r.snippet ?? '').replace(/\s+/g, ' ').slice(0, 180)}`);
-            if (!lines.length)
-                return;
-            lastPassiveVaultQuery = query;
-            messages.push({
-                role: 'user',
-                content: `[Trifecta Vault (passive)] Relevant entries for "${query}":\n${lines.join('\n')}`
-            });
-        };
         const archiveToolOutputForVault = async (msg) => {
             if (!lens || !vault || msg.role !== 'tool' || typeof msg.content !== 'string')
                 return msg;
@@ -1952,8 +1960,9 @@ export async function createSession(opts) {
                     }
                 }
                 messages = compacted;
-                if (vaultMode === 'passive' && compactedDropped) {
-                    await maybeInjectVaultContext().catch(() => { });
+                if (dropped.length) {
+                    messages.push({ role: 'system', content: `[auto-compacted: ${dropped.length} old messages dropped to stay within context budget. Do NOT re-read files or re-run commands you have already seen — use vault_search to recall prior results if needed.]` });
+                    await injectVaultContext().catch(() => { });
                 }
                 const ac = makeAbortController();
                 inFlight = ac;
@@ -1961,10 +1970,11 @@ export async function createSession(opts) {
                 const callerSignal = hookObj.signal;
                 const onCallerAbort = () => ac.abort();
                 callerSignal?.addEventListener('abort', onCallerAbort, { once: true });
-                // Per-request timeout: the lesser of 120s or the remaining session wall time.
+                // Per-request timeout: the lesser of response_timeout (default 300s) or the remaining session wall time.
                 // This prevents a single slow request from consuming the entire session budget.
+                const perReqCap = cfg.response_timeout && cfg.response_timeout > 0 ? cfg.response_timeout : 300;
                 const wallRemaining = Math.max(0, cfg.timeout - (Date.now() - wallStart) / 1000);
-                const reqTimeout = Math.min(120, Math.max(10, wallRemaining));
+                const reqTimeout = Math.min(perReqCap, Math.max(10, wallRemaining));
                 const timer = setTimeout(() => ac.abort(), reqTimeout * 1000);
                 reqCounter++;
                 const turnStartMs = Date.now();
@@ -2240,9 +2250,13 @@ export async function createSession(opts) {
                             // Update to "now" for next turn.
                             mutationVersionBySig.set(sig, mutationVersion);
                             if (!hasMutatedSince) {
-                                // Allow a few more repeats for exec since "run tests" loops are common.
+                                const count = sigCounts.get(sig) ?? 0;
                                 const loopThreshold = harness.quirks.loopsOnToolError ? 3 : 6;
-                                if ((sigCounts.get(sig) ?? 0) >= loopThreshold) {
+                                // At 3x, inject vault context so the model gets the data it needs
+                                if (count >= 3 && count < loopThreshold) {
+                                    await injectVaultContext().catch(() => { });
+                                }
+                                if (count >= loopThreshold) {
                                     const args = sig.slice(toolName.length + 1);
                                     const argsPreview = args.length > 220 ? args.slice(0, 220) + '…' : args;
                                     throw new Error(`tool ${toolName}: identical call repeated ${loopThreshold}x across turns; breaking loop. ` +
@@ -2264,12 +2278,7 @@ export async function createSession(opts) {
                             }
                             const consec = consecutiveCounts.get(sig) ?? 1;
                             if (consec >= 3) {
-                                const args = sig.slice(toolName.length + 1);
-                                const argsPreview = args.length > 220 ? args.slice(0, 220) + '…' : args;
-                                messages.push({
-                                    role: 'user',
-                                    content: `[System] STOP READING: You have read the same resource ${consec} consecutive times (${toolName} ${argsPreview}). The content has NOT changed. You already have this data. Proceed immediately with your next action (write_file, edit_file, exec, etc.) — do NOT read this resource again.`,
-                                });
+                                await injectVaultContext().catch(() => { });
                             }
                             // Hard-break: after 6 consecutive identical reads, stop the session
                             if (consec >= 6) {