1 files changed, 39 insertions, 15 deletions
diff --git a/claude-templates/.ai/protocols.org b/claude-templates/.ai/protocols.org
index 3cd02ef..3e32074 100644
--- a/claude-templates/.ai/protocols.org
+++ b/claude-templates/.ai/protocols.org
@@ -84,7 +84,7 @@ Do NOT estimate, guess, or rely on memory. Just run the command. It takes one se
 
 Every session pulls rulesets first, then the local project repo. Rulesets carries the canonical behavioral rules and =.ai/= templates (the old =claude-templates= repo is folded in as a subtree at =rulesets/claude-templates/=); the project pull lands commits pushed from other machines or teammates since the last session.
 
-Resolve any dirty-tree or merge issue at each step before moving on. Both pulls run as =git pull --ff-only= (or =git merge --ff-only= against the fetched upstream), so anything non-trivial — non-fast-forward history, dirty working tree, diverged branches — aborts. Surface the state and stop. Never auto-stash, auto-merge, or auto-rebase; the user resolves the conflict before further work.
+Resolve any sync-blocking tree or merge issue at each step before moving on. The shared =git-worktree-gate sync-safe= policy permits untracked deliveries beneath =inbox/= so receiving a handoff never prevents another project from refreshing rulesets; every staged or tracked change, dirty submodule, Git operation in progress, or untracked path outside =inbox/= blocks. Both pulls run as =git pull --ff-only= (or =git merge --ff-only= against the fetched upstream), so non-fast-forward history and diverged branches also abort. Surface the state and stop. Never auto-stash, auto-merge, or auto-rebase; the user resolves the conflict before further work.
 
 Mechanics live in =startup.org= Phase A.0. The rule lives here because it governs the very first action of every session: load the freshest behavioral rules and templates before anything else runs.
 
@@ -106,7 +106,7 @@ The epoch is baked into the id by the spawner, never minted inside =session-cont
 
 Resolve the path with =.ai/scripts/session-context-path= rather than hardcoding =.ai/session-context.org=; it prints the right path for the current =AI_AGENT_ID=. Fall back to =.ai/session-context.org= if the script isn't present (older checkouts mid-sync). Everything below — the record/recovery purpose, the update triggers, the startup existence check, the wrap-up rename — operates on that resolved path. The prose says "session-context.org" as the default name; read it as "the resolved active path" when =AI_AGENT_ID= is set.
 
-A helper instance (a second agent running in this project while a primary session is live) follows a different contract: it skips the pulls and rsync, makes only scoped single-heading edits to shared files, leaves all git mutation to the primary, and wraps up by archiving its own context file without committing. The full rules — read/write tiers, data-integrity, light startup, helper wrap-up — live in [[file:workflows/helper-mode.org][workflows/helper-mode.org]]. A session is a helper only when something routes it there (the =ai --helper= launcher, startup's roster check, or an explicit "you are a helper" instruction); the routing itself ships behind the helper-instance feature gate and isn't live yet.
+A helper instance (a second agent running in this project while a primary session is live) follows a different contract: it skips the pulls and rsync, makes only scoped single-heading edits to shared files, leaves all git mutation to the primary, and wraps up by archiving its own context file without committing. The full rules — read/write tiers, data-integrity, light startup, helper wrap-up — live in [[file:workflows/helper-mode.org][workflows/helper-mode.org]]. A session is a helper only when something routes it there: the =ai --helper= launcher (live — it checks the roster, assigns the id, and opens the helper in its own tmux window) or an explicit "you are a helper" instruction. Startup's roster check is *not* built, so a bare =claude= launched into a project that already has a live session will run full primary startup regardless. Launch helpers with =ai --helper=.
 
 This file serves two purposes with one mechanism:
 1. *Crash recovery* — if the session dies mid-work, the live file is all that's left. On 2026-01-22 a session crashed during a 20-minute design discussion and all context was lost because this file wasn't being updated.
@@ -270,7 +270,9 @@ The queue lives in the session anchor (=.ai/session-context.org=) under a =* Bef
 
 Three ways to access Craig's calendars: Google Calendar MCP (preferred, both personal + work accounts), gcalcli (fallback, personal only), Emacs org files (read-only viewer).
 
-For tool recipes, authentication details, and credentials, see [[file:references/calendar-reference.org][calendar-reference.org]].
+For tool recipes and account details, read the calendar workflows in =.ai/workflows/=: =add-calendar-event.org=, =edit-calendar-event.org=, =delete-calendar-event.org=, =read-calendar-events.org=. They carry the MCP tool names, both account ids, the gcalcli fallback, and the conflict-check discipline.
+
+Credentials are needed only for a re-auth Craig performs himself. The MCP bundle's =mcp/README.org= in the rulesets repo is the authority: =gcp-oauth.keys.json= is gitignored and regenerated at install from a base64 var in the bundle, never committed. Named in prose rather than linked, because that path isn't synced into consuming projects.
 
 
 ** GPG Keys
@@ -305,15 +307,26 @@ gpg -d file.json.gpg > file.json       # decrypt (pinentry GUI handles passphras
 
 ** Signature Image
 
-A transparent-background PNG scan of Craig's handwritten signature lives at
-=~/pictures/cj-sig-transparent.png= (324×213, cropped), with a higher-resolution
-version at =~/pictures/cj-sig-no-background.png= (1536×1024). Both are symlinks
-into the archsetup stow dotfiles (=~/code/archsetup/dotfiles/common/pictures/=),
-so they're present on every machine. RGBA, transparent background; composites
-cleanly over a form line.
+Craig's handwritten marks live in =~/pictures/signature/=, all
+transparent-background PNGs that composite cleanly over a form line:
+
+| File                           | What it is                                     |
+|--------------------------------+------------------------------------------------|
+| =cj-signature-transparent.png= | Full signature, 324×213. The everyday one.     |
+|--------------------------------+------------------------------------------------|
+| =cj-signature-large.png=       | Same signature at 1536×1024, for print.        |
+|--------------------------------+------------------------------------------------|
+| =cj-initials-transparent.png=  | Handwritten CJ monogram, 65×66. Initial boxes. |
+|--------------------------------+------------------------------------------------|
+
+The directory is stow-managed from Craig's dotfiles repo, so it's present on
+every machine. Its =README.md= carries the ImageMagick pipeline the marks were
+keyed with, and the sizing guidance for placing one on a form — signature fields
+are usually thin baseline strips, so a mark fitted inside the strip shrinks to an
+illegible speck. Read it before stamping rather than guessing at a size.
 
 Default for signing documents is still Craig signing by hand in Xournal++. Only
-overlay this image onto a PDF (or other document) when Craig *explicitly asks
+overlay one of these onto a PDF (or other document) when Craig *explicitly asks
 for it on a specific document* — never sign for him on your own initiative. The
 =edit-pdf= workflow (project-level, where present) has the reportlab snippet for
 stamping it.
@@ -374,9 +387,19 @@ Craig runs a pure Wayland setup (Hyprland) and avoids XWayland/Xorg apps.
 - Clipboard: Use =wl-copy= and =wl-paste= (NOT =xclip= or =xsel=)
 - Window management: Use Hyprland commands (NOT =xkill=, =xdotool=, etc.)
 - Prefer Wayland-native tools over X11 equivalents
-- Open URLs in browser: Use =google-chrome-stable "URL" &>/dev/null &=
-  - The =&>/dev/null &= is required to detach the process and suppress output
-  - Without it, the command may appear to hang or produce no result
+- Open URLs in browser: invoke Chrome directly — never =xdg-open=, which returned success in a home session on 2026-07-26 while no tab appeared.
+
+  Chrome is normally already running, and in that case it hands the URL to the live session and exits immediately (rc 0), printing =Opening in existing browser session.= on *stdout*. So run it in the foreground and read that line as the confirmation the tab actually opened:
+
+  #+begin_src bash
+  google-chrome-stable --new-tab "URL"
+  #+end_src
+
+  Don't redirect stdout away while checking for that line — verified 2026-07-27 on ratio: with =2>/dev/null= the message still appears (it isn't stderr), and with =>/dev/null= it vanishes.
+
+  Several URLs in one invocation open as separate tabs (=google-chrome-stable --new-tab "URL1" "URL2"=). Pass them as separate words or an array — the Bash tool runs zsh, which does not word-split an unquoted =$urls= variable, so a space-joined string arrives as one malformed argument (see the zsh note below).
+
+  *Cold start.* If Chrome is *not* already running, the command becomes the browser process and blocks. Detach that case with =&>/dev/null &=, accepting that the confirmation line is discarded — there is no session to confirm into. Don't apply the detach form unconditionally: it suppresses the very output the warm path is verified by.
 
 *** Shell aliases (=ls= → =exa=)
 Craig's shell aliases =ls= to =exa=, which prints nothing to non-TTY pipes (e.g. when capturing =ls= output in a Bash tool call). The result looks like the directory is empty when it isn't.
@@ -567,12 +590,13 @@ When monitoring a long-running process (rsync, large downloads, builds, VM tests
 
 ** "Wrap it up" / "That's a wrap" / "Let's call it a wrap"
 
-When Craig says any of these phrases (or variations), execute the wrap-up workflow: [[file:workflows/wrap-it-up.org][wrap-it-up.org]]. Four steps:
+When Craig says any of these phrases (or variations), execute the wrap-up workflow: [[file:workflows/wrap-it-up.org][wrap-it-up.org]]. Five load-bearing steps:
 
 1. *Finalize the Summary* in =.ai/session-context.org= (populate the 5 subsections from the Session Log)
 2. *Rename* =.ai/session-context.org= → =.ai/sessions/YYYY-MM-DD-HH-MM-description.org=
 3. *Git commit + push* to all remotes (see Git Commit Requirements)
-4. *Valediction* — brief, warm, specific closing
+4. *Certify the clean tree* with =git-worktree-gate certify=. Any remaining staged, unstaged, untracked, submodule, or in-progress-operation state blocks wrap entirely; report each path and the exact decision needed. There is no dirty-file deferral.
+5. *Valediction* — brief, warm, specific closing, reachable only after certification
 
 The absence of =.ai/session-context.org= after wrap-up is the signal that the session ended cleanly. If the file is still there at the next session start, the previous session was interrupted.