@onepointfour-packs/flaredeck-agent 0.2.170 → 0.2.172

package/dist/serve.js

@@ -43,6 +43,8 @@ import { dirname, join } from 'node:path';
 import { configDir, loadGitHub, saveConfig, slug } from './config.js';
 import { boardArg, onMyBoards, outstandingCards } from './boards.js';
 import { browserTools, ensureBrowser } from './browser.js';
+import { AGY_HELPERS_BRIEF, HELPERS_BRIEF, helperTools } from './helpers.js';
+import { jamEvidence as jamEvidenceFor, loadJam as loadJamTokens } from './jam.js';
 import { environmentTools } from './envtools.js';
 import { watchForDesperation } from './desperation.js';
 import { note, recallWorktree, rememberWorktree, resumeBrief } from './journal.js';
@@ -2011,6 +2013,11 @@ export async function serve(opts) {
         // Read from the board= field, and checked here as well as asked for — the server is deployed
         // separately, and a board-scoped agent once picked up another team's cards (KD-1361).
         const boardKey = /board=`([^`]+)`/.exec(answer)?.[1];
+        // The card's KEY, not its code: worktrees and sessions are kept per key. Queued under the code,
+        // a picked-up card got a second worktree and branch beside its own — HR-0949 ended with two
+        // commits on agent/hr-0949 and agent/8zmkggmzfzndbd2ravdq, and the first branch's leftover
+        // edits reported the card "left unfinished" (16 Oct).
+        const cardKey = /card=`([^`]+)`/.exec(answer)?.[1];
         if (!onMyBoards(myBoards, boardKey ? { boardKey } : {}))
             return false;
         const kind = answer.startsWith('▶') ? 'doing' : answer.startsWith('✅ Next') ? 'mine' : answer.startsWith('✅ Took') ? 'took' : '';
@@ -2037,7 +2044,8 @@ export async function serve(opts) {
             event: 'assigned',
             line: kind === 'doing' ? `${next.code} is still yours and in progress` : `${next.code} is your next card — FlareDeck chose it by priority, then due date. Work this one.`,
             cardCode: next.code,
-            cardKey: next.code,
+            cardKey: cardKey || next.code,
+            ...(boardKey ? { boardKey } : {}),
         }))
             void drain();
         return true;
@@ -3422,6 +3430,21 @@ export async function serve(opts) {
          * the card waits for the reset, as it would for a spent plan.
          */
         let turnEngine = engine;
+        /* Helpers (helpers.ts): on for this agent while they are measured. The result of one running
+           in the background is typed into THIS turn; if the turn has ended by then, it starts the
+           next one on the card, so it is never lost and never polled for. */
+        const helpersOn = !isAssistant && (config.helpers === true || process.env['FLAREDECK_AGENT_HELPERS'] === '1');
+        let thisRun = null;
+        const deliverHelper = async (text) => {
+            if (thisRun && liveRun === thisRun && await thisRun.steer(text).catch(() => false))
+                return;
+            if (!event.cardKey) {
+                log('warn', `a helper finished after the turn ended, with no card to bring it back to: ${text.split('\n')[0]}`);
+                return;
+            }
+            if (enqueue({ id: `helper-${Date.now()}`, event: 'assigned', cardKey: event.cardKey, cardCode: event.cardCode, ...(event.boardKey ? { boardKey: event.boardKey } : {}), line: `A helper you started on this card finished after your last turn ended:\n${text.slice(0, 6000)}` }))
+                void drain();
+        };
         if (engine.name === 'antigravity') {
             const spend = await geminiSpend?.status().catch(() => null);
             if (spend?.over) {
@@ -3452,6 +3475,29 @@ export async function serve(opts) {
                 geminiOver = false;
             }
         }
+        const helperSet = helpersOn && turnEngine.name === 'claude' ? helperTools({
+            cwd: () => tree?.path ?? cwd,
+            ...(claudePlan?.use === 'token' ? { claudeToken: claudePlan.token } : {}),
+            // Its own browser, on the same environment the agent's points at.
+            browser: () => browserTools({
+                repo: config.repo,
+                endpoints: () => env.endpoints,
+                ...(web ? { defaultPart: () => web } : {}),
+                sites: () => declaredSites,
+                contract: () => env.contract,
+                cwd,
+                onNote: (t) => log('tool', t),
+            }),
+            jam: async (url) => {
+                const tokens = loadJamTokens();
+                if (!tokens)
+                    return null;
+                const e = await jamEvidenceFor(url, tokens, (t) => log('tool', t));
+                return e.ok ? e.text : null;
+            },
+            deliver: deliverHelper,
+            log: (t) => log('tool', t),
+        }) : null;
         const engineContext = {
             ...(leadGoal ? { goal: leadGoal } : {}),
             config: { ...config, repo: cwd, ...(isAssistant ? { assistantMode: true } : {}) },
@@ -3489,7 +3535,9 @@ export async function serve(opts) {
             ...(prepared?.model ? { model: prepared.model } : {}),
             ...(prepared?.size ? { size: prepared.size } : {}),
             ...(claudePlan?.use === 'token' ? { claudeToken: claudePlan.token } : {}),
+            ...(helpersOn && turnEngine.name === 'antigravity' ? { subagents: true } : {}),
             tools: {
+                ...(helperSet ? { helpers: helperSet } : {}),
                 ...(job ? { git: { server: gitServer, toolNames: GIT_TOOL_NAMES } } : {}),
                 // The project's file storage, when a person has set one up for these boards.
                 ...(await turnFileTools(cwd, forACard, event.environment) ?? {}),
@@ -3539,8 +3587,9 @@ export async function serve(opts) {
                     `the card, tell whoever owns the board that ${START_SCRIPT_NAME} does not survive parallel ` +
                     `worktrees — it must take a free port AND pass that port to the parts that call it — and stop.`
                 : '');
-        const run = turnEngine.run(brief, engineContext);
+        const run = turnEngine.run(brief + (helpersOn ? (turnEngine.name === 'antigravity' ? AGY_HELPERS_BRIEF : HELPERS_BRIEF) : ''), engineContext);
         liveRun = run;
+        thisRun = run;
         if (isAssistant)
             liveFeed?.start(String(event.message ?? event.line ?? '').split('\n').filter(Boolean).pop() ?? '');
         // Connected MCP servers' tokens, kept current for as long as the session runs. FlareDeck hands