@giovannijecha/jecode 0.3.1 → 0.4.0

package/dist/tui/keys.js

@@ -5,6 +5,7 @@
 // guessed at; and a bracketed paste arrives as a delimited run that must not be
 // interpreted key by key, or a pasted newline submits half the paste.
 const ESC = String.fromCharCode(27);
+const BS = String.fromCharCode(8);
 const DEL = String.fromCharCode(127);
 const PASTE_START = "[200~";
 const PASTE_END = "[201~";
@@ -35,10 +36,18 @@ const SEQUENCES = {
     "[7~": "home",
     "[8~": "end",
     "[3~": "delete",
+    "[3;5~": "deletewordright",
     "[5~": "pageup",
     "[6~": "pagedown",
     "[1;5C": "wordright",
     "[1;5D": "wordleft",
+    // Explicit modified-key forms used by terminals with CSI-u support.
+    "[127;5u": "deletewordleft",
+    "[8;5u": "deletewordleft",
+    // Readline-compatible Alt bindings. VS Code also sends Alt+D for
+    // Ctrl+Delete and Ctrl+W for Ctrl+Backspace in its integrated terminal.
+    d: "deletewordright",
+    [DEL]: "deletewordleft",
     "[Z": "backtab",
     // alt+enter, which arrives as an escape followed by the return itself. It is
     // how a multi-line message gets written when enter is what sends one.
@@ -48,10 +57,10 @@ const CONTROL = {
     "\r": "enter",
     "\n": "enter",
     "\t": "tab",
-    "\b": "backspace",
+    [BS]: "backspace",
     [DEL]: "backspace",
 };
-export function decoder() {
+export function decoder(options = {}) {
     let held = "";
     let pasting = false;
     let pasted = "";
@@ -121,7 +130,9 @@ export function decoder() {
                 keys.push({ name: "escape", text: "", ctrl: false });
                 continue;
             }
-            const named = CONTROL[ch];
+            const named = ch === BS && options.ctrlBackspaceIsBs === true
+                ? "deletewordleft"
+                : CONTROL[ch];
             if (named !== undefined) {
                 held = held.slice(1);
                 keys.push({ name: named, text: "", ctrl: false });

package/dist/tui/overlay.js

@@ -47,6 +47,12 @@ function handlePicker(open, key) {
         case "down":
             open.picker = picker.move(open.picker, 1);
             break;
+        case "left":
+            open.picker = picker.adjust(open.picker, -1);
+            break;
+        case "right":
+            open.picker = picker.adjust(open.picker, 1);
+            break;
         case "home":
             open.picker = picker.edge(open.picker, "home");
             break;

package/dist/tui/picker.js

@@ -19,6 +19,12 @@ export function edge(picker, end) {
 export function page(picker, direction, rows = WINDOW) {
     return move(picker, direction * Math.max(1, rows));
 }
+export function adjust(picker, step) {
+    const index = selected(picker);
+    return index === undefined || picker.adjust === undefined
+        ? picker
+        : picker.adjust(index, step);
+}
 export function type(picker, text) {
     if (picker.searchable !== true || text === "")
         return picker;
@@ -45,18 +51,21 @@ export function byKey(picker, text) {
     const found = picker.options.findIndex((option) => option.key === typed);
     return found === -1 ? undefined : found;
 }
-export function panel(picker, width, pal, maxRows = WINDOW + 3) {
+export function panel(picker, width, pal, maxRows = (picker.visible ?? WINDOW) + 3) {
     return layout(picker, width, pal, maxRows).rows;
 }
 /** Caret for the shared query row, relative to the unframed picker body. */
-export function caret(picker, width, maxRows = WINDOW + 3) {
+export function caret(picker, width, maxRows = (picker.visible ?? WINDOW) + 3) {
     return layout(picker, width, undefined, maxRows).cursor;
 }
 function layout(picker, width, pal, maxRows) {
     const found = matches(picker);
     const note = picker.description ?? picker.footer;
-    const fixed = 1 + (note === undefined ? 0 : 1) + (picker.searchable === true ? 1 : 0);
-    const optionRoom = Math.max(1, Math.min(WINDOW, maxRows - fixed));
+    const hasTitle = picker.title.length > 0;
+    const fixed = (hasTitle ? 1 : 0) +
+        (note === undefined ? 0 : 1) +
+        (picker.searchable === true ? 1 : 0);
+    const optionRoom = Math.max(1, Math.min(picker.visible ?? WINDOW, maxRows - fixed));
     const selectedAt = Math.max(0, found.findIndex((entry) => entry.index === picker.index));
     const { first, last } = menuWindow(found.length, selectedAt, optionRoom);
     const shown = found.slice(first, last);
@@ -67,14 +76,19 @@ function layout(picker, width, pal, maxRows) {
             ? [row(width, [{ text: "no matches", fg: colors.ink.muted }])]
             : renderMenuRows(shown.map(({ option, index }) => ({
                 label: option.label,
+                description: option.description,
                 hint: option.hint,
+                value: option.value,
+                adjustable: option.adjustable,
                 selected: index === picker.index,
             })), width, colors);
     const progress = found.length > shown.length || picker.searchable === true
         ? `${found.length === 0 ? "0" : `${first + 1}–${first + shown.length}`} / ${found.length}` +
             (found.length === picker.options.length ? "" : ` · ${picker.options.length} total`)
         : "";
-    const titleRight = picker.right ?? (picker.searchable === true ? undefined : progress);
+    const titleRight = hasTitle
+        ? picker.right ?? (picker.searchable === true ? undefined : progress)
+        : undefined;
     const visibleTitleRight = titleRight === undefined
         ? undefined
         : elide(titleRight, Math.max(1, Math.floor(width * 0.55)));
@@ -87,14 +101,16 @@ function layout(picker, width, pal, maxRows) {
     const queryCursor = picker.searchable === true
         ? promptCursor(picker.query ?? "", (picker.query ?? "").length, width, { right: progress })
         : undefined;
-    const queryOffset = 1 + (note === undefined ? 0 : 1);
+    const queryOffset = (hasTitle ? 1 : 0) + (note === undefined ? 0 : 1);
     return {
         rows: colors === undefined
             ? []
             : [
-                row(width, picker.title, visibleTitleRight === undefined || visibleTitleRight === ""
-                    ? []
-                    : [{ text: visibleTitleRight, fg: colors.ink.muted }]),
+                ...(hasTitle
+                    ? [row(width, picker.title, visibleTitleRight === undefined || visibleTitleRight === ""
+                            ? []
+                            : [{ text: visibleTitleRight, fg: colors.ink.dim }])]
+                    : []),
                 ...(note === undefined ? [] : [row(width, [{ text: note, fg: colors.ink.muted }])]),
                 ...(queryRow === undefined ? [] : [queryRow.row]),
                 ...options,
@@ -113,7 +129,7 @@ export function heading(label, about, pal) {
 function matches(picker) {
     const query = (picker.query ?? "").trim().toLocaleLowerCase();
     return picker.options.flatMap((option, index) => {
-        const haystack = `${option.label} ${option.hint ?? ""}`.toLocaleLowerCase();
+        const haystack = `${option.label} ${option.hint ?? ""} ${option.value ?? ""}`.toLocaleLowerCase();
         return query === "" || haystack.includes(query) ? [{ option, index }] : [];
     });
 }

package/dist/tui/session-view.js

@@ -28,13 +28,13 @@ export function turnFailure(session, error, aborted) {
     if (/\b401\b/.test(text)) {
         const auth = session.provider.auth;
         if (auth.kind === "oauth") {
-            text += ` · reconnect ${auth.label} in /settings`;
+            text += ` · reconnect ${auth.label} in /providers`;
         }
         else {
             const source = credentialSource(auth.keyVar);
             text += source === "environment"
                 ? ` · update ${auth.keyVar} in the environment and restart`
-                : " · check credentials with /settings";
+                : " · check access with /providers";
         }
     }
     return { kind: "notice", text, tone: "error" };

package/dist/tui/view.js

@@ -79,7 +79,7 @@ function tooSmall(height, width, view) {
     ]);
     if (middle + 1 < height) {
         rows[middle + 1] = row(width, [
-            { text: elide(`need ${MIN_COLS}×${MIN_ROWS}`, Math.max(1, width)), fg: view.pal.ink.muted },
+            { text: elide(`need ${MIN_COLS}×${MIN_ROWS}`, Math.max(1, width)), fg: view.pal.ink.dim },
         ]);
     }
     return { rows, maxScroll: 0 };

package/dist/ui/inline.js

@@ -21,7 +21,7 @@ export function inline(text, base, pal, bold = false) {
         }
         const [, mono, strong, strongAlt, emphasis, label] = match;
         if (mono !== undefined)
-            segs.push({ text: mono, fg: pal.accentSoft });
+            segs.push({ text: mono, fg: pal.technical });
         else if (strong !== undefined)
             segs.push({ text: strong, fg: ink.bright, bold: true });
         else if (strongAlt !== undefined)
@@ -29,7 +29,7 @@ export function inline(text, base, pal, bold = false) {
         else if (emphasis !== undefined)
             segs.push({ text: emphasis, fg: ink.bright });
         else if (label !== undefined)
-            segs.push({ text: label, fg: pal.accent });
+            segs.push({ text: label, fg: pal.technical });
         last = match.index + match[0].length;
     }
     if (last < text.length) {

package/dist/ui/markdown.js

@@ -63,7 +63,7 @@ export function markdown(text, max, pal, proseMax = max) {
             const depth = Math.min(2, Math.floor(bullet[1].length / 2));
             const mark = [
                 { text: "  ".repeat(depth) },
-                { text: "- ", fg: pal.accent },
+                { text: "- ", fg: pal.technical },
             ];
             const hang = [{ text: `${"  ".repeat(depth)}  ` }];
             rows.push(...emit(inline(bullet[2], ink.fg, pal), prose - depth * 2 - 2, mark, hang));
@@ -72,7 +72,7 @@ export function markdown(text, max, pal, proseMax = max) {
         const ordered = ORDERED.exec(line);
         if (ordered !== null) {
             const label = `${ordered[2]}. `;
-            const mark = [{ text: label, fg: pal.accent }];
+            const mark = [{ text: label, fg: pal.technical }];
             const hang = [{ text: " ".repeat(label.length) }];
             rows.push(...emit(inline(ordered[3], ink.fg, pal), prose - label.length, mark, hang));
             continue;
@@ -120,13 +120,13 @@ function code(lines, start, max, pal, out) {
             break;
         body.push(elide(line.replace(/\t/g, "  "), max - 2));
     }
-    out.push({ segs: [{ text: `\`\`\`${lang}`, fg: ink.muted }] });
+    out.push({ segs: [{ text: `\`\`\`${lang}`, fg: ink.dim }] });
     const roles = {
-        plain: ink.added,
-        comment: ink.muted,
+        plain: ink.fg,
+        comment: ink.dim,
         string: ink.added,
         number: ink.attention,
-        keyword: pal.accent,
+        keyword: pal.technical,
     };
     for (const tokens of highlight(body, lang)) {
         out.push({
@@ -136,7 +136,7 @@ function code(lines, start, max, pal, out) {
             ],
         });
     }
-    out.push({ segs: [{ text: "```", fg: ink.muted }] });
+    out.push({ segs: [{ text: "```", fg: ink.dim }] });
     return i;
 }
 /** Flow one inline run into rows, with an opener and a hanging indent. */

package/dist/ui/theme.js

@@ -5,20 +5,20 @@
 // Components depend on these roles rather than embedding presentation values.
 export const STEEL = {
     accent: [102, 155, 210],
-    accentSoft: [131, 213, 245],
+    technical: [78, 201, 232],
     focus: [102, 155, 210],
     rule: [53, 80, 110],
     ink: {
-        fg: [212, 218, 225],
+        fg: [220, 224, 229],
         bright: [235, 239, 244],
-        muted: [112, 124, 137],
+        muted: [156, 169, 183],
+        dim: [112, 124, 137],
         attention: [230, 191, 95],
         added: [134, 203, 146],
         removed: [232, 112, 112],
     },
     surface: {
         subtle: [31, 38, 47],
-        inset: [18, 24, 31],
         added: [22, 55, 34],
         removed: [62, 24, 27],
         attention: [62, 50, 19],

package/package.json

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