@giovannijecha/jecode 0.6.0 → 0.7.1

package/dist/tui/app.js

@@ -32,6 +32,7 @@ export async function runApp(session, transcriptRoot, environment = {}) {
     const workspace = await workspaceLabel(session.config.root);
     const state = appState();
     state.blocks.push(...session.conversation.transcript);
+    state.committedNodeId = session.conversation.activeNodeId;
     const permissions = sessionPermissions(session.tools, session.config.autoApprove);
     let closed;
     let frameTimer;
@@ -39,12 +40,21 @@ export async function runApp(session, transcriptRoot, environment = {}) {
     let escapeTimer;
     let stopResize = () => { };
     let stopInput = () => { };
+    let failure;
     // Timers outlive the teardown they were scheduled before. Painting after the
     // terminal has been handed back would write escapes into the user's shell.
     let live = true;
     const done = new Promise((resolve) => {
         closed = resolve;
     });
+    const guard = (action) => {
+        try {
+            action();
+        }
+        catch (error) {
+            fail(error);
+        }
+    };
     const view = () => {
         const now = Date.now();
         return {
@@ -93,8 +103,9 @@ export async function runApp(session, transcriptRoot, environment = {}) {
     const render = (block) => {
         if (block !== undefined)
             transcript.invalidate(block);
-        if (live && frameTimer === undefined)
-            frameTimer = setTimeout(draw, FRAME_MS);
+        if (live && frameTimer === undefined) {
+            frameTimer = setTimeout(() => guard(draw), FRAME_MS);
+        }
     };
     const feedback = feedbackController((next) => {
         state.feedback = next;
@@ -116,6 +127,16 @@ export async function runApp(session, transcriptRoot, environment = {}) {
         if (state.follow)
             state.unseen = 0;
     };
+    const replaceTranscript = () => {
+        state.blocks.splice(0, state.blocks.length, ...session.conversation.transcript);
+        state.scroll = 0;
+        state.follow = true;
+        state.unseen = 0;
+        state.lastMaxScroll = 0;
+        transcript.invalidate();
+        paint.invalidate();
+        render();
+    };
     function quit() {
         if (!live)
             return;
@@ -132,6 +153,10 @@ export async function runApp(session, transcriptRoot, environment = {}) {
         terminal.leave();
         closed?.();
     }
+    function fail(error) {
+        failure ??= { error };
+        quit();
+    }
     function requestQuit() {
         const activity = state.activity;
         if (activity === undefined) {
@@ -148,7 +173,7 @@ export async function runApp(session, transcriptRoot, environment = {}) {
         const activity = begin(kind, label);
         state.activity = activity;
         state.status = label;
-        spinTimer = setInterval(() => {
+        spinTimer = setInterval(() => guard(() => {
             if (!session.config.reducedMotion)
                 state.spin++;
             let activeTool;
@@ -160,7 +185,7 @@ export async function runApp(session, transcriptRoot, environment = {}) {
                 break;
             }
             render(activeTool);
-        }, session.config.reducedMotion ? 1_000 : SPIN_MS);
+        }), session.config.reducedMotion ? 1_000 : SPIN_MS);
         render();
         return activity;
     }
@@ -187,6 +212,7 @@ export async function runApp(session, transcriptRoot, environment = {}) {
         emit,
         commandNotice,
         render,
+        replaceTranscript,
         refreshSettings: () => {
             terminal.setReducedMotion(session.config.reducedMotion);
             paint.invalidate();
@@ -229,14 +255,9 @@ export async function runApp(session, transcriptRoot, environment = {}) {
                 return;
             try {
                 await launch.open(candidate.id);
-                state.blocks.splice(0, state.blocks.length, ...session.conversation.transcript);
+                replaceTranscript();
+                state.committedNodeId = session.conversation.activeNodeId;
                 state.past.length = 0;
-                state.scroll = 0;
-                state.follow = true;
-                state.unseen = 0;
-                state.lastMaxScroll = 0;
-                transcript.invalidate();
-                paint.invalidate();
                 finishActivity(activity);
                 return;
             }
@@ -246,39 +267,47 @@ export async function runApp(session, transcriptRoot, environment = {}) {
             }
         }
     }
-    terminal.enter(session.config.reducedMotion);
-    stopResize = terminal.onResize(() => {
-        paint.invalidate();
-        draw();
-    });
-    stopInput = terminal.onInput((chunk) => {
-        if (escapeTimer !== undefined)
-            clearTimeout(escapeTimer);
-        for (const key of keys.push(chunk)) {
-            if (!live)
-                break;
-            input.handle(key);
-        }
-        if (!live)
-            return;
-        escapeTimer = setTimeout(() => {
-            escapeTimer = undefined;
+    try {
+        terminal.enter(session.config.reducedMotion);
+        stopResize = terminal.onResize(() => guard(() => {
+            paint.invalidate();
+            draw();
+        }));
+        stopInput = terminal.onInput((chunk) => guard(() => {
+            if (escapeTimer !== undefined)
+                clearTimeout(escapeTimer);
+            for (const key of keys.push(chunk)) {
+                if (!live)
+                    break;
+                input.handle(key);
+            }
             if (!live)
                 return;
-            for (const key of keys.flush())
-                input.handle(key);
-            if (live)
-                render();
-        }, ESCAPE_MS);
-        render();
-    });
-    draw();
-    try {
-        await resumeAtLaunch;
+            escapeTimer = setTimeout(() => guard(() => {
+                escapeTimer = undefined;
+                if (!live)
+                    return;
+                for (const key of keys.flush())
+                    input.handle(key);
+                if (live)
+                    render();
+            }), ESCAPE_MS);
+            render();
+        }));
+        draw();
+        if (resumeAtLaunch !== undefined)
+            await Promise.race([resumeAtLaunch, done]);
         if (live)
             await done;
+        if (failure !== undefined)
+            throw failure.error;
     }
     finally {
-        await session.persistence?.close();
+        try {
+            quit();
+        }
+        finally {
+            await session.persistence?.close();
+        }
     }
 }

package/dist/tui/components/misc.js

@@ -5,11 +5,13 @@ export function renderNotice(block, width, pal) {
         warn: pal.ink.attention,
         error: pal.ink.removed,
     };
-    const mark = block.tone === "error" ? "× " : block.tone === "warn" ? "! " : "· ";
+    const mark = block.tone === "error" ? "× " : block.tone === "warn" ? "! " : undefined;
     return [
         "",
         ...wrap(block.text, Math.max(1, width - 3)).map((line, index) => row(width, [
-            { text: index === 0 ? mark : "  ", fg: fg[block.tone], bold: index === 0 },
+            ...(mark === undefined
+                ? []
+                : [{ text: index === 0 ? mark : "  ", fg: fg[block.tone], bold: index === 0 }]),
             { text: line, fg: fg[block.tone] },
         ], [], undefined, 1)),
     ];

package/dist/tui/picker.js

@@ -1,6 +1,6 @@
 // One interaction model for every terminal selector.
 import { row } from "../ui/render.js";
-import { elide } from "../ui/width.js";
+import { elide, graphemes } from "../ui/width.js";
 import { menuWindow, renderMenuRows } from "./components/menu.js";
 import { promptCursor, promptLine } from "./components/prompt.js";
 const WINDOW = 6;
@@ -33,7 +33,7 @@ export function type(picker, text) {
 export function backspace(picker) {
     if (picker.searchable !== true || (picker.query ?? "") === "")
         return picker;
-    return withQuery(picker, Array.from(picker.query ?? "").slice(0, -1).join(""));
+    return withQuery(picker, graphemes(picker.query ?? "").slice(0, -1).join(""));
 }
 export function clear(picker) {
     return withQuery(picker, "");

package/dist/ui/terminal-text.js

@@ -38,5 +38,8 @@ export function terminalText(text, options = {}) {
     return safe;
 }
 function isBidiControl(code) {
-    return (code >= 0x202a && code <= 0x202e) || (code >= 0x2066 && code <= 0x2069);
+    return code === 0x061c ||
+        (code >= 0x200e && code <= 0x200f) ||
+        (code >= 0x202a && code <= 0x202e) ||
+        (code >= 0x2066 && code <= 0x2069);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@giovannijecha/jecode",
-  "version": "0.6.0",
+  "version": "0.7.1",
   "description": "An owned coding agent with zero external runtime dependencies.",
   "license": "MIT",
   "repository": {