koneck 2.128.0 → 2.128.2

package/dist/engine.js

@@ -14,7 +14,7 @@ import { findChurn, describeChurn, WINDOW as CHURN_WINDOW } from './cycle.js';
 import { readingWithoutActing, describeReading } from './reading.js';
 import { claim, release, describeClaims } from './claims.js';
 import { handoffFrom, describeHandoff, worthSaying } from './handoff.js';
-import { readAll as readLedger, relevant as relevantFindings, withStaleness, describeFindings, deriveFindings, record as recordFindings, changedSince, currentSha } from './ledger.js';
+import { readAll as readLedger, relevant as relevantFindings, withStaleness, describeFindings, deriveFindings, freshFindings, record as recordFindings, changedSince, currentSha } from './ledger.js';
 import { repoNameFor } from './session-bus.js';
 import { compressIfNeeded } from './compressor.js';
 import { contextLimitFor, looksLikeContextOverflow, parseContextLimit, fetchModelContextLimit, ollamaServingLimit, fixedRequestTokens, overheadIsCrowded, crowdedWindowAdvice, probeServedContext, detectWindowPlateau, truncationNotice, windowFixFor, windowSettingIgnored, runsOnThisMachine, } from './context-limit.js';
@@ -970,7 +970,7 @@ delegated) {
     // Live state for every agent, shared with the UI. It is mutated in place and republished on
     // each change, so a panel can show tokens climbing per agent rather than only a final count.
     const progress = tasks.map((task, index) => ({
-        index, task, status: 'running', tokens: 0, turns: 0, startedAt: Date.now(),
+        index, task, status: 'running', activity: 'Queued', tokens: 0, turns: 0, startedAt: Date.now(),
     }));
     const publish = () => config.onAgentProgress?.(progress.map(p => ({ ...p })));
     publish();
@@ -992,10 +992,15 @@ delegated) {
          */
         if (abortSignal?.aborted) {
             mine.status = 'failed';
+            mine.activity = 'Cancelled before starting';
+            mine.endedAt = Date.now();
             publish();
             return { task, success: false,
                 output: 'NOT RUN: stopped at the user\'s request before this agent started.' };
         }
+        mine.activity = 'Starting';
+        mine.startedAt = Date.now();
+        publish();
         let taskCwd = cwd;
         let branch;
         if (isGit && args.use_worktrees !== false) {
@@ -1019,9 +1024,19 @@ delegated) {
             maxTurns: args.max_turns ?? resolveMaxTurns(config.maxTurns) ?? SUBAGENT_DEFAULT_TURNS,
             // A sub-agent must not stream its narration or tool calls into the parent's transcript —
             // eight agents writing at once is unreadable. Only its counters are forwarded.
-            onChunk: undefined,
-            onToolCall: undefined,
-            onToolResult: undefined,
+            onChunk: () => { if (mine.activity !== 'Writing response') {
+                mine.activity = 'Writing response';
+                publish();
+            } },
+            onToolCall: (name, args) => { mine.activity = name + ': ' + toolDetailFor(name, args); publish(); },
+            onToolResult: () => { mine.activity = 'Waiting for model'; publish(); },
+            onToolOutput: undefined,
+            onStreamActivity: undefined,
+            onHandoff: undefined,
+            onThinking: () => { if (mine.activity !== 'Thinking') {
+                mine.activity = 'Thinking';
+                publish();
+            } },
             onAgentProgress: undefined,
             onTokens: (s) => {
                 // Reported cumulatively per agent, so the parent is given the difference.
@@ -1062,8 +1077,9 @@ delegated) {
                     ? full.slice(0, SUBAGENT_REPORT_CHARS) + `\n      … (${full.length - SUBAGENT_REPORT_CHARS} more characters)`
                     : full)
                 : '(finished without saying anything)';
-            settle('done');
-            return { task, output, success: true, branch };
+            const success = session.completed;
+            settle(success ? 'done' : 'failed');
+            return { task, output, success, branch };
         }
         catch (err) {
             settle('failed');
@@ -3535,10 +3551,10 @@ detectedContext = { current: 0 }) {
  */
 export function imagesMentionedIn(text, cwd) {
     const out = [];
-    for (const raw of text.split(/\s+/)) {
+    for (const raw of text.match(/"[^"\n]+"|'[^'\n]+'|[^\s]+/g) ?? []) {
         // The question mark matters: "What is in swatch.png?" is how anyone actually asks, and
         // without it the token is `swatch.png?`, which has no extension we recognise.
-        const token = raw.replace(/[),.;:!?'"\]]+$/, '');
+        const token = raw.replace(/^["']|[),.;:!?'"\]]+$/g, '');
         if (!imageMime(token))
             continue;
         const abs = path.isAbsolute(token) ? token : path.resolve(cwd, token);
@@ -3797,6 +3813,7 @@ initialPlan) {
         // Images named in the prompt are sent as images. Naming a screenshot used to do nothing at
         // all: the model got the path, could not open a PNG, and answered about a file it had never
         // seen — while the person asking was looking straight at it.
+        const trajectoryBefore = new Set(trajectory.all());
         const named = imagePaths?.length ? [...imagePaths] : imagesMentionedIn(userText, config.cwd);
         const { images, problems } = named.length ? await loadImages(named) : { images: [], problems: [] };
         for (const problem of problems) {
@@ -3848,10 +3865,11 @@ initialPlan) {
              */
             try {
                 const sha = await currentSha(config.cwd);
-                const learned = deriveFindings(trajectory?.all() ?? [], {
+                const turnEvents = trajectory.all().filter(event => !trajectoryBefore.has(event));
+                const learned = freshFindings(deriveFindings(turnEvents, {
                     ...(sha ? { sha } : {}),
                     ...(config.sessionLabel ? { session: config.sessionLabel } : {}),
-                });
+                }), await readLedger(config.cwd));
                 if (learned.length > 0)
                     await recordFindings(config.cwd, learned);
                 /*
@@ -3861,7 +3879,7 @@ initialPlan) {
                  * it are already kept — the ledger has the findings and the transcript has the rest. What
                  * was missing was anybody saying the three things out loud at the moment they are true.
                  */
-                const note = handoffFrom(trajectory?.all() ?? [], planRef.current.steps, learned);
+                const note = handoffFrom(turnEvents, planRef.current.steps, learned.filter(f => f.kind !== 'timing'));
                 if (worthSaying(note)) {
                     const said = describeHandoff(note);
                     if (said)