flowviant 0.117.0 → 0.124.0

package/bin/lib/workSessionTurns.mjs

@@ -18,6 +18,8 @@
  */
 import { existsSync, readFileSync, realpathSync, rmSync, statSync, writeFileSync } from 'node:fs';
 import { git } from './git.mjs';
+import { measureRepositoryBaseline } from './repositoryBaseline.mjs';
+import { REPOSITORY_BASELINE_PARAGRAPH } from './prompts.mjs';
 import { processStartTime } from './procRegistry.mjs';
 import { c, note, ok, warn } from './ui.mjs';
 import { mcpFor } from './claude.mjs';
@@ -30,6 +32,7 @@ import { isAgyConversationLive } from './agySessions.mjs';
 import { adoptFence } from './localSessions.mjs';
 import { resumeRetriesFresh } from './resumeLost.mjs';
 import { turnLockedByLivePid } from './turnLock.mjs';
+import { killGroup } from './processGroup.mjs';
 import { printable } from './printable.mjs';
 import { brainFor } from './workBrain.mjs';
 import { AGY_CONV_RE, CLAUDE_SESSION_RE, CODEX_THREAD_RE, RESUME_MARKERS } from './conversationIds.mjs';
@@ -48,6 +51,7 @@ export const SETTLED_HERE_MAX = 500;
 
 export function createWorkSessionTurns({
   repoRoot,
+  baseRef = () => null,
   baseDir,
   getMcpUrl,
   getArtifactsAccepted,
@@ -84,6 +88,31 @@ export function createWorkSessionTurns({
   const workAnswering = new Set(); // turn ids currently queued/running here
   const MAX_WORK_TRIES = 3;
 
+  /**
+   * INTERRUPT NOW (2026-10-13) — each turn this lane has taken, with the CLI
+   * children it spawned and whether a person asked to stop it. A stop kills
+   * each child's PROCESS GROUP: the CLI is spawned detached, so everything it
+   * started (a test run, a dev server) is in that group and goes with it —
+   * which is what interrupting a prompt means, and what Pause does too. A
+   * turn asked to stop before it spawned never spawns.
+   */
+  const runs = new Map(); // turnId -> { interrupted, spawned: [] }
+  /** Turns this process answered `ran: false` for, so the roster's next read
+   *  (made before that settle landed) is not answered again at once. */
+  const notRunningSaid = new Map(); // turnId -> when
+  /**
+   * Sessions whose run this lane just stopped. The next turn there is the one
+   * sent to interrupt it, and the roster that hands it over can have been read
+   * before the stop's settle landed — so the note does not wait on the
+   * server's `interrupted` alone. Taken once, and only for a little while.
+   */
+  const stoppedIn = new Map(); // sessionId -> when
+  const tookStop = (sessionId) => {
+    const when = stoppedIn.get(sessionId);
+    stoppedIn.delete(sessionId);
+    return when != null && now() - when < 120_000;
+  };
+
   /**
    * A TURN THIS LANE SETTLED IS NEVER RUN AGAIN (2026-09-29).
    *
@@ -131,10 +160,14 @@ export function createWorkSessionTurns({
    * and it is released in the turn's outer `finally`, after its settle.
    */
   const startingIn = new Set();
+  // A roster can contain a turn read before its stop was requested. Never
+  // start that stale job after acknowledging the same roster's interrupt.
+  let rosterInterrupts = new Set();
 
   const processWorkTurns = (jobs) => {
     for (const job of jobs ?? []) {
       if (!job || typeof job.id !== 'string' || !job.body || !job.sessionId) continue;
+      if (rosterInterrupts.has(job.id)) continue;
       if (workAnswering.has(job.id)) continue;
       // Settled by this lane already: a roster read from before the settle
       // landed. See `settledHere`.
@@ -167,6 +200,14 @@ export function createWorkSessionTurns({
       const releaseSlot = admit.reserve();
       lastDeferSaid.delete(job.sessionId);
       workAnswering.add(job.id);
+      const run = { interrupted: false, spawned: [] };
+      runs.set(job.id, run);
+      /** The execution generation the server handed, echoed on every settle
+       *  so the server can tell this execution's answer from an older one's. */
+      const attempt = Number.isInteger(job.attempt) ? { attempt: job.attempt } : {};
+      /** The CLI, unless a person already asked to stop this turn — then no
+       *  run starts, the fresh retry after an empty resume included. */
+      const runCli = (args) => (run.interrupted ? Promise.resolve('') : runTurn(args));
       const place = job.place || job.sessionId;
       /**
        * VALIDATED AT THE TRUST BOUNDARY, through the same door `learnPlaces`
@@ -185,6 +226,7 @@ export function createWorkSessionTurns({
        */
       if (!notePlace(job.sessionId, place)) {
         void settleTurn(job.id, {
+          ...attempt,
           ok: false,
           answer:
             'the server named a working directory this machine refuses to use — close and reopen the tab, then send the message again',
@@ -229,7 +271,7 @@ export function createWorkSessionTurns({
          * a turn fails.
          */
         const spent = () => ({
-          ...(toolLog?.ev?.length > 0 ? { tools: toolLog } : {}),
+          ...(toolLog != null ? { tools: toolLog } : {}),
           ...(usage ? { usage } : {}),
           ...(model ? { model } : {}),
         });
@@ -242,6 +284,7 @@ export function createWorkSessionTurns({
             // Out of local tries: SETTLE, don't skip — a silently skipped turn
             // strands the tab for the server's whole 24h expiry window.
             await settleTurn(job.id, {
+              ...attempt,
               ok: false,
               answer: `the turn failed ${tries} times on this machine — check the daemon log, then send the message again`,
             });
@@ -271,6 +314,7 @@ export function createWorkSessionTurns({
               !/^[0-9a-f][0-9a-f-]{6,62}$/i.test(job.adopt.id)
             ) {
               await settleTurn(job.id, {
+              ...attempt,
                 ok: false,
                 answer: 'that terminal session id is not one this machine can resume',
               });
@@ -285,6 +329,7 @@ export function createWorkSessionTurns({
             }
             if (!srcCwd) {
               await settleTurn(job.id, {
+              ...attempt,
                 ok: false,
                 answer: "the terminal session's directory no longer exists on the machine",
               });
@@ -298,6 +343,7 @@ export function createWorkSessionTurns({
             const fenced = adoptFence({ repoRoot, excludeDirs: [baseDir] }).check(srcCwd);
             if (fenced === 'outside') {
               await settleTurn(job.id, {
+              ...attempt,
                 ok: false,
                 answer: "the terminal session's directory is outside this project's repository",
               });
@@ -305,6 +351,7 @@ export function createWorkSessionTurns({
             }
             if (fenced === 'ours') {
               await settleTurn(job.id, {
+              ...attempt,
                 ok: false,
                 answer:
                   "that directory is one of the daemon's own worktrees — its session is already a tab, not something to adopt",
@@ -315,6 +362,7 @@ export function createWorkSessionTurns({
               srcHead = git(['rev-parse', 'HEAD'], srcCwd);
             } catch {
               await settleTurn(job.id, {
+              ...attempt,
                 ok: false,
                 answer:
                   "the terminal session's directory is not a usable git checkout (no HEAD to branch from)",
@@ -332,6 +380,7 @@ export function createWorkSessionTurns({
                 : isTerminalSessionLive(job.adopt.id);
             if (adoptLive) {
               await settleTurn(job.id, {
+              ...attempt,
                 ok: false,
                 answer:
                   'That terminal session is still open on the machine — close it there first, then adopt.',
@@ -348,6 +397,7 @@ export function createWorkSessionTurns({
           const dir = placeWtFor(place, adopting ? srcHead : undefined);
           if (!dir) {
             await settleTurn(job.id, {
+              ...attempt,
               ok: false,
               answer:
                 'the session worktree could not be opened on the machine — check the daemon log',
@@ -379,12 +429,17 @@ export function createWorkSessionTurns({
           // What the artifact directory held BEFORE this turn — the capture chat
           // excepted: it runs read-only, is never told about artifacts, and
           // whatever sibling tabs wrote in this shared place is theirs.
-          if (job.capture !== true) artifactScan = { dir: dir.wt, before: beforeArtifacts(dir.wt) };
+          if (job.capture !== true) {
+            artifactScan = { dir: dir.wt, before: beforeArtifacts(dir.wt), reported: false };
+            artifactScan.instructions = getArtifactsAccepted()
+              ? await artifacts.prepare?.({ placeDir: dir.wt, before: artifactScan.before, sessionId: job.sessionId }) ?? '' : '';
+          }
           const rt = sessionRuntime(dir.wt, job.runtime || null, job.sessionId);
           if (rt.mismatch) {
             // Something upstream changed this tab's identity mid-life. A held
             // context must never be answered by a different brain — say so.
             await settleTurn(job.id, {
+              ...attempt,
               ok: false,
               answer: `this tab is pinned to ${rt.mismatch.pin} but the server says it is a ${rt.mismatch.runtime} tab — reopen a new tab`,
             });
@@ -392,6 +447,7 @@ export function createWorkSessionTurns({
           }
           if (rt.missing) {
             await settleTurn(job.id, {
+              ...attempt,
               ok: false,
               answer: `this session runs on ${rt.missing}, which is no longer installed on the machine — reinstall it, or open a new tab`,
             });
@@ -404,6 +460,7 @@ export function createWorkSessionTurns({
             // whole control plane rides one). An honest sentence beats the
             // mcpFor throw this used to crash into every turn.
             await settleTurn(job.id, {
+              ...attempt,
               ok: false,
               answer: `this session runs on ${rt.unsupported}, which cannot drive a Terminal tab on this machine — open a new tab`,
             });
@@ -411,6 +468,7 @@ export function createWorkSessionTurns({
           }
           if (!rt.id) {
             await settleTurn(job.id, {
+              ...attempt,
               ok: false,
               answer:
                 'No coding CLI is installed on the machine — install Claude Code (or another supported CLI), then send the message again',
@@ -428,7 +486,7 @@ export function createWorkSessionTurns({
            */
           const shape = sessionTurnShape({ runtime: rt.id, adopting, job });
           if (shape.refusal) {
-            await settleTurn(job.id, { ok: false, answer: shape.refusal });
+            await settleTurn(job.id, { ...attempt, ok: false, answer: shape.refusal });
             return;
           }
           // A PLAIN tab (agy) mounts no MCP: no credential to mint.
@@ -447,6 +505,7 @@ export function createWorkSessionTurns({
             }
             if (mint?.gone) {
               await settleTurn(job.id, {
+              ...attempt,
                 ok: false,
                 answer:
                   'Flowviant no longer offers this session to this machine — the tab may have been closed or moved',
@@ -455,6 +514,7 @@ export function createWorkSessionTurns({
             }
             if (!mint?.token) {
               await settleTurn(job.id, {
+              ...attempt,
                 ok: false,
                 answer:
                   'the machine could not mint a session credential from Flowviant — check its connection, then send the message again',
@@ -598,7 +658,7 @@ export function createWorkSessionTurns({
           toolLog = turnLog.toolLog;
           const { pushToolEvent } = turnLog;
           const narrator = makeNarrator(job.sessionId, job.id, () =>
-            toolLog.ev.length > 0 ? toolLog : undefined
+            toolLog
           );
 
 
@@ -632,6 +692,8 @@ export function createWorkSessionTurns({
                 sessionName: job.sessionName,
                 message,
                 askedByName: job.askedByName,
+                // INTERRUPT NOW: the previous run was stopped to send this.
+                interrupted: tookStop(job.sessionId) || job.interrupted === true,
               }),
               // ONE PROFILE (turnProfile.mjs), the shape's: `plan` for the
               // capture chat, `plan-mode` for a plan turn, else `build`.
@@ -647,6 +709,7 @@ export function createWorkSessionTurns({
               // library that synced a second ago is in THIS turn.
               ...(() => {
                 const knowledgeDir = knowledgeDirFor(repoRoot);
+                if (job.capture === true) toolLog.baseline = measureRepositoryBaseline({ cwd: dir.wt, baseRef, knowledgeDir });
                 return {
                   // The shape's contract (a plan turn: the PLAIN one, no
                   // artifacts paragraph, the planning sentence appended). The
@@ -655,7 +718,8 @@ export function createWorkSessionTurns({
                   system: sessionTurnSystem(shape, {
                     knowledgeDir,
                     artifactsAccepted: getArtifactsAccepted(),
-                  }),
+                    runtime: rt.id,
+                  }) + (toolLog.baseline ? '\n\n' + REPOSITORY_BASELINE_PARAGRAPH(toolLog.baseline) : '') + (artifactScan?.instructions ? `\n\n${artifactScan.instructions}` : ''),
                   // The directory is OUTSIDE a worktree's cwd; Claude Code is
                   // told it may read there (`--add-dir`) rather than left to
                   // refuse a read-only capture turn a path it was just handed.
@@ -672,7 +736,8 @@ export function createWorkSessionTurns({
               answerFromResult: true,
               onActivity: (a) => {
                 narrator.line(a?.label);
-                auditCommand(a);
+                // Claude/Codex commands are audited below with their correlated outcome.
+                if (rt.id !== 'claude' && rt.id !== 'codex') auditCommand(a);
                 if (a?.kind === 'tool' && APPROVAL_REFUSED.test(a.error ?? '')) approvalRefused.push(a.label);
               },
               // One Codex agent MESSAGE (runtimeEvents.mjs `answer`): the turn
@@ -681,7 +746,13 @@ export function createWorkSessionTurns({
                 if (String(a ?? '').trim()) codexSpoke = true;
               },
               // The structured twin of the line above — see toolLog.
-              onToolEvent: pushToolEvent,
+              onToolEvent: (name, input, meta) => {
+                const e = pushToolEvent(name, input, meta);
+                if (e?.t === 'bash') auditCommand({
+                  kind: 'bash', command: input?.command ?? e.c,
+                  observation: { id: e.id, outcome: e.outcome, exitCode: e.exitCode, errorCategory: e.errorCategory },
+                });
+              },
               // The CLI's own token counts, tagged with which CLI counted them
               // — ADDED, not set: both runTurn calls below share these args.
               onUsage: (u) => {
@@ -722,6 +793,9 @@ export function createWorkSessionTurns({
               onSpawn: (ch) => {
                 if (!ch) return;
                 spawned.push(ch);
+                run.spawned.push(ch);
+                // Asked to stop between the check and the spawn.
+                if (run.interrupted) killGroup(ch);
                 // Keyed to the SESSION it serves — that id is what the machine
                 // snapshot charges this child's memory to.
                 workChildren.set(ch, job.sessionId);
@@ -745,7 +819,7 @@ export function createWorkSessionTurns({
                 }
               },
             };
-            out = await runTurn({
+            out = await runCli({
               ...turnArgs,
               resume,
               resumeThreadId: codexResumeId || claudeResumeId || undefined,
@@ -786,7 +860,7 @@ export function createWorkSessionTurns({
               !adopting &&
               resumeRetriesFresh({ resume, out, runtime: rt.id, sawInit: Boolean(seenClaudeSession) })
             ) {
-              out = await runTurn({ ...turnArgs, resume: false });
+              out = await runCli({ ...turnArgs, resume: false });
             }
           } finally {
             // The CLI has stopped printing, so stop relaying. The LINE itself
@@ -837,6 +911,21 @@ export function createWorkSessionTurns({
               }
             }
           }
+          /**
+           * A PERSON INTERRUPTED IT. Whatever the CLI printed was cut off, so
+           * it is not an answer: the turn settles `interrupted`, with what it
+           * spent and did, and the message sent to interrupt it runs next in
+           * this same conversation — the markers above already hold its id.
+           * Never spawned, it settles `ran: false`, unremembered, so the
+           * server's re-offer runs it as it was.
+           */
+          if (run.interrupted) {
+            const body = { ...attempt, ok: false, interrupted: true, ran: run.spawned.length > 0, answer: 'the turn was interrupted', ...spent() };
+            if (body.ran) stoppedIn.set(job.sessionId, now());
+            await (body.ran ? settleTurn(job.id, body) : settleWorkTurn(job.id, body));
+            ok(`${c.cyan('tab')} ${c.dim('— interrupted')}`);
+            return;
+          }
           const answer = (out || '').trim();
           // No output at all smells like a dead MCP credential (the lane
           // workers' no-sentinel case) — drop the cached token so the next
@@ -848,6 +937,7 @@ export function createWorkSessionTurns({
             // exactly that; no sessionRef is recorded, so the server keeps
             // offering the adoption and a retry after the user checks is cheap.
             await settleTurn(job.id, {
+              ...attempt,
               ok: false,
               answer: "Couldn't resume the terminal session — it may have been removed.",
               // Whatever it DID before coming back empty is exactly the
@@ -897,10 +987,20 @@ export function createWorkSessionTurns({
            */
           const loginFailure = rt.id === 'codex' && !codexSpoke ? codexLoginFailure(answer) : null;
           const refusedLine = rt.id === 'codex' ? codexApprovalSentence(approvalRefused) : null;
+          let artifactFailure = null;
+          if (artifactScan) {
+            artifactScan.reported = true;
+            try {
+              await artifacts.report({ placeDir: artifactScan.dir, before: artifactScan.before, sessionId: job.sessionId, turnId: job.id });
+            } catch (error) {
+              artifactFailure = `Artifact delivery is incomplete: ${error.message}`;
+            }
+          }
           const spoke = answer.length > 0 && !loginFailure;
           await settleTurn(job.id, {
-            ok: spoke,
-            answer: loginFailure
+              ...attempt,
+            ok: spoke && !artifactFailure,
+            answer: artifactFailure ? withRelay(artifactFailure, answer) : loginFailure
               ? withRelay(codexLoginSentence(loginFailure), answer)
               : answer.length > 0
                 ? refusedLine
@@ -921,7 +1021,14 @@ export function createWorkSessionTurns({
           else if (loginFailure) warn('codex answered 401 for this session turn — settled as failed, in words');
           else warn('session turn produced no output — settled as failed');
         } catch (e) {
+          if (toolLog) toolLog.state = 'partial';
+          if (run.interrupted) {
+            const body = { ...attempt, ok: false, interrupted: true, ran: run.spawned.length > 0, answer: 'the turn was interrupted', ...spent() };
+            await (body.ran ? settleTurn(job.id, body) : settleWorkTurn(job.id, body));
+            return;
+          }
           await settleTurn(job.id, {
+              ...attempt,
             ok: false,
             // Scrub, like every string that leaves this machine: an exception
             // routinely quotes command output, and command output can quote a
@@ -935,6 +1042,7 @@ export function createWorkSessionTurns({
           warn(`session turn failed: ${e?.message ?? e}`);
         } finally {
           workAnswering.delete(job.id);
+          runs.delete(job.id);
           if (startClaim) startingIn.delete(startClaim);
           // Nothing spawned, or everything already has: releasing twice is the
           // normal case and costs nothing. A reservation that leaked would
@@ -950,7 +1058,7 @@ export function createWorkSessionTurns({
           // …and relay what it wrote to SHOW its owner (2026-09-22) — the same
           // beat, the same reason it is not awaited. A failed turn's half-drawn
           // page is still what the turn left, and the tab should see it.
-          if (artifactScan) {
+          if (artifactScan && !artifactScan.reported) {
             void artifacts
               .report({
                 placeDir: artifactScan.dir,
@@ -965,5 +1073,32 @@ export function createWorkSessionTurns({
     }
   };
 
-  return { processWorkTurns, workAnswering, settledHere };
+  /**
+   * THE RUNS A PERSON ASKED TO STOP (`roster.interruptTurns`, read before the
+   * jobs). One this lane is running is stopped — its process groups killed —
+   * and settles `interrupted` when its CLI is gone. One it finished already
+   * keeps its own settle. One it is not running at all is answered `ran:
+   * false`: nothing was running here to stop, and the server puts it back in
+   * the queue.
+   */
+  const interruptWorkTurns = (ids) => {
+    rosterInterrupts = new Set(Array.isArray(ids) ? ids : []);
+    const at = now();
+    for (const [id, when] of notRunningSaid) if (at - when > 30_000) notRunningSaid.delete(id);
+    for (const id of Array.isArray(ids) ? ids : []) {
+      if (typeof id !== 'string' || !id) continue;
+      const run = runs.get(id);
+      if (run) {
+        if (!run.interrupted) note(`${c.cyan('tab')} ${c.dim('— interrupting the running turn')}`);
+        run.interrupted = true;
+        for (const ch of run.spawned) killGroup(ch);
+        continue;
+      }
+      if (pendingWorkReports.has(id) || settledRecently(id) || notRunningSaid.has(id)) continue;
+      notRunningSaid.set(id, at);
+      void Promise.resolve(settleWorkTurn(id, { ok: false, interrupted: true, ran: false, answer: '' })).catch(() => {});
+    }
+  };
+
+  return { processWorkTurns, interruptWorkTurns, workAnswering, settledHere };
 }

package/bin/lib/workToolLog.mjs

@@ -8,7 +8,7 @@
  * the stream. Tested directly (workToolLog.test.mjs).
  */
 import { toolEventOf } from './runtimeEvents.mjs';
-import { scrub as envScrub } from './uplinkScrub.mjs';
+import { scrubCut, scrub as envScrub } from './uplinkScrub.mjs';
 
 /**
  * THE TURN'S TOOL LOG — the structured relay behind the transcript's
@@ -30,14 +30,74 @@ import { scrub as envScrub } from './uplinkScrub.mjs';
  *     because it is current state rather than scrollback.
  */
 export function createToolLog(cwd) {
-  const toolLog = { ev: [], dropped: 0 };
-  const pushToolEvent = (name, input) => {
+  const toolLog = { ev: [], dropped: 0, state: 'unknown' };
+  // IDs are correlation keys, never model-authored citations. Keep only bounded
+  // metadata; output supplies a fixed category and allowlisted reader diagnostic.
+  // Arbitrary output and file contents are discarded.
+  const correlated = new Map();
+  const refresh = () => {
+    toolLog.state = toolLog.state === 'partial' || toolLog.dropped || toolLog.recoveryDropped ? 'partial' :
+      toolLog.ev.length && toolLog.ev.every(e => e.outcome && e.outcome !== 'unknown') ? 'complete' : 'unknown';
+    const retained = new Set([...toolLog.ev, toolLog.firstFailure, ...(toolLog.recovery ?? [])]);
+    for (const [id, row] of correlated) if (!retained.has(row)) correlated.delete(id);
+  };
+  const observe = (e, meta) => {
+    const code = Number.isSafeInteger(meta.exitCode) ? meta.exitCode : undefined;
+    const failed = meta.isError === true || (code !== undefined && code !== 0);
+    e.outcome = !meta.result ? 'unknown' : failed ? 'failed' :
+      meta.runtime === 'codex' && code === undefined ? 'unknown' : 'success';
+    if (code !== undefined) e.exitCode = code;
+    if (failed) {
+      const output = scrubCut(meta.output ?? '', 16_384);
+      const guardAt = output.indexOf('flowviant: this turn is read-only, so ');
+      const guard = guardAt >= 0 ? output.slice(guardAt).split('\n', 1)[0] : undefined;
+      const diagnostic = guard ?? output.split('\n', 80).find(line => /^(?:[\w./ -]{1,160}: ){1,2}(?:No such file or directory|Permission denied|command not found)\.?$/.test(line) || (e.t === 'read' && /^(?:Error: )?(?:File does not exist|File not found|Permission denied)\.?(?: Note: your current working directory is [^\n]{1,400}\.)?$/.test(line)));
+      if (diagnostic) {
+        e.errorMessage = diagnostic.slice(0, 500);
+        if (diagnostic.length > 500) { e.errorTruncated = true; toolLog.state = 'partial'; }
+      }
+      e.errorCategory = guard && /a pipe|a glob|a redirect|a second command|an expansion|command substitution|brace expansion|a subshell/.test(guard) ? 'syntax_refusal' : /permission|denied|approval|not allowed|refus/i.test(output) ? 'denied' :
+        /command not found|not recognized|executable.*not found/i.test(output) ? 'unavailable_tool' :
+        /no such file|not found|does not exist|cannot find/i.test(output) ? 'missing_path' : 'tool_error';
+      if (!toolLog.firstFailure) {
+        toolLog.firstFailure = { ...e };
+        toolLog.recovery = [];
+      }
+    }
+  };
+  const pushToolEvent = (name, input, meta = {}) => {
+    const id = typeof meta.id === 'string' && meta.id && meta.id.length <= 160 ? meta.id : undefined;
+    const existing = id && correlated.get(id);
+    if (existing) {
+      if (meta.result) observe(existing, meta);
+      refresh();
+      return existing;
+    }
+    if (!name) {
+      toolLog.dropped = Math.min(1_000_000, toolLog.dropped + 1);
+      refresh();
+      return;
+    }
     // envScrub rides INTO the builder, which scrubs over a bounded
     // window BEFORE its caps — scrubbing after the cut both leaked a
     // boundary-straddling secret's prefix and grew a capped field
     // past the server's limits (review, 2026-09-01).
     const e = toolEventOf(name, input, cwd, envScrub);
     if (!e) return;
+    if (e.t !== 'plan') {
+      if (id) { e.id = scrubCut(id, 160); correlated.set(id, e); }
+      if (name === 'Read') for (const key of ['offset', 'limit']) {
+        if (Number.isSafeInteger(input?.[key]) && input[key] >= 0) e[key] = input[key];
+      }
+      if (toolLog.firstFailure) {
+        toolLog.recovery.push(e);
+        if (toolLog.recovery.length > 12) {
+          toolLog.recovery.shift();
+          toolLog.recoveryDropped = Math.min(1_000_000, (toolLog.recoveryDropped ?? 0) + 1);
+        }
+      }
+      observe(e, meta);
+    }
     if (e.t === 'plan') {
       const i = toolLog.ev.findIndex((x) => x.t === 'plan');
       if (i >= 0) toolLog.ev.splice(i, 1);
@@ -46,6 +106,11 @@ export function createToolLog(cwd) {
       const last = toolLog.ev[toolLog.ev.length - 1];
       const sameKey =
         last &&
+        !id && !last.id &&
+        last.outcome === e.outcome &&
+        last.exitCode === e.exitCode &&
+        last.errorCategory === e.errorCategory &&
+        last.offset === e.offset && last.limit === e.limit &&
         last.t === e.t &&
         last.p === e.p &&
         last.q === e.q &&
@@ -71,6 +136,8 @@ export function createToolLog(cwd) {
       const [shed] = toolLog.ev.splice(i, 1);
       toolLog.dropped = Math.min(1_000_000, toolLog.dropped + (shed?.n ?? 1));
     }
+    refresh();
+    return e;
   };
   return { toolLog, pushToolEvent };
 }

package/bin/lib/workTurnShape.mjs

@@ -1,3 +1,4 @@
+import { discoveryGuide } from './discoveryContract.mjs';
 /**
  * WHAT A TERMINAL TAB'S TURN IS — plain, plan, capture or build — decided
  * once, as data (audit 2026-10-10, F159). Pure: no I/O, no state.
@@ -145,8 +146,8 @@ const SYSTEMS = { plain: SYSTEM_WORK_PLAIN, capture: SYSTEM_CAPTURE, work: SYSTE
 /** The turn's opening message under its contract. The plain kickoff names no
  *  session id (WORK_TURN_KICKOFF_PLAIN takes none) — it has no tools to pass
  *  one to. */
-export const sessionTurnKickoff = (shape, { sessionId, sessionName, message, askedByName }) =>
-  KICKOFFS[shape.kickoff]({ sessionId, sessionName, message, askedByName });
+export const sessionTurnKickoff = (shape, { sessionId, sessionName, message, askedByName, interrupted = false }) =>
+  KICKOFFS[shape.kickoff]({ sessionId, sessionName, message, askedByName, interrupted });
 
 /**
  * The turn's system prompt: its contract with the project's knowledge
@@ -154,10 +155,11 @@ export const sessionTurnKickoff = (shape, { sessionId, sessionName, message, ask
  * server can show one (`artifactsAccepted`, read by the lane at spawn), and a
  * plan turn's sentence appended.
  */
-export const sessionTurnSystem = (shape, { knowledgeDir, artifactsAccepted }) => {
+export const sessionTurnSystem = (shape, { knowledgeDir, artifactsAccepted, runtime }) => {
   const contract = withProjectContext(SYSTEMS[shape.systemBase], {
     knowledgeDir,
     artifacts: shape.artifacts && artifactsAccepted,
   });
-  return shape.planSentence ? `${contract}\n\n${PLAN_TURN_SENTENCE}` : contract;
+  const discovery = shape.systemBase === 'capture' && runtime ? `\n\n${discoveryGuide(runtime, 'capture')}` : '';
+  return shape.planSentence ? `${contract}\n\n${PLAN_TURN_SENTENCE}` : contract + discovery;
 };

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "flowviant",
-  "version": "0.117.0",
+  "version": "0.124.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "flowviant",
-      "version": "0.117.0",
+      "version": "0.124.0",
       "license": "MIT",
       "dependencies": {
         "libsodium-wrappers-sumo": "^0.8.4",
@@ -15,6 +15,9 @@
       "bin": {
         "flowviant": "bin/cli.mjs"
       },
+      "devDependencies": {
+        "three": "0.180.0"
+      },
       "engines": {
         "node": ">=20"
       }
@@ -34,6 +37,13 @@
         "libsodium-sumo": "^0.8.0"
       }
     },
+    "node_modules/three": {
+      "version": "0.180.0",
+      "resolved": "https://registry.npmjs.org/three/-/three-0.180.0.tgz",
+      "integrity": "sha512-o+qycAMZrh+TsE01GqWUxUIKR1AL0S8pq7zDkYOQw8GqfX8b8VoCKYUoHbhiX5j+7hr8XsuHDVU6+gkQJQKg9w==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/ws": {
       "version": "8.21.1",
       "resolved": "https://registry.npmjs.org/ws/-/ws-8.21.1.tgz",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "flowviant",
-  "version": "0.117.0",
+  "version": "0.124.0",
   "description": "Run your own coding CLIs as build agents for Flowviant — Claude Code, Codex or Antigravity, on your own credentials. Holds your sessions, keeps a worktree per tab, and ships branches on your word.",
   "type": "module",
   "bin": {
@@ -35,10 +35,14 @@
   "homepage": "https://flowviant.com",
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/flowviant/cli.git"
+    "url": "git+https://github.com/Flowviant/flowviant.git",
+    "directory": "cli"
   },
   "license": "MIT",
   "bugs": {
-    "url": "https://github.com/flowviant/cli/issues"
+    "url": "https://github.com/Flowviant/flowviant/issues"
+  },
+  "devDependencies": {
+    "three": "0.180.0"
   }
 }