@visual-z/xeno 0.2.1 → 0.3.0

package/CHANGELOG.md

@@ -1,5 +1,14 @@
 # xeno changelog
 
+## 0.3.0 — 2026-10-07
+
+- Replace the vendored Pi terminal UI with OpenTUI: a growing composer, command palette, model and login pickers, responsive status surfaces, terminal colours and bounded message rendering.
+- Keep inline image tags atomic through cursor movement, deletion, undo/redo, history and queued drafts; send only retained attachments and preview the image beside the cursor. Share bounded image decoding across drafts, messages and tool results.
+- Add plain-text mouse selection copying and optional daily version notices, with offline and non-interactive opt-outs.
+- Preserve tool admission and nested-call receipts, cancellable process ownership, deferred discovery, recoverable output and integration health handling. Code Mode is removed.
+- Strengthen file edit preconditions, workspace lifecycle and completion evidence; opening the editor no longer requires an eager workspace snapshot.
+- Require Bun 1.3.0 or newer for the native renderer. Existing session logs remain append-only.
+
 ## 0.2.1 — 2026-09-30
 
 - Handle Ctrl+C and termination signals while startup awaits resources or workspace snapshots, restoring the terminal before exit.

package/README.md

@@ -17,7 +17,7 @@ is ever summarized by a model, and nothing is ever rewritten in place.
 messages[]                             frozen system prefix + handoff + this node's events
 ```
 
-Version **0.2.1**. The on-disk session format will still change; `0.x` is that
+Version **0.3.0**. The on-disk session format will still change; `0.x` is that
 statement. Published as `@visual-z/xeno`; the license is `UNLICENSED` (readable and installable, no reuse granted).
 
 ## Install
@@ -52,6 +52,7 @@ Validation commands and current evidence are recorded in
 - Writing branches start from the parent's working copy, including uncommitted files, in an isolated Git worktree. Adopt continues that checkout.
 - Independent readers and read-only branches run in a bounded window; writes and state changes are barriers. Results remain in request order.
 - `note(kind="pin", work_id, event, what)` links original observations; `supersedes` replaces an earlier reference. `history(work_id=...)`, `history(resource=...)`, and `history(events=[...])` locate or batch-read the originals.
+- Verified history projections use a bounded per-session cache. Original ancestry and sealed digests are checked before every hit; a lost cache is rebuilt from the log.
 
 Use `/new` or `--fresh` to start with the current tool protocol. Existing sessions
 keep their saved frozen schemas and concurrency policy. New sessions default to
@@ -78,6 +79,17 @@ authorized `--budget unlimited` on both `plan` and `run` records costs without a
 dollar ceiling; upstream errors stop the trial, with HTTP 402 marked as awaiting top-up.
 This checks a controlled configuration, not stock Pi or an official leaderboard.
 
+The new single-factor protocol separately compares tool profiles, the carried
+working set, and strict verification. It runs four isolated scenarios through
+real sessions and grades files, fresh command evidence, and pending human review.
+Use `bun scripts/eval-harness.ts smoke --output /absolute/new/eval-directory`,
+then `bun scripts/eval-harness.ts audit --output /absolute/new/eval-directory`.
+Smoke has no paid requests and reports synthetic usage. `plan` and `run` require
+the same explicit numeric `--budget`; inputs, source, schemas, model settings,
+and paired order are frozen before spending. Started directories cannot be
+replayed automatically. Failures and missing trials remain in the denominator,
+and unknown charges retain their reservation. Details are in `docs/benchmarks.md`.
+
 ## Usage
 
 ```
@@ -92,6 +104,8 @@ xeno [-m <model>] [--provider <name>] [--api-key <key>]
      [--system-prompt <text-or-file>] [--append-system-prompt <text>]
      [--no-context-files|-nc]
      [--tools names] [--exclude-tools names] [--no-tools]
+     [--tool-profile coding|readonly|research|data|full]
+     [--acceptance-file <contract.json>]
      [--allow-tools names] [--approve|--no-approve]
      [--theme <name|path>] [--use-theme <name>] [--no-themes]
      [--tui-mode regular|fullscreen]
@@ -102,6 +116,28 @@ xeno [-m <model>] [--provider <name>] [--api-key <key>]
 ```
 
 - No prompt, a tty: interactive session.
+- `/acceptance` shows declared command checks and human criteria. `/accept ID`
+  records your acceptance of a human criterion; subsequent edits invalidate it.
+  Use `--acceptance-file` or a trusted project's `.xeno/acceptance.json` with
+  `{ "version": 1, "id": "task", "criteria": [{ "id": "tests", "kind": "command", "description": "tests pass", "command": "bun test" }] }`.
+  The declaration is frozen in the session. A normal execution exit does not
+  imply that human acceptance has been granted.
+  A contract may additionally declare `targets`, each with `id`, `build`
+  (a command criterion ID), `artifacts: { paths, output_roots }`, and `entry`
+  (one of those artifact paths). Optional `interpreter` is an absolute executable
+  path; `args` are literal strings, `workdir` stays inside the workspace, and
+  `port` declares an IPv4 loopback listener. A human criterion binds to it with
+  `target: "ID"`. Enable the `target` tool explicitly with `--tools` or the
+  `full` profile; the default coding profile stays compact. Run the declared
+  build with its exact artifact plan, then `target({action:"start",target:"ID"})`.
+  `inspect` rechecks the owned instance, build inputs, artifact/executable identity
+  and port ownership. `/acceptance` shows the entry, build, PID and session;
+  `/accept ID` binds your decision to that observed instance. Rebuilds, changed
+  files, process exits or lost ownership require fresh acceptance. The first
+  implementation observes macOS executable identity with the system `lsof` and
+  Linux identity with `/proc`; port checks require system `lsof`. Missing OS
+  evidence remains unknown. It never adopts an existing server or proves visual
+  correctness automatically, and a resumed session cannot reattach an old PID.
 - A prompt, or `-p` / `--print`: one shot, then exit. `-p` puts only the
   assistant's final text on stdout; the banner, usage, thinking, and tool
   lines go to stderr. Piped stdin is appended after the command-line prompt.
@@ -231,19 +267,43 @@ Project trust (`/trust`, `--approve`) only decides whether to load
 It does not change what tools can do. `AGENTS.md` is loaded whether the
 project is trusted or not.
 
+New sessions default to the nine-tool `coding` profile: read, grep, find,
+write, edit, exec_command, write_stdin, history and note. `readonly`,
+`research` (with branch/resolve), `data` (with query) and `full` choose other
+builtin defaults. Extensions remain available; explicit `--tools` overrides
+the profile and exclusions apply last. Resumed sessions keep their frozen tools.
+
 `--tools` / `--exclude-tools` / `--no-tools` remove tools from the schema
-the model sees. `--allow-tools bash` lets bash run without asking, which
+the model sees. `--allow-tools exec_command` lets commands run without asking, which
 is what a CI job that has no tty has to pass explicitly. Without a tty,
 an `ask` is a deny that names that flag.
 
 ## Workspace data
 
+Opening a session does not snapshot the working directory. File tools save the
+original bytes before editing and record the observed result. `/back` restores
+only recorded paths, preserves unrelated files, and refuses conflicting external
+edits. Conversation-only navigation leaves files unchanged.
+
+Shell effects are not automatically reversible. Opt in for a new session with
+`--checkpoint-shell` to capture eligible Git files around commands. This uses a
+private index and object store without changing your staging area or HEAD. Git
+ignored paths, non-regular files, untracked files over 2 MiB, and effects outside
+the workspace are excluded. Capture is best effort; unavailable recovery does
+not prevent a conversation or change the command's exit result. A running process
+has a pending checkpoint until its exit is observed; overlapping writes make that
+checkpoint unavailable. Initial capture can take time.
+
+Verification observes a bounded source scope separately from file recovery.
+Unknown observations cannot certify a completion claim. Old snapshot logs remain
+readable; new file records and scope markers are appended without rewriting them.
+
 A session writes into the workspace:
 
 | Path | |
 |---|---|
 | `.xeno/sessions/<id>/` | node logs, handoffs, metadata journal, derived manifest, and observation artifacts |
-| `.xeno/blobs/` | content-addressed file snapshots used by `/back` |
+| `.xeno/blobs/` | content-addressed before/after file versions used by `/back` |
 
 That tree grows with every turn and every snapshot. There is no garbage
 collection yet. Dead branches from `/back` stay on disk.
@@ -297,16 +357,29 @@ Shipped, not planned:
   Repeated content, renamed completion claims and gate regressions do not reset
   the three-segment stop rule. This is an anti-stall heuristic, not proof of
   relevance or completion; [`research M.4`](docs/agent-harness-research.md) states its limits.
-- A terminal UI using the pinned Pi renderer, raw input, editor, autocomplete,
-  Markdown, searchable pickers and settings. Durable history is a pure log
-  projection across handoff boundaries. Includes tool diffs, historical folds,
-  Pi dark/light palettes, `keybindings.json`, `/settings` and `/hotkeys`.
+- A terminal UI using pinned OpenTUI, a native text editor, autocomplete,
+  Markdown, a command palette and searchable pickers. Durable history is a pure
+  log projection across handoff boundaries. Includes tool diffs, historical
+  folds, terminal colours, `keybindings.json`, `/settings` and `/hotkeys`.
 
 - Context files: `AGENTS.md` / `CLAUDE.md` and the override chain, plus
   `--system-prompt` / `--append-system-prompt` / `-nc`.
 - Skills (`~/.xeno/skills/`, `/skill:name`) and prompt templates
-  (`~/.xeno/prompts/`, `/name`). Untrusted projects do not load the
+  support progressive loading, user visibility, explicit tool intersections
+  and isolated `context: fork`. Unsupported execution fields are diagnosed.
+  Loaded instructions keep frozen source hashes and recoverable artifacts.
+  Templates use `~/.xeno/prompts/` and `/name`. Untrusted projects do not load
   project-level copies.
+- `/tasks` shows dependency readiness and claims. Long tasks can use
+  `note(kind="next", work_id="b", depends_on=["a"], ...)`, then
+  `claim_work` / `release_work`; these are scheduling intent, separate from
+  the `done` command proof. Ordinary short tasks do not need a graph.
+- `branch(background=true)` returns an owned task reference. `/branches`
+  lists its current capability; `/branches wait|cancel|status <node>` joins or
+  controls it without a model request. `resolve` exposes the same actions.
+  Restarted unfinished tasks remain unknown; sealed outcomes can be joined.
+- `/processes` separates the last logged observation from a live handle.
+  Session exit drains its own processes and archives unread output.
 - `/reload` refreshes local models, settings, keybindings, context files, skills,
   templates and themes without losing the draft or active model. A changed system
   prefix checkpoints first; unchanged resources do not create a new segment.
@@ -330,7 +403,11 @@ Shipped, not planned:
   Copilot subscription flows. See Known gaps.
 
 Images can be attached with `@path`, a dropped image path, or Ctrl+V (files,
-image, then text). `/attachments` removes draft images; queue recall and history
+image, then text). Pasted and dropped images become `[Image #N]` tags at the
+caret. Left/Right cross a whole tag; Backspace/Delete remove it in one step,
+and Undo restores it. Moving the caret next to a tag shows its preview above
+the input (filename and dimensions when image display is unavailable).
+`/attachments` remains available for removal; queue recall and history
 forks retain them. The log stores immutable blob references. Provider adapters
 load verified bytes for Anthropic, Chat Completions and Responses; text-only
 models receive a visible placeholder. Custom models declare `input: ["text", "image"]`
@@ -360,27 +437,30 @@ unblocking affects new submissions, preserving historical request prefixes.
 - **`/back` does not restore symlinks.**
 - **`.xeno/` is not collected.** Snapshots and abandoned session branches
   stay until you delete them.
-- **No telemetry, `/share`, auto-update, or `/compact`.** Those are
-  refusals (`docs/PI_PARITY.md` D15, D16), not backlog.
+- **No telemetry, `/share`, self-installing updates, or `/compact`.** Those
+  are refusals (`docs/PI_PARITY.md` D15, D16), not backlog. xeno does say
+  when a newer version is published, at most once a day and never installing
+  it; `docs/install.md` (Updates) lists what that request reveals and every
+  way to turn it off.
 
 `docs/TUI_ARCHITECTURE.md` describes the active interaction path and verification.
 `docs/PI_PARITY.md` records deliberate differences and remaining Pi features.
-Pi's editor supports undo, not redo; an old `editor.redo` binding is diagnosed
-as unsupported rather than silently accepted. Ctrl+- invokes Pi undo.
+The native editor supports undo (Ctrl+_ or Ctrl+/) and redo (Ctrl+Shift+Z).
+Registered image tags move and delete as whole units and share text undo history.
 Ctrl+Z suspends the CLI on POSIX; `fg` restores the terminal and unsent draft.
 
-`/settings tuiMode fullscreen` uses Pi's alternate-screen viewport, transcript
-search (Ctrl+Shift+F), prompt navigation (Ctrl+Up/Down), mouse scrolling and text
-selection. `/settings fullscreenExitOutput resume-hint` leaves a resume command
-when exiting; `transcript` prints the conversation. Switching modes preserves
-the editor, history and undo. Scrollbar, wheel speed, copy-on-select, editor
-padding, autocomplete rows, cursor, output padding and double-Escape behavior
-are configurable in `/settings`.
+Fullscreen is the default. Ctrl+P opens commands, Ctrl+L selects a model,
+PgUp/PgDn scroll, and Ctrl+Home/End jump to the start or latest messages.
+Ctrl+O expands tools, Ctrl+T expands thinking, and Ctrl+B toggles the sidebar.
+Mouse selection copies plain text when `fullscreenCopyOnSelect` is enabled;
+Ctrl+X copies a selection or the last reply. Exiting restores the terminal and
+prints the conversation and a resume command. The composer stays at the bottom
+and grows with the draft; pickers and forms use the same input area.
 
 `/settings theme` previews built-in and custom themes from the config directory's
 `themes/`. Escape restores the prior theme. Custom files reload after valid edits;
-`auto` follows terminal light/dark changes and `system` derives Pi's palette from
-terminal color replies. Pi's namespaced action IDs work in `keybindings.json`
+`auto` follows terminal light/dark changes. Built-in themes keep the terminal's
+background and derive readable accents from its colour replies. Namespaced action IDs work in `keybindings.json`
 alongside existing xeno names; an empty array disables an action in its own scope.
 
 ## Why this shape
@@ -575,10 +655,10 @@ Every path below was checked with `test -f` on this checkout.
 | `runtime/benchmark.ts` | actual Session trials, bounded spending and cache diagnostics |
 | `runtime/loop.ts` | orchestration; every judgement delegates to a pure function in core |
 | `runtime/auth.ts` / `oauth.ts` | credential order and subscription flows |
-| **`src/vendor/pi-tui/`** | unmodified Pi terminal and component library, pinned in `VENDOR.md` |
-| **`src/tui/`** | Pi input, component and theme adapters; no harness imports |
-| `tui/markdown.ts` / `toolview.ts` / `statusline.ts` / `tree.ts` | display |
-| **`src/apps/`** | `cli.ts` — Pi main-screen UI for TTY, clean print/JSON output otherwise |
+| **`src/tui/`** | OpenTUI view components and pure display helpers; no harness imports |
+| `tui/ui/composer.ts` / `atomic-draft.ts` / `messages.ts` / `screen.ts` | native editing, atomic image tags, messages and layout |
+| **`src/apps/`** | `cli.ts` — OpenTUI for TTY, clean print/JSON output otherwise |
+| `apps/ui/app.ts` / `project.ts` / `status-model.ts` | controller, transcript projection and status facts |
 | `apps/startup.ts` / `shell.ts` / `commands.ts` | flags, session, slash commands |
 
 ## Properties the tests pin

package/docs/install.md

@@ -16,7 +16,7 @@ The entry point is `src/apps/cli.ts` with `#!/usr/bin/env bun`. The
 process uses Bun APIs (`Bun.file`, `Bun.spawn`, `Bun.spawnSync`,
 `for await (const line of console)`). Those are why the runtime is Bun.
 
-`engines.bun` is `>=1.1.0`. This checkout was run on **Bun 1.3.10**.
+`engines.bun` is `>=1.3.0` (required by the OpenTUI renderer, D20). This checkout was run on **Bun 1.3.10**.
 Node is untested. That is a fact about this tree, not a promise that
 Node support is coming.
 
@@ -30,16 +30,14 @@ cd xeno
 bun install
 ```
 
-`bun install` pulls the provider SDK, Pi text layout/Markdown dependencies,
-syntax highlighting, Mermaid, Photon image processing, and TypeScript tooling.
+`bun install` pulls the provider SDKs, OpenTUI and its platform renderer,
+Markdown, syntax highlighting, Mermaid, Photon image processing, and TypeScript tooling.
 The exact versions are in `package.json` and `bun.lock`.
 
-Pi native helpers for macOS, Linux X11 and Windows (arm64/x64) ship with the
-package. They are pinned upstream builds with matching source and hashes;
-startup does not download or compile them. Missing platform support uses the
-clipboard command fallbacks. The packaged macOS helper was load-tested on
-this machine; Linux/Windows payloads and routing are checked without claiming
-native device acceptance.
+OpenTUI supplies the native renderer through its platform dependencies.
+Clipboard integration uses terminal OSC 52 and platform commands; the old
+vendored Pi native helpers are no longer packaged. Release package checks run
+on macOS arm64; they do not establish Linux or Windows device acceptance.
 
 Run the CLI without linking:
 
@@ -68,10 +66,49 @@ Each invocation starts a new session. `xeno -c` continues the newest one;
 and nothing is deleted. Resume restores the saved model. An explicit
 `--model` switches at a checkpoint while keeping the original log intact.
 
-Startup loads resources and establishes a workspace snapshot before the editor
-opens. Slow initialization shows its current stage; Ctrl+C cancels startup and
-restores the terminal. Snapshots cover the selected workspace, so start inside
-the intended project or pass `--workspace <path>`.
+Startup loads resources and opens or restores the session. Workspace snapshots
+are deferred until file tools need them, so opening an editor does not scan the
+whole project. Slow initialization shows its current stage; Ctrl+C cancels it
+and restores the terminal. Start inside the intended project or pass
+`--workspace <path>`.
+
+## Updates
+
+xeno says when a newer version is published. It never installs one: the
+notice names the command, and you run it.
+
+```
+xeno 0.3.0 is available (you have 0.2.1)
+  bun add -g @visual-z/xeno@latest
+```
+
+The command follows where this copy is installed: `bun add -g` under
+`~/.bun/install/global/`, `npm i -g` under an npm global prefix
+(`…/lib/node_modules/`, or `…\npm\node_modules\` on Windows). Anywhere else
+the notice points to this file. A checkout updates with `git pull`.
+
+- **Request.** `GET https://registry.npmjs.org/-/package/@visual-z%2fxeno/dist-tags`
+  (an 18-byte answer). If that fails, `GET …/@visual-z%2fxeno/latest`.
+  `npm_config_registry` replaces the host. The timeout is 3 seconds.
+- **What the registry learns.** Your IP address, the time, the package name
+  and Bun's default `User-Agent` (`Bun/<version>`). No identifier, no query
+  string, nothing from your session.
+- **How often.** At most once every 24 hours. The time and the version seen
+  are kept in `~/.xeno/update-check.json`. A failed attempt is recorded too,
+  so a closed network is not retried on every start.
+- **When.** In the background after the editor opens. Startup never waits for
+  it, and quitting cancels it. A version found during a session is shown only
+  while that session is still empty. Otherwise it waits for the next start,
+  so it never interrupts a turn.
+
+Nothing is sent when any of these holds:
+
+- `--offline` or `XENO_OFFLINE=1`
+- `XENO_NO_UPDATE_CHECK` or `NO_UPDATE_NOTIFIER` is set (to anything but empty, `0` or `false`)
+- `"updateCheck": false` in `settings.json` (*Check for updates* in `/settings`)
+- `CI` or `CONTINUOUS_INTEGRATION` is set, by the same rule
+- the run is not the interactive app: `-p`, `--mode json`, `--export`, `--list-models`, `models --refresh`, package and `config` commands, `--version`
+- xeno runs from a checkout: its package root is not under `node_modules`, or has a `.git` (`bun src/apps/cli.ts`, `bun run agent`, `bun link`)
 
 ## Credentials
 
@@ -129,6 +166,7 @@ settings.json     theme, thinking, defaults
 trust.json        which directories may load project settings
 models.json       optional user provider/model configuration
 models-cache.json generated catalog cache (written by `xeno models --refresh`)
+update-check.json when the last update check ran, and the newest version it saw
 keybindings.json  optional
 prompts/ skills/  optional
 ```

package/docs/providers.md

@@ -4,6 +4,17 @@ xeno 内置 Pi 0.99.1 和 OpenCode 所用 Models.dev 的固定源并集：226
 
 来源固定为 Pi `1b347794e2a630e4359f2584f4eea388145d0ddf`、OpenCode `2fa3363c924c5c3e367b84a87ae478296a0ed59b`，Models.dev JSON SHA256 `7345de7358c471e78ac756aed556cd804677cd0d8748b71edc3931225440158f`。SDK 固定为 `@earendil-works/pi-ai@0.99.1`；引入它是为了复用维护中的原生协议和签名处理，避免在 xeno 重写十套 SDK。SDK 仅在 runtime；原有 TUI vendor 的版本与升级方式独立。
 
+## 最快的接入：`/login`
+
+在交互界面输入 `/login`（`/login <provider>` 直达；`/connect` 是同一命令的别名）。一个列表里包含全部接入方式：
+
+- **订阅账户**：Claude Pro/Max、ChatGPT Plus/Pro（Codex）、GitHub Copilot，走浏览器或设备码登录。
+- **API key**：选择目录中的供应商（Anthropic、OpenAI、Gemini、DeepSeek、OpenRouter、Kimi、智谱、硅基流动、通义、豆包等，可搜索），粘贴 key（掩码显示；`$MY_KEY` 读取环境变量）。
+- **＋ Custom endpoint…**：OpenAI Chat Completions / OpenAI Responses / Anthropic Messages / Gemini 兼容地址，或 Ollama、LM Studio。填 base URL（粘贴完整的 `…/chat/completions`、`…/v1/messages` 会自动截断）、ID 和 key 后，xeno 用这个 key 向端点列出模型（OpenAI `GET /models`；Anthropic `GET /v1/models`；Gemini `GET /v1beta/models`），勾选要启用的模型后保存。
+- **⚙ Manage connected…**：重新列出并选择模型、更换 key 或断开。
+
+`/model` 只显示已接入且凭据可用的模型，最近使用的排在最前。保存位置与手写配置相同：key 在 `~/.xeno/auth.json`（0600），端点和启用的模型在 `~/.xeno/models.json` 的 `providers.<id>`。
+
 ## 目录和选择
 
 ```sh

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@visual-z/xeno",
-  "version": "0.2.1",
+  "version": "0.3.0",
   "license": "UNLICENSED",
   "type": "module",
   "description": "Segmented append-only agent log with pure context and handoff projections",
@@ -15,10 +15,11 @@
     "docs/providers.md"
   ],
   "engines": {
-    "bun": ">=1.1.0"
+    "bun": ">=1.3.0"
   },
   "repository": {
-    "type": "git"
+    "type": "git",
+    "url": "git+https://github.com/visual-z/xeno.git"
   },
   "scripts": {
     "test": "bun test",
@@ -37,8 +38,8 @@
   "dependencies": {
     "@anthropic-ai/sdk": "^0.127.0",
     "@earendil-works/pi-ai": "0.99.1",
+    "@opentui/core": "0.5.14",
     "@silvia-odwyer/photon-node": "0.3.4",
-    "get-east-asian-width": "1.6.0",
     "grok-mermaid": "0.2.3",
     "highlight.js": "10.7.3",
     "marked": "18.0.11"

package/src/apps/approve.ts

@@ -9,7 +9,7 @@
 
 import type { PermissionRequest } from "../core/permissions.ts";
 import type { ApprovalChoice } from "../runtime/tools.ts";
-import type { SelectItem } from "../tui/select.ts";
+import type { ListItem } from "../tui/ui/list-model.ts";
 
 export function approvalHeading(request: PermissionRequest): string {
   if (request.command !== undefined) {
@@ -24,8 +24,8 @@ export function approvalHeading(request: PermissionRequest): string {
   return `${request.tool} wants to run. Approval is the last look, not a boundary.`;
 }
 
-export function approvalItems(request: PermissionRequest): SelectItem[] {
-  const items: SelectItem[] = [{ value: "once", label: "this once" }];
+export function approvalItems(request: PermissionRequest): ListItem[] {
+  const items: ListItem[] = [{ value: "once", label: "this once" }];
   if (request.command !== undefined) {
     items.push({ value: "command", label: "this command this session" });
   }

package/src/apps/commands.ts

@@ -16,10 +16,16 @@ import { skillInvocationMessage, type Skill } from "../core/skills.ts";
 
 export type Command =
   | { kind: "extension"; name: string; args: string }
-  | { kind: "prompt"; text: string }
+  | { kind: "prompt"; text: string; skill?: Skill }
   | { kind: "quit" }
   | { kind: "usage" }
   | { kind: "state" }
+  | { kind: "context" }
+  | { kind: "acceptance" }
+  | { kind: "tasks" }
+  | { kind: "branches"; action?: "wait" | "cancel" | "status"; node?: number }
+  | { kind: "processes" }
+  | { kind: "accept"; criterion: string }
   | { kind: "model"; pattern?: string }
   | { kind: "scoped-models" }
   | { kind: "login"; provider?: string }
@@ -54,7 +60,7 @@ export const COMMANDS = [
   { name: "scoped-models", description: "Enable and order models for cycling", busy: "idle" },
   { name: "thinking", description: "Set reasoning effort", argumentHint: "[level]", busy: "idle" },
   { name: "settings", description: "Configure appearance, input and model behavior", argumentHint: "[key value]", busy: "idle" },
-  { name: "login", description: "Sign in or store an API key", argumentHint: "[provider]", busy: "idle" },
+  { name: "login", description: "Connect a provider: subscription, API key, gateway or local server", argumentHint: "[provider]", busy: "idle" },
   { name: "logout", description: "Remove a stored credential", argumentHint: "[provider]", busy: "idle" },
   { name: "new", description: "Start a new session", busy: "idle" },
   { name: "resume", description: "Search saved sessions", argumentHint: "[id]", busy: "idle" },
@@ -66,6 +72,12 @@ export const COMMANDS = [
   { name: "session", description: "Show session details", busy: "run" },
   { name: "usage", description: "Show token usage and costs", busy: "run" },
   { name: "state", description: "Show log and handoff state", busy: "run" },
+  { name: "context", description: "Explain context sources, omissions and token estimates", busy: "run" },
+  { name: "acceptance", description: "Show declared criteria and current evidence", busy: "idle" },
+  { name: "tasks", description: "Show work dependencies, readiness and ownership", busy: "run" },
+  { name: "branches", description: "Inspect or join owned background work", argumentHint: "[wait|cancel|status node]", busy: "idle" },
+  { name: "processes", description: "Show process observations and available handles", busy: "run" },
+  { name: "accept", description: "Record your acceptance of a human criterion", argumentHint: "<criterion ID>", busy: "idle" },
   { name: "export", description: "Export HTML or JSONL", argumentHint: "[file]", busy: "idle" },
   { name: "import", description: "Import a portable JSONL session", argumentHint: "<file>", busy: "idle" },
   { name: "debug", description: "Write local terminal diagnostics", argumentHint: "[file]", busy: "run" },
@@ -84,8 +96,15 @@ export const COMMANDS = [
 
 export const BUILTIN_COMMAND_NAMES = COMMANDS.map((command) => command.name);
 
+/**
+ * Hidden spellings of a listed command. Not in COMMANDS, so the `/` menu,
+ * the startup hint and completion show one entry per job.
+ */
+const ALIASES: Readonly<Record<string, string>> = { connect: "login" };
+
 export function commandDefinition(input: string): (typeof COMMANDS)[number] | undefined {
-  const name = input.trim().split(/\s/, 1)[0]?.slice(1).toLowerCase();
+  const typed = input.trim().split(/\s/, 1)[0]?.slice(1).toLowerCase() ?? "";
+  const name = ALIASES[typed] ?? typed;
   return COMMANDS.find((command) => command.name === name);
 }
 
@@ -95,6 +114,7 @@ export interface SlashCatalog {
   readonly prompts: ReadonlyMap<string, PromptTemplate>;
   readonly skills: ReadonlyMap<string, Skill>;
   readonly skillCommands?: boolean;
+  readonly skillExecution?: boolean;
 }
 
 export function resolveSlashCatalog(
@@ -140,7 +160,8 @@ export function parseCommand(input: string, catalog?: SlashCatalog): Command {
   if (!text.startsWith("/")) return { kind: "prompt", text };
 
   const [head, ...rest] = text.split(/\s+/);
-  const token = (head ?? "").toLowerCase();
+  const typed = (head ?? "").toLowerCase();
+  const token = `/${ALIASES[typed.slice(1)] ?? typed.slice(1)}`;
   const arg = rest.join(" ");
 
   if (!commandDefinition(text)) return resolveRegistered(token, arg, text, rest.length, catalog);
@@ -157,6 +178,17 @@ export function parseCommand(input: string, catalog?: SlashCatalog): Command {
       return { kind: "usage" };
     case "/state":
       return { kind: "state" };
+    case "/context": return { kind: "context" };
+    case "/acceptance": return { kind: "acceptance" };
+    case "/tasks": return { kind: "tasks" };
+    case "/processes": return { kind: "processes" };
+    case "/branches": {
+      if (!arg) return { kind: "branches" };
+      const action = rest[0], node = Number(rest[1]);
+      return (action === "wait" || action === "cancel" || action === "status") && Number.isSafeInteger(node) && node >= 0 && rest.length === 2
+        ? { kind: "branches", action, node } : { kind: "unknown", input: text };
+    }
+    case "/accept": return { kind: "accept", criterion: arg };
     case "/model":
       return arg.length > 0 ? { kind: "model", pattern: arg } : { kind: "model" };
     case "/login":
@@ -240,7 +272,8 @@ function resolveRegistered(
       const name = token.slice("/skill:".length);
       const skill = catalog.skills.get(name);
       if (skill !== undefined) {
-        return { kind: "prompt", text: skillInvocationMessage(skill, arg) };
+        if (skill.userInvocable === false) return { kind: "unknown", input: text };
+        return { kind: "prompt", text: skillInvocationMessage(skill, arg), ...(catalog.skillExecution ? { skill } : {}) };
       }
     }
     const prompt = catalog.prompts.get(token.slice(1));

package/src/apps/completions.ts

@@ -1,31 +1,85 @@
-import { COMMANDS } from "./commands.ts";
+/**
+ * What the composer offers for the text at the cursor. Pure given its
+ * sources, so the three cases are tested without a terminal:
+ *   "/mo|"          command names (the palette's own entries)
+ *   "/thinking h|" the command's argument values
+ *   "see @src/ap|"  workspace paths (ranked fuzzy, quoted when they contain spaces)
+ * `@` inside a word (an e-mail) or after a backslash is not a reference.
+ */
 import type { App } from "./startup.ts";
-import { WorkspaceAutocomplete } from "../tui/autocomplete.ts";
 import { SUBSCRIPTION_OPTIONS } from "../runtime/oauth.ts";
-import { modelKey } from "../core/session-position.ts";
 import { supportedThinkingLevels } from "../core/thinking.ts";
 import { SETTINGS_KEYS, DISPLAY_SETTINGS } from "../core/settings.ts";
+import { fuzzyFilter } from "../tui/fuzzy.ts";
+import { COMMANDS } from "./commands.ts";
+import type { Completion } from "../tui/ui/composer.ts";
+import type { ListItem } from "../tui/ui/list-model.ts";
+
+export interface CompletionSources {
+  readonly commands: readonly { name: string; description: string }[];
+  readonly argumentValues: (command: string) => readonly string[];
+  readonly paths: readonly string[];
+}
+
+/** Twelve rows: enough to see siblings of a path without hiding the composer. Assumed. */
+const MAX_ITEMS = 12;
 
-export function interactiveAutocomplete(app: App, paths: (refresh?: boolean) => Promise<readonly string[]>): WorkspaceAutocomplete {
-  const providers = [...new Set([...app.catalog.map((m) => m.provider), ...SUBSCRIPTION_OPTIONS.map((p) => p.id)])];
+export function completionAt(text: string, cursor: number, sources: CompletionSources): Completion | undefined {
+  const before = text.slice(0, cursor);
+  const line = before.slice(before.lastIndexOf("\n") + 1);
+  const lineStart = cursor - line.length;
+  if (line.startsWith("/") && lineStart === 0) {
+    const space = line.indexOf(" ");
+    if (space < 0) {
+      const query = line.slice(1).toLowerCase();
+      const items = sources.commands
+        .filter(command => command.name.toLowerCase().startsWith(query) || (query.length > 1 && command.name.toLowerCase().includes(query)))
+        .map(command => ({ value: `/${command.name} `, label: `/${command.name}`, description: command.description }));
+      return items.length ? { start: 0, end: cursor, items: items.slice(0, MAX_ITEMS) } : undefined;
+    }
+    const command = line.slice(1, space);
+    const arg = line.slice(space + 1);
+    if (arg.includes(" ")) return undefined;
+    const values = sources.argumentValues(command);
+    if (!values.length) return undefined;
+    const items = fuzzyFilter(values, arg).slice(0, MAX_ITEMS).map(value => ({ value, label: value }));
+    return items.length ? { start: space + 1, end: cursor, items } : undefined;
+  }
+  const at = line.lastIndexOf("@");
+  if (at < 0) return undefined;
+  const prev = line[at - 1];
+  if (prev !== undefined && !/\s/.test(prev)) return undefined;
+  const query = line.slice(at + 1);
+  if (/\s/.test(query) && !query.startsWith("\"")) return undefined;
+  const bare = query.replace(/^"/, "");
+  const items: ListItem[] = fuzzyFilter(sources.paths, bare).slice(0, MAX_ITEMS)
+    .map(path => ({ value: `@${/\s/.test(path) ? JSON.stringify(path) : path} `, label: path }));
+  return items.length ? { start: lineStart + at, end: cursor, items } : undefined;
+}
+
+export function completionSources(app: App, paths: readonly string[]): CompletionSources {
+  const providers = [...new Set([...app.catalog.map(m => m.provider), ...SUBSCRIPTION_OPTIONS.map(p => p.id)])];
   const values: Record<string, () => string[]> = {
-    model: () => app.catalog.map(modelKey),
+    // Model identities belong to the searchable picker. The generic completer
+    // still handles arbitrary argument sources; this app supplies only one
+    // model selection surface, rather than a second list with different keys.
     thinking: () => [...supportedThinkingLevels(app.providerConfig.spec)],
-    login: () => providers, logout: () => providers,
+    login: () => providers, connect: () => providers, logout: () => Object.keys(app.auth),
     settings: () => [...new Set([...SETTINGS_KEYS, ...DISPLAY_SETTINGS.map(item => item.id)])],
     models: () => ["refresh"], trust: () => ["once", "here", "parent", "never"],
   };
-  const commands = COMMANDS.map((definition) => ({
-    ...definition,
-    getArgumentCompletions(prefix: string) {
-      return (values[definition.name]?.() ?? []).filter((v) => v.toLowerCase().includes(prefix.toLowerCase()))
-        .map((v) => ({ value: v, label: v }));
-    },
-  }));
-  const registered = [
-    ...[...app.extensions?.commands ?? []].map(([name, command]) => ({ name, ...command })),
-    ...[...(app.slash?.prompts.values() ?? [])].map((p) => ({ name: p.name, description: p.description })),
-    ...(app.slash?.skillCommands === false ? [] : [...(app.slash?.skills.values() ?? [])].map((s) => ({ name: `skill:${s.name}`, description: s.description }))),
+  return {
+    commands: [...COMMANDS.filter(command => command.name !== "exit"), ...commandEntries(app)],
+    argumentValues: command => values[command]?.() ?? [],
+    paths,
+  };
+}
+
+/** Built-ins, then extension commands, prompt templates and skills: the same names the palette lists. */
+export function commandEntries(app: App): { name: string; description: string; section: string }[] {
+  return [
+    ...[...app.extensions?.commands ?? []].map(([name, command]) => ({ name, description: command.description ?? "extension command", section: "Extensions" })),
+    ...[...(app.slash?.prompts.values() ?? [])].map(p => ({ name: p.name, description: p.description ?? "prompt template", section: "Prompts" })),
+    ...(app.slash?.skillCommands === false ? [] : [...(app.slash?.skills.values() ?? [])].map(s => ({ name: `skill:${s.name}`, description: s.description ?? "skill", section: "Skills" }))),
   ];
-  return new WorkspaceAutocomplete([...commands, ...registered], app.workspace, paths);
 }