@mrciphersmith/keryx 0.2.58 → 0.2.60

package/dist/cli.js

@@ -53454,7 +53454,7 @@ import { spawnSync as spawnSync2 } from "child_process";
 // package.json
 var package_default = {
   name: "@mrciphersmith/keryx",
-  version: "0.2.58",
+  version: "0.2.60",
   description: "Version-controlled project context for AI coding agents: code graph, architecture wiki, project memory, relevant tests, quality signals, and task flows.",
   private: false,
   publishConfig: {
@@ -57441,6 +57441,31 @@ function checkWinner(board) {
   }
   return null;
 }
+function freeCells(board) {
+  return board.flatMap((cell, index) => cell === null ? [index] : []);
+}
+function bestLocalMove(board, mark) {
+  const free = freeCells(board);
+  if (free.length === 0) {
+    return;
+  }
+  const opponent = mark === "X" ? "O" : "X";
+  for (const candidate of [mark, opponent]) {
+    for (const index of free) {
+      const next = board.slice();
+      next[index] = candidate;
+      if (checkWinner(next)?.winner === candidate) {
+        return index;
+      }
+    }
+  }
+  for (const index of [4, 0, 2, 6, 8]) {
+    if (board[index] === null) {
+      return index;
+    }
+  }
+  return free[0];
+}
 function placeMark(board, index, mark) {
   if (index < 0 || index > 8 || board[index] !== null) {
     return;
@@ -57482,7 +57507,8 @@ function gameSystemPrompt() {
     "3 4 5",
     "6 7 8",
     "Reply with ONLY the index of the cell you choose, as a single digit 0-8.",
-    "Choose an empty cell. Prefer winning, then blocking, then center/corner."
+    "Choose an empty cell. Prefer winning, then blocking, then center/corner.",
+    "Answer immediately. No explanation, no working out \u2014 one character."
   ].join(`
 `);
 }
@@ -57500,7 +57526,7 @@ async function modelMove(board, opts = {}) {
     user: gameUserPrompt(board),
     ...opts.provider !== undefined ? { provider: opts.provider } : {},
     ...opts.model !== undefined ? { model: opts.model } : {},
-    maxOutputTokens: 16,
+    maxOutputTokens: 256,
     requestId: "keryx-game",
     ...opts.providerFactory !== undefined ? { providerFactory: opts.providerFactory } : {},
     ...opts.env !== undefined ? { env: opts.env } : {}
@@ -57519,6 +57545,20 @@ var GAME_FOOTER = [
   { key: "r", label: "new game" },
   { key: "esc", label: "minimize" }
 ];
+var GAME_CELL_GAP = 1;
+var GAME_BOARD_CHROME_X = 4;
+var GAME_CELL_SIZES = {
+  large: { width: 9, height: 5 },
+  small: { width: 5, height: 3 }
+};
+function gameBoardWidth(cellWidth) {
+  return cellWidth * 3 + GAME_CELL_GAP * 2 + GAME_BOARD_CHROME_X;
+}
+function resolveCellSize(availableWidth) {
+  const large = GAME_CELL_SIZES.large;
+  return gameBoardWidth(large.width) <= availableWidth ? large : GAME_CELL_SIZES.small;
+}
+var GAME_MODEL_TIMEOUT_MS = 12000;
 function asOtui2(otui) {
   if (otui === undefined || otui === null) {
     return;
@@ -57545,37 +57585,40 @@ function statusText(state) {
   if (state.draw) {
     return "Draw!  (r \u2014 new game)";
   }
-  return `Your turn \u2014 ${state.turn}`;
+  return state.turn === "X" ? "Your turn \u2014 X" : "Agent's turn \u2014 O";
 }
 function presentGame(openModalFn, otui, chrome, options = {}) {
   const renderer = options.renderer;
   const core = asOtui2(otui);
   let handle;
-  let boardBox;
+  let cells = [];
   let statusBox;
-  let hintBox;
+  let noticeBox;
   let cursor = 4;
+  let notice;
   let unsubscribeKey;
   const paint = () => {
-    if (core === undefined || boardBox === undefined || statusBox === undefined || hintBox === undefined) {
+    if (statusBox === undefined || noticeBox === undefined || cells.length !== 9) {
       return;
     }
     const theme = getTheme();
-    clearTranscriptChildren(boardBox);
     statusBox.content = statusText(currentGame);
-    hintBox.content = modelBusy ? "agent is thinking\u2026" : "\u2190\u2191\u2193\u2192 move \xB7 enter place \xB7 r new game \xB7 esc minimize";
-    for (let i = 0;i < 9; i++) {
-      const cell = currentGame.board[i] ?? null;
-      const isCursor = i === cursor && !isGameOver(currentGame) && !modelBusy;
-      const win = currentGame.winLine?.includes(i) === true;
-      const content = cell === null ? isCursor ? "\xB7" : "." : cell;
-      const fg = cell === null ? isCursor ? theme.focus : theme.muted : markColor(cell);
-      const styled2 = win && core.bold !== undefined ? core.bold(content) : content;
-      boardBox.add(new core.TextRenderable(renderer, {
-        id: `game-cell-${i}`,
-        content: styled2,
-        fg
-      }));
+    statusBox.fg = theme.text;
+    if (modelBusy) {
+      noticeBox.content = "agent is thinking\u2026";
+      noticeBox.fg = theme.focus;
+    } else {
+      noticeBox.content = notice ?? "";
+      noticeBox.fg = theme.error;
+    }
+    for (const [index, view] of cells.entries()) {
+      const cell = currentGame.board[index] ?? null;
+      const isCursor = index === cursor && !isGameOver(currentGame) && !modelBusy;
+      const won = currentGame.winLine?.includes(index) === true;
+      view.text.content = cell ?? "\xB7";
+      view.text.fg = cell === null ? theme.muted : markColor(cell);
+      view.box.borderColor = won ? markColor(currentGame.winner ?? "X") : isCursor ? theme.focus : theme.border;
+      view.box.backgroundColor = isCursor || won ? theme.highlight : undefined;
     }
   };
   const applyModelMove = async () => {
@@ -57583,26 +57626,44 @@ function presentGame(openModalFn, otui, chrome, options = {}) {
       return;
     }
     modelBusy = true;
+    notice = undefined;
     paint();
-    const result = await modelMove(currentGame.board, {
-      ...options.provider !== undefined ? { provider: options.provider } : {},
-      ...options.model !== undefined ? { model: options.model } : {},
-      ...options.providerFactory !== undefined ? { providerFactory: options.providerFactory } : {},
-      ...options.env !== undefined ? { env: options.env } : {}
+    const timeoutMs = options.timeoutMs ?? GAME_MODEL_TIMEOUT_MS;
+    let timer;
+    const deadline = new Promise((resolve3) => {
+      timer = setTimeout(() => resolve3("timeout"), timeoutMs);
     });
+    const outcome = await Promise.race([
+      modelMove(currentGame.board, {
+        ...options.provider !== undefined ? { provider: options.provider } : {},
+        ...options.model !== undefined ? { model: options.model } : {},
+        ...options.providerFactory !== undefined ? { providerFactory: options.providerFactory } : {},
+        ...options.env !== undefined ? { env: options.env } : {}
+      }),
+      deadline
+    ]);
+    if (timer !== undefined) {
+      clearTimeout(timer);
+    }
     modelBusy = false;
-    if (result.move !== undefined) {
-      const placed = placeMark(currentGame.board, result.move, "O");
-      if (placed !== undefined) {
-        currentGame = placed;
-      } else {
-        currentGame = { ...currentGame, turn: "X" };
-      }
+    const timedOut = outcome === "timeout";
+    const result = timedOut ? { move: undefined, error: undefined } : outcome;
+    let move = result.move;
+    let playedLocally = false;
+    if (move === undefined && result.error === undefined) {
+      move = bestLocalMove(currentGame.board, "O");
+      playedLocally = move !== undefined;
+    }
+    const placed = move === undefined ? undefined : placeMark(currentGame.board, move, "O");
+    currentGame = placed ?? { ...currentGame, turn: "X" };
+    if (result.error !== undefined) {
+      notice = `agent: ${result.error}`;
+    } else if (timedOut && playedLocally) {
+      notice = `agent timed out after ${Math.round(timeoutMs / 1000)}s \u2014 played a local move`;
+    } else if (playedLocally) {
+      notice = "agent gave no usable answer \u2014 played a local move";
     } else {
-      currentGame = { ...currentGame, turn: "X" };
-      if (result.error !== undefined) {
-        statusBox !== undefined && (statusBox.content = `agent: ${result.error}`);
-      }
+      notice = undefined;
     }
     paint();
   };
@@ -57615,6 +57676,7 @@ function presentGame(openModalFn, otui, chrome, options = {}) {
       return;
     }
     currentGame = placed;
+    notice = undefined;
     paint();
     if (!isGameOver(currentGame) && currentGame.turn === "O") {
       applyModelMove();
@@ -57632,13 +57694,18 @@ function presentGame(openModalFn, otui, chrome, options = {}) {
   const restart = () => {
     resetGame();
     cursor = 4;
+    notice = undefined;
     paint();
   };
   handle = openModalFn(otui, chrome, {
     title: "/game",
     tabs: [{ id: "game", label: "Tic-tac-toe" }],
     footer: GAME_FOOTER,
-    renderTab: (_tabId, body) => {
+    onArrowKeys: (_key, direction) => {
+      moveCursor(0, direction === "left" ? -1 : 1);
+      return true;
+    },
+    renderTab: (_tabId, body, ctx) => {
       if (body === undefined || body === null) {
         return;
       }
@@ -57647,10 +57714,27 @@ function presentGame(openModalFn, otui, chrome, options = {}) {
         return;
       }
       const theme = getTheme();
-      const board = new core.BoxRenderable(renderer, {
+      const r = renderer;
+      const cellSize = resolveCellSize(ctx.width);
+      const wrap2 = new core.BoxRenderable(r, {
+        id: "game-wrap",
+        width: "100%",
+        flexDirection: "column",
+        alignItems: "center"
+      });
+      const legend = new core.BoxRenderable(r, {
+        id: "game-legend",
+        flexDirection: "row",
+        marginBottom: 1
+      });
+      legend.add(new core.TextRenderable(r, { id: "game-legend-x", content: "X you", fg: theme.ok }));
+      legend.add(new core.TextRenderable(r, { id: "game-legend-sep", content: "  \xB7  ", fg: theme.muted }));
+      legend.add(new core.TextRenderable(r, { id: "game-legend-o", content: "O model", fg: theme.error }));
+      wrap2.add(legend);
+      const board = new core.BoxRenderable(r, {
         id: "game-board",
-        width: 15,
         flexDirection: "column",
+        flexShrink: 0,
         border: true,
         borderStyle: "rounded",
         borderColor: theme.border,
@@ -57658,22 +57742,55 @@ function presentGame(openModalFn, otui, chrome, options = {}) {
         paddingLeft: 1,
         paddingRight: 1
       });
-      boardBox = board;
-      parent.add(board);
-      const status = new core.TextRenderable(renderer, {
+      cells = [];
+      for (let row = 0;row < 3; row++) {
+        const rowBox = new core.BoxRenderable(r, {
+          id: `game-row-${row}`,
+          flexDirection: "row",
+          flexShrink: 0,
+          gap: GAME_CELL_GAP
+        });
+        for (let col = 0;col < 3; col++) {
+          const index = row * 3 + col;
+          const cellBox = new core.BoxRenderable(r, {
+            id: `game-cell-${index}`,
+            width: cellSize.width,
+            height: cellSize.height,
+            flexShrink: 0,
+            flexGrow: 0,
+            flexDirection: "row",
+            alignItems: "center",
+            justifyContent: "center",
+            border: true,
+            borderStyle: "rounded",
+            borderColor: theme.border
+          });
+          const cellText = new core.TextRenderable(r, {
+            id: `game-cell-text-${index}`,
+            content: "\xB7",
+            fg: theme.muted
+          });
+          cellBox.add(cellText);
+          rowBox.add(cellBox);
+          cells.push({ box: cellBox, text: cellText });
+        }
+        board.add(rowBox);
+      }
+      wrap2.add(board);
+      const status = new core.TextRenderable(r, {
         id: "game-status",
         content: "",
         marginTop: 1
       });
       statusBox = status;
-      parent.add(status);
-      const hint = new core.TextRenderable(renderer, {
-        id: "game-hint",
-        content: "",
-        marginTop: 1
+      wrap2.add(status);
+      const noticeText = new core.TextRenderable(r, {
+        id: "game-notice",
+        content: ""
       });
-      hintBox = hint;
-      parent.add(hint);
+      noticeBox = noticeText;
+      wrap2.add(noticeText);
+      parent.add(wrap2);
       paint();
     },
     onClose: () => {
@@ -57694,11 +57811,11 @@ function presentGame(openModalFn, otui, chrome, options = {}) {
         moveCursor(1, 0);
         return;
       }
-      if (token === "left" || token === "h") {
+      if (token === "h") {
         moveCursor(0, -1);
         return;
       }
-      if (token === "right" || token === "l") {
+      if (token === "l") {
         moveCursor(0, 1);
         return;
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mrciphersmith/keryx",
-  "version": "0.2.58",
+  "version": "0.2.60",
   "description": "Version-controlled project context for AI coding agents: code graph, architecture wiki, project memory, relevant tests, quality signals, and task flows.",
   "private": false,
   "publishConfig": {