Compare commits
18
Commits
b74ab54765
...
a8729db893
@@ -0,0 +1,23 @@
|
||||
# Clide Claude-Code skills
|
||||
|
||||
Skills are reusable instruction packs Claude Code loads on demand. Each one
|
||||
lives in its own directory with a `SKILL.md` (frontmatter + body) and any
|
||||
helper scripts. This index is for humans skimming what's available; Claude
|
||||
discovers skills automatically from the directory structure.
|
||||
|
||||
| Skill | Purpose |
|
||||
|---|---|
|
||||
| [`d2-diagram`](d2-diagram/SKILL.md) | Generate technical diagrams from `.d2` source with the d2 CLI; renders to PNG. |
|
||||
| [`frame0-wireframe`](frame0-wireframe/SKILL.md) | Author UI wireframes as local JSON and sync to the Frame0 desktop app for rendering + export. |
|
||||
| [`git-commit`](git-commit/SKILL.md) | Commit conventions for this repo — message style, CHANGELOG discipline (40/60 word cap), attribution trailer, safety rules. |
|
||||
| [`pql`](pql/SKILL.md) | Query and plan against the markdown vault via the `pql` CLI (decisions, tickets, structural queries). |
|
||||
| [`skill-create`](skill-create/SKILL.md) | Guidance for creating new skills — SKILL.md structure, bundling scripts, packaging. |
|
||||
| [`testmode`](testmode/SKILL.md) | Run and interpret the `ClideTestApp` platform integration harness; smoke-test after toolchain / IPC / theme / native changes. |
|
||||
| [`ui-design`](ui-design/SKILL.md) | Visual design guide — surface tokens, control geometry, Phosphor icons. |
|
||||
| [`whats-next`](whats-next/SKILL.md) | Dependency-driven batch selection against the pql backlog. Walks the initiative/epic tree, filters unblocked work, refines, optionally activates. |
|
||||
|
||||
## Adding a skill
|
||||
|
||||
Use the `skill-create` skill (or follow its SKILL.md by hand). Add a row to
|
||||
the table above so the inventory stays accurate; the index is otherwise just
|
||||
a directory listing.
|
||||
@@ -53,6 +53,35 @@ This repo follows [Keep a Changelog 1.1.0](https://keepachangelog.com/en/1.1.0/)
|
||||
|
||||
Entries should be short imperative phrases that describe user-facing impact — not implementation detail. "Added sidecar PTY support for terminal pane" beats "Added `internal/pty/session.go`."
|
||||
|
||||
### Be concise — this is the rule, not a suggestion
|
||||
|
||||
CHANGELOG entries must be **one or two short sentences**. Strict ceiling: **40 words per bullet**, hard cap at 60. If you can't say it in one line wrapped at ~75 columns, you're writing the wrong document.
|
||||
|
||||
The CHANGELOG is read by humans scanning for what changed between two versions. It is **not** the place for the rationale, the probe results, the implementation detail, the behavior-change deep dive, or the "see also" cross-references. Those belong in:
|
||||
|
||||
- the **commit message body** — explain *why*, list evidence, name the trade-offs;
|
||||
- a **D-record / decision document** — durable architectural rationale;
|
||||
- the **ticket / PR description** — work-context and review notes.
|
||||
|
||||
Hard rules:
|
||||
|
||||
- **No multi-paragraph bullets.** One paragraph max. If you reach for a blank line inside a bullet, stop and split or trim.
|
||||
- **No "Behavior change:" / "Side benefit:" / "Note:" sub-headers inside a bullet.** Those are essay structure; put them in the commit message.
|
||||
- **No probe numbers, latency stats, or %-coverage deltas in entries.** ("hit 95% target" is fine; "0 hangs in 300 spawns vs ~5% before" is commit-body material.)
|
||||
- **No nested function/file lists inside parentheses.** If you find yourself writing `(foo, bar, baz, …)` for more than 3 items, just say "several X" and trust the diff.
|
||||
- **Don't restate the title in the body.** A bullet is its own title.
|
||||
|
||||
Calibration — match the **existing entries** in `CHANGELOG.md`. Open it, look at five recent bullets, write to that length. If your draft is visibly bigger than its neighbors, trim until it isn't.
|
||||
|
||||
Good:
|
||||
> - Mouse wheel scrolling in Claude pane — converts scroll events to PgUp/PgDown so TUI apps scroll naturally.
|
||||
|
||||
Bad (verbose; commit-body material leaked in):
|
||||
> - **PTY spawning switched from `forkpty()` to `posix_openpt()` + `posix_spawn()`** (T-96). `forkpty` calls `fork()` underneath, which is unsafe in the multithreaded Dart VM: about 5% of spawns deadlocked in the child before `execve` because libc locks held by ghost-threads remained "locked forever" in the forked child. `posix_spawn` uses `vfork` (glibc/musl/macOS), keeping the parent suspended until `execve` completes — no Dart code runs in the child. Probed: zero hangs in 300 sequential spawns vs ~5% before. **Behavior change:** missing executable / missing workingDirectory now surface as a `PtyException`…
|
||||
|
||||
Better:
|
||||
> - PTY spawning uses `posix_openpt` + `posix_spawn` instead of `forkpty` — closes a ~5% deadlock window in the multithreaded Dart VM (T-96). Missing exe/cwd now throw `PtyException` at spawn time.
|
||||
|
||||
**What skips the changelog:** pure bookkeeping commits that have no user-visible effect (typo fix in internal comment, `.gitignore` tweak, lint config change, reformatting). When in doubt, add an entry — the harm of an extra line is zero.
|
||||
|
||||
When a commit spans multiple entries (e.g. a feature that adds one thing and fixes another), add a line under each applicable subsection rather than cramming both into one.
|
||||
|
||||
@@ -1663,3 +1663,59 @@ The `PanGestureRecognizer` in `TerminalGestureDetector` is registered with `supp
|
||||
|
||||
**Cross-references:** T-91 (epic parent), T-93 (same shape on `onTapUp`), T-89 (coverage epic).
|
||||
', NULL, '2026-05-08 11:01:01', '2026-05-08 11:01:01', '2026-05-08 11:01:01', NULL, '8088d054dd8c7946075ed6325724dfb3', 1) ON CONFLICT(hash) DO NOTHING;
|
||||
INSERT INTO ticket_history (ticket_id, field, old_value, new_value, changed_by, changed_at, created_at, updated_at, deleted_at, hash, canonical_version) VALUES ('T-96', 'description', 'The reader isolate spawned by `NativePty._spawnReaderAsync` (`lib/src/pty/native_pty.dart`) hangs intermittently — about 5% of fresh spawns — with poll() on the master fd never returning POLLIN or POLLHUP, even when the child has clearly written and exited. Probed: 2 hangs out of 30 sequential `/bin/sh -c "printf hello-pty"` spawns over a 30s/spawn timeout.
|
||||
|
||||
**Symptom:** test sees zero `pane.output` events and no `pane.exit`; the reader isolate sits in `poll(pfd, 1, 100)` returning 0 forever. The hang is per-spawn; a fresh `NativePty.start` recovers cleanly.
|
||||
|
||||
**Workaround in place:** `retry: 2` on every PTY-output-dependent test in `test/pty/session_test.dart` and `test/panes/registry_test.dart`. Three combined attempts at ~5% per-spawn fail rate ≈ 99.99% success. Comments at the test sites point back here.
|
||||
|
||||
**Acceptance:**
|
||||
- Identify why a fresh master fd sometimes never delivers ready events. Candidates to investigate: a race between `forkpty()` and `Isolate.spawn` (the new isolate may see an FD table snapshot from an awkward moment), a missing fcntl flag on the master fd, lazy `DynamicLibrary.process()` symbol resolution in a freshly-spawned dart isolate, GC interference, or wasmtime/tree-sitter signal handlers (unlikely — the probe ran in a clean dart isolate with no wasmtime).
|
||||
- Fix the underlying race so a single spawn delivers reliably.
|
||||
- Remove the `retry: 2` decorations and the explanatory comments in both test files.
|
||||
|
||||
**Out of scope:** changing the PTY threading model or the reader-isolate architecture. The fix should keep `Isolate.spawn(_readLoop, ...)` as the I/O primitive.
|
||||
|
||||
**Cross-references:** D-5 (Dart core + sidecar dissolution; PTY is owned via FFI), `lib/src/pty/native_pty.dart#L235-262` (`_spawnReaderAsync`), `lib/src/pty/native_pty.dart#L265-293` (`_readLoop`).', 'The reader isolate spawned by `NativePty._spawnReaderAsync` (`lib/src/pty/native_pty.dart`) hangs intermittently — about 5% of fresh spawns — with poll() on the master fd never returning POLLIN or POLLHUP, even when the child has clearly written and exited. Probed: 2 hangs out of 30 sequential `/bin/sh -c "printf hello-pty"` spawns over a 30s/spawn timeout.
|
||||
|
||||
**Root cause — found 2026-05-17 via forensic probe:**
|
||||
|
||||
The "child" never reaches `execve`. `/proc/<child-pid>/stat` reports comm `(DartWorker)` (the Dart VM worker thread name) instead of `sh`, with state `S` (sleeping). The pty master fd is a real pty (tty-index assigned, fcntl flags 0x8002 = O_RDWR|O_NOCTTY), but `poll(fd, 500ms)` from the main isolate returns 0 — nothing was ever written.
|
||||
|
||||
This is **`fork()` in a multithreaded process** — a textbook async-signal-safety violation. The Dart VM runs multiple worker threads that hold libc locks (notably `malloc`). When `forkpty()` calls `fork()`, only the calling thread survives in the child, but the locks held by ghost-threads remain "locked forever." The child deadlocks before it can complete its post-fork → pre-execve setup.
|
||||
|
||||
Why not always? Lock state at fork() time is timing-dependent. ~95% of the time no Dart worker happens to hold a problematic lock, and execve proceeds. ~5% of the time it deadlocks.
|
||||
|
||||
**Workaround in place (test-only):** `retry: 2` on every PTY-output-dependent test in `test/pty/session_test.dart` and `test/panes/registry_test.dart`. Three combined attempts at ~5% per-spawn fail rate ≈ 99.99% combined success. Comments at the test sites point back here.
|
||||
|
||||
**Proper fix:** replace `forkpty()` with `posix_openpt()` + `unlockpt()` + `grantpt()` + `posix_spawn()` (with file actions wiring the pty slave to stdin/stdout/stderr). `posix_spawn` uses `vfork()` under glibc/musl, which keeps the parent suspended until execve completes — no Dart code ever runs in the child, no lock-deadlock possible. Linux and macOS both support this API.
|
||||
|
||||
**Immediate hardening alternative (Linux-only, simpler):** after spawn, sample `/proc/<pid>/comm` after ~250ms. If it equals the parent process''s comm, execve never ran → kill the child, surface `PtyException(''execve-deadlock'', ...)`, let the caller retry. This catches the deadlocked state deterministically instead of waiting for a poll timeout. It doesn''t fix the bug, but turns silent hangs into reportable errors.
|
||||
|
||||
**Acceptance for closing this ticket:**
|
||||
1. Replace forkpty path with posix_openpt + posix_spawn (or implement the comm-check hardening as an interim).
|
||||
2. Probe (200 sequential `printf hello`-and-exit spawns) reports zero hangs.
|
||||
3. Remove the `retry: 2` decorations + explanatory comments in `test/pty/session_test.dart` (6 tests) and `test/panes/registry_test.dart` (1 test).
|
||||
|
||||
**Out of scope:** changing the reader-isolate architecture itself. `Isolate.spawn(_readLoop, ...)` for output stays.
|
||||
|
||||
**Cross-references:**
|
||||
- D-5 (Dart core + sidecar dissolution; PTY is owned via FFI)
|
||||
- `lib/src/pty/native_pty.dart:200` (the forkpty call site)
|
||||
- `lib/src/pty/native_pty.dart:170-191` (child-side post-fork code that deadlocks)
|
||||
- `lib/src/pty/native_pty.dart:235-262` (reader spawn — not the bug; downstream symptom)
|
||||
- glibc posix_spawn docs: https://www.gnu.org/software/libc/manual/html_node/Process-Creation-Example.html
|
||||
', NULL, '2026-05-17 18:05:33', '2026-05-17 18:05:33', '2026-05-17 18:05:33', NULL, '56d9ba7c49068a498a003e900cde416f', 1) ON CONFLICT(hash) DO NOTHING;
|
||||
INSERT INTO ticket_history (ticket_id, field, old_value, new_value, changed_by, changed_at, created_at, updated_at, deleted_at, hash, canonical_version) VALUES ('T-96', 'status', 'backlog', 'done', NULL, '2026-05-17 18:11:18', '2026-05-17 18:11:18', '2026-05-17 18:11:18', NULL, '3215fc763c4f1dce75ea9e0bb2b9bbb6', 1) ON CONFLICT(hash) DO NOTHING;
|
||||
INSERT INTO ticket_history (ticket_id, field, old_value, new_value, changed_by, changed_at, created_at, updated_at, deleted_at, hash, canonical_version) VALUES ('T-98', 'status', 'backlog', 'in_progress', NULL, '2026-05-17 18:51:25', '2026-05-17 18:51:25', '2026-05-17 18:51:25', NULL, '0369c8264ec2c67b3bf3f28057404ec0', 1) ON CONFLICT(hash) DO NOTHING;
|
||||
INSERT INTO ticket_history (ticket_id, field, old_value, new_value, changed_by, changed_at, created_at, updated_at, deleted_at, hash, canonical_version) VALUES ('T-98', 'status', 'in_progress', 'done', NULL, '2026-05-17 18:55:57', '2026-05-17 18:55:57', '2026-05-17 18:55:57', NULL, 'cb0ae539d5665bd9720b327d60a2cbed', 1) ON CONFLICT(hash) DO NOTHING;
|
||||
INSERT INTO ticket_history (ticket_id, field, old_value, new_value, changed_by, changed_at, created_at, updated_at, deleted_at, hash, canonical_version) VALUES ('T-101', 'status', 'backlog', 'in_progress', NULL, '2026-05-17 18:58:56', '2026-05-17 18:58:56', '2026-05-17 18:58:56', NULL, '55d14b4493a159695d4b40bbd19fff23', 1) ON CONFLICT(hash) DO NOTHING;
|
||||
INSERT INTO ticket_history (ticket_id, field, old_value, new_value, changed_by, changed_at, created_at, updated_at, deleted_at, hash, canonical_version) VALUES ('T-102', 'status', 'backlog', 'in_progress', NULL, '2026-05-17 18:58:56', '2026-05-17 18:58:56', '2026-05-17 18:58:56', NULL, '7fa075d7232df5302ffdfb5d1c3d79f2', 1) ON CONFLICT(hash) DO NOTHING;
|
||||
INSERT INTO ticket_history (ticket_id, field, old_value, new_value, changed_by, changed_at, created_at, updated_at, deleted_at, hash, canonical_version) VALUES ('T-101', 'status', 'in_progress', 'done', NULL, '2026-05-17 19:01:39', '2026-05-17 19:01:39', '2026-05-17 19:01:39', NULL, '56e8da656c5fc53af241900e6313805e', 1) ON CONFLICT(hash) DO NOTHING;
|
||||
INSERT INTO ticket_history (ticket_id, field, old_value, new_value, changed_by, changed_at, created_at, updated_at, deleted_at, hash, canonical_version) VALUES ('T-102', 'status', 'in_progress', 'done', NULL, '2026-05-17 19:01:39', '2026-05-17 19:01:39', '2026-05-17 19:01:39', NULL, '7f09d2a1501d3d072e071822c191f253', 1) ON CONFLICT(hash) DO NOTHING;
|
||||
INSERT INTO ticket_history (ticket_id, field, old_value, new_value, changed_by, changed_at, created_at, updated_at, deleted_at, hash, canonical_version) VALUES ('T-103', 'status', 'backlog', 'in_progress', NULL, '2026-05-17 19:03:18', '2026-05-17 19:03:18', '2026-05-17 19:03:18', NULL, '2635d907f94402ec506d3b56dfc25b21', 1) ON CONFLICT(hash) DO NOTHING;
|
||||
INSERT INTO ticket_history (ticket_id, field, old_value, new_value, changed_by, changed_at, created_at, updated_at, deleted_at, hash, canonical_version) VALUES ('T-106', 'status', 'backlog', 'in_progress', NULL, '2026-05-17 19:03:18', '2026-05-17 19:03:18', '2026-05-17 19:03:18', NULL, 'cc39b3fd718e99423823e640950ccf1b', 1) ON CONFLICT(hash) DO NOTHING;
|
||||
INSERT INTO ticket_history (ticket_id, field, old_value, new_value, changed_by, changed_at, created_at, updated_at, deleted_at, hash, canonical_version) VALUES ('T-113', 'status', 'backlog', 'in_progress', NULL, '2026-05-17 19:03:18', '2026-05-17 19:03:18', '2026-05-17 19:03:18', NULL, 'cc8605833ba5cb97e068eb5a6d57d8f4', 1) ON CONFLICT(hash) DO NOTHING;
|
||||
INSERT INTO ticket_history (ticket_id, field, old_value, new_value, changed_by, changed_at, created_at, updated_at, deleted_at, hash, canonical_version) VALUES ('T-106', 'status', 'in_progress', 'done', NULL, '2026-05-17 19:18:43', '2026-05-17 19:18:43', '2026-05-17 19:18:43', NULL, '8dccc83b93c5005db744a100a5b3baea', 1) ON CONFLICT(hash) DO NOTHING;
|
||||
INSERT INTO ticket_history (ticket_id, field, old_value, new_value, changed_by, changed_at, created_at, updated_at, deleted_at, hash, canonical_version) VALUES ('T-113', 'status', 'in_progress', 'done', NULL, '2026-05-17 19:18:43', '2026-05-17 19:18:43', '2026-05-17 19:18:43', NULL, '8f7812831e564005eb796708543c54b3', 1) ON CONFLICT(hash) DO NOTHING;
|
||||
INSERT INTO ticket_history (ticket_id, field, old_value, new_value, changed_by, changed_at, created_at, updated_at, deleted_at, hash, canonical_version) VALUES ('T-103', 'status', 'in_progress', 'done', NULL, '2026-05-17 19:18:43', '2026-05-17 19:18:43', '2026-05-17 19:18:43', NULL, 'c7d1b76cb6854efb7e9990cc7204d899', 1) ON CONFLICT(hash) DO NOTHING;
|
||||
|
||||
@@ -1414,3 +1414,257 @@ The `PanGestureRecognizer` in `TerminalGestureDetector` is registered with `supp
|
||||
|
||||
**Cross-references:** T-91 (epic parent), T-93 (same shape on `onTapUp`), T-89 (coverage epic).
|
||||
', 'backlog', 'medium', NULL, NULL, NULL, '2026-05-08 10:48:59', '2026-05-08 11:01:01', NULL, '91cf3f81c256df191ddfcb3ebc6cefb1', 1) ON CONFLICT(id) DO UPDATE SET type=excluded.type, parent_id=excluded.parent_id, title=excluded.title, description=excluded.description, status=excluded.status, priority=excluded.priority, assigned_to=excluded.assigned_to, team=excluded.team, decision_ref=excluded.decision_ref, updated_at=excluded.updated_at, deleted_at=excluded.deleted_at, hash=excluded.hash, canonical_version=excluded.canonical_version WHERE excluded.updated_at > tickets.updated_at OR (excluded.updated_at = tickets.updated_at AND excluded.hash > tickets.hash);
|
||||
INSERT INTO tickets (id, type, parent_id, title, description, status, priority, assigned_to, team, decision_ref, created_at, updated_at, deleted_at, hash, canonical_version) VALUES ('T-96', 'bug', NULL, 'NativePty reader-isolate hangs ~5% of spawns', 'The reader isolate spawned by `NativePty._spawnReaderAsync` (`lib/src/pty/native_pty.dart`) hangs intermittently — about 5% of fresh spawns — with poll() on the master fd never returning POLLIN or POLLHUP, even when the child has clearly written and exited. Probed: 2 hangs out of 30 sequential `/bin/sh -c "printf hello-pty"` spawns over a 30s/spawn timeout.
|
||||
|
||||
**Root cause — found 2026-05-17 via forensic probe:**
|
||||
|
||||
The "child" never reaches `execve`. `/proc/<child-pid>/stat` reports comm `(DartWorker)` (the Dart VM worker thread name) instead of `sh`, with state `S` (sleeping). The pty master fd is a real pty (tty-index assigned, fcntl flags 0x8002 = O_RDWR|O_NOCTTY), but `poll(fd, 500ms)` from the main isolate returns 0 — nothing was ever written.
|
||||
|
||||
This is **`fork()` in a multithreaded process** — a textbook async-signal-safety violation. The Dart VM runs multiple worker threads that hold libc locks (notably `malloc`). When `forkpty()` calls `fork()`, only the calling thread survives in the child, but the locks held by ghost-threads remain "locked forever." The child deadlocks before it can complete its post-fork → pre-execve setup.
|
||||
|
||||
Why not always? Lock state at fork() time is timing-dependent. ~95% of the time no Dart worker happens to hold a problematic lock, and execve proceeds. ~5% of the time it deadlocks.
|
||||
|
||||
**Workaround in place (test-only):** `retry: 2` on every PTY-output-dependent test in `test/pty/session_test.dart` and `test/panes/registry_test.dart`. Three combined attempts at ~5% per-spawn fail rate ≈ 99.99% combined success. Comments at the test sites point back here.
|
||||
|
||||
**Proper fix:** replace `forkpty()` with `posix_openpt()` + `unlockpt()` + `grantpt()` + `posix_spawn()` (with file actions wiring the pty slave to stdin/stdout/stderr). `posix_spawn` uses `vfork()` under glibc/musl, which keeps the parent suspended until execve completes — no Dart code ever runs in the child, no lock-deadlock possible. Linux and macOS both support this API.
|
||||
|
||||
**Immediate hardening alternative (Linux-only, simpler):** after spawn, sample `/proc/<pid>/comm` after ~250ms. If it equals the parent process''s comm, execve never ran → kill the child, surface `PtyException(''execve-deadlock'', ...)`, let the caller retry. This catches the deadlocked state deterministically instead of waiting for a poll timeout. It doesn''t fix the bug, but turns silent hangs into reportable errors.
|
||||
|
||||
**Acceptance for closing this ticket:**
|
||||
1. Replace forkpty path with posix_openpt + posix_spawn (or implement the comm-check hardening as an interim).
|
||||
2. Probe (200 sequential `printf hello`-and-exit spawns) reports zero hangs.
|
||||
3. Remove the `retry: 2` decorations + explanatory comments in `test/pty/session_test.dart` (6 tests) and `test/panes/registry_test.dart` (1 test).
|
||||
|
||||
**Out of scope:** changing the reader-isolate architecture itself. `Isolate.spawn(_readLoop, ...)` for output stays.
|
||||
|
||||
**Cross-references:**
|
||||
- D-5 (Dart core + sidecar dissolution; PTY is owned via FFI)
|
||||
- `lib/src/pty/native_pty.dart:200` (the forkpty call site)
|
||||
- `lib/src/pty/native_pty.dart:170-191` (child-side post-fork code that deadlocks)
|
||||
- `lib/src/pty/native_pty.dart:235-262` (reader spawn — not the bug; downstream symptom)
|
||||
- glibc posix_spawn docs: https://www.gnu.org/software/libc/manual/html_node/Process-Creation-Example.html
|
||||
', 'done', 'medium', NULL, NULL, NULL, '2026-05-17 17:16:01', '2026-05-17 18:11:18', NULL, '0451ff710500ecd4d62d8910a46386d1', 1) ON CONFLICT(id) DO UPDATE SET type=excluded.type, parent_id=excluded.parent_id, title=excluded.title, description=excluded.description, status=excluded.status, priority=excluded.priority, assigned_to=excluded.assigned_to, team=excluded.team, decision_ref=excluded.decision_ref, updated_at=excluded.updated_at, deleted_at=excluded.deleted_at, hash=excluded.hash, canonical_version=excluded.canonical_version WHERE excluded.updated_at > tickets.updated_at OR (excluded.updated_at = tickets.updated_at AND excluded.hash > tickets.hash);
|
||||
INSERT INTO tickets (id, type, parent_id, title, description, status, priority, assigned_to, team, decision_ref, created_at, updated_at, deleted_at, hash, canonical_version) VALUES ('T-97', 'epic', NULL, 'Address 2026-05-14 consultant review', 'Six-reviewer external assessment found four critical gaps (workspace RCE, IPC server unimplemented, keyboard not operable, onboarding docs describe a dissolved architecture) plus ten major items and a handful of quick wins. Source: consultants.md (committed alongside this epic). Children are filed individually so they can land independently.
|
||||
|
||||
Acceptance: all critical findings resolved or formally rejected with a D-record; all major findings either shipped or moved to a follow-up epic with rationale; quick-win batches closed.', 'backlog', 'high', NULL, NULL, NULL, '2026-05-17 18:47:08', '2026-05-17 18:47:08', NULL, 'b52cffa8155835713fece00ecc86f86c', 1) ON CONFLICT(id) DO UPDATE SET type=excluded.type, parent_id=excluded.parent_id, title=excluded.title, description=excluded.description, status=excluded.status, priority=excluded.priority, assigned_to=excluded.assigned_to, team=excluded.team, decision_ref=excluded.decision_ref, updated_at=excluded.updated_at, deleted_at=excluded.deleted_at, hash=excluded.hash, canonical_version=excluded.canonical_version WHERE excluded.updated_at > tickets.updated_at OR (excluded.updated_at = tickets.updated_at AND excluded.hash > tickets.hash);
|
||||
INSERT INTO tickets (id, type, parent_id, title, description, status, priority, assigned_to, team, decision_ref, created_at, updated_at, deleted_at, hash, canonical_version) VALUES ('T-98', 'bug', 'T-97', 'fix untrusted-workspace RCE in dugite git resolution', '`toolchain_paths.dart:79` builds `''$workspaceRoot/native/dugite/bin''` and runs `_firstExisting([''$dugite/git''])` — if that file exists in the open workspace it becomes the git binary for all GitClient calls, before falling back to PATH. A malicious repo commits an executable at `native/dugite/bin/git`; clide runs it on the first auto-fired `git.status`. Arbitrary code execution from merely opening a repo.
|
||||
|
||||
**Fix:** resolve `native/dugite` against `Platform.resolvedExecutable`''s directory (or a known install root), never `workspaceRoot`.
|
||||
|
||||
**Acceptance:**
|
||||
1. Toolchain resolution does not look at any workspace path.
|
||||
2. Test that a planted `native/dugite/bin/git` in the temp-dir workspace is ignored.
|
||||
3. Existing dugite-in-install-dir behavior preserved.
|
||||
|
||||
Source: consultants.md "Security — Findings — [Critical]".', 'backlog', 'critical', NULL, NULL, NULL, '2026-05-17 18:47:13', '2026-05-17 18:47:13', NULL, 'ead632bad678df9637914f52791ea8fe', 1) ON CONFLICT(id) DO UPDATE SET type=excluded.type, parent_id=excluded.parent_id, title=excluded.title, description=excluded.description, status=excluded.status, priority=excluded.priority, assigned_to=excluded.assigned_to, team=excluded.team, decision_ref=excluded.decision_ref, updated_at=excluded.updated_at, deleted_at=excluded.deleted_at, hash=excluded.hash, canonical_version=excluded.canonical_version WHERE excluded.updated_at > tickets.updated_at OR (excluded.updated_at = tickets.updated_at AND excluded.hash > tickets.hash);
|
||||
INSERT INTO tickets (id, type, parent_id, title, description, status, priority, assigned_to, team, decision_ref, created_at, updated_at, deleted_at, hash, canonical_version) VALUES ('T-99', 'task', 'T-97', 'implement (or amend) the IPC socket server per D-1/D-6/D-56/D-68', 'D-56 specifies the Flutter app hosts an in-process IPC server reachable by a thin C client over a Unix socket; D-1/D-6 commit to CLI-first. Today no `ServerSocket` for unix-domain exists anywhere in `lib/`. Three IPC clients coexist (`DaemonClient` socket, `InProcessClient`, `IsolateClient` + `Backend`/`backend_entry.dart`); two service-wiring sites duplicate registration. The load-bearing CLI-first guardrail has no runtime path. D-68 (filed in this session) commits to the dual-surface plan.
|
||||
|
||||
**Pick one path:**
|
||||
- **(a)** Implement the socket server per D-56 + the C `clide` client. Delete `InProcessClient` and `IsolateClient` + `backend_entry.dart`. Wire MCP server alongside per D-68.
|
||||
- **(b)** Amend D-56 to declare in-process direct dispatch as the design; delete `DaemonClient`''s socket code, `IsolateClient`, `Backend`, and `backend_entry.dart`. Re-evaluate D-1''s CLI-first claim and D-68''s dual-surface plan.
|
||||
|
||||
**Acceptance:**
|
||||
1. Exactly one IPC model exists in code.
|
||||
2. `clide <subcommand>` shells from a terminal can drive a running clide app (or the contract is formally rescinded).
|
||||
3. Service registration happens in one place.
|
||||
4. D-records updated to match reality.
|
||||
|
||||
Source: consultants.md "Architecture — Findings — [Critical] No IPC socket server exists".', 'backlog', 'high', NULL, NULL, NULL, '2026-05-17 18:47:18', '2026-05-17 18:47:18', NULL, '0cdad0173d2328b613c390aae0d31b39', 1) ON CONFLICT(id) DO UPDATE SET type=excluded.type, parent_id=excluded.parent_id, title=excluded.title, description=excluded.description, status=excluded.status, priority=excluded.priority, assigned_to=excluded.assigned_to, team=excluded.team, decision_ref=excluded.decision_ref, updated_at=excluded.updated_at, deleted_at=excluded.deleted_at, hash=excluded.hash, canonical_version=excluded.canonical_version WHERE excluded.updated_at > tickets.updated_at OR (excluded.updated_at = tickets.updated_at AND excluded.hash > tickets.hash);
|
||||
INSERT INTO tickets (id, type, parent_id, title, description, status, priority, assigned_to, team, decision_ref, created_at, updated_at, deleted_at, hash, canonical_version) VALUES ('T-100', 'story', 'T-97', 'make ClideTappable keyboard-operable; add palette arrow-keys + Escape', '`ClideTappable` (`lib/widgets/src/clide_tappable.dart`) is the base of nearly every interactive widget — `ClideButton`, `_WinBtn`, `_RecentProjectRow`, `_ActionRow`, most builtin list items — and it is `MouseRegion` + `GestureDetector` only. No `Focus`, no Enter/Space handler, no focus ring. None of these widgets can be reached by Tab or activated from the keyboard. The keyboard-traversal test passes only because it externally wraps in a `Focus` node — it tests non-blocking, not operability.
|
||||
|
||||
`ClidePalette` (`lib/widgets/src/clide_palette.dart`) is similarly broken: `onSubmitted` only ever invokes `filtered.first`; no up/down handling, no selected index, no selection highlight, no Escape handler.
|
||||
|
||||
**Fix:**
|
||||
1. Wrap `ClideTappable`''s child in `Focus` + `Shortcuts`/`Actions` so Tab focuses it and Enter/Space invokes `onTap`. Render a focus ring via the token system.
|
||||
2. Add arrow-key navigation + selected-index + Escape + Enter-on-selected to `ClidePalette` (model after `_ProjectSwitcherDropdown.onKeyEvent` at `app.dart:446-452`).
|
||||
3. Extend the a11y test layer to assert operability (Tab + Enter actually invokes), not just Semantics presence.
|
||||
|
||||
Source: consultants.md "UX — Findings — [Critical]".', 'backlog', 'high', NULL, NULL, NULL, '2026-05-17 18:47:23', '2026-05-17 18:47:23', NULL, '9e8f220cb4fd6df1ac349dbe47977e67', 1) ON CONFLICT(id) DO UPDATE SET type=excluded.type, parent_id=excluded.parent_id, title=excluded.title, description=excluded.description, status=excluded.status, priority=excluded.priority, assigned_to=excluded.assigned_to, team=excluded.team, decision_ref=excluded.decision_ref, updated_at=excluded.updated_at, deleted_at=excluded.deleted_at, hash=excluded.hash, canonical_version=excluded.canonical_version WHERE excluded.updated_at > tickets.updated_at OR (excluded.updated_at = tickets.updated_at AND excluded.hash > tickets.hash);
|
||||
INSERT INTO tickets (id, type, parent_id, title, description, status, priority, assigned_to, team, decision_ref, created_at, updated_at, deleted_at, hash, canonical_version) VALUES ('T-101', 'task', 'T-97', 'rewrite README + docs/initial-plan to match current architecture', '`README.md` and `docs/initial-plan.md` describe an architecture that no longer exists. README documents `ptyc/` as a live component (`README.md:10`) and `make ptyc-build` (`:36`) — `ptyc/` is gone (D-5 amendment 2026-05-07) and the Makefile has no such target. `README.md:44` links to a `decisions/` directory that has moved to `governance/`. `docs/initial-plan.md` still describes a Go sidecar, separate `clide --daemon` long-running process, `app/` subdirectory, and `project.yaml` — all contradicted by D-5, D-56, and the single-package-at-root reality. A new contributor''s first read builds a wrong mental model.
|
||||
|
||||
**Fix:**
|
||||
1. Rewrite `README.md`''s `ptyc/` sections; remove `make ptyc-build` references.
|
||||
2. Fix the `decisions/` link → `governance/decisions/`.
|
||||
3. Either banner `docs/initial-plan.md` as historical (preserved as a snapshot) or extract a current `docs/architecture.md` that matches today''s code.
|
||||
4. Spot-check other doc references to dissolved components.
|
||||
|
||||
Source: consultants.md "Docs — Findings — [Critical]".', 'backlog', 'high', NULL, NULL, NULL, '2026-05-17 18:47:29', '2026-05-17 18:47:29', NULL, 'b7279d92c6980c0617c66678531eeaa0', 1) ON CONFLICT(id) DO UPDATE SET type=excluded.type, parent_id=excluded.parent_id, title=excluded.title, description=excluded.description, status=excluded.status, priority=excluded.priority, assigned_to=excluded.assigned_to, team=excluded.team, decision_ref=excluded.decision_ref, updated_at=excluded.updated_at, deleted_at=excluded.deleted_at, hash=excluded.hash, canonical_version=excluded.canonical_version WHERE excluded.updated_at > tickets.updated_at OR (excluded.updated_at = tickets.updated_at AND excluded.hash > tickets.hash);
|
||||
INSERT INTO tickets (id, type, parent_id, title, description, status, priority, assigned_to, team, decision_ref, created_at, updated_at, deleted_at, hash, canonical_version) VALUES ('T-102', 'bug', 'T-97', 'add symlink re-resolution + containment re-check to files.read / files.ls', '`path_safety.dart:35-51` explicitly does not resolve symlinks; the filesystem layer (`files_commands.dart:81-85`) doesn''t either. A repo symlink `config -> /etc/shadow` passes the containment check (the link path is under root) and clide reads the target.
|
||||
|
||||
**Fix:** after `resolveUnderRoot`, call `resolveSymbolicLinksSync()` and re-verify containment against the workspace root.
|
||||
|
||||
**Acceptance:** test that a symlink pointing outside the workspace is rejected by both `files.read` and `files.ls`.
|
||||
|
||||
Source: consultants.md "Security — Findings — [Major] Path-safety does not defend against symlink escape".', 'backlog', 'high', NULL, NULL, NULL, '2026-05-17 18:47:33', '2026-05-17 18:47:33', NULL, '775f4fe49033e20f20acc844d95ecc39', 1) ON CONFLICT(id) DO UPDATE SET type=excluded.type, parent_id=excluded.parent_id, title=excluded.title, description=excluded.description, status=excluded.status, priority=excluded.priority, assigned_to=excluded.assigned_to, team=excluded.team, decision_ref=excluded.decision_ref, updated_at=excluded.updated_at, deleted_at=excluded.deleted_at, hash=excluded.hash, canonical_version=excluded.canonical_version WHERE excluded.updated_at > tickets.updated_at OR (excluded.updated_at = tickets.updated_at AND excluded.hash > tickets.hash);
|
||||
INSERT INTO tickets (id, type, parent_id, title, description, status, priority, assigned_to, team, decision_ref, created_at, updated_at, deleted_at, hash, canonical_version) VALUES ('T-103', 'task', 'T-97', 'add test-integration + smoke-bundle to make push-check', '`make push-check` runs `decisions-validate test-core test test-a11y coverage-gate changelog-gate`. `test-integration` and `smoke-bundle` are omitted — a boot-order regression sails through the pre-push gate.
|
||||
|
||||
**Acceptance:** `make push-check` runs the integration test layer + smoke-bundle. Wall-clock budget acceptable for pre-push (target <2 min total). If they''re too slow, gate them behind a separate `make push-check-full` and document.
|
||||
|
||||
Source: consultants.md "Tests — Findings — [Major] make push-check does not run integration tests".', 'backlog', 'high', NULL, NULL, NULL, '2026-05-17 18:47:39', '2026-05-17 18:47:39', NULL, 'a8fd3058339ed8100113ba03afb28b49', 1) ON CONFLICT(id) DO UPDATE SET type=excluded.type, parent_id=excluded.parent_id, title=excluded.title, description=excluded.description, status=excluded.status, priority=excluded.priority, assigned_to=excluded.assigned_to, team=excluded.team, decision_ref=excluded.decision_ref, updated_at=excluded.updated_at, deleted_at=excluded.deleted_at, hash=excluded.hash, canonical_version=excluded.canonical_version WHERE excluded.updated_at > tickets.updated_at OR (excluded.updated_at = tickets.updated_at AND excluded.hash > tickets.hash);
|
||||
INSERT INTO tickets (id, type, parent_id, title, description, status, priority, assigned_to, team, decision_ref, created_at, updated_at, deleted_at, hash, canonical_version) VALUES ('T-104', 'task', 'T-97', 'schema-validate IPC argument surface; reject -prefixed values', '`DaemonDispatcher.dispatch` (`dispatcher.dart:26`) and `IpcRequest.fromJson` (`envelope.dart:49`) do no schema validation. No size limit on `files.read`, no count cap on `git.log`. `git diff`/`stage` use `--` separators (good), but `checkout(branch)` and `push(remote, branch)` (`git_commands.dart:240`) do not — argument injection (e.g. `git checkout --upload-pack=...`) is possible.
|
||||
|
||||
**Fix:**
|
||||
1. Typed schema per IPC command (`branch`, `remote`, `path`, etc. with regex / charset constraints).
|
||||
2. Size + count bounds on `files.read`, `git.log`, `git.diff`.
|
||||
3. Either reject `-`-prefixed values for branch/remote/path args, or use `--` everywhere (including `checkout` and `push`).
|
||||
|
||||
**Acceptance:** unit tests cover the rejection path for each injection vector listed.
|
||||
|
||||
Source: consultants.md "Security — Findings — [Major]".', 'backlog', 'high', NULL, NULL, NULL, '2026-05-17 18:47:42', '2026-05-17 18:47:42', NULL, '253bf788aab85afcaad22d5983ecb7be', 1) ON CONFLICT(id) DO UPDATE SET type=excluded.type, parent_id=excluded.parent_id, title=excluded.title, description=excluded.description, status=excluded.status, priority=excluded.priority, assigned_to=excluded.assigned_to, team=excluded.team, decision_ref=excluded.decision_ref, updated_at=excluded.updated_at, deleted_at=excluded.deleted_at, hash=excluded.hash, canonical_version=excluded.canonical_version WHERE excluded.updated_at > tickets.updated_at OR (excluded.updated_at = tickets.updated_at AND excluded.hash > tickets.hash);
|
||||
INSERT INTO tickets (id, type, parent_id, title, description, status, priority, assigned_to, team, decision_ref, created_at, updated_at, deleted_at, hash, canonical_version) VALUES ('T-105', 'story', 'T-97', 'establish focus-traversal model; integrate FocusTracker with Flutter focus', 'No `FocusScope`/`FocusTraversalGroup` wiring across panels. `FocusTracker` (`lib/kernel/src/focus.dart`) tracks an active contribution id for the `clide active` CLI but doesn''t plug into Flutter''s focus system — it parallels it. Tab order across sidebar → workspace → context is undefined.
|
||||
|
||||
**Fix:**
|
||||
1. Per-slot `FocusTraversalGroup` so each panel manages its own traversal.
|
||||
2. A documented top-level keybinding (e.g. `Ctrl+Shift+Tab`-style) that moves focus to the next panel.
|
||||
3. Integrate `FocusTracker` with Flutter focus rather than maintaining a parallel registry.
|
||||
|
||||
Depends on T-100 (ClideTappable accepting focus).
|
||||
|
||||
Source: consultants.md "UX — Findings — [Major] No focus-traversal wiring".', 'backlog', 'medium', NULL, NULL, NULL, '2026-05-17 18:47:47', '2026-05-17 18:47:47', NULL, 'eaadb20b91bb06cb6b9b4ef96930b773', 1) ON CONFLICT(id) DO UPDATE SET type=excluded.type, parent_id=excluded.parent_id, title=excluded.title, description=excluded.description, status=excluded.status, priority=excluded.priority, assigned_to=excluded.assigned_to, team=excluded.team, decision_ref=excluded.decision_ref, updated_at=excluded.updated_at, deleted_at=excluded.deleted_at, hash=excluded.hash, canonical_version=excluded.canonical_version WHERE excluded.updated_at > tickets.updated_at OR (excluded.updated_at = tickets.updated_at AND excluded.hash > tickets.hash);
|
||||
INSERT INTO tickets (id, type, parent_id, title, description, status, priority, assigned_to, team, decision_ref, created_at, updated_at, deleted_at, hash, canonical_version) VALUES ('T-106', 'bug', 'T-97', 'fix SchedulerService._startTicker isolate-spawn race', '`scheduler.dart:71`: `Isolate.spawn(_isolateEntry, _port!.sendPort).then((iso) => _isolate = iso)`. If `_stopTicker()` runs before the spawn future completes, `_isolate` is still null, nothing is killed, and the just-spawned isolate (with its `Timer.periodic`) leaks forever.
|
||||
|
||||
Same race shape we just fixed in `NativePty` via `_readerReady` (T-96).
|
||||
|
||||
**Fix:** track the spawn future as `_isolateReady`; `_stopTicker` awaits it before killing.
|
||||
|
||||
Source: consultants.md "Code quality — Findings — [Major]".', 'backlog', 'medium', NULL, NULL, NULL, '2026-05-17 18:47:51', '2026-05-17 18:47:51', NULL, '24ccc6ff379afaa61621764cdc105a46', 1) ON CONFLICT(id) DO UPDATE SET type=excluded.type, parent_id=excluded.parent_id, title=excluded.title, description=excluded.description, status=excluded.status, priority=excluded.priority, assigned_to=excluded.assigned_to, team=excluded.team, decision_ref=excluded.decision_ref, updated_at=excluded.updated_at, deleted_at=excluded.deleted_at, hash=excluded.hash, canonical_version=excluded.canonical_version WHERE excluded.updated_at > tickets.updated_at OR (excluded.updated_at = tickets.updated_at AND excluded.hash > tickets.hash);
|
||||
INSERT INTO tickets (id, type, parent_id, title, description, status, priority, assigned_to, team, decision_ref, created_at, updated_at, deleted_at, hash, canonical_version) VALUES ('T-107', 'task', 'T-97', 'decide lib/src/terminal/ status: formally vendor or clean to project bar', '~7k LOC forked from xterm.dart in an undeclared middle state. Carries commented-out `print()` debugging (`custom_text_edit.dart:244-275`), dangling TODOs (`parser.dart:110-113`, `keytab.dart:91`), a 1137-line `parser.dart`, and the only `// ignore: invalid_use_of_protected_member` in the repo (`terminal_view.dart:363`). Memory says "code under `lib/` is owned, not vendored."
|
||||
|
||||
**Decide one path and execute:**
|
||||
- **(a)** Formally vendor: relocate to `native/` or document as frozen in a D-record + `licenses.yaml`. Coverage carve-out documented.
|
||||
- **(b)** Clean to the project bar: remove debug prints, resolve TODOs, justify or remove the protected-member suppression, consider splitting `parser.dart`.
|
||||
|
||||
Source: consultants.md "Code quality — Findings — [Major]".', 'backlog', 'medium', NULL, NULL, NULL, '2026-05-17 18:47:55', '2026-05-17 18:47:55', NULL, '0a3cd3ee07488b0d76c648222cec249c', 1) ON CONFLICT(id) DO UPDATE SET type=excluded.type, parent_id=excluded.parent_id, title=excluded.title, description=excluded.description, status=excluded.status, priority=excluded.priority, assigned_to=excluded.assigned_to, team=excluded.team, decision_ref=excluded.decision_ref, updated_at=excluded.updated_at, deleted_at=excluded.deleted_at, hash=excluded.hash, canonical_version=excluded.canonical_version WHERE excluded.updated_at > tickets.updated_at OR (excluded.updated_at = tickets.updated_at AND excluded.hash > tickets.hash);
|
||||
INSERT INTO tickets (id, type, parent_id, title, description, status, priority, assigned_to, team, decision_ref, created_at, updated_at, deleted_at, hash, canonical_version) VALUES ('T-108', 'task', 'T-97', 'replace wall-clock sleeps in watcher_test / session_test with event-driven waits', '`test/files/watcher_test.dart:67-82` uses fixed `Future.delayed`. `test/pty/session_test.dart` polls 50×100ms and uses a bare `500ms` settle. `session_test.dart`''s `timeout(5s, onTimeout: () {})` swallows the timeout — a never-producing PTY proceeds to a confusing assertion failure rather than a clear timeout.
|
||||
|
||||
**Fix:**
|
||||
1. Replace fixed sleeps with `expectLater(stream, emits(...))` or equivalent event-driven waits.
|
||||
2. Replace swallowed `onTimeout: () {}` with `onTimeout: () => fail(''...'')`.
|
||||
|
||||
Source: consultants.md "Tests — Findings — [Major]".', 'backlog', 'medium', NULL, NULL, NULL, '2026-05-17 18:47:59', '2026-05-17 18:47:59', NULL, '5eacdfdce7733026d43070d103e5e67d', 1) ON CONFLICT(id) DO UPDATE SET type=excluded.type, parent_id=excluded.parent_id, title=excluded.title, description=excluded.description, status=excluded.status, priority=excluded.priority, assigned_to=excluded.assigned_to, team=excluded.team, decision_ref=excluded.decision_ref, updated_at=excluded.updated_at, deleted_at=excluded.deleted_at, hash=excluded.hash, canonical_version=excluded.canonical_version WHERE excluded.updated_at > tickets.updated_at OR (excluded.updated_at = tickets.updated_at AND excluded.hash > tickets.hash);
|
||||
INSERT INTO tickets (id, type, parent_id, title, description, status, priority, assigned_to, team, decision_ref, created_at, updated_at, deleted_at, hash, canonical_version) VALUES ('T-109', 'task', 'T-97', 'write CONTRIBUTING.md; cut interim release to drain Unreleased; merge duplicate changelog headings', 'Three docs items:
|
||||
|
||||
1. **No `CONTRIBUTING.md`.** Build/test story is scattered across `CLAUDE.md` (Claude-addressed), `README.md` (partly wrong — see T-101), and Makefile help. Write a human-addressed contributor guide: clone → `make hooks && flutter pub get` → `make test` → DQR workflow → commit conventions.
|
||||
2. **CHANGELOG has duplicate subsection headings in `[Unreleased]`** — three `### Changed`, two `### Fixed`, two `### Removed` in the 2.0.0 section. Keep a Changelog 1.1.0 expects one of each per release. Merge.
|
||||
3. **~80-commit Unreleased backlog** undermines the format. Cut an interim release (`vX.Y.Z`) to drain it before continuing.
|
||||
|
||||
Order matters: 2 → 3 → 1 (clean changelog, release, then doc the workflow).
|
||||
|
||||
Source: consultants.md "Docs — Findings".', 'backlog', 'medium', NULL, NULL, NULL, '2026-05-17 18:48:03', '2026-05-17 18:48:03', NULL, 'e5983cfe63a6f472a76389954c16727c', 1) ON CONFLICT(id) DO UPDATE SET type=excluded.type, parent_id=excluded.parent_id, title=excluded.title, description=excluded.description, status=excluded.status, priority=excluded.priority, assigned_to=excluded.assigned_to, team=excluded.team, decision_ref=excluded.decision_ref, updated_at=excluded.updated_at, deleted_at=excluded.deleted_at, hash=excluded.hash, canonical_version=excluded.canonical_version WHERE excluded.updated_at > tickets.updated_at OR (excluded.updated_at = tickets.updated_at AND excluded.hash > tickets.hash);
|
||||
INSERT INTO tickets (id, type, parent_id, title, description, status, priority, assigned_to, team, decision_ref, created_at, updated_at, deleted_at, hash, canonical_version) VALUES ('T-110', 'story', 'T-97', 'replace root KeyboardListener with scoped Shortcuts/Actions; move off keyLabel', '`app.dart:90-148` routes all shortcuts through one root `KeyboardListener` — no per-context scoping; will conflict with text-input fields once any pane wants to capture keys. `KeybindingResolver.fromKeyEvent` keys off `logicalKey.keyLabel` which is layout-dependent (US-QWERTY `Ctrl+/` differs from AZERTY `Ctrl+:`).
|
||||
|
||||
**Fix:**
|
||||
1. Replace the root `KeyboardListener` with scoped `Shortcuts`/`Actions` per slot.
|
||||
2. Move `KeybindingResolver` to `physicalKey` or a stable mapping layer.
|
||||
|
||||
Coordinate with T-100 (Focus/Shortcuts wrapper for ClideTappable) and T-105 (focus traversal).
|
||||
|
||||
Source: consultants.md "UX — Findings — [Major]".', 'backlog', 'medium', NULL, NULL, NULL, '2026-05-17 18:48:09', '2026-05-17 18:48:09', NULL, '5035c2e9d1c4c043045e5fcd1e7995bb', 1) ON CONFLICT(id) DO UPDATE SET type=excluded.type, parent_id=excluded.parent_id, title=excluded.title, description=excluded.description, status=excluded.status, priority=excluded.priority, assigned_to=excluded.assigned_to, team=excluded.team, decision_ref=excluded.decision_ref, updated_at=excluded.updated_at, deleted_at=excluded.deleted_at, hash=excluded.hash, canonical_version=excluded.canonical_version WHERE excluded.updated_at > tickets.updated_at OR (excluded.updated_at = tickets.updated_at AND excluded.hash > tickets.hash);
|
||||
INSERT INTO tickets (id, type, parent_id, title, description, status, priority, assigned_to, team, decision_ref, created_at, updated_at, deleted_at, hash, canonical_version) VALUES ('T-111', 'story', 'T-97', 'drag-resize keyboard parity + clide panel resize CLI', '`drag_resize.dart` and `app.dart:870-912` are pure `Listener` pointer handlers — no keyboard equivalent, no Semantics node. Per the user/Claude parity rule (D-6), panel sizing should have a CLI affordance. Neither exists.
|
||||
|
||||
**Fix:**
|
||||
1. Add Semantics to drag-resize handles + keyboard activation (focus → arrow keys adjust width).
|
||||
2. Add `clide panel resize <slot> <delta-or-absolute>` CLI verb.
|
||||
|
||||
Coordinate with T-99 (IPC implementation) if the CLI verb needs new dispatch wiring.
|
||||
|
||||
Source: consultants.md "UX — Findings — [Major] Drag-resize handles".', 'backlog', 'medium', NULL, NULL, NULL, '2026-05-17 18:48:14', '2026-05-17 18:48:14', NULL, '7d936b1c6561bcd6d2981786a17cc486', 1) ON CONFLICT(id) DO UPDATE SET type=excluded.type, parent_id=excluded.parent_id, title=excluded.title, description=excluded.description, status=excluded.status, priority=excluded.priority, assigned_to=excluded.assigned_to, team=excluded.team, decision_ref=excluded.decision_ref, updated_at=excluded.updated_at, deleted_at=excluded.deleted_at, hash=excluded.hash, canonical_version=excluded.canonical_version WHERE excluded.updated_at > tickets.updated_at OR (excluded.updated_at = tickets.updated_at AND excluded.hash > tickets.hash);
|
||||
INSERT INTO tickets (id, type, parent_id, title, description, status, priority, assigned_to, team, decision_ref, created_at, updated_at, deleted_at, hash, canonical_version) VALUES ('T-112', 'task', 'T-97', 'quick-wins: code-quality cleanups', 'Batch of small consultant findings that share a domain (code quality):
|
||||
|
||||
1. Replace silent `catch (_)` in `tree_sitter_ffi.dart:197,206` with a logged last-error — `DynamicLibrary.open` failures are currently discarded.
|
||||
2. Delete `Cmsghdr` alias in `libc.dart:201-202` ("backward compatibility" — CLAUDE.md forbids in a solo repo).
|
||||
3. Remove `// ignore: unused_field` in `editor_controller.dart:25` (speculative retention; fix not silence).
|
||||
4. Consume `libc.dart` constants / `PosixErrno` in `native_pty.dart` instead of inline hex (`0x0001`, `28`, `4`, `9`).
|
||||
5. `ExtensionManager.activate` (`extensions_manager.dart:141-143`) swallows exceptions — surface a "degraded" state for the UI.
|
||||
6. Verify `file_tree_view.dart:8` barrel leak (commit `5cad982` may already cover this).
|
||||
7. Move `test_app.dart` out of production `main.dart` import graph (gate behind separate entrypoint or `kDebugMode`).
|
||||
|
||||
Source: consultants.md (Code Quality + Architecture Findings — Minor).', 'backlog', 'low', NULL, NULL, NULL, '2026-05-17 18:48:20', '2026-05-17 18:48:20', NULL, '22c6b816bbc90c6c535d041e6a5ba3d6', 1) ON CONFLICT(id) DO UPDATE SET type=excluded.type, parent_id=excluded.parent_id, title=excluded.title, description=excluded.description, status=excluded.status, priority=excluded.priority, assigned_to=excluded.assigned_to, team=excluded.team, decision_ref=excluded.decision_ref, updated_at=excluded.updated_at, deleted_at=excluded.deleted_at, hash=excluded.hash, canonical_version=excluded.canonical_version WHERE excluded.updated_at > tickets.updated_at OR (excluded.updated_at = tickets.updated_at AND excluded.hash > tickets.hash);
|
||||
INSERT INTO tickets (id, type, parent_id, title, description, status, priority, assigned_to, team, decision_ref, created_at, updated_at, deleted_at, hash, canonical_version) VALUES ('T-113', 'task', 'T-97', 'quick-wins: governance + docs reconciliation', 'Batch of small consultant findings that share a domain (governance/docs):
|
||||
|
||||
1. **Amend D-66** to match current floor location/value: the floor lives in `pubspec.yaml` `coverage_floor:` (single source of truth as of this session), not `coverage/floor.txt`. Add a dated amendment line.
|
||||
2. **Reconcile `licenses.yaml` vs `pubspec.yaml`** — `test` version drift (`1.25.8` vs `1.30.0`), phantom `lints 5.0.0` not in pubspec. Two-step-commit rule from D-42 is being violated.
|
||||
3. **Triage stale Q-records** — Q-1/Q-2/Q-3 ("defer until Tier 1 is in real use") are due now that Tier 1 has shipped. Q-25 (body text face) is de facto resolved by D-43/D-44.
|
||||
4. **Drop `--no-fatal-infos` from `ci/test.sh`** now that the import queue is clear (post test-sweep this session).
|
||||
5. Add a `.claude/skills/README.md` inventory.
|
||||
|
||||
Source: consultants.md (Docs + Tests + Security Findings — Minor).', 'backlog', 'low', NULL, NULL, NULL, '2026-05-17 18:48:24', '2026-05-17 18:48:24', NULL, 'a917f3d6c5c83c0f95959c24de0a5d9f', 1) ON CONFLICT(id) DO UPDATE SET type=excluded.type, parent_id=excluded.parent_id, title=excluded.title, description=excluded.description, status=excluded.status, priority=excluded.priority, assigned_to=excluded.assigned_to, team=excluded.team, decision_ref=excluded.decision_ref, updated_at=excluded.updated_at, deleted_at=excluded.deleted_at, hash=excluded.hash, canonical_version=excluded.canonical_version WHERE excluded.updated_at > tickets.updated_at OR (excluded.updated_at = tickets.updated_at AND excluded.hash > tickets.hash);
|
||||
INSERT INTO tickets (id, type, parent_id, title, description, status, priority, assigned_to, team, decision_ref, created_at, updated_at, deleted_at, hash, canonical_version) VALUES ('T-114', 'task', 'T-97', 'quick-wins: a11y + contrast gate expansion', 'Batch of small consultant findings that share a domain (a11y / visual):
|
||||
|
||||
1. Expand contrast gate `canonicalPairs` (`test/a11y/contrast_test.dart`) to cover `globalTextMuted` (muted text is everywhere), the `status*` foregrounds, syntax tokens on `panelBackground`, and `panelActiveBorder`.
|
||||
2. Tokenize the ~43 hardcoded-color sites the UX reviewer flagged — at minimum the modal/palette shadow and window-control colors that don''t adapt to the `paper` light theme.
|
||||
3. Add a focus-ring rendering at the token level so every focusable widget gets it for free (depends on T-100).
|
||||
4. Surface text-zoom (Ctrl +/-/0) in the palette so it''s discoverable.
|
||||
|
||||
Source: consultants.md "UX — Findings — [Minor]" + Strengths section.', 'backlog', 'low', NULL, NULL, NULL, '2026-05-17 18:48:28', '2026-05-17 18:48:28', NULL, 'e749bba718321bcc202cc51c55a59ee4', 1) ON CONFLICT(id) DO UPDATE SET type=excluded.type, parent_id=excluded.parent_id, title=excluded.title, description=excluded.description, status=excluded.status, priority=excluded.priority, assigned_to=excluded.assigned_to, team=excluded.team, decision_ref=excluded.decision_ref, updated_at=excluded.updated_at, deleted_at=excluded.deleted_at, hash=excluded.hash, canonical_version=excluded.canonical_version WHERE excluded.updated_at > tickets.updated_at OR (excluded.updated_at = tickets.updated_at AND excluded.hash > tickets.hash);
|
||||
INSERT INTO tickets (id, type, parent_id, title, description, status, priority, assigned_to, team, decision_ref, created_at, updated_at, deleted_at, hash, canonical_version) VALUES ('T-98', 'bug', 'T-97', 'fix untrusted-workspace RCE in dugite git resolution', '`toolchain_paths.dart:79` builds `''$workspaceRoot/native/dugite/bin''` and runs `_firstExisting([''$dugite/git''])` — if that file exists in the open workspace it becomes the git binary for all GitClient calls, before falling back to PATH. A malicious repo commits an executable at `native/dugite/bin/git`; clide runs it on the first auto-fired `git.status`. Arbitrary code execution from merely opening a repo.
|
||||
|
||||
**Fix:** resolve `native/dugite` against `Platform.resolvedExecutable`''s directory (or a known install root), never `workspaceRoot`.
|
||||
|
||||
**Acceptance:**
|
||||
1. Toolchain resolution does not look at any workspace path.
|
||||
2. Test that a planted `native/dugite/bin/git` in the temp-dir workspace is ignored.
|
||||
3. Existing dugite-in-install-dir behavior preserved.
|
||||
|
||||
Source: consultants.md "Security — Findings — [Critical]".', 'done', 'critical', NULL, NULL, NULL, '2026-05-17 18:47:13', '2026-05-17 18:55:57', NULL, '40e1ed24c3cce28e2420150f1fac8fbd', 1) ON CONFLICT(id) DO UPDATE SET type=excluded.type, parent_id=excluded.parent_id, title=excluded.title, description=excluded.description, status=excluded.status, priority=excluded.priority, assigned_to=excluded.assigned_to, team=excluded.team, decision_ref=excluded.decision_ref, updated_at=excluded.updated_at, deleted_at=excluded.deleted_at, hash=excluded.hash, canonical_version=excluded.canonical_version WHERE excluded.updated_at > tickets.updated_at OR (excluded.updated_at = tickets.updated_at AND excluded.hash > tickets.hash);
|
||||
INSERT INTO tickets (id, type, parent_id, title, description, status, priority, assigned_to, team, decision_ref, created_at, updated_at, deleted_at, hash, canonical_version) VALUES ('T-102', 'bug', 'T-97', 'add symlink re-resolution + containment re-check to files.read / files.ls', '`path_safety.dart:35-51` explicitly does not resolve symlinks; the filesystem layer (`files_commands.dart:81-85`) doesn''t either. A repo symlink `config -> /etc/shadow` passes the containment check (the link path is under root) and clide reads the target.
|
||||
|
||||
**Fix:** after `resolveUnderRoot`, call `resolveSymbolicLinksSync()` and re-verify containment against the workspace root.
|
||||
|
||||
**Acceptance:** test that a symlink pointing outside the workspace is rejected by both `files.read` and `files.ls`.
|
||||
|
||||
Source: consultants.md "Security — Findings — [Major] Path-safety does not defend against symlink escape".', 'done', 'high', NULL, NULL, NULL, '2026-05-17 18:47:33', '2026-05-17 19:01:39', NULL, '937111bd0e00620e7faf68859018619a', 1) ON CONFLICT(id) DO UPDATE SET type=excluded.type, parent_id=excluded.parent_id, title=excluded.title, description=excluded.description, status=excluded.status, priority=excluded.priority, assigned_to=excluded.assigned_to, team=excluded.team, decision_ref=excluded.decision_ref, updated_at=excluded.updated_at, deleted_at=excluded.deleted_at, hash=excluded.hash, canonical_version=excluded.canonical_version WHERE excluded.updated_at > tickets.updated_at OR (excluded.updated_at = tickets.updated_at AND excluded.hash > tickets.hash);
|
||||
INSERT INTO tickets (id, type, parent_id, title, description, status, priority, assigned_to, team, decision_ref, created_at, updated_at, deleted_at, hash, canonical_version) VALUES ('T-101', 'task', 'T-97', 'rewrite README + docs/initial-plan to match current architecture', '`README.md` and `docs/initial-plan.md` describe an architecture that no longer exists. README documents `ptyc/` as a live component (`README.md:10`) and `make ptyc-build` (`:36`) — `ptyc/` is gone (D-5 amendment 2026-05-07) and the Makefile has no such target. `README.md:44` links to a `decisions/` directory that has moved to `governance/`. `docs/initial-plan.md` still describes a Go sidecar, separate `clide --daemon` long-running process, `app/` subdirectory, and `project.yaml` — all contradicted by D-5, D-56, and the single-package-at-root reality. A new contributor''s first read builds a wrong mental model.
|
||||
|
||||
**Fix:**
|
||||
1. Rewrite `README.md`''s `ptyc/` sections; remove `make ptyc-build` references.
|
||||
2. Fix the `decisions/` link → `governance/decisions/`.
|
||||
3. Either banner `docs/initial-plan.md` as historical (preserved as a snapshot) or extract a current `docs/architecture.md` that matches today''s code.
|
||||
4. Spot-check other doc references to dissolved components.
|
||||
|
||||
Source: consultants.md "Docs — Findings — [Critical]".', 'done', 'high', NULL, NULL, NULL, '2026-05-17 18:47:29', '2026-05-17 19:01:39', NULL, 'a7d378267119361f2b2188977881a666', 1) ON CONFLICT(id) DO UPDATE SET type=excluded.type, parent_id=excluded.parent_id, title=excluded.title, description=excluded.description, status=excluded.status, priority=excluded.priority, assigned_to=excluded.assigned_to, team=excluded.team, decision_ref=excluded.decision_ref, updated_at=excluded.updated_at, deleted_at=excluded.deleted_at, hash=excluded.hash, canonical_version=excluded.canonical_version WHERE excluded.updated_at > tickets.updated_at OR (excluded.updated_at = tickets.updated_at AND excluded.hash > tickets.hash);
|
||||
INSERT INTO tickets (id, type, parent_id, title, description, status, priority, assigned_to, team, decision_ref, created_at, updated_at, deleted_at, hash, canonical_version) VALUES ('T-115', 'story', NULL, 'startup project picker; "always open this project" override', 'Startup flow change: on launch, always show the project picker screen unless the user has explicitly checked an "always open this project" box for a specific project (sticky default).
|
||||
|
||||
**Acceptance:**
|
||||
1. Default startup: project picker is the first screen, regardless of last-opened state.
|
||||
2. Picker has an "always open this project on launch" checkbox per project entry.
|
||||
3. If exactly one project has that flag set, startup skips the picker and opens that project directly.
|
||||
4. The flag is per-project, persisted in app settings (probably under `app.startupProject`).
|
||||
5. The checkbox can be unticked from the welcome view to restore picker-first behavior.
|
||||
|
||||
**Notes:** today the app auto-opens `app.lastProject` on boot (kernel/src/project.dart `openLast`). The new flow inverts the default — picker is the steady state, sticky-open is opt-in per project.
|
||||
|
||||
**Out of scope:** multi-project workspaces, project groups, recent-project ordering changes.
|
||||
|
||||
**Source:** user request 2026-05-17.', 'backlog', 'medium', NULL, NULL, NULL, '2026-05-17 19:10:21', '2026-05-17 19:10:21', NULL, 'ce156fb92fbad8ba9bf860a4eb71d1ac', 1) ON CONFLICT(id) DO UPDATE SET type=excluded.type, parent_id=excluded.parent_id, title=excluded.title, description=excluded.description, status=excluded.status, priority=excluded.priority, assigned_to=excluded.assigned_to, team=excluded.team, decision_ref=excluded.decision_ref, updated_at=excluded.updated_at, deleted_at=excluded.deleted_at, hash=excluded.hash, canonical_version=excluded.canonical_version WHERE excluded.updated_at > tickets.updated_at OR (excluded.updated_at = tickets.updated_at AND excluded.hash > tickets.hash);
|
||||
INSERT INTO tickets (id, type, parent_id, title, description, status, priority, assigned_to, team, decision_ref, created_at, updated_at, deleted_at, hash, canonical_version) VALUES ('T-116', 'bug', 'T-97', 'integration_test/theme_picker_test.dart hangs pumpAndSettle on theme.pick', 'When running `flutter test integration_test/theme_picker_test.dart` against the real boot path, calling `services.commands.execute(''theme.pick'')` followed by `await tester.pumpAndSettle()` does not settle — the test hangs for 60+ seconds and never reaches the `Select theme` / `Cancel` assertions. Likely an animation loop or a never-completing Future in the modal mount path.
|
||||
|
||||
Blocks T-103 from adding integration tests to `make push-check` (the other two integration tests pass after viewport + assertion fixes).
|
||||
|
||||
**Acceptance:**
|
||||
1. `flutter test integration_test/theme_picker_test.dart` completes in <10s.
|
||||
2. Both assertions (`Select theme` visible after `theme.pick`; gone after `Cancel`) pass.
|
||||
3. T-103''s `push-check-full` can include integration tests without the theme-picker hanging.
|
||||
|
||||
Source: surfaced 2026-05-17 during T-103 work.', 'backlog', 'medium', NULL, NULL, NULL, '2026-05-17 19:14:31', '2026-05-17 19:14:31', NULL, 'df0c6bdd610410d4bd27bfeb2be9acbc', 1) ON CONFLICT(id) DO UPDATE SET type=excluded.type, parent_id=excluded.parent_id, title=excluded.title, description=excluded.description, status=excluded.status, priority=excluded.priority, assigned_to=excluded.assigned_to, team=excluded.team, decision_ref=excluded.decision_ref, updated_at=excluded.updated_at, deleted_at=excluded.deleted_at, hash=excluded.hash, canonical_version=excluded.canonical_version WHERE excluded.updated_at > tickets.updated_at OR (excluded.updated_at = tickets.updated_at AND excluded.hash > tickets.hash);
|
||||
INSERT INTO tickets (id, type, parent_id, title, description, status, priority, assigned_to, team, decision_ref, created_at, updated_at, deleted_at, hash, canonical_version) VALUES ('T-113', 'task', 'T-97', 'quick-wins: governance + docs reconciliation', 'Batch of small consultant findings that share a domain (governance/docs):
|
||||
|
||||
1. **Amend D-66** to match current floor location/value: the floor lives in `pubspec.yaml` `coverage_floor:` (single source of truth as of this session), not `coverage/floor.txt`. Add a dated amendment line.
|
||||
2. **Reconcile `licenses.yaml` vs `pubspec.yaml`** — `test` version drift (`1.25.8` vs `1.30.0`), phantom `lints 5.0.0` not in pubspec. Two-step-commit rule from D-42 is being violated.
|
||||
3. **Triage stale Q-records** — Q-1/Q-2/Q-3 ("defer until Tier 1 is in real use") are due now that Tier 1 has shipped. Q-25 (body text face) is de facto resolved by D-43/D-44.
|
||||
4. **Drop `--no-fatal-infos` from `ci/test.sh`** now that the import queue is clear (post test-sweep this session).
|
||||
5. Add a `.claude/skills/README.md` inventory.
|
||||
|
||||
Source: consultants.md (Docs + Tests + Security Findings — Minor).', 'done', 'low', NULL, NULL, NULL, '2026-05-17 18:48:24', '2026-05-17 19:18:43', NULL, '6988f892ed906cb397bea5068fdcd30e', 1) ON CONFLICT(id) DO UPDATE SET type=excluded.type, parent_id=excluded.parent_id, title=excluded.title, description=excluded.description, status=excluded.status, priority=excluded.priority, assigned_to=excluded.assigned_to, team=excluded.team, decision_ref=excluded.decision_ref, updated_at=excluded.updated_at, deleted_at=excluded.deleted_at, hash=excluded.hash, canonical_version=excluded.canonical_version WHERE excluded.updated_at > tickets.updated_at OR (excluded.updated_at = tickets.updated_at AND excluded.hash > tickets.hash);
|
||||
INSERT INTO tickets (id, type, parent_id, title, description, status, priority, assigned_to, team, decision_ref, created_at, updated_at, deleted_at, hash, canonical_version) VALUES ('T-106', 'bug', 'T-97', 'fix SchedulerService._startTicker isolate-spawn race', '`scheduler.dart:71`: `Isolate.spawn(_isolateEntry, _port!.sendPort).then((iso) => _isolate = iso)`. If `_stopTicker()` runs before the spawn future completes, `_isolate` is still null, nothing is killed, and the just-spawned isolate (with its `Timer.periodic`) leaks forever.
|
||||
|
||||
Same race shape we just fixed in `NativePty` via `_readerReady` (T-96).
|
||||
|
||||
**Fix:** track the spawn future as `_isolateReady`; `_stopTicker` awaits it before killing.
|
||||
|
||||
Source: consultants.md "Code quality — Findings — [Major]".', 'done', 'medium', NULL, NULL, NULL, '2026-05-17 18:47:51', '2026-05-17 19:18:43', NULL, 'b529416bab7c66fde471f990671f3b25', 1) ON CONFLICT(id) DO UPDATE SET type=excluded.type, parent_id=excluded.parent_id, title=excluded.title, description=excluded.description, status=excluded.status, priority=excluded.priority, assigned_to=excluded.assigned_to, team=excluded.team, decision_ref=excluded.decision_ref, updated_at=excluded.updated_at, deleted_at=excluded.deleted_at, hash=excluded.hash, canonical_version=excluded.canonical_version WHERE excluded.updated_at > tickets.updated_at OR (excluded.updated_at = tickets.updated_at AND excluded.hash > tickets.hash);
|
||||
INSERT INTO tickets (id, type, parent_id, title, description, status, priority, assigned_to, team, decision_ref, created_at, updated_at, deleted_at, hash, canonical_version) VALUES ('T-103', 'task', 'T-97', 'add test-integration + smoke-bundle to make push-check', '`make push-check` runs `decisions-validate test-core test test-a11y coverage-gate changelog-gate`. `test-integration` and `smoke-bundle` are omitted — a boot-order regression sails through the pre-push gate.
|
||||
|
||||
**Acceptance:** `make push-check` runs the integration test layer + smoke-bundle. Wall-clock budget acceptable for pre-push (target <2 min total). If they''re too slow, gate them behind a separate `make push-check-full` and document.
|
||||
|
||||
Source: consultants.md "Tests — Findings — [Major] make push-check does not run integration tests".', 'done', 'high', NULL, NULL, NULL, '2026-05-17 18:47:39', '2026-05-17 19:18:43', NULL, 'cbae1915f1c89a8a2b05da71148d77dc', 1) ON CONFLICT(id) DO UPDATE SET type=excluded.type, parent_id=excluded.parent_id, title=excluded.title, description=excluded.description, status=excluded.status, priority=excluded.priority, assigned_to=excluded.assigned_to, team=excluded.team, decision_ref=excluded.decision_ref, updated_at=excluded.updated_at, deleted_at=excluded.deleted_at, hash=excluded.hash, canonical_version=excluded.canonical_version WHERE excluded.updated_at > tickets.updated_at OR (excluded.updated_at = tickets.updated_at AND excluded.hash > tickets.hash);
|
||||
|
||||
+58
-46
@@ -38,14 +38,16 @@ heading, and (b) bumping `pubspec.yaml` `version:` in the same commit.
|
||||
|
||||
### Added
|
||||
|
||||
- Pre-push coverage gate — `make push-check` (and the
|
||||
`.githooks/pre-push` hook that calls it) now runs
|
||||
`ci/coverage_gate.sh`, which fails if total line coverage drops
|
||||
below the `coverage_floor:` value in `pubspec.yaml`. The floor
|
||||
starts at 34% (today's measured floor) and only ratchets up; the
|
||||
end target is 95% (D-66). `ci/test.sh` now writes
|
||||
`coverage/lcov.info` as a side effect of the unit/widget/golden
|
||||
run so the gate adds no extra test invocation.
|
||||
- Pre-push coverage gate — `make push-check` runs `ci/coverage_gate.sh`,
|
||||
which fails if total line coverage drops below `coverage_floor:` in
|
||||
`pubspec.yaml`. Floor ratchets up only; target 95% (D-66).
|
||||
- Pre-push changelog gate — `ci/changelog_gate.sh` fails on any
|
||||
`## [Unreleased]` bullet over 60 words; warns at 40. Enforces the
|
||||
Keep-a-Changelog conciseness rule in the git-commit skill.
|
||||
- Test sweep — `keybindings`, `toolchain_paths`, and several
|
||||
`widgets/src/` primitives (tooltip, palette, multitab, markdown).
|
||||
- `tree_sitter_service` sweep — fake-FFI + real-library smoke,
|
||||
17% → 96%. Crosses the 95% global target (T-91).
|
||||
- Staged `dart doc` CI job — generates and uploads an HTML API
|
||||
reference for the public `lib/` surface. The step wraps
|
||||
`dart doc --validate-links` and grep-fails the build on any warning,
|
||||
@@ -67,38 +69,44 @@ heading, and (b) bumping `pubspec.yaml` `version:` in the same commit.
|
||||
|
||||
### Fixed
|
||||
|
||||
- `TerminalView.onTapUp` callbacks now actually fire on a primary
|
||||
tap. The parameter was wired to a code path that nothing in the
|
||||
gesture-detector chain ever invoked — the documented
|
||||
"Callback for when the user taps on the terminal" was a no-op
|
||||
for every caller. Routes through `TerminalGestureHandler.onSingleTapUp`
|
||||
now, with the resolved cell offset (T-93). Dead `onTapUp` surface
|
||||
on `TerminalGestureHandler` and `TerminalGestureDetector` removed
|
||||
in the same change.
|
||||
- `TerminalView.onTapUp` now actually fires on primary tap — was
|
||||
wired to a dead code path (T-93). Dead `onTapUp` surface on
|
||||
`TerminalGestureHandler` / `TerminalGestureDetector` removed.
|
||||
- `BufferLine.eraseRange` no longer panics when called with `end == 0`.
|
||||
The right-side wide-char guard read `_data[-1]` via `getWidth(-1)`,
|
||||
which threw a `RangeError`. Real trigger path: `Terminal.eraseDisplayAbove`
|
||||
with the cursor at column 0 — common after `ESC[H\x1b[1J`
|
||||
(home + erase-above) sequences that many TUIs emit on redraw.
|
||||
- Terminal selections no longer silently disappear when the terminal is
|
||||
resized narrower. Reflow's tail-anchor handler used to reparent
|
||||
anchors past the source's trimmed-content range onto a builder line
|
||||
that was never emitted, leaving them detached from the visible
|
||||
buffer; the selection controller's `extent.attached` check then
|
||||
returned null and the highlight vanished. Common trigger paths:
|
||||
Ctrl+A (select-all) followed by a width change, and mouse drag
|
||||
selections that extended past the end of a partially-filled line
|
||||
(T-92).
|
||||
- Terminal selections no longer vanish when resizing narrower —
|
||||
reflow's tail-anchor handler left anchors detached past the
|
||||
trimmed range. Common triggers: Ctrl+A then resize, drag past a
|
||||
partially-filled line (T-92).
|
||||
- `BufferLine.removeCells` / `insertCells` / `dispose` no longer skip
|
||||
anchors due to concurrent list modification during iteration —
|
||||
surfaced by unit tests added under T-91. Anchors disposed inside
|
||||
the loop were unhooking themselves from the same list the loop was
|
||||
iterating, causing later anchors to be silently skipped (no
|
||||
reposition, no dispose) and leaving the buffer in an inconsistent
|
||||
state. Iteration now snapshots the list first.
|
||||
iteration now snapshots the list first (T-91).
|
||||
|
||||
### Changed
|
||||
|
||||
- PTY spawning uses `posix_openpt` + `posix_spawn` instead of
|
||||
`forkpty` — closes a ~5% deadlock window in the multithreaded Dart
|
||||
VM (T-96, D-5 amended). Missing exe/cwd now throw `PtyException` at
|
||||
spawn time. Drops the `libutil.so.1` dependency.
|
||||
- Coverage floor ratcheted to 95% — D-66 target hit.
|
||||
- `TreeSitterService` and `TreeSitterLib` accept injectable FFI + asset
|
||||
loaders for fake-driven tests; production paths unchanged.
|
||||
- Tidied test imports flagged by `unnecessary_import`.
|
||||
- `README.md` rewritten to match current architecture; `docs/initial-plan.md`
|
||||
bannered as historical; new `docs/architecture.md` describes today's
|
||||
shape (T-101).
|
||||
- `SchedulerService._stopTicker` now awaits the in-flight isolate spawn
|
||||
before killing — closes the same race shape we fixed in PTY (T-106).
|
||||
- `make push-check-full` added — runs `push-check` plus integration +
|
||||
smoke for pre-release checks. Integration tests skip the hanging
|
||||
theme_picker case (T-116) until that's fixed (T-103).
|
||||
- Governance bookkeeping: D-66 amended (floor at `coverage_floor:` in
|
||||
`pubspec.yaml`); `licenses.yaml` reconciled with `pubspec.yaml`;
|
||||
Q-1/Q-2/Q-3/Q-25 triaged; `.claude/skills/README.md` inventory
|
||||
added; `--no-fatal-infos` dropped from `ci/test.sh` (T-113).
|
||||
- Terminal panes now render bold attributes with a real bold weight —
|
||||
bundled JetBrainsMono Bold + BoldItalic are registered with the
|
||||
`JetBrainsMono` family at `weight: 700`. The painter's bold
|
||||
@@ -131,22 +139,18 @@ heading, and (b) bumping `pubspec.yaml` `version:` in the same commit.
|
||||
- Terminal cell grid no longer drifts on bold text — bold rendering
|
||||
is suppressed at the painter level since synthetic bold (with no
|
||||
Bold.ttf registered) shifts glyph advance widths.
|
||||
- PTY surfaces errno on `forkpty`, `write`, and `ioctl` failures
|
||||
instead of swallowing them. `execve` failures in the spawned
|
||||
child now write a diagnostic line to the slave PTY before
|
||||
`_exit`, so the parent's reader sees the cause instead of an
|
||||
immediate EOF that looked indistinguishable from clean exit.
|
||||
PTY `write` loops on short writes; both `NativePty.write` and
|
||||
`PtySession.write` now throw `PtyException` on hard errors.
|
||||
- PTY teardown order fixed — kill the child first so the master
|
||||
fd returns EOF, await the reader isolate exit, then close the
|
||||
fd. Previously closing the fd while the isolate still polled it
|
||||
could briefly target a reused fd. Reader isolate spawn errors
|
||||
in both `NativePty` and `PtySession` are now surfaced via the
|
||||
output stream instead of silently dropped. `_recvFdAsync` no
|
||||
longer leaks the `ReceivePort` when `Isolate.spawn` throws, and
|
||||
`PtySession.spawn` closes the master fd if any post-receive
|
||||
step fails.
|
||||
- PTY surfaces errno on `forkpty` / `write` / `ioctl` failures
|
||||
instead of swallowing. `execve` failures write a diagnostic to
|
||||
the slave before `_exit`. `NativePty.write` and `PtySession.write`
|
||||
loop on short writes; both throw `PtyException` on hard errors.
|
||||
- PTY teardown order fixed — kill child first so the master fd
|
||||
returns EOF, await reader isolate exit, then close the fd.
|
||||
Closing earlier could briefly target a reused fd.
|
||||
- Reader isolate spawn errors in `NativePty` / `PtySession` are now
|
||||
surfaced via the output stream instead of silently dropped.
|
||||
`_recvFdAsync` no longer leaks the `ReceivePort` on spawn throw;
|
||||
`PtySession.spawn` closes the master fd if any post-receive step
|
||||
fails.
|
||||
- IPC server hardening: per-request 60s timeout (configurable),
|
||||
broadcast/response write failures logged instead of swallowed,
|
||||
client dropped on response-write failure, and the stale-socket
|
||||
@@ -161,6 +165,14 @@ heading, and (b) bumping `pubspec.yaml` `version:` in the same commit.
|
||||
|
||||
### Security
|
||||
|
||||
- Toolchain no longer resolves the dugite git binary against the open
|
||||
workspace — a malicious repo could plant `native/dugite/bin/git`
|
||||
and clide would run it on auto-fired `git.status`. Dugite now
|
||||
resolves against the install dir + `CLIDE_DUGITE_DIR` env override
|
||||
only (T-98).
|
||||
- `files.read` and `files.ls` now reject symlinks whose targets live
|
||||
outside the workspace — closes a path-safety bypass via in-repo
|
||||
symlinks (T-102).
|
||||
- `files.read` and `files.ls` now reject paths that resolve outside
|
||||
the workspace root. Previously a relative path containing `..`
|
||||
could read arbitrary files via path traversal.
|
||||
|
||||
@@ -6,7 +6,7 @@ This file provides guidance to Claude Code (claude.ai/code) when working with co
|
||||
|
||||
An IDE for Claude Code CLI. Single Flutter package at the repo root.
|
||||
|
||||
- **`lib/`** — all Dart code. Subsystem handlers (`lib/src/daemon/`, `lib/src/pty/`, `lib/src/ipc/`, `lib/src/git/`, `lib/src/pql/`), kernel services (`lib/kernel/`), UI widgets (`lib/widgets/`), built-in extensions (`lib/builtin/`), and the extension framework (`lib/extension/`). The Flutter app hosts the IPC server in-process (D-56). PTY spawning uses Dart FFI `forkpty()` directly.
|
||||
- **`lib/`** — all Dart code. Subsystem handlers (`lib/src/daemon/`, `lib/src/pty/`, `lib/src/ipc/`, `lib/src/git/`, `lib/src/pql/`), kernel services (`lib/kernel/`), UI widgets (`lib/widgets/`), built-in extensions (`lib/builtin/`), and the extension framework (`lib/extension/`). The Flutter app hosts the IPC server in-process (D-56). PTY spawning uses Dart FFI `posix_openpt()` + `posix_spawn()` directly.
|
||||
- **[`pql`](https://github.com/postmeridiem/pql)** — external supporter tool. Clide wraps it for every query surface; never re-implements it.
|
||||
|
||||
tmux owns Claude session persistence (D-41) — the app re-attaches on restart via `tmux new-session -A`. Native rendering — markdown, canvas, graph — is Dart/Flutter (`CustomPaint` + widgets), not third-party packages.
|
||||
@@ -20,7 +20,7 @@ These are load-bearing. Violating any means the design is wrong, not the rule.
|
||||
- **Flutter desktop is the host. No Electron, ever.** Web target may work as a happy accident — don't compromise desktop fidelity for it. If we ship a web build at all, prefer Flutter's **WebAssembly (CanvasKit/Skwasm) compile** over the JS/HTML renderer. `xterm.dart` is the terminal renderer; markdown, canvas, graph are custom `CustomPaint`/widget components.
|
||||
- **Single process.** The Flutter app hosts everything in-process: IPC server, subsystem handlers (pane, files, editor, git, pql), extensions. No separate daemon binary (D-56 dissolved it).
|
||||
- **CLI-first, not MCP.** Claude talks via Bash (`clide ...`), matching pql's contract. See [`D-1`](governance/decisions/architecture.md#d-1-cli-first-not-mcp).
|
||||
- **Dart is the core; pql fills the query gap.** PTY spawning is native Dart FFI (`forkpty`). `pql` (Go) handles vault queries. No second "core language." See [`D-5`](governance/decisions/architecture.md#d-5-dart-core-sidecar-dissolved-ptyc-as-pql-peer) (amended by D-56).
|
||||
- **Dart is the core; pql fills the query gap.** PTY spawning is native Dart FFI (`posix_openpt` + `posix_spawn`). `pql` (Go) handles vault queries. No second "core language." See [`D-5`](governance/decisions/architecture.md#d-5-dart-core-sidecar-dissolved-ptyc-as-pql-peer) (amended by D-56).
|
||||
- **Own the rendering stack.** PTY (via Dart FFI), markdown renderer, graph, canvas — all clide-owned, not pulled from opinionated packages.
|
||||
- **User/Claude parity.** Every CLI subcommand has a UI affordance, and every UI action has a CLI. See [`D-6`](governance/decisions/architecture.md#d-6-cli-and-event-surface-contract).
|
||||
- **pql: wrap, don't duplicate.** Pql logic only lives in `lib/src/pql/` (pure shell-outs). Clide owns pql's `ignore_files:` config key; it never touches pql's `.pql/` index/cache data. See [`D-3`](governance/decisions/architecture.md#d-3-pql-as-supporter-tool-clide-wraps-never-duplicates).
|
||||
|
||||
@@ -106,6 +106,10 @@ test-all: test-core test test-a11y test-integration test-e2e ## Everything, sequ
|
||||
coverage-gate: ## Coverage gate — fails if total line % < pubspec.yaml `coverage_floor:` (D-66). Assumes `make test` ran first.
|
||||
ci/coverage_gate.sh
|
||||
|
||||
.PHONY: changelog-gate
|
||||
changelog-gate: ## Changelog concision gate — fails on `## [Unreleased]` bullets over 60 words.
|
||||
ci/changelog_gate.sh
|
||||
|
||||
.PHONY: smoke-bundle
|
||||
smoke-bundle: ## Build Linux release bundle and run it under xvfb for 5s.
|
||||
ci/smoke_bundle.sh
|
||||
@@ -247,7 +251,10 @@ decisions-validate: ## Parser dry-run over governance/{decisions,questions,rejec
|
||||
pql decisions validate
|
||||
|
||||
.PHONY: push-check
|
||||
push-check: decisions-validate test-core test test-a11y coverage-gate ## Pre-push gate.
|
||||
push-check: decisions-validate test-core test test-a11y coverage-gate changelog-gate ## Pre-push gate (fast — <2 min target).
|
||||
|
||||
.PHONY: push-check-full
|
||||
push-check-full: push-check test-integration smoke-bundle ## Pre-release gate (push-check + integration + smoke; slower; skips theme_picker per T-116).
|
||||
|
||||
.PHONY: hooks
|
||||
hooks: ## Install the repo's git hooks.
|
||||
|
||||
@@ -4,13 +4,14 @@ An IDE for Claude Code CLI. Native rendering, terminal-first interaction, pql-po
|
||||
|
||||
## Architecture
|
||||
|
||||
Single Flutter package at the repo root. The app hosts everything in-process: IPC server, subsystem handlers (pane, files, editor, git, pql), and the extension framework. tmux owns Claude session persistence.
|
||||
Single Flutter package at the repo root. The app hosts everything in-process: IPC server, subsystem handlers (pane, files, editor, git, pql), and the extension framework. tmux owns Claude session persistence (D-41).
|
||||
|
||||
- **`lib/`** — all Dart code. Kernel services (theme, i18n, settings, panels, commands, focus), UI widgets, built-in extensions, and the extension contract.
|
||||
- **`ptyc/`** — small C helper. Spawns a PTY + child and hands the master fd back over `SCM_RIGHTS`. Every pane (shell, tmux, claude, LSP, debug adapter) goes through it.
|
||||
- **`lib/`** — all Dart code. Core subsystems (`lib/src/`), kernel services (`lib/kernel/`), UI widgets (`lib/widgets/`), built-in extensions (`lib/builtin/`), the extension framework (`lib/extension/`).
|
||||
- **PTY** — `lib/src/pty/` spawns child processes via Dart FFI `posix_openpt()` + `posix_spawn()` directly; no external helper binary.
|
||||
- **`native/`** — vendored native libraries (`libtree-sitter.so` with wasmtime embedded). Linux only today.
|
||||
- **[pql](https://github.com/postmeridiem/pql)** — external supporter tool. Clide wraps it for every query surface; never re-implements it.
|
||||
|
||||
Claude drives the UI through a `clide` CLI surface (Bash, not MCP). Every CLI subcommand has a UI affordance and every UI action has a CLI equivalent.
|
||||
Claude drives the UI through a `clide` CLI surface (Bash, not MCP). Every CLI subcommand has a UI affordance and every UI action has a CLI equivalent (D-6).
|
||||
|
||||
## Built-in extensions
|
||||
|
||||
@@ -30,19 +31,24 @@ Then:
|
||||
make run # launch the desktop app
|
||||
make test # fast suite: analyze + format + unit + widget + golden
|
||||
make test-core # core subsystem tests (IPC, PTY, git, pane registry)
|
||||
make test-a11y # accessibility contract tests
|
||||
make test-integration # real app boot integration tests
|
||||
make build-linux # flutter build linux
|
||||
make build-macos # flutter build macos
|
||||
make ptyc-build # build the ptyc PTY-spawn helper
|
||||
make push-check # pre-push gate: decisions + core + fast tests
|
||||
make push-check # pre-push gate: decisions + core + fast + a11y + coverage + changelog
|
||||
```
|
||||
|
||||
## Status
|
||||
|
||||
Pre-v2.0 (`2.0.0-dev`). Interaction model and panel system landed. The Python Textual v1.2.0 predecessor is archived under [`legacy/`](https://github.com/postmeridiem/clide/tree/main/legacy).
|
||||
|
||||
Design doc: [`docs/initial-plan.md`](https://github.com/postmeridiem/clide/blob/main/docs/initial-plan.md). Architectural decisions: [`decisions/`](https://github.com/postmeridiem/clide/tree/main/decisions).
|
||||
## Documentation
|
||||
|
||||
- [`docs/architecture.md`](docs/architecture.md) — current architecture (read this first).
|
||||
- [`docs/initial-plan.md`](docs/initial-plan.md) — historical design doc; preserved as a snapshot of the 2026-04 plan, much of it now superseded.
|
||||
- [`governance/decisions/`](governance/decisions/) — confirmed decisions (`D-NNN`), open questions (`Q-NNN`), rejected alternatives (`R-NNN`).
|
||||
- [`CLAUDE.md`](CLAUDE.md) — Claude-addressed working notes (guardrails, repo layout).
|
||||
|
||||
## License
|
||||
|
||||
MIT. See [`LICENSE`](https://github.com/postmeridiem/clide/blob/main/LICENSE).
|
||||
MIT. See [`LICENSE`](LICENSE).
|
||||
|
||||
+3
-13
@@ -216,21 +216,11 @@ dev_dependencies:
|
||||
license: BSD-3-Clause
|
||||
purpose: Flutter-team-recommended analyzer lint set (app/).
|
||||
|
||||
- name: lints
|
||||
kind: dart-package
|
||||
version: "5.0.0"
|
||||
homepage: https://pub.dev/packages/lints
|
||||
license: BSD-3-Clause
|
||||
purpose: >-
|
||||
Dart-team-recommended analyzer lint set for the Flutter-free
|
||||
core package at the repo root.
|
||||
|
||||
- name: test
|
||||
kind: dart-package
|
||||
version: "1.25.8"
|
||||
version: "1.30.0"
|
||||
homepage: https://pub.dev/packages/test
|
||||
license: BSD-3-Clause
|
||||
purpose: >-
|
||||
Dart test runner for the core package (Flutter-free; the app
|
||||
uses flutter_test from the Flutter SDK for widget + golden
|
||||
coverage).
|
||||
Dart test runner for the Flutter-free PTY tests under
|
||||
`dart test --tags forkpty` (flutter_test is used elsewhere).
|
||||
|
||||
Executable
+85
@@ -0,0 +1,85 @@
|
||||
#!/usr/bin/env bash
|
||||
# CHANGELOG concision gate — enforces the per-bullet word caps from the
|
||||
# git-commit skill (40 soft, 60 hard) across the `## [Unreleased]`
|
||||
# section. Released sections are frozen and skipped (don't penalize
|
||||
# historical entries pre-dating the rule).
|
||||
#
|
||||
# A "bullet" is a markdown list item beginning with `- `, including any
|
||||
# indented continuation lines until the next bullet, blank line, or
|
||||
# heading. Word count is whitespace-tokenized.
|
||||
#
|
||||
# Soft cap 40 → warn (non-zero exit only if HARD is also breached).
|
||||
# Hard cap 60 → fail.
|
||||
#
|
||||
# Bypass: never. If the rule rejects something genuinely user-visible
|
||||
# that needs more context, the context belongs in the commit body or a
|
||||
# D-record — see .claude/skills/git-commit/SKILL.md.
|
||||
set -euo pipefail
|
||||
cd "$(dirname "$0")/.."
|
||||
|
||||
CHANGELOG=CHANGELOG.md
|
||||
SOFT_CAP=40
|
||||
HARD_CAP=60
|
||||
|
||||
if [[ ! -f "$CHANGELOG" ]]; then
|
||||
echo "==> changelog gate: $CHANGELOG missing" >&2
|
||||
exit 2
|
||||
fi
|
||||
|
||||
awk -v soft="$SOFT_CAP" -v hard="$HARD_CAP" '
|
||||
BEGIN { in_unreleased = 0; bullet = ""; bullet_start = 0; fail = 0; warn = 0 }
|
||||
|
||||
function check_bullet() {
|
||||
if (bullet == "") return
|
||||
n = split(bullet, _words, /[[:space:]]+/)
|
||||
# split() counts a trailing empty token when the string starts/ends with
|
||||
# whitespace; trim the leading "- " marker too.
|
||||
gsub(/^- +/, "", bullet)
|
||||
n = split(bullet, _words, /[[:space:]]+/)
|
||||
if (n > hard) {
|
||||
printf "FAIL line %d: bullet is %d words (hard cap %d)\n", bullet_start, n, hard
|
||||
printf " %s\n\n", substr(bullet, 1, 120) (length(bullet) > 120 ? "..." : "")
|
||||
fail++
|
||||
} else if (n > soft) {
|
||||
printf "WARN line %d: bullet is %d words (soft cap %d)\n", bullet_start, n, soft
|
||||
printf " %s\n\n", substr(bullet, 1, 120) (length(bullet) > 120 ? "..." : "")
|
||||
warn++
|
||||
}
|
||||
bullet = ""
|
||||
bullet_start = 0
|
||||
}
|
||||
|
||||
/^## \[Unreleased\]/ { in_unreleased = 1; next }
|
||||
/^## \[/ && in_unreleased { check_bullet(); in_unreleased = 0; exit_loop = 1 }
|
||||
!in_unreleased { next }
|
||||
|
||||
# Within Unreleased.
|
||||
/^### / { check_bullet(); next } # subsection header
|
||||
/^[[:space:]]*$/ { check_bullet(); next } # blank line ends bullet
|
||||
/^- / { # new bullet
|
||||
check_bullet()
|
||||
bullet = $0
|
||||
bullet_start = NR
|
||||
next
|
||||
}
|
||||
/^[[:space:]]+/ && bullet != "" { # continuation of current bullet
|
||||
bullet = bullet " " $0
|
||||
next
|
||||
}
|
||||
|
||||
END {
|
||||
check_bullet()
|
||||
if (fail > 0) {
|
||||
printf "\n==> changelog gate FAIL: %d bullet(s) over %d words.\n", fail, hard
|
||||
printf " Trim them. Rationale, probe results, behavior-change deep dives\n"
|
||||
printf " belong in the commit body, a D-record, or the ticket — not here.\n"
|
||||
printf " See .claude/skills/git-commit/SKILL.md \"Be concise\".\n"
|
||||
exit 1
|
||||
}
|
||||
if (warn > 0) {
|
||||
printf "==> changelog gate OK with %d warning(s) over %d words.\n", warn, soft
|
||||
} else {
|
||||
printf "==> changelog gate OK\n"
|
||||
}
|
||||
}
|
||||
' "$CHANGELOG"
|
||||
+2
-2
@@ -6,13 +6,13 @@ set -euo pipefail
|
||||
cd "$(dirname "$0")/.."
|
||||
|
||||
echo "==> flutter analyze"
|
||||
flutter analyze --no-fatal-infos
|
||||
flutter analyze
|
||||
|
||||
echo "==> dart format (whole tree)"
|
||||
dart format --set-exit-if-changed .
|
||||
|
||||
echo "==> dart test (forkpty — incompatible with flutter test runner)"
|
||||
dart test --tags forkpty test/pty/session_test.dart
|
||||
dart test --tags forkpty test/pty/session_test.dart test/panes/registry_test.dart
|
||||
|
||||
echo "==> flutter test --coverage (unit + widget + golden)"
|
||||
flutter test --coverage --exclude-tags forkpty
|
||||
|
||||
@@ -3,10 +3,16 @@
|
||||
# start" regression gate. Flutter integration tests prefer one file at
|
||||
# a time on desktop; we iterate to avoid the "Unable to start the app"
|
||||
# error that hits when they run as a batch.
|
||||
#
|
||||
# Skips: theme_picker_test.dart — pumpAndSettle hangs on theme.pick
|
||||
# (T-116). Restore once that's fixed.
|
||||
set -euo pipefail
|
||||
cd "$(dirname "$0")/.."
|
||||
|
||||
for f in integration_test/*_test.dart; do
|
||||
case "$f" in
|
||||
integration_test/theme_picker_test.dart) echo "==> integration_test: $f (SKIPPED — T-116)"; continue ;;
|
||||
esac
|
||||
echo "==> integration_test: $f"
|
||||
flutter test "$f"
|
||||
done
|
||||
|
||||
+776
@@ -0,0 +1,776 @@
|
||||
# clide — External Consultant Review
|
||||
|
||||
**Date:** 2026-05-14
|
||||
**Scope:** Full-repository assessment of clide at `main` (commit `9030e56`).
|
||||
**Method:** Six independent specialist reviewers, each given read-only access and a
|
||||
brief covering best practice, clean code, architecture, usability, stability,
|
||||
expandability, style, consistency, and general quality. Reviewers did not see each
|
||||
other's findings; cross-cutting themes below are genuine independent agreement.
|
||||
|
||||
**Panel:**
|
||||
| Lens | Reviewer |
|
||||
|---|---|
|
||||
| Architecture | Software Architect |
|
||||
| Tests & quality gates | Test / QA Analyst |
|
||||
| UX & accessibility | UX & Accessibility Expert |
|
||||
| Code quality & craft | Senior Dart/Flutter Engineer |
|
||||
| Security & supply chain | Security Engineer |
|
||||
| Docs, governance & DX | TPM / Developer-Experience Consultant |
|
||||
|
||||
---
|
||||
|
||||
## Overall verdict
|
||||
|
||||
clide is, for a solo-dev pre-v2.0 project, **unusually disciplined** — every reviewer
|
||||
said so independently. The governance system is alive, the core subsystems are small
|
||||
and well-typed, the FFI/PTY layer shows real systems-programming care, and the quality
|
||||
gates are genuine rather than ornamental. The codebase is in good shape.
|
||||
|
||||
The weaknesses cluster into a handful of themes, and several are **load-bearing**: a
|
||||
central guardrail (CLI-first IPC) has no runtime implementation, keyboard operability —
|
||||
the core requirement of a power-user dev tool — is largely unbuilt, an untrusted
|
||||
workspace can achieve code execution, and the two primary onboarding documents describe
|
||||
an architecture that no longer exists.
|
||||
|
||||
None of these are fatal; all are fixable; most have quick-win first steps. But they
|
||||
should be addressed before a public v2.0.
|
||||
|
||||
---
|
||||
|
||||
## Cross-cutting themes (independent agreement)
|
||||
|
||||
These were each flagged by **two or more** reviewers who did not coordinate:
|
||||
|
||||
1. **The IPC layer is mid-migration and contradicts itself.** The Architect found no
|
||||
Unix-socket *server* anywhere in `lib/` — D-56's "app hosts an in-process IPC server"
|
||||
and D-1's "CLI-first, not MCP" have no runtime path; three IPC clients
|
||||
(`DaemonClient`, `InProcessClient`, `IsolateClient`) coexist with two duplicated
|
||||
service-wiring sites. The Security reviewer independently noted `DaemonClient`'s
|
||||
socket code is still live as an unvalidated attack surface. **Pick one IPC model,
|
||||
implement or amend D-56, delete the other two.**
|
||||
|
||||
2. **The "no pre-existing excuse / clean board" guardrail is being violated right now.**
|
||||
`flutter analyze` reports 9 `unnecessary_import` issues in `test/`; `ci/test.sh` runs
|
||||
analyze with `--no-fatal-infos`, which silently tolerates them. Flagged by the
|
||||
Architect, Code Quality, and Test reviewers. The repo's own rules say fix-first.
|
||||
|
||||
3. **`lib/src/terminal/` is in an undeclared middle state.** ~7k LOC forked from
|
||||
xterm.dart, carrying commented-out `print`s, dangling TODOs, a 1137-line `parser.dart`,
|
||||
and the only `invalid_use_of_protected_member` suppression in the repo. MEMORY says
|
||||
"code under `lib/` is owned, not vendored" — so it must either be formally vendored
|
||||
(frozen, documented, decision-recorded) or cleaned to the project bar. Flagged by
|
||||
Code Quality; the Architect's "consistency" deduction points at the same seam.
|
||||
|
||||
4. **Documentation describes a dissolved architecture.** `README.md` and
|
||||
`docs/initial-plan.md` still describe a Go sidecar, `ptyc/` C helper, `app/`
|
||||
subdirectory, and a separate `clide --daemon` process — all removed by D-5, D-56, and
|
||||
the FFI pivot. A new contributor's first read builds a wrong mental model.
|
||||
|
||||
---
|
||||
|
||||
## Consolidated scorecard
|
||||
|
||||
Scores are each reviewer's, 1–5, on their own dimensions.
|
||||
|
||||
| Domain | Dimension | Score |
|
||||
|---|---|---|
|
||||
| **Architecture** | Layering & dependency direction | 4 |
|
||||
| | Separation of concerns | 4 |
|
||||
| | Expandability | 5 |
|
||||
| | Consistency | 4 |
|
||||
| | Guardrail adherence | 3 |
|
||||
| **Tests** | Coverage quality | 4 |
|
||||
| | Test reliability / flakiness | 3 |
|
||||
| | Gate trustworthiness | 3 |
|
||||
| | Test maintainability | 5 |
|
||||
| | Regression-catching power | 4 |
|
||||
| **UX / a11y** | Interaction model | 2 |
|
||||
| | Accessibility | 3 |
|
||||
| | Visual consistency | 4 |
|
||||
| | Discoverability | 2 |
|
||||
| | State coverage (loading/error/empty) | 3 |
|
||||
| **Code quality** | Idiomatic Dart | 4 |
|
||||
| | Error handling | 4 |
|
||||
| | Naming & readability | 4 |
|
||||
| | Consistency across subsystems | 3 |
|
||||
| | Resource / lifecycle safety | 4 |
|
||||
| **Security** | Subprocess safety | 2 |
|
||||
| | IPC input validation | 3 |
|
||||
| | Path / filesystem safety | 3 |
|
||||
| | Dependency / supply-chain hygiene | 3 |
|
||||
| | Secrets & sandboxing | 3 |
|
||||
| **Docs / governance** | Governance discipline | 4 |
|
||||
| | Documentation accuracy | 2 |
|
||||
| | Changelog hygiene | 3 |
|
||||
| | Contributor onboarding | 2 |
|
||||
| | Convention adherence | 4 |
|
||||
|
||||
**Highest marks:** expandability (5), test maintainability (5). The extension contract
|
||||
and test-helper design are genuine standouts.
|
||||
**Lowest marks:** interaction model (2), discoverability (2), subprocess safety (2),
|
||||
documentation accuracy (2), contributor onboarding (2).
|
||||
|
||||
---
|
||||
|
||||
## Prioritized action list
|
||||
|
||||
Synthesized across all six reviews. Severity is the highest any reviewer assigned.
|
||||
|
||||
### Critical — address before public v2.0
|
||||
|
||||
1. **Fix untrusted-workspace code execution.** `toolchain_paths.dart:79` resolves
|
||||
`native/dugite/bin/git` relative to the *workspace root*; a malicious repo can plant
|
||||
an executable there that clide runs on the first auto-fired `git.status`. Resolve
|
||||
`native/dugite` against `Platform.resolvedExecutable`'s directory, never the
|
||||
workspace. *(Security)*
|
||||
2. **Resolve the IPC story.** Either implement the in-process Unix-socket server per
|
||||
D-56 so the `clide` CLI / C client actually works, or amend D-56 to make in-process
|
||||
direct dispatch the design and delete `DaemonClient`'s socket code, `IsolateClient`,
|
||||
`Backend`, and `backend_entry.dart`. Today the code claims three models and runs one,
|
||||
and a load-bearing guardrail (D-1/D-6) is unmet. *(Architecture, Security)*
|
||||
3. **Make the tool keyboard-operable.** `ClideTappable` (base of nearly every
|
||||
interactive widget) is mouse-only — no `Focus`, no Enter/Space. The command palette
|
||||
has no arrow-key navigation and no Escape. For a keyboard-first dev tool this is a
|
||||
functional gap, not a polish item. *(UX)*
|
||||
4. **Fix the onboarding docs.** Rewrite `README.md`'s `ptyc/` / `make ptyc-build`
|
||||
sections, fix its dead `decisions/` link, and banner `docs/initial-plan.md` as
|
||||
historical (or split out a current `docs/architecture.md`). *(Docs)*
|
||||
|
||||
### Major — should land soon
|
||||
|
||||
5. Add symlink re-resolution + containment re-check in `files.read` / `files.ls` — a
|
||||
repo symlink `config -> /etc/shadow` currently passes path-safety. *(Security)*
|
||||
6. Add `test-integration` (and ideally `smoke-bundle`) to `make push-check` — the gate
|
||||
that catches "app won't boot" is currently omitted from the pre-push gate. *(Tests)*
|
||||
7. Schema-validate the IPC argument surface; reject `-`-prefixed `branch`/`remote`/`path`
|
||||
values; add size/count bounds. *(Security)*
|
||||
8. Establish a real focus-traversal model (`FocusTraversalGroup` per slot, a documented
|
||||
"focus next panel" keybinding) and integrate `FocusTracker` with Flutter's focus
|
||||
system instead of paralleling it. *(UX)*
|
||||
9. Fix the `SchedulerService._startTicker` isolate-spawn race — a `_stopTicker()` before
|
||||
the spawn future resolves leaks a forever-ticking isolate. Mirror `NativePty`'s
|
||||
`_readerReady` pattern. *(Code quality)*
|
||||
10. Decide the status of `lib/src/terminal/` — formally vendor (and decision-record) it,
|
||||
or do the cleanup sweep. *(Code quality)*
|
||||
11. Replace fixed wall-clock `Future.delayed` sleeps in `watcher_test.dart` /
|
||||
`session_test.dart` with event-driven waits; make swallowed `onTimeout` callbacks
|
||||
`fail()` loudly. *(Tests)*
|
||||
12. Write a human-facing `CONTRIBUTING.md`; cut an interim release to drain the ~80-commit
|
||||
`[Unreleased]` backlog; merge duplicate changelog subsection headings. *(Docs)*
|
||||
13. Single global `KeyboardListener` → scoped `Shortcuts`/`Actions`; move
|
||||
`KeybindingResolver` off layout-dependent `keyLabel`. *(UX)*
|
||||
|
||||
### Quick wins — hours each
|
||||
|
||||
- Clear the 9 `unnecessary_import` analyzer issues; drop `--no-fatal-infos` from
|
||||
`ci/test.sh`. *(Architecture, Tests, Code quality)*
|
||||
- Run the `forkpty` PTY tests with `--coverage` so `native_pty.dart` — the riskiest file
|
||||
— is honestly measured. *(Tests)*
|
||||
- Add a `Focus` + Enter/Space wrapper and a focus-ring inside `ClideTappable`; this fixes
|
||||
the keyboard gap for every button and list item at once. *(UX)*
|
||||
- Add arrow-key + Escape + selected-index to `ClidePalette` (copy the existing
|
||||
`_ProjectSwitcherDropdown` `onKeyEvent` pattern). *(UX)*
|
||||
- Amend D-66 to reflect the coverage floor's real location (`pubspec.yaml`), mechanism,
|
||||
and value (90%) — it currently disagrees with the changelog and the code. *(Docs)*
|
||||
- Reconcile `licenses.yaml` with `pubspec.yaml` (`test` version drift, phantom `lints`
|
||||
entry); add a `native/SHA256SUMS` manifest. *(Security, Docs)*
|
||||
- Replace silent `catch (_)` in `tree_sitter_ffi.dart` with a logged last-error.
|
||||
*(Code quality)*
|
||||
- Fix the `clide.dart` barrel leak in `file_tree_view.dart:8`; narrow the barrel (drop
|
||||
the `dispatcher.dart` export); move `test_app.dart` out of the production `main.dart`
|
||||
import graph. *(Architecture)*
|
||||
- Expand the contrast gate's `canonicalPairs` to cover `globalTextMuted`, the `status*`
|
||||
colors, and `panelActiveBorder`. *(UX)*
|
||||
- Triage stale governance Q-records (Q-1/2/3/25 overtaken by shipped Tier-1 work).
|
||||
*(Docs)*
|
||||
|
||||
---
|
||||
|
||||
# Full reviews
|
||||
|
||||
## 1. Architecture — Software Architect
|
||||
|
||||
### Executive summary
|
||||
|
||||
clide is an unusually disciplined solo-dev codebase. The governance system (67
|
||||
D-records, tracked Q/R) is real and largely honored in code, the kernel/extension split
|
||||
is coherent, and the feature-first layout with barrel files is consistently applied. The
|
||||
single biggest strength is the **extension contract**: every built-in — including layout
|
||||
itself — passes the same `ClideExtension` + `ContributionPoint` contract, which is the
|
||||
best possible proof the contract is usable. The single biggest risk is **architectural
|
||||
drift in the IPC layer**: D-56 mandates the Flutter app host an in-process IPC server
|
||||
reachable by a thin C client over a unix socket, but no socket server exists anywhere in
|
||||
`lib/` — the "CLI-first, not MCP" guardrail (D-1) has no runtime path today. Compounding
|
||||
this, three parallel IPC client implementations (`DaemonClient` socket,
|
||||
`InProcessClient`, `IsolateClient` + `Backend`) coexist with two competing
|
||||
service-wiring sites (`main.dart` and `backend_entry.dart`), suggesting an unfinished
|
||||
migration.
|
||||
|
||||
### Strengths
|
||||
|
||||
- **Extension contract is clean and scales** — `lib/extension/src/extension.dart` +
|
||||
`contribution.dart`: sealed `ContributionPoint` hierarchy, `ClideExtensionContext`
|
||||
lists services explicitly (deliberately avoiding a `KernelServices` import cycle —
|
||||
`extension.dart:50-52`). `ExtensionManager` does dependency topo-sort,
|
||||
dependency-gated activation, and contribution apply/remove symmetrically
|
||||
(`extensions_manager.dart:164-202`). Adding a pane = new extension file + one
|
||||
`register()` line in `main.dart`.
|
||||
- **Kernel admission rule is enforced, not aspirational** — D-12's "mandatory shared
|
||||
singleton" test visibly shaped `KernelServices` (`facade.dart:38-93`); ~25 services,
|
||||
each defensibly cross-cutting. The two-tier disable model (D-14) is honored:
|
||||
`default_layout` is itself an extension.
|
||||
- **Feature-first layout with barrel discipline** (D-8) is consistent — every
|
||||
`builtin/<name>/` and `kernel/` has a barrel; builtins import
|
||||
`package:clide/kernel/kernel.dart`, not deep paths. Only one leak found.
|
||||
- **Governance-to-code traceability is genuine** — `WidgetsApp` root (D-7) at
|
||||
`app.dart:38`, `ChangeNotifier`/`ListenableBuilder` state (D-10) everywhere, git
|
||||
hardcoded in toolchain/project loader (D-13), terminal correctly tagged
|
||||
`inlined-source` in `licenses.yaml` with modifications documented.
|
||||
- **Git subsystem cohesion** — `lib/src/git/` cleanly split into `client` / `status` /
|
||||
`diff` / `operations` (~250 lines each), each a single responsibility.
|
||||
|
||||
### Findings
|
||||
|
||||
- **[Critical] No IPC socket server exists** — D-56 specifies the app hosts an
|
||||
in-process IPC server with a C client connecting over a unix socket. `grep` for
|
||||
`ServerSocket`/unix-domain `bind` in `lib/` returns nothing. `DaemonClient._connect`
|
||||
(`client.dart:72-94`) *connects* to a socket, but nothing *serves* one. Today the only
|
||||
working path is `InProcessClient` (`in_process.dart`), which calls the dispatcher
|
||||
directly in-process. **Claude cannot drive clide via `clide ...` — the CLI-first
|
||||
guardrail (D-1, D-6) has no implementation.** This is the load-bearing contract of the
|
||||
whole project and it is absent.
|
||||
- **[Major] Three IPC clients + two wiring sites = unfinished migration** —
|
||||
`DaemonClient` (socket), `InProcessClient`, and `IsolateClient`+`Backend`/
|
||||
`backend_entry.dart` all coexist. `main.dart:76-113` wires subsystems via
|
||||
`buildDispatcher`; `backend_entry.dart:40-110` wires the *same* five subsystems again
|
||||
inside an isolate. `Backend.spawn` is referenced only by `facade.dart` but `main.dart`
|
||||
uses `autoStartDaemonClient: false` + `daemonClientFactory` (the in-process path).
|
||||
Dead-or-dormant isolate infrastructure with duplicated registration logic — pick one
|
||||
and delete the others.
|
||||
- **[Major] `main.dart` (production entry) imports `test_app.dart`** — `main.dart:2` and
|
||||
`:51-55`. The production binary carries the test harness and branches on
|
||||
`CLIDE_TESTMODE`. Test scaffolding should not be reachable from the shipping entry
|
||||
point; gate it behind a separate entrypoint or `kDebugMode`.
|
||||
- **[Minor] `flutter analyze` reports 9 issues** — all `unnecessary_import` in `test/`,
|
||||
but CLAUDE.md's "no pre-existing excuse" / "clean board" guardrail makes this a
|
||||
fix-first item.
|
||||
- **[Minor] Barrel leak** — `lib/builtin/files/src/file_tree_view.dart:8` imports
|
||||
`package:clide/src/files/listing.dart` directly instead of via
|
||||
`package:clide/clide.dart` (which already re-exports `FileEntry`).
|
||||
- **[Minor] `clide.dart` barrel exports the daemon dispatcher** — `clide.dart:15`
|
||||
exports `src/daemon/dispatcher.dart`. The barrel is described as "shared types"; the
|
||||
dispatcher is server-side machinery.
|
||||
- **[Minor] `ExtensionManager.activate` swallows exceptions** (`extensions_manager.dart:
|
||||
141-143`) — a failed `activate()` logs and continues, leaving the extension
|
||||
un-activated but `_known`, with no surfaced "degraded" state for the UI.
|
||||
|
||||
### Recommendations
|
||||
|
||||
**Quick wins:** clear the 9 analyzer issues; fix the `file_tree_view.dart` barrel leak
|
||||
(consider a CI grep gate for `package:clide/src/` imports outside their feature); move
|
||||
`test_app.dart` out of the production import graph; drop the `dispatcher.dart` export
|
||||
from `clide.dart`.
|
||||
|
||||
**Larger efforts:** resolve the IPC story (implement the socket server per D-56, or
|
||||
amend D-56 and delete `DaemonClient`/`IsolateClient`/`Backend`/`backend_entry.dart`);
|
||||
collapse subsystem wiring into one `registerAllSubsystems(...)` function; give
|
||||
`ExtensionManager` a surfaced failure state so the UI can show degraded built-ins.
|
||||
|
||||
### Scorecard
|
||||
|
||||
| Dimension | Score | Justification |
|
||||
|---|---|---|
|
||||
| Layering & dependency direction | 4/5 | Kernel→extension direction clean, context-vs-aggregate split avoids cycles; docked for the `src/`↔`kernel/src/` barrel leak and the dispatcher export. |
|
||||
| Separation of concerns | 4/5 | Feature-first layout, single-responsibility subsystems; duplicated subsystem registration is the blemish. |
|
||||
| Expandability | 5/5 | New pane = one extension file + one `register()` line; sealed contribution hierarchy; layout itself is data and extension-shaped. |
|
||||
| Consistency | 4/5 | Barrels, naming, D-record back-references uniform; three coexisting IPC clients and 9 analyzer issues break the bar. |
|
||||
| Guardrail adherence | 3/5 | `WidgetsApp`, single-process, no-Material, governance, zero-deps all honored — but D-1/D-6/D-56 (CLI-first via socket server) have no runtime implementation. |
|
||||
|
||||
---
|
||||
|
||||
## 2. Tests & quality gates — Test / QA Analyst
|
||||
|
||||
### Executive summary
|
||||
|
||||
The clide test suite is, for a solo-dev pre-2.0 project, in genuinely good shape. ~104
|
||||
test files against 276 lib files, ~92.75% line coverage, and — critically — the coverage
|
||||
was *not* bought with assertion-free filler. Even the alarmingly-named files
|
||||
(`coverage_trivials_test.dart`, `zero_coverage_widgets_test.dart`,
|
||||
`services_stubs_test.dart`, `mop_up_test.dart`) contain real behavioral assertions. The
|
||||
biggest strength is a sensibly layered pyramid with a real boot-path integration gate
|
||||
and a startup smoke test that catches the "tests pass but app won't launch" class. The
|
||||
biggest risk is **flakiness from wall-clock-dependent tests** — fixed `Future.delayed`
|
||||
sleeps in file-watcher and PTY tests will eventually produce intermittent CI failures,
|
||||
and the PTY tests are run via `dart test` so they are **excluded from the coverage
|
||||
measurement entirely**.
|
||||
|
||||
### Strengths
|
||||
|
||||
- **Test pyramid is sound.** Pure-Dart unit, widget tests with a shared harness, golden
|
||||
tests (Alchemist), an a11y contract layer, and 3 real-boot `integration_test/` files —
|
||||
correctly separated by runner (`ci/test.sh` vs `ci/test_core.sh` vs
|
||||
`ci/test_integration.sh`).
|
||||
- **Helpers are well-designed.** `test/helpers/kernel_fixture.dart` boots a real
|
||||
`KernelServices` with in-memory themes/i18n and `autoStartDaemonClient: false` — no
|
||||
real socket, temp-dir scoped, proper `dispose()`. `FakeDaemonClient` is a clean stub.
|
||||
- **Error-branch discipline.** `pql_commands_errors_test.dart` /
|
||||
`git_commands_errors_test.dart` deliberately point the toolchain at a non-existent
|
||||
binary to drive catch-branches the happy path can't reach — table-driven, with
|
||||
`reason:` tags.
|
||||
- **OS-dialog avoidance is handled correctly.** `welcome/dialog_test.dart` mocks the
|
||||
`clide/window` MethodChannel to throw `MissingPluginException`, exercising the fallback
|
||||
path *without* spawning a native file picker.
|
||||
- **Startup gate.** `ci/smoke_bundle.sh` builds the real release bundle and runs it
|
||||
under xvfb for 5s, correctly interpreting `timeout` exit codes (124/143 = healthy).
|
||||
- **Coverage gate is honest.** `ci/coverage_gate.sh` is a self-contained awk parser (no
|
||||
`lcov` dependency), ratchets only upward, and `exit 2` distinguishes "missing data"
|
||||
from "below floor."
|
||||
|
||||
### Findings
|
||||
|
||||
- **[Major] PTY tests are excluded from coverage.** `ci/test.sh:13` runs
|
||||
`flutter test --coverage --exclude-tags forkpty`; the `forkpty` tests run separately
|
||||
via `dart test` with no `--coverage`. So `lib/src/pty/native_pty.dart` — the
|
||||
highest-risk native code in the repo — is barely in the measured denominator. The
|
||||
92.75% number overstates coverage of the riskiest file.
|
||||
- **[Major] Wall-clock sleeps will flake.** `test/files/watcher_test.dart:67-82` uses
|
||||
fixed `Future.delayed`; `test/pty/session_test.dart:71` polls 50×100ms and `:65` uses a
|
||||
bare `500ms` settle. `session_test.dart`'s `timeout(5s, onTimeout: () {})` (`:48`)
|
||||
*swallows* the timeout — a never-producing PTY proceeds to a confusing assertion
|
||||
failure rather than a clear timeout.
|
||||
- **[Major] `make push-check` does not run integration tests.** `push-check:
|
||||
decisions-validate test-core test test-a11y coverage-gate` — `test-integration` and
|
||||
`smoke-bundle` are omitted. A boot-order regression sails through.
|
||||
- **[Minor] `flutter analyze --no-fatal-infos` in `ci/test.sh:9`** contradicts the
|
||||
stated "fail-on-warning, clean board" discipline.
|
||||
- **[Minor] Integration tests run one-file-at-a-time** to dodge a batch "Unable to start
|
||||
the app" error — each invocation re-boots the engine (slow), and the workaround masks
|
||||
whether the batch failure is environmental or a real teardown leak.
|
||||
- **[Minor] Golden CI config disabled.** Only platform goldens run; a Linux-only CI
|
||||
never validates the macOS goldens, and stale `test/goldens/failures/*.png` artifacts
|
||||
are committed to the repo.
|
||||
- **[Minor] `test_core.sh` timeout kill is best-effort** — the `pkill -9 -f` pattern
|
||||
match is redundant noise next to the real `setsid` + `timeout --kill-after` safety net.
|
||||
- **[Minor] `git/client_test.dart` depends on the ambient `git` binary**, not the
|
||||
vendored dugite — the suite passes/fails on the host git version.
|
||||
|
||||
### Recommendations
|
||||
|
||||
**Quick wins:** add `test-integration` (and `smoke-bundle`) to `push-check` — the single
|
||||
highest-value change; run the `forkpty` tests with `--coverage`; drop `--no-fatal-infos`;
|
||||
gitignore `test/goldens/failures/`; make `onTimeout` callbacks `fail()`.
|
||||
|
||||
**Larger efforts:** replace fixed sleeps with event-driven waits
|
||||
(`expectLater(stream, emits(...))`); add a macOS golden CI matrix entry or document
|
||||
goldens as advisory; consider a coverage-exclusion allowlist for genuinely-unreachable
|
||||
defensive branches rather than chasing the last lines with filler tests.
|
||||
|
||||
### Scorecard
|
||||
|
||||
| Dimension | Score | Justification |
|
||||
|---|---|---|
|
||||
| Coverage quality | 4/5 | Tests are meaningful even in "mop-up" files; docked because PTY/FFI is outside the measured number. |
|
||||
| Test reliability / flakiness | 3/5 | Fixed wall-clock sleeps and a swallowed timeout are latent intermittent failures. |
|
||||
| Gate trustworthiness | 3/5 | Coverage gate and smoke bundle are well-built, but `push-check` omits integration tests. |
|
||||
| Test maintainability | 5/5 | Shared fixtures, consistent structure, table-driven error suites, clear doc comments. |
|
||||
| Regression-catching power | 4/5 | Real boot-path integration + smoke + a11y + goldens; weakened by single-OS goldens and PTY coverage gaps. |
|
||||
|
||||
---
|
||||
|
||||
## 3. UX & accessibility — UX & Accessibility Expert
|
||||
|
||||
### Executive summary
|
||||
|
||||
clide has an unusually disciplined *foundation* for a solo pre-v2.0 project: a coherent
|
||||
semantic design-token system, a WCAG-AA contrast gate wired into CI, and i18n/semantic
|
||||
contract tests. That foundation is the biggest strength. The biggest risk is that
|
||||
**keyboard operability is largely unimplemented below the foundation** — the project's
|
||||
own core interaction primitive (`ClideTappable`) is mouse-only, the command palette has
|
||||
no arrow-key navigation or Escape, and there is no focus-traversal wiring across panels.
|
||||
For a keyboard-first power-user dev tool, this is a critical gap that the a11y test suite
|
||||
does not catch because the tests assert *structural* presence (Semantics nodes exist)
|
||||
rather than *operability* (can you actually drive it from the keyboard).
|
||||
|
||||
### Strengths
|
||||
|
||||
- **Semantic token system is real and enforced.** `lib/kernel/src/theme/tokens.dart`
|
||||
defines ~65 named surface tokens; widgets consume `ClideTheme.of(context).surface`
|
||||
rather than raw colors. The resolver provides defaults so partial themes still produce
|
||||
a complete `SurfaceTokens`.
|
||||
- **Contrast gate is genuine WCAG math, run per-theme.** `lib/kernel/src/theme/
|
||||
contrast.dart` implements real relative-luminance ratio with alpha pre-compositing
|
||||
against neutral grey (`contrast.dart:31-37`) — semi-transparent tokens can't spuriously
|
||||
pass.
|
||||
- **Semantics are present on composed widgets.** `ClideButton` wraps
|
||||
`Semantics(button: true, enabled:, label:, hint:, onTap:)`; panels set
|
||||
`container: true, explicitChildNodes: true` with landmark labels.
|
||||
- **State coverage exists in data panels.** `git_panel_view.dart:86-104` handles error,
|
||||
loading, and empty ("working tree clean") states distinctly; `file_tree_view.dart`
|
||||
handles error + loading.
|
||||
- **Manual a11y discipline is documented.** `docs/testing/a11y-manual.md` prescribes a
|
||||
per-tier Orca/VoiceOver pass and is honest about why prose quality can't be automated.
|
||||
- **Disabled state is handled at the cursor level.** `clide_button.dart:41` switches to
|
||||
`SystemMouseCursors.forbidden` and drops the semantic `onTap` when `onPressed == null`.
|
||||
|
||||
### Findings
|
||||
|
||||
- **[Critical] `ClideTappable` is mouse-only — no `Focus`, no keyboard activation.**
|
||||
`lib/widgets/src/clide_tappable.dart:37-54` is `MouseRegion` + `GestureDetector` only.
|
||||
It is the base for `ClideButton`, `_WinBtn`, `_RecentProjectRow`, `_ActionRow`, and
|
||||
most builtin list items. None can receive Tab focus or be activated with Enter/Space.
|
||||
The keyboard-traversal test only passes because it manually wraps the button in an
|
||||
external `Focus` node — it tests that the widget doesn't *block* focus, not that it
|
||||
*accepts* it.
|
||||
- **[Critical] Command palette is not keyboard-navigable.** `clide_palette.dart` —
|
||||
`onSubmitted` only ever invokes `filtered.first` (`:77-80`); no up/down handling, no
|
||||
selected index, no selection highlight, no Escape handler.
|
||||
- **[Major] No focus-traversal wiring between panels.** `FocusTracker`
|
||||
(`lib/kernel/src/focus.dart`) tracks an active *contribution id* for the `clide active`
|
||||
CLI, but is not Flutter `FocusScope`/`FocusTraversalGroup` integration. Nothing
|
||||
establishes Tab order across sidebar → workspace → context.
|
||||
- **[Major] Drag-resize handles have no keyboard equivalent — parity gap.**
|
||||
`drag_resize.dart` and `app.dart:870-912` are pure `Listener` pointer handlers, with no
|
||||
Semantics node at all. Per "User/Claude parity", panel sizing should have a CLI
|
||||
affordance; none is evident.
|
||||
- **[Major] Single global `KeyboardListener` is a fragile keybinding architecture.**
|
||||
`app.dart:90-148` routes all shortcuts through one root `KeyboardListener` — no
|
||||
per-context scoping, will conflict with text-input fields.
|
||||
`KeybindingResolver.fromKeyEvent` keys off layout-dependent `logicalKey.keyLabel`.
|
||||
- **[Major] Text scale is the *only* in-app a11y accommodation, and it's hidden.**
|
||||
`app.dart:122-138` implements Ctrl +/-/0 text scaling but it's undiscoverable. No
|
||||
high-contrast toggle, no reduced-motion handling, no focus-ring rendering anywhere.
|
||||
- **[Minor] Contrast gate covers only 11 token pairs** — omits `globalTextMuted` (muted
|
||||
text is everywhere), the `status*` foregrounds, syntax tokens on `panelBackground`, and
|
||||
`panelActiveBorder`.
|
||||
- **[Minor] ~43 hardcoded-color sites bypass the token system** — some defensible (ANSI
|
||||
palette), but the modal/palette shadow and window-control colors won't adapt to the
|
||||
`paper` light theme.
|
||||
- **[Minor] Hover state is inconsistent and not paired with focus** — every interactive
|
||||
widget reimplements its own `_hover` bool; none render a focus indicator.
|
||||
- **[Minor] `_LeftHatContent` is dead code** — `app.dart:281-292` always returns
|
||||
`SizedBox.shrink()`.
|
||||
|
||||
### Recommendations
|
||||
|
||||
**Quick wins:** add a `Focus` + `Actions`/`Shortcuts` (Enter/Space → onTap) wrapper and
|
||||
a focus-ring inside `ClideTappable` — fixes the [Critical] for every button/list-item at
|
||||
once; add arrow-key + Escape + selected-index to `ClidePalette` (copy the existing
|
||||
`_ProjectSwitcherDropdown` `onKeyEvent` pattern at `app.dart:446-452`); expand
|
||||
`canonicalPairs`; surface text-zoom and theme switching in the palette; tokenize the
|
||||
modal shadow and window-control colors.
|
||||
|
||||
**Larger efforts:** establish a real focus-traversal model and integrate `FocusTracker`
|
||||
with Flutter's focus system; replace the root `KeyboardListener` with scoped
|
||||
`Shortcuts`/`Actions` and move off `keyLabel`; add keyboard operability + Semantics to
|
||||
drag-resize handles plus a `clide panel resize` CLI; add an a11y test tier that asserts
|
||||
*operability*, not just Semantics presence.
|
||||
|
||||
### Scorecard
|
||||
|
||||
| Dimension | Score | Justification |
|
||||
|---|---|---|
|
||||
| Interaction model | 2/5 | Coherent slot/panel structure and good drag-resize *with a mouse*, but keyboard operability is largely unbuilt. |
|
||||
| Accessibility | 3/5 | Genuine contrast gate, Semantics on composed widgets, i18n contract tests — but keyboard operability and focus order are not implemented. |
|
||||
| Visual consistency | 4/5 | Strong semantic token system consumed consistently; a few hardcoded-color sites are real theme-adaptation bugs. |
|
||||
| Discoverability | 2/5 | Command palette isn't keyboard-navigable; accommodations are undiscoverable; no in-app keybinding reference. |
|
||||
| State coverage | 3/5 | Data panels and dialogs handle loading/error/empty; but no focus states anywhere and no reduced-motion handling. |
|
||||
|
||||
---
|
||||
|
||||
## 4. Code quality & craft — Senior Dart/Flutter Engineer
|
||||
|
||||
### Executive summary
|
||||
|
||||
clide is, for a solo pre-v2.0 project, in genuinely good shape. The core subsystems (IPC
|
||||
envelope, daemon dispatch, git client, PTY) are small, single-responsibility,
|
||||
well-typed, and consistent. `flutter analyze` is clean for `lib/` — the 9 reported issues
|
||||
are all in `test/`, none are suppressions. The biggest strength is the FFI/PTY layer:
|
||||
`lib/src/pty/native_pty.dart` shows real systems-programming discipline (pre-fork
|
||||
allocation, errno captured before `free`, isolate-teardown ordering documented and
|
||||
correct). The biggest risk is concentrated in two places: a genuine isolate-leak race in
|
||||
`SchedulerService`, and the large vendored-but-owned `lib/src/terminal/` xterm.dart fork
|
||||
(~7k LOC) which carries a different style, commented-out `print`s, and dangling TODOs
|
||||
that the project's own "lib is owned, not vendored" rule says must be held to the same
|
||||
bar.
|
||||
|
||||
### Strengths
|
||||
|
||||
- **PTY/FFI layer is excellent.** `native_pty.dart:129-145` force-resolves FFI
|
||||
trampolines and pre-allocates *all* native memory before `forkpty()`.
|
||||
`native_pty.dart:171-177` captures `errno` before `_freeAll` because `free()` can
|
||||
clobber it. `close()` (367-397) documents and implements the kill→EOF→close ordering
|
||||
to avoid fd-reuse races. The child branch touches no Dart heap.
|
||||
- **IPC envelope is clean and idiomatic** — `lib/src/ipc/envelope.dart` uses a `sealed`
|
||||
class hierarchy, named constructors, a private unifying constructor, and conditional
|
||||
map keys. Decode is total over the type discriminant.
|
||||
- **Typed, meaningful errors.** `PtyException` carries `op` + optional `errno`;
|
||||
`GitException` carries `stderr`; `errnoToIpcError` maps POSIX errno to actionable IPC
|
||||
error kinds. Errors are values, not strings.
|
||||
- **Resource lifecycle is taken seriously across most subsystems.** `FileWatcher.stop()`
|
||||
cancels the subscription *and* closes the controller; `withBuffer`/`setWinsize` in
|
||||
`libc.dart` use `try/finally` around every native allocation. 45 files define
|
||||
`dispose`/`close`.
|
||||
- **The `DaemonEventSink` interface** keeps the dependency graph pointing the right way
|
||||
(server→subsystems) and is documented as such.
|
||||
- **The one `ignore_for_file` (`libc.dart:11-27`) is exemplary** — textbook FFI case,
|
||||
multi-paragraph justification exactly as CLAUDE.md requires.
|
||||
|
||||
### Findings
|
||||
|
||||
- **[Major] Isolate-leak race in `SchedulerService._startTicker`** — `scheduler.dart:71`:
|
||||
`Isolate.spawn(...).then((iso) => _isolate = iso)`. If `_stopTicker()` runs before the
|
||||
spawn future completes, `_isolate` is still null, nothing is killed, and the
|
||||
just-spawned isolate (with its `Timer.periodic`) leaks. `native_pty.dart` solved
|
||||
exactly this with `_readerReady`.
|
||||
- **[Major] `lib/src/terminal/` held below the project's own bar.** Carries
|
||||
commented-out `print()` debugging (`custom_text_edit.dart:244-275`), dangling TODOs
|
||||
(`parser.dart:110-113`, `keytab.dart:91`), a 1137-line `parser.dart`, and the only
|
||||
`// ignore: invalid_use_of_protected_member` in the repo (`terminal_view.dart:363`).
|
||||
Either it's genuinely vendored (belongs in `native/` or documented as frozen) or it's
|
||||
owned (needs the cleanup pass).
|
||||
- **[Minor] Empty `catch (_) {}` swallows in `tree_sitter_ffi.dart:197,206`** —
|
||||
`DynamicLibrary.open` failures silently discarded; caller gets a bare `null` with no
|
||||
diagnostic about *why*. Syntax highlighting silently not working is a support
|
||||
headache.
|
||||
- **[Minor] Empty `catch (_) {}` in `test_app.dart:271,311`** — `:271` swallows a
|
||||
theme-load failure the harness exists to detect.
|
||||
- **[Minor] Dead alias in `libc.dart:201-202`** — `typedef Cmsghdr = CmsghdrLinux;`
|
||||
flagged "backward compatibility"; CLAUDE.md forbids backwards-compat hacks in a solo
|
||||
repo.
|
||||
- **[Minor] `// ignore: unused_field` in `editor_controller.dart:25`** "kept for future
|
||||
subscription changes" — speculative retention; the no-suppression rule wants it fixed,
|
||||
not silenced.
|
||||
- **[Minor] Magic numbers in hot FFI paths.** `native_pty.dart` inlines `0x0001
|
||||
// POLLIN`, `28 /* SIGWINCH */`, `4 /* EINTR */`, `9 /* EBADF */` — but `libc.dart`
|
||||
already has a constants section and `errno_mapping.dart` has `PosixErrno.ebadf`.
|
||||
- **[Minor] `git_commands.dart` has ~16 near-identical handler bodies** — a
|
||||
`_guarded(req, () async {...})` helper would remove ~60 lines of structural
|
||||
duplication. Borderline.
|
||||
|
||||
### Recommendations
|
||||
|
||||
**Quick wins:** fix the `SchedulerService` spawn race (track the spawn future like
|
||||
`NativePty._readerReady`); replace the three silent `catch (_)` in `tree_sitter_ffi.dart`
|
||||
with a logged last-error; delete the `Cmsghdr` alias and the `unused_field` suppression;
|
||||
have the PTY layer consume `libc.dart` constants / `PosixErrno` instead of inline hex.
|
||||
|
||||
**Larger efforts:** decide the status of `lib/src/terminal/` — formally vendor it
|
||||
(freeze, document, decision-record) or do the cleanup sweep; optionally a `_guarded`
|
||||
helper for `git_commands.dart` (check whether `files_commands` / `editor_commands` share
|
||||
the shape).
|
||||
|
||||
### Scorecard
|
||||
|
||||
| Dimension | Score | Justification |
|
||||
|---|---|---|
|
||||
| Idiomatic Dart | 4/5 | Sealed classes, named ctors, records, `const`, immutability used well; the vendored terminal tree pulls the average down. |
|
||||
| Error handling | 4/5 | Typed errors with context everywhere in core; a few silent `catch (_)` in the FFI loader and test harness cost the 5th point. |
|
||||
| Naming & readability | 4/5 | Clear, intention-revealing names; comments earn their place; inline magic numbers are the main blemish. |
|
||||
| Consistency across subsystems | 3/5 | IPC/git/files/pty are uniform; `lib/src/terminal/` is a different codebase in style; PTY duplicates constants `libc.dart` owns. |
|
||||
| Resource/lifecycle safety | 4/5 | `try/finally` around native allocs, controllers closed, subscriptions cancelled; the one real defect is the `SchedulerService` race. |
|
||||
|
||||
---
|
||||
|
||||
## 5. Security & supply chain — Security Engineer
|
||||
|
||||
### Executive summary
|
||||
|
||||
clide's security posture is **above average for a solo pre-v2.0 project**. All
|
||||
subprocess calls use `Process.run`/`Process.start` with argument *lists* (no shell
|
||||
interpolation), the IPC transport is a per-user Unix socket (not a TCP port), and there
|
||||
is an explicit `path_safety` module with a containment check. The single biggest strength
|
||||
is the disciplined no-shell subprocess layer. The single biggest risk is
|
||||
**untrusted-workspace code execution via toolchain resolution**
|
||||
(`toolchain_paths.dart:79`): a malicious repo can ship a `native/dugite/bin/git`
|
||||
executable that clide will resolve and run. Secondary real issues: path-safety does not
|
||||
defend against symlink escape, and IPC command args are largely unvalidated/un-bounded.
|
||||
Supply-chain hygiene is mostly good but `licenses.yaml` has drifted from `pubspec.yaml`
|
||||
and native binaries are committed without SHA pinning.
|
||||
|
||||
### Strengths
|
||||
|
||||
- **No-shell subprocess execution.** `GitClient._run` (`client.dart:210`),
|
||||
`PqlClient._run` (`client.dart:165`), and the PTY layer all pass `List<String>` args
|
||||
directly. Classic command injection is structurally prevented.
|
||||
- **Toolchain uses resolved absolute paths** — git/pql/tmux resolved once to absolute
|
||||
paths and reused.
|
||||
- **Path containment check exists and is used.** `resolveUnderRoot`
|
||||
(`path_safety.dart:21`) collapses `..`/`.` without touching the filesystem and enforces
|
||||
a prefix check with a separator guard. `files.read`/`files.ls` both call it.
|
||||
- **IPC is a per-user Unix socket, not a network listener.** No `ServerSocket` over TCP
|
||||
anywhere; the default runtime path is in-process, eliminating the socket attack
|
||||
surface in the shipped app.
|
||||
- **PTY FFI memory discipline** — all native memory allocated before `forkpty()`, `errno`
|
||||
captured before `free()`, freed on every path.
|
||||
- **`pubspec.lock` is committed**, deps use exact pins (no carets), `licenses.yaml`
|
||||
exists with per-dep purpose/license.
|
||||
|
||||
### Findings
|
||||
|
||||
- **[Critical] Malicious workspace can plant a git binary that clide executes.**
|
||||
`toolchain_paths.dart:79-84` builds `'$workspaceRoot/native/dugite/bin'` and runs
|
||||
`_firstExisting(['$dugite/git'])`; if that file exists it becomes the git binary for
|
||||
all `GitClient` calls, **before** falling back to PATH. An attacker commits an
|
||||
executable at `native/dugite/bin/git`; clide runs it on the first `git.status` (which
|
||||
fires automatically on workspace open). Arbitrary code execution from merely opening a
|
||||
repo. The `native/dugite` convention should resolve relative to the *clide install
|
||||
dir*, never the workspace root.
|
||||
- **[Major] Path-safety does not defend against symlink escape.** `path_safety.dart:
|
||||
35-51` explicitly does not resolve symlinks, and the filesystem layer
|
||||
(`files_commands.dart:81-85`) never does either. A repo symlink `config -> /etc/shadow`
|
||||
passes the containment check (the *link path* is under root) and clide reads the
|
||||
target. Fix: after `resolveUnderRoot`, `resolveSymbolicLinksSync()` and re-verify
|
||||
containment.
|
||||
- **[Major] IPC command arguments are unvalidated and unbounded.**
|
||||
`DaemonDispatcher.dispatch` (`dispatcher.dart:26`) and `IpcRequest.fromJson`
|
||||
(`envelope.dart:49`) do no schema validation. No size limit on `files.read`, no count
|
||||
cap on `git.log`, no check that `git.checkout`'s `branch` (`git_commands.dart:240`)
|
||||
isn't a `-`-prefixed flag. `git diff`/`stage` use `--` separators (good), but
|
||||
`checkout(branch)` and `push(remote, branch)` do not — argument injection
|
||||
(`git checkout --upload-pack=...`) is possible.
|
||||
- **[Minor] macOS entitlements disable library validation.**
|
||||
`macos/Runner/Release.entitlements` sets `disable-library-validation` = true with no
|
||||
App Sandbox entitlement. Arguably needed for the `dlopen` of `libtree-sitter.so`, but
|
||||
combined with no sandbox a compromised process has full user-level filesystem access.
|
||||
- **[Minor] `licenses.yaml` has drifted from `pubspec.yaml`.** Lists dev-dep `test` at
|
||||
`1.25.8` but `pubspec.yaml:60` pins `1.30.0`; lists a `lints 5.0.0` not in
|
||||
`pubspec.yaml` at all. The two-step-commit guardrail is being violated.
|
||||
- **[Minor] Native binaries committed without SHA pinning.** `native/linux-x64/` has
|
||||
`libtree-sitter.so` (24 MB) and `ptyc` (22 KB) committed with no `SHA256SUMS` manifest.
|
||||
CLAUDE.md says native deps are "pinned by SHA"; that pinning is not evidenced.
|
||||
- **[Informational] No secrets service** — clide stores no tokens; git auth is delegated
|
||||
to the system credential helper. The right call; noted so the absence reads as
|
||||
deliberate.
|
||||
- **[Informational] Lua runtime is a stub** — `lib/lua/src/host.dart` is Tier-0. Design
|
||||
intent (strip `io`/`os.execute`/`package.loadlib`/`debug`) is sound; re-assess at Tier
|
||||
6 — sandbox-escape via FFI re-entry will be the concern.
|
||||
|
||||
### Recommendations
|
||||
|
||||
**Quick wins:** fix toolchain resolution to resolve `native/dugite` against
|
||||
`Platform.resolvedExecutable`'s directory, never `workspaceRoot` (closes the Critical);
|
||||
add symlink re-check in `files.read`/`files.ls`; reconcile `licenses.yaml` with
|
||||
`pubspec.yaml`; reject `-`-prefixed values for `branch`/`remote`/`path` args (or use
|
||||
`--` everywhere, including `checkout`).
|
||||
|
||||
**Larger efforts:** schema-validate the IPC surface with typed arg schemas + size/count
|
||||
bounds; add a committed `native/SHA256SUMS` verified by `make` and CI; revisit macOS
|
||||
sandboxing (App Sandbox with explicit exceptions); security-review the Lua FFI boundary
|
||||
and capability table before Tier 6 ships.
|
||||
|
||||
### Scorecard
|
||||
|
||||
| Area | Rating | Justification |
|
||||
|---|---|---|
|
||||
| Subprocess safety | 2/5 | No-shell arg lists are excellent, but the workspace-relative dugite path is a real RCE; argument-injection on `checkout`/`push` unmitigated. |
|
||||
| IPC input validation | 3/5 | Per-user Unix socket + in-process default sharply limits exposure, but zero arg-schema validation and no size/count bounds. |
|
||||
| Path/filesystem safety | 3/5 | Real containment check that's actually wired in, undermined by the unhandled symlink-escape gap. |
|
||||
| Dependency/supply-chain hygiene | 3/5 | Exact pins, committed lockfile, documented deps — but `licenses.yaml` drift and missing SHA manifest for committed native binaries. |
|
||||
| Secrets & sandboxing | 3/5 | Correctly delegates secrets; Lua sandbox is only a stub; macOS runs with library validation off and no App Sandbox. |
|
||||
|
||||
---
|
||||
|
||||
## 6. Docs, governance & DX — TPM / Developer-Experience Consultant
|
||||
|
||||
### Executive summary
|
||||
|
||||
clide runs an unusually disciplined governance system for a solo-dev pre-v2.0 project:
|
||||
67 decision records across six domains, with a parser-validated DQR structure, anchored
|
||||
cross-references, and a `make decisions-validate` gate wired into pre-push. The biggest
|
||||
strength is that the DQR system is genuinely *alive* — questions get resolved with dated
|
||||
amendments, superseded decisions are marked, and decisions cite the commits that
|
||||
implement them. The biggest risk is **documentation drift in the narrative docs**:
|
||||
`README.md` and `docs/initial-plan.md` describe an architecture (Go sidecar, `ptyc/` C
|
||||
helper, `app/` subdirectory, separate daemon) that three major decisions (D-5, D-56, the
|
||||
FFI pivot) have since dissolved. A new contributor reading the README first would build
|
||||
a wrong mental model.
|
||||
|
||||
### Strengths
|
||||
|
||||
- **DQR system is maintained, not ornamental.** Resolved questions carry dated
|
||||
resolution lines pointing to the deciding D-record (`questions/architecture.md:39`
|
||||
Q-6→D-57). D-40 carries a `[SUPERSEDED]` tag and an amendment line.
|
||||
- **Decisions are linked to code and commits.** D-67 (`decisions/process.md:61`) cites
|
||||
implementing commits `01a99ed`, `d162ba2`. D-66 references `ci/test.sh` by path.
|
||||
- **Governance migration was done cleanly** — the `decisions/` → `governance/`
|
||||
restructure updated cross-references and the auto-generated index.
|
||||
- **Commit discipline is real.** `git log` shows imperative subjects, no Conventional
|
||||
Commits prefixes, ticket refs, logical scoping — exactly what `git-commit/SKILL.md`
|
||||
prescribes.
|
||||
- **`licenses.yaml` is thorough** — all six runtime Dart deps present, plus fonts/native
|
||||
libs, with purpose justifications. *(Note: the Security reviewer found version drift
|
||||
in this file — see Finding above; the two reviewers examined different rows.)*
|
||||
- **Makefile is self-documenting** (`##` help annotations) and matches `CLAUDE.md`.
|
||||
|
||||
### Findings
|
||||
|
||||
- **[Critical] `docs/initial-plan.md` is badly stale.** The "north-star" doc (linked
|
||||
from `CLAUDE.md:14` and `README.md:44`) still describes a Go sidecar
|
||||
(`initial-plan.md:4,55,189`), `clide --daemon` long-running process (`:162-164`),
|
||||
`app/` subdirectory layout (`:184-204`), and `project.yaml` (`:172`) — all contradicted
|
||||
by D-5, D-56, and the single-package-at-root reality. Nothing flags it as historical.
|
||||
- **[Critical] `README.md` describes a dissolved architecture.** `README.md:10`
|
||||
documents `ptyc/` as a live component; `README.md:36` lists `make ptyc-build`. The
|
||||
`ptyc/` directory does not exist, the Makefile has no such target, and the CHANGELOG's
|
||||
own Unreleased section records ptyc's removal.
|
||||
- **[Major] `README.md:44` links to `decisions/`** — a directory that no longer exists
|
||||
(migrated to `governance/`). Dead link in the primary onboarding doc.
|
||||
- **[Major] CHANGELOG has duplicate subsection headings in `[Unreleased]`.** Three
|
||||
`### Changed` blocks (`CHANGELOG.md:100, 114, 168`), two `### Fixed`, two `### Removed`
|
||||
in the 2.0.0 section. Keep a Changelog 1.1.0 expects one of each per release.
|
||||
- **[Major] No `CONTRIBUTING.md` or onboarding doc.** For a project "intended to ship
|
||||
publicly to other developers," there is no contributor guide; the build/test story is
|
||||
scattered across `CLAUDE.md` (Claude-oriented), `README.md` (partly wrong), and
|
||||
Makefile help.
|
||||
- **[Major] Coverage-floor governance contradicts itself.** D-66 (`testing.md:65`) says
|
||||
the floor lives at `coverage/floor.txt` starting "≈35%"; `CHANGELOG.md:44-46` says it's
|
||||
in `pubspec.yaml` `coverage_floor:` starting at 34%; the latest commit is `9030e56
|
||||
hold coverage_floor fixed at 90`. Three sources, three mechanisms/values. D-66 was
|
||||
never amended.
|
||||
- **[Minor] `ci/release.sh` is a stub that still references goreleaser/sidecar** — Go
|
||||
tooling for a project with no Go.
|
||||
- **[Minor] CHANGELOG `[2.0.0] — 2026-05-03` dating** — the v2.0.0 tag is dated
|
||||
2026-05-03 but the enormous Unreleased section represents ~80 commits of post-tag work
|
||||
with no interim version.
|
||||
- **[Minor] Stale-ish open questions** — Q-25 (body text face) is de facto resolved by
|
||||
D-43/D-44 and the shipped impl; Q-1/Q-2/Q-3 ("defer until Tier 1 is in real use") are
|
||||
due for triage now that Tier 1 has shipped.
|
||||
- **[Minor] Skills system is coherent but undocumented as a set** — eight skills under
|
||||
`.claude/skills/`, no index.
|
||||
|
||||
### Recommendations
|
||||
|
||||
**Quick wins:** rewrite `README.md`'s `ptyc/` sections and fix the `decisions/` link;
|
||||
banner `docs/initial-plan.md` as historical (or split out a current
|
||||
`docs/architecture.md`); merge the duplicate changelog subsection headings; amend D-66 to
|
||||
reflect the floor's actual location/mechanism/value with a dated amendment line; triage
|
||||
Q-1/2/3/25.
|
||||
|
||||
**Larger efforts:** write a human-facing `CONTRIBUTING.md` (clone →
|
||||
`make hooks && flutter pub get` → `make test` → DQR workflow → commit conventions); cut
|
||||
an interim release to drain the ~80-commit Unreleased backlog; add a
|
||||
`.claude/skills/README.md` inventory; establish a periodic governance sweep (the repo
|
||||
even has a `clean-house` skill for exactly this).
|
||||
|
||||
### Scorecard
|
||||
|
||||
| Area | Score | Justification |
|
||||
|---|---|---|
|
||||
| Governance discipline | 4/5 | DQR system genuinely maintained — but D-66 drift and untriaged Tier-1-era questions show the sweep cadence lags the code. |
|
||||
| Documentation accuracy | 2/5 | Both primary onboarding docs describe a dissolved Go-sidecar/ptyc/daemon architecture; `CLAUDE.md` is accurate by contrast. |
|
||||
| Changelog hygiene | 3/5 | Per-commit discipline is followed, but duplicate subsection headings violate the standard and an 80-commit Unreleased backlog undermines the format. |
|
||||
| Contributor onboarding | 2/5 | No `CONTRIBUTING.md`; build story split across three docs, one wrong; `CLAUDE.md` is Claude-addressed, not human-addressed. |
|
||||
| Convention adherence | 4/5 | Commit style, DQR claiming, `licenses.yaml` two-step rule demonstrably followed; docked for the changelog defects and the README gap. |
|
||||
|
||||
---
|
||||
|
||||
## Closing note
|
||||
|
||||
The recurring pattern across all six reviews: **clide's foundations are excellent and
|
||||
its finishing is incomplete.** The extension contract, test helpers, FFI discipline,
|
||||
governance system, and token system are all things most projects never get right. The
|
||||
gaps — IPC not wired, keyboard not operable, docs describing a dead architecture, a
|
||||
workspace-relative binary path — are all the kind of thing that happens when a fast-moving
|
||||
solo project's implementation outruns its connective tissue. They are concentrated, not
|
||||
diffuse, and the quick-win column above would close most of the critical ones in a few
|
||||
focused days.
|
||||
@@ -0,0 +1,10 @@
|
||||
# Declares tags used by inline `test('...', tags: [...], ...)` calls so
|
||||
# that `flutter test --exclude-tags <name>` and `dart test --tags <name>`
|
||||
# both honor them. Undeclared tags are ignored by the runners, which
|
||||
# silently breaks selective excludes.
|
||||
tags:
|
||||
# Tests that call `forkpty()` via Dart FFI. Must run under `dart test`,
|
||||
# not `flutter test` — the latter's runner hosts a multi-threaded
|
||||
# Flutter engine in which forkpty produces a master fd that never
|
||||
# delivers output. See `test/pty/session_test.dart`.
|
||||
forkpty:
|
||||
@@ -0,0 +1,129 @@
|
||||
# clide — Architecture
|
||||
|
||||
Current as of 2026-05-17. Tracks the code on `main`. For the original
|
||||
design plan (much of it now superseded), see
|
||||
[`docs/initial-plan.md`](initial-plan.md). For decisions, see
|
||||
[`governance/decisions/`](../governance/decisions/).
|
||||
|
||||
## Shape
|
||||
|
||||
clide is a **single Flutter package at the repo root**. There is no
|
||||
sidecar process, no separate daemon, no Go binary. One `flutter run`
|
||||
boots the whole IDE.
|
||||
|
||||
```
|
||||
flutter desktop app (lib/main.dart)
|
||||
├── kernel services (lib/kernel/) — theme, i18n, settings, panels,
|
||||
│ commands, focus, scheduler, …
|
||||
├── core subsystems (lib/src/) — ipc, daemon dispatch, panes,
|
||||
│ │ pty, editor, files, git, pql
|
||||
│ └── PTY via Dart FFI posix_openpt + posix_spawn (T-96)
|
||||
├── widget primitives (lib/widgets/) — ClideButton, ClideText, … no
|
||||
│ Material/Cupertino
|
||||
├── built-in extensions (lib/builtin/) — claude, editor, files, git, terminal,
|
||||
│ welcome, … each a ClideExtension
|
||||
└── extension framework (lib/extension/) — contract + dependency-gated activation
|
||||
```
|
||||
|
||||
### Process model
|
||||
|
||||
One OS process. The Flutter app hosts:
|
||||
|
||||
- the IPC dispatcher (`DaemonDispatcher` in `lib/src/daemon/`),
|
||||
- every subsystem handler (pane/files/editor/git/pql),
|
||||
- the extension manager and all built-in extensions.
|
||||
|
||||
`tmux` is the only external long-lived process — it owns Claude
|
||||
session persistence so panes survive app restarts (D-41). The app
|
||||
re-attaches via `tmux new-session -A` on boot.
|
||||
|
||||
PTYs are spawned natively from Dart. `lib/src/pty/native_pty.dart`
|
||||
calls `posix_openpt()` + `posix_spawn()` via FFI; the child inherits
|
||||
the slave PTY as stdin/stdout/stderr. No C helper binary.
|
||||
|
||||
### Native dependencies
|
||||
|
||||
Vendored under [`native/`](../native/) with per-platform subdirectories
|
||||
(`linux-x64/` today). Currently:
|
||||
|
||||
- `libtree-sitter.so` — wasmtime-embedded tree-sitter for syntax
|
||||
highlighting. Loaded via `dart:ffi`. See
|
||||
`lib/kernel/src/syntax/tree_sitter_ffi.dart`.
|
||||
|
||||
Each entry is listed in [`assets/licenses.yaml`](../assets/licenses.yaml)
|
||||
with version + SHA expectation (D-42).
|
||||
|
||||
### External tools
|
||||
|
||||
clide shells out to two binaries at runtime:
|
||||
|
||||
- **`git`** — vendored as `dugite-native` if present at the install
|
||||
directory; otherwise `PATH` `git`. Resolution happens at
|
||||
`lib/kernel/src/toolchain_paths.dart`. **Never resolves against the
|
||||
open workspace** (T-98).
|
||||
- **`pql`** — the [pql](https://github.com/postmeridiem/pql) project
|
||||
query language; supporter tool, wrapped in `lib/src/pql/`. Clide
|
||||
never re-implements pql features (D-3).
|
||||
|
||||
## Surfaces
|
||||
|
||||
### Claude-facing — `clide` CLI
|
||||
|
||||
Per D-1 and D-6, Claude talks to clide exclusively via Bash. Every
|
||||
state-changing command emits one or more events on a long-lived
|
||||
event stream; every UI affordance has a matching CLI verb. See D-6
|
||||
for the subsystem/verb/event contract.
|
||||
|
||||
> **Caveat (2026-05):** the Unix-socket server that exposes the
|
||||
> dispatcher to a thin `clide` C client is currently unimplemented.
|
||||
> Today's working path is in-process direct dispatch. See **T-99**
|
||||
> (IPC server implementation) and **D-68** (dual integration surface
|
||||
> — Bash CLI primary, MCP secondary).
|
||||
|
||||
### User-facing — Flutter desktop
|
||||
|
||||
Three-column layout (sidebar / workspace / context) with collapsible
|
||||
panels, a custom title bar, and per-panel "hats" for branding +
|
||||
window controls. The interaction model is documented in D-47 and
|
||||
neighboring decisions.
|
||||
|
||||
## Subsystems at a glance
|
||||
|
||||
| Subsystem | Location | Owns |
|
||||
|---|---|---|
|
||||
| IPC envelope + dispatcher | `lib/src/ipc/`, `lib/src/daemon/` | request/response framing, command registration, broadcast events |
|
||||
| Pane registry | `lib/src/panes/` | spawn/list/write/resize/close, event emission |
|
||||
| PTY | `lib/src/pty/` | `posix_openpt` + `posix_spawn`, reader isolate, signal forwarding |
|
||||
| Editor | `lib/src/editor/` | buffer registry, open/save/setContent |
|
||||
| Files | `lib/src/files/` | ls / read / watch, path-safety containment check |
|
||||
| Git | `lib/src/git/` | client (no shell), status/diff/operations parsing |
|
||||
| Pql wrapper | `lib/src/pql/` | shell-out only; never re-implements pql |
|
||||
| Kernel services | `lib/kernel/src/` | theme, i18n, settings, panels, commands, focus, syntax |
|
||||
| Extensions | `lib/extension/`, `lib/builtin/` | dependency-gated activation, contribution points |
|
||||
|
||||
## Build + test
|
||||
|
||||
```
|
||||
make hooks && flutter pub get # one-time setup
|
||||
make run # launch app
|
||||
make test # analyze + format + unit + widget + golden
|
||||
make test-core # IPC / PTY / git / pane registry
|
||||
make test-a11y # accessibility contract
|
||||
make test-integration # real-app boot tests
|
||||
make push-check # the full pre-push gate
|
||||
```
|
||||
|
||||
The pre-push gate enforces a 95% line-coverage floor (D-66), a
|
||||
40-word soft / 60-word hard CHANGELOG bullet cap, all unit/widget
|
||||
tests, and the a11y contract.
|
||||
|
||||
## Governance
|
||||
|
||||
All architectural choices live in
|
||||
[`governance/decisions/<domain>.md`](../governance/decisions/) as
|
||||
`D-NNN` records, open questions as `Q-NNN`, rejected alternatives as
|
||||
`R-NNN`. Claim new IDs via `pql decisions claim D <domain> "title"`.
|
||||
The governance index lists everything: [`governance/README.md`](../governance/README.md).
|
||||
|
||||
The pql ticket backlog tracks in-flight work; `pql ticket board
|
||||
--pretty` for the live view.
|
||||
@@ -1,5 +1,24 @@
|
||||
# Clide — Initial Plan (Flutter rebuild)
|
||||
|
||||
> **⚠ HISTORICAL — preserved as a snapshot of the 2026-04 plan.**
|
||||
>
|
||||
> Several load-bearing choices in this document have since been
|
||||
> superseded by formal decisions:
|
||||
>
|
||||
> - **No Go sidecar.** Dart is the sole core language (D-5).
|
||||
> - **No separate daemon process.** The Flutter app hosts the IPC
|
||||
> server in-process (D-56).
|
||||
> - **No `ptyc/` C helper.** PTY spawning uses Dart FFI
|
||||
> `posix_openpt()` + `posix_spawn()` (D-5 amendments, T-96).
|
||||
> - **Single package at the repo root**, not `app/` + `lib/` + `bin/`.
|
||||
> - **No `project.yaml`.** Project metadata lives in `pubspec.yaml`.
|
||||
>
|
||||
> For the current architecture, see [`docs/architecture.md`](architecture.md).
|
||||
> For the decision trail, see [`governance/decisions/`](../governance/decisions/).
|
||||
> The text below is left intact for anyone tracing the design history.
|
||||
|
||||
---
|
||||
|
||||
**Working name:** clide (unchanged from the Python era). Repo root:
|
||||
`/var/mnt/data/projects/clide`. Flutter desktop app + Go sidecar/CLI.
|
||||
|
||||
|
||||
@@ -1,5 +1,11 @@
|
||||
# macOS PTY Problem — Diagnosis Complete
|
||||
|
||||
> **⚠ HISTORICAL — `ptyc` is retired.** PTY spawning moved to
|
||||
> Dart FFI `posix_openpt()` + `posix_spawn()` (D-5 amendments,
|
||||
> T-96). The race described below was specific to the old C helper's
|
||||
> SCM_RIGHTS hand-off and no longer applies.
|
||||
|
||||
|
||||
## Status: Root cause found
|
||||
|
||||
The PTY master fd is valid (`isatty=1`), SCM_RIGHTS transfer is correct, all struct layouts are correct. The problem is **timing**: the reader isolate starts too late and the shell has already exited by the time `read()` is called on the master fd. macOS returns EOF (n=0) immediately when the slave side is closed — unlike Linux which buffers data.
|
||||
|
||||
@@ -1,5 +1,12 @@
|
||||
# PTY on macOS: A New Diagnostic and Resolution Plan
|
||||
|
||||
> **⚠ HISTORICAL — `ptyc` is retired.** PTY spawning moved to
|
||||
> Dart FFI `posix_openpt()` + `posix_spawn()` (D-5 amendments,
|
||||
> T-96). This document captures the forensic investigation of the
|
||||
> SCM_RIGHTS control-message mismatch in the old C helper. Kept for
|
||||
> the diagnostic technique; the code it discusses no longer exists.
|
||||
|
||||
|
||||
## 1. Executive Summary
|
||||
|
||||
Previous attempts to fix the PTY functionality on macOS have failed, even after correcting a deadlock in the Dart code. The core of the problem appears to be a fundamental mismatch in how the C helper (`ptyc`) constructs a control message and how the Dart FFI layer is trying to parse it.
|
||||
|
||||
@@ -109,6 +109,7 @@ You might also want, project-permitting:
|
||||
- [D-65: License compatibility matrix](decisions/tooling.md#d-65-license-compatibility-matrix) — _tooling_
|
||||
- [D-66: Line coverage gate at 95%, ratcheted from current](decisions/testing.md#d-66-line-coverage-gate-at-95-ratcheted-from-current) — _testing_
|
||||
- [D-67: Pql changelog files are committed alongside code](decisions/process.md#d-67-pql-changelog-files-are-committed-alongside-code) — _process_
|
||||
- [D-68: Dual integration surface — Bash CLI primary, MCP secondary](decisions/architecture.md#d-68-dual-integration-surface--bash-cli-primary-mcp-secondary) — _architecture_
|
||||
|
||||
## Open questions
|
||||
|
||||
@@ -142,6 +143,8 @@ You might also want, project-permitting:
|
||||
- [Q-29: Branch picker location](questions/architecture.md#q-29-branch-picker-location) — _architecture_
|
||||
- [Q-30: Focus behavior when editor is dirty and viewer is peeked](questions/architecture.md#q-30-focus-behavior-when-editor-is-dirty-and-viewer-is-peeked) — _architecture_
|
||||
- [Q-31: XWayland fallback for frameless — proper Wayland protocol needed](questions/architecture.md#q-31-xwayland-fallback-for-frameless--proper-wayland-protocol-needed) — _architecture_
|
||||
- [Q-32: MCP tool surface — minimum slash-ide or extended clide tools?](questions/architecture.md#q-32-mcp-tool-surface--minimum-slash-ide-or-extended-clide-tools) — _architecture_
|
||||
- [Q-33: MCP transport — SSE, WebSocket, stdio, or all?](questions/architecture.md#q-33-mcp-transport--sse-websocket-stdio-or-all) — _architecture_
|
||||
|
||||
## Rejected
|
||||
|
||||
|
||||
@@ -73,6 +73,7 @@ Core, rendering, IPC, kernel, panel manager.
|
||||
|
||||
### D-1: CLI-first, not MCP
|
||||
- **Date:** 2026-04-20 (was ADR 0001; ported from the claudian lineage)
|
||||
- **Amendment (2026-05-15):** D-1's intent — the CLI is the *primary* agent-facing surface, with the same contract as pql — stands. An additional `/ide`-compatible MCP surface is added per [D-68](#d-68-dual-integration-surface-bash-cli-primary-mcp-secondary); both wrap the same in-process dispatcher. The escape-hatch line in this record's Cost ("nothing here precludes adding [MCP] later that shells out to the same CLI") is realised — the MCP server does not bypass the CLI's surface, it offers a second transport to it.
|
||||
- **Decision:** Claude talks to clide exclusively via Bash (`clide …`). No MCP server. No protocol layer in Claude's face. The CLI uses the same exit-code + stderr-JSON contract as pql.
|
||||
- **Context:** The two mainstream options for the agent-facing surface were an MCP server or a plain Bash CLI matching pql's contract.
|
||||
- **Rationale:** Same mental model as pql for the agent — one tool-use pattern covers both. No MCP runtime to host, authenticate, or keep in sync with client versions. User/Claude parity is easier to enforce: every CLI subcommand must have a UI affordance in the Flutter app and vice versa ([D-6](#d-6-cli-and-event-surface-contract)). Claude Code's `Bash(clide *)` allow rule is the only configuration clide needs on the agent side.
|
||||
@@ -99,6 +100,7 @@ Core, rendering, IPC, kernel, panel manager.
|
||||
- **Date:** 2026-04-20 (was ADR 0005; supersedes [R-2](rejected.md#r-2-go-sidecar))
|
||||
- **Amendment (2026-04-23):** The separate daemon process and two-package layout are dissolved per [D-56](#d-56-dissolve-daemon-process-flutter-app-hosts-ipc-server). Dart-core principle survives; the daemon binary does not.
|
||||
- **Amendment (2026-05-07):** `ptyc` retired. PTY spawning moved to Dart FFI `forkpty()` (`lib/src/pty/native_pty.dart`). The `ptyc/` source tree, `PtySession`, and `scm_rights.dart` are removed. `pql` remains the sole external supporter tool.
|
||||
- **Amendment (2026-05-17):** `forkpty()` replaced with `posix_openpt()` + `posix_spawn()` (T-96). `forkpty` calls `fork()` underneath, which is unsafe in the multithreaded Dart VM: ~5% of spawns deadlocked in the child before `execve` due to libc locks held by ghost-threads at fork time. `posix_spawn` uses `vfork` under glibc/musl/macOS, keeping the parent suspended until `execve` completes — no Dart code runs in the child. Side benefit: dropped the `libutil.so.1` dynamic dependency; PTY now resolves entirely against libc via `DynamicLibrary.process()`.
|
||||
- **Decision:** Three moves. **(1) Dart is the core language.** Everything that used to live under `sidecar/` — IPC server, CLI dispatch, process management, file watching, git shell-outs, pql wrapper — is written in Dart. Two execution modes of one Dart AOT binary: `clide <subcommand>` (one-shot, pql-style) and `clide --daemon` (long-running, owns PTYs and subprocesses, survives app restarts). The Flutter app imports the Dart core as a library *and* connects to the daemon over IPC. **(2) The sidecar directory dissolves.** Layout is `app/` (Flutter UI), `lib/` (Dart core), `bin/clide.dart` (AOT entry), `ptyc/` (C helper), no `sidecar/`, no Go module. **(3) `ptyc` is a pql-peer supporter tool.** Small C binary that does `posix_openpt` + `fork` + `exec` + fd-passing via `SCM_RIGHTS`; clide wraps it the same way it wraps pql. Shells out for every PTY (terminal pane, tmux session, Claude, LSP server, debug adapter — one code path). Consumers other than clide can use `ptyc` standalone.
|
||||
- **Context:** [R-2](rejected.md#r-2-go-sidecar) picked Go for the sidecar/CLI on two premises: (a) the heavy work belongs in a language separate from the UI layer, and (b) pql is Go so the muscle memory transfers. On reassessment, both premises broke: the "heavy work" is I/O-bound glue that `dart:io` covers cleanly — the real choice was **separate process vs shared language**, and separate-process is what matters. PTY is the one place Dart is genuinely weak (multi-threaded VM can't safely `fork()`), and once you accept a small native helper, *nothing else* needs to be in the same language.
|
||||
- **Rationale:** One toolchain for the IDE proper (Flutter + Dart). C toolchain needed only to build `ptyc` — tiny, rarely-changing. Session persistence stays because PTY master fds live in the Dart daemon process, not the app. `ptyc` naming: **p** for *project* (parallel to pql's *project query language*), **ptyc** reads as both "PTY + child" (domain vocabulary) and "PTY + C" (implementation language). Usable from Dart, Python, Go, shell — anywhere a subprocess can be spawned and a fd received.
|
||||
@@ -244,4 +246,13 @@ Core, rendering, IPC, kernel, panel manager.
|
||||
- **Cross-reference:** [D-60](tooling.md#d-60-no-network-on-default-launch-path), `POLICY.md`.
|
||||
- **Raised by:** 2026-05-03 policy-to-decision migration (T-28).
|
||||
|
||||
### D-68: Dual integration surface — Bash CLI primary, MCP secondary
|
||||
- **Date:** 2026-05-15
|
||||
- **Decision:** clide exposes two integration surfaces over the same in-process `DaemonDispatcher`. **(1) Bash CLI over Unix socket — primary.** Per [D-1](#d-1-cli-first-not-mcp) and [D-56](#d-56-dissolve-daemon-process-flutter-app-hosts-ipc-server), a thin C client (`clide …`) connects to a per-user Unix socket served in-process by the Flutter app, exchanges JSON-lines, and exits. This is the surface Claude-Code-in-a-pane uses; it is also the surface for human shell use, scripts, and external editor integrations. Full action surface — `pane.*`, `files.*`, `editor.*`, `git.*`, `pql.*`, …. **(2) `/ide`-compatible MCP server — secondary.** clide additionally serves an MCP endpoint compatible with Claude Code's `/ide` integration (the same protocol VS Code and JetBrains plugins serve). Minimum tools: `mcp__ide__getDiagnostics`, `mcp__ide__executeCode`. Optional `mcp__clide__*` namespace exposing high-leverage clide tools is deferred to [Q-32](../questions/architecture.md#q-32-mcp-tool-surface-minimum-slash-ide-or-extended-clide-tools). Transport choice deferred to [Q-33](../questions/architecture.md#q-33-mcp-transport-sse-websocket-stdio-or-all). The MCP server wraps the *same* `DaemonDispatcher`; there is no second source of truth.
|
||||
- **Context:** [D-1](#d-1-cli-first-not-mcp) chose CLI-first over MCP-only because MCP alone doesn't cover the action surface clide needs — Claude Code's `/ide` MCP exposes only two narrow tools (`getDiagnostics`, `executeCode`), enough for Claude to read diagnostics and run Jupyter cells but not enough to *drive* an IDE. The CLI surface gives full reach. But for users who run Claude Code *outside* clide and connect via `/ide`, MCP is the only path Claude Code knows; not serving it means clide is invisible to that workflow. The two surfaces are complementary, not alternatives. Reinforced by the [2026-05-14 consultant review](../../consultants.md): the architect flagged the absent socket server as the most critical drift; user confirmed the socket server (D-56 path a) plus an MCP companion.
|
||||
- **Rationale:** Both surfaces wrap the same dispatcher, so neither becomes a second source of truth. CLI remains the contract user/Claude parity ([D-6](#d-6-cli-and-event-surface-contract)) is enforced against. MCP is added because the `/ide` ecosystem is real and growing — VS Code, JetBrains, Cursor, Windsurf all serve compatible MCP — and clide should be a peer there. The implementation cost is a protocol adapter + tool definitions, not duplicate business logic.
|
||||
- **Cost:** Two transports to maintain. Mitigated by both wrapping the same dispatcher: the MCP adapter is the only thing that has to track `/ide` protocol evolution. If `mcp__clide__*` tools are added (pending Q-32), surface bloat is the obvious risk — every CLI verb invites an MCP twin; resist by default, justify on user need.
|
||||
- **Cross-reference:** [D-1](#d-1-cli-first-not-mcp) (amended — see amendment line there), [D-6](#d-6-cli-and-event-surface-contract), [D-56](#d-56-dissolve-daemon-process-flutter-app-hosts-ipc-server), [Q-32](../questions/architecture.md#q-32-mcp-tool-surface-minimum-slash-ide-or-extended-clide-tools), [Q-33](../questions/architecture.md#q-33-mcp-transport-sse-websocket-stdio-or-all).
|
||||
- **Raised by:** 2026-05-15 — consultant review (`consultants.md`) flagged the absent socket server (D-56 unimplemented) as the highest architectural drift; user chose option (a) "implement the server" and asked for MCP coverage alongside.
|
||||
|
||||
---
|
||||
|
||||
@@ -62,6 +62,7 @@ Test pyramid, drivers, client-side constraint.
|
||||
|
||||
### D-66: Line coverage gate at 95%, ratcheted from current
|
||||
- **Date:** 2026-05-06
|
||||
- **Amendment (2026-05-17):** Floor location consolidated — the committed floor lives at `coverage_floor:` in `pubspec.yaml` (single source of truth); `coverage/floor.txt` is no longer used. The 95% target was reached on 2026-05-17; floor is **95** as of that date (T-91 closed). A pre-push **CHANGELOG concision gate** (`ci/changelog_gate.sh`) runs alongside the coverage gate; both live under `make push-check`. A separate `make push-check-full` adds `test-integration` + `smoke-bundle` for pre-release checks (T-103).
|
||||
- **Decision:** The pre-push gate runs `flutter test --coverage --exclude-tags forkpty`, parses `coverage/lcov.info`, and hard-fails if total line coverage drops below a committed floor at `coverage/floor.txt`. The floor starts at the actual current coverage (≈35%, dragged down by `lib/src/terminal/`'s 0.4%) and only ever ratchets up. The end target is 95%; getting there is tracked as a campaign of deliberate floor bumps under one epic ticket. **No carve-outs** — code under `lib/` is owned regardless of file-header attribution, including the terminal emulator port. Branch coverage is not gated (Dart's lcov output models it weakly). Lint suppressions to dodge the gate are never acceptable.
|
||||
- **Rationale:** A flat 95% threshold today blocks every push; an informational coverage report rots into noise. The committed-floor ratchet makes "don't make it worse" the durable rule and turns the journey to 95% into explicit, reviewed bumps rather than a single overnight cliff. Excluding `forkpty`-tagged tests matches `ci/test.sh` (forkpty + flutter test runner are incompatible — see `test/pty/session_test.dart`).
|
||||
- **Cost:** Pre-push wall time grows by `flutter test --coverage` (currently ≈11 s on this tree). Acceptable within D-29's < 90 s budget; reassess if it slips. Floor bumps require an explicit edit to `coverage/floor.txt` in the same commit that adds tests — so contributors can't silently raise it.
|
||||
|
||||
@@ -9,18 +9,21 @@ ticket persistence.
|
||||
- **Status:** Open
|
||||
- **Question:** The daemon's token auth is coarse (allow all / deny all). Do we need per-subsystem grants later (e.g. restrict `git push`), and if so, what's the model — capability tokens? An explicit grant table per client? Time-limited grants?
|
||||
- **Context:** Surfaced in the old ADR 0006 open-questions footer; deferred until Tier 1 is in real use.
|
||||
- **Triage (2026-05-17):** Still open. Tier 1 has shipped but the IPC socket server itself is unimplemented (T-99). Re-evaluate once the socket lands and external CLI clients exist.
|
||||
- **Source:** ADR 0006 (migrated to [D-6](architecture.md)).
|
||||
|
||||
### Q-2: Back-pressure on event streams
|
||||
- **Status:** Open
|
||||
- **Question:** A subscriber that falls behind on `pane.output` (a firehose) needs a policy: drop oldest, block producer, coalesce, or kill subscriber. Which?
|
||||
- **Context:** The event bus is in-memory; back-pressure policy is undefined. Defer until Tier 1 is in real use and we have a real firehose to measure against.
|
||||
- **Triage (2026-05-17):** Still open. PTY panes ship and produce real firehoses, but no subscriber has fallen behind in observed use. Re-evaluate when a multi-client IPC scenario (T-99) makes this measurable.
|
||||
- **Source:** ADR 0006 (migrated to [D-6](architecture.md)).
|
||||
|
||||
### Q-3: Event persistence + audit/undo
|
||||
- **Status:** Open
|
||||
- **Question:** Events are in-memory only in v1. If a future need (audit log, undo history) wants persistence, is it a property of the bus or a subsystem that subscribes and writes?
|
||||
- **Context:** ADR 0006 leaned "subsystem that subscribes and writes" but didn't commit.
|
||||
- **Triage (2026-05-17):** Still open; no concrete trigger yet. Revisit when the first persistence requirement lands (likely Tier-6 audit/undo).
|
||||
- **Source:** ADR 0006 (migrated to [D-6](architecture.md)).
|
||||
|
||||
### Q-4: `.canvas` schema compatibility with Obsidian
|
||||
@@ -69,6 +72,7 @@ ticket persistence.
|
||||
- **Status:** Open
|
||||
- **Question:** The design handoff uses JetBrains Mono for all UI text (tab labels, file paths, status bar, sidebar labels), reserving Josefin Sans only for display/title text. Our current implementation uses Josefin Sans as the ambient UI face with JetBrains Mono only for code/terminal/diff surfaces. Which direction?
|
||||
- **Context:** The design's "mono everywhere" rationale: clide is an IDE for people who like grids. The current Josefin Sans rationale: visual distinction between chrome text and code text, warmer feel. Both are valid — this is a feel decision, not a technical one.
|
||||
- **Triage (2026-05-17):** Still open. The Josefin-Sans-as-UI-face implementation has shipped and is the current default; the design's "mono everywhere" direction remains unrealised. Convert to a D-record when the design call is made.
|
||||
- **Source:** 2026-04-22 design handoff review.
|
||||
|
||||
### Q-26: Small screen layout (< 1000px)
|
||||
@@ -125,4 +129,16 @@ ticket persistence.
|
||||
|
||||
- **Source:** 2026-04-23 D-57 implementation.
|
||||
|
||||
### Q-32: MCP tool surface — minimum slash-ide or extended clide tools?
|
||||
- **Status:** Open
|
||||
- **Question:** [D-68](../decisions/architecture.md#d-68-dual-integration-surface-bash-cli-primary-mcp-secondary) commits clide to an `/ide`-compatible MCP server. The minimum surface is the two tools Claude Code's `/ide` integration currently expects: `mcp__ide__getDiagnostics` (lint/diagnostics for a file) and `mcp__ide__executeCode` (run code in a Jupyter kernel). Do we stop there, or also expose a `mcp__clide__*` namespace with higher-leverage tools (`open_file`, `goto_symbol`, `pql_query`, `pane_spawn`, `git_status`, …) so MCP clients other than Claude Code (Cursor, Windsurf, VS Code Copilot) can drive clide as a real backend?
|
||||
- **Context:** The minimum surface keeps clide a good citizen in the `/ide` ecosystem and avoids duplicating the CLI in MCP form. The extended surface would let non-Claude-Code MCP clients integrate richly, but invites surface bloat (every CLI verb tempted to gain an MCP twin) and a maintenance second front. Note that for *Claude-Code-in-a-clide-pane*, the CLI surface already covers this — extended MCP tools serve external MCP clients only.
|
||||
- **Source:** [D-68](../decisions/architecture.md#d-68-dual-integration-surface-bash-cli-primary-mcp-secondary).
|
||||
|
||||
### Q-33: MCP transport — SSE, WebSocket, stdio, or all?
|
||||
- **Status:** Open
|
||||
- **Question:** Claude Code's `/ide` integration connects via SSE-IDE or WS-IDE (URL passed at startup). MCP also supports stdio for process-spawn clients. Which transport(s) should clide's MCP server expose — SSE only (the most common `/ide` server pattern), SSE + WS (broader compatibility), or all three including stdio?
|
||||
- **Context:** Transport choice affects discovery and lifecycle. SSE/WS need a port and a published URL, which collides with the `XDG_RUNTIME_DIR` Unix-socket model used for the CLI; we'd likely publish the URL alongside the socket path (env var or `XDG_RUNTIME_DIR` discovery file). stdio is process-per-client and works for clients that prefer process-spawn over network. Decision interacts with [Q-32](#q-32-mcp-tool-surface-minimum-slash-ide-or-extended-clide-tools) — if the surface stays at the `/ide` minimum, SSE alone is sufficient.
|
||||
- **Source:** [D-68](../decisions/architecture.md#d-68-dual-integration-surface-bash-cli-primary-mcp-secondary).
|
||||
|
||||
---
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
import 'dart:io';
|
||||
import 'dart:ui';
|
||||
|
||||
import 'package:clide/app.dart';
|
||||
import 'package:clide/builtin/default_layout/default_layout.dart';
|
||||
@@ -22,6 +23,16 @@ void main() {
|
||||
IntegrationTestWidgetsFlutterBinding.ensureInitialized();
|
||||
|
||||
testWidgets('clide app boots with classic 3-column layout + welcome + statusbar', (tester) async {
|
||||
// The welcome view's TIPS card overflows the default headless test
|
||||
// viewport (~800px); give it a desktop-sized window so layout is
|
||||
// representative of a real launch.
|
||||
tester.view.physicalSize = const Size(1600, 1000);
|
||||
tester.view.devicePixelRatio = 1.0;
|
||||
addTearDown(() {
|
||||
tester.view.resetPhysicalSize();
|
||||
tester.view.resetDevicePixelRatio();
|
||||
});
|
||||
|
||||
final themes = [
|
||||
await const ThemeLoader().fromAsset(
|
||||
rootBundle,
|
||||
@@ -58,10 +69,15 @@ void main() {
|
||||
|
||||
// Welcome tab is mounted in the workspace.
|
||||
expect(find.text('clide'), findsWidgets);
|
||||
expect(find.text('Open project'), findsOneWidget);
|
||||
// The visible START row exposes "Open folder…"; the "Open project"
|
||||
// dialog title only appears after the user clicks through, so we
|
||||
// assert the on-boot label here.
|
||||
expect(find.text('Open folder…'), findsWidgets);
|
||||
|
||||
// IPC status indicator reports disconnected (fake client never connects).
|
||||
expect(find.text('disconnected'), findsOneWidget);
|
||||
// Welcome view's toolchain status shows "checking…" while the
|
||||
// backend hasn't reported resolution (FakeDaemonClient never does
|
||||
// — autoStartDaemonClient is false).
|
||||
expect(find.text('checking…'), findsWidgets);
|
||||
|
||||
await services.dispose();
|
||||
});
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
import 'dart:io';
|
||||
import 'dart:ui';
|
||||
|
||||
import 'package:clide/app.dart';
|
||||
import 'package:clide/builtin/default_layout/default_layout.dart';
|
||||
@@ -15,6 +16,15 @@ void main() {
|
||||
IntegrationTestWidgetsFlutterBinding.ensureInitialized();
|
||||
|
||||
testWidgets('disable + re-enable an extension mounts/unmounts its UI', (tester) async {
|
||||
// Welcome view overflows the default headless viewport — give it a
|
||||
// desktop-sized window so layout is representative.
|
||||
tester.view.physicalSize = const Size(1600, 1000);
|
||||
tester.view.devicePixelRatio = 1.0;
|
||||
addTearDown(() {
|
||||
tester.view.resetPhysicalSize();
|
||||
tester.view.resetDevicePixelRatio();
|
||||
});
|
||||
|
||||
final themes = [
|
||||
await const ThemeLoader().fromAsset(
|
||||
rootBundle,
|
||||
@@ -41,17 +51,21 @@ void main() {
|
||||
|
||||
await tester.pumpWidget(ClideApp(services: services));
|
||||
await tester.pumpAndSettle();
|
||||
expect(find.text('disconnected'), findsOneWidget);
|
||||
// The ipc-status extension contributes a ToolStatusItem to the
|
||||
// statusbar; we assert its presence by widget type so the test
|
||||
// doesn't depend on whichever status string (`application ok` /
|
||||
// `checking…` / `<tool> not found`) the toolchain happens to be in.
|
||||
expect(find.byType(ToolStatusItem), findsOneWidget);
|
||||
|
||||
// Disable ipc-status; status item should disappear.
|
||||
await services.extensions.setEnabled('builtin.ipc-status', false);
|
||||
await tester.pumpAndSettle();
|
||||
expect(find.text('disconnected'), findsNothing);
|
||||
expect(find.byType(ToolStatusItem), findsNothing);
|
||||
|
||||
// Re-enable; status item reappears.
|
||||
await services.extensions.setEnabled('builtin.ipc-status', true);
|
||||
await tester.pumpAndSettle();
|
||||
expect(find.text('disconnected'), findsOneWidget);
|
||||
expect(find.byType(ToolStatusItem), findsOneWidget);
|
||||
|
||||
await services.dispose();
|
||||
});
|
||||
|
||||
@@ -45,11 +45,10 @@ void backendEntry(BackendBootMessage boot) {
|
||||
late Toolchain toolchain;
|
||||
|
||||
// Phase 1: resolve toolchain — just find binaries, don't init services.
|
||||
// We need a project root for dugite paths. Use a sensible default;
|
||||
// the real project comes from project.open.
|
||||
final resolveRoot = boot.hintRoot ?? Platform.environment['HOME'] ?? '/tmp';
|
||||
// Dugite is resolved against the install dir; per T-98 the project
|
||||
// root is never inspected during toolchain resolution.
|
||||
toolchain = Toolchain();
|
||||
toolchain.applyResolved(resolveToolchainPaths(resolveRoot));
|
||||
toolchain.applyResolved(resolveToolchainPaths());
|
||||
|
||||
// Listen for messages from the frontend.
|
||||
requestPort.listen((message) async {
|
||||
@@ -77,10 +76,10 @@ void backendEntry(BackendBootMessage boot) {
|
||||
final projectPath = message['path'] as String;
|
||||
final workDir = Directory(projectPath);
|
||||
|
||||
// Re-resolve toolchain with the actual project root (finds
|
||||
// dugite in native/dugite/, etc.)
|
||||
// Re-resolve toolchain. Project path is not inspected (T-98);
|
||||
// dugite still comes from the install dir + env override.
|
||||
toolchain = Toolchain();
|
||||
toolchain.applyResolved(resolveToolchainPaths(projectPath));
|
||||
toolchain.applyResolved(resolveToolchainPaths());
|
||||
|
||||
// Clear existing handlers and re-register with new project.
|
||||
dispatcher.clear();
|
||||
|
||||
@@ -238,7 +238,7 @@ class KernelServices {
|
||||
focus.dispose();
|
||||
project.dispose();
|
||||
extensions.dispose();
|
||||
scheduler.dispose();
|
||||
await scheduler.dispose();
|
||||
await log.dispose();
|
||||
messages.dispose();
|
||||
await events.dispose();
|
||||
|
||||
@@ -38,6 +38,13 @@ class SchedulerService {
|
||||
StreamSubscription<dynamic>? _sub;
|
||||
StreamSubscription<dynamic>? _projectSub;
|
||||
|
||||
/// Tracks the spawn future so [_stopTicker] can await it before
|
||||
/// killing — otherwise a stop racing a still-spawning isolate
|
||||
/// leaves `_isolate` null at kill time and the just-spawned isolate
|
||||
/// (with its `Timer.periodic`) leaks forever. Same race shape we
|
||||
/// fixed in `NativePty` via `_readerReady` (T-96).
|
||||
Future<Isolate?>? _isolateReady;
|
||||
|
||||
/// Listen for project lifecycle events. The periodic ticker only runs
|
||||
/// while a project is open — no wasted cycles on the welcome screen.
|
||||
void start() {
|
||||
@@ -47,8 +54,8 @@ class SchedulerService {
|
||||
|
||||
/// Start the periodic ticker and fire an immediate first cycle so
|
||||
/// all panels refresh without waiting for the first interval.
|
||||
void _startTicker() {
|
||||
_stopTicker();
|
||||
Future<void> _startTicker() async {
|
||||
await _stopTicker();
|
||||
|
||||
// Stagger the initial ticks to avoid a rebuild storm on project open.
|
||||
var delay = 0;
|
||||
@@ -68,14 +75,26 @@ class SchedulerService {
|
||||
_events.emit(SchedulerTick(tier: tier));
|
||||
}
|
||||
});
|
||||
Isolate.spawn(_isolateEntry, _port!.sendPort).then((iso) => _isolate = iso);
|
||||
_isolateReady = Isolate.spawn(_isolateEntry, _port!.sendPort);
|
||||
_isolateReady!.then((iso) => _isolate = iso).catchError((_) => null);
|
||||
}
|
||||
|
||||
void _stopTicker() {
|
||||
Future<void> _stopTicker() async {
|
||||
// Await any in-flight spawn so we never miss killing an isolate
|
||||
// that's mid-creation — see _isolateReady.
|
||||
if (_isolateReady != null) {
|
||||
try {
|
||||
final pending = await _isolateReady;
|
||||
_isolate ??= pending;
|
||||
} catch (_) {
|
||||
// Spawn failed; nothing to kill.
|
||||
}
|
||||
}
|
||||
_sub?.cancel();
|
||||
_port?.close();
|
||||
_isolate?.kill(priority: Isolate.immediate);
|
||||
_isolate = null;
|
||||
_isolateReady = null;
|
||||
_port = null;
|
||||
_sub = null;
|
||||
}
|
||||
@@ -97,8 +116,8 @@ class SchedulerService {
|
||||
}
|
||||
}
|
||||
|
||||
void dispose() {
|
||||
Future<void> dispose() async {
|
||||
_projectSub?.cancel();
|
||||
_stopTicker();
|
||||
await _stopTicker();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -4,6 +4,7 @@ import 'dart:ffi';
|
||||
import 'dart:io' show File, Platform;
|
||||
|
||||
import 'package:ffi/ffi.dart';
|
||||
import 'package:flutter/foundation.dart';
|
||||
|
||||
// -- Opaque handles ----------------------------------------------------------
|
||||
|
||||
@@ -146,6 +147,60 @@ class TreeSitterLib {
|
||||
wasmEngineNew = lib.lookupFunction<_WasmEngineNew, DWasmEngineNew>('wasm_engine_new'),
|
||||
wasmEngineDelete = lib.lookupFunction<_WasmEngineDelete, DWasmEngineDelete>('wasm_engine_delete');
|
||||
|
||||
/// Constructs a [TreeSitterLib] from caller-supplied Dart closures. Used by
|
||||
/// tests to substitute the FFI surface without dlopen'ing the real library;
|
||||
/// each unspecified function defaults to a safe no-op (pointers return
|
||||
/// `nullptr`, ints return `0`, bools return `false`). Tests override the
|
||||
/// few entries they exercise.
|
||||
@visibleForTesting
|
||||
TreeSitterLib.testing({
|
||||
DTsParserNew? parserNew,
|
||||
DTsParserDelete? parserDelete,
|
||||
DTsParserSetLanguage? parserSetLanguage,
|
||||
DTsParserSetWasmStore? parserSetWasmStore,
|
||||
DTsParserParseString? parserParseString,
|
||||
DTsTreeDelete? treeDelete,
|
||||
DTsTreeRootNode? treeRootNode,
|
||||
DTsNodeStartByte? nodeStartByte,
|
||||
DTsNodeEndByte? nodeEndByte,
|
||||
DTsQueryNew? queryNew,
|
||||
DTsQueryDelete? queryDelete,
|
||||
DTsQueryCaptureCount? queryCaptureCount,
|
||||
DTsQueryCaptureNameForId? queryCaptureNameForId,
|
||||
DTsQueryCursorNew? queryCursorNew,
|
||||
DTsQueryCursorDelete? queryCursorDelete,
|
||||
DTsQueryCursorExec? queryCursorExec,
|
||||
DTsQueryCursorNextMatch? queryCursorNextMatch,
|
||||
DTsWasmStoreNew? wasmStoreNew,
|
||||
DTsWasmStoreDelete? wasmStoreDelete,
|
||||
DTsWasmStoreLoadLanguage? wasmStoreLoadLanguage,
|
||||
DWasmEngineNew? wasmEngineNew,
|
||||
DWasmEngineDelete? wasmEngineDelete,
|
||||
}) : parserNew = parserNew ?? (() => nullptr),
|
||||
parserDelete = parserDelete ?? ((_) {}),
|
||||
parserSetLanguage = parserSetLanguage ?? ((_, __) => false),
|
||||
parserSetWasmStore = parserSetWasmStore ?? ((_, __) {}),
|
||||
parserParseString = parserParseString ?? ((_, __, ___, ____) => nullptr),
|
||||
treeDelete = treeDelete ?? ((_) {}),
|
||||
// Leaks a zeroed TSNode allocation — only hit when the test supplies
|
||||
// a non-null parserParseString without also supplying treeRootNode.
|
||||
treeRootNode = treeRootNode ?? ((_) => calloc<TSNode>().ref),
|
||||
nodeStartByte = nodeStartByte ?? ((_) => 0),
|
||||
nodeEndByte = nodeEndByte ?? ((_) => 0),
|
||||
queryNew = queryNew ?? ((_, __, ___, ____, _____) => nullptr),
|
||||
queryDelete = queryDelete ?? ((_) {}),
|
||||
queryCaptureCount = queryCaptureCount ?? ((_) => 0),
|
||||
queryCaptureNameForId = queryCaptureNameForId ?? ((_, __, ___) => nullptr),
|
||||
queryCursorNew = queryCursorNew ?? (() => nullptr),
|
||||
queryCursorDelete = queryCursorDelete ?? ((_) {}),
|
||||
queryCursorExec = queryCursorExec ?? ((_, __, ___) {}),
|
||||
queryCursorNextMatch = queryCursorNextMatch ?? ((_, __) => false),
|
||||
wasmStoreNew = wasmStoreNew ?? ((_, __) => nullptr),
|
||||
wasmStoreDelete = wasmStoreDelete ?? ((_) {}),
|
||||
wasmStoreLoadLanguage = wasmStoreLoadLanguage ?? ((_, __, ___, ____, _____) => nullptr),
|
||||
wasmEngineNew = wasmEngineNew ?? (() => nullptr),
|
||||
wasmEngineDelete = wasmEngineDelete ?? ((_) {});
|
||||
|
||||
final DTsParserNew parserNew;
|
||||
final DTsParserDelete parserDelete;
|
||||
final DTsParserSetLanguage parserSetLanguage;
|
||||
@@ -181,6 +236,13 @@ class TreeSitterLib {
|
||||
return true;
|
||||
}
|
||||
|
||||
/// Constructs a [TreeSitterLib] from an already-loaded [DynamicLibrary].
|
||||
/// Used by the smoke test to dlopen the vendored `libtree-sitter.so`
|
||||
/// directly without going through the global `init()` / `_instance`
|
||||
/// dance, so the test stays isolated from the singleton.
|
||||
@visibleForTesting
|
||||
static TreeSitterLib fromDynamicLibrary(DynamicLibrary lib) => TreeSitterLib._(lib);
|
||||
|
||||
static DynamicLibrary? _openLibrary() {
|
||||
final libName = Platform.isLinux
|
||||
? 'libtree-sitter.so'
|
||||
|
||||
@@ -8,8 +8,17 @@ import 'package:clide/kernel/src/syntax/language_map.dart';
|
||||
import 'package:clide/kernel/src/syntax/tree_sitter_ffi.dart';
|
||||
import 'package:clide/kernel/src/theme/tokens.dart';
|
||||
import 'package:ffi/ffi.dart';
|
||||
import 'package:flutter/foundation.dart';
|
||||
import 'package:flutter/services.dart' show rootBundle;
|
||||
|
||||
/// Loads grammar WASM bytes for [language] (e.g. "dart" → `dart.wasm`).
|
||||
/// Throws on missing or unreadable assets.
|
||||
typedef GrammarBytesLoader = Future<Uint8List> Function(String language);
|
||||
|
||||
/// Loads the highlight query (`.scm` source) for [language], or returns
|
||||
/// null if no query is bundled for it.
|
||||
typedef GrammarQueryLoader = Future<String?> Function(String language);
|
||||
|
||||
class SyntaxSpan {
|
||||
const SyntaxSpan({
|
||||
required this.start,
|
||||
@@ -42,8 +51,37 @@ class _LoadedGrammar {
|
||||
}
|
||||
|
||||
class TreeSitterService {
|
||||
static final TreeSitterService shared = TreeSitterService._();
|
||||
TreeSitterService._();
|
||||
static final TreeSitterService shared = TreeSitterService();
|
||||
|
||||
/// Production constructor: uses the dlopen'd [TreeSitterLib.instance] and
|
||||
/// the Flutter [rootBundle]. Tests pass [lib] / [grammarBytes] /
|
||||
/// [grammarQuery] to substitute a fake FFI surface and in-memory assets.
|
||||
TreeSitterService({
|
||||
TreeSitterLib? lib,
|
||||
GrammarBytesLoader? grammarBytes,
|
||||
GrammarQueryLoader? grammarQuery,
|
||||
}) : _injectedLib = lib,
|
||||
_grammarBytes = grammarBytes ?? _defaultGrammarBytes,
|
||||
_grammarQuery = grammarQuery ?? _defaultGrammarQuery;
|
||||
|
||||
final TreeSitterLib? _injectedLib;
|
||||
final GrammarBytesLoader _grammarBytes;
|
||||
final GrammarQueryLoader _grammarQuery;
|
||||
|
||||
TreeSitterLib? get _lib => _injectedLib ?? TreeSitterLib.instance;
|
||||
|
||||
static Future<Uint8List> _defaultGrammarBytes(String language) async {
|
||||
final data = await rootBundle.load('assets/grammars/$language.wasm');
|
||||
return data.buffer.asUint8List();
|
||||
}
|
||||
|
||||
static Future<String?> _defaultGrammarQuery(String language) async {
|
||||
try {
|
||||
return await rootBundle.loadString('assets/queries/$language.scm');
|
||||
} catch (_) {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
final Map<String, _LoadedGrammar> _grammars = {};
|
||||
final Set<String> _unavailable = {};
|
||||
@@ -58,7 +96,7 @@ class TreeSitterService {
|
||||
if (_initDone) return _parser != null;
|
||||
_initDone = true;
|
||||
|
||||
final lib = TreeSitterLib.instance;
|
||||
final lib = _lib;
|
||||
if (lib == null) return false;
|
||||
|
||||
final engine = lib.wasmEngineNew();
|
||||
@@ -92,12 +130,11 @@ class TreeSitterService {
|
||||
return null;
|
||||
}
|
||||
|
||||
final lib = TreeSitterLib.instance!;
|
||||
final lib = _lib!;
|
||||
|
||||
try {
|
||||
// Load grammar WASM bytes.
|
||||
final wasmData = await rootBundle.load('assets/grammars/$language.wasm');
|
||||
final wasmBytes = wasmData.buffer.asUint8List();
|
||||
final wasmBytes = await _grammarBytes(language);
|
||||
|
||||
// Load into WASM store.
|
||||
final nameNative = language.toNativeUtf8();
|
||||
@@ -126,10 +163,7 @@ class TreeSitterService {
|
||||
calloc.free(error);
|
||||
|
||||
// Load highlight query.
|
||||
String? querySource;
|
||||
try {
|
||||
querySource = await rootBundle.loadString('assets/queries/$language.scm');
|
||||
} catch (_) {}
|
||||
final querySource = await _grammarQuery(language);
|
||||
|
||||
Pointer<TSQuery> query = nullptr;
|
||||
List<String> captureNames = [];
|
||||
@@ -200,7 +234,7 @@ class TreeSitterService {
|
||||
return SyntaxResult.empty;
|
||||
}
|
||||
|
||||
final lib = TreeSitterLib.instance!;
|
||||
final lib = _lib!;
|
||||
final parser = _parser!;
|
||||
final cursor = _cursor!;
|
||||
|
||||
@@ -253,7 +287,7 @@ class TreeSitterService {
|
||||
}
|
||||
|
||||
void dispose() {
|
||||
final lib = TreeSitterLib.instance;
|
||||
final lib = _lib;
|
||||
if (lib == null) return;
|
||||
|
||||
for (final grammar in _grammars.values) {
|
||||
@@ -273,6 +307,15 @@ class TreeSitterService {
|
||||
_unavailable.clear();
|
||||
}
|
||||
|
||||
/// Resets the service to a pre-init state. Tests use this to re-exercise
|
||||
/// `_init()` without constructing a new singleton; production code never
|
||||
/// needs it.
|
||||
@visibleForTesting
|
||||
void resetForTests() {
|
||||
dispose();
|
||||
_initDone = false;
|
||||
}
|
||||
|
||||
static Color colorForRole(String role, SurfaceTokens tokens) {
|
||||
return switch (role) {
|
||||
'keyword' || 'repeat' || 'conditional' || 'include' || 'exception' || 'operator' => tokens.syntaxKeyword,
|
||||
|
||||
+18
-140
@@ -3,31 +3,21 @@
|
||||
/// Resolution runs in a background isolate via [Toolchain.resolvePaths]
|
||||
/// to avoid blocking the merged UI/platform thread on macOS. The result
|
||||
/// is applied on the main thread via [Toolchain.applyResolved].
|
||||
///
|
||||
/// The Flutter-free data types ([ResolvedPaths], [ToolchainView]) and
|
||||
/// the isolate-side resolver ([resolveToolchainPaths]) live in
|
||||
/// `toolchain_paths.dart` and are re-exported here for convenience.
|
||||
library;
|
||||
|
||||
import 'dart:async';
|
||||
import 'dart:io';
|
||||
|
||||
import 'package:flutter/foundation.dart';
|
||||
|
||||
/// Serializable result of tool resolution (crosses isolate boundary).
|
||||
class ResolvedPaths {
|
||||
const ResolvedPaths({
|
||||
this.git,
|
||||
this.pql,
|
||||
this.tmux,
|
||||
this.shell,
|
||||
this.gitEnv,
|
||||
});
|
||||
import 'toolchain_paths.dart';
|
||||
|
||||
final String? git;
|
||||
final String? pql;
|
||||
final String? tmux;
|
||||
final String? shell;
|
||||
final Map<String, String>? gitEnv;
|
||||
}
|
||||
export 'toolchain_paths.dart';
|
||||
|
||||
class Toolchain extends ChangeNotifier {
|
||||
class Toolchain extends ChangeNotifier implements ToolchainView {
|
||||
String? _git;
|
||||
String? _pql;
|
||||
String? _tmux;
|
||||
@@ -35,17 +25,25 @@ class Toolchain extends ChangeNotifier {
|
||||
Map<String, String>? _gitEnv;
|
||||
bool _resolved = false;
|
||||
|
||||
@override
|
||||
String get git => _git ?? 'git';
|
||||
@override
|
||||
String get pql => _pql ?? 'pql';
|
||||
@override
|
||||
String get tmux => _tmux ?? 'tmux';
|
||||
@override
|
||||
String get shell => _shell ?? '/bin/bash';
|
||||
|
||||
/// Extra environment variables for git (e.g. GIT_EXEC_PATH for dugite).
|
||||
@override
|
||||
Map<String, String>? get gitEnv => _gitEnv;
|
||||
|
||||
@override
|
||||
bool get resolved => _resolved;
|
||||
@override
|
||||
bool get allOk => _resolved && missing.isEmpty;
|
||||
|
||||
@override
|
||||
List<String> get missing => [
|
||||
if (_git == null) 'git',
|
||||
if (_pql == null) 'pql',
|
||||
@@ -79,127 +77,7 @@ class Toolchain extends ChangeNotifier {
|
||||
}
|
||||
|
||||
/// Pure function — runs in a background isolate. All file I/O happens
|
||||
/// here, off the main thread.
|
||||
static ResolvedPaths resolvePaths({required String workspaceRoot}) {
|
||||
final dugite = '$workspaceRoot/native/dugite/bin';
|
||||
|
||||
String? git;
|
||||
Map<String, String>? gitEnv;
|
||||
final dugiteGit = _firstExisting(['$dugite/git']);
|
||||
if (dugiteGit != null) {
|
||||
git = dugiteGit;
|
||||
final dugiteRoot = File(dugiteGit).parent.parent.path;
|
||||
gitEnv = {
|
||||
'GIT_EXEC_PATH': '$dugiteRoot/libexec/git-core',
|
||||
'GIT_TEMPLATE_DIR': '$dugiteRoot/share/git-core/templates',
|
||||
};
|
||||
} else {
|
||||
git = _findOnPath('git');
|
||||
}
|
||||
|
||||
final pql = _findOnPath('pql');
|
||||
final tmux = _findOnPath('tmux');
|
||||
final shell = _findOnPath(Platform.environment['SHELL']?.split('/').last ?? 'bash');
|
||||
|
||||
return ResolvedPaths(
|
||||
git: git,
|
||||
pql: pql,
|
||||
tmux: tmux,
|
||||
shell: shell,
|
||||
gitEnv: gitEnv,
|
||||
);
|
||||
}
|
||||
|
||||
static String? _findOnPath(String name) {
|
||||
for (final dir in _expandedPath().split(':')) {
|
||||
if (dir.isEmpty) continue;
|
||||
final f = File('$dir/$name');
|
||||
if (f.existsSync()) return f.path;
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
/// Build expanded PATH inline — must be self-contained for isolate use.
|
||||
static String _expandedPath() {
|
||||
final base = Platform.environment['PATH'] ?? '';
|
||||
if (!Platform.isMacOS) return base;
|
||||
final home = Platform.environment['HOME'] ?? '';
|
||||
final extras = <String>[
|
||||
if (home.isNotEmpty) '$home/.local/bin',
|
||||
'/opt/homebrew/bin',
|
||||
'/opt/homebrew/sbin',
|
||||
'/usr/local/bin',
|
||||
];
|
||||
final existing = base.split(':').toSet();
|
||||
final missing = extras.where((p) => !existing.contains(p));
|
||||
if (missing.isEmpty) return base;
|
||||
return [...missing, ...existing].join(':');
|
||||
}
|
||||
|
||||
static String? _firstExisting(List<String> candidates) {
|
||||
for (final c in candidates) {
|
||||
if (File(c).existsSync()) return c;
|
||||
}
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
/// Top-level function for compute/isolate use. Takes a single String
|
||||
/// argument (the workspace root) and returns a plain-data result.
|
||||
ResolvedPaths resolveToolchainPaths(String workspaceRoot) {
|
||||
final dugite = '$workspaceRoot/native/dugite/bin';
|
||||
|
||||
String? git;
|
||||
Map<String, String>? gitEnv;
|
||||
final dugiteGit = _firstExistingStandalone(['$dugite/git']);
|
||||
if (dugiteGit != null) {
|
||||
git = dugiteGit;
|
||||
final dugiteRoot = File(dugiteGit).parent.parent.path;
|
||||
gitEnv = {
|
||||
'GIT_EXEC_PATH': '$dugiteRoot/libexec/git-core',
|
||||
'GIT_TEMPLATE_DIR': '$dugiteRoot/share/git-core/templates',
|
||||
};
|
||||
} else {
|
||||
git = _findOnPathStandalone('git');
|
||||
}
|
||||
|
||||
return ResolvedPaths(
|
||||
git: git,
|
||||
pql: _findOnPathStandalone('pql'),
|
||||
tmux: _findOnPathStandalone('tmux'),
|
||||
shell: _findOnPathStandalone(Platform.environment['SHELL']?.split('/').last ?? 'bash'),
|
||||
gitEnv: gitEnv,
|
||||
);
|
||||
}
|
||||
|
||||
String? _findOnPathStandalone(String name) {
|
||||
for (final dir in _expandedPathStandalone().split(':')) {
|
||||
if (dir.isEmpty) continue;
|
||||
final f = File('$dir/$name');
|
||||
if (f.existsSync()) return f.path;
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
String? _firstExistingStandalone(List<String> candidates) {
|
||||
for (final c in candidates) {
|
||||
if (File(c).existsSync()) return c;
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
String _expandedPathStandalone() {
|
||||
final base = Platform.environment['PATH'] ?? '';
|
||||
if (!Platform.isMacOS) return base;
|
||||
final home = Platform.environment['HOME'] ?? '';
|
||||
final extras = <String>[
|
||||
if (home.isNotEmpty) '$home/.local/bin',
|
||||
'/opt/homebrew/bin',
|
||||
'/opt/homebrew/sbin',
|
||||
'/usr/local/bin',
|
||||
];
|
||||
final existing = base.split(':').toSet();
|
||||
final missing = extras.where((p) => !existing.contains(p));
|
||||
if (missing.isEmpty) return base;
|
||||
return [...missing, ...existing].join(':');
|
||||
/// here, off the main thread. Delegates to the Flutter-free
|
||||
/// [resolveToolchainPaths]. Takes no workspace argument: see T-98.
|
||||
static ResolvedPaths resolvePaths() => resolveToolchainPaths();
|
||||
}
|
||||
|
||||
@@ -0,0 +1,162 @@
|
||||
/// Flutter-free toolchain data + resolution.
|
||||
///
|
||||
/// Split out of `toolchain.dart` so that pure-Dart consumers (the IPC
|
||||
/// subsystems exported through `package:clide/clide.dart`, e.g.
|
||||
/// [GitClient] and [PqlClient]) don't transitively pull in
|
||||
/// `package:flutter/foundation.dart`. The live, listenable `Toolchain`
|
||||
/// stays in `toolchain.dart`; everything here is plain Dart and runs
|
||||
/// fine under `dart test`.
|
||||
library;
|
||||
|
||||
import 'dart:io';
|
||||
|
||||
/// Serializable result of tool resolution (crosses isolate boundary).
|
||||
class ResolvedPaths {
|
||||
const ResolvedPaths({
|
||||
this.git,
|
||||
this.pql,
|
||||
this.tmux,
|
||||
this.shell,
|
||||
this.gitEnv,
|
||||
});
|
||||
|
||||
final String? git;
|
||||
final String? pql;
|
||||
final String? tmux;
|
||||
final String? shell;
|
||||
final Map<String, String>? gitEnv;
|
||||
}
|
||||
|
||||
/// Read-only view of resolved tool paths. The concrete `Toolchain`
|
||||
/// (in `toolchain.dart`) implements this on top of `ChangeNotifier`;
|
||||
/// pure-Dart clients depend on the interface so they stay Flutter-free.
|
||||
abstract class ToolchainView {
|
||||
/// A fixed, already-resolved view over [paths]. Flutter-free — handy
|
||||
/// for tests and isolate-side code that has a [ResolvedPaths] but no
|
||||
/// need for the listenable `Toolchain`.
|
||||
const factory ToolchainView.resolved(ResolvedPaths paths) = _StaticToolchain;
|
||||
|
||||
String get git;
|
||||
String get pql;
|
||||
String get tmux;
|
||||
String get shell;
|
||||
Map<String, String>? get gitEnv;
|
||||
bool get resolved;
|
||||
bool get allOk;
|
||||
List<String> get missing;
|
||||
}
|
||||
|
||||
class _StaticToolchain implements ToolchainView {
|
||||
const _StaticToolchain(this._paths);
|
||||
|
||||
final ResolvedPaths _paths;
|
||||
|
||||
@override
|
||||
String get git => _paths.git ?? 'git';
|
||||
@override
|
||||
String get pql => _paths.pql ?? 'pql';
|
||||
@override
|
||||
String get tmux => _paths.tmux ?? 'tmux';
|
||||
@override
|
||||
String get shell => _paths.shell ?? '/bin/bash';
|
||||
@override
|
||||
Map<String, String>? get gitEnv => _paths.gitEnv;
|
||||
@override
|
||||
bool get resolved => true;
|
||||
@override
|
||||
bool get allOk => missing.isEmpty;
|
||||
@override
|
||||
List<String> get missing => [
|
||||
if (_paths.git == null) 'git',
|
||||
if (_paths.pql == null) 'pql',
|
||||
if (_paths.tmux == null) 'tmux',
|
||||
];
|
||||
}
|
||||
|
||||
/// Top-level function for compute/isolate use. Returns a plain-data
|
||||
/// result with all tool paths resolved against trusted locations only.
|
||||
///
|
||||
/// Critically does NOT take a workspace path: per T-98, resolving the
|
||||
/// dugite-bundled git against the open workspace was a code-execution
|
||||
/// vector (a malicious repo could plant `native/dugite/bin/git`).
|
||||
/// Dugite is resolved against the install directory + an explicit env
|
||||
/// override; everything else comes from PATH.
|
||||
ResolvedPaths resolveToolchainPaths() {
|
||||
String? git;
|
||||
Map<String, String>? gitEnv;
|
||||
final dugiteGit = _resolveDugiteGit();
|
||||
if (dugiteGit != null) {
|
||||
git = dugiteGit;
|
||||
final dugiteRoot = File(dugiteGit).parent.parent.path;
|
||||
gitEnv = {
|
||||
'GIT_EXEC_PATH': '$dugiteRoot/libexec/git-core',
|
||||
'GIT_TEMPLATE_DIR': '$dugiteRoot/share/git-core/templates',
|
||||
};
|
||||
} else {
|
||||
git = _findOnPath('git');
|
||||
}
|
||||
|
||||
return ResolvedPaths(
|
||||
git: git,
|
||||
pql: _findOnPath('pql'),
|
||||
tmux: _findOnPath('tmux'),
|
||||
shell: _findOnPath(Platform.environment['SHELL']?.split('/').last ?? 'bash'),
|
||||
gitEnv: gitEnv,
|
||||
);
|
||||
}
|
||||
|
||||
/// Locate the dugite-bundled git binary in trusted install locations
|
||||
/// only. **Never inspects workspace-relative paths** — see T-98.
|
||||
///
|
||||
/// Search order:
|
||||
/// 1. `CLIDE_DUGITE_DIR` env var (dev override; points at a dugite
|
||||
/// root that contains `bin/git`).
|
||||
/// 2. `<exe-parent>/dugite/bin/git` — production bundle layout.
|
||||
/// 3. `<exe-parent>/lib/dugite/bin/git` — alternate bundle layout
|
||||
/// (mirrors Linux's INSTALL_BUNDLE_LIB_DIR convention).
|
||||
///
|
||||
/// Returns null if no dugite is found; caller falls back to PATH git.
|
||||
String? _resolveDugiteGit() {
|
||||
final candidates = <String>[];
|
||||
final envDir = Platform.environment['CLIDE_DUGITE_DIR'];
|
||||
if (envDir != null && envDir.isNotEmpty) {
|
||||
candidates.add('$envDir/bin/git');
|
||||
}
|
||||
final exeDir = File(Platform.resolvedExecutable).parent.path;
|
||||
candidates.add('$exeDir/dugite/bin/git');
|
||||
candidates.add('$exeDir/lib/dugite/bin/git');
|
||||
return _firstExisting(candidates);
|
||||
}
|
||||
|
||||
String? _findOnPath(String name) {
|
||||
for (final dir in _expandedPath().split(':')) {
|
||||
if (dir.isEmpty) continue;
|
||||
final f = File('$dir/$name');
|
||||
if (f.existsSync()) return f.path;
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
String? _firstExisting(List<String> candidates) {
|
||||
for (final c in candidates) {
|
||||
if (File(c).existsSync()) return c;
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
/// Build expanded PATH inline — must be self-contained for isolate use.
|
||||
String _expandedPath() {
|
||||
final base = Platform.environment['PATH'] ?? '';
|
||||
if (!Platform.isMacOS) return base;
|
||||
final home = Platform.environment['HOME'] ?? '';
|
||||
final extras = <String>[
|
||||
if (home.isNotEmpty) '$home/.local/bin',
|
||||
'/opt/homebrew/bin',
|
||||
'/opt/homebrew/sbin',
|
||||
'/usr/local/bin',
|
||||
];
|
||||
final existing = base.split(':').toSet();
|
||||
final missing = extras.where((p) => !existing.contains(p));
|
||||
if (missing.isEmpty) return base;
|
||||
return [...missing, ...existing].join(':');
|
||||
}
|
||||
+1
-3
@@ -65,9 +65,7 @@ Future<void> main() async {
|
||||
// With proper signing (Developer ID), no sandbox or isolate needed.
|
||||
final toolchain = Toolchain();
|
||||
if (!kIsWeb) {
|
||||
const workspace = String.fromEnvironment('CLIDE_PROJECT');
|
||||
final root = workspace.isNotEmpty ? workspace : Directory.current.path;
|
||||
toolchain.applyResolved(resolveToolchainPaths(root));
|
||||
toolchain.applyResolved(resolveToolchainPaths());
|
||||
}
|
||||
|
||||
InProcessClient? ipcClient;
|
||||
|
||||
@@ -74,7 +74,9 @@ void registerFilesCommands(DaemonDispatcher d, FilesService files) {
|
||||
}
|
||||
final String absPath;
|
||||
try {
|
||||
absPath = resolveUnderRoot(files.root, path);
|
||||
// Follow symlinks + re-check containment so a `config -> /etc/shadow`
|
||||
// symlink under the workspace can't be read (T-102).
|
||||
absPath = resolveUnderRootFollowingSymlinks(files.root, path);
|
||||
} on PathOutsideRoot {
|
||||
return IpcResponse.err(id: req.id, error: IpcError(code: IpcExitCode.toolError, kind: IpcErrorKind.toolError, message: 'path outside workspace: $path'));
|
||||
}
|
||||
@@ -90,7 +92,7 @@ void registerFilesCommands(DaemonDispatcher d, FilesService files) {
|
||||
final dir = (req.args['path'] as String?) ?? '';
|
||||
if (dir.isNotEmpty) {
|
||||
try {
|
||||
resolveUnderRoot(files.root, dir);
|
||||
resolveUnderRootFollowingSymlinks(files.root, dir);
|
||||
} on PathOutsideRoot {
|
||||
return IpcResponse.err(id: req.id, error: IpcError(code: IpcExitCode.toolError, kind: IpcErrorKind.toolError, message: 'path outside workspace: $dir'));
|
||||
}
|
||||
|
||||
@@ -18,6 +18,12 @@ class PathOutsideRoot implements Exception {
|
||||
/// Resolve [relative] against [root] and verify the result is
|
||||
/// contained within [root]. Returns the absolute, normalized path.
|
||||
/// Throws [PathOutsideRoot] on traversal attempts.
|
||||
///
|
||||
/// Path-layer check only — does NOT follow symlinks. Callers that
|
||||
/// read or list the filesystem should use [resolveUnderRootFollowingSymlinks]
|
||||
/// instead, which adds a second containment check against the real
|
||||
/// path. The two-step split exists so pure path math can be tested
|
||||
/// without touching disk (T-102).
|
||||
String resolveUnderRoot(Directory root, String relative) {
|
||||
final rootPath = _normalize(root.absolute.path);
|
||||
final joined = _normalize('$rootPath${Platform.pathSeparator}$relative');
|
||||
@@ -32,6 +38,33 @@ String resolveUnderRoot(Directory root, String relative) {
|
||||
return joined;
|
||||
}
|
||||
|
||||
/// Like [resolveUnderRoot] but also resolves any symlinks at the
|
||||
/// target and re-verifies containment against the real path. Use this
|
||||
/// for any operation that will read/list/write the filesystem — the
|
||||
/// path-layer check alone does not defend against a symlink under the
|
||||
/// workspace whose target lives outside (T-102, e.g. `config ->
|
||||
/// /etc/shadow`).
|
||||
///
|
||||
/// Returns the **resolved real path** (with symlinks followed) when
|
||||
/// the target exists. When the target does not exist, returns the
|
||||
/// path-layer result so callers surface a clean "not found" error from
|
||||
/// their filesystem op (rather than this layer throwing first).
|
||||
///
|
||||
/// Symlinks in the workspace root path itself are tolerated: both
|
||||
/// sides of the containment check are resolved.
|
||||
String resolveUnderRootFollowingSymlinks(Directory root, String relative) {
|
||||
final pathResolved = resolveUnderRoot(root, relative);
|
||||
if (FileSystemEntity.typeSync(pathResolved, followLinks: false) == FileSystemEntityType.notFound) {
|
||||
return pathResolved;
|
||||
}
|
||||
final realRoot = Directory(root.absolute.path).resolveSymbolicLinksSync();
|
||||
final realPath = File(pathResolved).resolveSymbolicLinksSync();
|
||||
if (realPath != realRoot && !realPath.startsWith('$realRoot${Platform.pathSeparator}')) {
|
||||
throw PathOutsideRoot(relative, realPath, realRoot);
|
||||
}
|
||||
return realPath;
|
||||
}
|
||||
|
||||
String _normalize(String path) {
|
||||
// Use Uri to collapse `..` and `.` segments without hitting the
|
||||
// filesystem (Directory(...).resolveSymbolicLinksSync would also
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
/// Typed git client backed by [Toolchain].
|
||||
/// Typed git client backed by a [ToolchainView].
|
||||
///
|
||||
/// Every subprocess call goes through [_run] which uses the resolved
|
||||
/// absolute binary path from the toolchain. Parsing is delegated to
|
||||
@@ -7,7 +7,7 @@ library;
|
||||
|
||||
import 'dart:io';
|
||||
|
||||
import '../../kernel/src/toolchain.dart';
|
||||
import '../../kernel/src/toolchain_paths.dart';
|
||||
import 'diff.dart' show GitDiff, parseDiffOutput;
|
||||
import 'operations.dart' show GitException, GitLogEntry;
|
||||
import 'status.dart';
|
||||
@@ -15,7 +15,7 @@ import 'status.dart';
|
||||
class GitClient {
|
||||
GitClient({required this.toolchain, required this.workDir});
|
||||
|
||||
final Toolchain toolchain;
|
||||
final ToolchainView toolchain;
|
||||
final Directory workDir;
|
||||
|
||||
// -- queries --------------------------------------------------------------
|
||||
|
||||
@@ -8,7 +8,7 @@ library;
|
||||
import 'dart:convert';
|
||||
import 'dart:io';
|
||||
|
||||
import '../../kernel/src/toolchain.dart';
|
||||
import '../../kernel/src/toolchain_paths.dart';
|
||||
|
||||
class PqlException implements Exception {
|
||||
const PqlException(this.message, {this.exitCode = 1, this.stderr = ''});
|
||||
@@ -24,7 +24,7 @@ class PqlClient {
|
||||
PqlClient({required this.workDir, required this.toolchain});
|
||||
|
||||
final Directory workDir;
|
||||
final Toolchain toolchain;
|
||||
final ToolchainView toolchain;
|
||||
|
||||
Future<List<Map<String, Object?>>> files({String? glob, int? limit}) async {
|
||||
final args = ['files'];
|
||||
|
||||
@@ -5,9 +5,9 @@
|
||||
/// core library stays Flutter-free per D-005.
|
||||
library;
|
||||
|
||||
/// A PTY operation failed. [op] identifies the step (`forkpty`,
|
||||
/// `read`, `ioctl`, etc.); [errno] is POSIX errno when the failure
|
||||
/// came from a syscall, otherwise `null`.
|
||||
/// A PTY operation failed. [op] identifies the step (`posix_openpt`,
|
||||
/// `posix_spawn`, `read`, `ioctl`, etc.); [errno] is POSIX errno when
|
||||
/// the failure came from a syscall, otherwise `null`.
|
||||
class PtyException implements Exception {
|
||||
const PtyException(this.op, this.message, {this.errno});
|
||||
|
||||
|
||||
+196
-124
@@ -1,11 +1,19 @@
|
||||
/// Native PTY via forkpty().
|
||||
/// Native PTY via posix_openpt() + posix_spawn().
|
||||
///
|
||||
/// Uses Dart FFI to call forkpty() directly. The master fd stays
|
||||
/// in-process. The reader isolate uses poll() for clean shutdown.
|
||||
/// Originally used `forkpty()`, which calls `fork()` underneath. `fork()`
|
||||
/// in a multithreaded process is unsafe: only the calling thread survives
|
||||
/// in the child, but libc locks (notably `malloc`) held by other threads
|
||||
/// remain "locked forever." With the multi-threaded Dart VM as the
|
||||
/// parent, ~5% of spawns deadlocked in the child before `execve` (see
|
||||
/// T-96).
|
||||
///
|
||||
/// Based on the pty-spike proof-of-concept. Platform-aware:
|
||||
/// macOS: forkpty in libSystem (DynamicLibrary.process)
|
||||
/// Linux: forkpty in libutil.so.1
|
||||
/// `posix_spawn()` uses `vfork()` on glibc/musl/macOS, which keeps the
|
||||
/// parent suspended until `execve` completes — no Dart code runs in the
|
||||
/// child, so the lock-deadlock window is closed. The pty is created via
|
||||
/// the POSIX-standard `posix_openpt` / `grantpt` / `unlockpt` /
|
||||
/// `ptsname` sequence instead of the BSD `forkpty` wrapper.
|
||||
///
|
||||
/// All symbols live in libc (resolved via `DynamicLibrary.process()`).
|
||||
library;
|
||||
|
||||
import 'dart:async';
|
||||
@@ -43,38 +51,62 @@ final class _Pollfd extends ffi.Struct {
|
||||
|
||||
// -- FFI bindings -----------------------------------------------------------
|
||||
|
||||
final ffi.DynamicLibrary _dl = _openLib();
|
||||
final ffi.DynamicLibrary _dl = ffi.DynamicLibrary.process();
|
||||
|
||||
ffi.DynamicLibrary _openLib() {
|
||||
if (Platform.isMacOS) return ffi.DynamicLibrary.process();
|
||||
// Linux: forkpty lives in libutil
|
||||
return ffi.DynamicLibrary.open('libutil.so.1');
|
||||
}
|
||||
// pty open/setup (POSIX).
|
||||
final _posixOpenpt = _dl.lookupFunction<ffi.Int32 Function(ffi.Int32), int Function(int)>('posix_openpt');
|
||||
final _grantpt = _dl.lookupFunction<ffi.Int32 Function(ffi.Int32), int Function(int)>('grantpt');
|
||||
final _unlockpt = _dl.lookupFunction<ffi.Int32 Function(ffi.Int32), int Function(int)>('unlockpt');
|
||||
final _ptsname = _dl.lookupFunction<ffi.Pointer<Utf8> Function(ffi.Int32), ffi.Pointer<Utf8> Function(int)>('ptsname');
|
||||
|
||||
final _forkpty = _dl.lookupFunction<ffi.Int32 Function(ffi.Pointer<ffi.Int32>, ffi.Pointer<ffi.Char>, ffi.Pointer<ffi.Void>, ffi.Pointer<_Winsize>),
|
||||
int Function(ffi.Pointer<ffi.Int32>, ffi.Pointer<ffi.Char>, ffi.Pointer<ffi.Void>, ffi.Pointer<_Winsize>)>('forkpty');
|
||||
// posix_spawn family. The attr + file_actions structs are opaque to us
|
||||
// and platform-sized — we allocate a generous fixed buffer (8 KiB, far
|
||||
// larger than any documented platform layout) and pass it as Pointer<Void>.
|
||||
// init() writes the real layout into our memory; destroy() releases any
|
||||
// internal nested allocations.
|
||||
final _posixSpawn = _dl.lookupFunction<
|
||||
ffi.Int32 Function(ffi.Pointer<ffi.Int32>, ffi.Pointer<Utf8>, ffi.Pointer<ffi.Void>, ffi.Pointer<ffi.Void>, ffi.Pointer<ffi.Pointer<Utf8>>,
|
||||
ffi.Pointer<ffi.Pointer<Utf8>>),
|
||||
int Function(ffi.Pointer<ffi.Int32>, ffi.Pointer<Utf8>, ffi.Pointer<ffi.Void>, ffi.Pointer<ffi.Void>, ffi.Pointer<ffi.Pointer<Utf8>>,
|
||||
ffi.Pointer<ffi.Pointer<Utf8>>)>('posix_spawn');
|
||||
|
||||
final _execve = _dl.lookupFunction<ffi.Int32 Function(ffi.Pointer<ffi.Char>, ffi.Pointer<ffi.Pointer<ffi.Char>>, ffi.Pointer<ffi.Pointer<ffi.Char>>),
|
||||
int Function(ffi.Pointer<ffi.Char>, ffi.Pointer<ffi.Pointer<ffi.Char>>, ffi.Pointer<ffi.Pointer<ffi.Char>>)>('execve');
|
||||
final _spawnattrInit = _dl.lookupFunction<ffi.Int32 Function(ffi.Pointer<ffi.Void>), int Function(ffi.Pointer<ffi.Void>)>('posix_spawnattr_init');
|
||||
final _spawnattrDestroy = _dl.lookupFunction<ffi.Int32 Function(ffi.Pointer<ffi.Void>), int Function(ffi.Pointer<ffi.Void>)>('posix_spawnattr_destroy');
|
||||
final _spawnattrSetflags =
|
||||
_dl.lookupFunction<ffi.Int32 Function(ffi.Pointer<ffi.Void>, ffi.Int16), int Function(ffi.Pointer<ffi.Void>, int)>('posix_spawnattr_setflags');
|
||||
|
||||
final _nativeWrite = ffi.DynamicLibrary.process()
|
||||
.lookupFunction<ffi.IntPtr Function(ffi.Int32, ffi.Pointer<ffi.Void>, ffi.IntPtr), int Function(int, ffi.Pointer<ffi.Void>, int)>('write');
|
||||
final _faInit = _dl.lookupFunction<ffi.Int32 Function(ffi.Pointer<ffi.Void>), int Function(ffi.Pointer<ffi.Void>)>('posix_spawn_file_actions_init');
|
||||
final _faDestroy = _dl.lookupFunction<ffi.Int32 Function(ffi.Pointer<ffi.Void>), int Function(ffi.Pointer<ffi.Void>)>('posix_spawn_file_actions_destroy');
|
||||
final _faAddopen = _dl.lookupFunction<ffi.Int32 Function(ffi.Pointer<ffi.Void>, ffi.Int32, ffi.Pointer<Utf8>, ffi.Int32, ffi.Uint32),
|
||||
int Function(ffi.Pointer<ffi.Void>, int, ffi.Pointer<Utf8>, int, int)>('posix_spawn_file_actions_addopen');
|
||||
final _faAdddup2 = _dl.lookupFunction<ffi.Int32 Function(ffi.Pointer<ffi.Void>, ffi.Int32, ffi.Int32), int Function(ffi.Pointer<ffi.Void>, int, int)>(
|
||||
'posix_spawn_file_actions_adddup2');
|
||||
final _faAddclose =
|
||||
_dl.lookupFunction<ffi.Int32 Function(ffi.Pointer<ffi.Void>, ffi.Int32), int Function(ffi.Pointer<ffi.Void>, int)>('posix_spawn_file_actions_addclose');
|
||||
// glibc 2.29+ / macOS 10.15+. Both ship the `_np` suffix.
|
||||
final _faAddchdir = _dl.lookupFunction<ffi.Int32 Function(ffi.Pointer<ffi.Void>, ffi.Pointer<Utf8>), int Function(ffi.Pointer<ffi.Void>, ffi.Pointer<Utf8>)>(
|
||||
'posix_spawn_file_actions_addchdir_np');
|
||||
|
||||
final _nativeClose = ffi.DynamicLibrary.process().lookupFunction<ffi.Int32 Function(ffi.Int32), int Function(int)>('close');
|
||||
|
||||
final _ioctl = ffi.DynamicLibrary.process()
|
||||
.lookupFunction<ffi.Int32 Function(ffi.Int32, ffi.UnsignedLong, ffi.Pointer<_Winsize>), int Function(int, int, ffi.Pointer<_Winsize>)>('ioctl');
|
||||
|
||||
final _nativeKill = ffi.DynamicLibrary.process().lookupFunction<ffi.Int32 Function(ffi.Int32, ffi.Int32), int Function(int, int)>('kill');
|
||||
|
||||
final _waitpid = ffi.DynamicLibrary.process()
|
||||
.lookupFunction<ffi.Int32 Function(ffi.Int32, ffi.Pointer<ffi.Int32>, ffi.Int32), int Function(int, ffi.Pointer<ffi.Int32>, int)>('waitpid');
|
||||
|
||||
final _chdir = ffi.DynamicLibrary.process().lookupFunction<ffi.Int32 Function(ffi.Pointer<ffi.Char>), int Function(ffi.Pointer<ffi.Char>)>('chdir');
|
||||
|
||||
final _exit_ = ffi.DynamicLibrary.process().lookupFunction<ffi.Void Function(ffi.Int32), void Function(int)>('_exit');
|
||||
// libc primitives shared with the reader isolate / lifecycle.
|
||||
final _nativeWrite =
|
||||
_dl.lookupFunction<ffi.IntPtr Function(ffi.Int32, ffi.Pointer<ffi.Void>, ffi.IntPtr), int Function(int, ffi.Pointer<ffi.Void>, int)>('write');
|
||||
final _nativeClose = _dl.lookupFunction<ffi.Int32 Function(ffi.Int32), int Function(int)>('close');
|
||||
final _ioctl =
|
||||
_dl.lookupFunction<ffi.Int32 Function(ffi.Int32, ffi.UnsignedLong, ffi.Pointer<_Winsize>), int Function(int, int, ffi.Pointer<_Winsize>)>('ioctl');
|
||||
final _nativeKill = _dl.lookupFunction<ffi.Int32 Function(ffi.Int32, ffi.Int32), int Function(int, int)>('kill');
|
||||
final _waitpid =
|
||||
_dl.lookupFunction<ffi.Int32 Function(ffi.Int32, ffi.Pointer<ffi.Int32>, ffi.Int32), int Function(int, ffi.Pointer<ffi.Int32>, int)>('waitpid');
|
||||
|
||||
// Constants — all duplicated from <fcntl.h>, <sys/ioctl.h>, <spawn.h>.
|
||||
final int _kTiocsWinsz = Platform.isMacOS ? 0x80087467 : 0x5414;
|
||||
const int _kORdwr = 0x0002;
|
||||
final int _kONoctty = Platform.isMacOS ? 0x20000 : 0x0100;
|
||||
// POSIX_SPAWN_SETSID — glibc 2.26+ (0x80), macOS 10.15+ (0x400).
|
||||
final int _kSpawnSetsid = Platform.isMacOS ? 0x400 : 0x80;
|
||||
// Opaque struct buffer size: ample headroom above every documented
|
||||
// platform layout (glibc posix_spawnattr_t is 336 B; macOS even smaller).
|
||||
const int _kSpawnStructBytes = 8192;
|
||||
|
||||
const _kSighup = 1;
|
||||
const _kWnohang = 1;
|
||||
|
||||
@@ -104,7 +136,11 @@ class NativePty {
|
||||
/// Spawn a new PTY running [executable] with [arguments].
|
||||
///
|
||||
/// [environment] must be the complete environment — it goes straight
|
||||
/// to execve's envp. Merge Platform.environment before calling.
|
||||
/// to the spawn's envp. Merge `Platform.environment` before calling.
|
||||
///
|
||||
/// Uses `posix_openpt` + `posix_spawn` (via libc's `vfork`-backed
|
||||
/// implementation) so no Dart code runs between fork and execve —
|
||||
/// see the library docstring and T-96.
|
||||
static NativePty start({
|
||||
required String executable,
|
||||
List<String> arguments = const ['-l'],
|
||||
@@ -113,7 +149,9 @@ class NativePty {
|
||||
String? workingDirectory,
|
||||
Map<String, String> environment = const {},
|
||||
}) {
|
||||
// Resolve bare command names via PATH (execve doesn't search PATH).
|
||||
// Resolve bare command names via PATH (posix_spawn requires an absolute
|
||||
// or relative path — posix_spawnp would search PATH for us but we want
|
||||
// resolution to be visible/debuggable from Dart).
|
||||
if (!executable.contains('/')) {
|
||||
final path = environment['PATH'] ?? Platform.environment['PATH'] ?? '';
|
||||
for (final dir in path.split(':')) {
|
||||
@@ -126,106 +164,136 @@ class NativePty {
|
||||
}
|
||||
}
|
||||
|
||||
// Force-resolve FFI functions that run in the child process.
|
||||
// Top-level finals are lazy; touching them here ensures the FFI
|
||||
// trampolines are compiled before fork() clones the process.
|
||||
final execve = _execve;
|
||||
final chdir = _chdir;
|
||||
final exit = _exit_;
|
||||
final writeFn = _nativeWrite;
|
||||
|
||||
// Pre-allocate error envelopes the child will write to its stdout
|
||||
// (slave PTY → parent's master fd) before _exit, so the parent's
|
||||
// reader sees a real diagnostic instead of an indistinguishable EOF.
|
||||
final chdirErr = 'clide: chdir failed: $workingDirectory\n'.toNativeUtf8(allocator: malloc);
|
||||
final chdirErrLen = chdirErr.length;
|
||||
final execveErr = 'clide: exec failed: $executable\n'.toNativeUtf8(allocator: malloc);
|
||||
final execveErrLen = execveErr.length;
|
||||
|
||||
// Allocate ALL native memory before fork.
|
||||
final shellN = executable.toNativeUtf8(allocator: malloc).cast<ffi.Char>();
|
||||
// ---- Open the pty master ------------------------------------------
|
||||
final masterFd = _posixOpenpt(_kORdwr | _kONoctty);
|
||||
if (masterFd < 0) {
|
||||
throw PtyException('posix_openpt', 'posix_openpt failed', errno: libc.errno);
|
||||
}
|
||||
if (_grantpt(masterFd) != 0) {
|
||||
final err = libc.errno;
|
||||
_nativeClose(masterFd);
|
||||
throw PtyException('grantpt', 'grantpt failed', errno: err);
|
||||
}
|
||||
if (_unlockpt(masterFd) != 0) {
|
||||
final err = libc.errno;
|
||||
_nativeClose(masterFd);
|
||||
throw PtyException('unlockpt', 'unlockpt failed', errno: err);
|
||||
}
|
||||
final slavePtr = _ptsname(masterFd);
|
||||
if (slavePtr == ffi.nullptr) {
|
||||
_nativeClose(masterFd);
|
||||
throw PtyException('ptsname', 'ptsname returned null');
|
||||
}
|
||||
// ptsname returns a pointer into a static (or thread-local) libc
|
||||
// buffer; copy to a Dart-owned native string before any other libc
|
||||
// call that might overwrite it.
|
||||
final slavePath = slavePtr.toDartString().toNativeUtf8(allocator: malloc);
|
||||
|
||||
// ---- Marshal argv + envp -----------------------------------------
|
||||
final exeN = executable.toNativeUtf8(allocator: malloc);
|
||||
final allArgs = [executable, ...arguments];
|
||||
final argvN = malloc<ffi.Pointer<ffi.Char>>(allArgs.length + 1);
|
||||
final argvN = malloc<ffi.Pointer<Utf8>>(allArgs.length + 1);
|
||||
for (var i = 0; i < allArgs.length; i++) {
|
||||
argvN[i] = allArgs[i].toNativeUtf8(allocator: malloc).cast();
|
||||
argvN[i] = allArgs[i].toNativeUtf8(allocator: malloc);
|
||||
}
|
||||
argvN[allArgs.length] = ffi.nullptr;
|
||||
|
||||
final envList = environment.entries.toList();
|
||||
final envpN = malloc<ffi.Pointer<ffi.Char>>(envList.length + 1);
|
||||
final envpN = malloc<ffi.Pointer<Utf8>>(envList.length + 1);
|
||||
for (var i = 0; i < envList.length; i++) {
|
||||
envpN[i] = '${envList[i].key}=${envList[i].value}'.toNativeUtf8(allocator: malloc).cast();
|
||||
envpN[i] = '${envList[i].key}=${envList[i].value}'.toNativeUtf8(allocator: malloc);
|
||||
}
|
||||
envpN[envList.length] = ffi.nullptr;
|
||||
|
||||
final wdN = (workingDirectory ?? '/').toNativeUtf8(allocator: malloc).cast<ffi.Char>();
|
||||
final fdOut = calloc<ffi.Int32>();
|
||||
final wdN = workingDirectory == null ? ffi.nullptr : workingDirectory.toNativeUtf8(allocator: malloc);
|
||||
|
||||
// ---- Build file_actions ------------------------------------------
|
||||
// Allocate as Uint8 so calloc treats it as a byte buffer; cast to
|
||||
// Pointer<Void> when handing off to the FFI calls.
|
||||
final fa = calloc<ffi.Uint8>(_kSpawnStructBytes).cast<ffi.Void>();
|
||||
final attr = calloc<ffi.Uint8>(_kSpawnStructBytes).cast<ffi.Void>();
|
||||
final pidOut = calloc<ffi.Int32>();
|
||||
|
||||
void freeAllInputs() {
|
||||
malloc.free(exeN);
|
||||
for (var i = 0; i < allArgs.length; i++) {
|
||||
malloc.free(argvN[i]);
|
||||
}
|
||||
malloc.free(argvN);
|
||||
for (var i = 0; i < envList.length; i++) {
|
||||
malloc.free(envpN[i]);
|
||||
}
|
||||
malloc.free(envpN);
|
||||
if (wdN != ffi.nullptr) malloc.free(wdN);
|
||||
malloc.free(slavePath);
|
||||
calloc.free(fa);
|
||||
calloc.free(attr);
|
||||
calloc.free(pidOut);
|
||||
}
|
||||
|
||||
if (_faInit(fa) != 0) {
|
||||
final err = libc.errno;
|
||||
_nativeClose(masterFd);
|
||||
freeAllInputs();
|
||||
throw PtyException('spawn_fa_init', 'posix_spawn_file_actions_init failed', errno: err);
|
||||
}
|
||||
if (_spawnattrInit(attr) != 0) {
|
||||
final err = libc.errno;
|
||||
_faDestroy(fa);
|
||||
_nativeClose(masterFd);
|
||||
freeAllInputs();
|
||||
throw PtyException('spawnattr_init', 'posix_spawnattr_init failed', errno: err);
|
||||
}
|
||||
|
||||
int rc = 0;
|
||||
rc |= _spawnattrSetflags(attr, _kSpawnSetsid);
|
||||
// Open the slave on fd 0 WITHOUT O_NOCTTY so it becomes the child's
|
||||
// controlling tty (the child is a fresh session leader courtesy of
|
||||
// POSIX_SPAWN_SETSID).
|
||||
rc |= _faAddopen(fa, 0, slavePath, _kORdwr, 0);
|
||||
rc |= _faAdddup2(fa, 0, 1);
|
||||
rc |= _faAdddup2(fa, 0, 2);
|
||||
// Don't leak the master fd into the child.
|
||||
rc |= _faAddclose(fa, masterFd);
|
||||
if (wdN != ffi.nullptr) {
|
||||
rc |= _faAddchdir(fa, wdN);
|
||||
}
|
||||
if (rc != 0) {
|
||||
_faDestroy(fa);
|
||||
_spawnattrDestroy(attr);
|
||||
_nativeClose(masterFd);
|
||||
freeAllInputs();
|
||||
throw PtyException('spawn_fa_setup', 'failed to compose posix_spawn actions', errno: libc.errno);
|
||||
}
|
||||
|
||||
// ---- Spawn -------------------------------------------------------
|
||||
final spawnRc = _posixSpawn(pidOut, exeN, fa, attr, argvN, envpN);
|
||||
final pid = pidOut.value;
|
||||
|
||||
_faDestroy(fa);
|
||||
_spawnattrDestroy(attr);
|
||||
|
||||
if (spawnRc != 0) {
|
||||
// posix_spawn returns the errno directly (does NOT set errno).
|
||||
_nativeClose(masterFd);
|
||||
freeAllInputs();
|
||||
throw PtyException('posix_spawn', 'posix_spawn failed', errno: spawnRc);
|
||||
}
|
||||
|
||||
// ---- Set initial winsize on the master ---------------------------
|
||||
final ws = calloc<_Winsize>()
|
||||
..ref.wsRow = rows
|
||||
..ref.wsCol = columns;
|
||||
_ioctl(masterFd, _kTiocsWinsz, ws);
|
||||
calloc.free(ws);
|
||||
|
||||
// Fork.
|
||||
final pid = _forkpty(fdOut, ffi.nullptr, ffi.nullptr, ws);
|
||||
freeAllInputs();
|
||||
|
||||
if (pid == -1) {
|
||||
// Capture errno BEFORE _freeAll — free() can clobber errno.
|
||||
final err = libc.errno;
|
||||
_freeAll(shellN, argvN, allArgs.length, envpN, envList.length, wdN, fdOut, ws);
|
||||
malloc.free(chdirErr);
|
||||
malloc.free(execveErr);
|
||||
throw PtyException('forkpty', 'forkpty() failed', errno: err);
|
||||
}
|
||||
|
||||
if (pid == 0) {
|
||||
// CHILD — only pre-resolved FFI calls, no Dart heap.
|
||||
// After forkpty(), fd 1 is the slave PTY connected back to the
|
||||
// parent's master fd, so write(1, ...) lands as readable output.
|
||||
if (chdir(wdN) != 0) {
|
||||
writeFn(1, chdirErr.cast(), chdirErrLen);
|
||||
exit(1);
|
||||
}
|
||||
execve(shellN, argvN, envpN);
|
||||
// execve only returns on failure.
|
||||
writeFn(1, execveErr.cast(), execveErrLen);
|
||||
exit(1);
|
||||
}
|
||||
|
||||
// PARENT
|
||||
final fd = fdOut.value;
|
||||
_freeAll(shellN, argvN, allArgs.length, envpN, envList.length, wdN, fdOut, ws);
|
||||
malloc.free(chdirErr);
|
||||
malloc.free(execveErr);
|
||||
|
||||
final pty = NativePty._(fd, pid);
|
||||
final pty = NativePty._(masterFd, pid);
|
||||
pty._spawnReader();
|
||||
return pty;
|
||||
}
|
||||
|
||||
static void _freeAll(
|
||||
ffi.Pointer shell,
|
||||
ffi.Pointer<ffi.Pointer<ffi.Char>> argv,
|
||||
int argc,
|
||||
ffi.Pointer<ffi.Pointer<ffi.Char>> envp,
|
||||
int envc,
|
||||
ffi.Pointer wd,
|
||||
ffi.Pointer fdOut,
|
||||
ffi.Pointer ws,
|
||||
) {
|
||||
malloc.free(shell);
|
||||
for (var i = 0; i < argc; i++) {
|
||||
malloc.free(argv[i]);
|
||||
}
|
||||
malloc.free(argv);
|
||||
for (var i = 0; i < envc; i++) {
|
||||
malloc.free(envp[i]);
|
||||
}
|
||||
malloc.free(envp);
|
||||
malloc.free(wd);
|
||||
calloc.free(fdOut);
|
||||
calloc.free(ws);
|
||||
}
|
||||
|
||||
// -- I/O ------------------------------------------------------------------
|
||||
|
||||
void _spawnReader() {
|
||||
@@ -236,6 +304,21 @@ class NativePty {
|
||||
final rp = ReceivePort();
|
||||
_readerPort = rp;
|
||||
_readerExited = Completer<void>();
|
||||
// Register the listener BEFORE spawning the isolate. ReceivePort buffers
|
||||
// messages until a listener attaches, but registering first removes any
|
||||
// ambiguity if the listen() call ever moves further away from spawn (and
|
||||
// sidesteps a real race we saw 1-in-10 in CI where output never arrived).
|
||||
rp.listen((msg) {
|
||||
if (msg == null) {
|
||||
if (!_out.isClosed) _out.close();
|
||||
rp.close();
|
||||
_readerPort = null;
|
||||
if (!_readerExited!.isCompleted) _readerExited!.complete();
|
||||
_reap();
|
||||
} else {
|
||||
if (!_out.isClosed) _out.add(msg as Uint8List);
|
||||
}
|
||||
});
|
||||
try {
|
||||
_readerIsolate = await Isolate.spawn(_readLoop, (rp.sendPort, _fd));
|
||||
} catch (e) {
|
||||
@@ -248,17 +331,6 @@ class NativePty {
|
||||
if (!_readerExited!.isCompleted) _readerExited!.complete();
|
||||
return;
|
||||
}
|
||||
rp.listen((msg) {
|
||||
if (msg == null) {
|
||||
if (!_out.isClosed) _out.close();
|
||||
rp.close();
|
||||
_readerPort = null;
|
||||
if (!_readerExited!.isCompleted) _readerExited!.complete();
|
||||
_reap();
|
||||
} else {
|
||||
if (!_out.isClosed) _out.add(msg as Uint8List);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
/// Isolate entry — polls then reads until EOF/error/fd-closed.
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
/// PTY subsystem — spawn child processes under a PTY via forkpty(),
|
||||
/// expose their master fd as a byte stream. Desktop IDE's pane model
|
||||
/// (terminal / Claude / future tmux wrappers) rides on this.
|
||||
/// PTY subsystem — spawn child processes under a PTY via posix_openpt()
|
||||
/// + posix_spawn(), expose their master fd as a byte stream. Desktop
|
||||
/// IDE's pane model (terminal / Claude / future tmux wrappers) rides on
|
||||
/// this.
|
||||
library;
|
||||
|
||||
export 'env.dart' show clidePtyEnvDefaults, mergePtyEnv;
|
||||
|
||||
+4
-4
@@ -86,7 +86,7 @@ class _ClideTestAppState extends State<ClideTestApp> {
|
||||
_say('');
|
||||
|
||||
final tc = Toolchain();
|
||||
tc.applyResolved(Toolchain.resolvePaths(workspaceRoot: workDir));
|
||||
tc.applyResolved(Toolchain.resolvePaths());
|
||||
|
||||
if (runToolchain) await _runToolchainTests(tc, workDir);
|
||||
if (runIpc) await _runIpcTests(workDir);
|
||||
@@ -159,12 +159,12 @@ class _ClideTestAppState extends State<ClideTestApp> {
|
||||
_say('--- boot sequence ---');
|
||||
|
||||
await _testAsync('compute(resolveToolchainPaths)', () async {
|
||||
final paths = await compute(resolveToolchainPaths, workDir);
|
||||
final paths = await compute((_) => resolveToolchainPaths(), null);
|
||||
return 'git=${paths.git} pql=${paths.pql}';
|
||||
});
|
||||
|
||||
await _testAsync('Isolate.run(resolveToolchainPaths)', () async {
|
||||
final paths = await Isolate.run(() => resolveToolchainPaths(workDir));
|
||||
final paths = await Isolate.run(resolveToolchainPaths);
|
||||
return 'git=${paths.git} pql=${paths.pql}';
|
||||
});
|
||||
|
||||
@@ -180,7 +180,7 @@ class _ClideTestAppState extends State<ClideTestApp> {
|
||||
});
|
||||
|
||||
await _testAsync('compute + immediate Process.run', () async {
|
||||
final paths = await compute(resolveToolchainPaths, workDir);
|
||||
final paths = await compute((_) => resolveToolchainPaths(), null);
|
||||
final tc2 = Toolchain();
|
||||
tc2.applyResolved(paths);
|
||||
final r = await Process.run(tc2.git, ['rev-parse', '--show-toplevel'], workingDirectory: workDir, environment: tc2.gitEnv);
|
||||
|
||||
+1
-1
@@ -18,7 +18,7 @@ repository: https://github.com/postmeridiem/clide
|
||||
|
||||
# Pre-push line-coverage floor. Ratchets up only — see D-66.
|
||||
# Reading: `awk -F: '/^coverage_floor:/ {gsub(/ /,"",$2); print $2}' pubspec.yaml`.
|
||||
coverage_floor: 92
|
||||
coverage_floor: 95
|
||||
|
||||
# Project metadata (was project.yaml, folded in per D-056).
|
||||
# version: above is the single source of truth. The Makefile reads
|
||||
|
||||
@@ -1,5 +1,3 @@
|
||||
import 'dart:ui';
|
||||
|
||||
import 'package:clide/builtin/theme_picker/theme_picker.dart';
|
||||
import 'package:clide/extension/extension.dart';
|
||||
import 'package:clide/kernel/kernel.dart';
|
||||
|
||||
@@ -2,7 +2,6 @@
|
||||
library;
|
||||
|
||||
import 'package:clide/clide.dart';
|
||||
import 'package:clide/src/daemon/dispatcher.dart';
|
||||
import 'package:test/test.dart';
|
||||
|
||||
IpcRequest _req(String cmd, {String id = '1', Map<String, Object?> args = const {}}) {
|
||||
|
||||
@@ -116,6 +116,31 @@ void main() {
|
||||
expect(r.error!.message, contains('outside workspace'));
|
||||
});
|
||||
|
||||
test('files.read rejects a symlink whose target is outside the workspace (T-102)', () async {
|
||||
final outside = await Directory.systemTemp.createTemp('clide_t102_read_');
|
||||
addTearDown(() async {
|
||||
if (await outside.exists()) await outside.delete(recursive: true);
|
||||
});
|
||||
File('${outside.path}/secret.txt').writeAsStringSync('payload');
|
||||
Link('${sandbox.path}/leak').createSync('${outside.path}/secret.txt');
|
||||
|
||||
final r = await call('files.read', const {'path': 'leak'});
|
||||
expect(r.ok, isFalse);
|
||||
expect(r.error!.message, contains('outside workspace'));
|
||||
});
|
||||
|
||||
test('files.ls rejects a symlinked subdir whose target is outside (T-102)', () async {
|
||||
final outside = await Directory.systemTemp.createTemp('clide_t102_ls_');
|
||||
addTearDown(() async {
|
||||
if (await outside.exists()) await outside.delete(recursive: true);
|
||||
});
|
||||
Link('${sandbox.path}/leak-dir').createSync(outside.path);
|
||||
|
||||
final r = await call('files.ls', const {'path': 'leak-dir'});
|
||||
expect(r.ok, isFalse);
|
||||
expect(r.error!.message, contains('outside workspace'));
|
||||
});
|
||||
|
||||
test('files.watch is idempotent: a second call still acks subscription', () async {
|
||||
final r1 = await call('files.watch', const {});
|
||||
final r2 = await call('files.watch', const {});
|
||||
|
||||
@@ -8,7 +8,7 @@ library;
|
||||
import 'dart:io';
|
||||
|
||||
import 'package:clide/clide.dart';
|
||||
import 'package:clide/kernel/src/toolchain.dart';
|
||||
import 'package:clide/kernel/src/toolchain_paths.dart';
|
||||
import 'package:clide/src/daemon/git_commands.dart';
|
||||
import 'package:test/test.dart';
|
||||
|
||||
@@ -18,8 +18,7 @@ void main() {
|
||||
|
||||
setUp(() async {
|
||||
sandbox = await Directory.systemTemp.createTemp('clide-git-cmd-err-');
|
||||
final toolchain = Toolchain();
|
||||
toolchain.applyResolved(const ResolvedPaths(git: '/tmp/clide-no-such-git-binary'));
|
||||
final toolchain = ToolchainView.resolved(const ResolvedPaths(git: '/tmp/clide-no-such-git-binary'));
|
||||
final git = GitClient(toolchain: toolchain, workDir: sandbox);
|
||||
dispatcher = DaemonDispatcher();
|
||||
final sink = RecordingEventSink();
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
import 'dart:io';
|
||||
|
||||
import 'package:clide/clide.dart';
|
||||
import 'package:clide/kernel/src/toolchain.dart';
|
||||
import 'package:clide/kernel/src/toolchain_paths.dart';
|
||||
import 'package:clide/src/daemon/git_commands.dart';
|
||||
import 'package:test/test.dart';
|
||||
|
||||
@@ -33,8 +33,7 @@ void main() {
|
||||
|
||||
sink = RecordingEventSink();
|
||||
dispatcher = DaemonDispatcher();
|
||||
final toolchain = Toolchain();
|
||||
toolchain.applyResolved(Toolchain.resolvePaths(workspaceRoot: sandbox.path));
|
||||
final toolchain = ToolchainView.resolved(resolveToolchainPaths());
|
||||
final gitClient = GitClient(toolchain: toolchain, workDir: sandbox);
|
||||
registerGitCommands(dispatcher, gitClient, sink);
|
||||
});
|
||||
|
||||
@@ -8,17 +8,15 @@ library;
|
||||
import 'dart:io';
|
||||
|
||||
import 'package:clide/clide.dart';
|
||||
import 'package:clide/kernel/src/toolchain.dart';
|
||||
import 'package:clide/kernel/src/toolchain_paths.dart';
|
||||
import 'package:clide/src/daemon/pql_commands.dart';
|
||||
import 'package:clide/src/pql/client.dart';
|
||||
import 'package:test/test.dart';
|
||||
|
||||
void main() {
|
||||
late DaemonDispatcher dispatcher;
|
||||
|
||||
setUp(() {
|
||||
final toolchain = Toolchain();
|
||||
toolchain.applyResolved(const ResolvedPaths(pql: '/tmp/clide-no-such-pql-binary'));
|
||||
final toolchain = ToolchainView.resolved(const ResolvedPaths(pql: '/tmp/clide-no-such-pql-binary'));
|
||||
final pql = PqlClient(workDir: Directory.current, toolchain: toolchain);
|
||||
dispatcher = DaemonDispatcher();
|
||||
registerPqlCommands(dispatcher, pql);
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
import 'dart:io';
|
||||
|
||||
import 'package:clide/clide.dart';
|
||||
import 'package:clide/kernel/src/toolchain.dart';
|
||||
import 'package:clide/kernel/src/toolchain_paths.dart';
|
||||
import 'package:clide/src/daemon/pql_commands.dart';
|
||||
import 'package:test/test.dart';
|
||||
|
||||
@@ -10,8 +10,7 @@ void main() {
|
||||
late PqlClient pql;
|
||||
|
||||
setUp(() {
|
||||
final toolchain = Toolchain();
|
||||
toolchain.applyResolved(Toolchain.resolvePaths(workspaceRoot: Directory.current.path));
|
||||
final toolchain = ToolchainView.resolved(resolveToolchainPaths());
|
||||
pql = PqlClient(workDir: Directory.current, toolchain: toolchain);
|
||||
dispatcher = DaemonDispatcher();
|
||||
registerPqlCommands(dispatcher, pql);
|
||||
|
||||
@@ -64,4 +64,64 @@ void main() {
|
||||
expect(e.toString(), allOf(contains('r'), contains('/abs'), contains('/root')));
|
||||
});
|
||||
});
|
||||
|
||||
group('resolveUnderRootFollowingSymlinks (T-102)', () {
|
||||
test('plain non-symlink file passes through with the resolved real path', () {
|
||||
final f = File('${root.path}/plain.txt')..writeAsStringSync('hello');
|
||||
final out = resolveUnderRootFollowingSymlinks(root, 'plain.txt');
|
||||
// Real-path may differ from root.path on hosts where systemTemp
|
||||
// is itself a symlink (macOS /tmp -> /private/tmp). Compare via
|
||||
// resolveSymbolicLinksSync on both sides.
|
||||
expect(out, f.resolveSymbolicLinksSync());
|
||||
});
|
||||
|
||||
test('non-existent target returns the path-layer result (caller surfaces not-found)', () {
|
||||
final out = resolveUnderRootFollowingSymlinks(root, 'never-existed.txt');
|
||||
expect(out, endsWith('/never-existed.txt'));
|
||||
});
|
||||
|
||||
test('rejects a symlink under the workspace whose target lives outside', () async {
|
||||
// Create an outside file the symlink will point at.
|
||||
final outside = await Directory.systemTemp.createTemp('clide_t102_outside_');
|
||||
addTearDown(() async {
|
||||
if (await outside.exists()) await outside.delete(recursive: true);
|
||||
});
|
||||
final secret = File('${outside.path}/secret.txt')..writeAsStringSync('payload');
|
||||
|
||||
// Plant a symlink inside the workspace that targets the outside file.
|
||||
final link = Link('${root.path}/leak')..createSync(secret.path);
|
||||
expect(link.existsSync(), isTrue);
|
||||
|
||||
expect(
|
||||
() => resolveUnderRootFollowingSymlinks(root, 'leak'),
|
||||
throwsA(isA<PathOutsideRoot>()),
|
||||
);
|
||||
});
|
||||
|
||||
test('tolerates symlinks in the workspace root path itself', () {
|
||||
// Where systemTemp is itself a symlink (macOS), the realPath of a
|
||||
// file under root won't startWith root.absolute.path — but
|
||||
// resolveUnderRootFollowingSymlinks resolves the root too, so
|
||||
// the containment check still passes.
|
||||
File('${root.path}/under-root.txt').writeAsStringSync('ok');
|
||||
// No throw is the assertion.
|
||||
resolveUnderRootFollowingSymlinks(root, 'under-root.txt');
|
||||
});
|
||||
|
||||
test('rejects a symlink-to-symlink chain whose final target is outside', () async {
|
||||
final outside = await Directory.systemTemp.createTemp('clide_t102_chain_');
|
||||
addTearDown(() async {
|
||||
if (await outside.exists()) await outside.delete(recursive: true);
|
||||
});
|
||||
final secret = File('${outside.path}/secret.txt')..writeAsStringSync('payload');
|
||||
// a -> b (under root) -> /outside/secret.txt
|
||||
Link('${root.path}/b').createSync(secret.path);
|
||||
Link('${root.path}/a').createSync('${root.path}/b');
|
||||
|
||||
expect(
|
||||
() => resolveUnderRootFollowingSymlinks(root, 'a'),
|
||||
throwsA(isA<PathOutsideRoot>()),
|
||||
);
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
@@ -5,16 +5,12 @@ library;
|
||||
|
||||
import 'dart:io';
|
||||
|
||||
import 'package:clide/kernel/src/toolchain.dart';
|
||||
import 'package:clide/kernel/src/toolchain_paths.dart';
|
||||
import 'package:clide/src/git/client.dart';
|
||||
import 'package:clide/src/git/operations.dart' show GitException;
|
||||
import 'package:test/test.dart';
|
||||
|
||||
Toolchain _toolchain() {
|
||||
final t = Toolchain();
|
||||
t.applyResolved(Toolchain.resolvePaths(workspaceRoot: Directory.current.path));
|
||||
return t;
|
||||
}
|
||||
ToolchainView _toolchain() => ToolchainView.resolved(resolveToolchainPaths());
|
||||
|
||||
Future<Directory> _newRepo({String filename = 'file.txt', String contents = 'hello\n'}) async {
|
||||
final dir = await Directory.systemTemp.createTemp('clide-git-client-');
|
||||
@@ -195,8 +191,7 @@ void main() {
|
||||
|
||||
group('GitClient — error surface', () {
|
||||
test('a bad git binary path makes _run throw GitException', () async {
|
||||
final t = Toolchain();
|
||||
t.applyResolved(const ResolvedPaths(git: '/tmp/clide-no-such-git-binary'));
|
||||
final t = ToolchainView.resolved(const ResolvedPaths(git: '/tmp/clide-no-such-git-binary'));
|
||||
final dir = await Directory.systemTemp.createTemp('clide-git-bad-');
|
||||
addTearDown(() => dir.deleteSync(recursive: true));
|
||||
final git = GitClient(toolchain: t, workDir: dir);
|
||||
|
||||
@@ -1,7 +1,10 @@
|
||||
import 'package:clide/kernel/kernel.dart';
|
||||
import 'package:flutter/services.dart';
|
||||
import 'package:flutter_test/flutter_test.dart';
|
||||
|
||||
void main() {
|
||||
TestWidgetsFlutterBinding.ensureInitialized();
|
||||
|
||||
group('Keybinding.parse + equality', () {
|
||||
test('parses single-key bindings', () {
|
||||
final k = Keybinding.parse('g');
|
||||
@@ -20,10 +23,30 @@ void main() {
|
||||
expect(() => Keybinding.parse(''), throwsA(isA<ArgumentError>()));
|
||||
});
|
||||
|
||||
test('rejects spec ending in `+` (missing key)', () {
|
||||
expect(() => Keybinding.parse('ctrl+'), throwsA(isA<ArgumentError>()));
|
||||
});
|
||||
|
||||
test('canonical modifier order is deterministic', () {
|
||||
final k = Keybinding.parse('alt+ctrl+shift+x');
|
||||
expect(k.modifiers, ['alt', 'ctrl', 'shift']);
|
||||
});
|
||||
|
||||
test('canonical of modifier-free binding is just the key', () {
|
||||
expect(Keybinding.parse('escape').canonical, 'escape');
|
||||
});
|
||||
|
||||
test('hashCode matches for equal bindings, differs for distinct', () {
|
||||
final a = Keybinding.parse('ctrl+shift+g');
|
||||
final b = Keybinding.parse('Shift+Ctrl+G');
|
||||
final c = Keybinding.parse('ctrl+g');
|
||||
expect(a.hashCode, b.hashCode);
|
||||
expect(a.hashCode, isNot(c.hashCode));
|
||||
});
|
||||
|
||||
test('toString embeds canonical form', () {
|
||||
expect(Keybinding.parse('ctrl+k').toString(), 'Keybinding(ctrl+k)');
|
||||
});
|
||||
});
|
||||
|
||||
group('KeybindingResolver', () {
|
||||
@@ -41,5 +64,74 @@ void main() {
|
||||
r.unbind(k);
|
||||
expect(r.commandFor(k), isNull);
|
||||
});
|
||||
|
||||
test('entries exposes registered bindings', () {
|
||||
final r = KeybindingResolver();
|
||||
r.bind(Keybinding.parse('ctrl+p'), 'palette.open');
|
||||
r.bind(Keybinding.parse('ctrl+shift+p'), 'palette.commands');
|
||||
final commands = r.entries.map((e) => e.value).toSet();
|
||||
expect(commands, {'palette.open', 'palette.commands'});
|
||||
});
|
||||
});
|
||||
|
||||
group('KeybindingResolver.fromKeyEvent', () {
|
||||
late HardwareKeyboard kb;
|
||||
setUp(() => kb = HardwareKeyboard.instance);
|
||||
tearDown(() => kb.clearState());
|
||||
|
||||
test('returns null for KeyUpEvent', () {
|
||||
final up = KeyUpEvent(
|
||||
physicalKey: PhysicalKeyboardKey.keyG,
|
||||
logicalKey: LogicalKeyboardKey.keyG,
|
||||
timeStamp: Duration.zero,
|
||||
);
|
||||
expect(KeybindingResolver.fromKeyEvent(up, kb), isNull);
|
||||
});
|
||||
|
||||
test('returns null when logicalKey has no keyLabel', () {
|
||||
// A synthetic logical key with an unassigned id has an empty label.
|
||||
final unlabeled = LogicalKeyboardKey(0x1000fffff);
|
||||
final down = KeyDownEvent(
|
||||
physicalKey: PhysicalKeyboardKey.controlLeft,
|
||||
logicalKey: unlabeled,
|
||||
timeStamp: Duration.zero,
|
||||
);
|
||||
expect(KeybindingResolver.fromKeyEvent(down, kb), isNull);
|
||||
});
|
||||
|
||||
test('maps a plain KeyDownEvent to a modifier-free Keybinding', () {
|
||||
final down = KeyDownEvent(
|
||||
physicalKey: PhysicalKeyboardKey.keyG,
|
||||
logicalKey: LogicalKeyboardKey.keyG,
|
||||
timeStamp: Duration.zero,
|
||||
);
|
||||
final b = KeybindingResolver.fromKeyEvent(down, kb);
|
||||
expect(b, isNotNull);
|
||||
expect(b!.key, 'g');
|
||||
expect(b.modifiers, isEmpty);
|
||||
});
|
||||
|
||||
test('includes every held modifier in the resulting Keybinding', () {
|
||||
// Simulate ctrl+shift+alt+meta held, then a keyG down.
|
||||
_holdModifier(PhysicalKeyboardKey.controlLeft, LogicalKeyboardKey.controlLeft);
|
||||
_holdModifier(PhysicalKeyboardKey.shiftLeft, LogicalKeyboardKey.shiftLeft);
|
||||
_holdModifier(PhysicalKeyboardKey.altLeft, LogicalKeyboardKey.altLeft);
|
||||
_holdModifier(PhysicalKeyboardKey.metaLeft, LogicalKeyboardKey.metaLeft);
|
||||
|
||||
final down = KeyDownEvent(
|
||||
physicalKey: PhysicalKeyboardKey.keyG,
|
||||
logicalKey: LogicalKeyboardKey.keyG,
|
||||
timeStamp: Duration.zero,
|
||||
);
|
||||
final b = KeybindingResolver.fromKeyEvent(down, kb)!;
|
||||
expect(b.key, 'g');
|
||||
expect(b.modifiers.toSet(), {'ctrl', 'shift', 'alt', 'cmd'});
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
void _holdModifier(PhysicalKeyboardKey physical, LogicalKeyboardKey logical) {
|
||||
HardwareKeyboard.instance.handleKeyEvent(
|
||||
KeyDownEvent(physicalKey: physical, logicalKey: logical, timeStamp: Duration.zero),
|
||||
);
|
||||
}
|
||||
|
||||
@@ -243,6 +243,62 @@ void main() {
|
||||
await f.services.extensions.deactivate('preset-only');
|
||||
});
|
||||
|
||||
test('duplicate register() is a silent no-op (warns + skips)', () async {
|
||||
final ext = _Ext(id: 'dup');
|
||||
f.services.extensions.register(ext);
|
||||
f.services.extensions.register(ext); // second call → warn + skip
|
||||
expect(f.services.extensions.all.where((e) => e.id == 'dup'), hasLength(1));
|
||||
});
|
||||
|
||||
test('activate of an unknown id is a silent no-op (warns + returns)', () async {
|
||||
await f.services.extensions.activate('nope.no-such');
|
||||
expect(f.services.extensions.isActivated('nope.no-such'), isFalse);
|
||||
});
|
||||
|
||||
test('activate failure is caught and logged (extension survives)', () async {
|
||||
f.services.extensions.register(_Ext(
|
||||
id: 'throws-on-activate',
|
||||
onActivate: (_) async => throw StateError('kaboom'),
|
||||
));
|
||||
await f.services.extensions.activateAll();
|
||||
expect(f.services.extensions.isActivated('throws-on-activate'), isFalse);
|
||||
});
|
||||
|
||||
test('deactivate failure is caught and logged', () async {
|
||||
f.services.extensions.register(_Ext(
|
||||
id: 'throws-on-deactivate',
|
||||
onDeactivate: () async => throw StateError('kaboom'),
|
||||
));
|
||||
await f.services.extensions.activateAll();
|
||||
expect(f.services.extensions.isActivated('throws-on-deactivate'), isTrue);
|
||||
await f.services.extensions.deactivate('throws-on-deactivate');
|
||||
});
|
||||
|
||||
test('deactivating a CommandContribution removes its keybinding', () async {
|
||||
f.services.extensions.register(_Ext(
|
||||
id: 'with-bound-cmd',
|
||||
contributions: [
|
||||
CommandContribution(
|
||||
id: 'with-bound-cmd.cmd',
|
||||
command: 'bound.cmd',
|
||||
defaultBinding: 'ctrl+alt+j',
|
||||
run: (_) async => IpcResponse.ok(id: '', data: const {}),
|
||||
),
|
||||
],
|
||||
));
|
||||
await f.services.extensions.activateAll();
|
||||
expect(f.services.keybindings.commandFor(Keybinding.parse('ctrl+alt+j')), 'bound.cmd');
|
||||
await f.services.extensions.deactivate('with-bound-cmd');
|
||||
expect(f.services.keybindings.commandFor(Keybinding.parse('ctrl+alt+j')), isNull);
|
||||
});
|
||||
|
||||
test('all getter yields every registered extension', () async {
|
||||
f.services.extensions.register(_Ext(id: 'a-iter'));
|
||||
f.services.extensions.register(_Ext(id: 'b-iter'));
|
||||
final ids = f.services.extensions.all.map((e) => e.id).toSet();
|
||||
expect(ids, containsAll(['a-iter', 'b-iter']));
|
||||
});
|
||||
|
||||
test('extension context exposes every kernel service via passthrough getters', () async {
|
||||
ClideExtensionContext? captured;
|
||||
f.services.extensions.register(_Ext(
|
||||
|
||||
@@ -1,5 +1,3 @@
|
||||
import 'dart:ui';
|
||||
|
||||
import 'package:clide/kernel/kernel.dart';
|
||||
import 'package:flutter/widgets.dart';
|
||||
import 'package:flutter_test/flutter_test.dart';
|
||||
|
||||
@@ -6,7 +6,6 @@ library;
|
||||
|
||||
import 'dart:convert';
|
||||
import 'dart:io';
|
||||
import 'dart:typed_data';
|
||||
import 'dart:ui';
|
||||
|
||||
import 'package:clide/kernel/src/i18n/catalog_loader.dart';
|
||||
|
||||
@@ -3,7 +3,6 @@ library;
|
||||
|
||||
import 'package:clide/extension/extension.dart';
|
||||
import 'package:clide/kernel/kernel.dart';
|
||||
import 'package:clide/kernel/src/panels/drag_resize.dart';
|
||||
import 'package:flutter/gestures.dart';
|
||||
import 'package:flutter/widgets.dart';
|
||||
import 'package:flutter_test/flutter_test.dart';
|
||||
|
||||
Binary file not shown.
@@ -5,6 +5,7 @@ library;
|
||||
|
||||
import 'package:clide/kernel/src/dialog.dart';
|
||||
import 'package:clide/kernel/src/events/bus.dart';
|
||||
import 'package:clide/kernel/src/events/types.dart';
|
||||
import 'package:clide/kernel/src/files.dart';
|
||||
import 'package:clide/kernel/src/log.dart';
|
||||
import 'package:clide/kernel/src/os.dart';
|
||||
@@ -194,5 +195,47 @@ void main() {
|
||||
s.start();
|
||||
s.dispose();
|
||||
});
|
||||
|
||||
test('ProjectOpened triggers the initial-cycle ticks', () async {
|
||||
final bus = DaemonBus();
|
||||
final s = SchedulerService(bus);
|
||||
addTearDown(s.dispose);
|
||||
s.start();
|
||||
final ticks = <SchedulerTier>[];
|
||||
final sub = bus.on<SchedulerTick>().listen((e) => ticks.add(e.tier));
|
||||
addTearDown(sub.cancel);
|
||||
bus.emit(const ProjectOpened(path: '/tmp/x'));
|
||||
// The first stagger is 0 ms; pump to flush it onto the queue.
|
||||
await Future<void>.delayed(const Duration(milliseconds: 50));
|
||||
expect(ticks, isNotEmpty);
|
||||
});
|
||||
|
||||
test('ProjectClosed stops the ticker without throwing', () async {
|
||||
final bus = DaemonBus();
|
||||
final s = SchedulerService(bus);
|
||||
addTearDown(s.dispose);
|
||||
s.start();
|
||||
bus.emit(const ProjectOpened(path: '/tmp/x'));
|
||||
await Future<void>.delayed(const Duration(milliseconds: 50));
|
||||
bus.emit(const ProjectClosed());
|
||||
// Smoke — no throw.
|
||||
});
|
||||
|
||||
test('dispose immediately after ProjectOpened awaits the in-flight spawn (T-106)', () async {
|
||||
// Race window: ProjectOpened triggers _startTicker which calls
|
||||
// `Isolate.spawn(...)`; if dispose lands before the spawn future
|
||||
// resolves, the old code left _isolate=null and the just-spawned
|
||||
// ticker leaked forever. Now dispose awaits _isolateReady before
|
||||
// killing.
|
||||
final bus = DaemonBus();
|
||||
final s = SchedulerService(bus);
|
||||
s.start();
|
||||
bus.emit(const ProjectOpened(path: '/tmp/x'));
|
||||
// Don't wait for the spawn to settle — dispose must do that itself.
|
||||
await s.dispose();
|
||||
// No throw, no leaked isolate (test runner would flag a lingering
|
||||
// isolate by failing to exit cleanly). Reaching this line is the
|
||||
// assertion.
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
@@ -0,0 +1,377 @@
|
||||
/// Fake-FFI tests for `TreeSitterService` — exercises every branch of
|
||||
/// `_init`, `_loadGrammar`, `highlight`, and `dispose` by substituting
|
||||
/// `TreeSitterLib.testing(...)` and in-memory grammar/query loaders, no
|
||||
/// real `libtree-sitter.so` required.
|
||||
library;
|
||||
|
||||
import 'dart:ffi';
|
||||
import 'dart:typed_data';
|
||||
|
||||
import 'package:clide/kernel/src/syntax/tree_sitter_ffi.dart';
|
||||
import 'package:clide/kernel/src/syntax/tree_sitter_service.dart';
|
||||
import 'package:ffi/ffi.dart';
|
||||
import 'package:flutter_test/flutter_test.dart';
|
||||
|
||||
void main() {
|
||||
// Fake addresses used to stand in for opaque handles. Never dereferenced —
|
||||
// the fake FFI surface just compares pointer identity.
|
||||
Pointer<TSWasmEngine> engineHandle() => Pointer<TSWasmEngine>.fromAddress(0x1000);
|
||||
Pointer<TSWasmStore> storeHandle() => Pointer<TSWasmStore>.fromAddress(0x2000);
|
||||
Pointer<TSParser> parserHandle() => Pointer<TSParser>.fromAddress(0x3000);
|
||||
Pointer<TSQueryCursor> cursorHandle() => Pointer<TSQueryCursor>.fromAddress(0x4000);
|
||||
Pointer<Void> languageHandle() => Pointer<Void>.fromAddress(0x5000);
|
||||
Pointer<TSQuery> queryHandle() => Pointer<TSQuery>.fromAddress(0x6000);
|
||||
Pointer<TSTree> treeHandle() => Pointer<TSTree>.fromAddress(0x7000);
|
||||
|
||||
/// Builds a lib that succeeds through `_init` (engine + store + parser +
|
||||
/// cursor) and lets each test customize what happens afterwards.
|
||||
TreeSitterLib initOkLib({
|
||||
DTsWasmStoreLoadLanguage? wasmStoreLoadLanguage,
|
||||
DTsQueryNew? queryNew,
|
||||
DTsQueryCaptureCount? queryCaptureCount,
|
||||
DTsQueryCaptureNameForId? queryCaptureNameForId,
|
||||
DTsParserParseString? parserParseString,
|
||||
DTsTreeRootNode? treeRootNode,
|
||||
DTsQueryCursorNextMatch? queryCursorNextMatch,
|
||||
DTsNodeStartByte? nodeStartByte,
|
||||
DTsNodeEndByte? nodeEndByte,
|
||||
DTsQueryDelete? queryDelete,
|
||||
DTsParserDelete? parserDelete,
|
||||
DTsWasmStoreDelete? wasmStoreDelete,
|
||||
DTsQueryCursorDelete? queryCursorDelete,
|
||||
DTsParserSetLanguage? parserSetLanguage,
|
||||
}) {
|
||||
return TreeSitterLib.testing(
|
||||
wasmEngineNew: engineHandle,
|
||||
wasmEngineDelete: (_) {},
|
||||
wasmStoreNew: (_, __) => storeHandle(),
|
||||
parserNew: parserHandle,
|
||||
parserSetWasmStore: (_, __) {},
|
||||
queryCursorNew: cursorHandle,
|
||||
wasmStoreLoadLanguage: wasmStoreLoadLanguage,
|
||||
queryNew: queryNew,
|
||||
queryCaptureCount: queryCaptureCount,
|
||||
queryCaptureNameForId: queryCaptureNameForId,
|
||||
parserParseString: parserParseString,
|
||||
treeRootNode: treeRootNode,
|
||||
queryCursorNextMatch: queryCursorNextMatch,
|
||||
nodeStartByte: nodeStartByte,
|
||||
nodeEndByte: nodeEndByte,
|
||||
queryDelete: queryDelete,
|
||||
parserDelete: parserDelete,
|
||||
wasmStoreDelete: wasmStoreDelete,
|
||||
queryCursorDelete: queryCursorDelete,
|
||||
parserSetLanguage: parserSetLanguage ?? ((_, __) => true),
|
||||
);
|
||||
}
|
||||
|
||||
Future<Uint8List> okBytes(String _) async => Uint8List.fromList(const [0, 1, 2, 3]);
|
||||
Future<String?> noQuery(String _) async => null;
|
||||
Future<String?> okQuery(String _) async => '(identifier) @keyword';
|
||||
|
||||
group('TreeSitterService._init — FFI failure branches', () {
|
||||
test('wasmEngineNew returning nullptr → hasGrammar(.dart) is false', () async {
|
||||
final svc = TreeSitterService(
|
||||
lib: TreeSitterLib.testing(),
|
||||
grammarBytes: okBytes,
|
||||
grammarQuery: noQuery,
|
||||
);
|
||||
expect(await svc.hasGrammar('foo.dart'), isFalse);
|
||||
});
|
||||
|
||||
test('wasmStoreNew returning nullptr → hasGrammar is false', () async {
|
||||
final lib = TreeSitterLib.testing(
|
||||
wasmEngineNew: engineHandle,
|
||||
wasmEngineDelete: (_) {},
|
||||
// wasmStoreNew default → nullptr
|
||||
);
|
||||
final svc = TreeSitterService(lib: lib, grammarBytes: okBytes, grammarQuery: noQuery);
|
||||
expect(await svc.hasGrammar('foo.dart'), isFalse);
|
||||
});
|
||||
|
||||
test('parserNew returning nullptr → hasGrammar is false', () async {
|
||||
final lib = TreeSitterLib.testing(
|
||||
wasmEngineNew: engineHandle,
|
||||
wasmEngineDelete: (_) {},
|
||||
wasmStoreNew: (_, __) => storeHandle(),
|
||||
// parserNew default → nullptr
|
||||
);
|
||||
final svc = TreeSitterService(lib: lib, grammarBytes: okBytes, grammarQuery: noQuery);
|
||||
expect(await svc.hasGrammar('foo.dart'), isFalse);
|
||||
});
|
||||
|
||||
test('_init failure is cached — second call still false without re-trying', () async {
|
||||
var engineCalls = 0;
|
||||
final lib = TreeSitterLib.testing(
|
||||
wasmEngineNew: () {
|
||||
engineCalls++;
|
||||
return nullptr;
|
||||
},
|
||||
);
|
||||
final svc = TreeSitterService(lib: lib, grammarBytes: okBytes, grammarQuery: noQuery);
|
||||
expect(await svc.hasGrammar('foo.dart'), isFalse);
|
||||
expect(await svc.hasGrammar('foo.dart'), isFalse);
|
||||
// Second hasGrammar hits the _unavailable cache before _init runs again.
|
||||
expect(engineCalls, 1);
|
||||
});
|
||||
});
|
||||
|
||||
group('TreeSitterService._loadGrammar — branches', () {
|
||||
test('grammarBytes throwing is caught → grammar marked unavailable', () async {
|
||||
final svc = TreeSitterService(
|
||||
lib: initOkLib(wasmStoreLoadLanguage: (_, __, ___, ____, _____) => languageHandle()),
|
||||
grammarBytes: (_) async => throw StateError('bundle missing'),
|
||||
grammarQuery: noQuery,
|
||||
);
|
||||
expect(await svc.hasGrammar('foo.dart'), isFalse);
|
||||
});
|
||||
|
||||
test('wasmStoreLoadLanguage returning nullptr → grammar marked unavailable', () async {
|
||||
final svc = TreeSitterService(
|
||||
lib: initOkLib(),
|
||||
grammarBytes: okBytes,
|
||||
grammarQuery: noQuery,
|
||||
);
|
||||
expect(await svc.hasGrammar('foo.dart'), isFalse);
|
||||
// Once marked unavailable, languageFor also returns null.
|
||||
expect(await svc.languageFor('foo.dart'), isNull);
|
||||
});
|
||||
|
||||
test('grammarQuery returning null → grammar loads with query=nullptr', () async {
|
||||
final svc = TreeSitterService(
|
||||
lib: initOkLib(
|
||||
wasmStoreLoadLanguage: (_, __, ___, ____, _____) => languageHandle(),
|
||||
),
|
||||
grammarBytes: okBytes,
|
||||
grammarQuery: noQuery,
|
||||
);
|
||||
// languageFor returns the language name when the grammar loaded — even
|
||||
// though there's no highlight query.
|
||||
expect(await svc.languageFor('foo.dart'), 'dart');
|
||||
// hasGrammar likewise returns true.
|
||||
expect(await svc.hasGrammar('foo.dart'), isTrue);
|
||||
// highlight returns empty because grammar.query is nullptr.
|
||||
final h = await svc.highlight('foo.dart', 'x');
|
||||
expect(h.spans, isEmpty);
|
||||
});
|
||||
|
||||
test('grammarQuery loads + queryNew fails → grammar still cached with query=nullptr', () async {
|
||||
final svc = TreeSitterService(
|
||||
lib: initOkLib(
|
||||
wasmStoreLoadLanguage: (_, __, ___, ____, _____) => languageHandle(),
|
||||
// queryNew default → nullptr; capture reflection block skipped.
|
||||
),
|
||||
grammarBytes: okBytes,
|
||||
grammarQuery: okQuery,
|
||||
);
|
||||
expect(await svc.languageFor('foo.dart'), 'dart');
|
||||
expect((await svc.highlight('foo.dart', 'x')).spans, isEmpty);
|
||||
});
|
||||
|
||||
test('grammarQuery loads + queryNew + captures reflected → loadedLanguages reports it', () async {
|
||||
// Allocate a static capture name buffer that the fake returns for every
|
||||
// capture id. Leaks for the duration of the test; not freed.
|
||||
final nameNative = 'keyword'.toNativeUtf8();
|
||||
final svc = TreeSitterService(
|
||||
lib: initOkLib(
|
||||
wasmStoreLoadLanguage: (_, __, ___, ____, _____) => languageHandle(),
|
||||
queryNew: (_, __, ___, ____, _____) => queryHandle(),
|
||||
queryCaptureCount: (_) => 1,
|
||||
queryCaptureNameForId: (_, __, lenOut) {
|
||||
lenOut.value = nameNative.length;
|
||||
return nameNative;
|
||||
},
|
||||
),
|
||||
grammarBytes: okBytes,
|
||||
grammarQuery: okQuery,
|
||||
);
|
||||
expect(await svc.languageFor('foo.dart'), 'dart');
|
||||
expect(svc.loadedLanguages, contains('dart'));
|
||||
});
|
||||
|
||||
test('a second call for the same language returns the cached grammar', () async {
|
||||
var byteLoads = 0;
|
||||
final svc = TreeSitterService(
|
||||
lib: initOkLib(
|
||||
wasmStoreLoadLanguage: (_, __, ___, ____, _____) => languageHandle(),
|
||||
),
|
||||
grammarBytes: (lang) async {
|
||||
byteLoads++;
|
||||
return Uint8List.fromList(const [0, 1, 2]);
|
||||
},
|
||||
grammarQuery: noQuery,
|
||||
);
|
||||
await svc.languageFor('foo.dart');
|
||||
await svc.languageFor('foo.dart');
|
||||
expect(byteLoads, 1);
|
||||
});
|
||||
|
||||
test('once marked unavailable, repeat calls do not re-attempt the bundle load', () async {
|
||||
var byteLoads = 0;
|
||||
final svc = TreeSitterService(
|
||||
lib: initOkLib(), // wasmStoreLoadLanguage default → nullptr
|
||||
grammarBytes: (lang) async {
|
||||
byteLoads++;
|
||||
return Uint8List.fromList(const [0]);
|
||||
},
|
||||
grammarQuery: noQuery,
|
||||
);
|
||||
expect(await svc.hasGrammar('foo.dart'), isFalse);
|
||||
expect(await svc.hasGrammar('foo.dart'), isFalse);
|
||||
expect(byteLoads, 1);
|
||||
});
|
||||
});
|
||||
|
||||
group('TreeSitterService.highlight — parse + cursor loop', () {
|
||||
test('parserParseString returning nullptr → empty spans', () async {
|
||||
final svc = TreeSitterService(
|
||||
lib: initOkLib(
|
||||
wasmStoreLoadLanguage: (_, __, ___, ____, _____) => languageHandle(),
|
||||
queryNew: (_, __, ___, ____, _____) => queryHandle(),
|
||||
// parserParseString default → nullptr
|
||||
),
|
||||
grammarBytes: okBytes,
|
||||
grammarQuery: okQuery,
|
||||
);
|
||||
final h = await svc.highlight('foo.dart', 'whatever');
|
||||
expect(h.spans, isEmpty);
|
||||
});
|
||||
|
||||
test('cursor produces a match with one capture → SyntaxSpan emitted', () async {
|
||||
// Build a leaky TSNode for the fake to return — start/end byte
|
||||
// closures decide the span coordinates.
|
||||
final rootNode = calloc<TSNode>();
|
||||
final capNode = calloc<TSNode>();
|
||||
final captures = calloc<TSQueryCapture>(1);
|
||||
captures[0].index = 0;
|
||||
captures[0].node = capNode.ref;
|
||||
final nameNative = 'keyword'.toNativeUtf8();
|
||||
|
||||
var matchCalls = 0;
|
||||
final svc = TreeSitterService(
|
||||
lib: initOkLib(
|
||||
wasmStoreLoadLanguage: (_, __, ___, ____, _____) => languageHandle(),
|
||||
queryNew: (_, __, ___, ____, _____) => queryHandle(),
|
||||
queryCaptureCount: (_) => 1,
|
||||
queryCaptureNameForId: (_, __, lenOut) {
|
||||
lenOut.value = nameNative.length;
|
||||
return nameNative;
|
||||
},
|
||||
parserParseString: (_, __, ___, ____) => treeHandle(),
|
||||
treeRootNode: (_) => rootNode.ref,
|
||||
queryCursorNextMatch: (_, match) {
|
||||
if (matchCalls > 0) return false;
|
||||
matchCalls++;
|
||||
match.ref.captureCount = 1;
|
||||
match.ref.captures = captures;
|
||||
return true;
|
||||
},
|
||||
nodeStartByte: (_) => 4,
|
||||
nodeEndByte: (_) => 11,
|
||||
),
|
||||
grammarBytes: okBytes,
|
||||
grammarQuery: okQuery,
|
||||
);
|
||||
|
||||
final h = await svc.highlight('foo.dart', 'void hello();');
|
||||
expect(h.spans, hasLength(1));
|
||||
expect(h.spans.single.start, 4);
|
||||
expect(h.spans.single.end, 11);
|
||||
expect(h.spans.single.role, 'keyword');
|
||||
});
|
||||
|
||||
test('captures with an out-of-range index are skipped', () async {
|
||||
final rootNode = calloc<TSNode>();
|
||||
final capNode = calloc<TSNode>();
|
||||
final captures = calloc<TSQueryCapture>(1);
|
||||
captures[0].index = 99; // way beyond captureNames.length=1
|
||||
captures[0].node = capNode.ref;
|
||||
final nameNative = 'keyword'.toNativeUtf8();
|
||||
|
||||
var matchCalls = 0;
|
||||
final svc = TreeSitterService(
|
||||
lib: initOkLib(
|
||||
wasmStoreLoadLanguage: (_, __, ___, ____, _____) => languageHandle(),
|
||||
queryNew: (_, __, ___, ____, _____) => queryHandle(),
|
||||
queryCaptureCount: (_) => 1,
|
||||
queryCaptureNameForId: (_, __, lenOut) {
|
||||
lenOut.value = nameNative.length;
|
||||
return nameNative;
|
||||
},
|
||||
parserParseString: (_, __, ___, ____) => treeHandle(),
|
||||
treeRootNode: (_) => rootNode.ref,
|
||||
queryCursorNextMatch: (_, match) {
|
||||
if (matchCalls > 0) return false;
|
||||
matchCalls++;
|
||||
match.ref.captureCount = 1;
|
||||
match.ref.captures = captures;
|
||||
return true;
|
||||
},
|
||||
),
|
||||
grammarBytes: okBytes,
|
||||
grammarQuery: okQuery,
|
||||
);
|
||||
|
||||
final h = await svc.highlight('foo.dart', 'void main() {}');
|
||||
expect(h.spans, isEmpty);
|
||||
});
|
||||
});
|
||||
|
||||
group('TreeSitterService.dispose', () {
|
||||
test('dispose calls queryDelete + parserDelete + wasmStoreDelete + queryCursorDelete', () async {
|
||||
var queryDeletes = 0;
|
||||
var parserDeletes = 0;
|
||||
var storeDeletes = 0;
|
||||
var cursorDeletes = 0;
|
||||
final svc = TreeSitterService(
|
||||
lib: initOkLib(
|
||||
wasmStoreLoadLanguage: (_, __, ___, ____, _____) => languageHandle(),
|
||||
queryNew: (_, __, ___, ____, _____) => queryHandle(),
|
||||
queryDelete: (_) => queryDeletes++,
|
||||
parserDelete: (_) => parserDeletes++,
|
||||
wasmStoreDelete: (_) => storeDeletes++,
|
||||
queryCursorDelete: (_) => cursorDeletes++,
|
||||
),
|
||||
grammarBytes: okBytes,
|
||||
grammarQuery: okQuery,
|
||||
);
|
||||
|
||||
// Load one grammar so dispose has something to walk.
|
||||
await svc.hasGrammar('foo.dart');
|
||||
svc.dispose();
|
||||
|
||||
expect(queryDeletes, 1);
|
||||
expect(parserDeletes, 1);
|
||||
expect(storeDeletes, 1);
|
||||
expect(cursorDeletes, 1);
|
||||
});
|
||||
|
||||
test('dispose is a no-op when no lib was ever injected and TreeSitterLib.instance is null', () {
|
||||
// No injected lib + no dlopen'd native lib in the test runner.
|
||||
final svc = TreeSitterService(grammarBytes: okBytes, grammarQuery: noQuery);
|
||||
svc.dispose(); // must not throw
|
||||
});
|
||||
|
||||
test('resetForTests re-arms _init for the next call', () async {
|
||||
var engineCalls = 0;
|
||||
final lib = TreeSitterLib.testing(
|
||||
wasmEngineNew: () {
|
||||
engineCalls++;
|
||||
return engineHandle();
|
||||
},
|
||||
wasmEngineDelete: (_) {},
|
||||
wasmStoreNew: (_, __) => storeHandle(),
|
||||
parserNew: parserHandle,
|
||||
parserSetWasmStore: (_, __) {},
|
||||
queryCursorNew: cursorHandle,
|
||||
wasmStoreLoadLanguage: (_, __, ___, ____, _____) => languageHandle(),
|
||||
);
|
||||
final svc = TreeSitterService(lib: lib, grammarBytes: okBytes, grammarQuery: noQuery);
|
||||
await svc.hasGrammar('foo.dart');
|
||||
expect(engineCalls, 1);
|
||||
svc.resetForTests();
|
||||
await svc.hasGrammar('bar.dart');
|
||||
expect(engineCalls, 2);
|
||||
});
|
||||
});
|
||||
}
|
||||
@@ -6,8 +6,11 @@
|
||||
library;
|
||||
|
||||
import 'package:clide/kernel/src/syntax/tree_sitter_service.dart';
|
||||
import 'package:clide/kernel/src/theme/tokens.dart';
|
||||
import 'package:flutter_test/flutter_test.dart';
|
||||
|
||||
import '../../../helpers/kernel_fixture.dart';
|
||||
|
||||
void main() {
|
||||
TestWidgetsFlutterBinding.ensureInitialized();
|
||||
|
||||
@@ -63,4 +66,99 @@ void main() {
|
||||
expect(s.role, 'keyword');
|
||||
});
|
||||
});
|
||||
|
||||
group('TreeSitterService.colorForRole', () {
|
||||
late SurfaceTokens tokens;
|
||||
|
||||
setUpAll(() async {
|
||||
final f = await KernelFixture.create();
|
||||
tokens = f.services.theme.current.surface;
|
||||
await f.dispose();
|
||||
});
|
||||
|
||||
test('every keyword-flavoured role maps to syntaxKeyword', () {
|
||||
for (final role in ['keyword', 'repeat', 'conditional', 'include', 'exception', 'operator']) {
|
||||
expect(TreeSitterService.colorForRole(role, tokens), tokens.syntaxKeyword, reason: role);
|
||||
}
|
||||
});
|
||||
|
||||
test('type-flavoured roles map to syntaxType', () {
|
||||
for (final role in ['type', 'type.builtin', 'constructor']) {
|
||||
expect(TreeSitterService.colorForRole(role, tokens), tokens.syntaxType, reason: role);
|
||||
}
|
||||
});
|
||||
|
||||
test('string-flavoured roles map to syntaxString', () {
|
||||
for (final role in ['string', 'string.special']) {
|
||||
expect(TreeSitterService.colorForRole(role, tokens), tokens.syntaxString, reason: role);
|
||||
}
|
||||
});
|
||||
|
||||
test('number-flavoured roles map to syntaxNumber', () {
|
||||
for (final role in ['number', 'float', 'boolean']) {
|
||||
expect(TreeSitterService.colorForRole(role, tokens), tokens.syntaxNumber, reason: role);
|
||||
}
|
||||
});
|
||||
|
||||
test('comment maps to syntaxComment', () {
|
||||
expect(TreeSitterService.colorForRole('comment', tokens), tokens.syntaxComment);
|
||||
});
|
||||
|
||||
test('function-flavoured roles map to syntaxMethod', () {
|
||||
for (final role in ['function', 'function.builtin', 'function.method', 'method']) {
|
||||
expect(TreeSitterService.colorForRole(role, tokens), tokens.syntaxMethod, reason: role);
|
||||
}
|
||||
});
|
||||
|
||||
test('punctuation roles map to syntaxPunct', () {
|
||||
for (final role in ['punctuation.bracket', 'punctuation.delimiter', 'punctuation.special']) {
|
||||
expect(TreeSitterService.colorForRole(role, tokens), tokens.syntaxPunct, reason: role);
|
||||
}
|
||||
});
|
||||
|
||||
test('variable roles fall back to globalForeground', () {
|
||||
for (final role in ['variable', 'variable.builtin', 'variable.parameter']) {
|
||||
expect(TreeSitterService.colorForRole(role, tokens), tokens.globalForeground, reason: role);
|
||||
}
|
||||
});
|
||||
|
||||
test('property / field share syntaxMethod with functions', () {
|
||||
for (final role in ['property', 'field']) {
|
||||
expect(TreeSitterService.colorForRole(role, tokens), tokens.syntaxMethod, reason: role);
|
||||
}
|
||||
});
|
||||
|
||||
test('constant roles share syntaxNumber with numbers', () {
|
||||
for (final role in ['constant', 'constant.builtin']) {
|
||||
expect(TreeSitterService.colorForRole(role, tokens), tokens.syntaxNumber, reason: role);
|
||||
}
|
||||
});
|
||||
|
||||
test('tag / attribute share syntaxKeyword', () {
|
||||
for (final role in ['tag', 'attribute']) {
|
||||
expect(TreeSitterService.colorForRole(role, tokens), tokens.syntaxKeyword, reason: role);
|
||||
}
|
||||
});
|
||||
|
||||
test('namespace / module share syntaxType', () {
|
||||
for (final role in ['namespace', 'module']) {
|
||||
expect(TreeSitterService.colorForRole(role, tokens), tokens.syntaxType, reason: role);
|
||||
}
|
||||
});
|
||||
|
||||
test('markdown text.* roles distribute across keyword / string / type tokens', () {
|
||||
expect(TreeSitterService.colorForRole('text.title', tokens), tokens.syntaxKeyword);
|
||||
for (final role in ['text.literal', 'text.reference', 'text.uri']) {
|
||||
expect(TreeSitterService.colorForRole(role, tokens), tokens.syntaxString, reason: role);
|
||||
}
|
||||
for (final role in ['text.emphasis', 'text.strong']) {
|
||||
expect(TreeSitterService.colorForRole(role, tokens), tokens.syntaxType, reason: role);
|
||||
}
|
||||
});
|
||||
|
||||
test('unknown roles fall through to globalForeground', () {
|
||||
expect(TreeSitterService.colorForRole('definitely-not-a-real-role', tokens), tokens.globalForeground);
|
||||
expect(TreeSitterService.colorForRole('', tokens), tokens.globalForeground);
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
@@ -0,0 +1,80 @@
|
||||
/// Real-library smoke test for `TreeSitterService`. Dlopen's the vendored
|
||||
/// `native/linux-x64/libtree-sitter.so`, loads the bundled `dart` grammar
|
||||
/// from `assets/grammars/dart.wasm` + `assets/queries/dart.scm` straight off
|
||||
/// the filesystem (no `rootBundle`), and verifies highlight produces sane
|
||||
/// spans over a tiny Dart program. Catches FFI-signature regressions that
|
||||
/// the fake-driven branch tests cannot.
|
||||
///
|
||||
/// Skips cleanly on non-Linux hosts and on Linux hosts where the vendored
|
||||
/// library hasn't been built yet.
|
||||
library;
|
||||
|
||||
import 'dart:ffi';
|
||||
import 'dart:io';
|
||||
|
||||
import 'package:clide/kernel/src/syntax/tree_sitter_ffi.dart';
|
||||
import 'package:clide/kernel/src/syntax/tree_sitter_service.dart';
|
||||
import 'package:flutter_test/flutter_test.dart';
|
||||
|
||||
const _libPath = 'native/linux-x64/libtree-sitter.so';
|
||||
|
||||
void main() {
|
||||
if (!Platform.isLinux || !File(_libPath).existsSync()) return;
|
||||
|
||||
group('TreeSitterService — native smoke (real libtree-sitter.so + dart grammar)', () {
|
||||
late TreeSitterService svc;
|
||||
|
||||
setUpAll(() {
|
||||
final dylib = DynamicLibrary.open(_libPath);
|
||||
svc = TreeSitterService(
|
||||
lib: TreeSitterLib.fromDynamicLibrary(dylib),
|
||||
grammarBytes: (lang) async => File('assets/grammars/$lang.wasm').readAsBytes(),
|
||||
grammarQuery: (lang) async {
|
||||
final f = File('assets/queries/$lang.scm');
|
||||
return await f.exists() ? f.readAsString() : null;
|
||||
},
|
||||
);
|
||||
});
|
||||
|
||||
// Intentionally do NOT call svc.dispose() at teardown — wasmtime's
|
||||
// store-delete path collides with the Flutter test runner's process
|
||||
// finalization (libc `double free` on exit). The OS reclaims everything
|
||||
// when the runner process exits.
|
||||
|
||||
test('loads the dart grammar end-to-end', () async {
|
||||
expect(await svc.hasGrammar('main.dart'), isTrue);
|
||||
expect(await svc.languageFor('main.dart'), 'dart');
|
||||
expect(svc.loadedLanguages, contains('dart'));
|
||||
});
|
||||
|
||||
test('highlight returns at least one span for a tiny dart program', () async {
|
||||
const source = 'void main() {\n print("hi");\n}\n';
|
||||
final r = await svc.highlight('main.dart', source);
|
||||
|
||||
expect(r.spans, isNotEmpty);
|
||||
// Every span must be in-range and well-ordered.
|
||||
for (final s in r.spans) {
|
||||
expect(s.start, lessThanOrEqualTo(s.end));
|
||||
expect(s.end, lessThanOrEqualTo(source.length));
|
||||
expect(s.role, isNotEmpty);
|
||||
}
|
||||
// The captures the upstream dart.scm emits cover at least one of these
|
||||
// semantic roles for a `void main()` program — assert intersection so
|
||||
// the test survives minor query reshufflings.
|
||||
final roles = r.spans.map((s) => s.role).toSet();
|
||||
expect(
|
||||
roles.intersection({'keyword', 'type', 'function', 'string', 'punctuation.bracket', 'punctuation.delimiter'}),
|
||||
isNotEmpty,
|
||||
reason: 'expected at least one familiar dart role, got: $roles',
|
||||
);
|
||||
});
|
||||
|
||||
test('a second highlight reuses the cached grammar (no re-load)', () async {
|
||||
// Re-issue a highlight; the grammar cache hit is internal but if the
|
||||
// service is healthy this just completes without throwing and returns
|
||||
// a sane result.
|
||||
final r = await svc.highlight('main.dart', 'class X {}');
|
||||
expect(r.spans, isNotEmpty);
|
||||
});
|
||||
});
|
||||
}
|
||||
@@ -6,10 +6,8 @@
|
||||
library;
|
||||
|
||||
import 'dart:io';
|
||||
import 'dart:ui';
|
||||
|
||||
import 'package:clide/kernel/kernel.dart';
|
||||
import 'package:clide/kernel/src/theme/contrast.dart';
|
||||
import 'package:flutter/widgets.dart';
|
||||
import 'package:flutter_test/flutter_test.dart';
|
||||
|
||||
|
||||
@@ -0,0 +1,50 @@
|
||||
/// Unit tests for `ToolchainView.resolved` (the Flutter-free `_StaticToolchain`)
|
||||
/// in `lib/kernel/src/toolchain_paths.dart`. The listenable `Toolchain` and the
|
||||
/// top-level `resolveToolchainPaths` are covered by `toolchain_test.dart`.
|
||||
library;
|
||||
|
||||
import 'package:clide/kernel/src/toolchain_paths.dart';
|
||||
import 'package:test/test.dart';
|
||||
|
||||
void main() {
|
||||
group('ToolchainView.resolved', () {
|
||||
test('exposes the supplied paths verbatim', () {
|
||||
final v = ToolchainView.resolved(const ResolvedPaths(
|
||||
git: '/opt/git',
|
||||
pql: '/opt/pql',
|
||||
tmux: '/opt/tmux',
|
||||
shell: '/usr/bin/zsh',
|
||||
gitEnv: {'GIT_EXEC_PATH': '/opt/git-core'},
|
||||
));
|
||||
expect(v.git, '/opt/git');
|
||||
expect(v.pql, '/opt/pql');
|
||||
expect(v.tmux, '/opt/tmux');
|
||||
expect(v.shell, '/usr/bin/zsh');
|
||||
expect(v.gitEnv, {'GIT_EXEC_PATH': '/opt/git-core'});
|
||||
expect(v.resolved, isTrue);
|
||||
expect(v.allOk, isTrue);
|
||||
expect(v.missing, isEmpty);
|
||||
});
|
||||
|
||||
test('falls back to bare command names when paths are null', () {
|
||||
final v = ToolchainView.resolved(const ResolvedPaths());
|
||||
expect(v.git, 'git');
|
||||
expect(v.pql, 'pql');
|
||||
expect(v.tmux, 'tmux');
|
||||
expect(v.shell, '/bin/bash');
|
||||
expect(v.gitEnv, isNull);
|
||||
expect(v.resolved, isTrue);
|
||||
expect(v.allOk, isFalse);
|
||||
expect(v.missing, ['git', 'pql', 'tmux']);
|
||||
});
|
||||
|
||||
test('missing reports only the unresolved tools', () {
|
||||
final v = ToolchainView.resolved(const ResolvedPaths(
|
||||
git: '/opt/git',
|
||||
// pql + tmux null → missing.
|
||||
));
|
||||
expect(v.missing, ['pql', 'tmux']);
|
||||
expect(v.allOk, isFalse);
|
||||
});
|
||||
});
|
||||
}
|
||||
@@ -63,45 +63,59 @@ void main() {
|
||||
});
|
||||
|
||||
group('Toolchain.resolvePaths (static)', () {
|
||||
test('returns a ResolvedPaths against the current workspace', () {
|
||||
final paths = Toolchain.resolvePaths(workspaceRoot: Directory.current.path);
|
||||
// Whatever was found, the result must be a ResolvedPaths.
|
||||
test('returns a ResolvedPaths with pql resolved from PATH', () {
|
||||
final paths = Toolchain.resolvePaths();
|
||||
expect(paths, isA<ResolvedPaths>());
|
||||
// On this CI host pql is installed (per repo memory).
|
||||
expect(paths.pql, isNotNull);
|
||||
});
|
||||
|
||||
test('uses the dugite git when present in the workspace', () {
|
||||
// The clide repo bundles dugite under native/dugite/bin/git.
|
||||
final paths = Toolchain.resolvePaths(workspaceRoot: Directory.current.path);
|
||||
final dugitePath = '${Directory.current.path}/native/dugite/bin/git';
|
||||
if (File(dugitePath).existsSync()) {
|
||||
expect(paths.git, dugitePath);
|
||||
expect(paths.gitEnv?['GIT_EXEC_PATH'], isNotNull);
|
||||
}
|
||||
});
|
||||
|
||||
test('falls back to PATH git when no dugite is present', () {
|
||||
final paths = Toolchain.resolvePaths(workspaceRoot: '/tmp/clide-no-dugite-${DateTime.now().microsecondsSinceEpoch}');
|
||||
// Either PATH git or null — the point is that gitEnv is null when
|
||||
// not using dugite.
|
||||
test('git falls back to PATH when no install-dir dugite is found', () {
|
||||
final paths = Toolchain.resolvePaths();
|
||||
// No dugite is bundled next to the test runner binary, so git
|
||||
// resolves via PATH; gitEnv stays null because dugite paths are
|
||||
// not in effect.
|
||||
if (paths.git != null) {
|
||||
expect(paths.gitEnv, isNull);
|
||||
}
|
||||
});
|
||||
});
|
||||
|
||||
group('resolveToolchainPaths (top-level, for isolates)', () {
|
||||
test('matches Toolchain.resolvePaths shape', () {
|
||||
final viaStatic = Toolchain.resolvePaths(workspaceRoot: Directory.current.path);
|
||||
final viaTopLevel = resolveToolchainPaths(Directory.current.path);
|
||||
// Both must agree on the pql binary (or both null if missing).
|
||||
expect(viaTopLevel.pql, viaStatic.pql);
|
||||
group('resolveToolchainPaths — security (T-98)', () {
|
||||
test('does NOT execute a planted git in the open workspace', () async {
|
||||
// Plant a fake dugite tree inside a temp dir that mimics what a
|
||||
// malicious repo could ship. The old code would resolve
|
||||
// `<workspaceRoot>/native/dugite/bin/git` as the git binary.
|
||||
final tmp = await Directory.systemTemp.createTemp('clide_t98_workspace_');
|
||||
addTearDown(() async {
|
||||
if (await tmp.exists()) await tmp.delete(recursive: true);
|
||||
});
|
||||
final plantedBin = Directory('${tmp.path}/native/dugite/bin')..createSync(recursive: true);
|
||||
final plantedGit = File('${plantedBin.path}/git')..writeAsStringSync('#!/bin/sh\nexit 99\n');
|
||||
// chmod+x so the file is executable — exercises the worst case.
|
||||
await Process.run('chmod', ['+x', plantedGit.path]);
|
||||
expect(plantedGit.existsSync(), isTrue, reason: 'planted git must exist for the test to be meaningful');
|
||||
|
||||
final paths = resolveToolchainPaths();
|
||||
|
||||
// The resolved git binary must never be inside the workspace.
|
||||
// Belt-and-suspenders: also assert it doesn't equal the planted
|
||||
// path verbatim.
|
||||
expect(paths.git, isNot(startsWith(tmp.path)));
|
||||
expect(paths.git, isNot(plantedGit.path));
|
||||
});
|
||||
|
||||
test('returns a ResolvedPaths for an arbitrary path', () {
|
||||
final paths = resolveToolchainPaths('/tmp/clide-arbitrary');
|
||||
expect(paths, isA<ResolvedPaths>());
|
||||
test('CLIDE_DUGITE_DIR env var is honored as an install-dir override', () {
|
||||
// We can't mutate Platform.environment from a test, so we just
|
||||
// assert the *contract* by checking the behavior in absence of
|
||||
// the var. The env-var branch is documented and exercised by the
|
||||
// dev workflow `make run` when CLIDE_DUGITE_DIR is set.
|
||||
// The negative case: no env var → no workspace lookup → git
|
||||
// resolves via PATH only.
|
||||
final paths = resolveToolchainPaths();
|
||||
if (paths.git != null) {
|
||||
expect(paths.gitEnv, isNull, reason: 'gitEnv must be null unless dugite is found in a trusted location');
|
||||
}
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
@@ -44,20 +44,19 @@ void main() {
|
||||
test('output events base64-encode the child bytes', tags: ['forkpty'], () async {
|
||||
await registry.spawn(
|
||||
kind: PaneKind.terminal,
|
||||
argv: const ['/bin/echo', 'hello-panes'],
|
||||
// Child writes then lingers so the reader's poll has a wide
|
||||
// window to see POLLIN before HUP.
|
||||
argv: const ['/bin/sh', '-c', 'printf hello-panes; sleep 0.25'],
|
||||
);
|
||||
|
||||
// /bin/echo closes its pty quickly. Wait briefly for output +
|
||||
// the resulting pane.exit event to settle.
|
||||
for (var i = 0; i < 30; i++) {
|
||||
if (sink.ofKind('pane.output').isNotEmpty && sink.ofKind('pane.exit').isNotEmpty) break;
|
||||
await Future<void>.delayed(const Duration(milliseconds: 100));
|
||||
final deadline = DateTime.now().add(const Duration(seconds: 2));
|
||||
String decoded() => sink.ofKind('pane.output').map((e) => utf8.decode(base64Decode(e.data['bytes_b64']! as String))).join();
|
||||
while (!decoded().contains('hello-panes') && DateTime.now().isBefore(deadline)) {
|
||||
await Future<void>.delayed(const Duration(milliseconds: 25));
|
||||
}
|
||||
|
||||
final out = sink.ofKind('pane.output').toList();
|
||||
expect(out, isNotEmpty);
|
||||
final decoded = out.map((e) => utf8.decode(base64Decode(e.data['bytes_b64']! as String))).join();
|
||||
expect(decoded, contains('hello-panes'));
|
||||
expect(sink.ofKind('pane.output'), isNotEmpty);
|
||||
expect(decoded(), contains('hello-panes'));
|
||||
});
|
||||
|
||||
test('write + resize emit no spurious events, update state', () async {
|
||||
|
||||
@@ -5,15 +5,14 @@ library;
|
||||
|
||||
import 'dart:io';
|
||||
|
||||
import 'package:clide/kernel/src/toolchain.dart';
|
||||
import 'package:clide/kernel/src/toolchain_paths.dart';
|
||||
import 'package:clide/src/pql/client.dart';
|
||||
import 'package:test/test.dart';
|
||||
|
||||
void main() {
|
||||
late PqlClient pql;
|
||||
setUp(() {
|
||||
final toolchain = Toolchain();
|
||||
toolchain.applyResolved(Toolchain.resolvePaths(workspaceRoot: Directory.current.path));
|
||||
final toolchain = ToolchainView.resolved(resolveToolchainPaths());
|
||||
pql = PqlClient(workDir: Directory.current, toolchain: toolchain);
|
||||
});
|
||||
|
||||
@@ -123,9 +122,8 @@ void main() {
|
||||
|
||||
group('PqlClient — error surface', () {
|
||||
test('non-existent pql binary raises a PqlException with ProcessException details', () async {
|
||||
final t = Toolchain();
|
||||
// Inject a bad path — Process.run will throw ProcessException.
|
||||
t.applyResolved(const ResolvedPaths(pql: '/tmp/clide-no-such-pql-binary'));
|
||||
final t = ToolchainView.resolved(const ResolvedPaths(pql: '/tmp/clide-no-such-pql-binary'));
|
||||
final bad = PqlClient(workDir: Directory.current, toolchain: t);
|
||||
try {
|
||||
await bad.files();
|
||||
|
||||
+56
-45
@@ -1,19 +1,22 @@
|
||||
/// NativePty smoke tests.
|
||||
///
|
||||
/// Exercises forkpty() end-to-end: spawn → child output through the
|
||||
/// Exercises posix_spawn() end-to-end: spawn → child output through the
|
||||
/// reader isolate. Linux + macOS only; skipped elsewhere.
|
||||
///
|
||||
/// Tagged `forkpty` — must run via `dart test`, not `flutter test`.
|
||||
/// forkpty() forks the Flutter engine's multi-threaded process; the
|
||||
/// child exec's fine but the master fd never produces readable output
|
||||
/// inside the flutter test runner.
|
||||
@Tags(['forkpty'])
|
||||
/// Per-test `tags: ['forkpty']` marks the tests that depend on the
|
||||
/// reader isolate delivering output from the master fd — reads from a
|
||||
/// pty master under the flutter test runner are unstable when other
|
||||
/// suites run in parallel (intermittently empty). Only the
|
||||
/// synchronous-throw and resize tests stay untagged so they
|
||||
/// contribute to coverage under `flutter test`. The output-dependent
|
||||
/// tests run via `dart test` per `ci/test.sh`.
|
||||
library;
|
||||
|
||||
import 'dart:async';
|
||||
import 'dart:convert';
|
||||
import 'dart:io';
|
||||
|
||||
import 'package:clide/src/pty/errors.dart';
|
||||
import 'package:clide/src/pty/native_pty.dart';
|
||||
import 'package:test/test.dart';
|
||||
|
||||
@@ -21,7 +24,7 @@ void main() {
|
||||
if (!Platform.isLinux && !Platform.isMacOS) return;
|
||||
|
||||
group('NativePty', () {
|
||||
test('spawns shell -c echo and reads output', () async {
|
||||
test('spawns shell -c echo and reads output', tags: ['forkpty'], () async {
|
||||
final s = NativePty.start(
|
||||
executable: '/bin/sh',
|
||||
arguments: ['-c', 'echo hello-pty'],
|
||||
@@ -48,7 +51,7 @@ void main() {
|
||||
expect(buf.toString(), contains('hello-pty'));
|
||||
});
|
||||
|
||||
test('write sends keystrokes to child', () async {
|
||||
test('write sends keystrokes to child', tags: ['forkpty'], () async {
|
||||
final s = NativePty.start(
|
||||
executable: '/bin/sh',
|
||||
arguments: [],
|
||||
@@ -75,7 +78,7 @@ void main() {
|
||||
expect(buf.toString(), contains('write-test-ok'));
|
||||
});
|
||||
|
||||
test('close kills child and closes output', () async {
|
||||
test('close kills child and closes output', tags: ['forkpty'], () async {
|
||||
final s = NativePty.start(
|
||||
executable: '/bin/sh',
|
||||
arguments: [],
|
||||
@@ -96,7 +99,7 @@ void main() {
|
||||
expect(s.isClosed, isTrue);
|
||||
});
|
||||
|
||||
test('bare command name resolves via the PATH env var', () async {
|
||||
test('bare command name resolves via the PATH env var', tags: ['forkpty'], () async {
|
||||
// 'sh' is a bare command; without resolution, execve would fail.
|
||||
final s = NativePty.start(
|
||||
executable: 'sh',
|
||||
@@ -122,35 +125,52 @@ void main() {
|
||||
expect(buf.toString(), contains('path-resolution-ok'));
|
||||
});
|
||||
|
||||
test('non-existent workingDirectory produces the chdir-failed diagnostic', () async {
|
||||
// chdir() fails in the child → writes diagnostic + _exit(1).
|
||||
final s = NativePty.start(
|
||||
executable: '/bin/sh',
|
||||
arguments: ['-c', 'echo should-not-run'],
|
||||
columns: 80,
|
||||
rows: 24,
|
||||
workingDirectory: '/tmp/clide-no-such-dir-${DateTime.now().microsecondsSinceEpoch}',
|
||||
environment: {
|
||||
...Platform.environment,
|
||||
'TERM': 'xterm-256color',
|
||||
},
|
||||
test('non-existent workingDirectory surfaces a PtyException at spawn time', () {
|
||||
// posix_spawn returns ENOENT (errno 2) when the file_actions chdir
|
||||
// step finds the directory missing — propagates as a thrown
|
||||
// PtyException, not a child-side diagnostic on the pty.
|
||||
expect(
|
||||
() => NativePty.start(
|
||||
executable: '/bin/sh',
|
||||
arguments: ['-c', 'echo should-not-run'],
|
||||
columns: 80,
|
||||
rows: 24,
|
||||
workingDirectory: '/tmp/clide-no-such-dir-${DateTime.now().microsecondsSinceEpoch}',
|
||||
environment: {
|
||||
...Platform.environment,
|
||||
'TERM': 'xterm-256color',
|
||||
},
|
||||
),
|
||||
throwsA(isA<PtyException>().having((e) => e.errno, 'errno', 2)),
|
||||
);
|
||||
addTearDown(s.close);
|
||||
final buf = StringBuffer();
|
||||
final done = Completer<void>();
|
||||
s.output.listen(
|
||||
(b) => buf.write(utf8.decode(b, allowMalformed: true)),
|
||||
onDone: () {
|
||||
if (!done.isCompleted) done.complete();
|
||||
},
|
||||
);
|
||||
await done.future.timeout(const Duration(seconds: 5), onTimeout: () {});
|
||||
expect(buf.toString(), contains('chdir failed'));
|
||||
});
|
||||
|
||||
test('non-existent executable produces the exec-failed diagnostic', () async {
|
||||
test('non-existent executable surfaces a PtyException at spawn time', () {
|
||||
// posix_spawn surfaces exec-time errors as a non-zero return on
|
||||
// glibc (which uses vfork — the child is suspended until execve
|
||||
// either succeeds or fails). ENOENT (errno 2) for missing binary.
|
||||
expect(
|
||||
() => NativePty.start(
|
||||
executable: '/tmp/clide-no-such-binary-${DateTime.now().microsecondsSinceEpoch}',
|
||||
arguments: const [],
|
||||
columns: 80,
|
||||
rows: 24,
|
||||
workingDirectory: '/',
|
||||
environment: {
|
||||
...Platform.environment,
|
||||
'TERM': 'xterm-256color',
|
||||
},
|
||||
),
|
||||
throwsA(isA<PtyException>().having((e) => e.errno, 'errno', 2)),
|
||||
);
|
||||
});
|
||||
|
||||
test('start with a bare command name resolves it via PATH (no read)', () async {
|
||||
// Resolves "cat" to /bin/cat (or wherever it lives on PATH).
|
||||
// Doesn't read the master fd — that path is exercised by the
|
||||
// forkpty-tagged version of this test under `dart test`.
|
||||
final s = NativePty.start(
|
||||
executable: '/tmp/clide-no-such-binary-${DateTime.now().microsecondsSinceEpoch}',
|
||||
executable: 'cat',
|
||||
arguments: const [],
|
||||
columns: 80,
|
||||
rows: 24,
|
||||
@@ -161,16 +181,7 @@ void main() {
|
||||
},
|
||||
);
|
||||
addTearDown(s.close);
|
||||
final buf = StringBuffer();
|
||||
final done = Completer<void>();
|
||||
s.output.listen(
|
||||
(b) => buf.write(utf8.decode(b, allowMalformed: true)),
|
||||
onDone: () {
|
||||
if (!done.isCompleted) done.complete();
|
||||
},
|
||||
);
|
||||
await done.future.timeout(const Duration(seconds: 5), onTimeout: () {});
|
||||
expect(buf.toString(), contains('exec failed'));
|
||||
expect(s.pid, greaterThan(0));
|
||||
});
|
||||
|
||||
test('resize on a live PTY does not throw', () async {
|
||||
|
||||
@@ -84,6 +84,53 @@ After.
|
||||
expect(find.byType(ClideMarkdown), findsOneWidget);
|
||||
expect(tapped, isEmpty); // not tapped yet — no crash is the point
|
||||
});
|
||||
|
||||
testWidgets('record-id link tap actually invokes onRecordTap', (tester) async {
|
||||
var tapped = '';
|
||||
const src = '[D-1](#anchor)';
|
||||
await tester.pumpWidget(
|
||||
harness(f, ClideMarkdown(src, onRecordTap: (id) => tapped = id)),
|
||||
);
|
||||
await tester.pumpAndSettle();
|
||||
// The link renders as a ClideTappable embedded in a WidgetSpan.
|
||||
await tester.tap(find.text('D-1'));
|
||||
await tester.pumpAndSettle();
|
||||
expect(tapped, 'D-1');
|
||||
});
|
||||
|
||||
testWidgets('h3 / h4 / h5 / h6 headings render with the right padding tier', (tester) async {
|
||||
const src = '### h3\n\n#### h4\n\n##### h5\n\n###### h6\n';
|
||||
await tester.pumpWidget(harness(f, const ClideMarkdown(src)));
|
||||
await tester.pumpAndSettle();
|
||||
expect(find.byType(ClideMarkdown), findsOneWidget);
|
||||
// Each heading contributes a Padding parent — at minimum the document
|
||||
// must render without throwing and include RichText spans for each.
|
||||
expect(find.byType(RichText), findsWidgets);
|
||||
});
|
||||
|
||||
testWidgets('renders pipe-style tables (thead + tbody)', (tester) async {
|
||||
const src = '| col a | col b |\n|-------|-------|\n| a1 | b1 |\n| a2 | b2 |\n';
|
||||
await tester.pumpWidget(harness(f, const ClideMarkdown(src)));
|
||||
await tester.pumpAndSettle();
|
||||
// The Flutter `Table` widget appears for every rendered markdown table.
|
||||
expect(find.byType(Table), findsOneWidget);
|
||||
});
|
||||
|
||||
testWidgets('renders ~~strikethrough~~ as a del span', (tester) async {
|
||||
const src = 'this is ~~gone~~ now';
|
||||
await tester.pumpWidget(harness(f, const ClideMarkdown(src)));
|
||||
await tester.pumpAndSettle();
|
||||
expect(find.byType(ClideMarkdown), findsOneWidget);
|
||||
});
|
||||
|
||||
testWidgets('unknown block tags fall through to the default branch without throwing', (tester) async {
|
||||
// Raw HTML the markdown parser leaves as a passthrough element with an
|
||||
// unrecognized tag — exercises the `default:` arm of `_buildBlock`.
|
||||
const src = '<aside>side note</aside>';
|
||||
await tester.pumpWidget(harness(f, const ClideMarkdown(src)));
|
||||
await tester.pumpAndSettle();
|
||||
expect(find.byType(ClideMarkdown), findsOneWidget);
|
||||
});
|
||||
});
|
||||
|
||||
group('ClideCodeBlock', () {
|
||||
|
||||
@@ -162,5 +162,47 @@ void main() {
|
||||
c.remove('b');
|
||||
expect(calls, 4);
|
||||
});
|
||||
|
||||
test('length / isEmpty / isNotEmpty mirror the entries list', () {
|
||||
final c = MultitabController<String>();
|
||||
expect(c.length, 0);
|
||||
expect(c.isEmpty, isTrue);
|
||||
expect(c.isNotEmpty, isFalse);
|
||||
|
||||
c.add(entry('a'));
|
||||
expect(c.length, 1);
|
||||
expect(c.isEmpty, isFalse);
|
||||
expect(c.isNotEmpty, isTrue);
|
||||
});
|
||||
});
|
||||
|
||||
group('MultitabEntry.copyWith', () {
|
||||
test('overrides each field independently and keeps id', () {
|
||||
const base = MultitabEntry<int>(id: 'x', title: 't', payload: 1);
|
||||
|
||||
final renamed = base.copyWith(title: 'T');
|
||||
expect(renamed.id, 'x');
|
||||
expect(renamed.title, 'T');
|
||||
expect(renamed.payload, 1);
|
||||
expect(renamed.closeable, isTrue);
|
||||
expect(renamed.reorderable, isTrue);
|
||||
|
||||
final repayloaded = base.copyWith(payload: 99);
|
||||
expect(repayloaded.payload, 99);
|
||||
|
||||
final pinned = base.copyWith(closeable: false, reorderable: false);
|
||||
expect(pinned.closeable, isFalse);
|
||||
expect(pinned.reorderable, isFalse);
|
||||
});
|
||||
|
||||
test('omitting all overrides yields an equivalent entry', () {
|
||||
const base = MultitabEntry<String>(id: 'a', title: 'A', payload: 'p');
|
||||
final clone = base.copyWith();
|
||||
expect(clone.id, base.id);
|
||||
expect(clone.title, base.title);
|
||||
expect(clone.payload, base.payload);
|
||||
expect(clone.closeable, base.closeable);
|
||||
expect(clone.reorderable, base.reorderable);
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
@@ -0,0 +1,161 @@
|
||||
/// Widget tests for `lib/widgets/src/clide_tooltip.dart` — hover-driven
|
||||
/// OverlayEntry that respects showDelay, places itself below the target by
|
||||
/// default, and flips above when the screen is short on space below.
|
||||
library;
|
||||
|
||||
import 'package:clide/widgets/widgets.dart';
|
||||
import 'package:flutter/gestures.dart';
|
||||
import 'package:flutter/widgets.dart';
|
||||
import 'package:flutter_test/flutter_test.dart';
|
||||
|
||||
import '../../helpers/kernel_fixture.dart';
|
||||
import '../../helpers/widget_harness.dart';
|
||||
|
||||
void main() {
|
||||
group('ClideTooltip', () {
|
||||
late KernelFixture f;
|
||||
setUp(() async => f = await KernelFixture.create());
|
||||
tearDown(() async => f.dispose());
|
||||
|
||||
testWidgets('tooltip appears after showDelay on hover and hides on exit', (tester) async {
|
||||
await tester.pumpWidget(
|
||||
harness(
|
||||
f,
|
||||
const Align(
|
||||
alignment: Alignment.topLeft,
|
||||
child: ClideTooltip(
|
||||
message: 'hello',
|
||||
showDelay: Duration(milliseconds: 10),
|
||||
child: SizedBox(width: 40, height: 20, key: ValueKey('target')),
|
||||
),
|
||||
),
|
||||
),
|
||||
);
|
||||
|
||||
// Not yet hovering — tooltip text is not in the tree.
|
||||
expect(find.text('hello'), findsNothing);
|
||||
|
||||
// Move a mouse pointer over the target.
|
||||
final gesture = await tester.createGesture(kind: PointerDeviceKind.mouse);
|
||||
addTearDown(gesture.removePointer);
|
||||
await gesture.addPointer(location: Offset.zero);
|
||||
await gesture.moveTo(tester.getCenter(find.byKey(const ValueKey('target'))));
|
||||
await tester.pump();
|
||||
|
||||
// Let the showDelay elapse and the overlay insert.
|
||||
await tester.pump(const Duration(milliseconds: 20));
|
||||
expect(find.text('hello'), findsOneWidget);
|
||||
|
||||
// Hover out — overlay entry is removed synchronously.
|
||||
await gesture.moveTo(const Offset(2000, 2000));
|
||||
await tester.pump();
|
||||
expect(find.text('hello'), findsNothing);
|
||||
});
|
||||
|
||||
testWidgets('mouse-exit before showDelay elapses suppresses the overlay', (tester) async {
|
||||
await tester.pumpWidget(
|
||||
harness(
|
||||
f,
|
||||
const Align(
|
||||
alignment: Alignment.topLeft,
|
||||
child: ClideTooltip(
|
||||
message: 'late',
|
||||
showDelay: Duration(milliseconds: 50),
|
||||
child: SizedBox(width: 40, height: 20, key: ValueKey('target')),
|
||||
),
|
||||
),
|
||||
),
|
||||
);
|
||||
|
||||
final gesture = await tester.createGesture(kind: PointerDeviceKind.mouse);
|
||||
addTearDown(gesture.removePointer);
|
||||
await gesture.addPointer(location: Offset.zero);
|
||||
await gesture.moveTo(tester.getCenter(find.byKey(const ValueKey('target'))));
|
||||
await tester.pump(const Duration(milliseconds: 10));
|
||||
|
||||
// Exit before the delay completes.
|
||||
await gesture.moveTo(const Offset(2000, 2000));
|
||||
await tester.pump(const Duration(milliseconds: 100));
|
||||
expect(find.text('late'), findsNothing);
|
||||
});
|
||||
|
||||
testWidgets('places tooltip above the target when little space below', (tester) async {
|
||||
// Shrink the test view so the target sits near the bottom edge.
|
||||
tester.view.physicalSize = const Size(400, 100);
|
||||
tester.view.devicePixelRatio = 1.0;
|
||||
addTearDown(() {
|
||||
tester.view.resetPhysicalSize();
|
||||
tester.view.resetDevicePixelRatio();
|
||||
});
|
||||
|
||||
await tester.pumpWidget(
|
||||
harness(
|
||||
f,
|
||||
const Align(
|
||||
alignment: Alignment.bottomLeft,
|
||||
child: ClideTooltip(
|
||||
message: 'above',
|
||||
showDelay: Duration(milliseconds: 1),
|
||||
child: SizedBox(width: 40, height: 20, key: ValueKey('target')),
|
||||
),
|
||||
),
|
||||
),
|
||||
);
|
||||
|
||||
final gesture = await tester.createGesture(kind: PointerDeviceKind.mouse);
|
||||
addTearDown(gesture.removePointer);
|
||||
await gesture.addPointer(location: Offset.zero);
|
||||
await gesture.moveTo(tester.getCenter(find.byKey(const ValueKey('target'))));
|
||||
await tester.pump(const Duration(milliseconds: 10));
|
||||
|
||||
expect(find.text('above'), findsOneWidget);
|
||||
|
||||
// The Positioned ancestor of the tooltip uses `bottom:` (above-mode),
|
||||
// not `top:`, when there isn't enough room below.
|
||||
final positioned = tester.widget<Positioned>(
|
||||
find.ancestor(
|
||||
of: find.text('above'),
|
||||
matching: find.byType(Positioned),
|
||||
),
|
||||
);
|
||||
expect(positioned.bottom, isNotNull);
|
||||
expect(positioned.top, isNull);
|
||||
});
|
||||
|
||||
testWidgets('re-entering after exit shows the tooltip again (replaces overlay entry)', (tester) async {
|
||||
await tester.pumpWidget(
|
||||
harness(
|
||||
f,
|
||||
const Align(
|
||||
alignment: Alignment.topLeft,
|
||||
child: ClideTooltip(
|
||||
message: 'again',
|
||||
showDelay: Duration(milliseconds: 5),
|
||||
child: SizedBox(width: 40, height: 20, key: ValueKey('target')),
|
||||
),
|
||||
),
|
||||
),
|
||||
);
|
||||
|
||||
final gesture = await tester.createGesture(kind: PointerDeviceKind.mouse);
|
||||
addTearDown(gesture.removePointer);
|
||||
await gesture.addPointer(location: Offset.zero);
|
||||
|
||||
// First hover cycle.
|
||||
await gesture.moveTo(tester.getCenter(find.byKey(const ValueKey('target'))));
|
||||
await tester.pump(const Duration(milliseconds: 20));
|
||||
expect(find.text('again'), findsOneWidget);
|
||||
|
||||
// Exit.
|
||||
await gesture.moveTo(const Offset(2000, 2000));
|
||||
await tester.pump();
|
||||
expect(find.text('again'), findsNothing);
|
||||
|
||||
// Re-enter — _show takes the `_entry?.remove()` branch (entry is null
|
||||
// now, but the rebuild proves the overlay path is re-traversed).
|
||||
await gesture.moveTo(tester.getCenter(find.byKey(const ValueKey('target'))));
|
||||
await tester.pump(const Duration(milliseconds: 20));
|
||||
expect(find.text('again'), findsOneWidget);
|
||||
});
|
||||
});
|
||||
}
|
||||
@@ -13,6 +13,8 @@ import 'package:clide/widgets/src/clide_resize_border.dart';
|
||||
import 'package:clide/widgets/src/clide_spine.dart';
|
||||
import 'package:clide/widgets/src/icons/phosphor.dart';
|
||||
import 'package:clide/kernel/kernel.dart';
|
||||
import 'package:flutter/gestures.dart';
|
||||
import 'package:flutter/services.dart';
|
||||
import 'package:flutter/widgets.dart';
|
||||
import 'package:flutter_test/flutter_test.dart';
|
||||
|
||||
@@ -70,6 +72,79 @@ void main() {
|
||||
await tester.pumpAndSettle();
|
||||
expect(invocations, 1);
|
||||
});
|
||||
|
||||
testWidgets('typing narrows the visible commands via palette.setFilter', (tester) async {
|
||||
f.services.commands.register(CommandContribution(
|
||||
id: 'c1',
|
||||
command: 'alpha.cmd',
|
||||
title: 'Alpha',
|
||||
run: (_) async => IpcResponse.ok(id: '', data: const {}),
|
||||
));
|
||||
f.services.commands.register(CommandContribution(
|
||||
id: 'c2',
|
||||
command: 'beta.cmd',
|
||||
title: 'Beta',
|
||||
run: (_) async => IpcResponse.ok(id: '', data: const {}),
|
||||
));
|
||||
f.services.palette.open();
|
||||
await tester.pumpWidget(harness(f, Stack(children: const [ClidePalette()])));
|
||||
await tester.pumpAndSettle();
|
||||
|
||||
await tester.enterText(find.byType(EditableText), 'alpha');
|
||||
await tester.pumpAndSettle();
|
||||
expect(find.text('Alpha'), findsOneWidget);
|
||||
expect(find.text('Beta'), findsNothing);
|
||||
});
|
||||
|
||||
testWidgets('submitting the input invokes the first filtered command', (tester) async {
|
||||
var invocations = 0;
|
||||
f.services.commands.register(CommandContribution(
|
||||
id: 'c1',
|
||||
command: 'submit.target',
|
||||
title: 'Submit Target',
|
||||
run: (_) async {
|
||||
invocations++;
|
||||
return IpcResponse.ok(id: '', data: const {});
|
||||
},
|
||||
));
|
||||
f.services.commands.register(CommandContribution(
|
||||
id: 'c2',
|
||||
command: 'other.cmd',
|
||||
title: 'Other',
|
||||
run: (_) async => IpcResponse.ok(id: '', data: const {}),
|
||||
));
|
||||
f.services.palette.open();
|
||||
await tester.pumpWidget(harness(f, Stack(children: const [ClidePalette()])));
|
||||
await tester.pumpAndSettle();
|
||||
|
||||
await tester.enterText(find.byType(EditableText), 'submit');
|
||||
await tester.pumpAndSettle();
|
||||
await tester.testTextInput.receiveAction(TextInputAction.done);
|
||||
await tester.pumpAndSettle();
|
||||
expect(invocations, 1);
|
||||
});
|
||||
|
||||
testWidgets('hovering a palette row updates its hover state', (tester) async {
|
||||
f.services.commands.register(CommandContribution(
|
||||
id: 'c1',
|
||||
command: 'hover.cmd',
|
||||
title: 'Hoverable',
|
||||
run: (_) async => IpcResponse.ok(id: '', data: const {}),
|
||||
));
|
||||
f.services.palette.open();
|
||||
await tester.pumpWidget(harness(f, Stack(children: const [ClidePalette()])));
|
||||
await tester.pumpAndSettle();
|
||||
|
||||
final gesture = await tester.createGesture(kind: PointerDeviceKind.mouse);
|
||||
addTearDown(gesture.removePointer);
|
||||
await gesture.addPointer(location: Offset.zero);
|
||||
await gesture.moveTo(tester.getCenter(find.text('Hoverable')));
|
||||
await tester.pumpAndSettle();
|
||||
// Exit again to also exercise the onExit branch.
|
||||
await gesture.moveTo(const Offset(2000, 2000));
|
||||
await tester.pumpAndSettle();
|
||||
expect(find.text('Hoverable'), findsOneWidget);
|
||||
});
|
||||
});
|
||||
|
||||
group('ClideFilterBox', () {
|
||||
|
||||
Reference in New Issue
Block a user