@thoth-agents/pi-thoth-theme 0.3.0 → 0.5.0

package/README.md

@@ -27,6 +27,26 @@ from the repository root. Restart Pi after installation.
 Select the `thoth` theme in Pi's theme settings. Theme selection is independent
 of the module toggles below.
 
+## User messages
+
+The `thoth` theme renders user messages in `#E8DCB5` on `#120E0A`.
+The extension surrounds the original Markdown with a top `╭── <icon> user ─…╮`
+and bottom `╰─…╯` frame, separated from the content by blank lines. Both borders
+fill the content width after Pi's horizontal padding and adapt on terminal resize.
+Framing is skipped when the width is missing, invalid, or too narrow to fit the
+title, one fill cell and the closing corner (13 columns with the current icons).
+This is display-only: stored messages, assistant replies and thinking are unchanged.
+Blank content and already-framed messages are left alone. The frame is independent
+of the optional modules below.
+
+The frame reuses `icons`: `"nerd"` (the existing default) selects nf-fa-user
+(U+F007), `"unicode"` selects `●` (U+25CF), and `"ascii"` selects `@`.
+Set `"icons": "nerd"` in the package configuration and use a Nerd Font in your
+terminal for the Nerd glyph; use `"icons": "unicode"` for its Unicode fallback.
+
+Markdown accents and syntax colors remain shared with assistant messages; only
+ordinary user text and the frame use `userMessageText` (`#E8DCB5`).
+
 ## Modules
 
 - **Status line**: a responsive footer below the input showing cumulative
@@ -37,8 +57,10 @@ of the module toggles below.
   drop speed, then cache, then tokens before truncating cost. Editor-border
   metadata is decorated in place without claiming the custom editor slot.
 - **Tools**: boxed calls and results for `read`, `bash`, `powershell`, `ls`,
-  `grep`, `find`, `edit` and `write`, with Nerd Font icons, native Unicode
-  glyphs or ASCII alternatives. `bash` and `powershell` show a live elapsed time
+  `grep`, `find`, `edit`, `write` and `codemode`, with Nerd Font icons, native Unicode
+  glyphs or ASCII alternatives. `codemode` previews up to eight nested calls
+  with status and duration; expanded results show the script, output and errors
+  without replacing Pi's builtin codemode extension. `bash` and `powershell` show a live elapsed time
   while running. Execution and parameters delegate to Pi's built-in tools;
   Pi's native output toggle still
   collapses and expands results. Registered non-built-in tools keep their own

package/dist/index.ts

@@ -54,6 +54,15 @@ function getToolElapsedMs(options) {
     state.completedElapsedMs = elapsedMs;
   return elapsedMs;
 }
+function renderToolFooter(kit, theme, options) {
+  if (kit?.toolFooter) return kit.toolFooter(theme, options);
+  const elapsedMs = getToolElapsedMs(options);
+  const elapsed = elapsedMs === void 0 ? "" : formatDuration(Math.floor(elapsedMs / 1e3) * 1e3);
+  const terminalGlyph = terminalFooterGlyphs[options.status];
+  const status = terminalGlyph ?? (options.status === "in_progress" ? "running" : options.status);
+  const summary = typeof options.summary === "string" ? [options.summary] : options.summary ?? [];
+  return [status, elapsed, ...terminalGlyph ? summary : []].filter(Boolean).join(" \xB7 ");
+}
 function registration() {
   try {
     const record = shared[registryKey];
@@ -71,6 +80,41 @@ function registerRenderKit(kit, owner) {
 function withdrawRenderKit(token) {
   if (registration()?.token === token) delete shared[registryKey];
 }
+function getRenderKit() {
+  try {
+    const kit = registration()?.kit;
+    if (kit?.version === RENDER_KIT_VERSION && (!("resolveToolRenderers" in kit) || typeof kit.resolveToolRenderers === "function") && (!("toolFooter" in kit) || typeof kit.toolFooter === "function") && (!("icon" in kit) || typeof kit.icon === "function") && [
+      "card",
+      "collapse",
+      "cachedComponent",
+      "indicator",
+      "statusGlyph",
+      "widgetHeading",
+      "treeRow",
+      "fg"
+    ].every(
+      (method2) => typeof kit[method2] === "function"
+    ))
+      return kit;
+  } catch {
+  }
+  return void 0;
+}
+function createKitRenderMemo() {
+  let cached;
+  return {
+    render(width, build) {
+      const kit = getRenderKit();
+      if (!cached || cached.width !== width || cached.kit !== kit) {
+        cached = { width, kit, lines: build(kit) };
+      }
+      return cached.lines;
+    },
+    invalidate() {
+      cached = void 0;
+    }
+  };
+}
 var nativeFrames, terminalFooterGlyphs, RENDER_KIT_VERSION, registryKey, shared;
 var init_render_kit = __esm({
   "../pi-core/src/render-kit.ts"() {
@@ -95,6 +139,9 @@ var init_render_kit = __esm({
       completed: "\u2713",
       deleted: "\u2713",
       failed: "\u2717",
+      timedOut: "\u25F7",
+      resolved: "\u21BB",
+      expectedExit: "\u2713",
       cancelled: "\u2717",
       interrupted: "\u2717",
       blocked: "\u2717"
@@ -115,6 +162,9 @@ var init_panel_frame = __esm({
   }
 });
 
+// src/index.ts
+import { visibleWidth as visibleWidth8 } from "@earendil-works/pi-tui";
+
 // ../pi-core/src/validation.ts
 function isRecord(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
@@ -477,6 +527,7 @@ function cachedComponent(renderFn) {
 
 // src/shared/icons.ts
 var ICONS = {
+  user: { nerd: "\uF007", unicode: "\u25CF", ascii: "@" },
   branch: { nerd: "\uE0A0", unicode: "\u2442", ascii: "git" },
   folder: { nerd: "\uF07C", unicode: "dir", ascii: "dir" },
   model: { nerd: "\u{F06A9}", unicode: "\u25CF", ascii: "*" },
@@ -548,7 +599,10 @@ var STATUS_ICONS = {
   running: { nerd: "\u25D0", unicode: "\u25D0", ascii: "*" },
   completed: { nerd: "\uF00C", unicode: "\u2713", ascii: "+" },
   failed: { nerd: "\uF00D", unicode: "\u2717", ascii: "x" },
-  cancelled: STOP,
+  timedOut: { nerd: "\uF017", unicode: "\u25F7", ascii: "T" },
+  resolved: { nerd: "\uF021", unicode: "\u21BB", ascii: "~" },
+  expectedExit: { nerd: "\uF00C", unicode: "\u2713", ascii: "+" },
+  cancelled: { ...STOP, ascii: "#" },
   interrupted: STOP,
   stopping: STOP,
   deleted: BLOCKED,
@@ -923,6 +977,9 @@ var STATUS_ROLE = {
   running: "accent",
   completed: "success",
   failed: "error",
+  timedOut: "warning",
+  resolved: "muted",
+  expectedExit: "dim",
   cancelled: "muted",
   interrupted: "warning",
   stopping: "warning",
@@ -934,13 +991,16 @@ var TOOL_FOOTER_STATUS = {
   completed: "completed",
   deleted: "completed",
   failed: "failed",
+  timedOut: "timedOut",
+  resolved: "resolved",
+  expectedExit: "expectedExit",
   cancelled: "failed",
   interrupted: "failed",
   blocked: "failed"
 };
 function startsWithFooterGlyph(footer, mode) {
   const plain = stripTerminalSequences(footer);
-  return ["completed", "failed"].some((status) => {
+  return ["completed", "failed", "timedOut", "resolved", "expectedExit"].some((status) => {
     const glyph = statusIcon(status, mode);
     return plain.startsWith(glyph) && (plain.length === glyph.length || /^\s/u.test(plain.slice(glyph.length)));
   });
@@ -2254,6 +2314,148 @@ function createCustomPowerShellTool(_cwd, config) {
   return createCustomShellTool(POWERSHELL_CONFIG, config);
 }
 
+// src/tools/codemode.ts
+var COLLAPSED_CALLS = 8;
+var RESULT_PRESENT = "codemodeResultPresent";
+var RESULT_BORDER = "codemodeResultBorder";
+var CALL_COMPONENT = "codemodeCallComponent";
+var CALL_STATUS = {
+  running: "running",
+  ok: "completed",
+  error: "failed",
+  cancelled: "cancelled"
+};
+function displayLines(text) {
+  return text.split("\n").map(escapeControlCharacters);
+}
+function scriptText(args) {
+  return args && typeof args === "object" && "code" in args && typeof args.code === "string" ? args.code : "(script unavailable)";
+}
+function displayCalls(details) {
+  if (!details || typeof details !== "object" || !("calls" in details) || !Array.isArray(details.calls))
+    return [];
+  return details.calls.flatMap((call) => {
+    if (!call || typeof call !== "object" || !("name" in call) || typeof call.name !== "string" || !("status" in call) || call.status !== "running" && call.status !== "ok" && call.status !== "error" && call.status !== "cancelled")
+      return [];
+    return [
+      {
+        name: call.name,
+        status: call.status,
+        durationMs: "durationMs" in call && typeof call.durationMs === "number" && Number.isFinite(call.durationMs) && call.durationMs >= 0 ? call.durationMs : void 0,
+        error: "error" in call && typeof call.error === "string" ? call.error : void 0
+      }
+    ];
+  });
+}
+function createCodemodeRenderer(config) {
+  const fallbackKit = createRenderKit({}, void 0, config.icons);
+  return {
+    renderShell: "self",
+    renderCall(_args, theme, context) {
+      if (context?.state) {
+        context.state[RESULT_PRESENT] = false;
+        context.state[RESULT_BORDER] = void 0;
+      }
+      const memo = createKitRenderMemo();
+      const component = {
+        invalidate: () => memo.invalidate(),
+        render(width) {
+          return memo.render(width, (registeredKit) => {
+            const kit = registeredKit ?? fallbackKit;
+            const hasResult = context?.state?.[RESULT_PRESENT] === true;
+            const status = context?.executionStarted ? "running" : "pending";
+            return kit.card(
+              theme,
+              {
+                title: theme.fg("toolTitle", "codemode"),
+                footer: hasResult ? "" : renderToolFooter(kit, theme, { status, context }),
+                part: hasResult ? "start" : "full",
+                ...context?.state?.[RESULT_BORDER]
+              },
+              width
+            );
+          });
+        }
+      };
+      if (context?.state) context.state[CALL_COMPONENT] = component;
+      return component;
+    },
+    renderResult(result, options, theme, context) {
+      const status = options.isPartial ? "running" : context?.isError ? "failed" : "completed";
+      const border = {
+        isError: status === "failed",
+        isSuccess: status === "completed" && context?.executionStarted !== false
+      };
+      if (context?.state) {
+        context.state[RESULT_PRESENT] = true;
+        context.state[RESULT_BORDER] = border;
+        context.state[CALL_COMPONENT]?.invalidate?.();
+      }
+      const calls = displayCalls(result.details);
+      const visibleCalls = options.expanded ? calls : calls.slice(0, COLLAPSED_CALLS);
+      const output = displayLines(getResultText(result) || "(no output)");
+      const errors = calls.flatMap(
+        (call) => call.error ? displayLines(`${call.name}: ${call.error}`).map(
+          (line) => theme.fg("error", line)
+        ) : []
+      );
+      const memo = createKitRenderMemo();
+      return {
+        invalidate: () => memo.invalidate(),
+        render(width) {
+          return memo.render(width, (registeredKit) => {
+            const kit = registeredKit ?? fallbackKit;
+            return kit.card(
+              theme,
+              {
+                part: context?.state?.[CALL_COMPONENT] ? "end" : "full",
+                title: theme.fg("toolTitle", "codemode"),
+                body: (bodyWidth) => {
+                  if (calls.length === 0) {
+                    return options.expanded ? [] : kit.collapse(theme, output, options);
+                  }
+                  const rows = visibleCalls.map((call, i) => {
+                    const duration = call.durationMs === void 0 ? "" : ` \xB7 ${formatDuration(call.durationMs)}`;
+                    return kit.treeRow(
+                      theme,
+                      {
+                        text: `${kit.statusGlyph(theme, CALL_STATUS[call.status])} ${escapeControlCharacters(call.name)}${duration}`,
+                        last: i === visibleCalls.length - 1
+                      },
+                      bodyWidth
+                    );
+                  });
+                  if (!options.expanded && calls.length > COLLAPSED_CALLS) {
+                    rows.push(
+                      theme.fg(
+                        "dim",
+                        `+${calls.length - COLLAPSED_CALLS} more \xB7 ctrl+o to expand`
+                      )
+                    );
+                  }
+                  return rows;
+                },
+                sections: options.expanded ? [
+                  {
+                    title: "Script",
+                    rows: displayLines(scriptText(context?.args))
+                  },
+                  { title: "Output", rows: output },
+                  ...errors.length ? [{ title: "Errors", rows: errors }] : []
+                ] : void 0,
+                wrap: options.expanded,
+                footer: renderToolFooter(kit, theme, { status, context }),
+                ...border
+              },
+              width
+            );
+          });
+        }
+      };
+    }
+  };
+}
+
 // src/tools/edit.ts
 var COLLAPSED_DIFF_LINES = 6;
 function parseDiffStats(diffText) {
@@ -3345,6 +3547,7 @@ function createCustomWriteTool(cwd, config) {
 // src/tools/index.ts
 function createToolRendererResolver(pi, config, cwd = process.cwd()) {
   const renderers = /* @__PURE__ */ new Map([
+    ["codemode", createCodemodeRenderer(config)],
     ["read", createCustomReadTool(cwd, config)],
     ["bash", createCustomBashTool(cwd, config)],
     ["powershell", createCustomPowerShellTool(cwd, config)],
@@ -3928,6 +4131,22 @@ function registerWelcome(pi, ctx, config, options) {
 // src/index.ts
 function thothTheme(pi) {
   const config = loadConfig();
+  pi.registerMarkdownTransformer((markdown, context) => {
+    if (context.messageType !== "user" || !markdown.trim()) return markdown;
+    if (/^╭── [\uF007●@] user ─+╮\r?\n\r?\n[\s\S]*\r?\n\r?\n╰─+╯$/.test(markdown))
+      return markdown;
+    const width = context.availableWidth;
+    const title = `\u256D\u2500\u2500 ${icon("user", config.icons)} user `;
+    const titleWidth = visibleWidth8(title);
+    if (!Number.isInteger(width) || width < titleWidth + 2) return markdown;
+    const top = `${title}${"\u2500".repeat(width - titleWidth - 1)}\u256E`;
+    const bottom = `\u2570${"\u2500".repeat(width - 2)}\u256F`;
+    return `${top}
+
+${markdown}
+
+${bottom}`;
+  });
   const owner = {};
   const cwd = process.cwd();
   const resolveToolRenderers = config.tools.enabled ? createToolRendererResolver(pi, config, cwd) : void 0;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@thoth-agents/pi-thoth-theme",
-  "version": "0.3.0",
+  "version": "0.5.0",
   "private": false,
   "description": "Modular Thoth theme, status line, tool styling, and welcome header for Pi.",
   "license": "MIT",
@@ -50,7 +50,7 @@
     "@earendil-works/pi-tui": "1.0.2",
     "@earendil-works/pi-ai": "1.0.2",
     "@rolldown/binding-wasm32-wasi": "^1.2.4",
-    "@thoth-agents/pi-core": "^0.3.0"
+    "@thoth-agents/pi-core": "^0.4.0"
   },
   "upstream": {
     "repository": "https://github.com/QuangThai/pi-omp-theme",