@hayasaka7/haya-pet 0.3.6 → 0.3.7

package/CHANGELOG.md

@@ -7,6 +7,14 @@ All notable changes to HAYA Pet are documented here. This project adheres to
 > 0.2.0 npm publish; they are listed under 0.2.1, which is the first version that
 > ships them.
 
+## [0.3.7]
+
+### Changed
+- **The tray menu no longer shows state-only controls.** Hidden **Display Mode**
+  and **Attach Bubbles to Terminals** until those settings have real runtime
+  behavior. **Active Sessions** stays visible while session actions continue in a
+  separate workflow.
+
 ## [0.3.6]
 
 ### Fixed
@@ -38,6 +46,12 @@ All notable changes to HAYA Pet are documented here. This project adheres to
   watcher, so a resumed main rollout could be rejected before the guardian trunk
   was matched to it. The guardian watcher now uses the same fresh-mtime + wrapped
   cwd rule for resumed main sessions before following the guardian review trunk.
+- **Codex hook review is one-time again.** Codex stores approved hook hashes in
+  the generated `$CODEX_HOME/haya-pet.config.toml` profile under `[hooks.state]`.
+  The injector used to rewrite the whole managed profile on every launch, deleting
+  that trust state and forcing Codex to ask for hook review every time. The
+  injector now preserves Codex's hook trust tables while regenerating the HAYA
+  hook definitions.
 
 ### Added
 - **`HAYA_PET_DAEMON_DEBUG` diagnostic.** When set to a file path, the companion

package/README.md

@@ -136,7 +136,7 @@ success or failure briefly, then fades.
 | Global pet | Reacts to the highest-priority session and can be dragged anywhere. |
 | Session bubbles | One bubble per running AI session, ordered by connect time. |
 | Folder button | Folds the bubbles away when you want a cleaner desktop. |
-| Tray menu | Show/hide, display mode, installed pets, reset position, and quit. |
+| Tray menu | Show/hide, active sessions, installed pets, reset position, updates, and quit. |
 | Resize grip | Hover the pet, drag the corner, and keep the size you like. |
 
 ## Screenshots
@@ -144,7 +144,7 @@ success or failure briefly, then fades.
 | | |
 |---|---|
 | **The global pet** - reacting to the highest-priority session.<br>![Pet overlay](docs/screenshots/pet-overlay.png) | **Session bubbles** - one per active session, with status icons.<br>![Session bubbles](docs/screenshots/session-bubbles.png) |
-| **Folder collapsed** - bubbles tucked away beside the pet.<br>![Folder collapsed](docs/screenshots/folder-collapsed.png) | **Tray menu** - show/hide, pets, reset position, quit.<br>![Tray menu](docs/screenshots/tray-menu.png) |
+| **Folder collapsed** - bubbles tucked away beside the pet.<br>![Folder collapsed](docs/screenshots/folder-collapsed.png) | **Tray menu** - show/hide, sessions, pets, reset position, quit.<br>![Tray menu](docs/screenshots/tray-menu.png) |
 
 ## Supported Clients
 
@@ -217,7 +217,7 @@ non-observe mode keeps terminal input native.
 | Drag | Move the pet; position is saved. |
 | Drag corner grip | Resize from 0.5x to 2x; size is saved. |
 | Double-click grip | Reset to normal size. |
-| Tray icon | Open menu for display, sessions, pets, reset, and quit. |
+| Tray icon | Open menu for sessions, pets, reset, updates, and quit. |
 
 ## Commands
 

package/apps/companion/src/main/tray-menu.js

@@ -2,13 +2,6 @@
 // converts these descriptors into a native Menu; keeping it pure makes the
 // recovery controls testable.
 
-const DISPLAY_MODES = Object.freeze([
-  { value: "global", label: "Global" },
-  { value: "cluster", label: "Cluster" },
-  { value: "per-terminal", label: "Per Terminal" },
-  { value: "hybrid", label: "Hybrid" }
-]);
-
 export function buildTrayTooltip() {
   return "HAYA Pet";
 }
@@ -22,17 +15,6 @@ export function buildTrayMenu(state = {}) {
       id: "toggle_pet",
       label: state.petVisible ? "Hide Pet" : "Show Pet"
     },
-    {
-      id: "display_mode",
-      label: "Display Mode",
-      submenu: DISPLAY_MODES.map((mode) => ({
-        id: `display_mode:${mode.value}`,
-        label: mode.label,
-        value: mode.value,
-        type: "radio",
-        checked: state.displayMode === mode.value
-      }))
-    },
     {
       id: "sessions",
       label: "Active Sessions",
@@ -43,17 +25,9 @@ export function buildTrayMenu(state = {}) {
       label: "Installed Pets",
       submenu: buildPetItems(pets, state.selectedPetId)
     },
-    {
-      id: "attach_bubbles",
-      label: "Attach Bubbles to Terminals",
-      type: "checkbox",
-      checked: Boolean(state.attachBubblesToTerminals)
-    },
     { id: "reset_position", label: "Reset Position" },
-    // Parked until a real settings window exists: every current setting already
-    // has a home (tray toggles, `haya-pet hooks`, drag/grip gestures), so the
-    // item would be a dead button. Re-enable once settings outgrow the tray
-    // (e.g. bubble text size, linger duration) and a handler is wired up.
+    // Parked until a real settings window exists; partially implemented knobs
+    // stay hidden instead of showing dead or state-only controls.
     // { id: "settings", label: "Open Settings" },
     // Only present when the daily npm update check found a newer version;
     // clicking it opens the package page (the app never runs npm itself).

package/apps/companion/test/tray-menu.test.mjs

@@ -13,9 +13,11 @@ const baseState = {
 test("includes the documented recovery controls", () => {
   const menu = buildTrayMenu(baseState);
   const ids = menu.map((item) => item.id);
-  for (const id of ["toggle_pet", "display_mode", "sessions", "pets", "attach_bubbles", "reset_position", "quit"]) {
+  for (const id of ["toggle_pet", "sessions", "pets", "reset_position", "quit"]) {
     assert.ok(ids.includes(id), `missing ${id}`);
   }
+  assert.ok(!ids.includes("display_mode"), "display mode should stay hidden until implemented");
+  assert.ok(!ids.includes("attach_bubbles"), "attach bubbles should stay hidden until implemented");
   // "Open Settings" is parked until a settings window exists (every current
   // setting already has a tray/CLI/gesture home) — it must not be shown dead.
   assert.ok(!ids.includes("settings"), "settings item should stay hidden until implemented");
@@ -26,14 +28,6 @@ test("toggles the pet label based on visibility", () => {
   assert.equal(buildTrayMenu({ ...baseState, petVisible: false }).find((i) => i.id === "toggle_pet").label, "Show Pet");
 });
 
-test("checks the current display mode in the submenu", () => {
-  const submenu = buildTrayMenu(baseState).find((i) => i.id === "display_mode").submenu;
-  const hybrid = submenu.find((i) => i.value === "hybrid");
-  const global = submenu.find((i) => i.value === "global");
-  assert.equal(hybrid.checked, true);
-  assert.equal(global.checked, false);
-});
-
 test("lists active sessions or shows an empty placeholder", () => {
   const withSessions = buildTrayMenu(baseState).find((i) => i.id === "sessions").submenu;
   assert.equal(withSessions[0].label, "Codex · netdisk-server");
@@ -42,11 +36,6 @@ test("lists active sessions or shows an empty placeholder", () => {
   assert.equal(empty[0].enabled, false);
 });
 
-test("reflects the attach-bubbles checkbox state", () => {
-  assert.equal(buildTrayMenu(baseState).find((i) => i.id === "attach_bubbles").checked, true);
-  assert.equal(buildTrayMenu({ ...baseState, attachBubblesToTerminals: false }).find((i) => i.id === "attach_bubbles").checked, false);
-});
-
 test("shows the update item only when a newer version is known", () => {
   const withoutUpdate = buildTrayMenu(baseState);
   assert.ok(!withoutUpdate.some((i) => i.id === "update"), "no update item by default");

package/docs/known-issues.md

@@ -117,6 +117,20 @@ Issues found in live use, with their current status.
   surfaces as turn-end *idle*). The TUI's passive `/approve` denial-override
   picker is not a blocking prompt.
 
+## ✅ Resolved: Codex asked to review HAYA hooks on every launch
+
+- **Symptom:** Even after approving HAYA Pet's Codex hooks once, every new
+  `haya-pet run --client codex` showed Codex's hook review prompt again.
+- **Root cause:** HAYA Pet correctly wrote a stable
+  `$CODEX_HOME/haya-pet.config.toml` profile, but Codex stores the user's hook
+  trust decisions back into that same profile under `[hooks.state]` as
+  `trusted_hash` entries. The injector rewrote the entire profile on every
+  launch, so it deleted Codex's trust cache before Codex could reuse it.
+- **Fix:** The Codex hook injector now regenerates the HAYA-managed hook tables
+  while preserving the Codex-managed `[hooks.state]` tables from the existing
+  profile. Users may need to approve once after updating; after that, unchanged
+  hook commands should stay trusted.
+
 ## ✅ Resolved: Codex pet looked busy immediately after startup
 
 - **Symptom:** Starting a wrapped Codex session and doing nothing could still make

package/docs/screenshots/README.md

@@ -4,4 +4,4 @@ Place screenshot PNGs referenced by the root README here (~800px wide):
 - `pet-overlay.png` — the pet reacting to the highest-priority session
 - `session-bubbles.png` — bubbles expanded, showing per-session status icons
 - `folder-collapsed.png` — bubbles folded away beside the pet
-- `tray-menu.png` — the tray menu (show/hide, pets, reset position, Quit)
+- `tray-menu.png` — the tray menu (show/hide, sessions, pets, reset position, Quit)

package/docs/troubleshooting.md

@@ -18,6 +18,7 @@ deferred problems with known root causes.
 | Typing doesn't work / **Claude Code** TUI frozen under `haya-pet run` | You have hooks enabled and Claude is showing its *review hooks* trust prompt (approve it once), or your Claude is too old for `--settings`. Run `haya-pet hooks off` (or set `HAYA_PET_NO_HOOKS=1`) for native passthrough with lifecycle-only status — typing and Shift+Tab work normally. |
 | Pet changes status after a **Claude Code** subagent finishes, even though the main agent already stopped | Fixed — Claude `SubagentStop` is ignored because it is not a reliable main-turn state. Update to the latest version and restart the wrapped Claude session so the new hook settings are used. |
 | Pet shows only **idle/lifecycle** while **Codex** works | Live status is opt-in: run `haya-pet hooks on` once (persisted, global), then `haya-pet run --client codex -- codex`; approve Codex's one-time *review hooks* prompt. `thinking`/`idle` come from hooks, `running_tool`/`editing_files` from a transcript watcher, and approval states from the `PermissionRequest` hook plus a guardian-review watcher. |
+| **Codex** asks to review HAYA hooks on every launch | Fixed — update to the latest version, then approve once more. Codex writes trusted hook hashes into `$CODEX_HOME/haya-pet.config.toml` under `[hooks.state]`; HAYA Pet now preserves that Codex-managed block when refreshing the hook profile. |
 | Pet showed **waiting for approval** while **Codex** auto-reviewed the request ("Approve for me") | Fixed — with `approvals_reviewer = auto_review` (legacy `guardian_subagent`) Codex's guardian decides without asking you; the pet now reports **reviewing** from the permission hook itself, then **working** on an allow verdict or **thinking** on a deny. *Waiting for approval* still shows when Codex actually asks you (`approvals_reviewer = "user"`). Restart the wrapped Codex session after updating so Codex reloads the changed hook command. |
 | Pet shows **shell_command** or **thinking** right after starting Codex, before you prompt it | Fixed — the Codex transcript and guardian watchers now ignore rollouts whose `session_meta.timestamp` predates the current wrapper launch, so another active Codex session cannot drive this pet's status. Restart the wrapped Codex session after updating. |
 | **Codex** live status didn't turn on / you pass your own `-p`/`--profile` | Codex allows only one profile, so haya-pet skips hook injection when you supply your own and prints a notice. Drop your `-p` for that run to get live status, or accept lifecycle-only. |

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hayasaka7/haya-pet",
-  "version": "0.3.6",
+  "version": "0.3.7",
   "type": "module",
   "description": "Generic AI CLI pet runtime foundation.",
   "keywords": [

package/packages/cli-core/src/codex-hook-injection.js

@@ -8,7 +8,7 @@
 // across sessions so Codex's hook-trust review only needs approving once. fnm hands
 // out a per-shell symlink for process.execPath that dies when the launching shell
 // exits, so we realpath it before baking it into the hook command.
-import { mkdirSync, realpathSync, writeFileSync } from "node:fs";
+import { mkdirSync, readFileSync, realpathSync, writeFileSync } from "node:fs";
 import { homedir } from "node:os";
 import { join } from "node:path";
 import { fileURLToPath } from "node:url";
@@ -32,7 +32,8 @@ export function injectCodexHooks({ nodePath, cliPath, codexHome, env = process.e
   // rewrite identical bytes, and the hooks stay "trusted" across launches.
   mkdirSync(home, { recursive: true });
   const profilePath = join(home, PROFILE_FILE);
-  writeFileSync(profilePath, toml, "utf8");
+  const trustedState = readCodexHookTrustState(profilePath);
+  writeFileSync(profilePath, appendCodexHookTrustState(toml, trustedState), "utf8");
 
   // The profile file is stable and reusable on purpose — leaving it in place is
   // what lets Codex remember the hooks are trusted. cleanup is a no-op kept for
@@ -47,3 +48,51 @@ function safeRealpath(target) {
     return target;
   }
 }
+
+function readCodexHookTrustState(profilePath) {
+  try {
+    return extractCodexHookTrustState(readFileSync(profilePath, "utf8"));
+  } catch {
+    return "";
+  }
+}
+
+function appendCodexHookTrustState(toml, trustedState) {
+  if (!trustedState) {
+    return toml;
+  }
+  return `${toml.trimEnd()}\n\n${trustedState.trim()}\n`;
+}
+
+function extractCodexHookTrustState(toml) {
+  const lines = String(toml).split(/\r?\n/);
+  const output = [];
+  let inHookState = false;
+
+  for (const line of lines) {
+    const tableName = readTomlTableName(line);
+    if (tableName) {
+      const isHookStateTable = tableName === "hooks.state" || tableName.startsWith("hooks.state.");
+      if (isHookStateTable) {
+        inHookState = true;
+      } else if (inHookState) {
+        break;
+      }
+    }
+
+    if (inHookState) {
+      output.push(line);
+    }
+  }
+
+  return output.join("\n").trim();
+}
+
+function readTomlTableName(line) {
+  const table = /^\s*\[([^\]]+)\]\s*$/.exec(line);
+  if (table) {
+    return table[1];
+  }
+  const arrayTable = /^\s*\[\[([^\]]+)\]\]\s*$/.exec(line);
+  return arrayTable?.[1];
+}

package/packages/cli-core/test/codex-hook-injection.test.mjs

@@ -1,5 +1,5 @@
 import assert from "node:assert/strict";
-import { mkdtempSync, readFileSync, rmSync } from "node:fs";
+import { mkdtempSync, readFileSync, rmSync, writeFileSync } from "node:fs";
 import { tmpdir } from "node:os";
 import { join } from "node:path";
 import { test } from "../../../test/harness.mjs";
@@ -43,3 +43,32 @@ test("injectCodexHooks honors CODEX_HOME from env and is stable across calls", (
     rmSync(home, { recursive: true, force: true });
   }
 });
+
+test("injectCodexHooks preserves Codex hook trust state in the managed profile", () => {
+  const home = mkdtempSync(join(tmpdir(), "haya-codex-home-"));
+  try {
+    const first = injectCodexHooks({
+      nodePath: "n",
+      cliPath: "c",
+      codexHome: home
+    });
+    const trustedState = `[hooks.state]
+
+[hooks.state.'${first.profilePath}:user_prompt_submit:0:0']
+trusted_hash = "sha256:abc123"
+`;
+    writeFileSync(first.profilePath, `${readFileSync(first.profilePath, "utf8")}\n${trustedState}`, "utf8");
+
+    injectCodexHooks({
+      nodePath: "n",
+      cliPath: "c",
+      codexHome: home
+    });
+
+    const next = readFileSync(first.profilePath, "utf8");
+    assert.match(next, /\[hooks\.state\]/);
+    assert.match(next, /trusted_hash = "sha256:abc123"/);
+  } finally {
+    rmSync(home, { recursive: true, force: true });
+  }
+});