@hraness/dawg 0.2.0 → 0.4.0

package/tui/activity.ts

@@ -45,7 +45,9 @@ export type AgentActivityEvent =
   | { type: "start"; prompt?: string | undefined; model?: string | undefined }
   | { type: "step"; step: number }
   | { type: "text-delta"; delta?: string; text?: string }
+  | { type: "activity"; message: string }
   | { type: "tool-start"; name: string; callId?: string; step?: number }
+  | { type: "tool-progress"; line: string; name?: string; callId?: string }
   | {
       type: "tool-applied";
       summary: string;
@@ -238,6 +240,9 @@ export class ActivityFeed {
           event.step <= 1 ? "thinking" : `thinking · step ${event.step}`,
         );
         return;
+      case "activity":
+        this.setSpinner(event.message);
+        return;
       case "text-delta": {
         const chunk = event.delta ?? event.text ?? "";
         const joined = `${this.streamText}${chunk}`.replace(/\s+/g, " ");
@@ -249,15 +254,27 @@ export class ActivityFeed {
       case "tool-start":
         this.setSpinner(`${event.name.replace(/_/g, " ")}…`);
         return;
-      case "tool-applied":
+      case "tool-progress":
+        this.setSpinner(
+          event.name
+            ? `${event.name.replace(/_/g, " ")} · ${event.line}`
+            : event.line,
+        );
+        return;
+      case "tool-applied": {
+        // A media or explain result leaves the revision alone: nothing to undo.
+        const unchanged =
+          event.baseRevision !== undefined &&
+          event.baseRevision === event.resultRevision;
         this.pushCard(event.summary, {
           tone: "success",
           baseRevision: event.baseRevision,
           resultRevision: event.resultRevision,
           trackId: event.trackId,
-          hint: "^z undo",
+          hint: unchanged ? undefined : "^z undo",
         });
         return;
+      }
       case "tool-rejected": {
         const what = event.summary ?? event.name?.replace(/_/g, " ");
         const why = event.reason ?? event.diagnostic;
@@ -309,9 +326,31 @@ export class ActivityFeed {
   }
 }
 
+/**
+ * A command receipt with its outcome carried structurally: `ok: true` is a
+ * success, `false` a failure, `"warn"` a no-op or conflict. Handlers return
+ * these so the strip never infers failure from prose.
+ */
+export type Receipt = Readonly<{ ok: boolean | "warn"; text: string }>;
+
+export const ok = (text: string): Receipt => ({ ok: true, text });
+export const fail = (text: string): Receipt => ({ ok: false, text });
+export const warn = (text: string): Receipt => ({ ok: "warn", text });
+
+/** Tone of a structured receipt; strings fall back to `receiptTone`. */
+export function toneOf(receipt: string | Receipt): CardTone {
+  if (typeof receipt === "string") return receiptTone(receipt);
+  return receipt.ok === true
+    ? "success"
+    : receipt.ok === "warn"
+      ? "warning"
+      : "error";
+}
+
 /**
  * Classify a legacy command receipt string (e.g. "undid · rev 41",
- * "tempo error · …") into a card tone so existing handlers need no rewrite.
+ * "tempo error · …") into a card tone. Fallback for handlers that still
+ * return plain strings; new handlers return a `Receipt`.
  */
 export function receiptTone(message: string): CardTone {
   const lower = message.toLowerCase();