@onepointfour-packs/flaredeck-agent 0.2.202 → 0.2.204

package/dist/serve.js

@@ -9,6 +9,7 @@ import { freshGitHubToken } from './githubauth.js';
 import { answerFrom, createPresence, heldFor, modeCommand } from './presence.js';
 import { defaultUploadRoots, fileTools, flaredeckStores } from './filestore.js';
 import { scratchFor } from './cardmess.js';
+import { locateScripts } from './trusted-scripts.js';
 import { boardsNaming, fetchLadder, isSoloWorker, namedOnLadders, releaseTools } from './release.js';
 import { LiveFeed, liveSender, midTurnMessage, ASSISTANT_KEY, claudeProjectDir, historyMessage, recentExchanges, latestCliSession, assistantBrief, assistantIgnores, assistantPerson, asAssistantEvent, loadAssistantSession, saveAssistantSession } from './assistant.js';
 import { codePrefix, loadPrefixes, savePrefixes, SCRATCH_SWEEP_EVERY_MS, sweepScratch } from './scratch.js';
@@ -42,7 +43,7 @@ export function neverStarted(e) {
 }
 import { isJustReading, jevGuard, judgeCommand } from './jevguard.js';
 import { loadProviders } from './providers.js';
-import { cardWorkOnBase, currentBranch, ensureWorktree, finishRefusalStands, freeDiskBytes, headOf, leadGaveItBack, sweepWorktrees, releaseSharedPushGuard, existingWorktree, produced, releaseWorktree, tooEarlyToFinish, uncommittedCount, worktreeBrief } from './worktree.js';
+import { cardWorkOnBase, currentBranch, ensureWorktree, finishRefusalStands, freeDiskBytes, headOf, leadGaveItBack, useGitHubToken, sweepWorktrees, releaseSharedPushGuard, existingWorktree, produced, releaseWorktree, tooEarlyToFinish, uncommittedCount, worktreeBrief } from './worktree.js';
 import { askingForComponent, checkouts, repoIdentity, resolveCheckout, voteByCode, workspaceBrief, describeCheckout } from './workspace.js';
 import { chooseRepoWithJev } from './jev.js';
 import { ROUTE, intake, intakeText, unclearBrief } from './intake.js';
@@ -68,7 +69,7 @@ import { mergeableComments, combineComments, unparkReason, isBossInstruction, is
 import { LogShipper } from './log-ship.js';
 import { isOwnMove } from './own-moves.js';
 import { baseBranchesFromComponent } from './workspace.js';
-import { isAfterReleaseMove } from './flaredeck-proxy.js';
+import { isAfterReleaseMove, isReleasedClose } from './flaredeck-proxy.js';
 import { canPublish, canPushTo } from './githubauth.js';
 /**
  * The always-on agent.
@@ -525,6 +526,7 @@ export async function serve(opts) {
                 log('tool', gh ? `GitHub: using FlareDeck's connection (@${gh.login ?? 'unknown'})` : 'GitHub: this machine\'s own login');
             }
             flaredeckGithub = gh;
+            useGitHubToken(gh?.token);
             /* Jam for intake: the workspace's jam connection, asked for again on each read (its token
                is refreshed in FlareDeck). Found by URL as well as name, so a connection named
                differently still counts. */
@@ -541,6 +543,19 @@ export async function serve(opts) {
             setProvidersFromFlaredeck(hydrated.providers);
             const { setSecretsFromFlaredeck } = await import('./secrets.js');
             setSecretsFromFlaredeck(hydrated.secrets);
+            // Trusted scripts, found in this machine's checkouts: this folder, its siblings, card clones.
+            {
+                const seen = new Map();
+                for (const root of [config.repo, dirname(config.repo), cardReposRoot()])
+                    for (const c of await checkouts(root).catch(() => []))
+                        seen.set(c.path, c);
+                const found = locateScripts(hydrated.allowedScripts ?? [], [...seen.values()]);
+                const was = (config.trustedScripts ?? []).map((t) => t.abs).join('|');
+                config.trustedScripts = found;
+                config.otherScripts = hydrated.otherScripts ?? [];
+                if (found.map((t) => t.abs).join('|') !== was && found.length)
+                    log('tool', `trusted scripts: ${found.map((t) => t.path).join(', ')}`);
+            }
             // Skills shared from FlareDeck, kept current the same way. See skills.ts.
             const { flaredeckSkills, syncSkills } = await import('./skills.js');
             const plugin = await syncSkills(join(configDir(), 'skills', slug(config.repo)), flaredeckSkills(config.mcpUrl, tenantForMcp, () => opts.auth(), (config.boards ?? []).map((b) => b.key)), (t, warn) => log(warn ? 'warn' : 'tool', t));
@@ -868,6 +883,7 @@ export async function serve(opts) {
         repo: config.repo,
         card: () => onCard?.card ?? null,
         cwd: () => reachable?.cwd ?? job?.cwd ?? null,
+        trusted: () => config.trustedScripts ?? [],
         access: () => {
             const out = [];
             if (reachable?.cwd)
@@ -1041,10 +1057,17 @@ export async function serve(opts) {
      * are assigned to it). Both have to be true: assigned to it, on a board it releases for.
      */
     let releaseBoards = new Set();
-    const assistantCard = (e) => isAssistant && releaseBoards.size > 0 && (
-    // Its own sweep of those boards is card work too: it runs as a worker turn, not in the chat.
+    /**
+     * An assistant works the cards PEOPLE give it, on any board (Cobus, 20 Oct): FlareDeck refuses an
+     * agent — a lead, a manager, another bot — that tries to assign it one, so any card it holds came
+     * from a person. Card work is a worker's turn (its own checkout where the board has code); its
+     * person's chat stays one conversation. Releasing is separate: only where a board names it.
+     */
+    const assistantCard = (e) => isAssistant && (
+    // Its own sweep and its own pickups are card work too: worker turns, not the chat.
     (e.event === 'sweep' && e.id === 'sweep')
-        || (!!(e.cardKey || e.cardCode) && !!e.boardKey && releaseBoards.has(e.boardKey)));
+        || String(e.id ?? '').startsWith('resume-')
+        || (!!(e.cardKey || e.cardCode) && (e.assigneeKey === selfId || (e.event === 'assigned' && e.forYou === true))));
     /**
      * One person's own agent: on no team, never dispatched to, listening only to `person`. One long
      * conversation, never handed over — the SDK compacts it — and loose rules. See ASSISTANT_BRIEF.
@@ -2128,8 +2151,7 @@ export async function serve(opts) {
             await enterPause(wall);
     })();
     const sweepNow = () => {
-        // An assistant sweeps only the boards it releases for, where it has cards of its own.
-        if (paused || !sweepsEnabled || stopping || (isAssistant && !releaseBoards.size))
+        if (paused || !sweepsEnabled || stopping)
             return;
         // Busy is reason enough to wait: the next tick is minutes away and the work is not going
         // anywhere.
@@ -2148,7 +2170,7 @@ export async function serve(opts) {
             // Asked here first, for nothing: a sweep used to start a whole session (28k tokens) only for
             // the model to call get-outstanding, hear "nothing", and write an empty handover — four idle
             // agents doing it in one half hour (19 Oct). The turn runs only when something is there.
-            const sweepBoards = isAssistant ? [...releaseBoards] : [...myBoards];
+            const sweepBoards = [...myBoards];
             const outstanding = String(await callFlaredeckTool(config.mcpUrl, await opts.auth(), 'get-outstanding', {
                 ...(boardArg(sweepBoards) !== undefined ? { board: boardArg(sweepBoards) } : {}),
             }).catch(() => '') ?? '');
@@ -2158,7 +2180,7 @@ export async function serve(opts) {
             }
             if (working || queue.length || live.size)
                 return;
-            const only = isAssistant ? ` on ${(config.boards ?? []).filter((b) => releaseBoards.has(b.key)).map((b) => b.name).join(', ') || 'the boards you release for'} only — your other boards are your person's to direct` : '';
+            const only = isAssistant ? ' — only the cards people have given you; nothing from the pile, and anything else is your person\'s to direct' : '';
             if (enqueue({ id: 'sweep', event: 'sweep', line: `checking what is still assigned to you${only}` }))
                 void drain();
         })();
@@ -2213,9 +2235,6 @@ export async function serve(opts) {
             ...[...resumedIdle].filter(([, n]) => n >= RESUME_IDLE_LIMIT).map(([c]) => c),
         ])];
     const resumeOwnWork = async () => {
-        // An assistant's own work is only the cards on boards it releases for; otherwise its person's asks.
-        if (isAssistant && !releaseBoards.size)
-            return false;
         /* Not `live.size`: a session kept WARM for a follow-up is a cache, not work, and blocking on
            it meant the card in progress was never resumed within fifteen minutes of any turn. */
         if (paused || !sweepsEnabled || stopping || working || queue.length)
@@ -2226,7 +2245,7 @@ export async function serve(opts) {
            of its own waiting. */
         let answer = '';
         try {
-            const pullFrom = isAssistant ? [...releaseBoards] : [...myBoards];
+            const pullFrom = [...myBoards];
             answer = String(await callFlaredeckTool(config.mcpUrl, await opts.auth(), 'pull-next-card', {
                 ...(boardArg(pullFrom) !== undefined ? { board: boardArg(pullFrom) } : {}),
                 // Cards this harness will not work now: waiting on a person, or picked up with nothing new.
@@ -3043,18 +3062,25 @@ export async function serve(opts) {
         // An assistant's card on a board it releases for: the board says which repository. A card the
         // harness picked up itself carries none, and with one checkout here the turn took that one —
         // FRIDAY worked HRG-0001 in the HR Goat app checkout, not the website's (20 Oct).
+        // A board with no repository at all (a sales board): the card has no code, so no checkout — it
+        // is worked from the assistant's own folder, with its email and calendar tools.
+        let assistantNoCode = false;
         if (isAssistant && !isAssistantChat && !(event.baseBranches ?? []).some((e) => e.repository) && event.boardKey) {
             const tid = tenantFromToken(await opts.auth());
             const l = tid ? await fetchLadder(config.mcpUrl, tid, event.boardKey, () => opts.auth()).catch(() => null) : null;
             const urls = (l?.repositories ?? []).map((r) => r.url).filter(Boolean);
             if (urls.length)
                 event = { ...event, baseBranches: urls.map((u) => ({ component: '', repository: u, branch: '', role: 'feature' })) };
+            else if (l)
+                assistantNoCode = true;
         }
         let where = await resolveCheckout(config.repo, event, scope, opts.agent ?? '');
         // An assistant's card for a repository that is not on this machine — its own folder is another
         // project (FRIDAY's is an HR Goat checkout, the website is HrGoatMarketing): cloned once, with
         // FlareDeck's GitHub connection, into the harness's own folder, and worked from there.
-        if (isAssistant && !isAssistantChat && where.kind !== 'repo') {
+        if (assistantNoCode)
+            where = { kind: 'none' };
+        else if (isAssistant && !isAssistantChat && where.kind !== 'repo') {
             const cardRoot = cardReposRoot();
             const gh = flaredeckGithub;
             for (const url of new Set((event.baseBranches ?? []).map((e) => e.repository).filter(Boolean))) {
@@ -3185,7 +3211,7 @@ export async function serve(opts) {
         }
         // An intake review reads the card and the code; it builds nothing, so it gets no checkout. HR-1004's
         // review made a full worktree (and from dev, which the board no longer uses) just to read a card.
-        const tree = event.event === 'intake' || isLeadDispatch(event, isLead) ? null
+        const tree = event.event === 'intake' || isLeadDispatch(event, isLead) || assistantNoCode ? null
             : event.cardKey && (chosen || where.kind === 'none')
                 ? await ensureWorktree(repo, key, (t) => log('tool', t), startFrom, config.worktreeLocalFiles)
                 : await worktreeTheMessageIsAbout(event, repo, (t) => log('tool', t), (code) => ensureWorktree(repo, code, (t) => log('tool', t), startFrom, config.worktreeLocalFiles));
@@ -3289,12 +3315,17 @@ export async function serve(opts) {
         // here rather than trusted, because a turn that produced nothing still reports confidently.
         const finishGate = async (toLane) => {
             // A released card moving on to testing or review is the next step of the board's flow.
-            if (toLane && opts.deck) {
+            if (opts.deck) {
                 const here = await opts.deck.card(tag || event.cardCode || event.cardKey || '').catch(() => null);
-                if (here && isAfterReleaseMove(toLane, here.lane?.type, here.lane?.name, (Array.isArray(here.releases) && here.releases.length > 0) || !!here.deployedAt)) {
+                const released = !!here && ((Array.isArray(here.releases) && here.releases.length > 0) || !!here.deployedAt);
+                if (here && toLane && isAfterReleaseMove(toLane, here.lane?.type, here.lane?.name, released)) {
                     log('tool', `moving ${here.code || tag} on to ${toLane} — it was released already, so this is the next step, not a hand-back`);
                     return null;
                 }
+                if (here && isReleasedClose(toLane ?? '', released)) {
+                    log('tool', `closing ${here.code || tag} — its work was released already`);
+                    return null;
+                }
             }
             const why = await tooEarlyToFinish(tree);
             /* A LEAD moving a card on with nothing of its own on the branch is dispatch, not a claim of
@@ -3956,7 +3987,7 @@ export async function serve(opts) {
             // Both only reachable in-process, so an out-of-process engine is handed them explicitly
             // rather than being left unable to publish and unchecked when it says it has.
             ...(job ? { publish: async () => publishBranch(job) } : {}),
-            standing: standingBrief(!!teamSet, config.style ?? process.env['FLAREDECK_AGENT_STYLE'], isAssistantChat, config.mcpServers),
+            standing: standingBrief(!!teamSet, config.style ?? process.env['FLAREDECK_AGENT_STYLE'], isAssistantChat, config.mcpServers, config.trustedScripts, config.otherScripts),
             finish: finishGate,
             noteCard,
             keep: keepTool,