@astrosheep/keiyaku 4.6.12 → 4.6.13

package/build/src/akuma/providers/pi/index.js

@@ -1,6 +1,6 @@
 import { abortable } from "../../abort.js";
 import { akumaExecutionEnvironment } from "../execution-environment.js";
-import { AgentEventChannel, createProviderAttempt, launchPrompt, modelEvent, tellRegistry, } from "../../provider.js";
+import { AgentEventChannel, createProviderAttempt, launchPrompt, modelEvent, noteEvent, tellRegistry, } from "../../provider.js";
 import { piSessionModel, piTerminalFailure, translatePiEvent } from "./events.js";
 const PI_THINKING_LEVELS = new Set(["minimal", "low", "medium", "high", "xhigh", "max"]);
 const MODEL_PATTERN = /^[^/\s]+\/[^\s]+$/u;
@@ -70,9 +70,13 @@ async function createPiSession(sdk, execution, input) {
                     : { systemPromptOverride: () => input.options.systemPrompt },
             }),
     });
+    const extensionErrors = services.resourceLoader.getExtensions().errors ?? [];
+    for (const failure of extensionErrors)
+        console.error(`Pi extension load failed: ${failure.path}\n${failure.error}`);
     try {
         input.signal?.throwIfAborted();
-        return await sdk.createAgentSessionFromServices(piCreateOptions(sdk, input, services));
+        const created = await sdk.createAgentSessionFromServices(piCreateOptions(sdk, input, services));
+        return { created, extensionErrors };
     }
     catch (error) {
         // Before a session owns the extension runtime, failed selection/setup must
@@ -139,7 +143,7 @@ async function retirePiSession(native) {
         throw failure;
 }
 async function drivePi(sdk, execution, input, signal, custody) {
-    const created = await createPiSession(sdk, execution, input);
+    const { created, extensionErrors } = await createPiSession(sdk, execution, input);
     const native = created.session;
     let settleRetired;
     let failRetired;
@@ -248,6 +252,9 @@ async function drivePi(sdk, execution, input, signal, custody) {
     await abortable(binding, signal);
     signal.throwIfAborted();
     events.emit({ type: "session", coordinate: { sessionFile: native.sessionFile, sessionId: native.sessionId } });
+    for (const failure of extensionErrors) {
+        events.emit(noteEvent(`Pi extension load failed: ${failure.path}: ${failure.error}`));
+    }
     const sessionModel = piSessionModel(native.model);
     if (sessionModel !== undefined)
         events.emit(modelEvent(sessionModel));

package/build/src/cli/render/akuma-activity.d.ts

@@ -42,7 +42,7 @@ export declare function actionReceipt(input: Readonly<{
  */
 type RowLayout = Readonly<{
     head: (time: string | undefined, glyph: string, verb: string, columns: number) => string;
-    continuation: () => string;
+    continuation: (verb: string) => string;
     marker: (count: number) => string;
     history?: true;
     compactRun?: true;

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

@@ -67,7 +67,7 @@ function clock(at) {
 }
 function label(row, tool) {
     if (row.kind === "said")
-        return "say";
+        return "";
     if (row.kind === "thought")
         return "think";
     if (row.kind === "note")
@@ -141,12 +141,14 @@ function verbColumn(verb) {
  */
 function actionCell(head, verb, columns) {
     const prefix = `${head} `;
+    if (verb === "")
+        return prefix;
     const available = Math.max(0, columns - displayColumns(prefix) - 1);
     const width = Math.min(verbColumn(verb), available);
     return `${prefix}${padToDisplay(truncateDisplayText(verb, width), width)} `;
 }
-function continuationPrefix() {
-    return " ".repeat(TIME_WIDTH) + " │ " + " ".repeat(VERB_WIDTH) + " ";
+function continuationPrefix(verb) {
+    return " ".repeat(TIME_WIDTH) + " │ " + (verb === "" ? "" : " ".repeat(VERB_WIDTH + 1));
 }
 function timelineMarker(text) {
     return `${" ".repeat(TIME_WIDTH)} ⋮ ${text}`;
@@ -165,10 +167,7 @@ function historyLayout() {
     return { ...compactLayout(), history: true };
 }
 function quotedBody(row) {
-    return (row.kind === "said" ||
-        row.kind === "thought" ||
-        row.kind === "tell" ||
-        (row.kind === "outcome" && row.outcome.kind === "answered"));
+    return row.kind === "thought" || row.kind === "tell" || (row.kind === "outcome" && row.outcome.kind === "answered");
 }
 function pathTail(path, maximum) {
     if (displayColumns(path) <= maximum)
@@ -258,7 +257,7 @@ function toolOverflowPreview(options, value, columns) {
     ];
 }
 function renderRow(row, context, options) {
-    const { layout, first, continuation, tool, inFlightSay = false } = options;
+    const { layout, first, continuation, tool } = options;
     const value = rowText(row, tool);
     const overflow = toolOverflowPreview(options, value, context.columns);
     if (overflow !== undefined)
@@ -278,8 +277,7 @@ function renderRow(row, context, options) {
             : layout.history === true
                 ? Number.MAX_SAFE_INTEGER
                 : value.lines,
-        quote: quotedBody(row) ? (layout.singleLine === true && row.kind !== "said" ? '"' : "“") : "",
-        openQuote: row.kind === "said" && inFlightSay,
+        quote: quotedBody(row) ? (layout.singleLine === true ? '"' : "“") : "",
         truncated: "truncated" in row && row.truncated === true,
     });
 }
@@ -287,12 +285,12 @@ function renderTimelineRow(row, context, layout, time, options = {}) {
     const { inFlightSay = false, live = false, unsettled = false } = options;
     const tool = row.kind === "tool" ? toolRepr(row) : undefined;
     const glyph = inFlightSay ? (live ? "●" : "?") : unsettled ? "?" : mark(row, live);
+    const verb = label(row, tool);
     return renderRow(row, context, {
         layout,
-        first: layout.head(time, glyph, label(row, tool), context.columns),
-        continuation: layout.continuation(),
+        first: layout.head(time, glyph, verb, context.columns),
+        continuation: layout.continuation(verb),
         tool,
-        inFlightSay,
     });
 }
 function groupedEntries(entries, context, layout = plainLayout(), options = {}) {
@@ -949,7 +947,6 @@ export function tellPayloadLines(text, context) {
         columns: context.columns,
         maxLines: 1,
         quote: '"',
-        openQuote: false,
         truncated: false,
     });
 }

package/build/src/cli/render/catalog.js

@@ -64,7 +64,6 @@ export function renderContractCatalogue(list) {
                     columns: 100,
                     maxLines: 3,
                     quote: "“",
-                    openQuote: false,
                     truncated: false,
                 })),
         ];

package/build/src/cli/render/kanshi.js

@@ -100,7 +100,6 @@ function payload(label, text, context) {
         columns: context.columns,
         maxLines: 3,
         quote: "“",
-        openQuote: false,
         truncated: false,
     });
 }

package/build/src/cli/render/terminal.d.ts

@@ -38,7 +38,6 @@ export declare function renderBoundedPayload(input: Readonly<{
     columns: number;
     maxLines: number;
     quote: string;
-    openQuote: boolean;
     truncated: boolean;
 }>): readonly string[];
 export declare function quotedText(value: string): string;

package/build/src/cli/render/terminal.js

@@ -186,7 +186,7 @@ export function renderBoundedPayload(input) {
         if (rest.length === 0 && !input.quote && index === 0)
             return [prefix.trimEnd()];
         const opening = input.quote && index === 0 ? input.quote : "";
-        const closing = input.quote && !input.openQuote ? (input.quote === "“" ? "”" : input.quote) : "";
+        const closing = input.quote === "“" ? "”" : input.quote;
         const budget = Math.max(0, input.columns - displayColumns(prefix + opening + closing));
         if (budget === 0)
             return lines.length === 0 ? [prefix.trimEnd()] : lines;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@astrosheep/keiyaku",
-  "version": "4.6.12",
+  "version": "4.6.13",
   "workspaces": [
     "plugins/square",
     "plugins/paseo/forwarder"
@@ -64,7 +64,7 @@
     "@earendil-works/pi-coding-agent": "*"
   },
   "devDependencies": {
-    "@earendil-works/pi-coding-agent": "^1.0.0",
+    "@earendil-works/pi-coding-agent": "^1.4.0",
     "@getpaseo/plugin": "0.11.2",
     "@getpaseo/server": "0.11.2",
     "@types/cross-spawn": "^6.0.6",