@astrosheep/keiyaku 4.5.25 → 4.5.26

package/build/src/akuma/projection-read.js

@@ -104,6 +104,10 @@ function isPendingTell(row) {
 function isActiveTool(row) {
     return row.kind === "tool" && row.state === "active";
 }
+function isProtectedCurrentTurnActivity(row) {
+    return (row.kind === "said" ||
+        (row.kind === "tool" && row.call.kind === "fileChange" && row.state !== "active" && row.state !== "unsettled"));
+}
 function isSettledTellDeliveredTo(row, turnSequence) {
     return (row.kind === "tell" &&
         row.state === "told" &&
@@ -146,6 +150,7 @@ export function selectSnapshot(ledger, input) {
         const opening = openingInput(ledger);
         const pinSet = new Set([
             ...window.filter(isActiveTool),
+            ...window.filter(isProtectedCurrentTurnActivity),
             ...pins,
             ...(opening === undefined ? [] : [opening]),
         ]);

package/build/src/cli/render/akuma-activity.js

@@ -281,6 +281,12 @@ function isMutableStreamRow(row) {
 function settledRows(activity) {
     return activity.rows.filter(isSettledStreamRow);
 }
+function isProtectedStreamRow(row) {
+    return row.kind === "said" || (row.kind === "tool" && row.call.kind === "fileChange");
+}
+function isBoundedStreamTool(row) {
+    return row.kind === "tool" && !isProtectedStreamRow(row);
+}
 function rememberMutableRows(state, activity) {
     for (const row of activity.rows)
         if (isMutableStreamRow(row))
@@ -320,7 +326,7 @@ function coalesceDeferredGaps(state) {
     }, []);
 }
 function omitOldestDeferredTool(state) {
-    const index = state.deferred.findIndex((entry) => entry.kind === "row" && entry.row.kind === "tool");
+    const index = state.deferred.findIndex((entry) => entry.kind === "row" && isBoundedStreamTool(entry.row));
     if (index === -1)
         throw new Error("activity tail lost its pending tool");
     state.deferred[index] = { kind: "gap", count: 1 };
@@ -330,7 +336,7 @@ function omitOldestDeferredTool(state) {
 function flushSafeActivityPrefix(state, lines, context, layout) {
     for (;;) {
         const first = state.deferred[0];
-        if (first === undefined || (first.kind === "row" && first.row.kind === "tool"))
+        if (first === undefined || (first.kind === "row" && isBoundedStreamTool(first.row)))
             return;
         if (first.kind === "row") {
             state.deferred.shift();
@@ -338,7 +344,7 @@ function flushSafeActivityPrefix(state, lines, context, layout) {
             continue;
         }
         const next = state.deferred[1];
-        if (next === undefined || (next.kind === "row" && next.row.kind === "tool"))
+        if (next === undefined || (next.kind === "row" && isBoundedStreamTool(next.row)))
             return;
         state.deferred.shift();
         lines.push(layout.marker(first.count));
@@ -375,18 +381,18 @@ function observeActivitySnapshot(state, activity, context, layout) {
     state.newestSettledSequence = observedRows.reduce((newest, row) => Math.max(newest, row.sequence), state.newestSettledSequence ?? observedRows[0].sequence);
     const rows = observedRows.filter((row) => row.kind !== "thought");
     for (const row of rows) {
-        if (row.kind === "tool" && state.openingTools < OPENING_TOOL_BUDGET) {
+        if (isBoundedStreamTool(row) && state.openingTools < OPENING_TOOL_BUDGET) {
             state.openingTools += 1;
             renderStreamRow(state, row, lines, context, layout);
             continue;
         }
-        if (row.kind !== "tool" && state.deferred.length === 0) {
+        if (!isBoundedStreamTool(row) && state.deferred.length === 0) {
             renderStreamRow(state, row, lines, context, layout);
             continue;
         }
         state.deferred.push({ kind: "row", row });
-        if (row.kind === "tool") {
-            const pendingTools = state.deferred.filter((entry) => entry.kind === "row" && entry.row.kind === "tool").length;
+        if (isBoundedStreamTool(row)) {
+            const pendingTools = state.deferred.filter((entry) => entry.kind === "row" && isBoundedStreamTool(entry.row)).length;
             if (pendingTools > RECENT_TOOL_BUDGET)
                 omitOldestDeferredTool(state);
         }

package/build/src/cli/render/akuma-tool.js

@@ -52,15 +52,17 @@ function searchText(call) {
         ...(call.glob === undefined ? [] : [oneLine(call.glob)]),
     ].join(" · ");
 }
-function fileChange(call) {
+function fileChange(call, state) {
     const first = call.changes[0];
     if (first === undefined)
         return { label: "edit", text: "files" };
     const label = call.changes.length === 1 ? (first.op === "add" ? "write" : first.op === "delete" ? "delete" : "edit") : "edit";
     const subject = call.changes.length === 1 ? oneLine(first.path) : `${call.changes.length} files · ${oneLine(first.path)} ...`;
     const complete = call.changes.every((change) => change.diffstat !== undefined);
-    if (!complete)
+    if (!complete && (state === "active" || state === "unsettled"))
         return { label, text: subject };
+    if (!complete)
+        return { label, text: `${subject} — +? -?` };
     const totals = call.changes.reduce((sum, change) => ({
         added: sum.added + change.diffstat.added,
         removed: sum.removed + change.diffstat.removed,
@@ -85,7 +87,7 @@ export function toolRepr(row) {
             core = { label: searchLabel(row.call.scope), text: searchText(row.call) };
             break;
         case "fileChange":
-            core = fileChange(row.call);
+            core = fileChange(row.call, row.state);
             break;
         case "other":
             core = { label: "use", text: oneLine(row.call.display || row.name) };

package/build/src/library/akuma-creation.js

@@ -384,7 +384,7 @@ async function publishCall(born, execution) {
             ...(born.signal === undefined ? {} : { signal: born.signal }),
         })
             .then(async (initial) => {
-            if (!defaultWaitComplete(initial) || (deadline !== undefined && remaining() <= 0))
+            if (initial.life !== "asleep" || !defaultWaitComplete(initial) || (deadline !== undefined && remaining() <= 0))
                 return undefined;
             const signal = schemaSignal();
             try {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@astrosheep/keiyaku",
-  "version": "4.5.25",
+  "version": "4.5.26",
   "workspaces": [
     "plugins/*"
   ],
@@ -80,8 +80,8 @@
   "dependencies": {
     "@agentclientprotocol/sdk": "^1.3.0",
     "@anthropic-ai/claude-agent-sdk": "^0.3.226",
-    "@astrosheep/keiyaku-plugin-square": "0.1.5",
-    "@astrosheep/square": "^0.3.50",
+    "@astrosheep/keiyaku-plugin-square": "0.1.6",
+    "@astrosheep/square": "^0.3.57",
     "@earendil-works/pi-coding-agent": "0.85.1",
     "@opencode-ai/sdk": "1.18.3",
     "cross-spawn": "^7.0.6",