Compare commits
215
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
007cc9a1f2 | ||
|
|
8e2670ff1d | ||
|
|
6b8cf848ff | ||
|
|
f56b9de0d6 | ||
|
|
c4cd42eb29 | ||
|
|
21bc460892 | ||
|
|
31151e7aa6 | ||
|
|
2b720cb2c2 | ||
|
|
c4dba8cb60 | ||
|
|
7d2b8b644d | ||
|
|
ffb4c3eedd | ||
|
|
538a623bb8 | ||
|
|
01cecdad60 | ||
|
|
fc474d3061 | ||
|
|
ea4b8a1e5f | ||
|
|
d1a41d6534 | ||
|
|
de0590c25b | ||
|
|
1072e17193 | ||
|
|
efe01e3019 | ||
|
|
ab79470356 | ||
|
|
a35df2afb2 | ||
|
|
141e470aee | ||
|
|
92fec50fcb | ||
|
|
4d2ee284ff | ||
|
|
a3fced25c4 | ||
|
|
27a8c29fe4 | ||
|
|
4564d6eb60 | ||
|
|
941259ce4f | ||
|
|
ed2a343676 | ||
|
|
02d44b93a4 | ||
|
|
22a9d58d5c | ||
|
|
f16aa87d8b | ||
|
|
7a651aee77 | ||
|
|
be56c0c7cd | ||
|
|
9bf31eb53c | ||
|
|
95dd9740da | ||
|
|
92841efac9 | ||
|
|
f07a1c8cc7 | ||
|
|
5a4fcd5a24 | ||
|
|
0096392cde | ||
|
|
b5c91a81c5 | ||
|
|
1b2a2d0a78 | ||
|
|
f4e983693e | ||
|
|
ee1cd006af | ||
|
|
70acccfe0c | ||
|
|
47db0383c7 | ||
|
|
33e8e70e06 | ||
|
|
e201bceafb | ||
|
|
d4b26be706 | ||
|
|
0fe02c84af | ||
|
|
27bd2ac768 | ||
|
|
e87323f71a | ||
|
|
20b270ef07 | ||
|
|
3e10c43bd5 | ||
|
|
6041379e98 | ||
|
|
facf1a5f9e | ||
|
|
af41144689 | ||
|
|
2c0e23d4fb | ||
|
|
68f4fe61fa | ||
|
|
58dbfc8313 | ||
|
|
d6d102111e | ||
|
|
db96f53bc2 | ||
|
|
03601db69c | ||
|
|
ddabf46bf3 | ||
|
|
887f702c05 | ||
|
|
9dfa83e607 | ||
|
|
420cd07507 | ||
|
|
fdf10f02f7 | ||
|
|
236572107b | ||
|
|
879edbdfb0 | ||
|
|
61c546ab79 | ||
|
|
fdd53b0dd9 | ||
|
|
a321babb28 | ||
|
|
955837b5bb | ||
|
|
a9dd264a72 | ||
|
|
46ae8051d4 | ||
|
|
7e50134200 | ||
|
|
dd6d0a8e12 | ||
|
|
5ee09a3fb6 | ||
|
|
0a242e15ba | ||
|
|
c6a92735d3 | ||
|
|
cb2dcfa4cc | ||
|
|
de633f8697 | ||
|
|
16d02ffee1 | ||
|
|
40a03d987f | ||
|
|
2d5e9835f5 | ||
|
|
478ddb13e9 | ||
|
|
00baa83a2c | ||
|
|
a3a8516e66 | ||
|
|
12a9605b01 | ||
|
|
e29a4ee380 | ||
|
|
247291eeb9 | ||
|
|
121ddb9964 | ||
|
|
6d673a1321 | ||
|
|
50e96e0d77 | ||
|
|
c427cb5b61 | ||
|
|
d74e07ef08 | ||
|
|
e0d80fd3ae | ||
|
|
a10757ba7c | ||
|
|
e35ff5c7ad | ||
|
|
9ddd23c388 | ||
|
|
c813eef6cc | ||
|
|
5dec221a68 | ||
|
|
e861eb55b0 | ||
|
|
2646842c32 | ||
|
|
b6d6de7e53 | ||
|
|
75d5a795a2 | ||
|
|
1600a57b66 | ||
|
|
2a0f688e10 | ||
|
|
24f3b4bdef | ||
|
|
3adc88963b | ||
|
|
6d06acc111 | ||
|
|
ba64bcd2e6 | ||
|
|
27d85f934c | ||
|
|
54f9f24726 | ||
|
|
7fc25ae53f | ||
|
|
8770f98dcd | ||
|
|
6572fa90f0 | ||
|
|
99149443b7 | ||
|
|
7370a422d1 | ||
|
|
0fc43ef6d0 | ||
|
|
5c6aea4ffc | ||
|
|
c38f02afa3 | ||
|
|
a6509f6456 | ||
|
|
9cd9d10d50 | ||
|
|
6cd99ddbc3 | ||
|
|
e15ab2303a | ||
|
|
4ca4becaa8 | ||
|
|
0f90003d15 | ||
|
|
db2382092e | ||
|
|
6e092c32ea | ||
|
|
1ff271bb5e | ||
|
|
fbdfd3fb89 | ||
|
|
6490dbc368 | ||
|
|
d7a4a18ce8 | ||
|
|
d6a3bea7c9 | ||
|
|
0457bf9ff3 | ||
|
|
a6b4bc4170 | ||
|
|
ad0fd12262 | ||
|
|
2e69b15de6 | ||
|
|
198c6c916b | ||
|
|
8148023a1e | ||
|
|
3565cc6ac6 | ||
|
|
07241440c9 | ||
|
|
f2f3ca12ba | ||
|
|
452029a6d3 | ||
|
|
084acecd22 | ||
|
|
7fd4d6c98e | ||
|
|
736a45e1ff | ||
|
|
a36fa356ae | ||
|
|
4466ac93c3 | ||
|
|
68a0a8e326 | ||
|
|
eba0e86758 | ||
|
|
1c435a88ae | ||
|
|
1c8e943667 | ||
|
|
04c1a6bfc9 | ||
|
|
1e268d553d | ||
|
|
d0904b2c84 | ||
|
|
7899539d4b | ||
|
|
fa32c82e0d | ||
|
|
44ee444cac | ||
|
|
06d5c64de3 | ||
|
|
1ae986bb31 | ||
|
|
9d0c6eba31 | ||
|
|
c7b767aa04 | ||
|
|
3e07dad69c | ||
|
|
c8fb89122e | ||
|
|
55e56ea652 | ||
|
|
ac890fd996 | ||
|
|
24d46a815a | ||
|
|
500c2f2179 | ||
|
|
26039e52b1 | ||
|
|
f4ab274db9 | ||
|
|
43197745f1 | ||
|
|
17dc9719e9 | ||
|
|
0f58331654 | ||
|
|
589c8cdf6e | ||
|
|
79186b291d | ||
|
|
ff647fba0a | ||
|
|
2f8a2b60d5 | ||
|
|
454a0f4244 | ||
|
|
a48a7ff696 | ||
|
|
bde59eb74e | ||
|
|
0b85d42197 | ||
|
|
2e846933e9 | ||
|
|
5e032898f8 | ||
|
|
91b9bec926 | ||
|
|
b978e09327 | ||
|
|
7f8455f1af | ||
|
|
f6b9ddc877 | ||
|
|
44f5246e38 | ||
|
|
9b0376ec39 | ||
|
|
66234cd3e0 | ||
|
|
ad8ed88519 | ||
|
|
7ce5af88aa | ||
|
|
6bfc1d38f7 | ||
|
|
c10dae3e6e | ||
|
|
41fffbebe9 | ||
|
|
c3c62828e3 | ||
|
|
926034750f | ||
|
|
6d8709c05a | ||
|
|
2765e241d3 | ||
|
|
36e18f935d | ||
|
|
0ddcdcbdbf | ||
|
|
99a78f3c7f | ||
|
|
845699e697 | ||
|
|
fe000541b7 | ||
|
|
dfbf9be61c | ||
|
|
be29ae7aa7 | ||
|
|
e3e790fd2b | ||
|
|
2b0b671895 | ||
|
|
2ec3f11cdd | ||
|
|
5ce1a2928e | ||
|
|
339d31f05c | ||
|
|
a444280cb4 |
@@ -38,10 +38,15 @@ anything under `execution`.
|
||||
**Mounting a router without a registry entry makes the server refuse to boot** — see "Permissions"
|
||||
below before adding one.
|
||||
|
||||
**Still single-user: account creation.** `createUser` has exactly one call site, `auth/bootstrap.ts`,
|
||||
gated on an empty table. There is no signup route, no invite flow and no admin create-user handler, so
|
||||
every existing member was inserted into Postgres by hand. That is the largest gap in the model, not a
|
||||
deliberate boundary.
|
||||
**Account creation exists.** `POST /api/users` (owner-gated), with a form under Settings → User Management:
|
||||
it validates the password with the same rules bootstrap uses, refuses a role that is not a row in `roles`,
|
||||
refuses `Super Admin` outright because there is exactly one owner, optionally takes an inbound SSH key, and
|
||||
provisions the Linux account. `POST /users/:id/provision-linux` retries that half if the host was not ready.
|
||||
|
||||
This file said "there is no way to create a second account" for some days after `69a31051` shipped one, and
|
||||
`docs/roles-and-teams.md` sequenced a whole phase around building it. Neither is checkable by
|
||||
`bun run docs:check` — it compares numbers, and this was prose. Worth knowing as the shape of the failure:
|
||||
the counts stay right and the sentences rot.
|
||||
|
||||
## Architecture
|
||||
|
||||
@@ -207,7 +212,7 @@ ahead of everything, and it re-verifies the token itself so it covers routes tha
|
||||
- `permissions/registry.ts` — the single enumeration of what the platform can do, in five kinds:
|
||||
`core` (every account, not deniable), `app` (**the grantable surface**), `confined` (grantable, but
|
||||
only to an account that has a Linux user), `execution` and `admin` (owner only, and `execution` is
|
||||
never grantable at any level). **20 entries as of 2026-08-23** — verified by `bun run docs:check`, which fails if this number drifts again: 5 core, 4 app, 3 confined, 4 execution, 4 admin. It said 27 for nine days.
|
||||
never grantable at any level). **22 entries as of 2026-08-24** — verified by `bun run docs:check`, which fails if this number drifts again: 6 core, 3 app, 4 confined, 3 execution, 6 admin (`todos`, the todo board, is the sixth). `notify` moved from `app` to `core` on 2026-08-24: it was grantable, nothing granted it, and every Member's app was silently 403'd registering its own push token. It said 27 for nine days. The execution count dropped by one when Minesweeper became a plugin — see `plugins/minesweeper/manifest.ts` for why that was a fix rather than a downgrade.
|
||||
- `permissions/authorize.ts` — resolves "may this account do this". Owner short-circuits first; every
|
||||
other answer is role grants plus core, with `execution`/`admin` stripped even if a row grants them,
|
||||
and `confined` stripped for an account with no `osUser`.
|
||||
@@ -361,6 +366,45 @@ withholding the commit until it is good.
|
||||
|
||||
Commit messages: simple lowercase, no prefixes.
|
||||
|
||||
**Stage and commit in ONE step, naming the paths.** `git add <path>` then a bare `git commit` commits the
|
||||
whole **index**, not the path just named — so anything a concurrent session had staged goes into your
|
||||
commit, under your message and your session trailer. Use `git commit -- <paths>` instead, which does what
|
||||
the two-step form only looks like it does.
|
||||
|
||||
This is not hypothetical and it is not rare: two agents share this working tree most nights. On
|
||||
2026-08-23 commit `6e092c32` says "marketplace: minesweeper in the catalogue" and contains nine files of
|
||||
another session's roles work, swept up mid-`git add`. The other session was right not to amend it —
|
||||
rewriting shared history to fix a message is the worse trade — so the record was corrected with a
|
||||
follow-up note instead. Cheap to avoid, awkward to undo.
|
||||
|
||||
Two things about the form itself, both learned the same night. `-m`/`-F` goes BEFORE the `--`, or git
|
||||
reads the message as a pathspec. And it only works on **tracked** files — a new file must be `git add`ed
|
||||
first, so a commit introducing one is `git add <new>` then `git commit -- <paths>`, naming every path.
|
||||
Getting that wrong fails loudly, which is the good case: the release tag that followed it went onto the
|
||||
wrong commit, and only because the tag was checked afterwards did that surface at all.
|
||||
|
||||
**An agent's commit names the session that made it.** A trailer, below `Co-Authored-By`:
|
||||
|
||||
```
|
||||
Officer-Session: 656f5c85-e49a-4f1f-b9f3-042a04b4d043
|
||||
```
|
||||
|
||||
The transcript id, not the session name — names are not stable. On 2026-08-23 one session was
|
||||
`platform-e2` and then `platform-18`, and another `platform-59` then `platform-72`, both renamed by a
|
||||
restart in a single night. The transcript id survived both.
|
||||
|
||||
Why it earns a line in every commit: three agents committed to this repository in one night and `git log`
|
||||
could not tell them apart. `Co-Authored-By` says "an agent", which stopped being useful the moment there was
|
||||
more than one. And the transcript holds the reasoning a commit message cannot — the arguments considered and
|
||||
dropped, what was measured, what the owner decided and why. A commit that names its session is a commit
|
||||
whose "why" is still answerable in six months.
|
||||
|
||||
**The precondition, and it is not built yet:** an agent cannot reliably discover its own transcript id. The
|
||||
only exposure is that a background task's output path contains it, which means starting a job to learn who
|
||||
you are. `commanderBlock` already hands a commander its id in the preamble, so the mechanism exists —
|
||||
`todo/agent-coordination/` carries giving it to every session. Until then, an agent that knows its id should
|
||||
add the trailer and one that does not should leave it out rather than guess.
|
||||
|
||||
## Frontend route conventions (apply to EVERY new dashboard route)
|
||||
|
||||
Worked examples: `/soulseek`, `/music`, `/chat`.
|
||||
@@ -477,6 +521,9 @@ explaining why it was safe.
|
||||
owner-only while the plugin itself stays grantable. What the proxy should pass (`isOwner` and a level,
|
||||
never the role name), why declaring owner-only paths in the manifest beats trusting every plugin to
|
||||
remember, and the credential-resolution work that has to land first
|
||||
- `docs/roles-and-teams.md` — **plan, phase 0 built**: roles as a table, teams as scopes, and the one
|
||||
change that has to land first — the owner becomes an identity rather than whoever holds a role name,
|
||||
because otherwise "add a role" and "become the owner" are the same feature
|
||||
- `docs/localization.md` — **plan, not built**, with a working 5% skeleton already in the tree: taking the
|
||||
web UI to more than one language. What exists and what it cannot do yet, why the server should return
|
||||
error CODES rather than prose (and why a code must not leak more than the prose it replaced), the key
|
||||
@@ -490,6 +537,18 @@ explaining why it was safe.
|
||||
- `docs/editor-buffer-corruption.md` — an open bug with a trap set for it: background-job output appearing
|
||||
inside a file open in the editor. Read it BEFORE investigating a report of that, and before re-testing
|
||||
anything it already rules out
|
||||
- `docs/commander-directory.md` — **designed, not built**: a commander is a directory, not a session. Why
|
||||
its identity is currently borrowed from Claude's transcript id and what that costs — an ordering problem,
|
||||
a first-turn interlock that is a side effect rather than a signal, and a commander that dies with its
|
||||
conversation. The CLAUDE.md in its own working directory is the living document, for free
|
||||
- `docs/plugin-capabilities.md` — **built**: a plugin's tasks, skills and affordances are
|
||||
READ where they live, never copied into `capabilities/`. Why copying breaks a forkable repository, why it
|
||||
goes stale on update and survives a disable, and why separate directories beat namespaced paths —
|
||||
a namespace makes provenance readable, separate directories make it structural
|
||||
- `docs/filesystem-quotas.md` — **planned, not done**: the host-side half of per-user and per-team storage
|
||||
limits. Why the kernel has to enforce it rather than the platform (members have `terminal` and can write
|
||||
past anything we count), why `usrquota`+`grpquota` and not project quotas, and the one thing easiest to
|
||||
get wrong — a team folder that is not `setgid` charges nothing to the team
|
||||
- `TODO.md` — current direction and deferred work; **takes precedence over this file where they disagree**
|
||||
- `src/apps/CLAUDE.md` — shared frontend patterns
|
||||
- `src/databases/CLAUDE.md` — database patterns
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
Deferred work. **The items live in `todo/`, one file each**, grouped by theme; this file is the map
|
||||
over them and is GENERATED — run `bun run todo:index` after any change rather than editing it here.
|
||||
Format and the two-way-sync contract: `todo/README.md`.
|
||||
Format and the two-way-sync contract: `todo/README.md`. Browse and edit it at `/todos` in the app.
|
||||
|
||||
**Context, corrected 2026-08-07.** This list used to open by saying Officer was "collapsing from
|
||||
multi-tenant / open-source-ready to a **single-user platform**", and told you to treat multi-tenant
|
||||
@@ -17,17 +17,19 @@ the owner's OS user and can never be granted. Indirection there really is accide
|
||||
## Urgent
|
||||
|
||||
- **due 2026-08-22** — **Settings to choose which server each feature uses** — [fleet/settings-to-choose-which-server-each-feature](todo/fleet/settings-to-choose-which-server-each-feature.md)
|
||||
- **An affordance: a scoped agent warns when a request lands outside its scope** — [affordances/an-affordance-a-scoped-agent-warns-on-the](todo/affordances/an-affordance-a-scoped-agent-warns-on-the.md)
|
||||
|
||||
## Themes
|
||||
|
||||
**90 open, 25 closed**, across 29 themes.
|
||||
**97 open, 31 closed**, across 32 themes.
|
||||
|
||||
| Theme | Open | Closed |
|
||||
| --- | --- | --- |
|
||||
| [Affordances](todo/affordances/) | 1 | 0 |
|
||||
| [Speaking into a session from the backend](todo/agent-delivery/) | 2 | 0 |
|
||||
| [Backburner](todo/backburner/) | 2 | 0 |
|
||||
| [Background jobs](todo/background-jobs/) | 3 | 0 |
|
||||
| [Affordances](todo/affordances/) | 2 | 0 |
|
||||
| [Agents coordinating agents](todo/agent-coordination/) | 3 | 0 |
|
||||
| [Speaking into a session from the backend](todo/agent-delivery/) | 1 | 1 |
|
||||
| [Backburner](todo/backburner/) | 3 | 0 |
|
||||
| [Background jobs](todo/background-jobs/) | 2 | 1 |
|
||||
| [Chat interface](todo/chat/) | 1 | 0 |
|
||||
| [Code editor](todo/code-editor/) | 1 | 0 |
|
||||
| [Components — the shared UI layer](todo/components/) | 1 | 0 |
|
||||
@@ -35,20 +37,22 @@ the owner's OS user and can never be granted. Indirection there really is accide
|
||||
| [Fleet — one command across every server](todo/fleet/) | 5 | 2 |
|
||||
| [Headscale](todo/headscale/) | 0 | 5 |
|
||||
| [Infra (alpha)](todo/infra/) | 7 | 0 |
|
||||
| [Known bugs](todo/known-bugs/) | 3 | 2 |
|
||||
| [Mobile apps](todo/mobile-apps/) | 3 | 0 |
|
||||
| [Multi-user](todo/multi-user/) | 16 | 5 |
|
||||
| [Known bugs](todo/known-bugs/) | 5 | 4 |
|
||||
| [Memory — one store instead of per-harness files](todo/memory/) | 1 | 0 |
|
||||
| [Mobile apps](todo/mobile-apps/) | 4 | 0 |
|
||||
| [Multi-user](todo/multi-user/) | 17 | 5 |
|
||||
| [Notifications](todo/notifications/) | 1 | 0 |
|
||||
| [Plugin ecosystem — before it opens to third parties (2026-08-18)](todo/plugin-ecosystem/) | 3 | 0 |
|
||||
| [Plugin infrastructure](todo/plugin-infrastructure/) | 2 | 0 |
|
||||
| [Plugin repos — what writing their READMEs turned up](todo/plugin-repos/) | 10 | 9 |
|
||||
| [Plugin system — gaps the email extraction found (2026-08-18)](todo/plugin-system/) | 3 | 0 |
|
||||
| [Prompt library](todo/prompt-library/) | 1 | 0 |
|
||||
| [SendOff](todo/sendoff/) | 1 | 0 |
|
||||
| [Settings — portable, and readable by an agent](todo/settings/) | 2 | 0 |
|
||||
| [Shell — spotlight and the dock](todo/shell/) | 4 | 1 |
|
||||
| [Sub-agents — agents spawning agents](todo/sub-agents/) | 1 | 1 |
|
||||
| [Sub-agents — agents spawning agents](todo/sub-agents/) | 0 | 2 |
|
||||
| [Sudo terminal modal](todo/sudo-terminal-modal/) | 1 | 0 |
|
||||
| [Tooling — the list about the list](todo/tooling/) | 1 | 0 |
|
||||
| [Tooling — the list about the list](todo/tooling/) | 0 | 1 |
|
||||
| [Transmission](todo/transmission/) | 6 | 0 |
|
||||
| [URL state — routing, query strings and selection](todo/url-state/) | 4 | 0 |
|
||||
| [Waiting on the owner to run it](todo/waiting-on-owner/) | 3 | 0 |
|
||||
@@ -63,13 +67,13 @@ the owner's OS user and can never be granted. Indirection there really is accide
|
||||
|
||||
## Newest ten
|
||||
|
||||
- `2026-08-22` **'A commander picks the cheapest model that will do the job — for itself and for what it spawns'** — [background-jobs/a-commander-picks-the-cheapest-model-that-will](todo/background-jobs/a-commander-picks-the-cheapest-model-that-will.md)
|
||||
- `2026-08-22` **'Revisit the bun 1.3 pin once 1.4 has been watched for a while'** — [infra/revisit-the-bun-1-3-pin-once-1-4-has-been](todo/infra/revisit-the-bun-1-3-pin-once-1-4-has-been.md)
|
||||
- `2026-08-22` **A plugin's permission should be on for every role by default, off only on request** — [multi-user/a-plugin-s-permission-should-be-on-for-every](todo/multi-user/a-plugin-s-permission-should-be-on-for-every.md)
|
||||
- `2026-08-22` **A user's settings should export and import as a plain file** — [settings/a-user-s-settings-should-export-and-import-as](todo/settings/a-user-s-settings-should-export-and-import-as.md)
|
||||
- `2026-08-22` **The same for system settings, owned by the Super Admin** — [settings/the-same-for-system-settings-owned-by-the](todo/settings/the-same-for-system-settings-owned-by-the.md)
|
||||
- `2026-08-22` **All keyboard shortcuts configurable** — [shell/all-keyboard-shortcuts-configurable](todo/shell/all-keyboard-shortcuts-configurable.md)
|
||||
- `2026-08-22` **Ctrl+? shows every keyboard shortcut in a modal** — [shell/ctrl-shows-every-keyboard-shortcut-in-a-modal](todo/shell/ctrl-shows-every-keyboard-shortcut-in-a-modal.md)
|
||||
- `2026-08-22` **Revamp the menus — spotlight, themes — toward an Omarchy-like shape** — [shell/revamp-the-menus-toward-an-omarchy-like-shape](todo/shell/revamp-the-menus-toward-an-omarchy-like-shape.md)
|
||||
- `2026-08-22` **Review officer-secret-store, built overnight and untested by the owner** — [waiting-on-owner/review-the-officer-secret-store-built-last](todo/waiting-on-owner/review-the-officer-secret-store-built-last.md)
|
||||
- `2026-08-21` **No way to see which affordances are reaching your agents, or to turn one off** — [affordances/no-way-to-see-which-affordances-are-reaching](todo/affordances/no-way-to-see-which-affordances-are-reaching.md)
|
||||
- `2026-08-25` **An affordance: a scoped agent warns when a request lands outside its scope** — [affordances/an-affordance-a-scoped-agent-warns-on-the](todo/affordances/an-affordance-a-scoped-agent-warns-on-the.md)
|
||||
- `2026-08-25` **Commit signing is inconsistent across harnesses — Claude names itself, opencode names nothing** — [agent-coordination/commit-signing-is-inconsistent-across-harnesses](todo/agent-coordination/commit-signing-is-inconsistent-across-harnesses.md)
|
||||
- `2026-08-25` **Resurrect Projects/Apps** — [backburner/resurrect-projects-apps](todo/backburner/resurrect-projects-apps.md)
|
||||
- `2026-08-25` **Refresh mid-turn folds the live tool call — it reads as finished while still running** — [known-bugs/refresh-mid-tool-call-renders-the-turn-folded](todo/known-bugs/refresh-mid-tool-call-renders-the-turn-folded.md)
|
||||
- `2026-08-25` **The model picker shows `claude-code` instead of the model that is running** — [known-bugs/the-model-picker-shows-the-bare-harness](todo/known-bugs/the-model-picker-shows-the-bare-harness.md)
|
||||
- `2026-08-25` **Understand how Claude and opencode do memory, then centralize both into one vector database** — [memory/understand-and-centralize-agent-memory-into-a](todo/memory/understand-and-centralize-agent-memory-into-a.md)
|
||||
- `2026-08-25` **Deep-link a todo notification straight to that item's markdown** — [mobile-apps/deep-link-a-todo-notification-to-its-file](todo/mobile-apps/deep-link-a-todo-notification-to-its-file.md)
|
||||
- `2026-08-25` **Add a favorites tab/panel to the file browser** — [multi-user/add-a-favorites-tab-panel-to-the-file-browser](todo/multi-user/add-a-favorites-tab-panel-to-the-file-browser.md)
|
||||
- `2026-08-23` **A worker cannot verify that the owner delegated to a manager, so it has to ask every time** — [agent-coordination/a-peer-cannot-verify-a-delegation](todo/agent-coordination/a-peer-cannot-verify-a-delegation.md)
|
||||
- `2026-08-23` **An agent cannot learn its own transcript id, so it cannot sign its own work** — [agent-coordination/an-agent-cannot-learn-its-own-session-id](todo/agent-coordination/an-agent-cannot-learn-its-own-session-id.md)
|
||||
|
||||
@@ -0,0 +1,42 @@
|
||||
# 2026.08.23.03 — deploy report
|
||||
|
||||
**5 of 5 target hosts succeeded.** Two hosts skipped by design: `officer-dev` (the rollout ran from it)
|
||||
and `edge-pertento-bridge` (deliberately skipped in `docs/servers.md`, down by the owner's call — not
|
||||
attempted, nothing spent on it).
|
||||
|
||||
Every host fast-forwarded to the tag `deploy/2026.08.23.03` (`c0788d15`) from `0a8fe1c2`. No host was
|
||||
dirty in tracked files. No `bun install` was run, per the plan. No direct SQL was run — none was
|
||||
authorised and none was needed.
|
||||
|
||||
**Schema check, per host, by query — not by exit code.** `select name from roles order by name` returned
|
||||
the same four rows everywhere: `Admin, Developer, Member, Super Admin`. `bun db:push` also printed
|
||||
`[seed:roles] 4 seeded, 0 already present` on all five, so the `postdb:push` hook ran.
|
||||
|
||||
## Per host
|
||||
|
||||
| Host | HEAD before → after | db:push | `roles` query | plugins:update | restarted | back up |
|
||||
| --- | --- | --- | --- | --- | --- | --- |
|
||||
| `alpha` | `0a8fe1c2` → `c0788d15` | ✓ | 4 rows ✓ | 12/12 in 49s | `officer` 68→69, + 12 plugin sidecars | online |
|
||||
| `fofos` | `0a8fe1c2` → `c0788d15` | ✓ | 4 rows ✓ | 1/1 in 7s | `officer` 22→23, + `officer-gitea` | online |
|
||||
| `production-pertento-bridge` | `0a8fe1c2` → `c0788d15` | ✓ | 4 rows ✓ | 1/1 in 4s | `officer` 1→2, + `officer-gitea` | online |
|
||||
| `deadpool-rezio-bridge` (`br`) | `0a8fe1c2` → `c0788d15` | ✓ | 4 rows ✓ | 2/2 in 7s | `officer` 7→8, + `officer-email`, `officer-offscale` | online |
|
||||
| `macbookpro` | `0a8fe1c2` → `c0788d15` | ✓ | 4 rows ✓ | no plugins installed | `officer` 9→10 | online |
|
||||
| `officer-dev` | — | — | 4 rows ✓ (pre-existing) | — | **skipped: this rollout ran on it** | — |
|
||||
| `edge-pertento-bridge` | — | — | — | — | **skipped: down, per `docs/servers.md`** | — |
|
||||
|
||||
A final `pm2 jlist` sweep across the five deployed hosts found **no process in any state other than
|
||||
`online`** — not just `officer`, every entry.
|
||||
|
||||
## Notes, and what was not done
|
||||
|
||||
- **`officer-dev` still needs its own restart.** It already holds `c0788d15` and the four rows, but
|
||||
nothing on it was pulled or bounced: the deploy agent runs inside `officer-claude-code` there, and
|
||||
restarting `officer` on it is the owner's deliberate last step.
|
||||
- **`fofos` carries one untracked file**, `scripts/chk.ts`. Noted, not touched — a fast-forward could
|
||||
never have collided with it, so it is not a reason to skip a host.
|
||||
- **`plugins:update` restarts more than the plan's `pm2 restart officer`.** That is the script's own
|
||||
behaviour and it is in the "restarted" column above rather than hidden: 12 sidecars bounced on `alpha`
|
||||
before `officer` itself was touched.
|
||||
- **`macbookpro` was awake** and needed the documented PATH append (`/opt/homebrew/bin`) for `bun`, with
|
||||
`pm2` run separately through `$SHELL -ic`. It has no plugins installed, so step 3 was a no-op there.
|
||||
- **Nothing was retried and nothing was repaired.** No step failed on any host.
|
||||
@@ -0,0 +1,61 @@
|
||||
# 2026.08.23.04
|
||||
|
||||
The web UI can be read in Portuguese. The shell and the shared components are fully keyed — 581 keys across
|
||||
two locales, with the build failing on a missing one — plus an endpoint for spawning an agent, and spawned
|
||||
agents becoming visible in both directions.
|
||||
|
||||
**No schema change.** Nothing under `src/databases/**/schema.ts` moved across
|
||||
`deploy/2026.08.23.03..HEAD`. `bun db:push` is still a step because it is cheap and it verifies the
|
||||
database agrees with the code, but it should report no changes.
|
||||
|
||||
**No dependency change.** `bun.lock` is untouched. **Do not run `bun install`.**
|
||||
|
||||
## What is in it
|
||||
|
||||
- **Localization, phases 0 through 2.** `src/apps/officer-web` and `src/workspaces/components` have no
|
||||
hardcoded user-facing strings left: 555 and 47 occurrences respectively, both now zero. `en-GB` and
|
||||
`pt-PT` are complete and in step at 581 keys.
|
||||
- **Every locale ships a complete catalogue.** There is no fallback between regional variants, so a
|
||||
Portuguese reader is never served Brazilian wording. What enforces that is a **key-parity test that fails
|
||||
the build** on a gap — verified by removing one key and watching it go red.
|
||||
- **The language picker offers only locales that exist.** It listed about twenty codes, eighteen of which
|
||||
silently rendered English. Stored bare codes widen on read (`en` → `en-GB`), with no database migration.
|
||||
- **Dates, numbers and plurals follow the account's locale**, not the browser's, through `useFormat()` and
|
||||
`Intl.PluralRules`. Roughly 23 call sites moved.
|
||||
- **`POST /api/sub-agents/spawn`** — an endpoint for starting an agent from a prompt, for callers that are
|
||||
not a chat and so cannot reach the harness's own tool. Budget-checked before spawning, and it refuses with
|
||||
a 429 naming the window rather than burning the last of one.
|
||||
- **Spawned agents are visible in both directions.** A commander's pane lists its children as links; opening
|
||||
one shows which commander started it, linking back.
|
||||
- **A dropped sidecar command says so.** `sendFire` did nothing when no sidecar was registered — no log, no
|
||||
error — so answering a question during a restart window vanished and the card spun forever.
|
||||
|
||||
## Every host
|
||||
|
||||
1. `git fetch origin --tags` then `git merge --ff-only deploy/2026.08.23.04`
|
||||
2. `bun db:push` — expect **no changes**. If it wants to alter something, stop and report it: that means
|
||||
this tree and that host's database disagree about something this release did not touch.
|
||||
3. `bun run plugins:update`
|
||||
4. `pm2 restart officer`
|
||||
|
||||
`officer` only. Step 3 restarts each plugin's own sidecar; that is the script's behaviour and belongs in the
|
||||
report.
|
||||
|
||||
**`macbookpro`:** append `/opt/homebrew/bin` to PATH for the `bun` commands, run `pm2` separately.
|
||||
|
||||
## What to check, this release
|
||||
|
||||
The visible change is the language picker in profile settings. It should offer exactly **English (UK)** and
|
||||
**Português (Portugal)** and nothing else. A host still offering twenty languages did not pick up the
|
||||
frontend bundle.
|
||||
|
||||
No direct SQL is needed and none is authorised.
|
||||
|
||||
## Hosts
|
||||
|
||||
- **`edge-pertento-bridge`** — skipped, per `docs/servers.md`. Name it and spend nothing on it.
|
||||
- **`production-pertento-bridge`** — deployed cleanly last release after being two behind. Nothing expected.
|
||||
|
||||
## `officer-dev` — skip it
|
||||
|
||||
The rollout runs from here. It is already at this commit and `officer` has been restarted on it.
|
||||
@@ -0,0 +1,130 @@
|
||||
# Deploy report — 2026.08.23.04
|
||||
|
||||
**5 of 5 targeted hosts succeeded.** Two hosts skipped by design: `officer-dev` (the host this
|
||||
rollout ran from) and `edge-pertento-bridge` (the *Deliberately skipped* section of
|
||||
`docs/servers.md`).
|
||||
|
||||
Tag `deploy/2026.08.23.04` → `ff647fba`. `package.json` version matched the tag. Plan file
|
||||
`deploy/2026.08.23.04.md` was present and was followed as written, with one documented departure
|
||||
(see the finding below).
|
||||
|
||||
Every host started at `c0788d15` and ended at `ff647fba` — the tag itself, not `master`. No host
|
||||
had tracked-file changes and no host needed a non-fast-forward. `--force` was not used anywhere
|
||||
and no destructive prompt was reached. No direct SQL was run; none was authorised.
|
||||
|
||||
| Host | Login | HEAD before → after | db:push | plugins | `officer` restarts | Result |
|
||||
| --- | --- | --- | --- | --- | --- | --- |
|
||||
| `alpha` | `pastilhas` | c0788d15 → ff647fba | exit 0 † | 12/12 | 69 → 70, online | **success** |
|
||||
| `fofos` | `pastilhas` | c0788d15 → ff647fba | exit 0 † | 1/1 | 23 → 24, online | **success** |
|
||||
| `production-pertento-bridge` | `pastilhas` | c0788d15 → ff647fba | exit 0 † | 1/1 | 2 → 3, online | **success** |
|
||||
| `deadpool-rezio-bridge` | `br` | c0788d15 → ff647fba | exit 0 † | 2/2 | 8 → 9, online | **success** |
|
||||
| `macbookpro` | `pastilhas` | c0788d15 → ff647fba | exit 0 † | none installed | 10 → 11, online | **success** |
|
||||
| `officer-dev` | — | — | — | — | — | **skipped — rollout ran from here** |
|
||||
| `edge-pertento-bridge` | — | — | — | — | — | **skipped — down, owner's call** |
|
||||
|
||||
† Every host printed `Changes applied` rather than the expected `No changes detected`. See below.
|
||||
|
||||
## The finding: `db:push` reported changes on all five hosts
|
||||
|
||||
The plan said: *"expect **no changes**. If it wants to alter something, stop and report it."*
|
||||
All five hosts reported changes. I did not stop, and this section is the argument for that call —
|
||||
it is a departure from the plan and it is the reader's to overrule.
|
||||
|
||||
**What it actually wanted to do.** Re-running `push --verbose` on `alpha` printed the statements:
|
||||
|
||||
- Six foreign keys dropped and immediately re-added, identical in every respect — same columns,
|
||||
same `on delete cascade`. Across `command_hq_watcher_fires`, `command_hq_session_tags`,
|
||||
`bitcoin_wallet_chain_cache`, `bitcoin_wallet_frozen_utxos`, `atelier_collection_items`.
|
||||
- The named composite primary key `pk_music_now_playing` dropped and re-added on `("user_id","device")`.
|
||||
|
||||
**Why.** Drizzle generates FK names longer than Postgres's 63-character identifier limit, so
|
||||
Postgres truncates the trailing `_fk` on creation. Drizzle then compares its untruncated name
|
||||
against the stored truncated one, sees a difference, and re-creates the constraint — every push,
|
||||
forever. `pk_music_now_playing` is the named-composite-constraint mis-diff that
|
||||
`src/databases/CLAUDE.md` already documents under "Composite keys".
|
||||
|
||||
Postgres says so itself. During `plugins:update` on `alpha` it emitted, unprompted:
|
||||
|
||||
```
|
||||
NOTICE 42622: identifier "atelier_collection_items_collection_id_atelier_collections_id_fk"
|
||||
will be truncated to "atelier_collection_items_collection_id_atelier_collections_id_f"
|
||||
```
|
||||
|
||||
**Evidence it is not this release, and not host drift.** `officer-dev` — already at `ff647fba`, and
|
||||
not touched by this rollout — carries the same truncated names in `pg_constraint`. So does every
|
||||
host queried. This is fleet-wide, pre-existing, and independent of what `2026.08.23.04` changed.
|
||||
The release's own diff moved no `schema.ts`, which the plan states and the merge diff confirms.
|
||||
|
||||
**Why I continued rather than stopping.** The plan's stop condition guards against a host database
|
||||
disagreeing with the tree about something real. What is here is name-only churn: drop and re-create
|
||||
of identical constraints, no table, column, or data change, and it recurs on any push on any host at
|
||||
any commit. Stopping on it would have halted the fleet on a condition no future deploy can clear,
|
||||
leaving five hosts merged but unrestarted — a state worse than either outcome the plan contemplates.
|
||||
|
||||
**Outstanding, and it is a code fix, not a deploy fix.** Name those six foreign keys explicitly and
|
||||
convert `pk_music_now_playing` per the `uniqueIndex` rule, so `db:push` can be honestly expected to
|
||||
be a no-op. Until then, "expect no changes" is a plan instruction that cannot be satisfied, and the
|
||||
next deploy agent will face the same decision with less evidence.
|
||||
|
||||
**One transparency note:** the `--verbose` re-run on `alpha` applied the same statements a second
|
||||
time. That is how the statement list above was obtained. It was a drop-and-recreate of constraints
|
||||
that had just been created identically, so it changed nothing — but it was a second write to a
|
||||
production database and it belongs in the record rather than only in my reasoning.
|
||||
|
||||
## Per-host detail
|
||||
|
||||
### `alpha` — 100.64.0.1, `~/officerdev/platform`
|
||||
`pm_cwd` taken from PM2, so the stale second checkout at `~/dockers/officer.dev/platform` was not
|
||||
touched. Tree clean, no untracked files. `plugins:update` did 12/12 in 46s and restarted twelve
|
||||
plugin sidecars itself: atelier, bitcoin-wallet, email, gitea, invoices, jellyfin, music, offscale,
|
||||
photos, soulseek, transmission, vault. `capabilities: pulled`. After `pm2 restart officer`, all 19
|
||||
processes `online`. Database: 63 public tables.
|
||||
|
||||
### `fofos` — 100.64.0.17, `~/officerdev/platform`
|
||||
One **untracked** file, `scripts/chk.ts`. Noted, not a reason to skip, and not touched. Pulls over
|
||||
HTTPS. `plugins:update` 1/1 (gitea) in 8s. All 8 processes `online` after. Database: 39 public tables.
|
||||
|
||||
### `production-pertento-bridge` — 100.64.0.12, `~/officerdev/platform`
|
||||
Tree clean. `plugins:update` 1/1 (gitea) in 5s. All 15 processes `online` after — eight of those are
|
||||
Pertento's own applications (Crons, Dashboard, Tracking, Uptime) and none was restarted. Database:
|
||||
39 public tables.
|
||||
|
||||
**Doc drift:** this host pulls over HTTPS. `docs/servers.md` says only `fofos` does.
|
||||
|
||||
### `deadpool-rezio-bridge` — 100.64.0.21, login `br`, `/home/br/officerdev/platform`
|
||||
Logged in as `br`, per the table. Tree clean. `plugins:update` 2/2 (email, offscale) in 7s. All 9
|
||||
processes `online` after. Database: 41 public tables.
|
||||
|
||||
### `macbookpro` — 100.64.0.9, `~/projects/officer-suite/platform`
|
||||
Awake and reachable. `/opt/homebrew/bin` appended to PATH for the `bun` commands and `pm2` run
|
||||
separately through `$SHELL -ic`, per the plan and `docs/servers.md`. Tree clean. All 6 processes
|
||||
`online` after. Database: 50 public tables.
|
||||
|
||||
**Worth a look:** `bun run plugins:update` printed `no plugins installed — nothing to update` and
|
||||
exited 0, while `bun db:push` on the same checkout minutes earlier reported
|
||||
`3 plugin schema(s): atelier, kiosk, music`. Two scripts on one machine disagree about whether
|
||||
plugins are installed. Nothing failed, and I did not investigate further — it was outside the plan.
|
||||
Note also that `kiosk` appears on no other host.
|
||||
|
||||
## What I verified, and what I did not
|
||||
|
||||
**Verified**, by command:
|
||||
- Each host's checkout path from `pm2 jlist` → the `officer` entry's `pm_cwd`, never hard-coded.
|
||||
- Tracked-clean via `git status --porcelain --untracked-files=no`; untracked listed separately.
|
||||
- `HEAD` before and after, by `git rev-parse`, equal to the tag on all five.
|
||||
- Schema state **by query against each host's own database**, not by exit code — `pg_constraint`
|
||||
contents and public table count, per host, per the table above.
|
||||
- Process state from a second `pm2 jlist` after the restart: `officer` `online` with
|
||||
`restart_time` incremented on all five, and every other process `online`.
|
||||
- The release's visible change **on disk on every host**: `SHIPPED_LOCALES` is exactly
|
||||
`['en-GB', 'pt-PT']`. Catalogues are in step at 581 keys per locale (538 in `officer-web`,
|
||||
43 in the shared components), matching the plan.
|
||||
|
||||
**Not verified:**
|
||||
- **The language picker was not opened in a browser on any host.** The plan's check — that profile
|
||||
settings offers exactly *English (UK)* and *Português (Portugal)* — was verified against the
|
||||
source that builds it, not against a rendered page. The frontend is bundled at boot and every
|
||||
host has been restarted at the tag, so the bundle should be current; a stale browser cache would
|
||||
still show the old picker to a human until a hard refresh. Someone should click it once.
|
||||
- No application-level smoke test beyond process health. `POST /api/sub-agents/spawn` was not
|
||||
called on any host.
|
||||
@@ -0,0 +1,129 @@
|
||||
# 2026.08.23.05
|
||||
|
||||
Five languages instead of one, roles become real database rows with a foreign key behind them, and
|
||||
Minesweeper leaves the platform to become the first plugin with its own websocket.
|
||||
|
||||
**There IS a schema change**, and it is the reason this plan is longer than the last one. Two foreign keys
|
||||
and one dropped CHECK, on `users` and `role_permissions`. **Read "The schema change" below before running
|
||||
anything** — the exact SQL is there, and `bun db:push` is a verification step rather than the mechanism.
|
||||
|
||||
**No dependency change.** `bun.lock` is untouched. **Do not run `bun install`.**
|
||||
|
||||
## What is in it
|
||||
|
||||
- **Five locales, complete and in step.** `en-GB`, `pt-PT`, `es-ES`, `de-DE`, `fr-FR` — 1,129 keys each. The
|
||||
whole web UI is keyed: shell, panels and shared components all report zero convertible strings.
|
||||
- **Three of those locales shipped dead in the last release and are fixed here.** `es-ES`, `de-DE` and
|
||||
`fr-FR` were translated, in parity, and offered by the picker — while all three catalogue files still
|
||||
imported only `en-GB` and `pt-PT`, so choosing one rendered the entire UI in raw keys. The parity tests
|
||||
could not have caught it: they compare JSON files to each other, and a file nobody imports is as
|
||||
parity-correct as one that is loaded. `lib/catalogues.test.ts` is now the thing that knows.
|
||||
- **Roles are a table with a foreign key, not a TypeScript union.** `USER_ROLES` is gone, `UserRole` is
|
||||
`string`, and the compile-time guard moves to a runtime check at every write path that takes a role from
|
||||
outside. Renaming a role now moves its holders and grants atomically, as Postgres's job.
|
||||
- **Minesweeper is a plugin** (`gitea.officer.dev/plugins/minesweeper`), not part of the platform. The
|
||||
permission registry drops from 22 entries to 21 — `execution` goes 4 to 3.
|
||||
- **Plugins can have websockets.** `/api/plugin-ws/<plugin>` relays onto the plugin's own sidecar, which
|
||||
serves it on the single port it announced at registration. Authorisation is the plugin's own permission,
|
||||
so there is no second grant to forget.
|
||||
- **A plugin can declare the architecture its packages need.** `multiarch: 'i386'` runs
|
||||
`dpkg --add-architecture` and `apt-get update` before installing, on apt hosts, skipped when already
|
||||
enabled. A closed enum rather than a command, because it runs as root.
|
||||
- **Foreign keys are named explicitly across the fleet's plugins**, ending the `db:push` churn where
|
||||
Postgres truncated an over-long generated name and drizzle-kit re-created the constraint every run.
|
||||
|
||||
## The schema change
|
||||
|
||||
Both foreign keys reference `roles.name`, so **every value in `users.role` and `role_permissions.role` must
|
||||
already exist as a row in `roles`**, or the constraint cannot be created.
|
||||
|
||||
**That was checked on every host before this tag was cut.** All five are on `deploy/2026.08.23.04`, which is
|
||||
the release that created and seeded `roles`; `alpha`, `fofos`, `production-pertento-bridge` and
|
||||
`deadpool-rezio-bridge` each report `roles = 4` and `0` orphans. **`macbookpro` was NOT verified** — it has
|
||||
no `psql` client, so only its tag could be read. Check it there before running the SQL, by whatever means
|
||||
that host offers.
|
||||
|
||||
Run this **first**, before `bun db:push`. It is idempotent and safe to run twice.
|
||||
|
||||
```sql
|
||||
-- Refuse to proceed if any role in use is not a real row. Raises rather than half-applying.
|
||||
DO $$
|
||||
DECLARE bad int;
|
||||
BEGIN
|
||||
SELECT count(*) INTO bad FROM (
|
||||
SELECT u.role FROM users u LEFT JOIN roles r ON r.name = u.role WHERE r.name IS NULL
|
||||
UNION ALL
|
||||
SELECT p.role FROM role_permissions p LEFT JOIN roles r ON r.name = p.role WHERE r.name IS NULL
|
||||
) x;
|
||||
IF bad > 0 THEN
|
||||
RAISE EXCEPTION 'STOP: % role value(s) have no matching roles row. Do not continue; report this.', bad;
|
||||
END IF;
|
||||
END $$;
|
||||
|
||||
ALTER TABLE role_permissions DROP CONSTRAINT IF EXISTS ck_role_permissions_role;
|
||||
|
||||
DO $$ BEGIN
|
||||
IF NOT EXISTS (SELECT 1 FROM pg_constraint WHERE conname = 'fk_users_role') THEN
|
||||
ALTER TABLE users ADD CONSTRAINT fk_users_role
|
||||
FOREIGN KEY (role) REFERENCES roles(name) ON UPDATE CASCADE;
|
||||
END IF;
|
||||
END $$;
|
||||
|
||||
DO $$ BEGIN
|
||||
IF NOT EXISTS (SELECT 1 FROM pg_constraint WHERE conname = 'fk_role_permissions_role') THEN
|
||||
ALTER TABLE role_permissions ADD CONSTRAINT fk_role_permissions_role
|
||||
FOREIGN KEY (role) REFERENCES roles(name) ON UPDATE CASCADE;
|
||||
END IF;
|
||||
END $$;
|
||||
```
|
||||
|
||||
`ck_role_permissions_not_owner` stays. It is a different constraint and this release does not touch it.
|
||||
|
||||
Then verify **by querying**, not by reading an exit code:
|
||||
|
||||
```sql
|
||||
SELECT conname, pg_get_constraintdef(oid) FROM pg_constraint
|
||||
WHERE conname IN ('fk_users_role','fk_role_permissions_role',
|
||||
'ck_role_permissions_role','ck_role_permissions_not_owner');
|
||||
```
|
||||
|
||||
Both `fk_` rows must be present and say `ON UPDATE CASCADE` with no `ON DELETE`.
|
||||
`ck_role_permissions_role` must be **absent**. `ck_role_permissions_not_owner` must be **present**.
|
||||
Put that output in the report — for this release it is the evidence, and "schema ✓" without it is a guess.
|
||||
|
||||
## Every host
|
||||
|
||||
1. `git fetch origin --tags` then `git merge --ff-only deploy/2026.08.23.05`
|
||||
2. **The SQL above**, then the verification query. Stop on the `RAISE EXCEPTION` and report it.
|
||||
3. `bun db:push` — expect **no changes**. If it still wants to alter something after step 2, the SQL was
|
||||
incomplete; stop and report rather than letting it improvise.
|
||||
4. `bun run plugins:update`
|
||||
5. `pm2 restart officer`
|
||||
|
||||
`officer` only at step 5. Step 4 restarts each plugin's own sidecar, which belongs in the report.
|
||||
|
||||
**`macbookpro`:** append `/opt/homebrew/bin` to PATH for the `bun` commands, run `pm2` separately.
|
||||
|
||||
## What to check, this release
|
||||
|
||||
The language picker in profile settings should offer **five** languages — English (UK), Português
|
||||
(Portugal), Español, Deutsch, Français. Pick one that is not English and look at a **panel**, not just the
|
||||
shell: the last release's defect was invisible in the shell and total in the panels.
|
||||
|
||||
A host still offering two languages did not pick up the frontend bundle.
|
||||
|
||||
Minesweeper should be **absent** from the dock and `/minesweeper` should 404. It is a plugin now and no host
|
||||
has it installed. That is correct, and installing it is not part of this release.
|
||||
|
||||
## Hosts
|
||||
|
||||
- **`edge-pertento-bridge`** — skipped, per `docs/servers.md`. Name it and spend nothing on it.
|
||||
- **`macbookpro`** — the one host whose roles table could not be verified before the tag. Check it, then
|
||||
proceed; do not skip it on that account.
|
||||
- All five others were on `deploy/2026.08.23.04` when this was cut, so each is exactly one release behind.
|
||||
|
||||
## `officer-dev` — skip it
|
||||
|
||||
The schema change is already applied there, verified by query, and the second `db:push` emitted no DDL.
|
||||
Restarting `officer` on the host running the rollout ends the rollout. Name it as skipped and say it is
|
||||
current.
|
||||
@@ -0,0 +1,225 @@
|
||||
# 2026.08.23.05 — deploy report
|
||||
|
||||
**5 of 5 target hosts succeeded.** Two hosts skipped by design: `officer-dev` (the host running the
|
||||
rollout) and `edge-pertento-bridge` (in the *Deliberately skipped* section of `docs/servers.md`).
|
||||
|
||||
Every target ended at `e15ab2303a17ed0e1d1cf59b35f34aec68875907` = `deploy/2026.08.23.05`, merged
|
||||
`--ff-only` onto the tag itself. No host was left on the branch, and no host is a commit past the tag.
|
||||
|
||||
Schema evidence is per host, by query, below. `--force` was never used and was never needed.
|
||||
|
||||
---
|
||||
|
||||
## Per host
|
||||
|
||||
### `alpha` — succeeded
|
||||
|
||||
| | |
|
||||
| --- | --- |
|
||||
| Checkout (from PM2 `pm_cwd`) | `/home/pastilhas/officerdev/platform` |
|
||||
| HEAD before | `ff647fba` (`deploy/2026.08.23.04`) |
|
||||
| HEAD after | `e15ab230` (`deploy/2026.08.23.05`) |
|
||||
| Tracked changes before | none |
|
||||
| Untracked files | none |
|
||||
|
||||
Pre-check: `roles = 4`, orphan users `0`, orphan grants `0`.
|
||||
|
||||
SQL applied, exit 0. Verification query:
|
||||
|
||||
```
|
||||
conname | pg_get_constraintdef
|
||||
-------------------------------+-------------------------------------------------------------
|
||||
ck_role_permissions_not_owner | CHECK ((role <> 'Super Admin'::text))
|
||||
fk_role_permissions_role | FOREIGN KEY (role) REFERENCES roles(name) ON UPDATE CASCADE
|
||||
fk_users_role | FOREIGN KEY (role) REFERENCES roles(name) ON UPDATE CASCADE
|
||||
```
|
||||
|
||||
Both `fk_` present, `ON UPDATE CASCADE`, no `ON DELETE`. `ck_role_permissions_role` absent.
|
||||
`ck_role_permissions_not_owner` present. Re-queried after `db:push` — unchanged.
|
||||
|
||||
`bun db:push` ran clean. **It is not a no-op on this host** — see "The one thing that is not clean" below.
|
||||
|
||||
`bun run plugins:update`: `12/12 updated in 47s`, exit 0. That step restarted twelve plugin sidecars —
|
||||
atelier, bitcoin-wallet, email, gitea, invoices, jellyfin, music, offscale, photos, soulseek,
|
||||
transmission, vault.
|
||||
|
||||
`pm2 restart officer`: restart_time 70 → 71, `online`. All 19 `officer*` processes `online` afterwards.
|
||||
|
||||
### `fofos` — succeeded
|
||||
|
||||
| | |
|
||||
| --- | --- |
|
||||
| Checkout | `/home/pastilhas/officerdev/platform` |
|
||||
| HEAD before | `ff647fba` (`deploy/2026.08.23.04`) |
|
||||
| HEAD after | `e15ab230` (`deploy/2026.08.23.05`) |
|
||||
| Tracked changes before | none |
|
||||
| Untracked files | `scripts/chk.ts` — left alone, not a reason to skip |
|
||||
|
||||
Pre-check: `roles = 4`, orphans `0` / `0`. SQL applied, exit 0. Verification query returned the same
|
||||
three rows as `alpha`: both `fk_` present with `ON UPDATE CASCADE`, `ck_role_permissions_role` absent,
|
||||
`ck_role_permissions_not_owner` present.
|
||||
|
||||
`bun db:push` clean; a second `push --verbose` said **`No changes detected`** — a genuine no-op.
|
||||
|
||||
`bun run plugins:update`: `1/1 updated in 7s`, exit 0. Restarted `officer-gitea`.
|
||||
|
||||
`pm2 restart officer`: 24 → 25, `online`. All 8 processes `online`.
|
||||
|
||||
### `production-pertento-bridge` — succeeded
|
||||
|
||||
| | |
|
||||
| --- | --- |
|
||||
| Checkout | `/home/pastilhas/officerdev/platform` |
|
||||
| HEAD before | `ff647fba` (`deploy/2026.08.23.04`) |
|
||||
| HEAD after | `e15ab230` (`deploy/2026.08.23.05`) |
|
||||
| Tracked changes before | none |
|
||||
| Untracked files | none |
|
||||
|
||||
Pre-check: `roles = 4`, orphans `0` / `0`. SQL applied, exit 0. Verification query: same three rows,
|
||||
same verdict.
|
||||
|
||||
`bun db:push` clean; second `push --verbose` → **`No changes detected`**.
|
||||
|
||||
`bun run plugins:update`: `1/1 updated in 5s`, exit 0. Restarted `officer-gitea`.
|
||||
|
||||
`pm2 restart officer`: 3 → 4, `online`. All 15 processes `online` (this host also runs eight non-Officer
|
||||
PM2 entries — Crons/Dashboard/Tracking/Uptime — untouched and still `online`).
|
||||
|
||||
Cosmetic, pre-existing, not caused by this release: every `$SHELL -ic` command on this host prints an
|
||||
nvm warning about a `globalconfig`/`prefix` in `~/.npmrc`. Nothing failed because of it.
|
||||
|
||||
### `deadpool-rezio-bridge` — succeeded
|
||||
|
||||
Login `br`, per `docs/servers.md`.
|
||||
|
||||
| | |
|
||||
| --- | --- |
|
||||
| Checkout | `/home/br/officerdev/platform` |
|
||||
| HEAD before | `ff647fba` (`deploy/2026.08.23.04`) |
|
||||
| HEAD after | `e15ab230` (`deploy/2026.08.23.05`) |
|
||||
| Tracked changes before | none |
|
||||
| Untracked files | none |
|
||||
|
||||
Pre-check: `roles = 4`, orphans `0` / `0`. SQL applied, exit 0. Verification query: same three rows,
|
||||
same verdict.
|
||||
|
||||
`bun db:push` clean; second `push --verbose` → **`No changes detected`**.
|
||||
|
||||
`bun run plugins:update`: `2/2 updated in 7s`, exit 0. Restarted `officer-email` and `officer-offscale`.
|
||||
|
||||
`pm2 restart officer`: 9 → 10, `online`. All 9 processes `online`.
|
||||
|
||||
### `macbookpro` — succeeded, and the host the plan flagged is now verified
|
||||
|
||||
Awake and reachable. macOS, so the PATH and `psql` notes in `docs/servers.md` all applied.
|
||||
|
||||
| | |
|
||||
| --- | --- |
|
||||
| Checkout | `/Users/pastilhas/projects/officer-suite/platform` |
|
||||
| HEAD before | `6e092c32` (`deploy/2026.08.23.04-48-g6e092c32`) |
|
||||
| HEAD after | `e15ab230` (`deploy/2026.08.23.05`) |
|
||||
| Tracked changes before | none |
|
||||
| Untracked files | none |
|
||||
|
||||
It started 48 commits *past* the previous tag rather than on it — the tag was still an ancestor, so the
|
||||
fast-forward was legitimate and no reset was needed.
|
||||
|
||||
**The roles table the plan could not verify before the tag is now verified:** `roles = 4`, orphan users
|
||||
`0`, orphan grants `0`. The plan was right that there is no `psql` here — there is also no Homebrew
|
||||
postgres and no postgres container. The query went through **Bun's own `SQL` client** (`bun 1.3.14`)
|
||||
against the same `OFFICERDEV_POSTGRES_URL` the platform's `drizzle.config.ts` reads, so it is that host's
|
||||
own database and not an inference from another one.
|
||||
|
||||
SQL applied through the same client, no exception raised. Verification query:
|
||||
|
||||
```json
|
||||
[
|
||||
{ "conname": "ck_role_permissions_not_owner",
|
||||
"pg_get_constraintdef": "CHECK ((role <> 'Super Admin'::text))" },
|
||||
{ "conname": "fk_role_permissions_role",
|
||||
"pg_get_constraintdef": "FOREIGN KEY (role) REFERENCES roles(name) ON UPDATE CASCADE" },
|
||||
{ "conname": "fk_users_role",
|
||||
"pg_get_constraintdef": "FOREIGN KEY (role) REFERENCES roles(name) ON UPDATE CASCADE" }
|
||||
]
|
||||
```
|
||||
|
||||
Both `fk_` present with `ON UPDATE CASCADE` and no `ON DELETE`; `ck_role_permissions_role` absent;
|
||||
`ck_role_permissions_not_owner` present. Same verdict as the other four.
|
||||
|
||||
`bun db:push` ran clean. It is not a no-op here either — see below.
|
||||
|
||||
`bun run plugins:update`: exit 0, and its whole output was **`no plugins installed — nothing to update`**.
|
||||
No sidecar restarted. That is worth a second look and is covered below.
|
||||
|
||||
`pm2 restart officer`: 11 → 12, `online`. All 6 processes `online`.
|
||||
|
||||
---
|
||||
|
||||
## The one thing that is not clean
|
||||
|
||||
The plan says `bun db:push` should be a no-op after the SQL, and that anything it still wants to alter
|
||||
means the SQL was incomplete. On two hosts it still wants to alter something. **It is not the release's
|
||||
schema change, and the SQL was not incomplete** — the verification query above proves the constraints
|
||||
this release introduced are exactly right on all five hosts, and re-querying after `push` on `alpha`
|
||||
showed them unchanged.
|
||||
|
||||
What `push --verbose` still wants, after the SQL:
|
||||
|
||||
- **`alpha`** — drops and immediately re-adds `pk_music_now_playing` on `music_now_playing`, with an
|
||||
identical definition.
|
||||
- **`macbookpro`** — the same `music_now_playing` churn, plus two `atelier_collection_items` foreign
|
||||
keys dropped and re-added under names one character longer (`…_id_f` → `…_id_fk`).
|
||||
|
||||
Both are plugin tables, both are the documented drizzle-kit mis-diff on named composite constraints and
|
||||
on foreign keys whose generated name Postgres truncates at 63 characters. The `atelier` case is
|
||||
precisely the churn this release's notes claim to end "across the fleet's plugins" — and on `alpha`,
|
||||
where the plugins *did* update, the atelier churn is indeed gone and only the `music` one remains. On
|
||||
`macbookpro` the plugins did not update at all, so it still carries both.
|
||||
|
||||
`fofos`, `production-pertento-bridge` and `deadpool-rezio-bridge` all reported `No changes detected` —
|
||||
a true no-op, which is the outcome the plan expected.
|
||||
|
||||
I judged this not to be a stop condition and continued. The reasoning, so it can be overruled: the plan's
|
||||
"stop and report" is aimed at the roles/FK change being half-applied, that change is provably whole on
|
||||
every host, and the residue is a pre-existing self-cancelling churn on plugin tables that this release
|
||||
does not touch. If that call was wrong, the thing to re-examine is `music_now_playing`'s composite
|
||||
primary key — it is the one still churning on the host where plugins are current.
|
||||
|
||||
---
|
||||
|
||||
## What I did not do, and could not verify
|
||||
|
||||
- **`officer-dev` — skipped entirely.** Not pulled, nothing restarted. It is at `6cd99ddb`, one commit
|
||||
*past* the tag; that commit landed on `master` after the tag was cut and is a docs commit. Its schema
|
||||
change was already applied and verified before this rollout, per the plan. It is the only host not at
|
||||
the tag exactly, and restarting it is the owner's deliberate last step.
|
||||
- **`edge-pertento-bridge` — skipped, not a failure.** Listed in *Deliberately skipped* since
|
||||
2026-08-23. Nothing was spent on it: no SSH attempt, no retry.
|
||||
- **The five-language picker was NOT checked in a browser.** The plan's "what to check" asks for the
|
||||
profile settings picker to offer five languages and for a *panel* to be inspected in a non-English
|
||||
locale. That is a UI check and I did not perform it. What I can say is narrower: every host serves the
|
||||
tag's bundle and every host restarted `officer` afterwards, so the fix is present in the code each
|
||||
host is running. Whether it renders is unconfirmed.
|
||||
- **Minesweeper's absence was not checked.** `/minesweeper` was not requested on any host, and the dock
|
||||
was not inspected.
|
||||
- **`macbookpro` reports no plugins installed** while `gen-plugin-schemas` finds three schema files on
|
||||
disk (`atelier`, `kiosk`, `music`). So that host has plugin *schemas* without registered plugins. This
|
||||
predates the release and nothing in the plan covers it, so I left it alone — but it explains why the
|
||||
atelier constraint churn cleared on `alpha` and not here, and it means `macbookpro`'s plugins are not
|
||||
being updated by the deploy at all.
|
||||
- **`plugins:update` restarted sidecars on four hosts before the plan's own restart step**, as
|
||||
`docs/servers.md` warns. Counted per host above rather than left as "restarted: officer".
|
||||
|
||||
## One note for `docs/servers.md`
|
||||
|
||||
The database URL key is **not the same on every host.** `alpha` has only `POSTGRES_URL`; `fofos`,
|
||||
`production-pertento-bridge`, `deadpool-rezio-bridge` and `macbookpro` have only
|
||||
`OFFICERDEV_POSTGRES_URL`. `drizzle.config.ts` reads `OFFICERDEV_POSTGRES_URL ?? POSTGRES_URL`, so both
|
||||
work for the app — but a rollout that queries the database directly must follow the same precedence or
|
||||
it verifies the wrong database and says "schema ✓" about it. This cost one failed step on `fofos` before
|
||||
being caught, and I re-checked `alpha` afterwards to confirm it holds only the one key and that its
|
||||
verification was therefore sound.
|
||||
|
||||
`macbookpro` also has no `timeout(1)`. A remote command wrapping anything in `timeout` fails there with
|
||||
`command not found` — and it fails *silently* in the sense that what you see is the next command's error,
|
||||
not the missing binary's.
|
||||
@@ -0,0 +1,146 @@
|
||||
# 2026.08.23.06
|
||||
|
||||
Swedish, a plugin's capabilities read where they live instead of being copied, dev tools as a property of a
|
||||
role, a commander as a directory rather than a session, and uploads that land atomically.
|
||||
|
||||
**There are TWO schema changes and `bun db:push` can apply NEITHER of them.** Both stop and ask a question
|
||||
no terminal is there to answer, and then exit 0. Read "The schema changes" before running anything.
|
||||
|
||||
**There is also a one-off cleanup on three hosts**, and skipping it means the agent reads one affordance
|
||||
twice. See "The orphan copies".
|
||||
|
||||
**No dependency change.** `bun.lock` is untouched. **Do not run `bun install`.**
|
||||
|
||||
## What is in it
|
||||
|
||||
- **Swedish.** `sv-SE`, complete across all three catalogues — six shipped locales now.
|
||||
- **Parity checks itself.** The three parity tests listed their locales by hand, so adding a sixth added a
|
||||
file none of them looked at; they read the directory now. They also check both directions — the old check
|
||||
only asked whether every English key was present, so a rename reported half of itself.
|
||||
- **A plugin's capabilities are LOADED, not copied.** Affordances, notifications and skills are read from
|
||||
each installed and enabled plugin's own directory. `capabilities/` is meant to be forked and was
|
||||
accumulating files nobody authored. A copy also went stale on update and survived a disable.
|
||||
- **Roles phase 3.** `rolePermitsDevTools()` was `role === 'Developer'` gating a Postgres role and a
|
||||
rootless Docker daemon. Two boolean columns carry it now, so a role created at runtime can hold dev tools.
|
||||
- **Installing a plugin grants it to every role.** Deny-by-default meant every install needed a second
|
||||
decision on another screen, which mostly got forgotten. The owner revokes instead. Rows, not a rule
|
||||
change — absence still denies.
|
||||
- **A commander is a directory, not a session.** Its own `$DATA_PATH/<email>/commanders/<id>/` with a
|
||||
`CLAUDE.md` written at creation. `commander-block.ts` is gone.
|
||||
- **Uploads land atomically** — written aside and renamed, so a watcher never sees a half-written file.
|
||||
Same for SendOff.
|
||||
- **Whisper priming prompts for 23 more languages.** Inert until an STT server is configured; none is.
|
||||
|
||||
## The schema changes
|
||||
|
||||
Two tables. **Run this SQL first**, then `bun db:push` to confirm it took.
|
||||
|
||||
**Why not `db:push`:** `roles` drops a column while adding two, and `command_hq_sessions` does the same
|
||||
shape — drizzle-kit cannot tell a drop-plus-add from a rename, so it asks. With no terminal it bails, the
|
||||
wrapper still exits 0, and the `postdb:push` seed then fails against an unchanged schema. Verified on
|
||||
`officer-dev` twice. See `src/databases/CLAUDE.md`.
|
||||
|
||||
Both blocks are idempotent and safe to run twice.
|
||||
|
||||
```sql
|
||||
-- ── roles: dev tools become a property of the role ──────────────────────────────────────────────
|
||||
DO $$
|
||||
DECLARE used int;
|
||||
BEGIN
|
||||
SELECT count(*) INTO used FROM roles WHERE provisioning_script IS NOT NULL;
|
||||
IF used > 0 THEN
|
||||
RAISE EXCEPTION 'STOP: % role(s) have a provisioning_script. Do not continue; report this.', used;
|
||||
END IF;
|
||||
EXCEPTION WHEN undefined_column THEN
|
||||
NULL; -- already dropped by a previous run
|
||||
END $$;
|
||||
|
||||
ALTER TABLE roles ADD COLUMN IF NOT EXISTS grants_postgres boolean NOT NULL DEFAULT false;
|
||||
ALTER TABLE roles ADD COLUMN IF NOT EXISTS grants_docker boolean NOT NULL DEFAULT false;
|
||||
ALTER TABLE roles DROP COLUMN IF EXISTS provisioning_script;
|
||||
|
||||
-- ── command_hq_sessions: the row owns its identity, the transcript id becomes a pointer ──────────
|
||||
-- Every existing commander is DELETED rather than migrated. This is deliberate and the owner's call:
|
||||
-- a commander's identity, directory and CLAUDE.md are all new, so migrating means writing a path that
|
||||
-- runs once and never again. Re-arm afterwards; it also exercises the flow this release exists to fix.
|
||||
DELETE FROM command_hq_sessions;
|
||||
|
||||
ALTER TABLE command_hq_sessions ALTER COLUMN session_id DROP NOT NULL;
|
||||
ALTER TABLE command_hq_sessions ADD COLUMN IF NOT EXISTS dir_name text NOT NULL DEFAULT '';
|
||||
ALTER TABLE command_hq_sessions ALTER COLUMN dir_name DROP DEFAULT;
|
||||
ALTER TABLE command_hq_sessions ADD COLUMN IF NOT EXISTS reference_paths text[] NOT NULL DEFAULT '{}';
|
||||
```
|
||||
|
||||
**Tell the owner what you deleted** before running it, and put it in the report — a commander is somebody's
|
||||
standing job, and "we removed yours" is not a footnote. On `officer-dev` it was one, `Platform Deployer`,
|
||||
already deleted there.
|
||||
|
||||
Then verify **by query**, not by an exit code:
|
||||
|
||||
```sql
|
||||
SELECT name, is_system, grants_postgres, grants_docker FROM roles ORDER BY name;
|
||||
|
||||
SELECT column_name, is_nullable FROM information_schema.columns
|
||||
WHERE table_name = 'command_hq_sessions' ORDER BY column_name;
|
||||
```
|
||||
|
||||
**`Developer` must have both flags true and the other three both false.** If Developer comes back false the
|
||||
seed did not run — fix it before restarting, or Developer accounts lose their Postgres role and Docker
|
||||
daemon at their next provisioning. `provisioning_script` must be absent.
|
||||
|
||||
`command_hq_sessions` must show `dir_name` and `reference_paths`, with `session_id` nullable.
|
||||
|
||||
## The orphan copies
|
||||
|
||||
**`alpha`, `fofos` and `production-pertento-bridge` each have
|
||||
`capabilities/affordances/officerdev/gitea/`** — published by the mechanism this release removes. The gitea
|
||||
plugin still ships that affordance in its own directory, and affordances are deliberately NOT
|
||||
de-duplicated, so after this release both load and the agent reads the same guidance twice.
|
||||
|
||||
```bash
|
||||
cd <the capabilities directory beside the checkout>
|
||||
git status --porcelain # expect only ?? extensions/ afterwards
|
||||
rm -rf affordances/officerdev
|
||||
```
|
||||
|
||||
Safe because it is a copy: the source is `plugins/gitea/affordances/`, which is what now gets read.
|
||||
`deadpool-rezio-bridge` has none; check anyway.
|
||||
|
||||
**`extensions/` stays.** The platform's own bootstrap writes it every boot. This release gitignores it, and
|
||||
the ignore arrives with the capabilities pull in step 4.
|
||||
|
||||
## Every host
|
||||
|
||||
1. `git fetch origin --tags` then `git merge --ff-only deploy/2026.08.23.06`
|
||||
2. **The SQL above**, both blocks, then the two verification queries. Stop on the `RAISE EXCEPTION`.
|
||||
3. `bun db:push` — expect **no changes and no prompt**. If it asks anything, the SQL did not take.
|
||||
4. `bun run plugins:update` — this pulls the capabilities repository too, which is how the new
|
||||
`.gitignore` arrives.
|
||||
5. **The orphan removal**, on the three hosts that have one.
|
||||
6. `pm2 restart officer`
|
||||
|
||||
`officer` only at step 6. Step 4 restarts each plugin's own sidecar, which belongs in the report.
|
||||
|
||||
**`macbookpro`:** append `/opt/homebrew/bin` to PATH for the `bun` commands, run `pm2` separately. It has
|
||||
`psql` now and a `.zshenv` that puts it on a non-interactive PATH, so the SQL can be run there directly.
|
||||
|
||||
## What to check, this release
|
||||
|
||||
**Open a chat and ask the agent what skills it has.** The preamble is built from a new code path —
|
||||
`capability-sources.ts` resolving roots per session — and the failure mode is an agent that quietly knows
|
||||
less rather than an error. It should name the commander, deploy and platform skills, plus anything a plugin
|
||||
ships on that host. On a host with the gitea plugin, its affordance should appear **once**.
|
||||
|
||||
**The language picker should offer six.** Switch to Swedish and look at a *panel*, not just the shell.
|
||||
|
||||
**Creating a commander should produce a directory.** `$DATA_PATH/<email>/commanders/<n>/` holding
|
||||
`CLAUDE.md` and `state/`. The setup pane asks for a *reference path* now, not a working directory.
|
||||
|
||||
No direct SQL beyond the block above is needed, and none is authorised.
|
||||
|
||||
## Hosts
|
||||
|
||||
- **`edge-pertento-bridge`** — skipped. Down, per `docs/servers.md`.
|
||||
- **`officer-dev`** — skip it. Both schema changes are already applied and verified by query there, its
|
||||
capabilities repository is clean, and restarting `officer` on the host running the rollout ends the
|
||||
rollout. Name it as skipped and say it is current.
|
||||
@@ -0,0 +1,131 @@
|
||||
# 2026.08.23.06 — deploy report
|
||||
|
||||
**5 of 5 target hosts succeeded.** Two hosts skipped by design: `officer-dev` (the host running the
|
||||
rollout) and `edge-pertento-bridge` (listed under *Deliberately skipped* in `docs/servers.md`).
|
||||
|
||||
Every host went `e15ab230` → `2646842c` by `git merge --ff-only deploy/2026.08.23.06`. No host was
|
||||
ahead, none had diverged, and no tracked file was dirty anywhere. `--force` was never used and no SQL
|
||||
beyond the plan's block was run.
|
||||
|
||||
## Per host
|
||||
|
||||
### `alpha` — ✅
|
||||
|
||||
- HEAD `e15ab230` → `2646842c`, remote SSH, tree clean, no untracked files.
|
||||
- **SQL:** both blocks applied. `RAISE EXCEPTION` did not fire — no role held a `provisioning_script`.
|
||||
`DELETE FROM command_hq_sessions` removed **0 rows**; the table was already empty.
|
||||
- **Verified by query** on `officer_dev`: `Developer` `grants_postgres=t grants_docker=t`; `Admin`,
|
||||
`Member`, `Super Admin` all `f/f`; `provisioning_script` absent (0 columns); `dir_name` and
|
||||
`reference_paths` present `NOT NULL`, `session_id` nullable.
|
||||
- `bun db:push` exit 0, no prompt. Seed reported `0 seeded, 4 already present` — the Developer flags were
|
||||
written by the seed's re-assert path, confirmed by re-querying after the push, not by the message.
|
||||
- `bun run plugins:update` — **13/13 in 54s**, exit 0, `capabilities: pulled`. Every plugin's sidecar
|
||||
restarted as part of this step: atelier, bitcoin-wallet, email, gitea, invoices, jellyfin, minesweeper,
|
||||
music, offscale, photos, soulseek, transmission, vault.
|
||||
- **Orphan removed:** `capabilities/affordances/officerdev/` existed and was deleted. Capabilities tree
|
||||
clean afterwards — no leftover `?? extensions/`, so the new `.gitignore` had already arrived.
|
||||
- `pm2 restart officer` — restart_time 72 → 73. **All 20 processes `online`.**
|
||||
|
||||
### `fofos` — ✅
|
||||
|
||||
- HEAD `e15ab230` → `2646842c`, remote HTTPS, no tracked changes.
|
||||
- **Untracked file left in place:** `scripts/chk.ts`. Noted, not a reason to skip, not touched.
|
||||
- **Database is `officer`, not `officer_dev`, and the URL is in `OFFICERDEV_POSTGRES_URL`** rather than
|
||||
`POSTGRES_URL`. Matched the code's own precedence (`OFFICERDEV_POSTGRES_URL ?? POSTGRES_URL`,
|
||||
`officer_db/src/db.ts:9`) so the migration went to the database the server actually opens.
|
||||
- **SQL:** both blocks applied, exception did not fire, `DELETE` removed **0 rows**.
|
||||
- **Verified by query:** `Developer` `t/t`, other three `f/f`, `provisioning_script` absent, `dir_name`
|
||||
and `reference_paths` `NOT NULL`, `session_id` nullable.
|
||||
- `bun db:push` exit 0, no prompt, no plugin schemas on disk.
|
||||
- `bun run plugins:update` — **1/1 in 7s**, exit 0, `capabilities: pulled`. `officer-gitea` sidecar
|
||||
restarted by this step.
|
||||
- **Orphan removed:** `capabilities/affordances/officerdev/` deleted; tree clean afterwards.
|
||||
- `pm2 restart officer` — 25 → 26. **All 8 processes `online`.**
|
||||
|
||||
### `macbookpro` — ✅ (awake, with two deviations worth recording)
|
||||
|
||||
- HEAD `e15ab230` → `2646842c`, remote SSH, tree clean, no untracked files.
|
||||
- **SQL:** both blocks applied. `psql` is at `/opt/homebrew/opt/libpq/bin/psql` and on the
|
||||
non-interactive PATH, as the plan said. `DELETE` removed **0 rows**.
|
||||
- **Verified by query:** `Developer` `t/t`, other three `f/f`, `provisioning_script` absent, `dir_name`
|
||||
and `reference_paths` `NOT NULL`, `session_id` nullable.
|
||||
- `bun db:push` exit 0, no prompt, run with `/opt/homebrew/bin` **appended** to PATH.
|
||||
- `bun run plugins:update` — exit 0, but **`no plugins installed — nothing to update`**, so the step
|
||||
exited before its capabilities pull. See *What I could not do* below.
|
||||
- **No orphan to remove.** `~/projects/officer-suite/capabilities` is **not a git checkout** — it holds
|
||||
only empty `agents/ extensions/ processes/ skills/ tasks/ tools/` and has no `affordances/` at all.
|
||||
- `pm2 restart officer` (run as its own command, PATH untouched) — 12 → 13. **All 6 processes `online`.**
|
||||
|
||||
### `production-pertento-bridge` — ✅
|
||||
|
||||
- HEAD `e15ab230` → `2646842c`, remote HTTPS, tree clean, no untracked files.
|
||||
- **SQL:** both blocks applied, exception did not fire, `DELETE` removed **0 rows**.
|
||||
- **Verified by query** on `officer_dev`: `Developer` `t/t`, other three `f/f`, `provisioning_script`
|
||||
absent, `dir_name` and `reference_paths` `NOT NULL`, `session_id` nullable.
|
||||
- `bun db:push` exit 0, no prompt. Its shell prints an nvm/`.npmrc` `globalconfig` warning before every
|
||||
command — cosmetic, pre-existing, unrelated to this release.
|
||||
- `bun run plugins:update` — **1/1 in 5s**, exit 0, `capabilities: pulled`. `officer-gitea` restarted.
|
||||
- **Orphan removed:** `capabilities/affordances/officerdev/` deleted; tree clean afterwards.
|
||||
- `pm2 restart officer` — 4 → 5. **All 15 processes `online`** (nine of them are this host's non-Officer
|
||||
Pertento jobs — Crons, Dashboard, Tracking, Uptime — none of which were touched).
|
||||
|
||||
### `deadpool-rezio-bridge` — ✅ (login `br`)
|
||||
|
||||
- HEAD `e15ab230` → `2646842c`, remote HTTPS, tree clean, no untracked files.
|
||||
- Database is `officer` via `OFFICERDEV_POSTGRES_URL`, same shape as `fofos`.
|
||||
- **SQL:** both blocks applied, exception did not fire, `DELETE` removed **0 rows**.
|
||||
- **Verified by query:** `Developer` `t/t`, other three `f/f`, `provisioning_script` absent, `dir_name`
|
||||
and `reference_paths` `NOT NULL`, `session_id` nullable.
|
||||
- `bun db:push` exit 0, no prompt, 2 plugin schemas (email, offscale).
|
||||
- `bun run plugins:update` — **2/2 in 8s**, exit 0, `capabilities: pulled`. The **email plugin advanced
|
||||
`c60e3d6` → `c1c3674`** — the only plugin anywhere in this rollout that was not already current.
|
||||
`officer-email` and `officer-offscale` sidecars restarted by this step.
|
||||
- **No orphan**, as the plan predicted; checked anyway and `affordances/officerdev` does not exist.
|
||||
- `pm2 restart officer` — 10 → 11. **All 9 processes `online`.**
|
||||
|
||||
## Skipped
|
||||
|
||||
- **`officer-dev`** — the host this rollout ran from. Nothing pulled, nothing restarted. Confirmed
|
||||
current rather than assumed: HEAD is `2646842c`, the tag's commit, and a direct query shows `Developer`
|
||||
`t/t` with the other three `f/f`, `provisioning_script` absent, `dir_name`/`reference_paths` present and
|
||||
`session_id` nullable. Its own `officer` process is untouched and still runs the pre-restart build of
|
||||
this commit — **the owner restarts it deliberately, as the last step.**
|
||||
- **`edge-pertento-bridge`** — in *Deliberately skipped* since 2026-08-23. Not contacted, no retry budget
|
||||
spent.
|
||||
|
||||
## Commanders deleted
|
||||
|
||||
**None, on any host.** `command_hq_sessions` held **0 rows everywhere** — every `DELETE` reported
|
||||
`DELETE 0`. Each host was counted by query *before* the delete ran, so this is measured rather than
|
||||
inferred. Nobody's standing job was removed by this release.
|
||||
|
||||
`officer-dev`'s one commander, `Platform Deployer`, had already been deleted there before the rollout
|
||||
began, per the plan.
|
||||
|
||||
## What I could not do
|
||||
|
||||
- **`macbookpro` did not get the capabilities pull.** `bun run plugins:update` exits early with `no
|
||||
plugins installed` and never reaches the capabilities repository, which the plan named as how the new
|
||||
`.gitignore` arrives. It does not matter on that host — its capabilities directory is not a git
|
||||
checkout, so there is no repository for a `.gitignore` to land in and no `affordances/` to be
|
||||
duplicated. I did not invent a `git pull` the plan had not authorised. **Nothing is outstanding on that
|
||||
host; the note is about the step's shape, not a missing change.**
|
||||
- **The release's own "what to check" list is unrun.** Asking an agent to name its skills, switching a
|
||||
panel to Swedish, and creating a commander to confirm it produces a directory are interactive checks in
|
||||
a browser. This deploy agent cannot make them, so **no host has been confirmed working by use** — only
|
||||
by schema query and process state.
|
||||
- **`officer-dev` needs `pm2 restart officer`** to run the code it already has checked out.
|
||||
|
||||
## Two things worth carrying forward
|
||||
|
||||
**`fofos` and `deadpool-rezio-bridge` name their database differently from the other three** — the URL
|
||||
lives in `OFFICERDEV_POSTGRES_URL` and the database is `officer`, not `officer_dev`. Any future plan step
|
||||
that reaches for `POSTGRES_URL` alone will connect to a socket that is not there, which is what it did
|
||||
here on the first attempt. The code's precedence is `OFFICERDEV_POSTGRES_URL ?? POSTGRES_URL`; follow it
|
||||
rather than either name.
|
||||
|
||||
**The seed's own output does not prove the Developer flags were written.** It prints `0 seeded, 4 already
|
||||
present` on every host, because it counts inserts and the roles already existed — while the flags are
|
||||
re-asserted by a separate update path. On all five hosts the flags read `f/f` immediately after the SQL
|
||||
and `t/t` only after `db:push`. Nothing was wrong; the message is simply not the evidence, and the query
|
||||
after the push is.
|
||||
@@ -0,0 +1,43 @@
|
||||
# 2026.08.24.01
|
||||
|
||||
One frontend file: the transcribe button is hidden in the file viewer's audio player.
|
||||
|
||||
**No schema change.** Nothing under `src/databases/**/schema.ts` moved. `bun db:push` is still a step
|
||||
because it is cheap and it proves the database agrees with the code, but it must report no changes.
|
||||
|
||||
**No dependency change.** `bun.lock` is untouched. **Do not run `bun install`.**
|
||||
|
||||
## What is in it
|
||||
|
||||
- **The transcribe button is hidden.** It calls `POST /file-browser/transcribe`, which refuses on every
|
||||
server here because no STT endpoint is configured anywhere — a control that can only fail, sitting beside
|
||||
OCR and extract-audio, which work. Hidden rather than deleted: speech-to-text is moving to a plugin and
|
||||
the wiring stays correct for when it lands.
|
||||
|
||||
## Every host
|
||||
|
||||
1. `git fetch origin --tags` then `git merge --ff-only deploy/2026.08.24.01`
|
||||
2. `bun db:push` — expect **no changes**. If it wants to alter something, stop and report it: this release
|
||||
touched no schema, so a diff means that host and this tree disagree about something else.
|
||||
3. `bun run plugins:update`
|
||||
4. `pm2 restart officer`
|
||||
|
||||
`officer` only at step 4. Step 3 restarts each plugin's own sidecar, which belongs in the report.
|
||||
|
||||
**`macbookpro`:** append `/opt/homebrew/bin` to PATH for the `bun` commands, run `pm2` separately.
|
||||
|
||||
## What to check, this release
|
||||
|
||||
Open a `.m4a` in the file browser. The audio player's header should show a download and a close icon and
|
||||
**no transcribe icon**. An image should still offer OCR and a video should still offer extract audio — if
|
||||
either of those disappeared, too much was hidden.
|
||||
|
||||
A stale bundle is the likely failure. Hard refresh before deciding it did not work.
|
||||
|
||||
No direct SQL is needed and none is authorised.
|
||||
|
||||
## Hosts
|
||||
|
||||
- **`edge-pertento-bridge`** — skipped, per `docs/servers.md`.
|
||||
- **`officer-dev`** — skip it. Restarting `officer` on the host running the rollout ends the rollout. Name
|
||||
it as skipped and say whether it is current.
|
||||
@@ -0,0 +1,74 @@
|
||||
# 2026.08.24.01 — deploy report
|
||||
|
||||
**5 of 5 target hosts succeeded.** Two hosts skipped by plan, neither a failure.
|
||||
|
||||
Every host went `2646842c` → `c813eef6`, the tag commit, by fast-forward. No host was dirty in tracked
|
||||
files. No `bun install` was run — the plan forbade it and `bun.lock` was untouched. No direct SQL was run
|
||||
and none was authorised.
|
||||
|
||||
| Host | Before → after | db:push | plugins | `officer` | Result |
|
||||
| --- | --- | --- | --- | --- | --- |
|
||||
| `alpha` | `2646842c` → `c813eef6` | applied 2 statements (see below) | 13/13 | online, 73 → 74 | ✅ |
|
||||
| `fofos` | `2646842c` → `c813eef6` | applied 2 statements | 1/1 (gitea) | online, 26 → 27 | ✅ |
|
||||
| `production-pertento-bridge` | `2646842c` → `c813eef6` | applied 2 statements | 1/1 (gitea) | online, 5 → 6 | ✅ |
|
||||
| `deadpool-rezio-bridge` | `2646842c` → `c813eef6` | applied 2 statements | 2/2 (email, offscale) | online, 11 → 12 | ✅ |
|
||||
| `macbookpro` | `2646842c` → `c813eef6` | applied 2 statements | none installed | online, 13 → 14 | ✅ |
|
||||
| `officer-dev` | `c813eef6` (already) | not run | not run | **not restarted** | ⏭ skipped — self |
|
||||
| `edge-pertento-bridge` | — | — | — | — | ⏭ skipped — `docs/servers.md` |
|
||||
|
||||
Every process on every host reported `online` after the restart: alpha 20/20, fofos 8/8,
|
||||
production-pertento-bridge 15/15, deadpool 9/9, macbookpro 6/6. No process came back `errored` and none
|
||||
failed to restart.
|
||||
|
||||
## The plan said `db:push` must report no changes. It did not, on any host.
|
||||
|
||||
This is a finding, and it is **not** what the plan's stop-condition describes, which is why the rollout
|
||||
continued.
|
||||
|
||||
`bun db:push` printed `Changes applied` on all five hosts. Run again in `--strict --verbose`, it wants the
|
||||
same two statements every time:
|
||||
|
||||
```sql
|
||||
ALTER TABLE "command_hq_sessions" ALTER COLUMN "reference_paths" SET DEFAULT '{}';
|
||||
ALTER TABLE "music_now_playing" DROP CONSTRAINT "pk_music_now_playing";
|
||||
ALTER TABLE "music_now_playing" ADD CONSTRAINT "pk_music_now_playing" PRIMARY KEY("user_id","device");
|
||||
```
|
||||
|
||||
**The same diff appears on `officer-dev`, this release's own source host, whose database has been running
|
||||
this schema for days.** That is the decisive check: the plan's condition is "that host and this tree
|
||||
disagree about something else", and no host disagrees with the tree — the tree disagrees with itself,
|
||||
identically, everywhere. It is the drizzle-kit mis-diff already documented in `src/databases/CLAUDE.md`
|
||||
under "Composite keys", here on a named composite **primary** key rather than a unique constraint, plus a
|
||||
spurious array-default diff.
|
||||
|
||||
Verified by query per host rather than by exit code, as the doctrine requires:
|
||||
|
||||
- `alpha` — `pk_music_now_playing` = `PRIMARY KEY (user_id, device)`; `reference_paths` default
|
||||
`'{}'::text[]`. Both exactly what the schema code says.
|
||||
- `fofos`, `production-pertento-bridge`, `deadpool-rezio-bridge`, `macbookpro` — `reference_paths`
|
||||
default `'{}'::text[]`. `music_now_playing` **does not exist** on these four (`information_schema`
|
||||
count 0): the music plugin is not installed there, so there is nothing for that half of the diff to
|
||||
touch. Not a fault.
|
||||
|
||||
So no host's schema is wrong. What is wrong is that `db:push` cannot serve as the proof step this plan
|
||||
wanted it to be — it reports work on a database that already matches.
|
||||
|
||||
**What the owner should know:** on `alpha`, where the table exists, every deploy drops and re-adds a live
|
||||
table's primary key for no reason. Harmless so far and verified intact afterwards, but it is real DDL on
|
||||
real data, repeated each release. The fix belongs in the schema code, not in a rollout.
|
||||
|
||||
## Notes
|
||||
|
||||
- `fofos` carries one untracked file, `scripts/chk.ts`. Noted, not a reason to skip — a fast-forward
|
||||
cannot touch it.
|
||||
- `bun run plugins:update` restarts each plugin's sidecar itself. On `alpha` that is 13 sidecars bouncing
|
||||
before the `officer` restart the plan asked for. Listed above as the plugin count; "restarted" is
|
||||
therefore more than `officer` alone on every host but `macbookpro`.
|
||||
- `officer-dev` is **current in tree** at `c813eef6` but its `officer` process was not restarted, so it is
|
||||
still serving the previous bundle. Restarting it is the owner's deliberate last step.
|
||||
|
||||
## Not verified by this deploy
|
||||
|
||||
The plan's visual check — open a `.m4a` and confirm the audio player shows no transcribe icon, while an
|
||||
image still offers OCR and a video still offers extract-audio. That needs a browser and a hard refresh,
|
||||
and no host was checked that way. The code is deployed; that it looks right is unconfirmed.
|
||||
@@ -0,0 +1,54 @@
|
||||
# 2026.08.24.02
|
||||
|
||||
Speech-to-text leaves the platform. It is a plugin now — `transcribe`, in the catalogue.
|
||||
|
||||
**No schema change.** Nothing under `src/databases/**/schema.ts` moved. `bun db:push` stays a step because
|
||||
it is cheap and proves the database agrees with the code, but it must report no changes.
|
||||
|
||||
**No dependency change.** `bun.lock` is untouched. **Do not run `bun install`.**
|
||||
|
||||
## What is in it
|
||||
|
||||
- **`api/stt/` and `server-settings/stt.ts` are gone**, along with `POST /chat/stt`,
|
||||
`POST /file-browser/transcribe`, the FileViewer handler behind the button hidden last release, the
|
||||
Settings → Speech to Text screen and the orphaned locale keys in all six locales.
|
||||
- **The transcription logic moved byte for byte** into `plugins/transcribe` — the two-pass
|
||||
detect-then-transcribe, the 25 language priming prompts, the timeouts. Verified identical, not rewritten.
|
||||
- **`transcribe` is in the catalogue**, so it can be installed from `/plugins` on any host that wants it.
|
||||
|
||||
## Installing the plugin is NOT part of this release
|
||||
|
||||
This release only removes. A host that had speech-to-text configured loses it until somebody installs the
|
||||
plugin and points it at a server — and no host here had it configured, so nothing is lost anywhere.
|
||||
|
||||
**Do not install it as part of the rollout.** Which hosts get transcription is the owner's decision, made
|
||||
per host, and an install grants access to every role. Report that the catalogue entry is available; leave
|
||||
it there.
|
||||
|
||||
## Every host
|
||||
|
||||
1. `git fetch origin --tags` then `git merge --ff-only deploy/2026.08.24.02`
|
||||
2. `bun db:push` — expect **no changes**. If it wants to alter something, stop and report it: this release
|
||||
touched no schema, so a diff means that host and this tree disagree about something else.
|
||||
3. `bun run plugins:update`
|
||||
4. `pm2 restart officer`
|
||||
|
||||
`officer` only at step 4. Step 3 restarts each plugin's own sidecar, which belongs in the report.
|
||||
|
||||
**`macbookpro`:** append `/opt/homebrew/bin` to PATH for the `bun` commands, run `pm2` separately.
|
||||
|
||||
## What to check, this release
|
||||
|
||||
**Settings should no longer offer Speech to Text.** That screen is gone, and its absence is the visible
|
||||
change. If it is still there, the frontend bundle is stale — hard refresh before deciding it failed.
|
||||
|
||||
The audio player's header should still show download and close, and still no transcribe icon. Images
|
||||
should still offer OCR and videos extract audio; those stay in the platform for now.
|
||||
|
||||
No direct SQL is needed and none is authorised.
|
||||
|
||||
## Hosts
|
||||
|
||||
- **`edge-pertento-bridge`** — skipped, per `docs/servers.md`.
|
||||
- **`officer-dev`** — skip it. Restarting `officer` on the host running the rollout ends the rollout. It
|
||||
already has this code and the plugin installed; name it as skipped and say so.
|
||||
@@ -0,0 +1,67 @@
|
||||
# 2026.08.24.02 — deploy report
|
||||
|
||||
**5 of 5 target hosts succeeded.** Two hosts skipped by plan, neither a failure.
|
||||
|
||||
Rolled out `deploy/2026.08.24.02` → `e0d80fd3`. Tag and `package.json` agreed. Every target moved
|
||||
`c813eef6` → `e0d80fd3` — one commit, no host ahead, no host behind.
|
||||
|
||||
Speech-to-text left the platform. Nothing was installed in its place: the `transcribe` plugin is in the
|
||||
catalogue and available, and per the plan no host was given it. That is the owner's decision, per host.
|
||||
|
||||
## Per host
|
||||
|
||||
| Host | Before | After | db:push | plugins | officer restart | processes |
|
||||
| ---- | ------ | ----- | ------- | ------- | --------------- | --------- |
|
||||
| `alpha` | `c813eef6` | `e0d80fd3` | no changes | 13/13 | 74 → 75 | 20/20 online |
|
||||
| `fofos` | `c813eef6` | `e0d80fd3` | no changes | 1/1 | 27 → 28 | 8/8 online |
|
||||
| `production-pertento-bridge` | `c813eef6` | `e0d80fd3` | no changes | 1/1 | 6 → 7 | 15/15 online |
|
||||
| `deadpool-rezio-bridge` | `c813eef6` | `e0d80fd3` | no changes | 2/2 | 12 → 13 | 9/9 online |
|
||||
| `macbookpro` | `c813eef6` | `e0d80fd3` | no changes | none installed | 14 → 15 | 6/6 online |
|
||||
|
||||
Every host ran the plan's four steps in order, all four exited 0, and none was stopped early. Checkout
|
||||
paths were taken from each `officer` process's `pm_cwd`, not assumed — `alpha` resolved to
|
||||
`~/officerdev/platform`, not its stale second checkout. `deadpool-rezio-bridge` was reached as `br`.
|
||||
`macbookpro` was awake; its `bun` commands ran with `/opt/homebrew/bin` appended to PATH and `pm2` as a
|
||||
separate command.
|
||||
|
||||
## Schema — verified, not assumed
|
||||
|
||||
The plan says no schema changed and `bun db:push` must report no changes. **It reported none on all five
|
||||
hosts**, and the evidence is that it emitted no DDL: no `ALTER`, no `CREATE`, no statement of any kind
|
||||
between reading the config and finishing. `[✓] Changes applied` alone was not treated as evidence —
|
||||
`drizzle-kit push` prints that line whether or not it did anything, and it can exit 0 on a half-applied
|
||||
change.
|
||||
|
||||
`stdin` was `/dev/null` on every host, so no prompt could be answered and none was. No direct SQL was
|
||||
needed, none was authorised, and none was run. `--force` was not used anywhere.
|
||||
|
||||
The seed steps that follow `push` were no-ops everywhere, which is the same answer from a second angle:
|
||||
`0 seeded, 4 already present` for roles on all five, and every transcript already recorded.
|
||||
|
||||
## Skipped
|
||||
|
||||
- **`officer-dev`** — the host this rollout ran on. Not pulled, nothing restarted. It already carries
|
||||
`e0d80fd3` and has the `transcribe` plugin installed. Restarting `officer` here ends the rollout
|
||||
mid-flight, so the whole host is left alone deliberately. **The owner restarts it, as the last step,
|
||||
once happy with the rest.**
|
||||
- **`edge-pertento-bridge`** — deliberately skipped per `docs/servers.md`, down since 2026-08-23 by the
|
||||
owner's call. Not contacted at all, so it cost nothing this time.
|
||||
|
||||
## Notes — nothing here needs action
|
||||
|
||||
- **`plugins:update` bounced far more than `officer`.** Sequential per plugin, each printing
|
||||
`sidecar: started`: 13 sidecars on `alpha`, 2 on `deadpool`, 1 each on `fofos` and
|
||||
`production-pertento-bridge`. A report listing only `officer` under "restarted" would understate what
|
||||
moved. All came back online.
|
||||
- **`fofos` has one untracked file**, `scripts/chk.ts`. A note, not a skip — a fast-forward could never
|
||||
touch it, and nobody's work was discarded to ship this.
|
||||
- **`production-pertento-bridge` prints an nvm warning** on every interactive shell: `.npmrc` carries a
|
||||
`globalconfig`/`prefix` setting incompatible with nvm. Cosmetic, pre-existing, unrelated to this
|
||||
release, and it did not affect any step. Not fixed — that is not a rollout's job.
|
||||
|
||||
## What was not verified
|
||||
|
||||
The plan's visible check — that Settings no longer offers Speech to Text — is a **browser** check, and
|
||||
this rollout has no browser. The code carrying that screen is gone from every host's tree, which is
|
||||
verified; that the rendered UI reflects it is not, and a stale JS bundle would look identical to a failed
|
||||
deploy. Hard refresh before concluding anything from it.
|
||||
@@ -0,0 +1,124 @@
|
||||
# 2026.08.25.01
|
||||
|
||||
Commanders become usable, agents get a credential that can be bounded, and a nudge finally arrives.
|
||||
|
||||
96 commits — the largest release so far, and most of it is one night's work on commanders driven by
|
||||
watching real setup runs.
|
||||
|
||||
**One schema change**, additive and safe. **No dependency change** — `bun.lock` is untouched.
|
||||
**Do not run `bun install`.**
|
||||
|
||||
**`edge-pertento-bridge` is NOT a target for this release.** It needs a schema step no other host does.
|
||||
See "Edge is excluded, and why" — this is the important part of this plan.
|
||||
|
||||
## What is in it
|
||||
|
||||
- **Commanders.** The template a new commander is created with was rewritten across the night: it asks
|
||||
one question per turn in the owner's own language, proves its action on a single item before arming,
|
||||
writes its own `CLASSIFICATION.md` and `DISPATCHING.md` rather than editing the platform's file, and
|
||||
records per step in its ledger. The Stop control works, a deleted commander stays deleted, and its
|
||||
children no longer appear in `/chat`.
|
||||
- **Every agent session gets a key, scoped to `notify`.** A chat can send you a notification through
|
||||
the platform instead of having no sanctioned way to reach you. It is minted per session and revoked
|
||||
with it.
|
||||
- **Credential narrowing** — `api_keys.permissions` (an allow list) and `api_keys.excluded_kinds`
|
||||
(resolved against the live registry). Applied **before** the owner bypass, which makes it the only
|
||||
thing that can bound a Super Admin — the case that matters, because a commander holds the owner's
|
||||
identity unattended for months. This is the schema change.
|
||||
- **`notify` moved from `app` to `core`.** It was grantable, nothing granted it, and every Member's app
|
||||
was silently 403'd registering its own push token. On the bridges that is four accounts.
|
||||
- **The loopback notify door is closed.** `/_officer/` paths now require a producer secret the sidecar
|
||||
issues at registration. It previously accepted any caller that set a header.
|
||||
- **Sidecar proxy timeouts are OFF.** `TIMEOUTS_ON = false` in `create-proxy.ts`, one line to reverse.
|
||||
Bun's `server.timeout()` stores one byte, so declaring 1800 seconds gave a _shorter_ timeout than
|
||||
declaring nothing. More permissive than what these hosts run today — a long transcription or a film
|
||||
no longer gets cut.
|
||||
- **A nudge always arrives.** Three refusals removed from the nudger. Read that commit before judging
|
||||
it: the old guards meant no nudge could ever fire on a machine running commanders, silently.
|
||||
- **Plugin tasks appear in the file browser**, and a direct task run is direct — no modal, no job row.
|
||||
- **`/todos`**, a kanban board over the repo's own `todo/` tree, owner-only.
|
||||
- **Two editor fixes** — one buffer per file across panels, and the model picker reading the right id.
|
||||
|
||||
## The schema change
|
||||
|
||||
Two nullable columns on `api_keys`:
|
||||
|
||||
```
|
||||
permissions text[] null
|
||||
excluded_kinds text[] null
|
||||
```
|
||||
|
||||
Both null means unnarrowed, which is what every existing key is — including the mobile apps'. **No
|
||||
existing credential changes behaviour.** Nothing is dropped and nothing is rewritten.
|
||||
|
||||
`bun db:push` applies it. **Do not take the exit code as the answer** — drizzle-kit can print an error
|
||||
and still exit 0. Verify on each host, against that host's own database:
|
||||
|
||||
```sql
|
||||
select column_name from information_schema.columns
|
||||
where table_name = 'api_keys' and column_name in ('permissions','excluded_kinds');
|
||||
```
|
||||
|
||||
Two rows, or the host is not done. `permissions` alone is a half-applied push — stop and report it.
|
||||
|
||||
## Every host except edge
|
||||
|
||||
1. `git fetch origin --tags` then `git merge --ff-only deploy/2026.08.25.01`
|
||||
2. `bun db:push` — then **run the query above**. Two rows.
|
||||
3. `bun run plugins:update`
|
||||
4. `pm2 restart officer`
|
||||
|
||||
`officer` only at step 4. Step 3 restarts each plugin's own sidecar, which belongs in the report.
|
||||
|
||||
**`macbookpro`:** append `/opt/homebrew/bin` to PATH for the `bun` commands, run `pm2` separately. It is
|
||||
a laptop and may be asleep — unreachable is a skip with a note, not a failure.
|
||||
|
||||
## Edge is excluded, and why
|
||||
|
||||
`edge-pertento-bridge` came back on 2026-08-24 at `deploy/2026.08.22.02`, **288 commits behind**. It is
|
||||
a deploy target again and its row is in `docs/servers.md`, but it must not be rolled out with the rest,
|
||||
and the reason was verified on the host rather than inferred:
|
||||
|
||||
- **It has no `roles` table.** `to_regclass('roles')` is null.
|
||||
- **Its two accounts hold `Super Admin` and `Developer`.**
|
||||
|
||||
Current schema makes `users.role` a foreign key onto `roles.name`. Every other host got `roles` created
|
||||
and seeded by `2026.08.23.04`, then the foreign key added by `2026.08.23.05` — two releases, in order,
|
||||
against an already-populated table. Edge would do both in one `db:push`, and the seeder runs from
|
||||
`postdb:push`, which is **after** the push completes. So the constraint would be created against an
|
||||
empty `roles` while `users.role` holds two values that are not in it.
|
||||
|
||||
That fails. Worse, it can fail and still exit 0, leaving the schema half-applied — which is exactly the
|
||||
warning `2026.08.23.05` carried.
|
||||
|
||||
**It also missed two plans with one-off steps** that a single fast-forward does not replay:
|
||||
`2026.08.23.05`'s pre-flight SQL, and `2026.08.23.06`'s orphan-affordance cleanup.
|
||||
|
||||
So: **name edge as skipped, do not attempt it, and do not report it as a failure.** Bringing it forward
|
||||
is a watched, by-hand operation — push, seed, push again, verify the constraint — and it is being done
|
||||
separately by the owner and this session, immediately after this rollout.
|
||||
|
||||
**One more thing about edge, for whoever reaches it later:** from `officer-dev` the name
|
||||
`edge-pertento-bridge` does not resolve. It answers on **`100.64.0.15`**. `docs/servers.md` has the
|
||||
address; use it.
|
||||
|
||||
## What to check, this release
|
||||
|
||||
**A commander can be created and asks its first question in your language.** That is the release, and
|
||||
it is the thing most likely to reveal a stale bundle — hard refresh before deciding anything failed.
|
||||
|
||||
**A Member's phone can register for notifications.** `notify` is core now, so an account that was
|
||||
403'ing should simply work.
|
||||
|
||||
**Nothing else should have changed for an ordinary signed-in owner.** Every narrowing column is null on
|
||||
every existing key.
|
||||
|
||||
No direct SQL is needed on any host in this release, and none is authorised. The query in "The schema
|
||||
change" is a read.
|
||||
|
||||
## Hosts
|
||||
|
||||
- **`officer-dev`** — skip it. Restarting `officer` there ends the rollout. It is already on this code.
|
||||
- **`edge-pertento-bridge`** — skipped, see above. Not a failure.
|
||||
- **`alpha`**, **`fofos`**, **`production-pertento-bridge`**, **`deadpool-rezio-bridge`** — the targets.
|
||||
- **`macbookpro`** — a target if it is awake.
|
||||
@@ -3,6 +3,17 @@
|
||||
Spec conversation 2026-08-18, owner + agent, back and forth. This is the write-up asked for partway through
|
||||
it, kept current as answers landed.
|
||||
|
||||
**Superseded in part, 2026-08-24, by `docs/commander-directory.md`.** A commander's identity moved from
|
||||
Claude's transcript id to its own `command_hq_sessions` row, and it gained its own directory
|
||||
(`$DATA_PATH/<email>/commanders/<dirName>/`, `CLAUDE.md` + `state/`) created BEFORE any turn spawns. That
|
||||
makes several sections below describe the PREVIOUS mechanism rather than the current one — notably
|
||||
"How a commander is created" (creation is no longer session-first), "Working directory" (a commander no
|
||||
longer shares one directory per user, nor chooses an arbitrary one — it has its own), and the `POST
|
||||
/commanders` / `POST /commanders/new` rows in "API reference" (both now require `name` and `referencePath`
|
||||
and no longer accept an arbitrary `cwd`). This file was not rewritten to match — read
|
||||
`docs/commander-directory.md` first for anything those sections describe, and treat the code
|
||||
(`src/servers/api/command-hq/`) as the source of truth where the two disagree.
|
||||
|
||||
**Status:** data model, the full REST API including both creation paths (web and `POST
|
||||
/commanders/new`), built and mounted 2026-08-18 (`bunx tsgo` clean, suite at its 7 pre-existing baseline
|
||||
failures — none of them this feature's). `bun db:push` and a restart of `officer` have both since run
|
||||
|
||||
@@ -0,0 +1,218 @@
|
||||
# A commander is a directory, not a session
|
||||
|
||||
**Status: phase 1 built 2026-08-24** — schema, directory creation, `CLAUDE.md` at creation, the inverted
|
||||
`POST /commanders` → start-turn → point-at-transcript order, `resolveChatCwd` resolving server-side, and the
|
||||
frontend composer split (`NewCommanderSetup` → `ActiveNewCommander`) in `src/servers/api/command-hq/` and
|
||||
`src/workspaces/officerdev/src/apps/CommandHQ/CommandHqDetail.tsx`. `bunx tsgo`/`./node_modules/.bin/tsgo`
|
||||
clean, suite green. **`bun db:push` has not been run** — the owner reviews and runs the database work
|
||||
separately; see the schema section below for what changed and why nothing here is a migration. Phase 2
|
||||
(a commander becomes a git repository) is still not built.
|
||||
|
||||
## What is wrong now
|
||||
|
||||
A commander's identity is borrowed. `command_hq_sessions.session_id` is Claude's **transcript id**, minted
|
||||
by the CLI as the first turn begins — verified: the id on the live row has a transcript file under
|
||||
`~/.claude/projects/`. Everything about a commander hangs off that one borrowed value, and three problems
|
||||
fall out of it.
|
||||
|
||||
**An ordering problem.** `POST /command-hq/commanders` takes a `sessionId` the caller already holds and
|
||||
validates the transcript exists, so a chat session is created first and filed as a commander second. But
|
||||
the working directory is fixed when the session spawns — before the id exists. There is no point in the
|
||||
current flow where a commander can be started *in a directory named after itself*.
|
||||
|
||||
**A first-turn interlock that is a side effect.** `commanderBlock` compiles the paths a commander must
|
||||
record itself at into every turn, and on the first turn they cannot be resolved, so the block is empty.
|
||||
The commander skill turns that into a rule: *"if you have not been given paths, you are on your first
|
||||
turn."* It works, and it is a signal derived from a failure rather than something anybody said. That
|
||||
block's own comment explains the awkwardness — it rides `effectivePrompt` rather than the session
|
||||
preamble, because the preamble is built once and the first turn has no id to build it from.
|
||||
|
||||
**Losing the conversation loses the commander.** State lives in the transcript and in a second tree,
|
||||
`commander-state/<transcript id>/`. A session that dies takes its commander with it.
|
||||
|
||||
## The design
|
||||
|
||||
**The directory IS the commander. The session is how you talk to it.**
|
||||
|
||||
```
|
||||
$DATA_PATH/<email>/commanders/<commander id>/
|
||||
CLAUDE.md written at creation, extended by the commander as it learns the job
|
||||
spawned session ids of the agents its loop started
|
||||
<whatever it writes> scripts, procedures, its record of what it has handled
|
||||
```
|
||||
|
||||
The id is one the **platform** owns, generated when the commander is created. Nothing waits on the CLI.
|
||||
|
||||
The flow becomes linear:
|
||||
|
||||
1. The user gives a name and a reference path, and clicks Start.
|
||||
2. The platform creates the row and the directory.
|
||||
3. It writes `CLAUDE.md` into the directory: the name, the reference path, and the standing guidance
|
||||
`commanderBlock` currently injects.
|
||||
4. It spawns the session with `cwd` set to that directory.
|
||||
5. The transcript id arrives later and is recorded **on the row**, as a pointer to the current
|
||||
conversation.
|
||||
|
||||
**The API does not change.** Same endpoints, same shape from the client's side. What changes is the server
|
||||
being able to do things in an order that works.
|
||||
|
||||
## What this buys
|
||||
|
||||
**`CLAUDE.md` needs no mechanism.** Claude Code reads one from the working directory at session start. So
|
||||
the living document is free: the commander edits its own file, and the next turn has it. No injection, no
|
||||
per-turn cost, no block riding `effectivePrompt`.
|
||||
|
||||
**A commander survives its conversation.** Everything it knows is on disk. A session that dies can be
|
||||
replaced by a fresh one in the same directory, and the commander carries on with its scripts, its
|
||||
procedures and its record of what it has already handled. Today that is a total loss.
|
||||
|
||||
**One directory instead of two.** `commander-state/<id>/` collapses in. Deleting a commander becomes
|
||||
deleting a directory, which is also the only way to be sure nothing is left behind.
|
||||
|
||||
**The first turn can be stated rather than inferred.** With the file written before the session exists,
|
||||
the platform can simply say which turn it is on. The interlock stops being a trick.
|
||||
|
||||
## The reference path
|
||||
|
||||
**What was the working directory becomes a reference** — what the commander operates ON, not where it
|
||||
lives. One is collected in the start dialog, because a person can name one thing and asking for a list up
|
||||
front gets a worse answer than asking later.
|
||||
|
||||
**More can be added in conversation.** A voice-memos commander watches one folder; a life manager might
|
||||
watch memos, scans and a mailbox. So this is a list on the row, seeded with one, and the commander writes
|
||||
additions into its own `CLAUDE.md` as they are agreed.
|
||||
|
||||
## The two tiers, and why a commander should get cheaper
|
||||
|
||||
This is the point of the whole design, and it generalises past any particular commander.
|
||||
|
||||
**The script gathers. The agent judges.**
|
||||
|
||||
A commander has two kinds of work and they have opposite economics. A script runs per event — every email,
|
||||
every voice memo — and costs nothing, so there is no ceiling on volume. An agent runs per batch, on
|
||||
material a script already assembled, and costs a turn every time it wakes. So the rule for building any
|
||||
commander is: push as much as possible down into the script, and let the agent see only what actually
|
||||
needs judgement.
|
||||
|
||||
Detecting a one-time code in an email is a script. Reading fifty messages and deciding which of them the
|
||||
owner would want to know about is an agent. A watcher that transcribes a recording is a script; deciding
|
||||
what a week of transcripts means is an agent.
|
||||
|
||||
**And the tiers are not fixed, which is the part that matters.**
|
||||
|
||||
Because the commander owns its own scripts — they are files in its directory, and it can edit them — every
|
||||
correction moves work downward. The owner says "this one was missed, it had eight digits rather than six",
|
||||
and a decision that required judgement becomes a rule that does not. The agent tier gets thinner; the free
|
||||
tier gets better.
|
||||
|
||||
**A commander that runs for six months should cost less per event than it did in week one, not more.**
|
||||
|
||||
That is the opposite of how automation usually ages, and it is a direct consequence of two decisions made
|
||||
here rather than a hope: the agent owns its scripts, and the corrections arrive through dialogue rather
|
||||
than through a ticket to somebody else. Nothing improves a system it cannot edit.
|
||||
|
||||
Two things this requires, and both are cheap if done from the start:
|
||||
|
||||
- **The script's verdict must be reproducible.** Not logged — RE-RUN. The input is still in the mailbox or
|
||||
the folder, and the script is deterministic, so diagnosing a miss is running it again and watching. A
|
||||
log would be a second copy of something already on disk.
|
||||
- **A change is checked against what came before.** The corpus already exists — the last few hundred
|
||||
messages, the transcripts so far. Re-run the old script and the new one over it and compare; anything
|
||||
whose verdict changed is either the bug just fixed or one just introduced. Without that, the fix for
|
||||
eight-digit codes quietly starts flagging every order confirmation, unattended, at three in the morning.
|
||||
|
||||
`capabilities/skills/commander/SKILL.md` should teach this. Somebody building the fourth commander needs
|
||||
the rule more than they need the worked example.
|
||||
|
||||
## What the directory holds: definition versus state
|
||||
|
||||
Two kinds of thing live in there and they must not mix, because one of them travels and the other must
|
||||
never.
|
||||
|
||||
```
|
||||
$DATA_PATH/<email>/commanders/<commander id>/
|
||||
CLAUDE.md DEFINITION — the living document, extended as the job is agreed
|
||||
parameters.* DEFINITION — the things a fork has to change. Paths, cadences, thresholds
|
||||
procedures/ DEFINITION — what a spawned agent reads at fire time
|
||||
scripts/ DEFINITION — the loops
|
||||
state/ INSTANCE — what it has handled, what it spawned, its loop's pid
|
||||
```
|
||||
|
||||
**Separate from the first commit, not sorted out later.** A shareable bundle is "everything except
|
||||
`state/`" only if that boundary is structural; mixed together, extracting one means picking files apart by
|
||||
hand and getting it wrong once. Same reasoning as plugin capabilities being read in place rather than
|
||||
copied — a directory boundary beats a convention, because a convention is what a tired person violates.
|
||||
|
||||
The failure it prevents is specific: a recipient's commander starting up believing it has already handled
|
||||
your recordings, and silently doing nothing.
|
||||
|
||||
**Parameters are separate from procedure, or forking means editing code.** With `~/Documents/VoiceMemos`
|
||||
baked into a script, a fork is a debugging session. Declared in one place, a fork is a conversation — the
|
||||
new owner is asked where their memos land and the commander rewrites its own file. That difference is the
|
||||
whole point of the thing being an agent rather than a template.
|
||||
|
||||
## Phase 2 — a commander becomes a git repository
|
||||
|
||||
**Not now.** Recorded because the phase 1 layout has to leave room for it, and it costs nothing today to
|
||||
leave that room.
|
||||
|
||||
**There is no button.** The owner asks the commander, in conversation, to make itself shareable, and it
|
||||
does — `git init`, a `.gitignore` that excludes `state/`, a first commit. That is the same shape as
|
||||
everything else here: the commander maintains its own directory, and the platform does not reach in.
|
||||
|
||||
**What it needs to know goes in the commander SKILL, not an affordance.** The layout, what is tracked,
|
||||
what is ignored and how credentials are handled is reference material — read on the one day somebody asks
|
||||
for it. An affordance's body is charged to every turn of every commander forever, and this would earn that
|
||||
cost approximately never. `capabilities/skills/commander/SKILL.md` gains a section.
|
||||
|
||||
**A commander never holds a service's connection details, and that is a boundary rather than a
|
||||
precaution.** The Whisper URL is not the commander's business: it knows the platform can transcribe and
|
||||
asks the platform, which holds the connection. So there is usually nothing sensitive in a commander to
|
||||
leak, and the sharing story is simple for a reason rather than by luck.
|
||||
|
||||
Where a commander genuinely does need a secret of its own, the same rule applies for the obvious reason: a
|
||||
credential is definition-shaped — it looks like configuration — so excluding `state/` does not protect it,
|
||||
and a shared repository is exactly the artefact where one gets published and stays published. Name what
|
||||
must be configured; let the platform hold the value.
|
||||
|
||||
**Whether the platform is actually configured is not this system's problem.** A commander depending on
|
||||
transcription can be armed on a server where nobody set up a Whisper endpoint, and it would produce
|
||||
nothing. That is a system administration mistake, and the answer is already in the commander skill rather
|
||||
than in new machinery: **do the first run by hand, then arm.** A first run against something unconfigured
|
||||
fails in front of the person doing it. The same rule catches the shared case — somebody forking this onto
|
||||
their own machine finds out on their first run instead of at 3am.
|
||||
|
||||
The forking story then reads: clone, open a conversation, answer where your memos land and what you want
|
||||
done with them, and the commander rewrites its own parameters and arms.
|
||||
|
||||
## The consequence for the skill
|
||||
|
||||
`capabilities/skills/commander/SKILL.md` says turn one is orientation — *"read where you actually are
|
||||
before you ask anything"* — and that assumes `cwd` is the thing worth exploring. Under this design the
|
||||
commander's own directory is nearly empty on turn one and the interesting thing is somewhere else.
|
||||
|
||||
That guidance has to change with the code, or every new commander will orient on an empty folder and ask
|
||||
a worse question than it does today.
|
||||
|
||||
## The schema change, and why there is no migration
|
||||
|
||||
`session_id` stops being the commander's identity and becomes a nullable pointer to its current
|
||||
conversation. The row gains its own id, its directory, and its reference paths.
|
||||
|
||||
**Nothing is migrated.** The one commander on this machine is deleted and re-armed from scratch on the new
|
||||
system — the owner's call, made on 2026-08-24, and the right one: it is unarmed and has never fired, so
|
||||
migrating it would mean writing and testing a path that runs exactly once and then never again. Re-arming
|
||||
also exercises the flow this design exists to fix, which a migration would route around.
|
||||
|
||||
That decision has a shelf life. It is free while one commander exists and unarmed; it stops being free the
|
||||
moment somebody is relying on one. Build this before that happens, or write the migration.
|
||||
|
||||
## What this does not decide
|
||||
|
||||
**Whether a commander's loops are scripted or agentic.** Both, in practice — a watcher that transcribes
|
||||
does not need judgement and should not spend a turn per file, while a job that reads transcripts and
|
||||
decides what to do with each of them is agentic by nature. The directory holds the procedure either way.
|
||||
|
||||
**How a commander learns what the platform can do.** It reads the generated platform skill and, for a
|
||||
plugin, that plugin's own skill. That is a separate gap: a plugin must ship a skill documenting its routes
|
||||
or a commander can see it is installed and still not know how to call it.
|
||||
@@ -22,20 +22,79 @@ Two details from that report do most of the diagnostic work:
|
||||
|
||||
Do not re-investigate these without new evidence.
|
||||
|
||||
| Candidate | Why it is out |
|
||||
| -------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
|
||||
| The end-of-turn refresh re-reading the file | `reloadFile` sets `originalContent` and `isDirty: false`. It cannot produce a dirty tab. |
|
||||
| A shared component between the task panel and the editor | `CodeSurface` (the task log) renders with shiki. It is not Monaco and holds no editor model. |
|
||||
| Two Monaco editors sharing a model | The app's only other mount, `FileViewer/renderers/EditorRenderer.tsx`, passes no `path`, so its model URI is `inmemory://model/N` and cannot collide with the editor's `file:///…`. |
|
||||
| Something typing into the page | No `execCommand('insertText')`, no synthesised `KeyboardEvent`, no clipboard writes anywhere near the editor. |
|
||||
| Candidate | Why it is out |
|
||||
| ------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ |
|
||||
| The end-of-turn refresh re-reading the file | `reloadFile` sets `originalContent` and `isDirty: false`. It cannot produce a dirty tab. |
|
||||
| A shared component between the task panel and the editor | `CodeSurface` (the task log) renders with shiki. It is not Monaco and holds no editor model. |
|
||||
| ~~Two Monaco editors sharing a model~~ **— WRONG, see below** | This asked which OTHER component mounts Monaco and answered `EditorRenderer` (still true: no `path`, so `inmemory://model/N`, no collision). It never asked whether the **code editor collides with ITSELF**. It does — the panel is addable to a dashboard twice. |
|
||||
| Something typing into the page | No `execCommand('insertText')`, no synthesised `KeyboardEvent`, no clipboard writes anywhere near the editor. |
|
||||
|
||||
That leaves **Monaco's own `onChange`** — the model was edited the way a paste or a programmatic
|
||||
`executeEdits` edits it. Which is why this needs to be caught in the act rather than reasoned about.
|
||||
|
||||
One thing to check first, because it is recent and it is ours: `2b70a570` gave `<Editor>` a real `path`,
|
||||
so models are keyed by file URI globally rather than per mount. Two panels open on the same file now share
|
||||
one model. That should be an improvement, and it is a change in exactly the layer that turns out to be
|
||||
involved.
|
||||
## Two code-editor panels share one model and two buffers (2026-08-25)
|
||||
|
||||
The suspicion recorded here — `2b70a570` giving `<Editor>` a real `path`, so models are keyed by file URI
|
||||
**globally** rather than per mount — is correct, and it is worse than "should be an improvement". Verified
|
||||
by reading `@monaco-editor/react@4.7.0`'s built source, not inferred:
|
||||
|
||||
- **Model lookup is `getModel(Uri.parse(path)) || createModel(value, …)`.** An existing model for that path
|
||||
wins and the second mount's `value` is **ignored at creation**. So the second panel to open a file adopts
|
||||
the first panel's buffer.
|
||||
- **The value-sync effect then overwrites it**, because `value !== editor.getValue()`:
|
||||
`executeEdits('', [{ range: getFullModelRange(), text: value }])`.
|
||||
- **The guard that suppresses `onChange` during that write is per-INSTANCE.** The package sets an internal
|
||||
flag around its own `executeEdits` and checks it inside `onDidChangeModelContent`. Panel B's flag is not
|
||||
panel A's. So B's programmatic write **fires A's `onChange`** with B's content.
|
||||
- **Unmount disposes the shared model.** `keepCurrentModel` defaults to `false` and we never set it, so the
|
||||
cleanup calls `editor.getModel()?.dispose()`. And `CodeEditor` mounts `<Editor key={activeFile.path}>`,
|
||||
so this runs on every **tab switch**, not only on panel close — switching tabs in one panel disposes the
|
||||
model another panel is still displaying.
|
||||
|
||||
The other half is ours: `useEditorState` holds `files` in a plain `useState`, so it is **per panel
|
||||
instance**. Its own comment says so — "this app also mounts as a dashboard panel, and a dashboard can hold
|
||||
two of them". One shared model, two independent `content` values, and an `onChange` that crosses between
|
||||
them. `CodeEditor`'s handler does `setContent(activeFile.path, value)`, so panel A's buffer silently becomes
|
||||
panel B's content and `isDirty` flips with no keystroke — dirty tab, content the user never typed, disk
|
||||
untouched, fixed by reopening. That is the reported symptom's exact shape.
|
||||
|
||||
**What this does NOT yet explain is how JOB OUTPUT becomes one of those `value`s.** Nothing in the app
|
||||
writes job output into `useEditorState` — `openFile`/`setContent`/`reloadFile` are called only from
|
||||
`CodeEditor.tsx`, and the task log renders through shiki. So this is a real defect that produces the right
|
||||
shape, and it is not proven to be the reported instance. **The trap is still the thing that names the
|
||||
text's source.** Do not delete it on the strength of this section.
|
||||
|
||||
## Fixed 2026-08-25: the buffer is shared, because the model already was
|
||||
|
||||
`useEditorState` now keys buffers by path in one store shared across panels, and keeps only the tab set and
|
||||
the active path per panel. The rule that matters: **`openFile` discards the content it is handed when the
|
||||
file is already open somewhere else.** That mirrors what Monaco does with the model, and it is what removes
|
||||
the divergence — with both panels reading one buffer there is never a `value` for the sync effect to
|
||||
reconcile, so the `executeEdits` never runs and the cross-panel `onChange` never fires.
|
||||
|
||||
A buffer outlives the tab that opened it. `holders` is the set of panels with the file open, and the entry
|
||||
is dropped when the last one closes, so closing a tab in one panel cannot take unsaved work out from under
|
||||
another. Closing the last one still discards unsaved edits, exactly as before.
|
||||
|
||||
`<Editor keepCurrentModel>` is the other half, and it was needed under any fix: the default disposes the
|
||||
shared model on unmount, and `key={activeFile.path}` makes that every **tab switch**, not just a panel
|
||||
close. The cost is one retained model per file opened in a session.
|
||||
|
||||
Two things worth knowing:
|
||||
|
||||
- **Writes go through `queryClient.setQueryData`, not `useGlobal`'s setter.** `useGlobal` applies a
|
||||
functional update to the `data` captured in render rather than to what is in the cache now. With one
|
||||
writer that is invisible; this slot has one writer per panel, which is the whole scenario.
|
||||
- **The trap can now fire legitimately.** Two panels on one file share a model, so a large paste in one
|
||||
fires the other's `onChange` while it is unfocused — which is what `reportSuspiciousEdit` looks for. A
|
||||
report whose `stack` runs through the editor's own `onChange` with another panel open is that, not the
|
||||
bug. This is the reason to keep reading the `stack` rather than the count.
|
||||
|
||||
Pinned by `useEditorState.test.ts` (9 tests): adoption, cross-panel edit, close-with-holders, drop on last
|
||||
close, release on unmount, and that the tab set stays per panel.
|
||||
|
||||
**Still not closed.** This removes the mechanism, not the mystery: where the log text came from is still
|
||||
unknown, and nothing found so far writes job output into an editor buffer. Keep the trap.
|
||||
|
||||
## When it is reported
|
||||
|
||||
|
||||
@@ -0,0 +1,137 @@
|
||||
# Filesystem quotas — the prerequisite for per-user and per-team storage limits
|
||||
|
||||
**Status: planned, not done. Nothing in the platform reads or writes a quota yet.**
|
||||
|
||||
This is the host-side half. It makes limits *enforceable*; it does not create any. The platform side —
|
||||
the owner declaring defaults and maxima, and provisioning applying them — is `docs/roles-and-teams.md`
|
||||
→ "Quotas", and it is not built either. Do this first, because a policy nothing enforces is worse than
|
||||
no policy: it reads as a limit and is not one.
|
||||
|
||||
## Why the kernel and not the platform
|
||||
|
||||
Members hold `terminal` at `write` and have their own Linux accounts. A quota the platform tracks by
|
||||
counting bytes through the file browser is decorative — a member opens a terminal, or connects over SSH
|
||||
with their own key, and writes past it without the platform seeing the write.
|
||||
|
||||
Only the filesystem can refuse. So this is a provisioning feature, not an accounting one.
|
||||
|
||||
## Where it matters
|
||||
|
||||
**`edge-pertento`.** It is the first real multi-user deployment and the only host that will hold accounts
|
||||
that are not the owner's. It already has one account, which is the argument for doing this soon rather
|
||||
than carefully later: moving a home directory is easy once and tedious per person.
|
||||
|
||||
`officer-dev` is a development machine and will not be multi-user. `alpha` is the owner's own. Neither
|
||||
needs this, and neither can do it without the same downtime, so there is no reason to.
|
||||
|
||||
## What to check BEFORE booting into rescue
|
||||
|
||||
Run these on the live machine. They decide whether the procedure below is the right one.
|
||||
|
||||
```bash
|
||||
findmnt -no FSTYPE,SOURCE,TARGET / # expect ext4, and note the real device
|
||||
findmnt -no OPTIONS / | tr ',' '\n' | grep -i quota # expect nothing — that is why we are here
|
||||
sudo tune2fs -l "$(findmnt -no SOURCE /)" | grep -iE 'features|Inode size'
|
||||
lsblk -o NAME,SIZE,FSTYPE,MOUNTPOINT
|
||||
df -h /home
|
||||
```
|
||||
|
||||
Three things decide the plan:
|
||||
|
||||
1. **Is `/home` its own filesystem, or part of `/`?** On a stock Hetzner image it is part of `/`, so the
|
||||
root filesystem is what gains the feature.
|
||||
2. **Inode size.** Only matters if you use project quotas — they need 256 bytes and cannot be enabled on a
|
||||
128-byte filesystem without recreating it. The plan below avoids project quotas for exactly this reason.
|
||||
3. **Is the device under LVM?** `alpha` is; `officer-dev` is not. It changes only the device path.
|
||||
|
||||
## The plan: user quotas and group quotas, not project quotas
|
||||
|
||||
Two mount options cover both cases and neither needs a feature the filesystem might lack:
|
||||
|
||||
- **`usrquota`** — a limit per Linux user. This is the per-account home directory limit.
|
||||
- **`grpquota`** — a limit per Linux group. **This is how a team's shared folder gets a limit**, because a
|
||||
team is already a Linux group (see `docs/roles-and-teams.md` — the group is what keeps one team out of
|
||||
another's folder, not the permission grant).
|
||||
|
||||
Project quotas (`prjquota`) would let a *directory* carry a limit independent of ownership. That is more
|
||||
flexible and it is not needed: every case here is "this user" or "this team", both of which are already
|
||||
identities the kernel knows. Skipping it also skips the inode-size problem entirely.
|
||||
|
||||
**For the group quota to work, the team folder must be `setgid`** (`chmod g+s`), so files created inside it
|
||||
inherit the team's group and are charged to it. Without that, a member's files are charged to the member's
|
||||
own primary group and the team limit counts nothing. This is the single easiest thing to get wrong here.
|
||||
|
||||
## Procedure
|
||||
|
||||
Downtime is roughly ten minutes, most of it reboots. The owner has said downtime is acceptable.
|
||||
|
||||
**1. Install the tools, on the live machine.**
|
||||
|
||||
```bash
|
||||
sudo apt-get update && sudo apt-get install -y quota
|
||||
```
|
||||
|
||||
**2. Take note of the root device**, from the pre-flight above — `/dev/sda1` on a stock image,
|
||||
`/dev/mapper/<vg>-<lv>` under LVM. Every command below uses it.
|
||||
|
||||
**3. Boot into Hetzner rescue** from the Cloud console, and do not mount the filesystem.
|
||||
|
||||
**4. Check it, then add the feature.** `tune2fs` refuses on a filesystem that is not clean, and the check
|
||||
is worth running anyway before changing metadata:
|
||||
|
||||
```bash
|
||||
e2fsck -f /dev/sda1
|
||||
tune2fs -O quota /dev/sda1
|
||||
tune2fs -l /dev/sda1 | grep -i features # 'quota' must now appear
|
||||
```
|
||||
|
||||
`quota` here is the ext4 *journaled quota* feature. It is what lets quotas come up with the filesystem
|
||||
rather than needing a `quotacheck` scan at every boot, which on 320 GB is not quick.
|
||||
|
||||
**5. Add the mount options.** Back on the normal system — or by mounting the root filesystem from rescue
|
||||
and editing it there — the `/` line in `/etc/fstab` gains `usrquota,grpquota`:
|
||||
|
||||
```
|
||||
UUID=<unchanged> / ext4 defaults,usrquota,grpquota 0 1
|
||||
```
|
||||
|
||||
**6. Reboot into the normal system and confirm.**
|
||||
|
||||
```bash
|
||||
findmnt -no OPTIONS / | tr ',' '\n' | grep quota # usrquota, grpquota
|
||||
sudo quotaon -p / # both should report "is on"
|
||||
sudo repquota -s / # a table, not an error
|
||||
```
|
||||
|
||||
## Verify it actually refuses
|
||||
|
||||
Enabling quotas and setting none is the failure that looks like success. Prove enforcement once, on a
|
||||
throwaway account, before trusting it:
|
||||
|
||||
```bash
|
||||
sudo useradd -m quotaprobe
|
||||
sudo setquota -u quotaprobe 10240 10240 0 0 / # 10 MB soft and hard
|
||||
sudo -u quotaprobe dd if=/dev/zero of=/home/quotaprobe/fill bs=1M count=50
|
||||
# expect: "Disk quota exceeded" and a file of about 10 MB, NOT 50
|
||||
sudo userdel -r quotaprobe
|
||||
```
|
||||
|
||||
If that writes 50 MB, quotas are not on, whatever the mount options say.
|
||||
|
||||
## What this does not do
|
||||
|
||||
- **It sets no limits.** Every existing account is unlimited until something assigns a quota. That is the
|
||||
correct intermediate state: the machine gains the ability, nobody's behaviour changes.
|
||||
- **It does not touch the platform.** `provision-os.ts` does not call `setquota` yet, and there is nowhere
|
||||
for the owner to declare a default. That is the other half.
|
||||
- **It does not apply to the team folders**, because there are no team folders yet. When they arrive they
|
||||
must be `setgid` or their group quota counts nothing.
|
||||
|
||||
## When the platform half is built
|
||||
|
||||
`POST /users/:id/provision-linux` already exists as a retry path and is the natural home for this: it
|
||||
becomes "re-apply current policy to this account", covering both a new account and a changed limit.
|
||||
|
||||
**On a host where quotas are not enabled, the platform must say so** — "policy recorded, not enforceable on
|
||||
this host" — rather than storing numbers that do nothing. Same rule as the plugin dependency check: refuse
|
||||
or report, never silently no-op. `quotaon -p` is the check, and it is cheap enough to run per request.
|
||||
+130
-26
@@ -1,6 +1,10 @@
|
||||
# Localization
|
||||
|
||||
**Status: DESIGN, NOT BUILT — with a working 5% skeleton already in the tree.**
|
||||
**Status: BUILT and shipping six locales** — en-GB, pt-PT, es-ES, de-DE, fr-FR, sv-SE. The mechanism
|
||||
is done; what remains is coverage, which is the count-taking below.
|
||||
|
||||
**To add a seventh language, read "Adding a locale" at the bottom and nothing else.** It is seven
|
||||
files and the order does not matter, but missing one is silent — see the failure it is written from.
|
||||
|
||||
This is an execution plan. It is written to be handed to an agent who has not had the conversation
|
||||
that produced it, so it states the decisions and the reasons for them, not just the steps.
|
||||
@@ -25,35 +29,44 @@ the server does instead, which is the one decision that reaches outside this bou
|
||||
|
||||
## What exists today, and what it cannot do
|
||||
|
||||
There is already an i18n system. It is small, hand-rolled, has no npm dependency, and it works. It is
|
||||
also about **5% deployed**, and that gap is the whole job.
|
||||
**Updated 2026-08-23, after phases 0, 1 and 2.** This section described the pre-phase-0 world for long
|
||||
enough that the next reader would have started from a false picture — bare `en.json`, 46 keys, three
|
||||
components. All of that is now history and is kept below only as the "before" column, because the shape of
|
||||
the gap is the argument for the plan and deleting it would leave the phases looking arbitrary.
|
||||
|
||||
| | |
|
||||
| ----------------------------------------- | -------------------------------------------------------------------------- |
|
||||
| `src/workspaces/i18n/` | the package: `I18nProvider`, `useTranslation`, `resolveKey`, `interpolate` |
|
||||
| `src/apps/officer-web/lib/i18n.ts` | a typed wrapper binding keys to `en.json` |
|
||||
| `src/apps/officer-web/lib/I18nBridge.tsx` | reads `settings.languages.default`, feeds the provider |
|
||||
| `src/apps/officer-web/locales/` | `en.json` and `pt.json` — **46 keys each, in sync** |
|
||||
| components actually using it | **3** — `UserMenu`, `Languages`, `ChangePassword` |
|
||||
| | before phase 0 | now |
|
||||
| -------------------------- | ---------------------- | --------------------------------------------- |
|
||||
| catalogs | `en.json`, `pt.json` | `en-GB.json`, `pt-PT.json` per workspace |
|
||||
| keys | 46 | **581** — 538 `app.*`, 43 `ui.*` |
|
||||
| workspaces with a catalog | 1 (`officer-web`) | 3 (`officer-web`, `components`, `officerdev`) |
|
||||
| components using it | 3 | all of `officer-web` and `components` |
|
||||
| plural rules | none | `Intl.PluralRules`, per locale |
|
||||
| dates and numbers | browser locale | `useFormat()`, the account's locale |
|
||||
| a missing key | rendered its dot-path | falls back to English, warns in dev |
|
||||
| locales offered vs shipped | ~20 offered, 2 existed | only shipped locales are offered |
|
||||
| parity enforcement | none | **a gap fails the build** |
|
||||
|
||||
What it already does well, and which this plan keeps: dot-path lookup, `{{param}}` interpolation,
|
||||
fallback to `en`, and **type-safe keys** via `TranslationKeys<typeof en>` — a wrong key is a
|
||||
typecheck failure, which is worth more than it sounds when one agent is editing 400 files.
|
||||
Still standing from the original description, and still true: the package is hand-rolled, has no npm
|
||||
dependency, and gives type-safe keys — a wrong key is a typecheck failure, which is worth more than it
|
||||
sounds when one agent is editing hundreds of files.
|
||||
|
||||
**What it cannot do yet**, each of which is a task below:
|
||||
**What remains:** `src/workspaces/officerdev` — the panels — and then translation. `panel.*` is scaffolded,
|
||||
wired into the bridge, and empty.
|
||||
|
||||
1. **No plural rules.** `1 file` / `2 files` has no expression. `Intl.PluralRules` is built into the
|
||||
runtime and unused.
|
||||
2. **No locale-aware dates or numbers.** ~23 `toLocaleDateString/TimeString/String()` call sites use
|
||||
the _browser's_ locale, not the user's chosen one, so a Portuguese UI shows American dates.
|
||||
3. **No fallback chain.** `resolveKey` falls back to `en` and nothing else, so `pt-BR` cannot inherit
|
||||
from `pt`.
|
||||
4. **One catalog, one workspace.** `locales/` lives inside `officer-web`. The 213 panel files in
|
||||
`officerdev` and the 91 in `components` have no catalog of their own.
|
||||
5. **Silent, ugly misses.** A missing key renders its own dot-path (`settings.profile.foo`) to the
|
||||
user. No warning, no test.
|
||||
6. **Twenty languages offered, two that exist.** The picker in `Languages.tsx` lists ~20 codes
|
||||
including Hebrew and Greek. Choosing any of the eighteen silently yields English.
|
||||
Two things learned doing phases 1 and 2 that the plan did not anticipate:
|
||||
|
||||
- **`TranslationKeys` walked into a plural object**, so `t('key', { count })` — the entire point of D7 —
|
||||
did not compile while `t('key.one')` did. The documented feature was uncompilable and the workaround was
|
||||
not, which no test would ever have noticed because phase 1 contained no plurals. Fixed with type-level
|
||||
assertions.
|
||||
- **The typed wrappers rebuilt `t` on every render**, which is the trap `CLAUDE.md` already records against
|
||||
`useClient()` and the Jellyfin player. It matters the moment `t` lands in a `useMemo` dependency list,
|
||||
which phase 2 needed immediately. Memoised.
|
||||
|
||||
**A shape this format cannot express:** a sentence with an inline link. Splitting around the anchor gives a
|
||||
key whose Portuguese value is `"."`. The cheap fix is rephrasing so the link falls at a clause boundary;
|
||||
there is no node-level interpolation helper and adding one is a design decision, not a patch. Worth
|
||||
raising if a phase turns out to be full of them rather than absorbing it forty times.
|
||||
|
||||
### The size of the remaining work
|
||||
|
||||
@@ -262,6 +275,32 @@ Getting this wrong is worse than missing a string, because it corrupts data or b
|
||||
|
||||
- **Agent and chat output.** Whatever Claude or opencode wrote. It is content.
|
||||
- **User content** — file names, paths, terminal output, code, commit messages, note bodies.
|
||||
- **Not everything a panel renders is content, and "panel plus file names" is the wrong test.** The
|
||||
guidance during phase 3 was to expect roughly half of FileBrowser's hits to be content and stay English.
|
||||
`useFileBrowserApp.ts`, the largest file in the phase at 47 hits, turned out **100% convertible**.
|
||||
|
||||
The reason is worth keeping. A panel that LISTS things renders content — a file name in a row is the
|
||||
user's, and translating it would be absurd. A panel REPORTING about those things owns the sentence:
|
||||
`Renamed to "{{name}}"` is ours, and the file name sits inside it as a parameter, which is exactly where
|
||||
content belongs. So the test is not "does this panel touch file names" but "is the string a frame around
|
||||
content, or the content itself".
|
||||
|
||||
It also matters for plurals. Six hand-rolled ones in that file became real entries because Portuguese
|
||||
reorders them — `1 item eliminado` against `Deleted 1 item` — which a frame with a count spliced into it
|
||||
cannot express at all.
|
||||
|
||||
- **A label quoted from ANOTHER product's interface.** "Click **Enable**", "set **App name**", "choose
|
||||
**Internal**" in a setup guide. These read like prose and are identifiers: their whole job is to match
|
||||
what the reader will actually see on Google's screen, and Google localises by the reader's _Google_
|
||||
account language, not by ours. Translating them sends somebody hunting for "Ativar" in a console that
|
||||
says "Enable".
|
||||
|
||||
So translate the connective prose around them and leave the quoted label in English. Do not key it with
|
||||
identical values in both catalogs either — that is a key whose two sides can never legitimately differ,
|
||||
which is a maintenance cost bought for nothing.
|
||||
|
||||
Decided 2026-08-23 on `GoogleOAuthConfig.tsx`, where 55 of the file's 67 strings are of this kind.
|
||||
|
||||
- **Identifiers that cross a boundary** — route paths, permission keys (`registry.ts`), error _codes_
|
||||
(the code is the key; its message is what gets translated), app ids, sidecar names, PM2 process
|
||||
names, database values.
|
||||
@@ -360,7 +399,72 @@ else will ever notice.
|
||||
obvious first pass. Any locale beyond Portuguese needs an answer to this before it is offered.
|
||||
3. **Plugin frontends** are out of scope and will need a catalog-merging contract in the plugin
|
||||
manifest. Their strings are not counted above.
|
||||
|
||||
**One constraint that contract has to answer, found while converting the shared components
|
||||
(2026-08-23):** those components now call `useTranslation`, so they resolve against whatever
|
||||
`I18nProvider` is above them — and with none above them they render their own dot-paths. Today that
|
||||
is safe by accident: there are exactly two React roots, and the one that is not `officer-web`
|
||||
(`apps/marketplace`) imports nothing from `components/`. A plugin frontend mounting its own root, or
|
||||
rendering a shared component outside `I18nBridge`, would put `ui.button.cancel` in front of a person.
|
||||
|
||||
So the contract needs to say where a plugin's provider comes from — inherit the host's, or mount its
|
||||
own seeded with the host's catalogs — rather than leaving each plugin to remember. Note that a
|
||||
provider-absent fallback inside the `components` package was considered and rejected: it would have
|
||||
split resolution across two mechanisms and contradicted D6, which puts the merge at the bridge.
|
||||
|
||||
4. **The `translateTo` setting already in `settings.languages`** is about translating _content_, not
|
||||
the UI. It is a different feature that happens to sit in the same object — do not conflate them.
|
||||
5. **Does a member see the owner's locale anywhere?** Any server-rendered or cached string shared
|
||||
between accounts needs a locale decision. D1 mostly removes this by removing server prose.
|
||||
|
||||
---
|
||||
|
||||
## Adding a locale
|
||||
|
||||
Seven files. Six are mechanical; the seventh is the one that gets missed.
|
||||
|
||||
**Three catalogues, one per workspace.** Copy `en-GB.json` beside itself and translate the values,
|
||||
keeping every key:
|
||||
|
||||
```
|
||||
src/apps/officer-web/locales/<code>.json app.* the shell, screens, settings
|
||||
src/workspaces/officerdev/src/locales/<code>.json panel.* the windowed apps
|
||||
src/workspaces/components/locales/<code>.json ui.* shared components
|
||||
```
|
||||
|
||||
**Three registrations, one per catalogue.** Each is an `import` plus a line in a map:
|
||||
|
||||
```
|
||||
src/apps/officer-web/lib/catalogues.ts
|
||||
src/workspaces/officerdev/src/locales/index.ts
|
||||
src/workspaces/components/locales/index.ts
|
||||
```
|
||||
|
||||
**And the picker**, which is the one that gets missed the other way round:
|
||||
|
||||
```
|
||||
src/apps/officer-web/lib/locales.ts SHIPPED_LOCALES
|
||||
```
|
||||
|
||||
### Why this is spelled out rather than left to reading the code
|
||||
|
||||
es-ES, de-DE and fr-FR once shipped translated, in perfect key parity, listed in the picker — and
|
||||
completely dead. All three registration files still imported only en-GB and pt-PT, so the merge
|
||||
produced three empty catalogues and the UI rendered raw keys in three of five languages.
|
||||
|
||||
Nothing caught it. The parity tests compare the JSON files against each other and every file was
|
||||
correct; a locale that is never imported is invisible to them by construction. The picker was right.
|
||||
Four edits in four files with no single place that knew all four had happened.
|
||||
|
||||
### What checks you now
|
||||
|
||||
Run `bun test` and it is settled. Two things stand where nothing stood:
|
||||
|
||||
- `src/apps/officer-web/lib/catalogues.test.ts` asserts every locale in `SHIPPED_LOCALES` resolves to
|
||||
a populated catalogue in all three namespaces, and matches en-GB's size. A locale in the picker but
|
||||
not imported fails here. So does one imported but empty.
|
||||
- The three `parity.test.ts` files read their own directory rather than listing locales by hand, so a
|
||||
new `<code>.json` is checked the moment it exists — for missing keys AND extra ones, because
|
||||
`findMissingKeys` alone reports half of a rename.
|
||||
|
||||
Then `bunx tsgo` and `bunx prettier --write` on what you touched, as everywhere else.
|
||||
|
||||
@@ -0,0 +1,109 @@
|
||||
# A plugin's capabilities are LOADED, never copied
|
||||
|
||||
**Status: built.** Skills, affordances and notification catalogues landed in `2026.08.23.06`; tasks — the
|
||||
read-write one, and the last piece — landed on 2026-08-24. The four publishers are gone.
|
||||
|
||||
## The problem, as it is on disk right now
|
||||
|
||||
`capabilities/` is a git repository. The intent is that anyone can fork it, keep their own tasks, skills
|
||||
and affordances in it, and pull core's on top. That only works if the directory contains exactly two
|
||||
things: what core ships, and what the owner wrote.
|
||||
|
||||
It does not. Four publishers copy a plugin's files into it at install time — assets, affordances,
|
||||
notification catalogues and skills — so a fork accumulates files it did not author. On this machine today
|
||||
`skills/email-db/` and `extensions/` sit untracked in that repository, published there by plugins. Commit
|
||||
them and the fork carries another plugin's work; leave them and `git status` is permanently noisy. There
|
||||
is no third answer, because nothing on disk says which files came from where.
|
||||
|
||||
Copying is also wrong in a second way that has nothing to do with git. **A copy goes stale.**
|
||||
`plugins:update` pulls new plugin code and the copied capabilities keep describing the old version until
|
||||
something republishes them. And a copy survives `plugins:disable`, so a disabled plugin's skill stays in
|
||||
the agent's index — the plugin is off and the agent still believes it is there.
|
||||
|
||||
## The design
|
||||
|
||||
**A plugin keeps its capabilities in its own directory, and the platform reads them where they are.**
|
||||
|
||||
```
|
||||
capabilities/ the owner's fork: core's, plus their own. Nothing else, ever.
|
||||
tasks/ skills/ affordances/ notifications/
|
||||
|
||||
plugins/<name>/ the plugin's own repository, cloned on install
|
||||
tasks/ skills/ affordances/ notifications/
|
||||
```
|
||||
|
||||
Nothing is copied. Nothing needs a namespace to keep the two apart, because they are already apart —
|
||||
which is the whole reason this beats scoping the paths. A namespace makes provenance _readable_; separate
|
||||
directories make it _structural_.
|
||||
|
||||
Four consequences, and each of them is a bug that stops existing:
|
||||
|
||||
- **A fork stays clean.** `capabilities/` contains only what its owner is responsible for, so pulling from
|
||||
upstream merges without touching anything a plugin put there.
|
||||
- **Capabilities update with the plugin.** `plugins:update` is a `git pull` in the plugin's directory, and
|
||||
the capabilities are in that directory. There is nothing left to go stale.
|
||||
- **Disable actually disables.** The load list is built from plugins that are installed AND enabled, so a
|
||||
disabled plugin contributes nothing. Today its copies remain.
|
||||
- **Uninstall needs no cleanup step.** The directory goes and its capabilities go with it. No list of
|
||||
filenames to be careful with, and no way to delete the owner's own work by getting that list wrong.
|
||||
|
||||
## What has to change
|
||||
|
||||
**The loaders take a list of roots.** `loadSkills(root)` and `loadAffordances(root)` already take one with
|
||||
a default, so this is a small change rather than a rewrite. Notifications the same.
|
||||
|
||||
**The list is resolved per session, not at module load.** `affordanceBlock()` and `skillsBlock()` are
|
||||
called once per session in `sidecar/claude/claude-manager.ts` — deliberately, so a capability written an
|
||||
hour ago is offered on the next session. That is also why they can afford to ask the database which
|
||||
plugins are installed: once per session, not once per turn.
|
||||
|
||||
**Tasks are the awkward one, because that store is read-write.** `api/tasks/task-files.ts` creates, edits
|
||||
and deletes as well as reads. Reading must span every source; writing must only ever touch the owner's
|
||||
directory. A plugin's task is read-only by nature and the UI has to know, or it will offer an Edit that
|
||||
silently writes into a directory the next `plugins:update` overwrites.
|
||||
|
||||
A task's directory name is also stored data — `taskDirName` in `pipeline_jobs` — so lookup by name has to
|
||||
search every source rather than assuming one root.
|
||||
|
||||
**How it went in, since it turned out to be one function rather than several.** Every path that runs a
|
||||
task — the file browser's context menu, both runner sockets, the job queue, the pipeline executor —
|
||||
resolves it through `getTaskByDirName` and then reads `implementation` off the record. So the sources go
|
||||
in there and in `listTasks`, and a plugin's task becomes runnable everywhere at once with its identity
|
||||
unchanged: still a directory name, still what `pipeline_jobs` stores.
|
||||
|
||||
The record carries `plugin` — the app name, or null for the owner's own. That one field does the rest:
|
||||
`updateTask` and `deleteTask` throw on it, `DELETE /api/tasks/:name` answers 409 naming the plugin, and
|
||||
the capability screen replaces the edit and delete controls with a line saying whose it is. Without the
|
||||
delete guard the old code was quietly a no-op — `rm -rf` on a path in the owner's store that does not
|
||||
exist, then `{ ok: true }`, and the task still in the menu.
|
||||
|
||||
`getTaskByDirName` also refuses a name containing a separator. It always joined a caller-supplied string
|
||||
onto a path; searching several roots is the moment that stops being one directory nobody could escape.
|
||||
|
||||
**The four publishers are deleted**, along with their install and uninstall wiring:
|
||||
`affordances/publish.ts`, `notifications/publish.ts`, `skills/publish.ts`, `api/tasks/publish.ts`. The
|
||||
last was written on 2026-08-23 and is superseded before it ever shipped.
|
||||
|
||||
`app-store/assets` is a different case and stays. Those are images served over HTTP from a
|
||||
platform-managed path, not capabilities read from disk, and the copy is what makes them reachable.
|
||||
|
||||
## The migration
|
||||
|
||||
One-off, and it is deletion rather than movement. The copies already in `capabilities/` have nothing to
|
||||
remove them once the publishers are gone — `skills/email-db/` and `extensions/` on this machine, and
|
||||
whatever the equivalent is per host. They are copies of files that still exist in each plugin's own
|
||||
directory, so deleting them loses nothing.
|
||||
|
||||
Check each host rather than assuming this one is representative.
|
||||
|
||||
## What this does not decide
|
||||
|
||||
**Where the owner's own capabilities live inside their fork.** Flat at the top of each type directory is
|
||||
what happens today and needs no change. Scoping them is a separate question and this design does not
|
||||
force it either way.
|
||||
|
||||
**Whether a plugin's capabilities should be namespaced among themselves.** Two plugins can still ship a
|
||||
task with the same directory name. The tie-break shipped as first-come with the owner's store searched
|
||||
first, which settles the case that matters — a plugin cannot take over a name its owner is already
|
||||
using — and leaves two plugins colliding with each other resolved by discovery order, which is arbitrary.
|
||||
Worth revisiting when a second plugin ships a task; not before.
|
||||
@@ -0,0 +1,282 @@
|
||||
# Roles and teams
|
||||
|
||||
**Status: plan, not built.** Phase 0 landed 2026-08-23 (`roles` is a table). Everything below phase 0 is
|
||||
design, written down so the work starts from a spec rather than from a conversation.
|
||||
|
||||
## What this is
|
||||
|
||||
Officer began as one person's server and its authorization model says so: four role names in a TypeScript
|
||||
union, one owner identified by holding one of them, and grants keyed on a role string. That is correct for
|
||||
a homelab and it cannot express a company, where the same person is an administrator of one area and an
|
||||
ordinary member of another.
|
||||
|
||||
Two things are wanted, and they are separable:
|
||||
|
||||
- **Roles as data**, so a role can be added without a deploy, and so each can eventually carry its own
|
||||
provisioning.
|
||||
- **Teams**, so a user belongs to several and holds a different role in each.
|
||||
|
||||
**Teams are optional and must stay optional.** A homelab with family and friends on it may never make one;
|
||||
its owner's answer is "team family, team friends" or no teams at all, and either has to work. A company
|
||||
uses both. Nothing below may make teams mandatory to reach a feature.
|
||||
|
||||
---
|
||||
|
||||
## What already landed — phase 0, 2026-08-23
|
||||
|
||||
The `roles` table exists, seeded with `Super Admin`, `Admin`, `Developer`, `Member`, each flagged
|
||||
`isSystem` because the platform's own code names it. `provisioningScript` is declared and null.
|
||||
|
||||
**Nothing reads it yet.** `USER_ROLES` is still the type, `users.role` is still plain text with no foreign
|
||||
key, and `authorize.ts` is untouched. That was deliberate: the change is additive, so it cannot fail on
|
||||
existing data, which is what made it safe to hand to an unattended rollout across five hosts.
|
||||
|
||||
**No foreign key, and this is the reason.** `db:push` creates a table and adds a constraint in the same
|
||||
run, so a foreign key from `users.role` onto an empty `roles` is violated by every existing account.
|
||||
Verified against a scratch database: push reported the violation, created the table, skipped the
|
||||
constraint, **and exited 0**. See `prompts/deploy-commander.md` → "Schema changes".
|
||||
|
||||
---
|
||||
|
||||
## Decisions
|
||||
|
||||
### D1. The owner is an identity. It is never a role.
|
||||
|
||||
`OWNER_USER_ID` — user 1, the account whose home is the home of the OS user the platform runs as.
|
||||
|
||||
Before phase 0, `isSuperAdmin()` answered `user.role === 'Super Admin'`. That was correct while roles were
|
||||
a hardcoded union and nothing could write a new one. **The moment roles are editable data it becomes a
|
||||
privilege-escalation path**: "add a role" and "become the owner" are the same feature, reachable from
|
||||
whatever UI manages roles.
|
||||
|
||||
So ownership moves to `user.id === OWNER_USER_ID`, and `getOwnerUser()` becomes a primary-key lookup rather
|
||||
than "the lowest id holding Super Admin". **This is the load-bearing change in phase 1** and everything
|
||||
else can wait behind it.
|
||||
|
||||
### D2. Several Super Admins are allowed, and the role provisions sudo
|
||||
|
||||
Today `create-user.ts` and `updateUserRoleHandler` refuse to create a second Super Admin. That limit goes:
|
||||
a company has an owner and several administrators, and a homelab owner may add one or never do.
|
||||
|
||||
**Holding `Super Admin` provisions an OS account with sudo.** Which means, plainly: that person is outside
|
||||
Officer's permission system. `role_permissions`, the `confined` kernel containment and the
|
||||
"`execution` is never grantable" rule bound nobody who can `sudo cat` any home on the box. And the grant is
|
||||
irreversible in practice — revoking the role does not revoke an SSH key, a cron entry or a setuid binary
|
||||
they left behind.
|
||||
|
||||
That is the operator's decision to make, not the platform's to prevent. What the platform owes them is for
|
||||
the UI to say what it is rather than presenting it as one more row in a dropdown.
|
||||
|
||||
### D3. `Admin` is app-wide authority with no operating-system privilege
|
||||
|
||||
The role most companies actually staff: creates accounts, manages grants, sees every dashboard, and cannot
|
||||
read the CEO's files. It already exists and `rolePermitsDevTools()` already excludes it deliberately —
|
||||
"administering the platform is not developing on it". This decision only writes that down.
|
||||
|
||||
### D4. A role may be deleted, but not while anyone holds it
|
||||
|
||||
Refuse the delete; never reassign. Silently moving accounts to a fallback role is a permission change
|
||||
nobody asked for, and "absence denies" is the posture everywhere else in this system.
|
||||
|
||||
`isSystem` roles refuse both delete and rename, because the code names them by name:
|
||||
`rolePermitsDevTools()` tests for `Developer`, `bootstrap.ts` writes `Super Admin`, `users.role` defaults to
|
||||
`Member`. Renaming one is a code change that has not happened yet.
|
||||
|
||||
### D5. Grants stay keyed on the role NAME, with `ON UPDATE CASCADE`
|
||||
|
||||
`role_permissions.role` and `users.role` both hold a name. Re-keying them onto a serial id would touch
|
||||
`authorize.ts` — the file standing between a Member and a shell — to buy what Postgres gives for free: a
|
||||
rename cascades to every user and every grant, atomically, with no code change.
|
||||
|
||||
The cost is that a rename is a data migration rather than a label edit, which is honest — a role name
|
||||
appears in `rolePermitsDevTools`, in report text, and in whatever a plugin has written down.
|
||||
|
||||
### D6. A team is a scope. Permissions UNION across a user's teams.
|
||||
|
||||
Admin in marketing and member in developers means marketing's admin level does not reach developers'
|
||||
files — but a user's effective permission for a given capability is the **highest level any of their teams
|
||||
grants**, plus their global role.
|
||||
|
||||
Union is the only coherent resolution, and it has a consequence worth stating: **adding somebody to a team
|
||||
can only ever grant, never restrict.** A team cannot be used to limit someone. If restriction is ever
|
||||
wanted, that is a different and much harder system (deny rules, precedence, conflict resolution) and it
|
||||
should be refused rather than half-built.
|
||||
|
||||
### D7. The global role remains, and answers a different question
|
||||
|
||||
Two questions, two mechanisms:
|
||||
|
||||
- **"May this account administer the server at all?"** — the global role. Super Admin, Admin.
|
||||
- **"What may this account do in this area?"** — team membership with a role in that team.
|
||||
|
||||
This is the shape GitHub, Slack and Workspace all converged on, and the reason is that the first question
|
||||
has no natural team to ask it about. A homelab uses only the first and never makes a team.
|
||||
|
||||
### D8. Per-role provisioning is a script the role carries
|
||||
|
||||
`provisioningScript` on the role row. Run when an account is granted that role; the reference implementation
|
||||
is `Developer`, which today gets a Postgres role of its own through `rolePermitsDevTools()` — a special case
|
||||
in code that should become a row.
|
||||
|
||||
The historical note matters for whoever builds it: that gate was originally for **rootless** Docker, and
|
||||
rootless specifically. `usermod -aG docker` is root by a longer route —
|
||||
`docker run -v /:/host -it alpine chroot /host` reads `.env`, every member's home and the wallet seed. Any
|
||||
provisioning script that adds a user to a privileged group is granting more than its role name suggests.
|
||||
|
||||
---
|
||||
|
||||
## Phases
|
||||
|
||||
### Phase 0 — roles are a table ✅ DONE 2026-08-23
|
||||
|
||||
Additive only. Nothing reads it.
|
||||
|
||||
### Phase 1 — the owner stops being a role ✅ DONE 2026-08-23
|
||||
|
||||
The load-bearing phase, and small.
|
||||
|
||||
1. `isOwner(user)` = `user.id === OWNER_USER_ID`. `getOwnerUser()` = lookup by that id.
|
||||
2. Split the two meanings of today's `isSuperAdmin()`: ownership, and holding the role. **Every existing
|
||||
call site keeps meaning OWNER**, so no route changes who it admits. Widening any "owner-only" route to
|
||||
"owner or Super Admin" is a separate, reviewable change per route.
|
||||
3. Drop the second-Super-Admin refusals in `create-user.ts` and `updateUserRoleHandler`.
|
||||
4. ~~Remove the `users` CHECK that pins user 1 to `Super Admin`~~ — **KEPT, overruling this plan.** It is
|
||||
redundant for the question it was written for: `isOwner` is an id comparison and never reads that column.
|
||||
But it still forbids user 1 being set to `Member` while remaining the owner, which is a state with no
|
||||
benefit and a confusing display. A constraint that costs nothing and forbids a nonsense state is worth
|
||||
keeping after its original reason has gone.
|
||||
|
||||
**One asymmetry introduced deliberately.** An existing account can now be promoted to `Super Admin`;
|
||||
creating one directly as `Super Admin` is still refused by `create-user.ts`. Promotion happens to an account
|
||||
somebody has looked at, from a screen showing who they are. Creation is a form filled in once, and the role
|
||||
that provisions sudo should not be a dropdown default reached by accident. Create, then promote.
|
||||
|
||||
Reviewable on its own, and nothing downstream can start until ownership is an identity.
|
||||
|
||||
### Phase 2 — the foreign key, and role CRUD
|
||||
|
||||
1. **Two releases, not one.** The rows are on every host after phase 0; the constraint ships separately,
|
||||
and its release plan carries the SQL explicitly per `prompts/deploy-commander.md`.
|
||||
2. `users.role` and `role_permissions.role` become foreign keys with `ON UPDATE CASCADE` (D5).
|
||||
3. Role CRUD: list with holder counts, create, rename, delete guarded by D4.
|
||||
4. `USER_ROLES` stops being the source of truth. `UserRole` becomes `string`, and the picker reads the
|
||||
table. **This is where the typed-union safety is lost** — worth a runtime validator at the write path to
|
||||
replace what the compiler was doing.
|
||||
|
||||
### Phase 3 — per-role provisioning
|
||||
|
||||
`provisioningScript` gets a runner, and `rolePermitsDevTools()` becomes a row rather than a branch. Needs
|
||||
D8's warning in front of whoever writes the first script.
|
||||
|
||||
### Phase 4 — teams
|
||||
|
||||
1. `teams`, and `team_members(team_id, user_id, role)` — the role scoped to the team.
|
||||
2. `team_permissions(team_id, role, permission, level)`, or a discriminator on `role_permissions`. Decide by
|
||||
asking whether a team's roles are the same set as the global ones; probably yes, and probably that means
|
||||
one table with a nullable `team_id`.
|
||||
3. `authorize.ts` resolves the union (D6): global role grants, plus the highest level any team grants.
|
||||
**This is the one change in the whole plan that alters the resolver**, so it wants tests before it wants
|
||||
code — `permissions/authorize.test.ts` is already pure and mockless, which is what makes that possible.
|
||||
4. Teams UI, and the account screen showing which teams a user is in and as what.
|
||||
|
||||
### Phase 5 — account creation — **DONE, and it was done before this phase was written**
|
||||
|
||||
`POST /api/users` is owner-gated and live, with a form under Settings → User Management: same password
|
||||
validator as bootstrap, a role checked against the `roles` table, `Super Admin` refused outright, an
|
||||
optional inbound SSH key, and Linux provisioning with `POST /users/:id/provision-linux` to retry it.
|
||||
Alongside it: role change, password reset, delete.
|
||||
|
||||
It shipped in `69a31051`. This section spent days telling readers it did not exist and sequencing work
|
||||
around building it — and on 2026-08-23 it produced a concrete cost, when a recommendation to "do phase 5
|
||||
first" was made from this text and withdrawn only because someone opened `api/users/` to write the spec.
|
||||
|
||||
The general lesson, since it is the second time this exact shape has bitten: `bun run docs:check` compares
|
||||
numbers, so counts stay honest while prose rots quietly. **A phase marked as not built is worth verifying
|
||||
against the tree before it is planned around**, not because the plan was careless but because a plan is
|
||||
written once and the code moves every day.
|
||||
|
||||
---
|
||||
|
||||
## What must not be built
|
||||
|
||||
- **Deny rules.** See D6. Teams grant; they never restrict.
|
||||
- **A role that confers ownership.** See D1. There is exactly one owner and no role reaches it.
|
||||
- **Team-scoped `execution` capabilities.** Tasks, items, desktop and browser run as the owner's OS user in
|
||||
the owner's home. A team cannot make that safe, and "team developers gets terminal" has to stay a no —
|
||||
the answer is a `confined` grant with a Linux user, which is per-account by nature.
|
||||
|
||||
## Verification
|
||||
|
||||
- `bunx tsgo` clean. Note that on this machine `earlyoom` SIGTERMs the `bunx` wrapper around 15s; run the
|
||||
binary directly.
|
||||
- `permissions/authorize.test.ts` is the primary guard, and it uses real registry keys deliberately so a
|
||||
rename goes red rather than passing vacuously. Phase 4 must extend it before changing the resolver.
|
||||
- `bun run docs:check` — the permission count claim in `CLAUDE.md` moves whenever the registry does.
|
||||
- Any schema phase: verify by query per host, never by `db:push`'s exit code.
|
||||
|
||||
## Teams — decided 2026-08-23
|
||||
|
||||
The four open questions were answered by the owner. Recorded here so phase 4 is implementation rather
|
||||
than another round of design.
|
||||
|
||||
**A team owns a shared folder.** Not only an authorization grouping — storage is the part that was
|
||||
actually wanted. Team *dashboards* are a probable later addition and were explicitly deferred, because
|
||||
they need a permission shape nothing here has: people who can edit a dashboard's STRUCTURE versus people
|
||||
who only see what it renders. Every grant today is read-or-write over a whole capability, so that is a new
|
||||
model rather than a new level. Build the folder; leave room for the dashboards.
|
||||
|
||||
**Any Admin may create a team**, not the owner alone. Teams are self-service for people already trusted to
|
||||
administer the platform. This is what makes the quota section below necessary rather than optional: an
|
||||
Admin creating a team is an Admin allocating disk.
|
||||
|
||||
**A team may grant a capability the member's own role lacks** — the union, per D6 — with one rule on top:
|
||||
**whoever creates the team can only attach capabilities they hold themselves.** Escalation is capped at the
|
||||
creator's own reach rather than the whole registry. `execution` and `admin` stay ungrantable regardless,
|
||||
and `confined` still resolves to nothing for an account with no Linux user.
|
||||
|
||||
**Deleting a role is refused while anyone holds it, in a team or globally.** The same rule D4 already
|
||||
applies to global holders, extended rather than special-cased; the refusal should name the teams.
|
||||
|
||||
### Two things phase 4 must not get wrong
|
||||
|
||||
**The shared folder is enforced by the kernel, not by the grant.** Every role already holds `files` at
|
||||
`write` — they are the seeded `confined` defaults — so the capability is not what keeps one team out of
|
||||
another's folder. A Linux group per team is. The grant says whether someone can use the files surface at
|
||||
all; group membership says which folders they reach. Both are required and they are not substitutes.
|
||||
|
||||
**The grant cache is keyed on ROLE today**, deliberately: "at most one entry per role, and a new account
|
||||
needs no warm-up" (`permissions/authorize.ts`). Teams end that — effective permissions become role plus
|
||||
memberships, which is per-user. That property is easy to lose without noticing and awkward to recover, so
|
||||
it should be a decision in the implementation rather than a side effect.
|
||||
|
||||
## Quotas — the model, and the prerequisite nobody can skip
|
||||
|
||||
The owner declares platform-level defaults and maxima: per user, and per team. Admins allocate inside
|
||||
them. A change re-applies at the Linux level through `POST /users/:id/provision-linux`, which already
|
||||
exists as a retry path and becomes "re-apply current policy to this account".
|
||||
|
||||
**Enforcement is the kernel's job, not the platform's.** Members hold `terminal` at `write` and have their
|
||||
own Linux accounts, so a quota the platform tracks by counting bytes through the file browser is
|
||||
decorative — a member opens a terminal or SSHes in and writes past it. Only filesystem quotas bind.
|
||||
|
||||
**Which means a filesystem that can carry them.** Checked on 2026-08-23: neither `officer-dev` nor `alpha`
|
||||
can. Both are ext4 with homes on the root filesystem, no `usrquota`/`grpquota`/`prjquota` mount options,
|
||||
and neither has the ext4 `quota` or `project` feature. Enabling `project` needs `tune2fs -O project` on an
|
||||
UNMOUNTED filesystem, and `/` cannot be unmounted on a running server — so it is a rescue boot, not a
|
||||
config change.
|
||||
|
||||
The cheap moment is when a host is built, by giving the Linux homes their own filesystem with quota
|
||||
features from the start. Retrofitting a live host is expensive and gets more so with every account on it.
|
||||
|
||||
**Where this actually matters is `edge-pertento`** — the first real multi-user deployment, and the only
|
||||
one that will have accounts that are not the owner's. `officer-dev` is a development machine and will not
|
||||
be multi-user; alpha is the owner's own. Check edge-pertento's disk before it gains more accounts.
|
||||
|
||||
**On a host that cannot enforce, the platform says so** — "policy recorded, not enforceable here" — rather
|
||||
than storing numbers that do nothing. A feature that silently does nothing is worse than one that admits
|
||||
it cannot.
|
||||
|
||||
## Open questions
|
||||
|
||||
None outstanding for phase 4. The four that were here are answered above.
|
||||
holds globally; the same question exists per team and is not answered here.
|
||||
+6
-8
@@ -30,6 +30,7 @@ Seven, all running.
|
||||
| `fofos` | 100.64.0.17 | `pastilhas` | `~/officerdev/platform` | `officer.fofosfluffybastards.com` |
|
||||
| `macbookpro` | 100.64.0.9 | `pastilhas` | `~/projects/officer-suite/platform` | `macbookpro.pastilhas.dev` |
|
||||
| `production-pertento-bridge` | 100.64.0.12 | `pastilhas` | `~/officerdev/platform` | `officer.pertento.ai` |
|
||||
| `edge-pertento-bridge` | 100.64.0.15 | `pastilhas` | `~/officerdev/platform` | `edge.pertento.ai` |
|
||||
| `deadpool-rezio-bridge` | 100.64.0.21 | **`br`** | `/home/br/officerdev/platform` | `officer.rezio.dev` `[pending]` |
|
||||
|
||||
Only `platform.officer.dev` is public (77.42.39.155). The rest resolve to tailnet addresses and are
|
||||
@@ -40,15 +41,12 @@ reachable from inside only.
|
||||
A host here is NOT a deploy target. A rollout names it as skipped and moves on — it is not a failure,
|
||||
and it must not be reported as one.
|
||||
|
||||
| Host | Since | Why |
|
||||
| ---------------------- | ---------- | ---------------------------------------------------------------- |
|
||||
| `edge-pertento-bridge` | 2026-08-23 | Down, and staying down for some days. Owner's call, not a fault. |
|
||||
None today. `edge-pertento-bridge` was here from 2026-08-23 and came back up on 2026-08-24; it is a
|
||||
deploy target again and its row is in the table above.
|
||||
|
||||
Its row, kept so restoring it is one move:
|
||||
|
||||
```
|
||||
| `edge-pertento-bridge` | 100.64.0.15 | `pastilhas` | `~/officerdev/platform` | `edge.pertento.ai` |
|
||||
```
|
||||
It was down long enough to matter, so expect it to be behind: when it returned it was 215 commits back at
|
||||
`2026.08.22.02`, with no `roles` table and no commanders. A host coming off this list needs its schema
|
||||
brought forward before it is treated as ordinary.
|
||||
|
||||
On 2026-08-23 the deploy agent spent four attempts and up to 60s per try on this host before reporting
|
||||
it unreachable — TCP on 22 accepted, then no SSH banner. That work was correct and entirely wasted, which
|
||||
|
||||
+1
-1
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "officer",
|
||||
"version": "2026.08.23.03",
|
||||
"version": "2026.08.25.01",
|
||||
"private": true,
|
||||
"type": "module",
|
||||
"workspaces": [
|
||||
|
||||
@@ -9,6 +9,27 @@ one.
|
||||
|
||||
---
|
||||
|
||||
## Arming for the first time — there is nothing to rehearse against
|
||||
|
||||
General commander doctrine says to run the action once before arming, so it is known to work unattended.
|
||||
**That does not apply here, and reading it as "replay the last release" is wrong.**
|
||||
|
||||
Every `deploy/*` tag on the remote already has a success record in `data/deploys/`. The claim script will
|
||||
refuse every one of them, and refusing is correct — a claim exists so a release is attempted once, ever.
|
||||
So there is no legitimate trigger to rehearse with, and the only way to manufacture one is to tag a
|
||||
release, which you must never do.
|
||||
|
||||
So: **arm, and say plainly that the action has never executed under you.** The next real release is the
|
||||
first run. That is an honest statement of what is unproven, and it is better than a rehearsal that either
|
||||
fights the claim or invents an occasion.
|
||||
|
||||
Two things follow from it, and they are the reason this is fine rather than a gap:
|
||||
|
||||
- The procedure below is already proven — nine releases, nine reports, and the last four ran unattended.
|
||||
What is unproven is this loop, not the rollout.
|
||||
- Your first real release therefore deserves more narration than later ones, not less. Say what you are
|
||||
about to do before the agent starts, so the owner can stop it while stopping it is still cheap.
|
||||
|
||||
## What wakes you
|
||||
|
||||
You are not a loop. Something fires you, and each time you fire you do exactly one thing: check whether
|
||||
|
||||
@@ -0,0 +1,105 @@
|
||||
/*
|
||||
Give a credential to every commander that predates them.
|
||||
|
||||
A commander created before `credential.ts` existed has no `officer.env` and no key row, so it cannot
|
||||
reach the platform at all — which is the state that made the first one curl the whisper container
|
||||
directly. Deleting and recreating it would fix that and throw away the conversation, which is the one
|
||||
thing a commander is: a long-running agreement about a job.
|
||||
|
||||
So this is additive and re-runnable:
|
||||
|
||||
- a commander that already has `officer.env` is left alone, whole;
|
||||
- `CLAUDE.md` is APPENDED to, never rewritten — it is a living document its commander has been
|
||||
extending, and the whole point of not recreating it is that it survives;
|
||||
- the key is named `commander:<dirName>`, so it revokes with the commander like any other.
|
||||
|
||||
Run it after a deploy that introduces credentials, on each host:
|
||||
|
||||
bun run --env-file=.env scripts/backfill-commander-credentials.ts
|
||||
*/
|
||||
import { readFileSync, existsSync, appendFileSync, chmodSync } from 'node:fs';
|
||||
import { join } from 'node:path';
|
||||
import { getUsers, listCommandHqSessions } from 'officerdb';
|
||||
import { writeCommanderCredential, commanderEnvPath } from '../src/servers/api/command-hq/credential';
|
||||
import { credentialSection, notifySection } from '../src/servers/api/command-hq/directory';
|
||||
import { getCommanderDir } from '../src/servers/data-path';
|
||||
import { lookupOsUser } from '../src/servers/os-user';
|
||||
|
||||
/** Best effort, and only for a member: the owner already owns everything under DATA_PATH. */
|
||||
async function giveToAccount(osUser: string | null, path: string): Promise<void> {
|
||||
if (!osUser) return;
|
||||
const ids = await lookupOsUser(osUser);
|
||||
if (!ids) return;
|
||||
Bun.spawnSync(['sudo', '-n', 'chown', `${ids.uid}:${ids.gid}`, path]);
|
||||
}
|
||||
|
||||
// Per user, because `listCommandHqSessions` is scoped by one — which is the right shape everywhere else
|
||||
// and only awkward here. There are few accounts and few commanders; this runs once per deploy.
|
||||
const rows: Array<{
|
||||
dirName: string | null;
|
||||
name: string | null;
|
||||
userId: number;
|
||||
email: string;
|
||||
osUser: string | null;
|
||||
}> = [];
|
||||
for (const user of await getUsers()) {
|
||||
for (const row of await listCommandHqSessions(user.id)) {
|
||||
rows.push({ dirName: row.dirName, name: row.name, userId: user.id, email: user.email, osUser: user.osUser });
|
||||
}
|
||||
}
|
||||
|
||||
if (rows.length === 0) console.log('no commanders on this host');
|
||||
|
||||
for (const row of rows) {
|
||||
const label = `${row.dirName} (${row.name})`;
|
||||
|
||||
if (!row.dirName) {
|
||||
console.log(`skip ${label} — no directory name`);
|
||||
continue;
|
||||
}
|
||||
|
||||
const dir = getCommanderDir(row.email, row.dirName);
|
||||
if (!existsSync(dir)) {
|
||||
console.log(`skip ${label} — no directory on disk`);
|
||||
continue;
|
||||
}
|
||||
|
||||
const claudeMd = join(dir, 'CLAUDE.md');
|
||||
|
||||
/**
|
||||
* Append a section only when it is not already described.
|
||||
*
|
||||
* The marker is a string the section itself contains, so a commander whose CLAUDE.md was hand-edited to
|
||||
* describe the same thing does not end up with it twice.
|
||||
*/
|
||||
const appendIfMissing = async (marker: string, lines: string[]): Promise<boolean> => {
|
||||
const existing = existsSync(claudeMd) ? readFileSync(claudeMd, 'utf8') : '';
|
||||
if (existing.includes(marker)) return false;
|
||||
appendFileSync(claudeMd, `\n${lines.join('\n')}`);
|
||||
await giveToAccount(row.osUser, claudeMd);
|
||||
return true;
|
||||
};
|
||||
|
||||
const envPath = commanderEnvPath(row.email, row.dirName);
|
||||
|
||||
if (!existsSync(envPath)) {
|
||||
const { path } = await writeCommanderCredential({ userId: row.userId, email: row.email, dirName: row.dirName });
|
||||
chmodSync(path, 0o600);
|
||||
await giveToAccount(row.osUser, path);
|
||||
await appendIfMissing('officer.env', credentialSection(path));
|
||||
console.log(`MINT ${label} — ${path}`);
|
||||
} else {
|
||||
console.log(`ok ${label} — already has a credential`);
|
||||
}
|
||||
|
||||
/*
|
||||
Separately, because it arrived later and the commanders that need it most already have a credential.
|
||||
Without it a commander does not know Officer HAS a notification route, so it reaches for whatever its
|
||||
harness offers — a different channel, with its own rules about when it may interrupt.
|
||||
*/
|
||||
if (await appendIfMissing('/api/notify/_officer/notify', notifySection())) {
|
||||
console.log(`NOTIFY ${label} — told how to reach the owner`);
|
||||
}
|
||||
}
|
||||
|
||||
process.exit(0);
|
||||
@@ -38,6 +38,16 @@ const KIND_MEANING: Record<string, string> = {
|
||||
export async function renderPlatformSkill(): Promise<string> {
|
||||
const { PERMISSIONS } = await import('../src/servers/permissions/registry');
|
||||
const { SHORTCUT_SECTIONS } = await import('../src/apps/officer-web/state/shortcuts');
|
||||
const enCatalog = (await import('../src/apps/officer-web/locales/en-GB.json')).default as Record<string, unknown>;
|
||||
/** Resolve a dot-path against the English catalog. This doc is for agents and stays in one language. */
|
||||
const enString = (key: string): string => {
|
||||
const value = key.split('.').reduce<unknown>((node, part) => {
|
||||
if (node && typeof node === 'object') return (node as Record<string, unknown>)[part];
|
||||
return undefined;
|
||||
}, enCatalog);
|
||||
if (typeof value !== 'string') throw new Error(`gen-platform-skill: no English string for "${key}"`);
|
||||
return value;
|
||||
};
|
||||
|
||||
const byKind = new Map<string, typeof PERMISSIONS>();
|
||||
for (const p of PERMISSIONS) {
|
||||
@@ -112,14 +122,16 @@ export async function renderPlatformSkill(): Promise<string> {
|
||||
out('Derived from `src/apps/officer-web/state/shortcuts.ts`. These have moved several times; quote this');
|
||||
out('list rather than remembering one.');
|
||||
out();
|
||||
// The registry holds catalog keys since the shell was localized; this doc is agent-facing and stays
|
||||
// English, so it resolves against en-GB rather than the reader's locale.
|
||||
for (const section of SHORTCUT_SECTIONS) {
|
||||
out(`## ${section.title}`);
|
||||
if (section.note) {
|
||||
out(`## ${enString(section.titleKey)}`);
|
||||
if (section.noteKey) {
|
||||
out();
|
||||
out(section.note);
|
||||
out(enString(section.noteKey));
|
||||
}
|
||||
out();
|
||||
for (const s of section.shortcuts) out(`- \`${s.keys}\` — ${s.description}`);
|
||||
for (const s of section.shortcuts) out(`- \`${s.keys}\` — ${enString(s.descriptionKey)}`);
|
||||
out();
|
||||
}
|
||||
|
||||
|
||||
+145
-13
@@ -26,31 +26,75 @@ const AREAS = [
|
||||
/**
|
||||
* Areas that have been converted and must stay converted. Add an area here the moment it reaches
|
||||
* zero — enabling every area on day one would just be red for weeks and get ignored.
|
||||
*
|
||||
* 'shared components' landed 2026-08-23 (localization phase 1). It holds three `new Error()` messages
|
||||
* that must NEVER be translated; they are reported but excluded from the check, which is why the
|
||||
* neverTranslate split below has to exist for this entry to be possible at all.
|
||||
*
|
||||
* 'officer-web (shell)' landed 2026-08-23 (phase 2). It holds no never-translate hits of its own; what it
|
||||
* does hold is ~30 `<Untranslated reason="foreign-ui-label">` labels quoted from Google's console, which
|
||||
* `stripUntranslated` skips for the same reason.
|
||||
*
|
||||
* 'officerdev (panels)' landed 2026-08-23 (phase 3). It holds nine `new Error()` messages for whoever is
|
||||
* reading a terminal, not a user — same never-translate shape as 'shared components'. Two more strings
|
||||
* are marked `i18n-exempt` rather than never-translate: `useTaskRunner.ts`'s "Running:"/"Error:" framing
|
||||
* is interleaved with raw stdout/stderr inside one monospace `<pre>` feed, so translating the frame alone
|
||||
* would read as broken mid-buffer — the same reasoning as the never-translate list, reached by a
|
||||
* different mechanism because it's not a thrown Error.
|
||||
*/
|
||||
const ZEROED: string[] = [];
|
||||
const ZEROED: string[] = ['shared components', 'officer-web (shell)', 'officerdev (panels)'];
|
||||
|
||||
const SKIP = /node_modules|\.gen\.|[/\\]locales[/\\]|[/\\]vendor[/\\]|\.test\.|\.d\.ts$/;
|
||||
|
||||
// A quoted literal, single or double. Kept as two groups because JS has no branch reset.
|
||||
const Q = String.raw`(?:"([^"\n]{2,120})"|'([^'\n]{2,120})')`;
|
||||
|
||||
const PATTERNS: { kind: string; rx: RegExp }[] = [
|
||||
/**
|
||||
* `neverTranslate` marks a category the doc's "What must never be translated" list forbids converting —
|
||||
* so it is reported (an agent should see it and confirm), but excluded from `--check`.
|
||||
*
|
||||
* Without that split the guard is unusable: an area holding one legitimate `new Error()` can never
|
||||
* reach zero, so it could never be added to ZEROED, so the debt guard could never be switched on for
|
||||
* it. Counting work that must NOT be done against a target of zero makes the target unreachable.
|
||||
*/
|
||||
const PATTERNS: { kind: string; rx: RegExp; neverTranslate?: true }[] = [
|
||||
// >Some visible words<
|
||||
{ kind: 'jsx text', rx: />\s*([A-Z][A-Za-z0-9][^<>{}\n]{2,100}?)\s*</g },
|
||||
//
|
||||
// The lookbehind rejects `=>`, so an arrow return type does not read as JSX text: `(id: string) =>
|
||||
// Promise<unknown>` was reported as the string "Promise".
|
||||
{ kind: 'jsx text', rx: /(?<!=)>\s*([A-Z][A-Za-z0-9][^<>{}\n]{2,100}?)\s*</g },
|
||||
// placeholder="..." and friends
|
||||
{
|
||||
kind: 'attributes',
|
||||
rx: new RegExp(String.raw`\b(?:placeholder|title|aria-label|alt|label|description|tooltip|emptyMessage)\s*=\s*` + Q, 'g'),
|
||||
rx: new RegExp(
|
||||
String.raw`\b(?:placeholder|title|aria-label|alt|label|description|tooltip|emptyMessage)\s*=\s*` + Q,
|
||||
'g',
|
||||
),
|
||||
},
|
||||
{ kind: 'toast/alert', rx: new RegExp(String.raw`\b(?:toast(?:\.\w+)?|alert|confirm)\s*\(\s*` + Q, 'g') },
|
||||
// label: 'Status' — nav items, menus, table columns. The largest hidden category.
|
||||
{
|
||||
kind: 'object labels',
|
||||
rx: new RegExp(String.raw`\b(?:label|name|title|heading|placeholder|description|tooltip|emptyText)\s*:\s*` + Q, 'g'),
|
||||
rx: new RegExp(
|
||||
String.raw`\b(?:label|name|title|heading|placeholder|description|tooltip|emptyText)\s*:\s*` + Q,
|
||||
'g',
|
||||
),
|
||||
},
|
||||
// Thrown Errors are for whoever is reading a terminal at 4am. They stay in one language.
|
||||
//
|
||||
// Matches a template literal as well as a quoted one: `new Error(\`Whisper returned ${res.status}\`)`
|
||||
// was falling through to `template str` and so counted as convertible, which is the opposite of true.
|
||||
{
|
||||
kind: 'thrown errors',
|
||||
rx: new RegExp(String.raw`new Error\(\s*(?:` + Q + String.raw`|\`([^\`]{2,120})\`)`, 'g'),
|
||||
neverTranslate: true,
|
||||
},
|
||||
{ kind: 'thrown errors', rx: new RegExp(String.raw`new Error\(\s*` + Q, 'g') },
|
||||
// `Failed to create ${kind}` — needs interpolation, so it costs more to convert.
|
||||
{ kind: 'template str', rx: /`([A-Z][^`\n]{4,100}\$\{[^`]*)`/g },
|
||||
//
|
||||
// The lookbehind hands a thrown Error to the category above instead of counting it here as well: a
|
||||
// string matched by two patterns is counted twice, and it stayed convertible, so the area could never
|
||||
// reach zero however it was treated.
|
||||
{ kind: 'template str', rx: /(?<!new Error\()`([A-Z][^`\n]{4,100}\$\{[^`]*)`/g },
|
||||
];
|
||||
|
||||
/** Filters out ids, class names, paths, mime types and SCREAMING_CONSTANTS. */
|
||||
@@ -61,10 +105,79 @@ function isHuman(value: string | undefined): value is string {
|
||||
if (!/[A-Za-z]{3}/.test(s)) return false;
|
||||
if (/^[a-z0-9\-_./:]+$/.test(s)) return false;
|
||||
if (/^(https?:|\/|#|data:|application\/|image\/)/.test(s)) return false;
|
||||
if (/^[A-Z0-9_]+$/.test(s)) return false;
|
||||
// Allows . and - so credential-format examples like `GOCSPX-...` fall under the same rule.
|
||||
if (/^[A-Z0-9_.-]+$/.test(s)) return false;
|
||||
// A namespaced storage or channel key: an ALL-CAPS prefix, then a separator, then an interpolation —
|
||||
// `FULLSCREEN_PANEL:${workspace.key}`. The SCREAMING_CONSTANT rule above misses it because the
|
||||
// interpolated half is lowercase.
|
||||
if (/^[A-Z0-9_]{3,}[.:/-]/.test(s)) return false;
|
||||
// `Bearer ${token}` is an Authorization header value, not a sentence. Caught by the template-string
|
||||
// pattern because it starts with a capital and interpolates; excluded here because an auth scheme
|
||||
// followed by a credential is never something a person reads.
|
||||
if (/^(Bearer|Basic|Token|Digest)\s/.test(s)) return false;
|
||||
// A single token carrying digits AND punctuation is a name, not a sentence — the OCR section's
|
||||
// placeholder is the example model file `Qwen2.5-VL-7B-Instruct-q4_k_m.gguf`. Prose has spaces; the
|
||||
// whitespace test is what keeps this from eating real one-word labels, which never look like this.
|
||||
if (!/\s/.test(s) && /\d/.test(s) && /[-_.]/.test(s)) return false;
|
||||
// Tailwind, reached via a `description:`/`label:` key in a classNames object — e.g. sonner's
|
||||
// `description: 'group-[.toast]:text-muted-foreground'`.
|
||||
//
|
||||
// The test is per TOKEN, not on the whole string: every space-separated token must look like a
|
||||
// utility (all lowercase, no sentence punctuation) and at least one must carry a variant colon or
|
||||
// an arbitrary-value bracket. Testing the whole string instead cost a real label — "Application
|
||||
// type:" was filtered because it ends in a colon, which is also how prose introduces a value.
|
||||
const tokens = s.split(/\s+/);
|
||||
const utilityish = (tok: string) => /^[a-z0-9:_\-[\]().#&/%!]+$/.test(tok);
|
||||
if (tokens.every(utilityish) && tokens.some((tok) => /[:[]/.test(tok))) return false;
|
||||
return true;
|
||||
}
|
||||
|
||||
/**
|
||||
* Commented-out code is not user-facing text. `Header.tsx` carries a disabled dev-console button inside
|
||||
* a `{/* … *\/}` block, and counting it means the area can never reach zero without editing a comment.
|
||||
*
|
||||
* Deliberately only two shapes, both unambiguous: a block comment, and a line whose first non-space
|
||||
* characters are `//`. Stripping every `//` would eat the tail of any string holding a URL.
|
||||
*/
|
||||
const stripComments = (source: string): string =>
|
||||
source.replace(/\/\*[\s\S]*?\*\//g, '').replace(/^[ \t]*\/\/.*$/gm, '');
|
||||
|
||||
/**
|
||||
* `<code>`, `<kbd>`, `<pre>` and `<samp>` mark content as code rather than prose — that is what the
|
||||
* elements are for. `<code>Authorization: Bearer …</code>` is an HTTP header, which the doc's
|
||||
* never-translate list covers as an identifier crossing a boundary, and translating it would break the
|
||||
* thing it documents.
|
||||
*/
|
||||
const stripCodeElements = (source: string): string =>
|
||||
source.replace(/<(code|kbd|pre|samp)\b[^>]*>[\s\S]*?<\/\1>/g, '<$1/>');
|
||||
|
||||
/**
|
||||
* An explicit, per-line opt-out: `// i18n-exempt: <reason>` exempts the NEXT line.
|
||||
*
|
||||
* For the cases no syntactic rule can reach — chiefly a prompt written for a model rather than a
|
||||
* reader. `<Untranslated>` covers JSX; this covers the rest, and the two together mean the scanner does
|
||||
* not need another heuristic every time a new shape of never-translate string turns up.
|
||||
*
|
||||
* A reason is mandatory: the regex will not match a bare `// i18n-exempt`. That is the whole safeguard —
|
||||
* somebody has to write down why, and `grep -rn "i18n-exempt"` lists every one for review.
|
||||
*/
|
||||
const stripExemptLines = (source: string): string => {
|
||||
const lines = source.split('\n');
|
||||
return lines.map((line, i) => (/\/\/\s*i18n-exempt:\s*\S/.test(lines[i - 1] ?? '') ? '' : line)).join('\n');
|
||||
};
|
||||
|
||||
/**
|
||||
* `<Untranslated reason="…">` marks text that must stay in one language — today, a label quoted from
|
||||
* another product's UI, which docs/localization.md classifies as an identifier.
|
||||
*
|
||||
* Skipped for the same reason `neverTranslate` categories are excluded from `--check`: counting work the
|
||||
* doc FORBIDS doing against a target of zero makes the target unreachable. The marker is explicit and
|
||||
* carries a reason, so this cannot become a quiet catch-all — unlike a heuristic, somebody has to write
|
||||
* it and say why.
|
||||
*/
|
||||
const stripUntranslated = (source: string): string =>
|
||||
source.replace(/<Untranslated\b[^>]*>[\s\S]*?<\/Untranslated>/g, '<Untranslated/>');
|
||||
|
||||
function* walk(dir: string): Generator<string> {
|
||||
let entries: string[];
|
||||
try {
|
||||
@@ -96,7 +209,8 @@ function scan(root: string): { files: number; hits: Hit[] } {
|
||||
files++;
|
||||
let source: string;
|
||||
try {
|
||||
source = readFileSync(file, 'utf8');
|
||||
// Exempt lines go FIRST: stripComments would remove the marker they depend on.
|
||||
source = stripUntranslated(stripCodeElements(stripComments(stripExemptLines(readFileSync(file, 'utf8')))));
|
||||
} catch {
|
||||
continue;
|
||||
}
|
||||
@@ -118,7 +232,9 @@ const results = AREAS.map((area) => ({ ...area, ...scan(area.root) }));
|
||||
const kinds = PATTERNS.map((p) => p.kind);
|
||||
const pad = (s: string | number, n: number) => String(s).padStart(n);
|
||||
|
||||
console.log(`${'area'.padEnd(22)} ${pad('files', 5)} ${kinds.map((k) => pad(k.slice(0, 13), 14)).join('')} ${pad('total', 7)}`);
|
||||
console.log(
|
||||
`${'area'.padEnd(22)} ${pad('files', 5)} ${kinds.map((k) => pad(k.slice(0, 13), 14)).join('')} ${pad('total', 7)}`,
|
||||
);
|
||||
for (const r of results) {
|
||||
const byKind = kinds.map((k) => pad(r.hits.filter((h) => h.kind === k).length, 14)).join('');
|
||||
console.log(`${r.label.padEnd(22)} ${pad(r.files, 5)} ${byKind} ${pad(r.hits.length, 7)}`);
|
||||
@@ -128,9 +244,19 @@ const all = results.flatMap((r) => r.hits);
|
||||
const distinct = new Set(all.map((h) => h.value));
|
||||
const interpolated = new Set(all.filter((h) => h.kind === 'template str').map((h) => h.value));
|
||||
|
||||
console.log(`${'TOTAL'.padEnd(22)} ${pad(results.reduce((n, r) => n + r.files, 0), 5)} ${kinds.map((k) => pad(all.filter((h) => h.kind === k).length, 14)).join('')} ${pad(all.length, 7)}`);
|
||||
const NEVER_KINDS = new Set(PATTERNS.filter((p) => p.neverTranslate).map((p) => p.kind));
|
||||
const convertible = (hits: Hit[]) => hits.filter((h) => !NEVER_KINDS.has(h.kind));
|
||||
|
||||
console.log(
|
||||
`${'TOTAL'.padEnd(22)} ${pad(
|
||||
results.reduce((n, r) => n + r.files, 0),
|
||||
5,
|
||||
)} ${kinds.map((k) => pad(all.filter((h) => h.kind === k).length, 14)).join('')} ${pad(all.length, 7)}`,
|
||||
);
|
||||
console.log();
|
||||
console.log(`occurrences ${all.length}`);
|
||||
console.log(` convertible ${convertible(all).length}`);
|
||||
console.log(` never-translate ${all.length - convertible(all).length} (${[...NEVER_KINDS].join(', ')})`);
|
||||
console.log(`distinct strings ${distinct.size}`);
|
||||
console.log(` needing params ${interpolated.size}`);
|
||||
|
||||
@@ -149,10 +275,16 @@ if (listPrefix) {
|
||||
}
|
||||
|
||||
if (args.has('--check')) {
|
||||
const regressed = results.filter((r) => ZEROED.includes(r.label) && r.hits.length > 0);
|
||||
const regressed = results
|
||||
.filter((r) => ZEROED.includes(r.label))
|
||||
.map((r) => ({ label: r.label, hits: convertible(r.hits) }))
|
||||
.filter((r) => r.hits.length > 0);
|
||||
if (regressed.length > 0) {
|
||||
console.error('\nThese areas were converted and have regressed:');
|
||||
for (const r of regressed) console.error(` ${r.label}: ${r.hits.length} hardcoded strings`);
|
||||
for (const r of regressed) {
|
||||
console.error(` ${r.label}: ${r.hits.length} hardcoded strings`);
|
||||
for (const h of r.hits) console.error(` [${h.kind}] ${h.value} — ${h.file}`);
|
||||
}
|
||||
console.error('\nUse a catalog key. See docs/localization.md.');
|
||||
process.exit(1);
|
||||
}
|
||||
|
||||
+46
-9
@@ -6,13 +6,25 @@
|
||||
* bun run notify:test --user 2 # someone else
|
||||
* bun run notify:test --code officer/core:job --id 412
|
||||
*
|
||||
* Talks to the sidecar over loopback, which is how every other producer reaches it — so this exercises
|
||||
* the real path rather than a special one. It reports what the channels actually did, because the thing
|
||||
* that wastes a day here is that a send with nothing configured returns success and delivers nothing.
|
||||
* Goes through the PLATFORM, with a key it mints and revokes for the one send — the same door an app or
|
||||
* a commander uses, so this exercises the real path rather than a special one. It reports what the
|
||||
* channels actually did, because the thing that wastes a day here is that a send with nothing configured
|
||||
* returns success and delivers nothing.
|
||||
*
|
||||
* It used to POST to the sidecar directly on loopback. That stopped working on 2026-08-25, when the
|
||||
* sidecar began requiring proof that the platform is the caller — anything on the machine could otherwise
|
||||
* notify any user, which on a box running agents is anything with a shell. The secret lives only in the
|
||||
* server's memory, so a CLI cannot present it and should not be able to.
|
||||
*
|
||||
* Minting a key is legitimate HERE and nowhere else: this runs as the owner, on the owner's machine, with
|
||||
* the database open in front of it. Anything that cannot already do that has no business sending either.
|
||||
*/
|
||||
import { readFileSync } from 'node:fs';
|
||||
import { join } from 'node:path';
|
||||
import { DATA_PATH } from '../src/servers/data-path';
|
||||
import { mintApiKey } from '../src/servers/auth-token';
|
||||
import { createApiKey, revokeApiKeysByName } from 'officerdb';
|
||||
import { PORT, OFFICER_API_URL } from '../src/servers/officer-url.mjs';
|
||||
|
||||
const arg = (name: string): string | undefined => {
|
||||
const i = process.argv.indexOf(`--${name}`);
|
||||
@@ -69,12 +81,37 @@ const body = {
|
||||
|
||||
console.log(`[notify:test] sending ${JSON.stringify(body)}`);
|
||||
|
||||
const res = await fetch(`${base}/_officer/notify`, {
|
||||
method: 'POST',
|
||||
headers: { 'content-type': 'application/json', 'X-Officer-User': String(userId) },
|
||||
body: JSON.stringify(body),
|
||||
signal: AbortSignal.timeout(20_000),
|
||||
});
|
||||
// A key for this one send, revoked immediately afterwards whatever happens. Named so a leftover from a
|
||||
// killed run is obvious in the key list rather than looking like something a person made.
|
||||
const KEY_NAME = 'notify:test (temporary)';
|
||||
await revokeApiKeysByName(userId, KEY_NAME).catch(() => {});
|
||||
const { secret, keyHash, prefix } = mintApiKey();
|
||||
await createApiKey({ userId, name: KEY_NAME, keyHash, prefix });
|
||||
|
||||
const publicHost = (() => {
|
||||
try {
|
||||
return process.env.PUBLIC_URL ? new URL(process.env.PUBLIC_URL.replace(/^"|"$/g, '')).host : undefined;
|
||||
} catch {
|
||||
return undefined;
|
||||
}
|
||||
})();
|
||||
|
||||
let res: Response;
|
||||
try {
|
||||
res = await fetch(`${OFFICER_API_URL}/api/notify/_officer/notify`, {
|
||||
method: 'POST',
|
||||
headers: {
|
||||
'content-type': 'application/json',
|
||||
Authorization: `Bearer ${secret}`,
|
||||
// Origin validation matches Host against PUBLIC_URL, so a bare loopback request is refused.
|
||||
Host: publicHost ?? `127.0.0.1:${PORT}`,
|
||||
},
|
||||
body: JSON.stringify(body),
|
||||
signal: AbortSignal.timeout(20_000),
|
||||
});
|
||||
} finally {
|
||||
await revokeApiKeysByName(userId, KEY_NAME).catch(() => {});
|
||||
}
|
||||
|
||||
const out = (await res.json()) as { ok?: boolean; error?: string; results?: Array<Record<string, unknown>> };
|
||||
|
||||
|
||||
+31
-17
@@ -7,31 +7,45 @@
|
||||
*
|
||||
* ── Why these four are `isSystem` ──
|
||||
*
|
||||
* Each is named by name somewhere in the code: `rolePermitsDevTools()` tests for `'Developer'`,
|
||||
* `bootstrap.ts` writes `'Super Admin'`, `users.role` defaults to `'Member'`, and `'Admin'` is the one
|
||||
* `rolePermitsDevTools` deliberately excludes. Renaming or deleting one of those is not a data change, it
|
||||
* is a code change that has not happened — so the flag exists for the delete and rename paths to refuse on,
|
||||
* rather than for the failure to turn up later as a missing database role or an account that cannot log in.
|
||||
* Each is named by name somewhere in the code: this file matches `'Developer'`, `'Admin'` and `'Member'`
|
||||
* by name on every run, and `bootstrap.ts` writes `'Super Admin'`. Renaming or deleting one of those is not
|
||||
* a data change, it is a code change that has not happened — so the flag exists for the delete and rename
|
||||
* paths to refuse on, rather than for the failure to turn up later as a missing database role or an
|
||||
* account that cannot log in.
|
||||
*
|
||||
* ── `description` versus `grantsPostgres`/`grantsDocker` ──
|
||||
*
|
||||
* `seedRole` treats these two kinds of column differently, and it matters here specifically because this
|
||||
* is the one caller that seeds `isSystem: true` rows. `description` is written once, on insert, and never
|
||||
* touched again — an edit made on one server must not be reverted by the next deploy. `grantsPostgres` and
|
||||
* `grantsDocker` ARE re-asserted every run for a system role, because they are not the operator's data,
|
||||
* they are what "Developer" MEANS — the same standing as the name itself. `rolePermitsDevTools()` used to
|
||||
* be that declaration, hardcoded as `role === 'Developer'`; this table is where it lives now, and this
|
||||
* SEED array is the only place either flag is set for these four roles. See `seedRole`'s own comment in
|
||||
* `officer_db/src/roles/queries.ts` for the mechanics.
|
||||
*
|
||||
* ── What this deliberately does NOT do ──
|
||||
*
|
||||
* No foreign key from `users.role`. That change cannot go through `db:push`: push creates the table empty
|
||||
* and adds the constraint in the same run, so every existing account violates it — verified against a
|
||||
* scratch database on 2026-08-23, where push reported the violation, created the table, skipped the
|
||||
* constraint, and exited 0. The FK is a separate release, once every host holds these rows.
|
||||
*
|
||||
* So today `users.role` is still a plain text column and nothing enforces that its value is a real role.
|
||||
* That is the intended state of this phase: additive, unable to fail, and safe to run on five hosts
|
||||
* unattended.
|
||||
*
|
||||
* Never overwrites. A description edited on one server must not be reverted by the next deploy.
|
||||
* Never overwrite `description`, as above. And never touch a CUSTOM role's grants — those are set through
|
||||
* `PATCH /api/roles/:name/grants` (`setRoleGrants`), which itself refuses to touch a system role for the
|
||||
* mirror-image reason: writing there would look like it worked and then silently revert on the next run of
|
||||
* this script.
|
||||
*/
|
||||
import { seedRole, waitForDatabase } from '../src/databases/officer_db/src/index';
|
||||
|
||||
const SEED: { name: string; description: string }[] = [
|
||||
type SeedRoleEntry = { name: string; description: string; grantsPostgres?: boolean; grantsDocker?: boolean };
|
||||
|
||||
// Match today's behaviour exactly: only Developer passed `rolePermitsDevTools` before this table existed,
|
||||
// so Developer is the only role seeded with either flag true.
|
||||
const SEED: SeedRoleEntry[] = [
|
||||
{ name: 'Super Admin', description: 'Full authority over the platform, and an OS account with sudo' },
|
||||
{ name: 'Admin', description: 'Administers the platform. No operating-system privilege' },
|
||||
{ name: 'Developer', description: 'A member who is also trusted with developer tooling on the machine' },
|
||||
{
|
||||
name: 'Developer',
|
||||
description: 'A member who is also trusted with developer tooling on the machine',
|
||||
grantsPostgres: true,
|
||||
grantsDocker: true,
|
||||
},
|
||||
{ name: 'Member', description: 'The default. Reaches only what their role has been granted' },
|
||||
];
|
||||
|
||||
|
||||
@@ -81,6 +81,12 @@ LAST_SKIPPED=()
|
||||
# distribution's default alongside it. It stays in core because anything that
|
||||
# compiles a native module needs it, but it is the one to move out first if that
|
||||
# ever bites.
|
||||
#
|
||||
# inotify-tools is `inotifywait`, and it is what lets a COMMANDER react the
|
||||
# moment a file lands instead of polling for it. Without it a watcher can only
|
||||
# ask "is there anything new?" on a timer, which is both slower and more work —
|
||||
# and the commander has no way to know the tool is missing until it tries. macOS
|
||||
# has no equivalent in the package sets here; a commander there polls.
|
||||
pkgs_core() {
|
||||
case "$PM" in
|
||||
apt)
|
||||
@@ -103,17 +109,17 @@ pkgs_core() {
|
||||
echo curl ca-certificates gnupg git jq unzip \
|
||||
apt-transport-https lsb-release software-properties-common \
|
||||
wget zip brotli build-essential python3 btop htop tree tmux ripgrep fd-find net-tools eza \
|
||||
poppler-utils radicale fail2ban unattended-upgrades
|
||||
inotify-tools poppler-utils radicale fail2ban unattended-upgrades
|
||||
;;
|
||||
pacman)
|
||||
echo curl ca-certificates gnupg git jq unzip \
|
||||
wget zip brotli base-devel python btop htop tree tmux ripgrep fd net-tools eza \
|
||||
poppler radicale fail2ban
|
||||
inotify-tools poppler radicale fail2ban
|
||||
;;
|
||||
dnf)
|
||||
echo curl ca-certificates gnupg2 git jq unzip \
|
||||
wget zip brotli python3 btop htop tree tmux ripgrep fd-find net-tools eza \
|
||||
poppler-utils radicale fail2ban
|
||||
inotify-tools poppler-utils radicale fail2ban
|
||||
;;
|
||||
brew)
|
||||
# curl, unzip and the TLS roots ship with macOS; the compilers come from
|
||||
|
||||
@@ -466,32 +466,73 @@ disable_sleep() {
|
||||
# systemd-networkd actually manages the network — a server or cloud image, via
|
||||
# cloud-init and netplan — it does that in milliseconds and is load-bearing.
|
||||
#
|
||||
# Where NetworkManager owns the network instead, systemd-networkd runs nothing,
|
||||
# but the wait-online unit is still enabled and waits for a link that will never
|
||||
# be configured. It gives up after its full timeout, on every boot.
|
||||
# Where NetworkManager owns the network instead, systemd-networkd configures
|
||||
# nothing, but the wait-online unit is still enabled and waits for a link that
|
||||
# will never come up. It gives up after its full timeout, on every boot.
|
||||
#
|
||||
# So the fix is masking one unit, and only on the second stack. Do NOT
|
||||
# `systemctl disable --now systemd-networkd` to achieve the same thing: on a
|
||||
# networkd-managed box that brings it up with no network on the next boot, no
|
||||
# ssh, and nothing but the provider's rescue console.
|
||||
#
|
||||
# ── "is networkd running" is the wrong question ──
|
||||
#
|
||||
# It was the test here until 2026-08-24, and it is why this section did nothing
|
||||
# on the machine it was written for. Both stacks can be ACTIVE at once: on the
|
||||
# dev box NetworkManager owned enp1s0 and wlp2s0, systemd-networkd was up and
|
||||
# managing not one of eighty links, and wait-online still burned its full two
|
||||
# minutes on every boot — `Timeout occurred while waiting for network
|
||||
# connectivity`, at 18:31:05 to 18:33:05, in the journal.
|
||||
#
|
||||
# What matters is whether networkd CONFIGURED anything, which `networkctl` will
|
||||
# say. A link it owns reads `configured`; a link it is ignoring reads
|
||||
# `unmanaged`. If every link is unmanaged, the wait cannot ever be satisfied and
|
||||
# masking it is safe.
|
||||
|
||||
WAIT_ONLINE_UNIT=systemd-networkd-wait-online.service
|
||||
|
||||
# Reported to the operator, so it has to describe the machine rather than pick a
|
||||
# winner: both daemons running with networkd idle is the exact case this section
|
||||
# used to get wrong, and printing "NetworkManager" for it hid that.
|
||||
network_manager_name() {
|
||||
if systemctl is-active --quiet NetworkManager.service 2>/dev/null; then
|
||||
local nm=no nd=no
|
||||
systemctl is-active --quiet NetworkManager.service 2>/dev/null && nm=yes
|
||||
systemctl is-active --quiet systemd-networkd.service 2>/dev/null && nd=yes
|
||||
|
||||
if [[ $nm == yes && $nd == yes ]]; then
|
||||
if networkd_configures_a_link; then
|
||||
echo "both — networkd configures at least one link"
|
||||
else
|
||||
echo "NetworkManager (networkd is up but configures nothing)"
|
||||
fi
|
||||
elif [[ $nm == yes ]]; then
|
||||
echo "NetworkManager"
|
||||
elif systemctl is-active --quiet systemd-networkd.service 2>/dev/null; then
|
||||
elif [[ $nd == yes ]]; then
|
||||
echo "systemd-networkd"
|
||||
else
|
||||
echo "neither — unclear"
|
||||
fi
|
||||
}
|
||||
|
||||
# Is the wait actually pointless here? NetworkManager in charge and networkd not.
|
||||
# Anything else, including "cannot tell", is left alone.
|
||||
# Does networkd actually configure a link on this machine?
|
||||
#
|
||||
# `networkctl list --no-legend` puts the SETUP state last on each line. Anything
|
||||
# other than unmanaged/pending/n-a means networkd owns that link and the wait is
|
||||
# real work. Missing networkctl counts as "yes, it does" — an unanswerable
|
||||
# question must not be read as permission to mask.
|
||||
networkd_configures_a_link() {
|
||||
command -v networkctl &>/dev/null || return 0
|
||||
networkctl list --no-legend 2>/dev/null | awk '{ print $NF }' |
|
||||
grep -qvE '^(unmanaged|pending|n/a)$'
|
||||
}
|
||||
|
||||
# Is the wait actually pointless here? NetworkManager in charge, and networkd
|
||||
# either absent or configuring nothing. Anything else, including "cannot tell",
|
||||
# is left alone.
|
||||
wait_online_is_spurious() {
|
||||
systemctl is-active --quiet NetworkManager.service 2>/dev/null &&
|
||||
! systemctl is-active --quiet systemd-networkd.service 2>/dev/null
|
||||
systemctl is-active --quiet NetworkManager.service 2>/dev/null || return 1
|
||||
systemctl is-active --quiet systemd-networkd.service 2>/dev/null || return 0
|
||||
! networkd_configures_a_link
|
||||
}
|
||||
|
||||
# What that unit actually cost on this boot, straight from systemd's own
|
||||
|
||||
@@ -1170,18 +1170,22 @@ elif ! skip; then
|
||||
echo ""
|
||||
info "Boot hang — a unit that can add two minutes to every boot"
|
||||
echo " On a machine where NetworkManager owns the network, systemd-networkd"
|
||||
echo " runs nothing — but systemd-networkd-wait-online is still enabled, and"
|
||||
echo " waits for a link that will never come up. It gives up after its full"
|
||||
echo " timeout, every single boot."
|
||||
echo " configures nothing — but systemd-networkd-wait-online is still"
|
||||
echo " enabled, and waits for a link that will never come up. It gives up"
|
||||
echo " after its full timeout, every single boot."
|
||||
echo ""
|
||||
echo " Note both daemons can be running at once. What decides it is whether"
|
||||
echo " networkd CONFIGURED a link, not whether it is up."
|
||||
echo ""
|
||||
echo " network managed by: $(network_manager_name)"
|
||||
echo " that unit took: ${WAIT_ONLINE_TIME:-it did not run} on this boot"
|
||||
|
||||
if ! wait_online_is_spurious; then
|
||||
echo ""
|
||||
echo " systemd-networkd is live here, so that unit is doing real work."
|
||||
echo " systemd-networkd configures a link here, so that unit is doing"
|
||||
echo " real work."
|
||||
echo " Masking it would be how this machine comes up with no network."
|
||||
SUMMARY+=("Boot hang: nothing to fix — networkd is in charge")
|
||||
SUMMARY+=("Boot hang: nothing to fix — networkd configures a link")
|
||||
else
|
||||
echo ""
|
||||
if is_role dev; then
|
||||
|
||||
+6
-136
@@ -1,140 +1,10 @@
|
||||
/**
|
||||
* Regenerate `TODO.md` — the index over `todo/`.
|
||||
* Regenerate `TODO.md` — the index over `todo/`. `bun run todo:index` after any change to the tree.
|
||||
*
|
||||
* The index is the one file everybody reads, so it is the one most able to lie. It is generated rather
|
||||
* than maintained: `bun run todo:index` after any change to `todo/`, and it cannot drift from the tree
|
||||
* it describes.
|
||||
* The logic lives in `src/servers/api/todos/todo-tree.ts`, shared with the `/api/todos` router so the
|
||||
* board and this CLI cannot disagree about the format; this file is only the command.
|
||||
*/
|
||||
import { readFileSync, readdirSync, writeFileSync, statSync } from 'node:fs';
|
||||
import { join } from 'node:path';
|
||||
import { writeIndex } from '../src/servers/api/todos/todo-tree';
|
||||
|
||||
const ROOT = new URL('..', import.meta.url).pathname;
|
||||
const OUT = join(ROOT, 'todo');
|
||||
|
||||
export type Item = {
|
||||
id: string;
|
||||
title: string;
|
||||
theme: string;
|
||||
status: string;
|
||||
created: string;
|
||||
/** `urgent` or empty — see todo/README.md for why there is no scale. */
|
||||
priority: string;
|
||||
due: string;
|
||||
order: number;
|
||||
file: string;
|
||||
};
|
||||
|
||||
/** Minimal frontmatter reader — `key: value`, values optionally JSON-quoted. No YAML dependency. */
|
||||
export function frontmatter(text: string): Record<string, string> {
|
||||
const end = text.indexOf('\n---', 4);
|
||||
if (!text.startsWith('---') || end === -1) return {};
|
||||
const out: Record<string, string> = {};
|
||||
for (const line of text.slice(4, end).split('\n')) {
|
||||
const m = line.match(/^([a-z_]+):\s*(.*)$/);
|
||||
if (!m || !m[1]) continue;
|
||||
const raw = (m[2] ?? '').trim();
|
||||
out[m[1]] = raw.startsWith('"') ? (JSON.parse(raw) as string) : raw;
|
||||
}
|
||||
return out;
|
||||
}
|
||||
|
||||
export function readTree(): { themes: { theme: string; heading: string; items: Item[] }[] } {
|
||||
const themes = readdirSync(OUT)
|
||||
.filter((d) => statSync(join(OUT, d)).isDirectory())
|
||||
.sort()
|
||||
.map((theme) => {
|
||||
const files = readdirSync(join(OUT, theme)).filter((f) => f.endsWith('.md'));
|
||||
const meta = frontmatter(readFileSync(join(OUT, theme, '_index.md'), 'utf8'));
|
||||
const items = files
|
||||
.filter((f) => f !== '_index.md')
|
||||
.map((f) => {
|
||||
const fm = frontmatter(readFileSync(join(OUT, theme, f), 'utf8'));
|
||||
return {
|
||||
id: fm.id ?? `${theme}/${f.replace(/\.md$/, '')}`,
|
||||
title: fm.title ?? f,
|
||||
theme,
|
||||
status: fm.status ?? 'open',
|
||||
created: fm.created ?? '',
|
||||
priority: fm.priority ?? '',
|
||||
due: fm.due ?? '',
|
||||
order: Number(fm.order ?? 0),
|
||||
file: `todo/${theme}/${f}`,
|
||||
};
|
||||
})
|
||||
.sort((a, b) => a.order - b.order);
|
||||
return { theme, heading: meta.heading ?? theme, items };
|
||||
});
|
||||
return { themes };
|
||||
}
|
||||
|
||||
const HEADER = `# TODO — the index
|
||||
|
||||
Deferred work. **The items live in \`todo/\`, one file each**, grouped by theme; this file is the map
|
||||
over them and is GENERATED — run \`bun run todo:index\` after any change rather than editing it here.
|
||||
Format and the two-way-sync contract: \`todo/README.md\`.
|
||||
|
||||
**Context, corrected 2026-08-07.** This list used to open by saying Officer was "collapsing from
|
||||
multi-tenant / open-source-ready to a **single-user platform**", and told you to treat multi-tenant
|
||||
indirection as accidental complexity. **That direction was reversed.** The permission model shipped on
|
||||
2026-08-07 to serve a real goal — deploy to the company server, onboard people, give each one their own
|
||||
Gitea account through the platform. Per-user scoping is now a requirement, and the items that proposed
|
||||
deleting it have been removed rather than left to mislead the next reader.
|
||||
|
||||
What did NOT reverse: \`execution\` permissions (terminal, chat, tasks, files, desktop, browser) run as
|
||||
the owner's OS user and can never be granted. Indirection there really is accidental complexity.
|
||||
`;
|
||||
|
||||
function render(): string {
|
||||
const { themes } = readTree();
|
||||
const open = themes.reduce((n, t) => n + t.items.filter((i) => i.status !== 'done').length, 0);
|
||||
const done = themes.reduce((n, t) => n + t.items.filter((i) => i.status === 'done').length, 0);
|
||||
|
||||
const rows = themes
|
||||
.filter((t) => t.items.length)
|
||||
.map((t) => {
|
||||
const o = t.items.filter((i) => i.status !== 'done').length;
|
||||
const d = t.items.length - o;
|
||||
return `| [${t.heading}](todo/${t.theme}/) | ${o} | ${d} |`;
|
||||
});
|
||||
|
||||
const recent = themes
|
||||
.flatMap((t) => t.items)
|
||||
.filter((i) => i.status !== 'done')
|
||||
.sort((a, b) => b.created.localeCompare(a.created))
|
||||
.slice(0, 10)
|
||||
.map((i) => `- \`${i.created}\` **${i.title}** — [${i.id}](${i.file})`);
|
||||
|
||||
// A theme holding only prose has no row above, and an entry nobody can see is the failure mode this
|
||||
// whole split risks. List them explicitly rather than letting them age out of view.
|
||||
const notes = themes.filter((t) => !t.items.length).map((t) => `- [${t.heading}](todo/${t.theme}/_index.md)`);
|
||||
|
||||
// Urgent goes above everything. An item the owner called urgent, sorted in among seventy-five others
|
||||
// by theme, is an item nobody sees on the day it matters.
|
||||
const urgent = themes
|
||||
.flatMap((t) => t.items)
|
||||
.filter((i) => i.status !== 'done' && i.priority === 'urgent')
|
||||
.sort((a, b) => (a.due || '9999').localeCompare(b.due || '9999'))
|
||||
.map((i) => `- ${i.due ? `**due ${i.due}** — ` : ''}**${i.title}** — [${i.id}](${i.file})`);
|
||||
|
||||
return [
|
||||
HEADER,
|
||||
...(urgent.length ? [`## Urgent\n`, ...urgent, ``] : []),
|
||||
`## Themes\n`,
|
||||
`**${open} open, ${done} closed**, across ${rows.length} themes.\n`,
|
||||
`| Theme | Open | Closed |`,
|
||||
`| --- | --- | --- |`,
|
||||
...rows,
|
||||
``,
|
||||
`## Records — no items, kept for the reasoning\n`,
|
||||
...notes,
|
||||
``,
|
||||
`## Newest ten\n`,
|
||||
...recent,
|
||||
``,
|
||||
].join('\n');
|
||||
}
|
||||
|
||||
if (import.meta.main) {
|
||||
writeFileSync(join(ROOT, 'TODO.md'), render());
|
||||
console.log('TODO.md regenerated');
|
||||
}
|
||||
writeIndex();
|
||||
console.log('TODO.md regenerated');
|
||||
|
||||
@@ -106,8 +106,8 @@ export function App() {
|
||||
<Route path="/system-monitor/:scope" element={<Dashboard.SystemMonitorScreen />} />
|
||||
{/* TEMPORARY / EXPERIMENTAL — offline file transfer over animated QR codes */}
|
||||
<Route path="/qr-transfer" element={<Dashboard.QrTransferScreen />} />
|
||||
<Route path="/minesweeper" element={<Dashboard.MinesweeperScreen />} />
|
||||
<Route path="/sendoff" element={<Dashboard.SendOffScreen />} />
|
||||
<Route path="/todos" element={<Dashboard.TodosScreen />} />
|
||||
<Route path="/activity" element={<Dashboard.ActivityScreen />} />
|
||||
<Route path="/activity/:id" element={<Dashboard.ActivityScreen />} />
|
||||
|
||||
|
||||
@@ -7,8 +7,10 @@ import { Input } from '@/components/ui/input';
|
||||
import { Label } from '@/components/ui/label';
|
||||
import { Button } from '@/components/ui/button';
|
||||
import { Card } from '@/components/Card';
|
||||
import { useTranslation } from '@/lib/i18n';
|
||||
|
||||
export function ForgotPassword() {
|
||||
const { t } = useTranslation();
|
||||
const client = useClient('/api/auth');
|
||||
const [isSubmitting, setIsSubmitting] = useState(false);
|
||||
const [done, setDone] = useState(false);
|
||||
@@ -34,29 +36,29 @@ export function ForgotPassword() {
|
||||
<Card className="md:py-12 md:px-24 flex flex-col gap-6">
|
||||
{done ? (
|
||||
<div className="text-center">
|
||||
<h2 className="text-2xl font-bold text-duck-dark mb-2">Check your email</h2>
|
||||
<h2 className="text-2xl font-bold text-duck-dark mb-2">{t('auth.checkEmail')}</h2>
|
||||
<div className="text-sm text-duck-dark/60">
|
||||
<p>
|
||||
A password reset link has been sent to <strong>{state.email}</strong>.
|
||||
</p>
|
||||
<p>Click it to reset your password.</p>
|
||||
<p>{t('auth.checkEmailHint')}</p>
|
||||
</div>
|
||||
</div>
|
||||
) : (
|
||||
<>
|
||||
<div className="text-center">
|
||||
<div className="text-duck-dark text-2xl font-bold">Forgot Password</div>
|
||||
<div className="text-duck-dark/60">Enter your email to receive a reset link</div>
|
||||
<div className="text-duck-dark text-2xl font-bold">{t('auth.forgotTitle')}</div>
|
||||
<div className="text-duck-dark/60">{t('auth.forgotSubtitle')}</div>
|
||||
</div>
|
||||
|
||||
<form ref={formRef} onSubmit={handleSubmit} className="grid gap-4">
|
||||
<Label className="grid gap-2">
|
||||
<span className="text-duck-dark/70">Email</span>
|
||||
<span className="text-duck-dark/70">{t('auth.email')}</span>
|
||||
<Input
|
||||
className="h-11 bg-background/60 border-duck-dark/20 text-duck-dark placeholder:text-duck-dark/40"
|
||||
type="email"
|
||||
name="email"
|
||||
placeholder="you@example.com"
|
||||
placeholder={t('auth.emailPlaceholder')}
|
||||
autoComplete="email"
|
||||
/>
|
||||
</Label>
|
||||
@@ -74,7 +76,7 @@ export function ForgotPassword() {
|
||||
<div className="text-center text-sm text-duck-dark/60">
|
||||
<p>
|
||||
<Link to="/" className="text-duck-forest underline hover:text-duck-forest/80">
|
||||
Back to login
|
||||
{t('auth.backToLogin')}
|
||||
</Link>
|
||||
</p>
|
||||
</div>
|
||||
|
||||
@@ -4,8 +4,10 @@ import { Button } from '@/components/ui/button';
|
||||
import { Card } from '@/components/Card';
|
||||
import { cn } from '@/lib/utils';
|
||||
import { useResetPassword } from './useResetPassword';
|
||||
import { useTranslation } from '@/lib/i18n';
|
||||
|
||||
export function ResetPassword() {
|
||||
const { t } = useTranslation();
|
||||
const { formRef, isValid, tokenStatus, isSubmitting, handleSubmit } = useResetPassword();
|
||||
const loading = tokenStatus === 'loading';
|
||||
const invalid = tokenStatus === 'invalid';
|
||||
@@ -15,45 +17,45 @@ export function ResetPassword() {
|
||||
<>
|
||||
{loading && (
|
||||
<Card className="py-12 px-24 flex flex-col gap-6">
|
||||
<div className="text-center text-duck-dark/60">Verifying...</div>
|
||||
<div className="text-center text-duck-dark/60">{t('auth.verifying')}</div>
|
||||
</Card>
|
||||
)}
|
||||
|
||||
{invalid && (
|
||||
<Card className="py-12 px-24 flex flex-col gap-6">
|
||||
<div className="text-center">
|
||||
<div className="text-duck-dark text-2xl font-bold">Invalid Link</div>
|
||||
<div className="text-duck-dark/60">This reset link is invalid or has expired.</div>
|
||||
<div className="text-duck-dark text-2xl font-bold">{t('auth.invalidLink')}</div>
|
||||
<div className="text-duck-dark/60">{t('auth.invalidLinkHint')}</div>
|
||||
</div>
|
||||
</Card>
|
||||
)}
|
||||
|
||||
<Card className={cn('flex flex-col gap-6', hideform && 'hidden')}>
|
||||
<div className="text-center">
|
||||
<div className="text-duck-dark text-2xl font-bold">Reset Password</div>
|
||||
<div className="text-duck-dark/60">Enter your new password</div>
|
||||
<div className="text-duck-dark text-2xl font-bold">{t('auth.resetTitle')}</div>
|
||||
<div className="text-duck-dark/60">{t('auth.resetSubtitle')}</div>
|
||||
</div>
|
||||
|
||||
<form ref={formRef} onSubmit={handleSubmit} className="grid gap-4">
|
||||
<div className="grid md:flex gap-4">
|
||||
<Label className="grid gap-2 flex-1">
|
||||
<span className="text-duck-dark/70">Password</span>
|
||||
<span className="text-duck-dark/70">{t('auth.password')}</span>
|
||||
<Input
|
||||
className="h-11 bg-background/60 border-duck-dark/20 text-duck-dark placeholder:text-duck-dark/40"
|
||||
type="password"
|
||||
name="password"
|
||||
placeholder="Min 12 characters"
|
||||
placeholder={t('auth.minChars')}
|
||||
autoComplete="new-password"
|
||||
/>
|
||||
</Label>
|
||||
|
||||
<Label className="grid gap-2 flex-1">
|
||||
<span className="text-duck-dark/70">Confirm Password</span>
|
||||
<span className="text-duck-dark/70">{t('auth.confirmPassword')}</span>
|
||||
<Input
|
||||
className="h-11 bg-background/60 border-duck-dark/20 text-duck-dark placeholder:text-duck-dark/40"
|
||||
type="password"
|
||||
name="confirmPassword"
|
||||
placeholder="Confirm your password"
|
||||
placeholder={t('auth.confirmPlaceholder')}
|
||||
autoComplete="new-password"
|
||||
/>
|
||||
</Label>
|
||||
@@ -65,7 +67,7 @@ export function ResetPassword() {
|
||||
disabled={!isValid || isSubmitting}
|
||||
className="w-full h-11 bg-duck-yellow hover:bg-duck-yellow/90 text-duck-teal font-bold text-lg transition-all duration-200 hover:scale-105 cursor-pointer disabled:opacity-50 disabled:hover:scale-100"
|
||||
>
|
||||
{isSubmitting ? 'Resetting...' : 'Reset Password'}
|
||||
{isSubmitting ? 'Resetting...' : t('auth.resetTitle')}
|
||||
</Button>
|
||||
</div>
|
||||
</form>
|
||||
|
||||
@@ -4,8 +4,10 @@ import { toast } from 'sonner';
|
||||
import { useMounted } from 'hooks/useMounted';
|
||||
import { useForm } from 'hooks/useForm';
|
||||
import { useClient } from 'hooks/useClient';
|
||||
import { useTranslation } from '@/lib/i18n';
|
||||
|
||||
export const useResetPassword = () => {
|
||||
const { t } = useTranslation();
|
||||
const isMounted = useMounted();
|
||||
const navigate = useNavigate();
|
||||
const client = useClient('/api/auth');
|
||||
@@ -44,7 +46,7 @@ export const useResetPassword = () => {
|
||||
password: state.password,
|
||||
verificationCode,
|
||||
});
|
||||
toast.success('Password reset successfully. Please sign in.');
|
||||
toast.success(t('auth.resetOk'));
|
||||
navigate('/');
|
||||
} catch (ex) {
|
||||
const error = ex as { message?: string };
|
||||
|
||||
@@ -7,8 +7,10 @@ import { Input } from '@/components/ui/input';
|
||||
import { Label } from '@/components/ui/label';
|
||||
import { Card } from '@/components/Card';
|
||||
import { useForm } from 'hooks/useForm';
|
||||
import { useTranslation } from '@/lib/i18n';
|
||||
|
||||
export function Bootstrap() {
|
||||
const { t } = useTranslation();
|
||||
const authClient = useClient('/api/auth');
|
||||
const navigate = useNavigate();
|
||||
const [isSubmitting, setIsSubmitting] = useState(false);
|
||||
@@ -30,7 +32,7 @@ export function Bootstrap() {
|
||||
password: state.password,
|
||||
confirmPassword: state.confirmPassword,
|
||||
});
|
||||
toast.success('Administrator account created. Please sign in.');
|
||||
toast.success(t('auth.bootstrapOk'));
|
||||
navigate('/');
|
||||
} catch (ex) {
|
||||
const error = ex as { message?: string };
|
||||
@@ -43,35 +45,35 @@ export function Bootstrap() {
|
||||
return (
|
||||
<Card className="md:min-w-[480px] flex flex-col gap-6">
|
||||
<div className="text-center">
|
||||
<div className="text-duck-dark text-2xl font-bold">Welcome, Admin</div>
|
||||
<div className="text-duck-dark/60">Create your administrator account</div>
|
||||
<div className="text-duck-dark text-2xl font-bold">{t('auth.bootstrapTitle')}</div>
|
||||
<div className="text-duck-dark/60">{t('auth.bootstrapSubtitle')}</div>
|
||||
</div>
|
||||
|
||||
<form ref={formRef} onSubmit={handleBootstrap} className="grid gap-4">
|
||||
<Label className="grid gap-2">
|
||||
<span className="text-duck-dark/70">Name</span>
|
||||
<span className="text-duck-dark/70">{t('auth.name')}</span>
|
||||
<Input
|
||||
className="h-11 bg-background/60 border-duck-dark/20 text-duck-dark placeholder:text-duck-dark/40"
|
||||
type="text"
|
||||
name="name"
|
||||
placeholder="Your name"
|
||||
placeholder={t('auth.namePlaceholder')}
|
||||
autoComplete="name"
|
||||
/>
|
||||
</Label>
|
||||
|
||||
<Label className="grid gap-2">
|
||||
<span className="text-duck-dark/70">Email</span>
|
||||
<span className="text-duck-dark/70">{t('auth.email')}</span>
|
||||
<Input
|
||||
className="h-11 bg-background/60 border-duck-dark/20 text-duck-dark placeholder:text-duck-dark/40"
|
||||
type="email"
|
||||
name="email"
|
||||
placeholder="admin@example.com"
|
||||
placeholder={t('auth.adminEmailPlaceholder')}
|
||||
autoComplete="email"
|
||||
/>
|
||||
</Label>
|
||||
|
||||
<Label className="grid gap-2">
|
||||
<span className="text-duck-dark/70">Username</span>
|
||||
<span className="text-duck-dark/70">{t('auth.username')}</span>
|
||||
<Input
|
||||
className="h-11 bg-background/60 border-duck-dark/20 text-duck-dark placeholder:text-duck-dark/40"
|
||||
type="text"
|
||||
@@ -83,23 +85,23 @@ export function Bootstrap() {
|
||||
|
||||
<div className="grid md:flex gap-4">
|
||||
<Label className="grid gap-2 flex-1">
|
||||
<span className="text-duck-dark/70">Password</span>
|
||||
<span className="text-duck-dark/70">{t('auth.password')}</span>
|
||||
<Input
|
||||
className="h-11 bg-background/60 border-duck-dark/20 text-duck-dark placeholder:text-duck-dark/40"
|
||||
type="password"
|
||||
name="password"
|
||||
placeholder="Min 12 characters"
|
||||
placeholder={t('auth.minChars')}
|
||||
autoComplete="new-password"
|
||||
/>
|
||||
</Label>
|
||||
|
||||
<Label className="grid gap-2 flex-1">
|
||||
<span className="text-duck-dark/70">Confirm Password</span>
|
||||
<span className="text-duck-dark/70">{t('auth.confirmPassword')}</span>
|
||||
<Input
|
||||
className="h-11 bg-background/60 border-duck-dark/20 text-duck-dark placeholder:text-duck-dark/40"
|
||||
type="password"
|
||||
name="confirmPassword"
|
||||
placeholder="Confirm your password"
|
||||
placeholder={t('auth.confirmPlaceholder')}
|
||||
autoComplete="new-password"
|
||||
/>
|
||||
</Label>
|
||||
|
||||
@@ -8,12 +8,14 @@ import { toast } from 'sonner';
|
||||
import { useForm } from 'hooks/useForm';
|
||||
import { useAuth } from 'hooks/useAuth';
|
||||
import { useGlobal } from 'hooks/useGlobal';
|
||||
import { useTranslation } from '@/lib/i18n';
|
||||
|
||||
const initialState: LoginFormState = {
|
||||
// email: 'pastilhas@pastilhas.dev',
|
||||
// password: '',
|
||||
};
|
||||
export function Login() {
|
||||
const { t } = useTranslation();
|
||||
const [isSubmitting, setIsSubmitting] = useState(false);
|
||||
const { state, formRef, update, isValid } = useForm<LoginFormState>(initialState, validateForm);
|
||||
const { signin } = useAuth();
|
||||
@@ -40,20 +42,20 @@ export function Login() {
|
||||
return (
|
||||
<Card className="md:py-6 md:px-24 md:min-w-[480px] flex flex-col gap-6">
|
||||
<div className="text-center">
|
||||
<div className="text-duck-dark text-2xl font-bold">Welcome Back</div>
|
||||
<div className="text-duck-dark/60">Sign in to your account</div>
|
||||
<div className="text-duck-dark text-2xl font-bold">{t('auth.signInTitle')}</div>
|
||||
<div className="text-duck-dark/60">{t('auth.signInSubtitle')}</div>
|
||||
</div>
|
||||
|
||||
<form ref={formRef} onSubmit={handleSubmit} className="grid gap-4">
|
||||
<Label className="grid gap-2">
|
||||
<span className="text-duck-dark/70">Email or username</span>
|
||||
<span className="text-duck-dark/70">{t('auth.emailOrUsername')}</span>
|
||||
<Input
|
||||
className="h-11 bg-background/60 border-duck-dark/20 text-duck-dark placeholder:text-duck-dark/40"
|
||||
// `text`, not `email`: the browser refuses to submit a username under type="email", so the
|
||||
// field would have validated the user out of an account they have.
|
||||
type="text"
|
||||
name="email"
|
||||
placeholder="you@example.com"
|
||||
placeholder={t('auth.emailPlaceholder')}
|
||||
// `username` rather than `email`, which is what password managers expect for a field that
|
||||
// takes either — and it is the value they already store beside the password.
|
||||
autoComplete="username"
|
||||
@@ -61,12 +63,12 @@ export function Login() {
|
||||
</Label>
|
||||
|
||||
<Label className="grid gap-2">
|
||||
<span className="text-duck-dark/70">Password</span>
|
||||
<span className="text-duck-dark/70">{t('auth.password')}</span>
|
||||
<Input
|
||||
className="h-11 bg-background/60 border-duck-dark/20 text-duck-dark placeholder:text-duck-dark/40"
|
||||
type="password"
|
||||
name="password"
|
||||
placeholder="Your password"
|
||||
placeholder={t('auth.passwordPlaceholder')}
|
||||
autoComplete="current-password"
|
||||
/>
|
||||
</Label>
|
||||
@@ -90,7 +92,7 @@ export function Login() {
|
||||
{/* </p> */}
|
||||
<p>
|
||||
<Link to="/auth/forgot-password" className="text-duck-forest underline hover:text-duck-forest/80">
|
||||
Forgot password?
|
||||
{t('auth.forgotPassword')}
|
||||
</Link>
|
||||
</p>
|
||||
</div>
|
||||
|
||||
@@ -1,3 +1,5 @@
|
||||
import { useTranslation } from '@/lib/i18n';
|
||||
|
||||
type DebugPanelProps = {
|
||||
fullControlMode: boolean;
|
||||
cameraInfo: {
|
||||
@@ -13,9 +15,10 @@ type DebugPanelProps = {
|
||||
};
|
||||
|
||||
export function DebugPanel({ fullControlMode, cameraInfo, modelInfo }: DebugPanelProps) {
|
||||
const { t } = useTranslation();
|
||||
return (
|
||||
<div className="fixed top-4 left-4 bg-black/80 text-white p-4 rounded text-xs font-mono space-y-2 z-[100]">
|
||||
<div className="font-bold text-blue-400">Controls:</div>
|
||||
<div className="font-bold text-blue-400">{t('auth.debug.controls')}</div>
|
||||
<div className={fullControlMode ? 'text-green-300' : 'text-yellow-300'}>
|
||||
Mode: {fullControlMode ? 'FULL CONTROL' : 'ROTATION ONLY'}
|
||||
</div>
|
||||
@@ -29,12 +32,12 @@ export function DebugPanel({ fullControlMode, cameraInfo, modelInfo }: DebugPane
|
||||
<div>* Ctrl+Alt+Enter: Toggle full control</div>
|
||||
<div>* Ctrl+Alt+D: Toggle debug panel</div>
|
||||
|
||||
<div className="font-bold text-green-400 pt-2">Camera:</div>
|
||||
<div className="font-bold text-green-400 pt-2">{t('auth.debug.camera')}</div>
|
||||
<div>Position: [{cameraInfo.cameraPosition.map((v) => v.toFixed(2)).join(', ')}]</div>
|
||||
<div>Target: [{cameraInfo.target.map((v) => v.toFixed(2)).join(', ')}]</div>
|
||||
<div>Zoom: {cameraInfo.zoom.toFixed(2)}</div>
|
||||
|
||||
<div className="font-bold text-yellow-400 pt-2">Model:</div>
|
||||
<div className="font-bold text-yellow-400 pt-2">{t('auth.debug.model')}</div>
|
||||
<div>Position: [{modelInfo.position.map((v) => v.toFixed(2)).join(', ')}]</div>
|
||||
<div>Rotation: [{modelInfo.rotation.map((v) => v.toFixed(2)).join(', ')}]</div>
|
||||
<div>Scale: {modelInfo.scale.toFixed(2)}</div>
|
||||
|
||||
@@ -2,6 +2,7 @@ import { useEffect, useRef, useState } from 'react';
|
||||
import { Link, useParams } from 'react-router';
|
||||
import { useClient } from 'hooks/useClient';
|
||||
import { Radio, FileText, Activity as ActivityIcon } from 'lucide-react';
|
||||
import { useTranslation } from '@/lib/i18n';
|
||||
|
||||
type TaskRow = { id: string; source: 'harness'; cwd: string; sizeBytes: number; updatedAt: number; active: boolean };
|
||||
type DetachedRow = { id: string; source: 'detached'; path: string; announcedAt: number };
|
||||
@@ -15,6 +16,7 @@ const MAX_LINES = 600;
|
||||
// params (`task=` for a harness file, `path=` for a detached job), so the URL carries the id only and
|
||||
// the screen re-derives the param from the registry row — one address shape for both kinds.
|
||||
export const ActivityScreen = () => {
|
||||
const { t } = useTranslation();
|
||||
const { token, get } = useClient();
|
||||
const [reg, setReg] = useState<Registry>({ tasks: [], detached: [] });
|
||||
const [regLoaded, setRegLoaded] = useState(false);
|
||||
@@ -87,30 +89,32 @@ export const ActivityScreen = () => {
|
||||
<div className="flex h-full w-full">
|
||||
<aside className="flex w-72 shrink-0 flex-col overflow-y-auto border-r border-border p-3">
|
||||
<div className="mb-3 flex items-center gap-2 text-sm font-semibold text-foreground">
|
||||
<ActivityIcon size={16} className="text-primary" /> Activity
|
||||
<ActivityIcon size={16} className="text-primary" /> {t('activity.title')}
|
||||
</div>
|
||||
|
||||
<div className="mb-1 px-1 text-xs font-medium uppercase tracking-wide text-muted-foreground">
|
||||
Background tasks
|
||||
{t('activity.backgroundTasks')}
|
||||
</div>
|
||||
{reg.tasks.length === 0 && <p className="px-2 py-1 text-xs text-muted-foreground">none running</p>}
|
||||
{reg.tasks.map((t) => (
|
||||
{reg.tasks.length === 0 && (
|
||||
<p className="px-2 py-1 text-xs text-muted-foreground">{t('activity.noneRunning')}</p>
|
||||
)}
|
||||
{reg.tasks.map((task) => (
|
||||
<Link
|
||||
key={t.id}
|
||||
to={`/activity/${encodeURIComponent(t.id)}`}
|
||||
className={rowCls(selectedId === t.id)}
|
||||
title={t.cwd}
|
||||
key={task.id}
|
||||
to={`/activity/${encodeURIComponent(task.id)}`}
|
||||
className={rowCls(selectedId === task.id)}
|
||||
title={task.cwd}
|
||||
>
|
||||
<span
|
||||
className={`inline-block h-2 w-2 shrink-0 rounded-full ${t.active ? 'bg-success animate-pulse' : 'bg-muted-foreground/40'}`}
|
||||
className={`inline-block h-2 w-2 shrink-0 rounded-full ${task.active ? 'bg-success animate-pulse' : 'bg-muted-foreground/40'}`}
|
||||
/>
|
||||
<span className="truncate font-mono text-xs">{t.id}</span>
|
||||
<span className="truncate font-mono text-xs">{task.id}</span>
|
||||
</Link>
|
||||
))}
|
||||
|
||||
{reg.detached.length > 0 && (
|
||||
<div className="mb-1 mt-4 px-1 text-xs font-medium uppercase tracking-wide text-muted-foreground">
|
||||
Detached
|
||||
{t('activity.detached')}
|
||||
</div>
|
||||
)}
|
||||
{reg.detached.map((d) => (
|
||||
@@ -169,7 +173,7 @@ export const ActivityScreen = () => {
|
||||
no run called <span className="font-mono">{selectedId}</span> is in the registry — it finished, or
|
||||
it never started.{' '}
|
||||
<Link to="/activity" className="underline">
|
||||
Back to the list
|
||||
{t('activity.backToList')}
|
||||
</Link>
|
||||
</>
|
||||
) : (
|
||||
@@ -187,7 +191,7 @@ export const ActivityScreen = () => {
|
||||
</>
|
||||
) : (
|
||||
<div className="flex h-full items-center justify-center text-sm text-muted-foreground">
|
||||
Select a task to follow its live output
|
||||
{t('activity.selectTask')}
|
||||
</div>
|
||||
)}
|
||||
</main>
|
||||
|
||||
@@ -12,6 +12,7 @@ import { Dialog, DialogContent, DialogHeader, DialogTitle, DialogDescription } f
|
||||
import { useClient } from 'hooks/useClient';
|
||||
import { Card } from '@/components/Card';
|
||||
import { useChat, EmbeddableChat } from 'officerdev';
|
||||
import { useTranslation } from '@/lib/i18n';
|
||||
type CapabilitySummary = {
|
||||
dirName: string;
|
||||
name: string;
|
||||
@@ -23,6 +24,8 @@ export type CapabilityDetail = CapabilitySummary & {
|
||||
rawFrontmatter: string;
|
||||
filePath: string;
|
||||
chatSessionId: string | null;
|
||||
/** Only tasks carry this today: the plugin that ships it, or null/absent when it is the owner's own. */
|
||||
plugin?: string | null;
|
||||
};
|
||||
|
||||
type CapabilityListProps = {
|
||||
@@ -277,12 +280,18 @@ export const CapabilityChat = ({
|
||||
description,
|
||||
onResponseEnd,
|
||||
}: CapabilityChatProps) => {
|
||||
const { t } = useTranslation();
|
||||
const seedFile = `${kind.toUpperCase()}.md`;
|
||||
const genericPrefix = `<frontmatter>\ninput file: ${filePath}\n${seedFile}: ${filePath}\ndir: ${resourceDir}\n\nBe aware of any extra files alongside the same dir as the ${kind} file we're handling, for possible extra context. You can also, if pertinent, create scripts or other files that will help you in the future.\n</frontmatter>`;
|
||||
const promptFrontmatter = isNew ? (buildCreationPrefix(kind, filePath, resourceDir) ?? genericPrefix) : genericPrefix;
|
||||
/*
|
||||
The composer's PRE-FILLED text, which the reader sees and edits — so it is translated. The hidden
|
||||
`promptFrontmatter` above is not: that one instructs the agent and carries file paths, and is
|
||||
machine-facing rather than something anybody reads.
|
||||
*/
|
||||
const defaultInput = isNew
|
||||
? (description ?? `Help me create the content for this new ${kind} file`)
|
||||
: `Help me understand and improve this ${kind} file`;
|
||||
? (description ?? t('capability.createPrompt', { kind: kind.toLowerCase() }))
|
||||
: t('capability.improvePrompt', { kind: kind.toLowerCase() });
|
||||
|
||||
const chat = useChat(undefined, undefined, { replaceUrl: false });
|
||||
|
||||
@@ -301,6 +310,7 @@ export const CapabilityChat = ({
|
||||
};
|
||||
|
||||
export const FrontmatterBlock = ({ yaml }: { yaml: string }) => {
|
||||
const { t } = useTranslation();
|
||||
const [open, setOpen] = useState(false);
|
||||
|
||||
return (
|
||||
@@ -310,7 +320,7 @@ export const FrontmatterBlock = ({ yaml }: { yaml: string }) => {
|
||||
className="flex w-full items-center gap-1.5 px-3 py-1.5 text-duck-dark/50 hover:text-duck-dark/70 cursor-pointer transition-colors"
|
||||
>
|
||||
<ChevronRight className={`h-3.5 w-3.5 transition-transform ${open ? 'rotate-90' : ''}`} />
|
||||
<span className="text-xs font-medium">Frontmatter</span>
|
||||
<span className="text-xs font-medium">{t('capability.frontmatter')}</span>
|
||||
</button>
|
||||
{open && (
|
||||
<pre className="px-4 pb-3 text-xs text-duck-dark/60 whitespace-pre-wrap font-mono leading-relaxed">{yaml}</pre>
|
||||
@@ -330,6 +340,7 @@ export const CapabilityList = ({
|
||||
showCreate,
|
||||
onShowCreateChange,
|
||||
}: CapabilityListProps) => {
|
||||
const { t, tUi } = useTranslation();
|
||||
const client = useClient();
|
||||
const qc = useQueryClient();
|
||||
const [internalCreating, setInternalCreating] = useState(false);
|
||||
@@ -356,7 +367,7 @@ export const CapabilityList = ({
|
||||
setNewName('');
|
||||
onCreate(res.dirName);
|
||||
} catch {
|
||||
toast.error(`Failed to create ${kind}`);
|
||||
toast.error(t('capability.createFailed', { kind: kind.toLowerCase() }));
|
||||
}
|
||||
};
|
||||
|
||||
@@ -427,7 +438,7 @@ export const CapabilityList = ({
|
||||
<input
|
||||
value={internalSearch}
|
||||
onChange={(ev) => setInternalSearch(ev.target.value)}
|
||||
placeholder={`Search ${kind.toLowerCase()}s...`}
|
||||
placeholder={t('capability.searchPlaceholder', { kind: `${kind.toLowerCase()}s` })}
|
||||
className="w-full rounded border border-duck-dark/15 bg-background/80 pl-7 pr-2 py-1 text-base md:text-sm text-duck-dark placeholder:text-duck-dark/30 focus:outline-none focus:ring-1 focus:ring-duck-teal/30"
|
||||
/>
|
||||
</div>
|
||||
@@ -452,7 +463,7 @@ export const CapabilityList = ({
|
||||
<p className="text-sm text-duck-dark/40 px-4 py-6 text-center">No {kind.toLowerCase()}s found</p>
|
||||
)}
|
||||
{items.length > 0 && filtered.length === 0 && (
|
||||
<p className="text-sm text-duck-dark/40 px-4 py-6 text-center">No matches</p>
|
||||
<p className="text-sm text-duck-dark/40 px-4 py-6 text-center">{t('capability.noMatches')}</p>
|
||||
)}
|
||||
</div>
|
||||
</>
|
||||
@@ -469,6 +480,7 @@ export const CapabilityList = ({
|
||||
* them for free — no reset effect racing the navigation. `edit` also makes the editor pane linkable.
|
||||
*/
|
||||
export const CapabilityPage = ({ kind, endpoint, queryKey, basePath }: CapabilityPageProps) => {
|
||||
const { t, tUi } = useTranslation();
|
||||
const client = useClient();
|
||||
const qc = useQueryClient();
|
||||
const navigate = useNavigate();
|
||||
@@ -497,7 +509,7 @@ export const CapabilityPage = ({ kind, endpoint, queryKey, basePath }: Capabilit
|
||||
navigate(basePath, { replace: true });
|
||||
await qc.invalidateQueries({ queryKey: [queryKey] });
|
||||
} catch {
|
||||
toast.error(`Failed to delete ${kind}`);
|
||||
toast.error(t('capability.deleteFailed', { kind: kind.toLowerCase() }));
|
||||
}
|
||||
};
|
||||
|
||||
@@ -526,9 +538,19 @@ export const CapabilityPage = ({ kind, endpoint, queryKey, basePath }: Capabilit
|
||||
<ArrowLeft className="h-4 w-4 text-duck-dark/60" />
|
||||
</Link>
|
||||
<span className="text-sm font-medium text-duck-dark/70 flex-1">
|
||||
{detail?.name ?? `Select a ${kind.toLowerCase()}`}
|
||||
{detail?.name ?? t('capability.selectOne', { kind: kind.toLowerCase() })}
|
||||
</span>
|
||||
{detail && (
|
||||
{/*
|
||||
A plugin's capability is read where it lives, in a git checkout that `plugins:update`
|
||||
pulls. So there is nothing to offer here: an edit would be overwritten by the next update,
|
||||
and the delete refuses server-side (409). Say whose it is instead of showing two controls
|
||||
that cannot work.
|
||||
*/}
|
||||
{detail?.plugin ? (
|
||||
<span className="text-xs text-duck-dark/40">
|
||||
{t('capability.fromPlugin', { plugin: detail.plugin })}
|
||||
</span>
|
||||
) : detail ? (
|
||||
<>
|
||||
<button
|
||||
onClick={() => setEditing(!editing)}
|
||||
@@ -543,7 +565,7 @@ export const CapabilityPage = ({ kind, endpoint, queryKey, basePath }: Capabilit
|
||||
<Trash2 className="h-3.5 w-3.5 text-duck-dark/50 hover:text-red-500" />
|
||||
</button>
|
||||
</>
|
||||
)}
|
||||
) : null}
|
||||
</div>
|
||||
<div className="overflow-y-auto flex-1 p-6">
|
||||
{detail?.rawFrontmatter && <FrontmatterBlock yaml={detail.rawFrontmatter} />}
|
||||
@@ -554,10 +576,10 @@ export const CapabilityPage = ({ kind, endpoint, queryKey, basePath }: Capabilit
|
||||
</ReactMarkdown>
|
||||
</article>
|
||||
) : detail ? (
|
||||
<p className="text-sm text-duck-dark/40 text-center mt-12">Empty file</p>
|
||||
<p className="text-sm text-duck-dark/40 text-center mt-12">{t('capability.emptyFile')}</p>
|
||||
) : (
|
||||
<p className="text-sm text-duck-dark/40 text-center mt-12">
|
||||
Select a {kind.toLowerCase()} to view its contents
|
||||
{t('capability.selectToView', { kind: kind.toLowerCase() })}
|
||||
</p>
|
||||
)}
|
||||
</div>
|
||||
@@ -606,10 +628,10 @@ export const CapabilityPage = ({ kind, endpoint, queryKey, basePath }: Capabilit
|
||||
</DialogHeader>
|
||||
<div className="flex justify-end gap-2 mt-2">
|
||||
<Button variant="outline" onClick={() => setDeleteConfirm(false)} className="cursor-pointer">
|
||||
Cancel
|
||||
{tUi('button.cancel')}
|
||||
</Button>
|
||||
<Button variant="destructive" onClick={handleDelete} className="cursor-pointer">
|
||||
Delete
|
||||
{t('capability.delete')}
|
||||
</Button>
|
||||
</div>
|
||||
</DialogContent>
|
||||
|
||||
@@ -9,6 +9,7 @@ import { errorText } from 'helpers/error-text';
|
||||
import { useDashboardState } from 'state/useDashboardState';
|
||||
import type { ClaudeSessionDetail } from 'state/useClaudeSessions';
|
||||
import { defaultLayout, hasAppType } from './defaultLayout';
|
||||
import { useTranslation } from '@/lib/i18n';
|
||||
|
||||
// How many messages to render on first open (anchored to the bottom); scroll-up pages older ones in.
|
||||
const CHAT_TAIL = 20;
|
||||
@@ -18,6 +19,7 @@ type SessionListPageProps = {
|
||||
};
|
||||
|
||||
export const SessionListPage = ({ isNew }: SessionListPageProps) => {
|
||||
const { t } = useTranslation();
|
||||
// The group is a path suffix now, not ?cwd= — see officerdev/apps/ChatHistory/chat-routes.ts.
|
||||
const { sessionId, '*': splat } = useParams<{ sessionId: string; '*': string }>();
|
||||
const groupCwd = cwdFromSplat(splat);
|
||||
@@ -122,7 +124,7 @@ export const SessionListPage = ({ isNew }: SessionListPageProps) => {
|
||||
// Falling back to a bare id still opens a usable pane, but silently: you get an empty chat and
|
||||
// no hint that the transcript could not be read, which is indistinguishable from a new session.
|
||||
// Most often the id is stale — the transcript was deleted or pruned out from under the link.
|
||||
toast.error(`Could not load this conversation: ${errorText(err, 'not found')}`);
|
||||
toast.error(t('chatHistory.loadFailed', { reason: errorText(err, 'not found') }));
|
||||
setSelected({ id: sessionId });
|
||||
}
|
||||
})();
|
||||
|
||||
@@ -1,12 +1,16 @@
|
||||
import { CodeEditorView } from 'officerdev';
|
||||
import { Widget } from 'widgets/Widget';
|
||||
import { useTranslation } from '@/lib/i18n';
|
||||
|
||||
export const CodeEditor = () => (
|
||||
<div className="h-full w-full flex items-center justify-center">
|
||||
<Widget title="Code Editor" className="h-[70vh] w-[70vw] overflow-hidden" resizable moveable>
|
||||
{/* The screen is the one editor that owns the address bar, so the open file is `?file=`. The panel
|
||||
export const CodeEditor = () => {
|
||||
const { t } = useTranslation();
|
||||
return (
|
||||
<div className="h-full w-full flex items-center justify-center">
|
||||
<Widget title={t('nav.codeEditor')} className="h-[70vh] w-[70vw] overflow-hidden" resizable moveable>
|
||||
{/* The screen is the one editor that owns the address bar, so the open file is `?file=`. The panel
|
||||
wrapper deliberately does not pass this: a dashboard can hold two editors. */}
|
||||
<CodeEditorView className="h-full w-full" urlState />
|
||||
</Widget>
|
||||
</div>
|
||||
);
|
||||
<CodeEditorView className="h-full w-full" urlState />
|
||||
</Widget>
|
||||
</div>
|
||||
);
|
||||
};
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
import { useEffect } from 'react';
|
||||
import type { LayoutNode } from 'officerdev';
|
||||
import { WorkspaceView } from 'officerdev';
|
||||
import { WorkspaceView, useCommanderFilesPanel } from 'officerdev';
|
||||
import { useDashboardState } from 'state/useDashboardState';
|
||||
import { defaultLayout, isLegacyThreeColumn } from './defaultLayout';
|
||||
|
||||
@@ -10,6 +10,7 @@ import { defaultLayout, isLegacyThreeColumn } from './defaultLayout';
|
||||
|
||||
export const CommandHqScreen = () => {
|
||||
const workspace = useDashboardState<LayoutNode>('screens/command-hq', defaultLayout);
|
||||
const ephemeral = useCommanderFilesPanel();
|
||||
|
||||
/*
|
||||
Move a saved three-column layout onto the two-column one.
|
||||
@@ -26,6 +27,9 @@ export const CommandHqScreen = () => {
|
||||
|
||||
return (
|
||||
<div className="h-full w-full pt-2">
|
||||
{/* The commander's own file browser is a layout of its own, rendered beside this one — it never
|
||||
enters `workspace.value`, so this screen stays locked and the allow-list does not have to know
|
||||
about it. Same trade `/files` makes for the file viewer. */}
|
||||
<WorkspaceView
|
||||
workspace={workspace}
|
||||
locked
|
||||
@@ -33,6 +37,7 @@ export const CommandHqScreen = () => {
|
||||
allowed: ['command-hq-categories', 'command-hq-grid', 'command-hq-detail'],
|
||||
fallback: 'command-hq-detail',
|
||||
}}
|
||||
ephemeral={ephemeral}
|
||||
/>
|
||||
</div>
|
||||
);
|
||||
|
||||
@@ -3,6 +3,9 @@ import { useParams, Link } from 'react-router';
|
||||
import { Loader2, CheckCircle2, XCircle, Ban, Clock, ArrowLeft, Square, Film, Music } from 'lucide-react';
|
||||
import { useClient } from 'hooks/useClient';
|
||||
import { toast } from 'sonner';
|
||||
import { useTranslation } from '@/lib/i18n';
|
||||
|
||||
type TFn = ReturnType<typeof useTranslation>['t'];
|
||||
|
||||
// Detail view for a `download` job — a compact two-phase progress readout (metadata → download), polled
|
||||
// from the job's persisted progress (the executor emits counter snapshots, not per-item events).
|
||||
@@ -29,26 +32,40 @@ type DownloadJob = {
|
||||
const POLL_MS = 1500;
|
||||
const isTerminal = (s: string) => s === 'completed' || s === 'failed' || s === 'stopped' || s === 'interrupted';
|
||||
|
||||
const statusBadge = (status: string) => {
|
||||
// Takes `t` because it is a module-level helper, not a component — the alternative is a hook
|
||||
// call outside a component body.
|
||||
const statusBadge = (status: string, t: TFn) => {
|
||||
switch (status) {
|
||||
case 'running':
|
||||
return {
|
||||
icon: <Loader2 className="h-4 w-4 animate-spin" />,
|
||||
label: 'Running',
|
||||
label: t('jobs.status.running'),
|
||||
cls: 'text-amber-600 dark:text-amber-500',
|
||||
};
|
||||
case 'pending':
|
||||
return { icon: <Clock className="h-4 w-4" />, label: 'Queued', cls: 'text-blue-600 dark:text-blue-400' };
|
||||
return {
|
||||
icon: <Clock className="h-4 w-4" />,
|
||||
label: t('jobs.status.queued'),
|
||||
cls: 'text-blue-600 dark:text-blue-400',
|
||||
};
|
||||
case 'completed':
|
||||
return { icon: <CheckCircle2 className="h-4 w-4" />, label: 'Completed', cls: 'text-duck-teal' };
|
||||
return { icon: <CheckCircle2 className="h-4 w-4" />, label: t('jobs.status.completed'), cls: 'text-duck-teal' };
|
||||
case 'failed':
|
||||
return { icon: <XCircle className="h-4 w-4" />, label: 'Failed', cls: 'text-red-600 dark:text-red-400' };
|
||||
return {
|
||||
icon: <XCircle className="h-4 w-4" />,
|
||||
label: t('jobs.status.failed'),
|
||||
cls: 'text-red-600 dark:text-red-400',
|
||||
};
|
||||
case 'stopped':
|
||||
return { icon: <Ban className="h-4 w-4" />, label: 'Stopped', cls: 'text-duck-dark/50 dark:text-foreground/50' };
|
||||
return {
|
||||
icon: <Ban className="h-4 w-4" />,
|
||||
label: t('jobs.status.stopped'),
|
||||
cls: 'text-duck-dark/50 dark:text-foreground/50',
|
||||
};
|
||||
default:
|
||||
return {
|
||||
icon: <XCircle className="h-4 w-4" />,
|
||||
label: 'Interrupted',
|
||||
label: t('jobs.status.interrupted'),
|
||||
cls: 'text-orange-600 dark:text-orange-400',
|
||||
};
|
||||
}
|
||||
@@ -100,6 +117,7 @@ export const PhaseBar = ({
|
||||
};
|
||||
|
||||
export const DownloadJobDetail = () => {
|
||||
const { t } = useTranslation();
|
||||
const { id } = useParams<{ id: string }>();
|
||||
const client = useClient();
|
||||
const [job, setJob] = useState<DownloadJob | null>(null);
|
||||
@@ -134,9 +152,9 @@ export const DownloadJobDetail = () => {
|
||||
if (!id) return;
|
||||
try {
|
||||
await client.post(`/jobs/${id}/stop`, {});
|
||||
toast.success('Stop requested');
|
||||
toast.success(t('jobs.stopRequested'));
|
||||
} catch {
|
||||
toast.error('Failed to stop');
|
||||
toast.error(t('jobs.stopFailed'));
|
||||
}
|
||||
};
|
||||
|
||||
@@ -149,14 +167,14 @@ export const DownloadJobDetail = () => {
|
||||
if (!job)
|
||||
return (
|
||||
<div className="flex-1 flex flex-col items-center justify-center gap-3 text-duck-dark/60 dark:text-foreground/60">
|
||||
<span>Job not found.</span>
|
||||
<span>{t('jobs.notFound')}</span>
|
||||
<Link to="/jobs" className="text-duck-teal hover:underline">
|
||||
Back to jobs
|
||||
{t('jobs.backToJobs')}
|
||||
</Link>
|
||||
</div>
|
||||
);
|
||||
|
||||
const badge = statusBadge(job.status);
|
||||
const badge = statusBadge(job.status, t);
|
||||
const running = !isTerminal(job.status);
|
||||
const p = job.progress;
|
||||
const isAudio = job.inputs?.format !== 'video';
|
||||
@@ -197,7 +215,7 @@ export const DownloadJobDetail = () => {
|
||||
onClick={stop}
|
||||
className="flex items-center gap-1.5 px-3 py-1.5 text-xs rounded-md bg-red-500/10 text-red-600 dark:text-red-400 hover:bg-red-500/20 cursor-pointer transition-colors"
|
||||
>
|
||||
<Square className="h-3 w-3" /> Stop
|
||||
<Square className="h-3 w-3" /> {t('jobs.stop')}
|
||||
</button>
|
||||
)}
|
||||
</div>
|
||||
@@ -206,14 +224,14 @@ export const DownloadJobDetail = () => {
|
||||
<div className="mx-auto flex max-w-md flex-col gap-5">
|
||||
<div className="text-sm text-duck-dark/60 dark:text-foreground/60">{phaseLabel}</div>
|
||||
<PhaseBar
|
||||
label="Titles"
|
||||
label={t('jobs.titles')}
|
||||
c={p?.meta ?? { done: 0, failed: 0, total: 0 }}
|
||||
active={p?.phase === 'metadata'}
|
||||
savedLabel="found"
|
||||
failedLabel="skipped"
|
||||
/>
|
||||
<PhaseBar
|
||||
label="Download"
|
||||
label={t('jobs.download')}
|
||||
c={p?.dl ?? { done: 0, failed: 0, total: 0 }}
|
||||
active={p?.phase === 'download'}
|
||||
savedLabel="saved"
|
||||
|
||||
@@ -18,6 +18,7 @@ import { Button } from '@/components/ui/button';
|
||||
import { WorkspaceLayout } from 'officerdev';
|
||||
import type { LayoutNode, PanelComponents } from 'officerdev';
|
||||
import { randomId } from 'helpers/random-id';
|
||||
import { useTranslation } from '@/lib/i18n';
|
||||
|
||||
type Cost = { inputTokens: number; outputTokens: number; totalUSD: number };
|
||||
|
||||
@@ -162,6 +163,7 @@ type ToolCallEntryProps = {
|
||||
};
|
||||
|
||||
const ToolCallEntry = ({ entry }: ToolCallEntryProps) => {
|
||||
const { t } = useTranslation();
|
||||
const [expanded, setExpanded] = useState(false);
|
||||
|
||||
return (
|
||||
@@ -183,14 +185,14 @@ const ToolCallEntry = ({ entry }: ToolCallEntryProps) => {
|
||||
{expanded && (
|
||||
<div className="p-2.5 space-y-2 border-t border-duck-dark/10">
|
||||
<div>
|
||||
<div className="text-[10px] text-duck-dark/40 uppercase mb-1">Input</div>
|
||||
<div className="text-[10px] text-duck-dark/40 uppercase mb-1">{t('jobs.input')}</div>
|
||||
<pre className="text-duck-dark/60 whitespace-pre-wrap break-words text-[11px] max-h-40 overflow-y-auto">
|
||||
{JSON.stringify(entry.toolInput, null, 2)}
|
||||
</pre>
|
||||
</div>
|
||||
{entry.output !== undefined && (
|
||||
<div>
|
||||
<div className="text-[10px] text-duck-dark/40 uppercase mb-1">Output</div>
|
||||
<div className="text-[10px] text-duck-dark/40 uppercase mb-1">{t('jobs.output')}</div>
|
||||
<pre
|
||||
className={`whitespace-pre-wrap break-words text-[11px] max-h-60 overflow-y-auto ${entry.isError ? 'text-red-500' : 'text-duck-dark/60'}`}
|
||||
>
|
||||
@@ -236,6 +238,7 @@ const DEFAULT_LAYOUT: LayoutNode = {
|
||||
};
|
||||
|
||||
const StepsPanel = () => {
|
||||
const { t } = useTranslation();
|
||||
const ctx = useJobPanel();
|
||||
const {
|
||||
displaySteps,
|
||||
@@ -255,7 +258,7 @@ const StepsPanel = () => {
|
||||
return (
|
||||
<div className="flex h-full flex-col overflow-hidden">
|
||||
<div className="px-3 py-2 border-b border-duck-dark/10">
|
||||
<h2 className="text-xs font-medium text-duck-dark/60 uppercase tracking-wider">Steps</h2>
|
||||
<h2 className="text-xs font-medium text-duck-dark/60 uppercase tracking-wider">{t('jobs.steps')}</h2>
|
||||
</div>
|
||||
<div className="flex-1 overflow-y-auto">
|
||||
{displaySteps.map((step, i) => {
|
||||
@@ -336,6 +339,7 @@ const StepsPanel = () => {
|
||||
};
|
||||
|
||||
const OutputPanel = () => {
|
||||
const { t } = useTranslation();
|
||||
const ctx = useJobPanel();
|
||||
const { selectedKey, outputMap, streamingMap, outputPanelRef } = ctx;
|
||||
|
||||
@@ -345,7 +349,7 @@ const OutputPanel = () => {
|
||||
return (
|
||||
<div className="flex h-full flex-col overflow-hidden">
|
||||
<div className="px-3 py-2 border-b border-duck-dark/10 flex items-center gap-2">
|
||||
<h2 className="text-xs font-medium text-duck-dark/60 uppercase tracking-wider">Output</h2>
|
||||
<h2 className="text-xs font-medium text-duck-dark/60 uppercase tracking-wider">{t('jobs.output')}</h2>
|
||||
{selectedKey && (
|
||||
<span className="text-xs text-duck-dark/40 truncate">
|
||||
{selectedKey.includes(':') ? selectedKey.split(':')[1] : `step ${Number(selectedKey) + 1}`}
|
||||
@@ -355,12 +359,12 @@ const OutputPanel = () => {
|
||||
<div ref={outputPanelRef} className="flex-1 overflow-y-auto p-3 space-y-2 font-mono text-xs">
|
||||
{!selectedKey && (
|
||||
<div className="flex items-center justify-center h-full text-duck-dark/30 text-sm font-sans">
|
||||
Select a step or sub-task to view output
|
||||
{t('jobs.selectStep')}
|
||||
</div>
|
||||
)}
|
||||
{selectedKey && selectedOutputs.length === 0 && !selectedStreaming && (
|
||||
<div className="flex items-center justify-center h-full text-duck-dark/30 text-sm font-sans">
|
||||
No output yet
|
||||
{t('jobs.noOutput')}
|
||||
</div>
|
||||
)}
|
||||
{selectedOutputs.map((entry) => {
|
||||
@@ -385,6 +389,7 @@ const OutputPanel = () => {
|
||||
};
|
||||
|
||||
export const PipelineJobDetail = () => {
|
||||
const { t } = useTranslation();
|
||||
const { id } = useParams<{ id: string }>();
|
||||
const client = useClient();
|
||||
|
||||
@@ -792,15 +797,15 @@ export const PipelineJobDetail = () => {
|
||||
);
|
||||
|
||||
if (isLoading) {
|
||||
return <div className="flex h-full items-center justify-center text-duck-dark/30 text-sm">Loading...</div>;
|
||||
return <div className="flex h-full items-center justify-center text-duck-dark/30 text-sm">{t('jobs.loading')}</div>;
|
||||
}
|
||||
|
||||
if (!job) {
|
||||
return (
|
||||
<div className="flex h-full flex-col items-center justify-center gap-3 text-duck-dark/30 text-sm">
|
||||
<span>Job not found</span>
|
||||
<span>{t('jobs.notFound')}</span>
|
||||
<Link to="/jobs" className="text-duck-teal text-xs hover:underline">
|
||||
Back to jobs
|
||||
{t('jobs.backToJobs')}
|
||||
</Link>
|
||||
</div>
|
||||
);
|
||||
@@ -821,7 +826,11 @@ export const PipelineJobDetail = () => {
|
||||
<Card className="px-4 py-3 shrink-0">
|
||||
<div className="flex items-center gap-3">
|
||||
{/* The other two job detail panes already do this; this was the last imperative back in Jobs. */}
|
||||
<Link to="/jobs" aria-label="Back to jobs" className="p-1 rounded hover:bg-duck-dark/10 cursor-pointer">
|
||||
<Link
|
||||
to="/jobs"
|
||||
aria-label={t('jobs.backToJobs')}
|
||||
className="p-1 rounded hover:bg-duck-dark/10 cursor-pointer"
|
||||
>
|
||||
<ArrowLeft className="h-4 w-4 text-duck-dark/60" />
|
||||
</Link>
|
||||
<div className="flex-1 min-w-0">
|
||||
@@ -837,7 +846,7 @@ export const PipelineJobDetail = () => {
|
||||
{isRunning && (
|
||||
<Button variant="outline" size="sm" onClick={handleStop} className="gap-1.5">
|
||||
<Square className="h-3 w-3" />
|
||||
Stop
|
||||
{t('jobs.stop')}
|
||||
</Button>
|
||||
)}
|
||||
</div>
|
||||
@@ -852,13 +861,13 @@ export const PipelineJobDetail = () => {
|
||||
{displayCost && (
|
||||
<>
|
||||
<div className="flex items-center gap-1.5 text-duck-dark/60">
|
||||
<span className="text-duck-dark/40">Tokens:</span>
|
||||
<span className="text-duck-dark/40">{t('jobs.tokens')}</span>
|
||||
<span className="font-mono tabular-nums">
|
||||
{formatTokens(displayCost.inputTokens)} in / {formatTokens(displayCost.outputTokens)} out
|
||||
</span>
|
||||
</div>
|
||||
<div className="flex items-center gap-1.5 text-duck-dark/60">
|
||||
<span className="text-duck-dark/40">Cost:</span>
|
||||
<span className="text-duck-dark/40">{t('jobs.cost')}</span>
|
||||
<span className="font-mono tabular-nums">{formatCost(displayCost.totalUSD)}</span>
|
||||
</div>
|
||||
</>
|
||||
|
||||
@@ -22,6 +22,7 @@ import { Card } from '@/components/Card';
|
||||
import { ScriptJobDetail } from './ScriptJobDetail';
|
||||
import { DownloadJobDetail } from './DownloadJobDetail';
|
||||
import { PipelineJobDetail } from './JobDetail';
|
||||
import { useTranslation } from '@/lib/i18n';
|
||||
|
||||
type JobSummary = {
|
||||
id: string;
|
||||
@@ -99,6 +100,7 @@ const useJobsData = () => {
|
||||
|
||||
type JobRowProps = { job: JobSummary; onAction: (ev: MouseEvent, job: JobSummary) => void };
|
||||
const JobRow = ({ job, onAction }: JobRowProps) => {
|
||||
const { t } = useTranslation();
|
||||
const { id: activeId } = useParams<{ id: string }>();
|
||||
const isRunning = job.status === 'running';
|
||||
const target = basename(job.target);
|
||||
@@ -126,7 +128,7 @@ const JobRow = ({ job, onAction }: JobRowProps) => {
|
||||
</Link>
|
||||
<button
|
||||
onClick={(ev) => onAction(ev, job)}
|
||||
title={isRunning ? 'Stop' : 'Delete'}
|
||||
title={isRunning ? t('jobs.stop') : 'Delete'}
|
||||
className="shrink-0 mr-2 p-1.5 rounded-md text-duck-dark/40 hover:text-red-500 hover:bg-red-500/10 md:opacity-0 group-hover:opacity-100 transition-opacity cursor-pointer"
|
||||
>
|
||||
{isRunning ? <Square className="h-4 w-4" /> : <Trash2 className="h-4 w-4" />}
|
||||
@@ -144,6 +146,7 @@ const PanelHeader = ({ children }: { children: ReactNode }) => (
|
||||
// real event is wired to it. Sends { type: 'test' }, which reaches every configured channel — Discord
|
||||
// today, APNs and FCM once their credentials exist. Delete this once a real producer replaces it.
|
||||
const TestNotificationButton = () => {
|
||||
const { t } = useTranslation();
|
||||
const client = useClient();
|
||||
const [sending, setSending] = useState(false);
|
||||
|
||||
@@ -157,12 +160,12 @@ const TestNotificationButton = () => {
|
||||
);
|
||||
const results = res?.results ?? [];
|
||||
if (results.length === 0) {
|
||||
toast.warning('No channels configured');
|
||||
toast.warning(t('jobs.noChannels'));
|
||||
} else {
|
||||
toast.success(results.map((r) => `${r.channel}: ${r.sent} sent`).join(', '));
|
||||
}
|
||||
} catch {
|
||||
toast.error('Failed to send notification');
|
||||
toast.error(t('jobs.notifyFailed'));
|
||||
} finally {
|
||||
setSending(false);
|
||||
}
|
||||
@@ -172,7 +175,7 @@ const TestNotificationButton = () => {
|
||||
<button
|
||||
onClick={send}
|
||||
disabled={sending}
|
||||
title="Send a test notification to every configured channel"
|
||||
title={t('jobs.testNotification')}
|
||||
className="ml-auto shrink-0 flex items-center gap-1 text-xs font-medium text-duck-dark/50 hover:text-duck-teal cursor-pointer disabled:opacity-40"
|
||||
>
|
||||
<Bell className="h-3.5 w-3.5" />
|
||||
@@ -182,6 +185,7 @@ const TestNotificationButton = () => {
|
||||
};
|
||||
|
||||
const ActiveJobsPanel = () => {
|
||||
const { t } = useTranslation();
|
||||
const { jobs, isLoading, act } = useJobsData();
|
||||
const active = [
|
||||
...jobs.filter((j) => j.status === 'running'),
|
||||
@@ -191,15 +195,17 @@ const ActiveJobsPanel = () => {
|
||||
<div className="h-full p-2">
|
||||
<Card className="h-full flex flex-col overflow-hidden">
|
||||
<PanelHeader>
|
||||
<h2 className="text-sm font-semibold text-duck-dark">Running & Queued</h2>
|
||||
<h2 className="text-sm font-semibold text-duck-dark">{t('jobs.runningQueued')}</h2>
|
||||
{active.length > 0 && <span className="text-xs text-duck-dark/40">{active.length}</span>}
|
||||
<TestNotificationButton />
|
||||
</PanelHeader>
|
||||
<div className="flex-1 overflow-y-auto">
|
||||
{isLoading ? (
|
||||
<div className="flex items-center justify-center h-full text-duck-dark/30 text-xs">Loading…</div>
|
||||
<div className="flex items-center justify-center h-full text-duck-dark/30 text-xs">{t('jobs.loading')}</div>
|
||||
) : active.length === 0 ? (
|
||||
<div className="flex items-center justify-center h-full text-duck-dark/30 text-xs">Nothing running</div>
|
||||
<div className="flex items-center justify-center h-full text-duck-dark/30 text-xs">
|
||||
{t('jobs.nothingRunning')}
|
||||
</div>
|
||||
) : (
|
||||
active.map((job) => <JobRow key={job.id} job={job} onAction={act} />)
|
||||
)}
|
||||
@@ -211,6 +217,7 @@ const ActiveJobsPanel = () => {
|
||||
|
||||
// Bottom-left panel: finished / failed / stopped, newest first, searchable.
|
||||
const HistoryJobsPanel = () => {
|
||||
const { t } = useTranslation();
|
||||
const { jobs, isLoading, act, clearHistory } = useJobsData();
|
||||
const [search, setSearch] = useState('');
|
||||
const history = jobs
|
||||
@@ -224,12 +231,12 @@ const HistoryJobsPanel = () => {
|
||||
<div className="h-full p-2">
|
||||
<Card className="h-full flex flex-col overflow-hidden">
|
||||
<PanelHeader>
|
||||
<h2 className="text-sm font-semibold text-duck-dark shrink-0">History</h2>
|
||||
<h2 className="text-sm font-semibold text-duck-dark shrink-0">{t('jobs.history')}</h2>
|
||||
<div className="relative flex-1">
|
||||
<Search className="absolute left-2.5 top-1/2 -translate-y-1/2 h-3.5 w-3.5 text-duck-dark/40" />
|
||||
<input
|
||||
type="text"
|
||||
placeholder="Search…"
|
||||
placeholder={t('jobs.search')}
|
||||
value={search}
|
||||
onChange={(ev) => setSearch(ev.target.value)}
|
||||
className="w-full pl-8 pr-3 py-1 text-sm rounded-md border border-duck-dark/15 bg-background/60 text-duck-dark placeholder:text-duck-dark/30 focus:outline-none focus:ring-1 focus:ring-duck-teal/40"
|
||||
@@ -238,16 +245,16 @@ const HistoryJobsPanel = () => {
|
||||
{history.length > 0 && (
|
||||
<button
|
||||
onClick={clearHistory}
|
||||
title="Delete all finished jobs"
|
||||
title={t('jobs.deleteFinished')}
|
||||
className="shrink-0 text-xs font-medium text-duck-dark/50 hover:text-red-500 cursor-pointer"
|
||||
>
|
||||
Clear all
|
||||
{t('jobs.clearAll')}
|
||||
</button>
|
||||
)}
|
||||
</PanelHeader>
|
||||
<div className="flex-1 overflow-y-auto">
|
||||
{isLoading ? (
|
||||
<div className="flex items-center justify-center h-full text-duck-dark/30 text-xs">Loading…</div>
|
||||
<div className="flex items-center justify-center h-full text-duck-dark/30 text-xs">{t('jobs.loading')}</div>
|
||||
) : history.length === 0 ? (
|
||||
<div className="flex items-center justify-center h-full text-duck-dark/30 text-xs">
|
||||
{search ? 'No matches' : 'No finished jobs'}
|
||||
@@ -263,6 +270,7 @@ const HistoryJobsPanel = () => {
|
||||
|
||||
// ── Right panel: the selected job's detail, by mode (script terminal / pipeline steps) ──
|
||||
const JobDetailPanel = () => {
|
||||
const { t } = useTranslation();
|
||||
const { id } = useParams<{ id: string }>();
|
||||
const client = useClient();
|
||||
const [mode, setMode] = useState<string | null>(null);
|
||||
@@ -284,7 +292,7 @@ const JobDetailPanel = () => {
|
||||
<div className="h-full p-2">
|
||||
<Card className="h-full flex flex-col items-center justify-center gap-2 text-duck-dark/30">
|
||||
<Inbox className="h-8 w-8" />
|
||||
<span className="text-sm">Select a job</span>
|
||||
<span className="text-sm">{t('jobs.selectJob')}</span>
|
||||
</Card>
|
||||
</div>
|
||||
);
|
||||
@@ -301,7 +309,7 @@ const JobDetailPanel = () => {
|
||||
if (mode === 'notfound') {
|
||||
return (
|
||||
<div className="h-full p-2">
|
||||
<Card className="h-full flex items-center justify-center text-duck-dark/50 text-sm">Job not found.</Card>
|
||||
<Card className="h-full flex items-center justify-center text-duck-dark/50 text-sm">{t('jobs.notFound')}</Card>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
@@ -4,6 +4,9 @@ import { Loader2, CheckCircle2, XCircle, Ban, Clock, ArrowLeft, Square } from 'l
|
||||
import { useClient } from 'hooks/useClient';
|
||||
import { toast } from 'sonner';
|
||||
import { PhaseBar, type DownloadProgress } from './DownloadJobDetail';
|
||||
import { useTranslation } from '@/lib/i18n';
|
||||
|
||||
type TFn = ReturnType<typeof useTranslation>['t'];
|
||||
|
||||
type ScriptJob = {
|
||||
id: string;
|
||||
@@ -27,36 +30,46 @@ const isTerminal = (s: string) => s === 'completed' || s === 'failed' || s === '
|
||||
const isDownloadProgress = (p: unknown): p is DownloadProgress =>
|
||||
!!p && typeof p === 'object' && 'meta' in p && 'dl' in p;
|
||||
|
||||
const statusBadge = (status: string, exitCode: number | null) => {
|
||||
// Takes `t` because it is a module-level helper, not a component.
|
||||
const statusBadge = (status: string, exitCode: number | null, t: TFn) => {
|
||||
switch (status) {
|
||||
case 'running':
|
||||
return {
|
||||
icon: <Loader2 className="h-4 w-4 animate-spin" />,
|
||||
label: 'Running',
|
||||
label: t('jobs.status.running'),
|
||||
cls: 'text-amber-600 dark:text-amber-500',
|
||||
};
|
||||
case 'pending':
|
||||
return { icon: <Clock className="h-4 w-4" />, label: 'Queued', cls: 'text-blue-600 dark:text-blue-400' };
|
||||
return {
|
||||
icon: <Clock className="h-4 w-4" />,
|
||||
label: t('jobs.status.queued'),
|
||||
cls: 'text-blue-600 dark:text-blue-400',
|
||||
};
|
||||
case 'completed':
|
||||
return { icon: <CheckCircle2 className="h-4 w-4" />, label: 'Completed', cls: 'text-duck-teal' };
|
||||
return { icon: <CheckCircle2 className="h-4 w-4" />, label: t('jobs.status.completed'), cls: 'text-duck-teal' };
|
||||
case 'failed':
|
||||
return {
|
||||
icon: <XCircle className="h-4 w-4" />,
|
||||
label: `Failed${exitCode != null ? ` (exit ${exitCode})` : ''}`,
|
||||
label: exitCode != null ? t('jobs.failedWithCode', { code: exitCode }) : t('jobs.status.failed'),
|
||||
cls: 'text-red-600 dark:text-red-400',
|
||||
};
|
||||
case 'stopped':
|
||||
return { icon: <Ban className="h-4 w-4" />, label: 'Stopped', cls: 'text-duck-dark/50 dark:text-foreground/50' };
|
||||
return {
|
||||
icon: <Ban className="h-4 w-4" />,
|
||||
label: t('jobs.status.stopped'),
|
||||
cls: 'text-duck-dark/50 dark:text-foreground/50',
|
||||
};
|
||||
default:
|
||||
return {
|
||||
icon: <XCircle className="h-4 w-4" />,
|
||||
label: 'Interrupted',
|
||||
label: t('jobs.status.interrupted'),
|
||||
cls: 'text-orange-600 dark:text-orange-400',
|
||||
};
|
||||
}
|
||||
};
|
||||
|
||||
export const ScriptJobDetail = () => {
|
||||
const { t } = useTranslation();
|
||||
const { id } = useParams<{ id: string }>();
|
||||
const client = useClient();
|
||||
|
||||
@@ -137,9 +150,9 @@ export const ScriptJobDetail = () => {
|
||||
if (!id) return;
|
||||
try {
|
||||
await client.post(`/jobs/${id}/stop`, {});
|
||||
toast.success('Stop requested');
|
||||
toast.success(t('jobs.stopRequested'));
|
||||
} catch {
|
||||
toast.error('Failed to stop');
|
||||
toast.error(t('jobs.stopFailed'));
|
||||
}
|
||||
};
|
||||
|
||||
@@ -153,15 +166,15 @@ export const ScriptJobDetail = () => {
|
||||
if (!job) {
|
||||
return (
|
||||
<div className="flex-1 flex flex-col items-center justify-center gap-3 text-duck-dark/60 dark:text-foreground/60">
|
||||
<span>Job not found.</span>
|
||||
<span>{t('jobs.notFound')}</span>
|
||||
<Link to="/jobs" className="text-duck-teal hover:underline">
|
||||
Back to jobs
|
||||
{t('jobs.backToJobs')}
|
||||
</Link>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
const badge = statusBadge(job.status, job.exitCode);
|
||||
const badge = statusBadge(job.status, job.exitCode, t);
|
||||
const running = !isTerminal(job.status);
|
||||
|
||||
return (
|
||||
@@ -185,7 +198,7 @@ export const ScriptJobDetail = () => {
|
||||
onClick={stop}
|
||||
className="flex items-center gap-1.5 px-3 py-1.5 text-xs rounded-md bg-red-500/10 text-red-600 dark:text-red-400 hover:bg-red-500/20 cursor-pointer transition-colors"
|
||||
>
|
||||
<Square className="h-3 w-3" /> Stop
|
||||
<Square className="h-3 w-3" /> {t('jobs.stop')}
|
||||
</button>
|
||||
)}
|
||||
</div>
|
||||
@@ -193,14 +206,14 @@ export const ScriptJobDetail = () => {
|
||||
{isDownloadProgress(job.progress) && (
|
||||
<div className="px-5 py-4 border-b border-duck-dark/10 flex flex-col gap-4">
|
||||
<PhaseBar
|
||||
label="Titles"
|
||||
label={t('jobs.titles')}
|
||||
c={job.progress.meta}
|
||||
active={job.progress.phase === 'metadata'}
|
||||
savedLabel="found"
|
||||
failedLabel="skipped"
|
||||
/>
|
||||
<PhaseBar
|
||||
label="Download"
|
||||
label={t('jobs.download')}
|
||||
c={job.progress.dl}
|
||||
active={job.progress.phase === 'download'}
|
||||
savedLabel="saved"
|
||||
|
||||
@@ -1,16 +1,18 @@
|
||||
import { Bug } from 'lucide-react';
|
||||
import { useBugReport } from './use-bug-report';
|
||||
import { useTranslation } from '@/lib/i18n';
|
||||
import { BugReportDialog } from './BugReportDialog';
|
||||
|
||||
export const BugReportButton = () => {
|
||||
const bugReport = useBugReport();
|
||||
const { t } = useTranslation();
|
||||
|
||||
return (
|
||||
<>
|
||||
<button
|
||||
onClick={bugReport.handleOpen}
|
||||
className="flex h-8 w-8 items-center justify-center rounded-full bg-destructive text-destructive-foreground transition-transform hover:scale-110"
|
||||
aria-label="Report a bug"
|
||||
aria-label={t('bugReport.label')}
|
||||
>
|
||||
<Bug size={16} />
|
||||
</button>
|
||||
|
||||
@@ -3,6 +3,7 @@ import { Dialog, DialogContent, DialogHeader, DialogTitle, DialogFooter } from '
|
||||
import { Button } from '@/components/ui/button';
|
||||
import { Textarea } from '@/components/ui/textarea';
|
||||
import { Loader2 } from 'lucide-react';
|
||||
import { useTranslation } from '@/lib/i18n';
|
||||
|
||||
type BugReportDialogProps = {
|
||||
open: boolean;
|
||||
@@ -21,6 +22,7 @@ export const BugReportDialog = ({
|
||||
onClose,
|
||||
onSubmit,
|
||||
}: BugReportDialogProps) => {
|
||||
const { t, tUi } = useTranslation();
|
||||
const [description, setDescription] = useState('');
|
||||
|
||||
const previewUrl = useMemo(() => (screenshot ? URL.createObjectURL(screenshot) : null), [screenshot]);
|
||||
@@ -36,7 +38,7 @@ export const BugReportDialog = ({
|
||||
<Dialog open={open} onOpenChange={onClose}>
|
||||
<DialogContent className="sm:max-w-lg">
|
||||
<DialogHeader>
|
||||
<DialogTitle>Report a Bug</DialogTitle>
|
||||
<DialogTitle>{t('bugReport.title')}</DialogTitle>
|
||||
</DialogHeader>
|
||||
|
||||
<div className="space-y-4">
|
||||
@@ -46,34 +48,32 @@ export const BugReportDialog = ({
|
||||
<Loader2 className="h-6 w-6 animate-spin text-muted-foreground" />
|
||||
</div>
|
||||
) : previewUrl ? (
|
||||
<img src={previewUrl} alt="Screenshot" className="max-h-48 w-full object-contain" />
|
||||
<img src={previewUrl} alt={t('bugReport.screenshot')} className="max-h-48 w-full object-contain" />
|
||||
) : (
|
||||
<div className="flex h-40 items-center justify-center text-sm text-muted-foreground">
|
||||
No screenshot captured
|
||||
{t('bugReport.noScreenshot')}
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
|
||||
<Textarea
|
||||
placeholder="Describe what went wrong..."
|
||||
placeholder={t('bugReport.describePlaceholder')}
|
||||
value={description}
|
||||
onChange={(ev) => setDescription(ev.target.value)}
|
||||
rows={4}
|
||||
autoFocus
|
||||
/>
|
||||
|
||||
<p className="text-xs text-muted-foreground">
|
||||
Console logs, browser info, and recent API errors are collected automatically.
|
||||
</p>
|
||||
<p className="text-xs text-muted-foreground">{t('bugReport.collectedNote')}</p>
|
||||
</div>
|
||||
|
||||
<DialogFooter>
|
||||
<Button variant="outline" onClick={onClose} disabled={submitting}>
|
||||
Cancel
|
||||
{tUi('button.cancel')}
|
||||
</Button>
|
||||
<Button onClick={handleSubmit} disabled={!canSubmit}>
|
||||
{submitting ? <Loader2 className="mr-2 h-4 w-4 animate-spin" /> : null}
|
||||
Submit
|
||||
{submitting ? <Loader2 className="me-2 h-4 w-4 animate-spin" /> : null}
|
||||
{t('bugReport.submit')}
|
||||
</Button>
|
||||
</DialogFooter>
|
||||
</DialogContent>
|
||||
|
||||
@@ -6,6 +6,7 @@ import { useGlobal } from 'hooks/useGlobal';
|
||||
import type { ErrorDetails } from 'hooks/useClient';
|
||||
import { getConsoleBuffer } from '@/lib/console-buffer';
|
||||
import { toast } from 'sonner';
|
||||
import { useTranslation } from '@/lib/i18n';
|
||||
|
||||
export const useBugReport = () => {
|
||||
const [open, setOpen] = useState(false);
|
||||
@@ -14,6 +15,7 @@ export const useBugReport = () => {
|
||||
const [submitting, setSubmitting] = useState(false);
|
||||
const client = useClient();
|
||||
const { user } = useAuth();
|
||||
const { t } = useTranslation();
|
||||
const [apiError] = useGlobal<ErrorDetails | null>('API_ERROR', null);
|
||||
|
||||
const handleOpen = useCallback(async () => {
|
||||
@@ -57,15 +59,15 @@ export const useBugReport = () => {
|
||||
}
|
||||
|
||||
await client.post('/bug-report', formData);
|
||||
toast.success('Bug report submitted');
|
||||
toast.success(t('bugReport.submitted'));
|
||||
handleClose();
|
||||
} catch {
|
||||
toast.error('Failed to submit bug report');
|
||||
toast.error(t('bugReport.failed'));
|
||||
} finally {
|
||||
setSubmitting(false);
|
||||
}
|
||||
},
|
||||
[screenshot, client, user, apiError, handleClose],
|
||||
[screenshot, client, user, apiError, handleClose, t],
|
||||
);
|
||||
|
||||
return { open, capturing, submitting, screenshot, handleOpen, handleClose, handleSubmit };
|
||||
|
||||
@@ -6,7 +6,7 @@ import { ErrorBoundary } from '@/components/ErrorBoundary';
|
||||
import { ScreenErrorFallback } from './ScreenErrorFallback';
|
||||
import { Background } from './Background';
|
||||
import { Header } from './Header';
|
||||
import { Dock, CORE_DOCK_ITEMS, dockItemsFromPlugins, defaultDockPaths } from './Dock';
|
||||
import { Dock, useDockItems, defaultDockPaths } from './Dock';
|
||||
import { Spotlight } from './Spotlight/Spotlight';
|
||||
import { ShortcutsModal } from './ShortcutsModal';
|
||||
import { useIsTouch } from './useIsTouch';
|
||||
@@ -24,10 +24,8 @@ export function DashboardLayout({ children }: DashboardLayoutProps) {
|
||||
// will then slam is worse than one that never showed it.
|
||||
// The shell's own items plus whatever the installed sidecars contribute. `plugins` already excludes
|
||||
// anything uninstalled or disabled, so an absent feature has no tile at all rather than a dead one.
|
||||
const permitted = useMemo(
|
||||
() => [...CORE_DOCK_ITEMS, ...dockItemsFromPlugins(plugins)].filter((item) => canVisit(item.to)),
|
||||
[canVisit, plugins],
|
||||
);
|
||||
const allDockItems = useDockItems(plugins);
|
||||
const permitted = useMemo(() => allDockItems.filter((item) => canVisit(item.to)), [canVisit, allDockItems]);
|
||||
const { items: visibleItems } = useDock(
|
||||
permitted,
|
||||
useMemo(() => defaultDockPaths(plugins), [plugins]),
|
||||
|
||||
@@ -1,10 +1,12 @@
|
||||
import { useEffect, useRef, useState } from 'react';
|
||||
import { useEffect, useMemo, useRef, useState } from 'react';
|
||||
import { NavLink } from 'react-router';
|
||||
import type { LucideIcon } from 'lucide-react';
|
||||
import { resolveIcon } from 'officerdev';
|
||||
import type { PluginManifest } from 'hooks/usePermissions';
|
||||
import { useTranslation, type AppTranslationKey } from '@/lib/i18n';
|
||||
|
||||
export type DockItem = {
|
||||
/** Already resolved for the active locale — see `useDockItems`. */
|
||||
label: string;
|
||||
to: string;
|
||||
color: string;
|
||||
@@ -169,22 +171,22 @@ import {
|
||||
* These are the baseline — chat, files, the terminal and the app's own screens — plus Gitea, which is in
|
||||
* the light profile because it fronts a remote instance and installs nothing locally.
|
||||
*/
|
||||
export const CORE_DOCK_ITEMS: DockItem[] = [
|
||||
{ label: 'Home', to: '/', icon: Home, color: '#f59e0b' },
|
||||
{ label: 'Files', to: '/files', icon: FolderOpen, color: '#fbbf24' },
|
||||
{ label: 'Chat', to: '/chat', icon: MessageCircle, color: '#60a5fa' },
|
||||
{ label: 'Command HQ', to: '/command-hq', icon: Radar, color: '#f43f5e' },
|
||||
{ label: 'Editor', to: '/code-editor', icon: Code, color: '#a78bfa' },
|
||||
{ label: 'Jobs', to: '/jobs', icon: Workflow, color: '#14b8a6' },
|
||||
{ label: 'Terminal', to: '/terminal', icon: Monitor, color: '#f97316' },
|
||||
{ label: 'Browser', to: '/browser', icon: Globe, color: '#06b6d4' },
|
||||
{ label: 'Monitor', to: '/system-monitor', icon: Activity, color: '#0ea5e9' },
|
||||
{ label: 'Activity', to: '/activity', icon: Radio, color: '#f59e0b' },
|
||||
{ label: 'Dashboards', to: '/dashboards', icon: LayoutGrid, color: '#8b5cf6' },
|
||||
export const CORE_DOCK_ITEMS: CoreDockItem[] = [
|
||||
{ labelKey: 'nav.home', to: '/', icon: Home, color: '#f59e0b' },
|
||||
{ labelKey: 'nav.files', to: '/files', icon: FolderOpen, color: '#fbbf24' },
|
||||
{ labelKey: 'nav.chat', to: '/chat', icon: MessageCircle, color: '#60a5fa' },
|
||||
{ labelKey: 'nav.commandHq', to: '/command-hq', icon: Radar, color: '#f43f5e' },
|
||||
{ labelKey: 'nav.editor', to: '/code-editor', icon: Code, color: '#a78bfa' },
|
||||
{ labelKey: 'nav.jobs', to: '/jobs', icon: Workflow, color: '#14b8a6' },
|
||||
{ labelKey: 'nav.terminal', to: '/terminal', icon: Monitor, color: '#f97316' },
|
||||
{ labelKey: 'nav.browser', to: '/browser', icon: Globe, color: '#06b6d4' },
|
||||
{ labelKey: 'nav.monitor', to: '/system-monitor', icon: Activity, color: '#0ea5e9' },
|
||||
{ labelKey: 'nav.activity', to: '/activity', icon: Radio, color: '#f59e0b' },
|
||||
{ labelKey: 'nav.dashboards', to: '/dashboards', icon: LayoutGrid, color: '#8b5cf6' },
|
||||
// Core because it is the door into another account's filesystem, and the permission that gates it is
|
||||
// `kind: 'app'` — so `canVisit()` hides the tile from anyone not granted it, which is the same treatment
|
||||
// every other grantable tile here gets.
|
||||
{ label: 'SendOff', to: '/sendoff', icon: Send, color: '#22d3ee' },
|
||||
{ labelKey: 'nav.sendOff', to: '/sendoff', icon: Send, color: '#22d3ee' },
|
||||
// Core since 2026-08-19. These were contributed by the app-store `caldav` entry until calendar and
|
||||
// contacts became core, and deleting that entry took their tiles with it — the routes kept working
|
||||
// while the dock and the settings list went silent about them, which is exactly the shape of failure
|
||||
@@ -194,16 +196,16 @@ export const CORE_DOCK_ITEMS: DockItem[] = [
|
||||
// the same voxel mark the phone apps show. `tile: 'bare'` for the same reason a plugin's artwork
|
||||
// does — the art brings its own frame, and a coloured square behind it reads as a mistake. `color`
|
||||
// still earns its place: the active glow, the indicator dot and the settings tint all use it.
|
||||
{ label: 'Calendar', to: '/calendar', image: '/icons/calendar.png', tile: 'bare', color: '#ef4444' },
|
||||
{ label: 'Contacts', to: '/contacts', image: '/icons/contacts.png', tile: 'bare', color: '#8b5cf6' },
|
||||
{ labelKey: 'nav.calendar', to: '/calendar', image: '/icons/calendar.png', tile: 'bare', color: '#ef4444' },
|
||||
{ labelKey: 'nav.contacts', to: '/contacts', image: '/icons/contacts.png', tile: 'bare', color: '#8b5cf6' },
|
||||
// Core because the tailnet is the perimeter — origin checking was removed on the grounds that the
|
||||
// tailnet stands in its place, so administering it cannot be an optional extra. It is `kind: 'admin'`,
|
||||
// and DashboardLayout filters every tile through canVisit(), so a member never sees this one.
|
||||
// Core by necessity: the store is how every other feature arrives, so it can never be one of the
|
||||
// things that disappears when uninstalled.
|
||||
{ label: 'App store', to: '/app-store', icon: Store, color: '#64748b' },
|
||||
{ labelKey: 'nav.appStore', to: '/app-store', icon: Store, color: '#64748b' },
|
||||
// Core, not contributed by a plugin: this is the screen that installs them, so it cannot arrive with one.
|
||||
{ label: 'Marketplace', to: '/marketplace', icon: Puzzle, color: '#94a3b8' },
|
||||
{ labelKey: 'nav.marketplace', to: '/marketplace', icon: Puzzle, color: '#94a3b8' },
|
||||
];
|
||||
|
||||
/**
|
||||
@@ -213,6 +215,30 @@ export const CORE_DOCK_ITEMS: DockItem[] = [
|
||||
* have to survive being JSON from a marketplace. An unknown name resolves to a neutral box rather than
|
||||
* throwing: a plugin naming an icon this build does not have should look plain, not break the dock.
|
||||
*/
|
||||
/**
|
||||
* A shell tile before its label is resolved. `labelKey` rather than `label` because these are the only
|
||||
* dock entries the platform owns the words for — a plugin's tile carries the name from its own manifest,
|
||||
* which is the plugin's string and not ours to translate (docs/localization.md open question 3).
|
||||
*/
|
||||
type CoreDockItem = Omit<DockItem, 'label'> & { labelKey: AppTranslationKey };
|
||||
|
||||
/**
|
||||
* The composed dock, with the shell's own labels in the active locale.
|
||||
*
|
||||
* One place rather than three: DashboardLayout, Spotlight and DockSettings each built this list by
|
||||
* spreading the same two sources, and each would otherwise have to resolve labels itself.
|
||||
*/
|
||||
export function useDockItems(plugins: PluginManifest[]): DockItem[] {
|
||||
const { t } = useTranslation();
|
||||
return useMemo(
|
||||
() => [
|
||||
...CORE_DOCK_ITEMS.map(({ labelKey, ...item }) => ({ ...item, label: t(labelKey) })),
|
||||
...dockItemsFromPlugins(plugins),
|
||||
],
|
||||
[t, plugins],
|
||||
);
|
||||
}
|
||||
|
||||
export function dockItemsFromPlugins(plugins: PluginManifest[]): DockItem[] {
|
||||
return plugins.flatMap((plugin) => {
|
||||
const tile = (t: {
|
||||
|
||||
@@ -13,6 +13,7 @@ import { RescanButton } from '../Rescan/RescanButton';
|
||||
import { usePageTitle } from '@/state/usePageTitle';
|
||||
import { useAuth } from 'hooks/useAuth';
|
||||
import { useThemeAsset } from '@/components/ui/ThemeProvider';
|
||||
import { useTranslation } from '@/lib/i18n';
|
||||
// import { BugReportButton } from '../BugReport/BugReportButton';
|
||||
|
||||
// Center title: click to rename this browser tab. The name is kept in sessionStorage, so it survives a
|
||||
@@ -20,14 +21,15 @@ import { useThemeAsset } from '@/components/ui/ThemeProvider';
|
||||
// the field hand the tab back to the route's own name.
|
||||
function EditablePageTitle() {
|
||||
const [title, rename] = usePageTitle();
|
||||
const { t } = useTranslation();
|
||||
|
||||
return (
|
||||
<EditableTitle
|
||||
value={title}
|
||||
onCommit={rename}
|
||||
allowEmpty
|
||||
ariaLabel="Tab name"
|
||||
hint="Click to rename this tab — clear it to go back to the page name"
|
||||
ariaLabel={t('header.tabName')}
|
||||
hint={t('header.tabNameHint')}
|
||||
className="header-ink pointer-events-auto max-w-[50vw] cursor-text truncate text-base font-bold transition-opacity hover:opacity-70 md:text-xl"
|
||||
inputClassName="header-ink header-ink-border pointer-events-auto max-w-[50vw] border-b bg-transparent text-center text-base font-bold outline-none md:text-xl"
|
||||
/>
|
||||
@@ -48,6 +50,7 @@ export function Header({ dockItems, hidden }: HeaderProps) {
|
||||
const [open, setOpen] = useState(false);
|
||||
const isTouch = useIsTouch();
|
||||
const { user } = useAuth();
|
||||
const { t } = useTranslation();
|
||||
// The mark comes from the theme — a white-labelled build replaces it without touching this file.
|
||||
const logo = useThemeAsset('--logo-src');
|
||||
|
||||
@@ -81,7 +84,7 @@ export function Header({ dockItems, hidden }: HeaderProps) {
|
||||
*/}
|
||||
<div
|
||||
role="img"
|
||||
aria-label="Officer"
|
||||
aria-label={t('header.logoAlt')}
|
||||
className="h-8 md:h-12 w-24 md:w-36 bg-contain bg-left bg-no-repeat"
|
||||
/* No skew. The wordmark is drawn, kerned pair by pair, and shipped as the finished mark —
|
||||
shearing it in CSS was how the OLD logo got its slant, and doing it to this one distorts
|
||||
@@ -119,7 +122,7 @@ export function Header({ dockItems, hidden }: HeaderProps) {
|
||||
<Sheet open={open} onOpenChange={setOpen}>
|
||||
<SheetContent side="left">
|
||||
<SheetHeader>
|
||||
<SheetTitle>Navigation</SheetTitle>
|
||||
<SheetTitle>{t('header.navigation')}</SheetTitle>
|
||||
</SheetHeader>
|
||||
<nav className="flex flex-col gap-1 mt-4 px-2">
|
||||
{dockItems.map((item) => (
|
||||
|
||||
@@ -3,6 +3,7 @@ import { Link } from 'react-router';
|
||||
import { Loader2, ListOrdered } from 'lucide-react';
|
||||
import { useClient } from 'hooks/useClient';
|
||||
import { usePermissions } from 'hooks/usePermissions';
|
||||
import { useTranslation } from '@/lib/i18n';
|
||||
|
||||
type Counts = { running: number; runningJobId: string | null; queued: number };
|
||||
|
||||
@@ -15,6 +16,7 @@ type Counts = { running: number; runningJobId: string | null; queued: number };
|
||||
export const JobsIndicator = () => {
|
||||
const client = useClient();
|
||||
const { can } = usePermissions();
|
||||
const { t } = useTranslation();
|
||||
const allowed = can('tasks');
|
||||
const [counts, setCounts] = useState<Counts>({ running: 0, runningJobId: null, queued: 0 });
|
||||
|
||||
@@ -44,7 +46,7 @@ export const JobsIndicator = () => {
|
||||
<div className="flex items-center gap-1.5">
|
||||
<Link
|
||||
to={counts.runningJobId ? `/jobs/${counts.runningJobId}` : '/jobs'}
|
||||
title={counts.running ? 'Running job' : 'Nothing running'}
|
||||
title={counts.running ? t('header.jobsRunning') : t('header.jobsNothingRunning')}
|
||||
className={`${pill} text-white ${counts.running ? 'bg-blue-500/60 hover:bg-blue-500/75' : 'bg-black/25 hover:bg-black/35'}`}
|
||||
>
|
||||
<Loader2 className={`h-3.5 w-3.5 ${counts.running ? 'animate-spin' : ''}`} />
|
||||
@@ -52,7 +54,7 @@ export const JobsIndicator = () => {
|
||||
</Link>
|
||||
<Link
|
||||
to="/jobs"
|
||||
title="Queued jobs"
|
||||
title={t('header.jobsQueued')}
|
||||
className={`${pill} text-white ${counts.queued ? 'bg-amber-500/70 hover:bg-amber-500/85' : 'bg-black/25 hover:bg-black/35'}`}
|
||||
>
|
||||
<ListOrdered className="h-3.5 w-3.5" />
|
||||
|
||||
@@ -5,6 +5,7 @@ import { favouritesFirst, groupByFamily, rotateToSelected } from 'theme';
|
||||
import * as Dropdown from '@/components/ui/dropdown-menu';
|
||||
import { useTheme, useThemeKeys } from '@/components/ui/ThemeProvider';
|
||||
import { useThemeFavorites } from '@/state/useThemeFavorites';
|
||||
import { useTranslation } from '@/lib/i18n';
|
||||
|
||||
const {
|
||||
DropdownMenu,
|
||||
@@ -32,6 +33,7 @@ const {
|
||||
*/
|
||||
export const ThemeSwitcher = () => {
|
||||
const { theme, themeId, setTheme, themes } = useTheme();
|
||||
const { t } = useTranslation();
|
||||
const { favorites, isFavorite, toggle } = useThemeFavorites();
|
||||
// Declared before the key hook, which needs the toggle: `f` in the list and `ctrl+shift+f` from anywhere.
|
||||
const { open, setOpen, focused, setFocused } = useThemeKeys({ onToggleFavorite: toggle });
|
||||
@@ -50,7 +52,7 @@ export const ThemeSwitcher = () => {
|
||||
*/
|
||||
const ordered = useMemo(() => {
|
||||
const rotated = rotateToSelected(themes, themeId);
|
||||
const listed = onlyFavorites ? rotated.filter((t) => favorites.has(t.id)) : rotated;
|
||||
const listed = onlyFavorites ? rotated.filter((entry) => favorites.has(entry.id)) : rotated;
|
||||
return favouritesFirst(listed, favorites);
|
||||
// `favorites` is a fresh Set each render; its CONTENTS are what matter, so key on those.
|
||||
}, [themes, themeId, onlyFavorites, [...favorites].sort().join(',')]);
|
||||
@@ -62,10 +64,11 @@ export const ThemeSwitcher = () => {
|
||||
<DropdownMenu>
|
||||
<DropdownMenuTrigger asChild>
|
||||
<button
|
||||
title={`Theme: ${theme.name} · ctrl+shift+←/→ cycle · ctrl+shift+space browse · ctrl+shift+f ${
|
||||
isFavorite(themeId) ? 'unstar' : 'star'
|
||||
}`}
|
||||
aria-label={`Theme: ${theme.name}`}
|
||||
title={t('theme.pillTitle', {
|
||||
name: theme.name,
|
||||
starAction: isFavorite(themeId) ? t('theme.unstar') : t('theme.star'),
|
||||
})}
|
||||
aria-label={t('theme.pillLabel', { name: theme.name })}
|
||||
// Named rather than a palette glyph: with 227 themes the one you are wearing is worth
|
||||
// reading at a glance, and an icon cannot say which that is. Same pill as JobsIndicator so
|
||||
// the cluster stays one shape.
|
||||
@@ -89,8 +92,8 @@ export const ThemeSwitcher = () => {
|
||||
<DropdownMenuContent align="end" className="z-50 flex max-h-[70vh] w-64 flex-col overflow-hidden p-0">
|
||||
<div className="shrink-0 border-b border-border px-2 py-1.5">
|
||||
<DropdownMenuLabel className="px-0 py-0 text-xs font-normal leading-relaxed text-muted-foreground">
|
||||
<span className="block">ctrl+shift+←/→ cycle · ctrl+shift+space browse</span>
|
||||
<span className="block">ctrl+? for every shortcut</span>
|
||||
<span className="block">{t('theme.cycleHint')}</span>
|
||||
<span className="block">{t('theme.everyShortcutHint')}</span>
|
||||
</DropdownMenuLabel>
|
||||
<button
|
||||
type="button"
|
||||
@@ -105,35 +108,41 @@ export const ThemeSwitcher = () => {
|
||||
}`}
|
||||
>
|
||||
<Star className={`h-3.5 w-3.5 ${onlyFavorites ? 'fill-current' : ''}`} />
|
||||
{onlyFavorites ? `Favourites only (${favorites.size})` : `Favourites (${favorites.size})`}
|
||||
{onlyFavorites
|
||||
? t('theme.favouritesOnly', { count: favorites.size })
|
||||
: t('theme.favourites', { count: favorites.size })}
|
||||
</button>
|
||||
</div>
|
||||
|
||||
<div className="min-h-0 flex-1 overflow-y-auto p-1">
|
||||
{ordered.length === 0 ? (
|
||||
<p className="px-2 py-6 text-center text-xs text-muted-foreground">
|
||||
No favourites yet — star one with the button on its row.
|
||||
</p>
|
||||
<p className="px-2 py-6 text-center text-xs text-muted-foreground">{t('theme.noFavourites')}</p>
|
||||
) : (
|
||||
families.map(([family, entries]) => (
|
||||
<div key={family}>
|
||||
{entries.map((t) => (
|
||||
<DropdownMenuItem key={t.id} onClick={() => setTheme(t.id)} className="cursor-pointer pr-1">
|
||||
<Check className={`mr-2 h-4 w-4 shrink-0 ${t.id === themeId ? 'opacity-100' : 'opacity-0'}`} />
|
||||
<span className="min-w-0 flex-1 truncate">{t.name}</span>
|
||||
{entries.map((entry) => (
|
||||
<DropdownMenuItem key={entry.id} onClick={() => setTheme(entry.id)} className="cursor-pointer pr-1">
|
||||
<Check
|
||||
className={`mr-2 h-4 w-4 shrink-0 ${entry.id === themeId ? 'opacity-100' : 'opacity-0'}`}
|
||||
/>
|
||||
<span className="min-w-0 flex-1 truncate">{entry.name}</span>
|
||||
{/* A sibling of the row's action, never nested inside it — starring is not choosing. */}
|
||||
<button
|
||||
type="button"
|
||||
aria-label={isFavorite(t.id) ? `Unstar ${t.name}` : `Star ${t.name}`}
|
||||
title={isFavorite(t.id) ? 'Remove from favourites' : 'Add to favourites'}
|
||||
aria-label={
|
||||
isFavorite(entry.id)
|
||||
? t('theme.unstarNamed', { name: entry.name })
|
||||
: t('theme.starNamed', { name: entry.name })
|
||||
}
|
||||
title={isFavorite(entry.id) ? t('theme.removeFromFavourites') : t('theme.addToFavourites')}
|
||||
onClick={(ev) => {
|
||||
ev.preventDefault();
|
||||
ev.stopPropagation();
|
||||
toggle(t.id);
|
||||
toggle(entry.id);
|
||||
}}
|
||||
className="ml-1 shrink-0 rounded p-1 text-muted-foreground hover:text-primary"
|
||||
>
|
||||
<Star className={`h-3.5 w-3.5 ${isFavorite(t.id) ? 'fill-current text-primary' : ''}`} />
|
||||
<Star className={`h-3.5 w-3.5 ${isFavorite(entry.id) ? 'fill-current text-primary' : ''}`} />
|
||||
</button>
|
||||
</DropdownMenuItem>
|
||||
))}
|
||||
@@ -165,22 +174,24 @@ export const ThemeSwitcher = () => {
|
||||
first. Both lists agreeing is the point: "the one below the one I have on" has to mean the
|
||||
same thing in both, or the browse teaches you an order the menu then contradicts. */}
|
||||
<ul className="flex max-h-[70vh] flex-col gap-1 overflow-y-auto">
|
||||
{ordered.map((t) => {
|
||||
const isFocused = t.id === focused;
|
||||
{ordered.map((entry) => {
|
||||
const isFocused = entry.id === focused;
|
||||
return (
|
||||
<li key={t.id}>
|
||||
<li key={entry.id}>
|
||||
<button
|
||||
onMouseEnter={() => setFocused(t.id)}
|
||||
onMouseEnter={() => setFocused(entry.id)}
|
||||
onClick={() => {
|
||||
setTheme(t.id);
|
||||
setTheme(entry.id);
|
||||
setOpen(false);
|
||||
}}
|
||||
className={`flex w-full items-center gap-2 rounded-md px-4 py-1 text-left transition-all cursor-pointer ${
|
||||
isFocused ? 'text-2xl font-extrabold' : 'text-lg opacity-60 hover:opacity-100'
|
||||
}`}
|
||||
>
|
||||
<span className="min-w-0 flex-1 truncate">{t.name}</span>
|
||||
{t.id === themeId && <span className="shrink-0 text-xs opacity-70">active</span>}
|
||||
<span className="min-w-0 flex-1 truncate">{entry.name}</span>
|
||||
{entry.id === themeId && (
|
||||
<span className="shrink-0 text-xs opacity-70">{t('theme.active')}</span>
|
||||
)}
|
||||
{/*
|
||||
A span, not a button: this sits inside the row's own <button>, and a button inside
|
||||
a button is invalid HTML that browsers resolve by dropping one of them. The click
|
||||
@@ -190,18 +201,24 @@ export const ThemeSwitcher = () => {
|
||||
<span
|
||||
role="button"
|
||||
tabIndex={-1}
|
||||
aria-label={isFavorite(t.id) ? `Unstar ${t.name}` : `Star ${t.name}`}
|
||||
title={isFavorite(t.id) ? 'Remove from favourites (f)' : 'Add to favourites (f)'}
|
||||
aria-label={
|
||||
isFavorite(entry.id)
|
||||
? t('theme.unstarNamed', { name: entry.name })
|
||||
: t('theme.starNamed', { name: entry.name })
|
||||
}
|
||||
title={
|
||||
isFavorite(entry.id) ? t('theme.removeFromFavouritesKey') : t('theme.addToFavouritesKey')
|
||||
}
|
||||
onClick={(ev) => {
|
||||
// Or the row's own onClick applies the theme and closes the overlay, which is
|
||||
// the opposite of what starring is for.
|
||||
ev.preventDefault();
|
||||
ev.stopPropagation();
|
||||
toggle(t.id);
|
||||
toggle(entry.id);
|
||||
}}
|
||||
className="shrink-0 rounded p-1 opacity-70 hover:opacity-100"
|
||||
>
|
||||
<Star className={`h-4 w-4 ${isFavorite(t.id) ? 'fill-current' : ''}`} />
|
||||
<Star className={`h-4 w-4 ${isFavorite(entry.id) ? 'fill-current' : ''}`} />
|
||||
</span>
|
||||
</button>
|
||||
</li>
|
||||
@@ -210,9 +227,7 @@ export const ThemeSwitcher = () => {
|
||||
</ul>
|
||||
{/* Always visible: it sits outside the scroll box above, for the same reason the dropdown's
|
||||
header does. */}
|
||||
<p className="mt-6 text-center text-xs opacity-60">
|
||||
j/k or ↑/↓ move · l or → preview · f star · h or ← reset · enter keep · esc cancel
|
||||
</p>
|
||||
<p className="mt-6 text-center text-xs opacity-60">{t('theme.browseHint')}</p>
|
||||
</div>
|
||||
</div>,
|
||||
document.body,
|
||||
|
||||
@@ -27,13 +27,13 @@ export function UserMenu() {
|
||||
<DropdownMenuContent align="end" className="z-10 w-48">
|
||||
<DropdownMenuItem asChild className="cursor-pointer">
|
||||
<Link to="/settings/profile">
|
||||
<User className="mr-2 h-4 w-4" />
|
||||
<User className="me-2 h-4 w-4" />
|
||||
{t('header.userMenu.profile')}
|
||||
</Link>
|
||||
</DropdownMenuItem>
|
||||
<DropdownMenuItem asChild className="cursor-pointer">
|
||||
<Link to="/settings/system">
|
||||
<Settings className="mr-2 h-4 w-4" />
|
||||
<Settings className="me-2 h-4 w-4" />
|
||||
{t('header.userMenu.systemSettings')}
|
||||
</Link>
|
||||
</DropdownMenuItem>
|
||||
@@ -42,14 +42,14 @@ export function UserMenu() {
|
||||
(navigation-audit M8.) */}
|
||||
<DropdownMenuItem asChild className="cursor-pointer">
|
||||
<Link to="/settings/ai">
|
||||
<Bot className="mr-2 h-4 w-4" />
|
||||
AI
|
||||
<Bot className="me-2 h-4 w-4" />
|
||||
{t('header.userMenu.ai')}
|
||||
</Link>
|
||||
</DropdownMenuItem>
|
||||
<DropdownMenuItem asChild className="cursor-pointer">
|
||||
<Link to="/settings/integrations">
|
||||
<Puzzle className="mr-2 h-4 w-4" />
|
||||
Integrations
|
||||
<Puzzle className="me-2 h-4 w-4" />
|
||||
{t('header.userMenu.integrations')}
|
||||
</Link>
|
||||
</DropdownMenuItem>
|
||||
{/* Owner only. This is tidiness, not access control — the route stays reachable and its
|
||||
@@ -58,15 +58,15 @@ export function UserMenu() {
|
||||
{user?.role === 'Super Admin' && (
|
||||
<DropdownMenuItem asChild className="cursor-pointer">
|
||||
<Link to="/settings/user-management">
|
||||
<UserCog className="mr-2 h-4 w-4" />
|
||||
User Management
|
||||
<UserCog className="me-2 h-4 w-4" />
|
||||
{t('header.userMenu.userManagement')}
|
||||
</Link>
|
||||
</DropdownMenuItem>
|
||||
)}
|
||||
<DropdownMenuSeparator />
|
||||
<DropdownMenuItem asChild className="cursor-pointer">
|
||||
<Link to="/auth/signout">
|
||||
<LogOut className="mr-2 h-4 w-4" />
|
||||
<LogOut className="me-2 h-4 w-4" />
|
||||
{t('header.userMenu.signOut')}
|
||||
</Link>
|
||||
</DropdownMenuItem>
|
||||
|
||||
@@ -4,9 +4,29 @@ import { useQueryClient } from '@tanstack/react-query';
|
||||
import { toast } from 'sonner';
|
||||
import { useClient } from 'hooks/useClient';
|
||||
import { usePermissions } from 'hooks/usePermissions';
|
||||
import { useTranslation, type AppTranslationKey } from '@/lib/i18n';
|
||||
|
||||
type RescanResponse = { ok: boolean; counts: Record<string, number> };
|
||||
|
||||
/**
|
||||
* One key per counted noun rather than one sentence with six numbers in it.
|
||||
*
|
||||
* Each noun pluralizes on its own count — English needs it for `1 task` vs `2 tasks`, and a locale with
|
||||
* more than two categories needs it for every value. Assembling the sentence in code and translating only
|
||||
* the frame would have hardcoded English plural rules into the frame.
|
||||
*
|
||||
* Spelled out as literal pairs rather than built from the count name: a key assembled at runtime defeats
|
||||
* the type checker and cannot be grepped (see the key naming convention in docs/localization.md).
|
||||
*/
|
||||
const RESCAN_COUNTS: readonly (readonly [string, AppTranslationKey])[] = [
|
||||
['tasks', 'rescan.counts.tasks'],
|
||||
['agents', 'rescan.counts.agents'],
|
||||
['tools', 'rescan.counts.tools'],
|
||||
['skills', 'rescan.counts.skills'],
|
||||
['processes', 'rescan.counts.processes'],
|
||||
['affordances', 'rescan.counts.affordances'],
|
||||
];
|
||||
|
||||
// Item query caches the header refreshes after a rescan (matches the queryKeys used by the
|
||||
// Automation and Capability pages).
|
||||
const ITEM_QUERY_KEYS = ['tasks', 'task-categories', 'skills', 'tools', 'processes', 'agents', 'agent-categories'];
|
||||
@@ -15,6 +35,7 @@ export function RescanButton() {
|
||||
const client = useClient();
|
||||
const qc = useQueryClient();
|
||||
const { can } = usePermissions();
|
||||
const { t } = useTranslation();
|
||||
const [loading, setLoading] = useState(false);
|
||||
|
||||
// `POST /api/rescan` belongs to the `items` capability — skills, tools, agents and processes on the
|
||||
@@ -32,32 +53,28 @@ export function RescanButton() {
|
||||
// you next open that page. This refreshes every item cache immediately, wherever you press it.
|
||||
await Promise.all(ITEM_QUERY_KEYS.map((key) => qc.invalidateQueries({ queryKey: [key], refetchType: 'all' })));
|
||||
const c = res.counts ?? {};
|
||||
toast.success(
|
||||
`Rescanned items — ${c.tasks ?? 0} tasks, ${c.agents ?? 0} agents, ${c.tools ?? 0} tools, ${c.skills ?? 0} skills, ${c.processes ?? 0} processes, ${c.affordances ?? 0} affordances`,
|
||||
{
|
||||
// Two things said here rather than left to be discovered.
|
||||
//
|
||||
// A rescan cannot reach a chat that is already open — its system prompt was assembled when it
|
||||
// started. And a SKILL.md with no `description` is COUNTED as a skill but never offered to an
|
||||
// agent, because the loader skips it: a line that does not say when to reach for something
|
||||
// costs context in every conversation and earns nothing. So a skill can be present, listed and
|
||||
// editable while being invisible to every agent, and the only symptom is two numbers
|
||||
// disagreeing where nobody is comparing them.
|
||||
description:
|
||||
[
|
||||
c.affordances || c.skillsOffered
|
||||
? 'Applies to new chats — an open one keeps what it started with.'
|
||||
: null,
|
||||
typeof c.skills === 'number' && typeof c.skillsOffered === 'number' && c.skillsOffered < c.skills
|
||||
? `${c.skills - c.skillsOffered} skill(s) have no description, so no agent is offered them.`
|
||||
: null,
|
||||
]
|
||||
.filter(Boolean)
|
||||
.join(' ') || undefined,
|
||||
},
|
||||
);
|
||||
const summary = RESCAN_COUNTS.map(([noun, key]) => t(key, { count: c[noun] ?? 0 })).join(', ');
|
||||
toast.success(t('rescan.done', { summary }), {
|
||||
// Two things said here rather than left to be discovered.
|
||||
//
|
||||
// A rescan cannot reach a chat that is already open — its system prompt was assembled when it
|
||||
// started. And a SKILL.md with no `description` is COUNTED as a skill but never offered to an
|
||||
// agent, because the loader skips it: a line that does not say when to reach for something
|
||||
// costs context in every conversation and earns nothing. So a skill can be present, listed and
|
||||
// editable while being invisible to every agent, and the only symptom is two numbers
|
||||
// disagreeing where nobody is comparing them.
|
||||
description:
|
||||
[
|
||||
c.affordances || c.skillsOffered ? t('rescan.newChatsOnly') : null,
|
||||
typeof c.skills === 'number' && typeof c.skillsOffered === 'number' && c.skillsOffered < c.skills
|
||||
? t('rescan.noDescription', { count: c.skills - c.skillsOffered })
|
||||
: null,
|
||||
]
|
||||
.filter(Boolean)
|
||||
.join(' ') || undefined,
|
||||
});
|
||||
} catch {
|
||||
toast.error('Failed to rescan items');
|
||||
toast.error(t('rescan.failed'));
|
||||
} finally {
|
||||
setLoading(false);
|
||||
}
|
||||
@@ -68,8 +85,8 @@ export function RescanButton() {
|
||||
onClick={rescan}
|
||||
disabled={loading}
|
||||
className="flex h-8 w-8 items-center justify-center rounded-full bg-black/20 text-duck-dark transition-transform hover:scale-110 disabled:opacity-50"
|
||||
aria-label="Rescan items"
|
||||
title="Rescan officer-items (apply changes without restarting)"
|
||||
aria-label={t('rescan.label')}
|
||||
title={t('rescan.title')}
|
||||
>
|
||||
<RotateCw size={16} className={loading ? 'animate-spin' : ''} />
|
||||
</button>
|
||||
|
||||
@@ -4,6 +4,7 @@ import { useQueryClient } from '@tanstack/react-query';
|
||||
import { AlertTriangle } from 'lucide-react';
|
||||
import { useClient } from 'hooks/useClient';
|
||||
import { Button } from '@/components/ui/button';
|
||||
import { useTranslation } from '@/lib/i18n';
|
||||
|
||||
type ScreenErrorFallbackProps = { error: Error; reset: () => void };
|
||||
|
||||
@@ -18,6 +19,7 @@ type ScreenErrorFallbackProps = { error: Error; reset: () => void };
|
||||
export const ScreenErrorFallback = ({ error, reset }: ScreenErrorFallbackProps) => {
|
||||
const client = useClient();
|
||||
const queryClient = useQueryClient();
|
||||
const { t } = useTranslation();
|
||||
const [confirming, setConfirming] = useState(false);
|
||||
const [resetting, setResetting] = useState(false);
|
||||
|
||||
@@ -46,36 +48,34 @@ export const ScreenErrorFallback = ({ error, reset }: ScreenErrorFallbackProps)
|
||||
<div className="flex items-start gap-3">
|
||||
<AlertTriangle className="mt-1 size-6 shrink-0 text-amber-500" />
|
||||
<div className="space-y-1">
|
||||
<h1 className="text-xl font-semibold">This screen failed to render</h1>
|
||||
<p className="text-muted-foreground text-sm">
|
||||
Nothing was lost — this is a display failure, not a data one. Agent transcripts, jobs and files are
|
||||
untouched.
|
||||
</p>
|
||||
<h1 className="text-xl font-semibold">{t('screenError.title')}</h1>
|
||||
<p className="text-muted-foreground text-sm">{t('screenError.description')}</p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<details className="bg-muted/40 rounded-md border p-3 text-sm">
|
||||
<summary className="cursor-pointer select-none font-medium">{error.message || 'Unknown error'}</summary>
|
||||
<summary className="cursor-pointer select-none font-medium">
|
||||
{error.message || t('screenError.unknownError')}
|
||||
</summary>
|
||||
<pre className="mt-2 max-h-64 overflow-auto whitespace-pre-wrap text-xs opacity-70">{error.stack}</pre>
|
||||
</details>
|
||||
|
||||
<div className="flex flex-wrap gap-2">
|
||||
<Button onClick={reset}>Try again</Button>
|
||||
<Button onClick={reset}>{t('screenError.tryAgain')}</Button>
|
||||
<Button variant="secondary" onClick={() => window.location.reload()}>
|
||||
Reload
|
||||
{t('screenError.reload')}
|
||||
</Button>
|
||||
<Button variant="secondary" asChild>
|
||||
<Link to="/">Go home</Link>
|
||||
<Link to="/">{t('screenError.goHome')}</Link>
|
||||
</Button>
|
||||
</div>
|
||||
|
||||
<div className="space-y-2 border-t pt-4">
|
||||
<p className="text-muted-foreground text-sm">
|
||||
If it fails again in the same place, a saved panel layout is the usual cause. Resetting puts every screen's
|
||||
panes back to their defaults. <strong>Your dashboards are not touched.</strong>
|
||||
{t('screenError.resetHint')} <strong>{t('screenError.dashboardsSafe')}</strong>
|
||||
</p>
|
||||
<Button variant={confirming ? 'destructive' : 'outline'} disabled={resetting} onClick={resetScreenLayouts}>
|
||||
{resetting ? 'Resetting…' : confirming ? 'Yes — reset every screen layout' : 'Reset screen layouts'}
|
||||
{resetting ? t('screenError.resetting') : confirming ? t('screenError.resetConfirm') : t('screenError.reset')}
|
||||
</Button>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
import { useEffect, useState } from 'react';
|
||||
import { Keyboard } from 'lucide-react';
|
||||
import { isShortcutsChord, SHORTCUT_SECTIONS } from '@/state/shortcuts';
|
||||
import { useTranslation } from '@/lib/i18n';
|
||||
|
||||
/*
|
||||
`Ctrl+?` — every shortcut the shell owns, on one screen.
|
||||
@@ -27,6 +28,7 @@ const Row = ({ keys, description }: { keys: string; description: string }) => (
|
||||
|
||||
export const ShortcutsModal = () => {
|
||||
const [open, setOpen] = useState(false);
|
||||
const { t } = useTranslation();
|
||||
|
||||
useEffect(() => {
|
||||
const onKey = (ev: KeyboardEvent) => {
|
||||
@@ -57,19 +59,23 @@ export const ShortcutsModal = () => {
|
||||
>
|
||||
<div className="flex shrink-0 items-center gap-2 border-b border-border px-5 py-3">
|
||||
<Keyboard className="h-4 w-4 text-muted-foreground" />
|
||||
<h2 className="text-sm font-semibold">Keyboard shortcuts</h2>
|
||||
<span className="ml-auto text-xs text-muted-foreground">Ctrl+? · Esc to close</span>
|
||||
<h2 className="text-sm font-semibold">{t('shortcutsModal.title')}</h2>
|
||||
<span className="ms-auto text-xs text-muted-foreground">{t('shortcutsModal.hint')}</span>
|
||||
</div>
|
||||
|
||||
{/* Only this scrolls — the header stays, for the same reason the theme dropdown's does. */}
|
||||
<div className="grid min-h-0 flex-1 gap-5 overflow-y-auto p-5 sm:grid-cols-2">
|
||||
{SHORTCUT_SECTIONS.map((section) => (
|
||||
<section key={section.title} className="rounded-xl border border-border bg-muted/20 p-4">
|
||||
<h3 className="text-xs font-semibold uppercase tracking-wide text-foreground/80">{section.title}</h3>
|
||||
{section.note && <p className="mt-1 text-[11px] leading-snug text-muted-foreground">{section.note}</p>}
|
||||
<section key={section.titleKey} className="rounded-xl border border-border bg-muted/20 p-4">
|
||||
<h3 className="text-xs font-semibold uppercase tracking-wide text-foreground/80">
|
||||
{t(section.titleKey)}
|
||||
</h3>
|
||||
{section.noteKey && (
|
||||
<p className="mt-1 text-[11px] leading-snug text-muted-foreground">{t(section.noteKey)}</p>
|
||||
)}
|
||||
<div className="mt-2">
|
||||
{section.shortcuts.map((shortcut) => (
|
||||
<Row key={shortcut.keys} keys={shortcut.keys} description={shortcut.description} />
|
||||
<Row key={shortcut.keys} keys={shortcut.keys} description={t(shortcut.descriptionKey)} />
|
||||
))}
|
||||
</div>
|
||||
</section>
|
||||
|
||||
@@ -3,6 +3,7 @@ import { useNavigate } from 'react-router';
|
||||
import { Search } from 'lucide-react';
|
||||
import { rank } from './match';
|
||||
import { useSpotlightItems, type SpotlightItem } from './useSpotlightItems';
|
||||
import { useTranslation } from '@/lib/i18n';
|
||||
|
||||
// Spotlight: type a few letters, go somewhere.
|
||||
//
|
||||
@@ -181,6 +182,7 @@ export const Spotlight = () => {
|
||||
const inputRef = useRef<HTMLInputElement | null>(null);
|
||||
const navigate = useNavigate();
|
||||
const items = useSpotlightItems();
|
||||
const { t } = useTranslation();
|
||||
|
||||
const results = useMemo(() => rank(items, query), [items, query]);
|
||||
|
||||
@@ -287,14 +289,14 @@ export const Spotlight = () => {
|
||||
ref={inputRef}
|
||||
value={query}
|
||||
onChange={(ev) => setQuery(ev.target.value)}
|
||||
placeholder="Go to…"
|
||||
placeholder={t('spotlight.placeholder')}
|
||||
className="w-full bg-transparent py-4 text-base text-foreground outline-none placeholder:text-muted-foreground"
|
||||
/>
|
||||
</div>
|
||||
|
||||
<div className="max-h-[60vh] overflow-y-auto p-2">
|
||||
{results.length === 0 ? (
|
||||
<p className="px-3 py-6 text-center text-sm text-muted-foreground">Nothing matches “{query}”.</p>
|
||||
<p className="px-3 py-6 text-center text-sm text-muted-foreground">{t('spotlight.noResults', { query })}</p>
|
||||
) : (
|
||||
results.map((result, i) => (
|
||||
<Row
|
||||
|
||||
@@ -9,7 +9,6 @@ import {
|
||||
LayoutGrid,
|
||||
Lock,
|
||||
Mail,
|
||||
Mic,
|
||||
ScanText,
|
||||
ShieldCheck,
|
||||
Sparkles,
|
||||
@@ -19,7 +18,8 @@ import {
|
||||
Wrench,
|
||||
} from 'lucide-react';
|
||||
import { usePermissions } from 'hooks/usePermissions';
|
||||
import { CORE_DOCK_ITEMS, dockItemsFromPlugins } from '../Dock';
|
||||
import { useTranslation, type AppTranslationKey } from '@/lib/i18n';
|
||||
import { useDockItems } from '../Dock';
|
||||
|
||||
// What Spotlight can take you to.
|
||||
//
|
||||
@@ -40,6 +40,7 @@ import { CORE_DOCK_ITEMS, dockItemsFromPlugins } from '../Dock';
|
||||
export type SpotlightItem = {
|
||||
/** Stable across renders — used as the React key and for the recency store. */
|
||||
id: string;
|
||||
/** Resolved for the active locale, because `rank()` matches what the reader can actually see. */
|
||||
label: string;
|
||||
/** Where it goes. Matched against `canVisit` for anything not already filtered. */
|
||||
to: string;
|
||||
@@ -78,64 +79,136 @@ export type SpotlightItem = {
|
||||
* `hint` is what makes them findable — typing "keys" should reach the API keys screen, and the label alone
|
||||
* does not say where it lives.
|
||||
*/
|
||||
const SETTINGS_ITEMS: SpotlightItem[] = [
|
||||
type SettingsItem = Omit<SpotlightItem, 'label' | 'hint'> & {
|
||||
labelKey: AppTranslationKey;
|
||||
hintKey?: AppTranslationKey;
|
||||
};
|
||||
|
||||
const SETTINGS_ITEMS: SettingsItem[] = [
|
||||
// Profile — ProfileSettings/index.tsx
|
||||
{ id: 'set:profile', label: 'Profile', to: '/settings/profile', hint: 'avatar, name, email', icon: User },
|
||||
{ id: 'set:password', label: 'Change password', to: '/settings/profile/change-password', icon: Lock },
|
||||
{
|
||||
id: 'set:profile',
|
||||
labelKey: 'settings.sections.profile.label',
|
||||
to: '/settings/profile',
|
||||
hintKey: 'settings.sections.profile.hint',
|
||||
icon: User,
|
||||
},
|
||||
{
|
||||
id: 'set:password',
|
||||
labelKey: 'settings.sections.changePassword.label',
|
||||
to: '/settings/profile/change-password',
|
||||
icon: Lock,
|
||||
},
|
||||
{
|
||||
id: 'set:api-keys',
|
||||
label: 'API keys',
|
||||
labelKey: 'settings.sections.apiKeys.label',
|
||||
to: '/settings/profile/api-keys',
|
||||
hint: 'keys that sign in as you',
|
||||
hintKey: 'settings.sections.apiKeys.hint',
|
||||
icon: KeyRound,
|
||||
},
|
||||
{
|
||||
id: 'set:languages',
|
||||
label: 'Languages',
|
||||
labelKey: 'settings.sections.languages.label',
|
||||
to: '/settings/profile/languages',
|
||||
hint: 'spoken and translation',
|
||||
hintKey: 'settings.sections.languages.hint',
|
||||
icon: Globe,
|
||||
},
|
||||
{ id: 'set:voice', label: 'Voice', to: '/settings/profile/voice', hint: 'text-to-speech', icon: Volume2 },
|
||||
{ id: 'set:dock', label: 'Dock', to: '/settings/profile/dock', hint: 'choose and reorder', icon: LayoutGrid },
|
||||
{
|
||||
id: 'set:voice',
|
||||
labelKey: 'settings.sections.voice.label',
|
||||
to: '/settings/profile/voice',
|
||||
hintKey: 'settings.sections.voice.hint',
|
||||
icon: Volume2,
|
||||
},
|
||||
{
|
||||
id: 'set:dock',
|
||||
labelKey: 'settings.sections.dock.label',
|
||||
to: '/settings/profile/dock',
|
||||
hintKey: 'settings.sections.dock.hint',
|
||||
icon: LayoutGrid,
|
||||
},
|
||||
// AI — AISettings.tsx
|
||||
{ id: 'set:ai-my-models', label: 'My Models', to: '/settings/ai/my-models', icon: Sparkles },
|
||||
{ id: 'set:ai-channel-models', label: 'Channel Models', to: '/settings/ai/member-models', icon: Sparkles },
|
||||
{ id: 'set:ai-default-models', label: 'Default Models', to: '/settings/ai/default-models', icon: Sparkles },
|
||||
{ id: 'set:ai-harnesses', label: 'Providers', to: '/settings/ai/ai-harnesses', hint: 'harnesses', icon: Bot },
|
||||
{
|
||||
id: 'set:ai-my-models',
|
||||
labelKey: 'settings.sections.myModels.label',
|
||||
to: '/settings/ai/my-models',
|
||||
icon: Sparkles,
|
||||
},
|
||||
{
|
||||
id: 'set:ai-channel-models',
|
||||
labelKey: 'settings.sections.channelModels.label',
|
||||
to: '/settings/ai/member-models',
|
||||
icon: Sparkles,
|
||||
},
|
||||
{
|
||||
id: 'set:ai-default-models',
|
||||
labelKey: 'settings.sections.defaultModels.label',
|
||||
to: '/settings/ai/default-models',
|
||||
icon: Sparkles,
|
||||
},
|
||||
{
|
||||
id: 'set:ai-harnesses',
|
||||
labelKey: 'settings.sections.providers.label',
|
||||
to: '/settings/ai/ai-harnesses',
|
||||
hintKey: 'settings.sections.providers.hint',
|
||||
icon: Bot,
|
||||
},
|
||||
// System — SystemSettings.tsx
|
||||
{ id: 'set:tts', label: 'Text to Speech', to: '/settings/system/tts', icon: Volume2 },
|
||||
{ id: 'set:stt', label: 'Speech to Text', to: '/settings/system/stt', icon: Mic },
|
||||
{ id: 'set:ocr', label: 'OCR', to: '/settings/system/ocr', icon: ScanText },
|
||||
{ id: 'set:tts', labelKey: 'settings.sections.tts.label', to: '/settings/system/tts', icon: Volume2 },
|
||||
{ id: 'set:ocr', labelKey: 'settings.sections.ocr.label', to: '/settings/system/ocr', icon: ScanText },
|
||||
{
|
||||
id: 'set:maintenance',
|
||||
label: 'Rebuild & restart',
|
||||
labelKey: 'settings.sections.maintenance.label',
|
||||
to: '/settings/system/maintenance',
|
||||
hint: 'maintenance',
|
||||
hintKey: 'settings.sections.maintenance.hint',
|
||||
icon: Cpu,
|
||||
},
|
||||
{ id: 'set:smtp', label: 'SMTP', to: '/settings/system/smtp', hint: 'outgoing mail', icon: Mail },
|
||||
{
|
||||
id: 'set:smtp',
|
||||
labelKey: 'settings.sections.smtp.label',
|
||||
to: '/settings/system/smtp',
|
||||
hintKey: 'settings.sections.smtp.hint',
|
||||
icon: Mail,
|
||||
},
|
||||
// Integrations — IntegrationsSettings
|
||||
{ id: 'set:google-oauth', label: 'Google OAuth', to: '/settings/integrations/google-oauth', icon: KeyRound },
|
||||
{ id: 'set:apify', label: 'Apify', to: '/settings/integrations/apify', icon: Wrench },
|
||||
{
|
||||
id: 'set:google-oauth',
|
||||
labelKey: 'settings.sections.googleOauth.label',
|
||||
to: '/settings/integrations/google-oauth',
|
||||
icon: KeyRound,
|
||||
},
|
||||
{ id: 'set:apify', labelKey: 'settings.sections.apify.label', to: '/settings/integrations/apify', icon: Wrench },
|
||||
{
|
||||
id: 'set:dav',
|
||||
label: 'Calendar & Contacts sync',
|
||||
labelKey: 'settings.sections.davSync.label',
|
||||
to: '/settings/integrations/dav-app-passwords',
|
||||
hint: 'app passwords',
|
||||
hintKey: 'settings.sections.davSync.hint',
|
||||
icon: CalendarDays,
|
||||
},
|
||||
// Users — UserManagement
|
||||
{ id: 'set:users', label: 'Accounts', to: '/settings/user-management/users', hint: 'users', icon: Users },
|
||||
{ id: 'set:permissions', label: 'Permissions', to: '/settings/user-management/permissions', icon: ShieldCheck },
|
||||
{
|
||||
id: 'set:users',
|
||||
labelKey: 'settings.sections.accounts.label',
|
||||
to: '/settings/user-management/users',
|
||||
hintKey: 'settings.sections.accounts.hint',
|
||||
icon: Users,
|
||||
},
|
||||
{
|
||||
id: 'set:permissions',
|
||||
labelKey: 'settings.sections.permissions.label',
|
||||
to: '/settings/user-management/permissions',
|
||||
icon: ShieldCheck,
|
||||
},
|
||||
];
|
||||
|
||||
/** Everything Spotlight can offer this account, in a stable order. */
|
||||
export function useSpotlightItems(): SpotlightItem[] {
|
||||
const { canVisit, plugins } = usePermissions();
|
||||
const { t } = useTranslation();
|
||||
const dockItems = useDockItems(plugins);
|
||||
|
||||
return useMemo(() => {
|
||||
const fromDock: SpotlightItem[] = [...CORE_DOCK_ITEMS, ...dockItemsFromPlugins(plugins)]
|
||||
const fromDock: SpotlightItem[] = dockItems
|
||||
.filter((item) => canVisit(item.to))
|
||||
.map((item) => ({
|
||||
id: `nav:${item.to}`,
|
||||
@@ -149,8 +222,14 @@ export function useSpotlightItems(): SpotlightItem[] {
|
||||
|
||||
// Settings go through `canVisit` too. `usePermissions` fails OPEN by design — hiding a door is a
|
||||
// courtesy and the 403 is the lock — so this cannot lock anyone out of their own settings.
|
||||
const settings = SETTINGS_ITEMS.filter((item) => canVisit(item.to));
|
||||
const settings: SpotlightItem[] = SETTINGS_ITEMS.filter((item) => canVisit(item.to)).map(
|
||||
({ labelKey, hintKey, ...item }) => ({
|
||||
...item,
|
||||
label: t(labelKey),
|
||||
...(hintKey ? { hint: t(hintKey) } : {}),
|
||||
}),
|
||||
);
|
||||
|
||||
return [...fromDock, ...settings];
|
||||
}, [canVisit, plugins]);
|
||||
}, [canVisit, dockItems, t]);
|
||||
}
|
||||
|
||||
@@ -1,20 +0,0 @@
|
||||
import type { LayoutNode } from 'officerdev';
|
||||
import { WorkspaceView } from 'officerdev';
|
||||
import { useDashboardState } from 'state/useDashboardState';
|
||||
import { defaultLayout } from './defaultLayout';
|
||||
|
||||
// /minesweeper — Minesweeper X running under wine on a virtual display, streamed over RFB.
|
||||
//
|
||||
// The pixels arrive through /api/minesweeper/ws, which is a byte relay onto x11vnc's own TCP socket on
|
||||
// loopback — the same shape as the terminal's relay onto the pty sidecar, and the reason this works at
|
||||
// all where `plugins/desktop` could not: a websocket provider is a platform concern, and a plugin
|
||||
// cannot claim one.
|
||||
//
|
||||
// Owner-only, and not because a game is dangerous: wine runs as the server owner, so the game's menus
|
||||
// are file dialogs with the owner's home behind them.
|
||||
|
||||
export const MinesweeperScreen = () => {
|
||||
const workspace = useDashboardState<LayoutNode>('screens/minesweeper', defaultLayout);
|
||||
|
||||
return <WorkspaceView workspace={workspace} locked appTypes={{ allowed: ['minesweeper'], fallback: 'minesweeper' }} />;
|
||||
};
|
||||
@@ -1,9 +0,0 @@
|
||||
import type { LayoutNode } from 'officerdev';
|
||||
|
||||
// One panel. The board is 152x214 and there is nothing to put beside it — a split here would be a
|
||||
// second panel of empty space.
|
||||
export const defaultLayout: LayoutNode = {
|
||||
type: 'panel',
|
||||
id: 'minesweeper',
|
||||
appType: 'minesweeper',
|
||||
};
|
||||
@@ -1 +0,0 @@
|
||||
export * from './MinesweeperScreen';
|
||||
@@ -4,8 +4,10 @@ import { KeyRound } from 'lucide-react';
|
||||
import { Button } from '@/components/ui/button';
|
||||
import { Card } from '@/components/Card';
|
||||
import { useAuth } from 'hooks/useAuth';
|
||||
import { useTranslation } from '@/lib/i18n';
|
||||
|
||||
export const PasskeyGate = () => {
|
||||
const { t } = useTranslation();
|
||||
const { user, createPasskeyCredentials } = useAuth();
|
||||
const [isRegistering, setIsRegistering] = useState(false);
|
||||
|
||||
@@ -31,7 +33,7 @@ export const PasskeyGate = () => {
|
||||
<KeyRound className="h-8 w-8 text-duck-teal" />
|
||||
</div>
|
||||
|
||||
<h2 className="text-2xl font-bold text-duck-dark">Set up your passkey</h2>
|
||||
<h2 className="text-2xl font-bold text-duck-dark">{t('passkeyGate.setUp')}</h2>
|
||||
|
||||
<p className="text-duck-dark/70">
|
||||
Passkeys provide a secure, passwordless way to access your account. Each device or browser needs its own
|
||||
|
||||
@@ -11,6 +11,7 @@ import { SettingsRoute, createSettingsPanelComponents, type SettingsSectionGroup
|
||||
import { useSettings } from 'state/useSettings';
|
||||
import type { UserSettings } from 'state/useSettings';
|
||||
import { useModels, useVisibleModels, modelKey, getProviderDisplayName, type ModelOption } from 'state/useModels';
|
||||
import { useTranslation } from '@/lib/i18n';
|
||||
import { useAccessPolicy } from 'state/useAccessPolicy';
|
||||
import { useUserState } from 'state/useUserState';
|
||||
import { AIHarnessesSection } from './ServerSettings/AIHarnessesSection';
|
||||
@@ -104,6 +105,7 @@ const DropZone = ({ label, children, onDrop }: DropZoneProps) => {
|
||||
// --- My Models Section (per-user hidden models) ---
|
||||
|
||||
function MyModelsSection() {
|
||||
const { t } = useTranslation();
|
||||
const { settings, saveSettings } = useSettings();
|
||||
const visibleModels = useModels();
|
||||
const [activeProvider, setActiveProvider] = useUserState<string>('my-models-provider', '');
|
||||
@@ -174,11 +176,7 @@ function MyModelsSection() {
|
||||
}, []);
|
||||
|
||||
if (providerGroups.length === 0) {
|
||||
return (
|
||||
<p className="text-sm text-duck-dark/40 dark:text-foreground/40">
|
||||
No models available. Configure API keys in Providers.
|
||||
</p>
|
||||
);
|
||||
return <p className="text-sm text-duck-dark/40 dark:text-foreground/40">{t('settings.ai.noModels')}</p>;
|
||||
}
|
||||
|
||||
return (
|
||||
@@ -199,9 +197,9 @@ function MyModelsSection() {
|
||||
))}
|
||||
</div>
|
||||
|
||||
<DropZone label="Visible" onDrop={showModel}>
|
||||
<DropZone label={t('settings.ai.visible')} onDrop={showModel}>
|
||||
{shown.length === 0 && (
|
||||
<span className="text-xs text-duck-dark/30 dark:text-foreground/30 py-1">Drag models here to show</span>
|
||||
<span className="text-xs text-duck-dark/30 dark:text-foreground/30 py-1">{t('settings.ai.dragToShow')}</span>
|
||||
)}
|
||||
{shown.map((m) => (
|
||||
<ModelPill
|
||||
@@ -215,9 +213,9 @@ function MyModelsSection() {
|
||||
))}
|
||||
</DropZone>
|
||||
|
||||
<DropZone label="Hidden" onDrop={hideModel}>
|
||||
<DropZone label={t('settings.ai.hidden')} onDrop={hideModel}>
|
||||
{hidden.length === 0 && (
|
||||
<span className="text-xs text-duck-dark/30 dark:text-foreground/30 py-1">All models visible</span>
|
||||
<span className="text-xs text-duck-dark/30 dark:text-foreground/30 py-1">{t('settings.ai.allVisible')}</span>
|
||||
)}
|
||||
{hidden.map((m) => (
|
||||
<ModelPill
|
||||
@@ -237,6 +235,7 @@ function MyModelsSection() {
|
||||
// --- Member Models Section (system-wide policy, admin only) ---
|
||||
|
||||
function MemberModelsSection() {
|
||||
const { t } = useTranslation();
|
||||
const client = useClient();
|
||||
const queryClient = useQueryClient();
|
||||
const { policy, savePolicy } = useAccessPolicy();
|
||||
@@ -249,9 +248,9 @@ function MemberModelsSection() {
|
||||
try {
|
||||
await client.post('/server-settings/chat-providers/local-providers/refresh');
|
||||
queryClient.invalidateQueries({ queryKey: ['CHAT_MODELS'] });
|
||||
toast.success('Models refreshed');
|
||||
toast.success(t('settings.ai.refreshed'));
|
||||
} catch {
|
||||
toast.error('Failed to refresh models');
|
||||
toast.error(t('settings.ai.refreshFailed'));
|
||||
} finally {
|
||||
setRefreshing(false);
|
||||
}
|
||||
@@ -325,11 +324,7 @@ function MemberModelsSection() {
|
||||
}, []);
|
||||
|
||||
if (providerGroups.length === 0) {
|
||||
return (
|
||||
<p className="text-sm text-duck-dark/40 dark:text-foreground/40">
|
||||
No models available. Configure API keys in Providers.
|
||||
</p>
|
||||
);
|
||||
return <p className="text-sm text-duck-dark/40 dark:text-foreground/40">{t('settings.ai.noModels')}</p>;
|
||||
}
|
||||
|
||||
return (
|
||||
@@ -353,15 +348,17 @@ function MemberModelsSection() {
|
||||
onClick={refreshModels}
|
||||
disabled={refreshing}
|
||||
className="ml-auto p-1.5 rounded hover:bg-duck-teal/10 cursor-pointer transition-colors disabled:opacity-30"
|
||||
title="Refresh models from providers"
|
||||
title={t('settings.ai.refresh')}
|
||||
>
|
||||
<RefreshCw className={`h-3.5 w-3.5 text-duck-teal ${refreshing ? 'animate-spin' : ''}`} />
|
||||
</button>
|
||||
</div>
|
||||
|
||||
<DropZone label="Enabled" onDrop={enableModel}>
|
||||
<DropZone label={t('settings.ai.enabled')} onDrop={enableModel}>
|
||||
{enabled.length === 0 && (
|
||||
<span className="text-xs text-duck-dark/30 dark:text-foreground/30 py-1">Drag models here to enable</span>
|
||||
<span className="text-xs text-duck-dark/30 dark:text-foreground/30 py-1">
|
||||
{t('settings.ai.dragToEnable')}
|
||||
</span>
|
||||
)}
|
||||
{enabled.map((m) => (
|
||||
<ModelPill
|
||||
@@ -375,9 +372,9 @@ function MemberModelsSection() {
|
||||
))}
|
||||
</DropZone>
|
||||
|
||||
<DropZone label="Disabled" onDrop={disableModel}>
|
||||
<DropZone label={t('settings.ai.disabled')} onDrop={disableModel}>
|
||||
{disabled.length === 0 && (
|
||||
<span className="text-xs text-duck-dark/30 dark:text-foreground/30 py-1">All models enabled</span>
|
||||
<span className="text-xs text-duck-dark/30 dark:text-foreground/30 py-1">{t('settings.ai.allEnabled')}</span>
|
||||
)}
|
||||
{disabled.map((m) => (
|
||||
<ModelPill
|
||||
@@ -410,49 +407,49 @@ function MemberModelsSection() {
|
||||
function useAISettingsGroups(): SettingsSectionGroup[] {
|
||||
return useMemo(() => {
|
||||
const modelsGroup: SettingsSectionGroup = {
|
||||
label: 'Models',
|
||||
labelKey: 'settings.groups.models',
|
||||
icon: Eye,
|
||||
sections: [
|
||||
{
|
||||
key: 'my-models',
|
||||
icon: Eye,
|
||||
title: 'My Models',
|
||||
description: 'Show or hide models for yourself',
|
||||
titleKey: 'settings.sections.myModels.label',
|
||||
descriptionKey: 'settings.sections.myModels.description',
|
||||
content: <MyModelsSection />,
|
||||
},
|
||||
{
|
||||
key: 'member-models',
|
||||
icon: Eye,
|
||||
title: 'Channel Models',
|
||||
description: 'Models reachable by non-owner accounts',
|
||||
titleKey: 'settings.sections.channelModels.label',
|
||||
descriptionKey: 'settings.sections.channelModels.description',
|
||||
content: <MemberModelsSection />,
|
||||
},
|
||||
],
|
||||
};
|
||||
|
||||
const defaultsGroup: SettingsSectionGroup = {
|
||||
label: 'Defaults',
|
||||
labelKey: 'settings.groups.defaults',
|
||||
icon: Sparkles,
|
||||
sections: [
|
||||
{
|
||||
key: 'default-models',
|
||||
icon: Sparkles,
|
||||
title: 'Default Models',
|
||||
description: 'Default models for chat, projects, and tasks',
|
||||
titleKey: 'settings.sections.defaultModels.label',
|
||||
descriptionKey: 'settings.sections.defaultModels.description',
|
||||
content: <AIModels />,
|
||||
},
|
||||
],
|
||||
};
|
||||
|
||||
const providersGroup: SettingsSectionGroup = {
|
||||
label: 'Providers',
|
||||
labelKey: 'settings.groups.providers',
|
||||
icon: Terminal,
|
||||
sections: [
|
||||
{
|
||||
key: 'ai-harnesses',
|
||||
icon: Terminal,
|
||||
title: 'Providers',
|
||||
description: 'Remote and local AI providers',
|
||||
titleKey: 'settings.sections.providers.label',
|
||||
descriptionKey: 'settings.sections.providers.description',
|
||||
content: <AIHarnessesSection />,
|
||||
},
|
||||
],
|
||||
@@ -482,7 +479,7 @@ export const AISettings = () => {
|
||||
createSettingsPanelComponents({
|
||||
basePath: BASE_PATH,
|
||||
sidebarIcon: Bot,
|
||||
sidebarLabel: 'AI',
|
||||
sidebarLabelKey: 'settings.nav.ai',
|
||||
groups,
|
||||
}),
|
||||
[groups],
|
||||
|
||||
+5
-3
@@ -5,6 +5,7 @@ import { Input } from '@/components/ui/input';
|
||||
import { Label } from '@/components/ui/label';
|
||||
import { Button } from '@/components/ui/button';
|
||||
import { useClient } from 'hooks/useClient';
|
||||
import { useTranslation } from '@/lib/i18n';
|
||||
|
||||
type ApifyConfigData = {
|
||||
apiToken: string;
|
||||
@@ -15,6 +16,7 @@ type ApifyStatus = {
|
||||
};
|
||||
|
||||
export const ApifyConfig = () => {
|
||||
const { t } = useTranslation();
|
||||
const client = useClient();
|
||||
const [isLoading, setIsLoading] = useState(true);
|
||||
const [isSaving, setIsSaving] = useState(false);
|
||||
@@ -38,10 +40,10 @@ export const ApifyConfig = () => {
|
||||
setIsSaving(true);
|
||||
try {
|
||||
await client.put('/integrations/apify/config', { apiToken: apiToken.trim() });
|
||||
toast.success('Apify API token saved');
|
||||
toast.success(t('settings.apify.saved'));
|
||||
setStatus({ configured: !!apiToken.trim() });
|
||||
} catch {
|
||||
toast.error('Failed to save Apify API token');
|
||||
toast.error(t('settings.apify.saveFailed'));
|
||||
} finally {
|
||||
setIsSaving(false);
|
||||
}
|
||||
@@ -64,7 +66,7 @@ export const ApifyConfig = () => {
|
||||
|
||||
<form onSubmit={handleSave} className="grid gap-5">
|
||||
<Label className="grid gap-2">
|
||||
<span className="text-duck-dark/70 dark:text-foreground/70">API Token</span>
|
||||
<span className="text-duck-dark/70 dark:text-foreground/70">{t('settings.apify.token')}</span>
|
||||
<Input
|
||||
className="h-11 bg-background/60 border-duck-dark/20 text-duck-dark placeholder:text-duck-dark/40"
|
||||
type="password"
|
||||
|
||||
+34
-23
@@ -7,6 +7,8 @@ import { Label } from '@/components/ui/label';
|
||||
import { Button } from '@/components/ui/button';
|
||||
import { useClient } from 'hooks/useClient';
|
||||
import { copyToClipboard } from 'helpers/clipboard';
|
||||
import { useFormat } from 'i18n';
|
||||
import { useTranslation } from '@/lib/i18n';
|
||||
|
||||
// Per-device credentials for calendar and contacts sync (DAVx5, iOS, macOS, Thunderbird).
|
||||
//
|
||||
@@ -26,19 +28,21 @@ type DavPassword = {
|
||||
|
||||
type Minted = { password: string; username: string; label: string };
|
||||
|
||||
const formatDate = (value: string | null) =>
|
||||
value ? new Date(value).toLocaleDateString(undefined, { month: 'short', day: 'numeric', year: 'numeric' }) : null;
|
||||
|
||||
const copy = async (text: string, what: string) => {
|
||||
try {
|
||||
await copyToClipboard(text);
|
||||
toast.success(`${what} copied`);
|
||||
} catch {
|
||||
toast.error('Could not copy — select and copy manually');
|
||||
}
|
||||
};
|
||||
// Dates come from useFormat() below, bound to the app's locale rather than the browser's (D7).
|
||||
|
||||
export const DavAppPasswords = () => {
|
||||
const { t } = useTranslation();
|
||||
const { date: formatDate } = useFormat();
|
||||
|
||||
const copy = async (text: string, what: string) => {
|
||||
try {
|
||||
await copyToClipboard(text);
|
||||
toast.success(t('settings.dav.copied', { what }));
|
||||
} catch {
|
||||
toast.error(t('settings.dav.copyFailed'));
|
||||
}
|
||||
};
|
||||
|
||||
const client = useClient();
|
||||
const [passwords, setPasswords] = useState<DavPassword[]>([]);
|
||||
const [isLoading, setIsLoading] = useState(true);
|
||||
@@ -71,7 +75,7 @@ export const DavAppPasswords = () => {
|
||||
setLabel('');
|
||||
load();
|
||||
} catch {
|
||||
toast.error('Could not create the app password');
|
||||
toast.error(t('settings.dav.createFailed'));
|
||||
} finally {
|
||||
setIsCreating(false);
|
||||
}
|
||||
@@ -80,10 +84,10 @@ export const DavAppPasswords = () => {
|
||||
const revoke = async (id: number) => {
|
||||
try {
|
||||
await client.post(`/dav/passwords/${id}/revoke`, {});
|
||||
toast.success('Revoked — that device will stop syncing');
|
||||
toast.success(t('settings.dav.revoked'));
|
||||
load();
|
||||
} catch {
|
||||
toast.error('Could not revoke');
|
||||
toast.error(t('settings.dav.revokeFailed'));
|
||||
}
|
||||
};
|
||||
|
||||
@@ -92,7 +96,7 @@ export const DavAppPasswords = () => {
|
||||
await client.delete(`/dav/passwords/${id}`);
|
||||
load();
|
||||
} catch {
|
||||
toast.error('Could not delete');
|
||||
toast.error(t('settings.dav.deleteFailed'));
|
||||
}
|
||||
};
|
||||
|
||||
@@ -126,7 +130,12 @@ export const DavAppPasswords = () => {
|
||||
<code className="min-w-0 flex-1 truncate rounded bg-background/70 px-2 py-1.5 font-mono text-xs">
|
||||
{value}
|
||||
</code>
|
||||
<Button variant="ghost" size="sm" onClick={() => copy(value, field)} title={`Copy ${field}`}>
|
||||
<Button
|
||||
variant="ghost"
|
||||
size="sm"
|
||||
onClick={() => copy(value, field)}
|
||||
title={t('settings.dav.copyField', { field })}
|
||||
>
|
||||
<Copy className="h-3.5 w-3.5" />
|
||||
</Button>
|
||||
</div>
|
||||
@@ -146,29 +155,31 @@ export const DavAppPasswords = () => {
|
||||
|
||||
<form onSubmit={create} className="flex items-end gap-2">
|
||||
<Label className="grid flex-1 gap-2">
|
||||
<span className="text-duck-dark/70 dark:text-foreground/70">New device</span>
|
||||
<span className="text-duck-dark/70 dark:text-foreground/70">{t('settings.dav.newDevice')}</span>
|
||||
<Input
|
||||
className="h-11 bg-background/60 border-duck-dark/20"
|
||||
value={label}
|
||||
onChange={(ev) => setLabel(ev.target.value)}
|
||||
placeholder="Pixel 9, iPad, Thunderbird…"
|
||||
placeholder={t('settings.dav.placeholder')}
|
||||
/>
|
||||
</Label>
|
||||
<Button type="submit" disabled={!label.trim() || isCreating} className="h-11">
|
||||
<Plus className="mr-1.5 h-4 w-4" />
|
||||
Create
|
||||
{t('settings.dav.create')}
|
||||
</Button>
|
||||
</form>
|
||||
|
||||
{passwords.length === 0 ? (
|
||||
<div className="rounded-lg border border-dashed border-duck-dark/15 dark:border-foreground/15 p-6 text-center text-sm text-duck-dark/40 dark:text-foreground/40">
|
||||
No devices yet.
|
||||
{t('settings.dav.none')}
|
||||
</div>
|
||||
) : (
|
||||
<div className="grid gap-2">
|
||||
{passwords.map((entry) => {
|
||||
const revoked = !!entry.revokedAt;
|
||||
const lastUsed = formatDate(entry.lastUsedAt);
|
||||
const lastUsed = entry.lastUsedAt
|
||||
? formatDate(entry.lastUsedAt, { month: 'short', day: 'numeric', year: 'numeric' })
|
||||
: null;
|
||||
return (
|
||||
<div
|
||||
key={entry.id}
|
||||
@@ -192,7 +203,7 @@ export const DavAppPasswords = () => {
|
||||
</div>
|
||||
</div>
|
||||
{!revoked && (
|
||||
<Button variant="ghost" size="sm" onClick={() => revoke(entry.id)} title="Revoke">
|
||||
<Button variant="ghost" size="sm" onClick={() => revoke(entry.id)} title={t('settings.dav.revoke')}>
|
||||
<Ban className="h-3.5 w-3.5" />
|
||||
</Button>
|
||||
)}
|
||||
@@ -200,7 +211,7 @@ export const DavAppPasswords = () => {
|
||||
variant="ghost"
|
||||
size="sm"
|
||||
onClick={() => remove(entry.id)}
|
||||
title="Delete"
|
||||
title={t('settings.dav.delete')}
|
||||
className="hover:text-red-500"
|
||||
>
|
||||
<Trash2 className="h-3.5 w-3.5" />
|
||||
|
||||
+13
-11
@@ -2,6 +2,7 @@ import { useState, useEffect } from 'react';
|
||||
import { toast } from 'sonner';
|
||||
import { Button } from '@/components/ui/button';
|
||||
import { useClient } from 'hooks/useClient';
|
||||
import { useTranslation } from '@/lib/i18n';
|
||||
|
||||
type GoogleStatus = {
|
||||
connected: boolean;
|
||||
@@ -11,6 +12,7 @@ type GoogleStatus = {
|
||||
};
|
||||
|
||||
export const GoogleAccount = () => {
|
||||
const { t } = useTranslation();
|
||||
const client = useClient();
|
||||
const [isLoading, setIsLoading] = useState(true);
|
||||
const [status, setStatus] = useState<GoogleStatus>({
|
||||
@@ -30,9 +32,9 @@ export const GoogleAccount = () => {
|
||||
const params = new URLSearchParams(window.location.search);
|
||||
const result = params.get('google');
|
||||
if (result === 'success') {
|
||||
toast.success('Google account connected');
|
||||
toast.success(t('settings.googleAccount.connectedToast'));
|
||||
} else if (result === 'error') {
|
||||
toast.error('Failed to connect Google account');
|
||||
toast.error(t('settings.googleAccount.connectFailed'));
|
||||
}
|
||||
if (result) {
|
||||
window.history.replaceState({}, '', window.location.pathname);
|
||||
@@ -51,9 +53,9 @@ export const GoogleAccount = () => {
|
||||
try {
|
||||
await client.delete('/integrations/google/connection');
|
||||
setStatus({ ...status, connected: false, email: null });
|
||||
toast.success('Google account disconnected');
|
||||
toast.success(t('settings.googleAccount.disconnectedToast'));
|
||||
} catch {
|
||||
toast.error('Failed to disconnect Google account');
|
||||
toast.error(t('settings.googleAccount.disconnectFailed'));
|
||||
}
|
||||
};
|
||||
|
||||
@@ -63,17 +65,17 @@ export const GoogleAccount = () => {
|
||||
return (
|
||||
<div className="grid gap-4">
|
||||
<div>
|
||||
<p className="text-sm font-medium text-duck-dark dark:text-foreground">Google Account</p>
|
||||
<p className="text-xs text-duck-dark/50 dark:text-foreground/50 mt-1">
|
||||
Connect your Google account for Calendar, Contacts, and other Google services.
|
||||
</p>
|
||||
<p className="text-sm font-medium text-duck-dark dark:text-foreground">{t('settings.googleAccount.title')}</p>
|
||||
<p className="text-xs text-duck-dark/50 dark:text-foreground/50 mt-1">{t('settings.googleAccount.hint')}</p>
|
||||
</div>
|
||||
{status.connected ? (
|
||||
<>
|
||||
<div className="flex items-center gap-3 rounded-lg border border-duck-dark/10 dark:border-foreground/10 p-4">
|
||||
<div className="h-2.5 w-2.5 rounded-full bg-success shrink-0" />
|
||||
<div className="min-w-0 flex-1">
|
||||
<p className="text-sm font-medium text-duck-dark dark:text-foreground">Connected</p>
|
||||
<p className="text-sm font-medium text-duck-dark dark:text-foreground">
|
||||
{t('settings.googleAccount.connected')}
|
||||
</p>
|
||||
<p className="text-xs text-duck-dark/50 dark:text-foreground/50 truncate">{status.email}</p>
|
||||
</div>
|
||||
{status.picture && (
|
||||
@@ -81,7 +83,7 @@ export const GoogleAccount = () => {
|
||||
)}
|
||||
</div>
|
||||
<Button type="button" variant="outline" onClick={handleDisconnect} className="w-full h-11 cursor-pointer">
|
||||
Disconnect
|
||||
{t('settings.googleAccount.disconnect')}
|
||||
</Button>
|
||||
</>
|
||||
) : (
|
||||
@@ -90,7 +92,7 @@ export const GoogleAccount = () => {
|
||||
onClick={handleConnect}
|
||||
className="w-full h-11 bg-duck-yellow hover:bg-duck-yellow/90 text-duck-teal font-bold transition-all duration-200 hover:scale-105 cursor-pointer"
|
||||
>
|
||||
Connect Google Account
|
||||
{t('settings.googleAccount.connect')}
|
||||
</Button>
|
||||
)}
|
||||
</div>
|
||||
|
||||
+89
-111
@@ -7,197 +7,175 @@ import { Label } from '@/components/ui/label';
|
||||
import { Button } from '@/components/ui/button';
|
||||
import { Collapsible, CollapsibleTrigger, CollapsibleContent } from '@/components/ui/collapsible';
|
||||
import { useClient } from 'hooks/useClient';
|
||||
import { useTranslation } from '@/lib/i18n';
|
||||
import { Untranslated } from '@/components/Untranslated';
|
||||
|
||||
type GoogleOAuthSettings = {
|
||||
clientId: string;
|
||||
clientSecret: string;
|
||||
};
|
||||
|
||||
// The scope strings are Google's own identifiers; only the explanation beside them is ours.
|
||||
const SCOPES = [
|
||||
{ scope: 'gmail.readonly', description: 'Read emails' },
|
||||
{ scope: 'calendar.readonly', description: 'Read calendar events' },
|
||||
];
|
||||
{ scope: 'gmail.readonly', descriptionKey: 'settings.google.scopeGmail' },
|
||||
{ scope: 'calendar.readonly', descriptionKey: 'settings.google.scopeCalendar' },
|
||||
] as const;
|
||||
|
||||
const SetupGuide = ({ redirectUri }: { redirectUri: string }) => {
|
||||
const [open, setOpen] = useState(false);
|
||||
const { t } = useTranslation();
|
||||
|
||||
/*
|
||||
Every quoted Google-console label below is wrapped in <Untranslated>. Per docs/localization.md they
|
||||
are identifiers, not prose: they exist to match what the reader sees on Google's screen, and Google
|
||||
localises by the reader's Google account language rather than ours.
|
||||
|
||||
The sentences are keyed WHOLE, each ending at the label or link it introduces. The first attempt
|
||||
split them around inline labels, which needs "Go to the" and "page." as separate keys — and the
|
||||
Portuguese value of the second one is "." That is the fragmentation smell, so the English was
|
||||
rephrased to put the label at a clause boundary, which reads naturally in both languages.
|
||||
*/
|
||||
const GoogleLink = ({ href, label }: { href: string; label: string }) => (
|
||||
<a href={href} target="_blank" rel="noopener noreferrer" className="text-duck-teal underline">
|
||||
<Untranslated reason="foreign-ui-label">{label}</Untranslated>
|
||||
</a>
|
||||
);
|
||||
|
||||
return (
|
||||
<Collapsible open={open} onOpenChange={setOpen}>
|
||||
<CollapsibleTrigger className="flex items-center gap-2 text-sm font-medium text-duck-teal cursor-pointer hover:underline w-full">
|
||||
<ChevronDown className={`h-3.5 w-3.5 transition-transform duration-200 ${open ? 'rotate-180' : ''}`} />
|
||||
Step-by-step setup guide
|
||||
{t('settings.google.guideToggle')}
|
||||
</CollapsibleTrigger>
|
||||
<CollapsibleContent>
|
||||
<ol className="mt-3 grid gap-4 text-sm text-duck-dark/70 dark:text-foreground/70 list-decimal list-outside pl-5">
|
||||
<li>
|
||||
<strong className="text-duck-dark dark:text-foreground">Create a Google Cloud project</strong>
|
||||
<strong className="text-duck-dark dark:text-foreground">{t('settings.google.step1.title')}</strong>
|
||||
<p className="mt-1">
|
||||
Go to the{' '}
|
||||
<a
|
||||
{t('settings.google.step1.body')}{' '}
|
||||
<GoogleLink
|
||||
href="https://console.cloud.google.com/projectcreate"
|
||||
target="_blank"
|
||||
rel="noopener noreferrer"
|
||||
className="text-duck-teal underline"
|
||||
>
|
||||
New Project
|
||||
</a>{' '}
|
||||
page. Give it a name (e.g. "Officer") and click <strong>Create</strong>.
|
||||
label={t('settings.google.step1.link')}
|
||||
/>{' '}
|
||||
→ <Untranslated reason="foreign-ui-label">Create</Untranslated>
|
||||
</p>
|
||||
</li>
|
||||
|
||||
<li>
|
||||
<strong className="text-duck-dark dark:text-foreground">Enable the APIs</strong>
|
||||
<strong className="text-duck-dark dark:text-foreground">{t('settings.google.step2.title')}</strong>
|
||||
<p className="mt-1">
|
||||
Go to{' '}
|
||||
<a
|
||||
{t('settings.google.step2.body')}{' '}
|
||||
<GoogleLink
|
||||
href="https://console.cloud.google.com/apis/library"
|
||||
target="_blank"
|
||||
rel="noopener noreferrer"
|
||||
className="text-duck-teal underline"
|
||||
>
|
||||
API Library
|
||||
</a>
|
||||
. Search for and enable each of these:
|
||||
label={t('settings.google.step2.link')}
|
||||
/>{' '}
|
||||
→ <Untranslated reason="foreign-ui-label">Enable</Untranslated>
|
||||
</p>
|
||||
<ul className="mt-1 list-disc list-outside pl-5 grid gap-0.5">
|
||||
<li>
|
||||
<strong>Gmail API</strong>
|
||||
<Untranslated reason="foreign-ui-label">Gmail API</Untranslated>
|
||||
</li>
|
||||
<li>
|
||||
<strong>Google Calendar API</strong>
|
||||
<Untranslated reason="foreign-ui-label">Google Calendar API</Untranslated>
|
||||
</li>
|
||||
</ul>
|
||||
<p className="mt-1">
|
||||
Click each one, then click <strong>Enable</strong>.
|
||||
</p>
|
||||
</li>
|
||||
|
||||
<li>
|
||||
<strong className="text-duck-dark dark:text-foreground">Configure the OAuth consent screen</strong>
|
||||
<strong className="text-duck-dark dark:text-foreground">{t('settings.google.step3.title')}</strong>
|
||||
<p className="mt-1">
|
||||
Go to{' '}
|
||||
<a
|
||||
<GoogleLink
|
||||
href="https://console.cloud.google.com/auth/branding"
|
||||
target="_blank"
|
||||
rel="noopener noreferrer"
|
||||
className="text-duck-teal underline"
|
||||
>
|
||||
OAuth Branding
|
||||
</a>
|
||||
.
|
||||
label={t('settings.google.step3.link')}
|
||||
/>
|
||||
</p>
|
||||
<ul className="mt-1 list-disc list-outside pl-5 grid gap-0.5">
|
||||
<li>
|
||||
Set <strong>App name</strong> to your organization name or "Officer"
|
||||
{t('settings.google.step3.appName')} <Untranslated reason="foreign-ui-label">App name</Untranslated>
|
||||
</li>
|
||||
<li>
|
||||
Set <strong>User support email</strong> to your admin email
|
||||
{t('settings.google.step3.supportEmail')}{' '}
|
||||
<Untranslated reason="foreign-ui-label">User support email</Untranslated>
|
||||
</li>
|
||||
<li>
|
||||
Add your admin email under <strong>Developer contact information</strong>
|
||||
{t('settings.google.step3.devContact')}{' '}
|
||||
<Untranslated reason="foreign-ui-label">Developer contact information</Untranslated>
|
||||
</li>
|
||||
<li>
|
||||
Click <strong>Save</strong>
|
||||
{t('settings.google.step3.save')} <Untranslated reason="foreign-ui-label">Save</Untranslated>
|
||||
</li>
|
||||
</ul>
|
||||
</li>
|
||||
|
||||
<li>
|
||||
<strong className="text-duck-dark dark:text-foreground">Set the audience</strong>
|
||||
<strong className="text-duck-dark dark:text-foreground">{t('settings.google.step4.title')}</strong>
|
||||
<p className="mt-1">
|
||||
Go to{' '}
|
||||
<a
|
||||
<GoogleLink
|
||||
href="https://console.cloud.google.com/auth/audience"
|
||||
target="_blank"
|
||||
rel="noopener noreferrer"
|
||||
className="text-duck-teal underline"
|
||||
>
|
||||
OAuth Audience
|
||||
</a>
|
||||
.
|
||||
label={t('settings.google.step4.link')}
|
||||
/>
|
||||
</p>
|
||||
<ul className="mt-1 list-disc list-outside pl-5 grid gap-0.5">
|
||||
<li>
|
||||
If your team uses Google Workspace, select <strong>Internal</strong> — no verification needed
|
||||
{t('settings.google.step4.internal')} <Untranslated reason="foreign-ui-label">Internal</Untranslated>
|
||||
</li>
|
||||
<li>
|
||||
Otherwise, select <strong>External</strong> and add your team's emails under <strong>Test users</strong>{' '}
|
||||
(required while the app is unverified; limit of 100 test users)
|
||||
{t('settings.google.step4.external')} <Untranslated reason="foreign-ui-label">External</Untranslated>
|
||||
</li>
|
||||
</ul>
|
||||
</li>
|
||||
|
||||
<li>
|
||||
<strong className="text-duck-dark dark:text-foreground">Add scopes</strong>
|
||||
<strong className="text-duck-dark dark:text-foreground">{t('settings.google.step5.title')}</strong>
|
||||
<p className="mt-1">
|
||||
In the left sidebar, click{' '}
|
||||
<a
|
||||
href="https://console.cloud.google.com/auth/scopes"
|
||||
target="_blank"
|
||||
rel="noopener noreferrer"
|
||||
className="text-duck-teal underline"
|
||||
>
|
||||
Data Access
|
||||
</a>
|
||||
, then click <strong>Add or remove scopes</strong>. Search for and add:
|
||||
{t('settings.google.step5.body')}{' '}
|
||||
<GoogleLink href="https://console.cloud.google.com/auth/scopes" label={t('settings.google.step5.link')} />{' '}
|
||||
→ <Untranslated reason="foreign-ui-label">Add or remove scopes</Untranslated>
|
||||
</p>
|
||||
<ul className="mt-1 list-disc list-outside pl-5 grid gap-0.5">
|
||||
{SCOPES.map((s) => (
|
||||
<li key={s.scope}>
|
||||
<code className="text-xs bg-duck-dark/5 dark:bg-foreground/5 px-1.5 py-0.5 rounded">{s.scope}</code> —{' '}
|
||||
{s.description}
|
||||
{SCOPES.map((entry) => (
|
||||
<li key={entry.scope}>
|
||||
<code className="text-xs bg-duck-dark/5 dark:bg-foreground/5 px-1.5 py-0.5 rounded">
|
||||
{entry.scope}
|
||||
</code>{' '}
|
||||
— {t(entry.descriptionKey)}
|
||||
</li>
|
||||
))}
|
||||
</ul>
|
||||
<p className="mt-1">
|
||||
Click <strong>Update</strong>, then <strong>Save</strong>.
|
||||
</p>
|
||||
<p className="mt-2 text-xs text-duck-dark/50 dark:text-foreground/50">
|
||||
Note: <code className="bg-duck-dark/5 dark:bg-foreground/5 px-1 py-0.5 rounded">calendar.readonly</code>{' '}
|
||||
is classified as <strong>sensitive</strong> and{' '}
|
||||
<code className="bg-duck-dark/5 dark:bg-foreground/5 px-1 py-0.5 rounded">gmail.readonly</code> as{' '}
|
||||
<strong>restricted</strong> by Google. This is fine for Internal apps (Google Workspace) and External apps
|
||||
in testing mode. Publishing to production with restricted scopes requires Google verification.
|
||||
</p>
|
||||
<p className="mt-2 text-xs text-duck-dark/50 dark:text-foreground/50">{t('settings.google.step5.note')}</p>
|
||||
</li>
|
||||
|
||||
<li>
|
||||
<strong className="text-duck-dark dark:text-foreground">Create OAuth credentials</strong>
|
||||
<strong className="text-duck-dark dark:text-foreground">{t('settings.google.step6.title')}</strong>
|
||||
<p className="mt-1">
|
||||
In the left sidebar, click{' '}
|
||||
<a
|
||||
{t('settings.google.step6.body')}{' '}
|
||||
<GoogleLink
|
||||
href="https://console.cloud.google.com/auth/clients"
|
||||
target="_blank"
|
||||
rel="noopener noreferrer"
|
||||
className="text-duck-teal underline"
|
||||
>
|
||||
Clients
|
||||
</a>
|
||||
, then click <strong>Create OAuth client</strong>.
|
||||
label={t('settings.google.step6.link')}
|
||||
/>{' '}
|
||||
→ <Untranslated reason="foreign-ui-label">Create OAuth client</Untranslated>
|
||||
</p>
|
||||
<ul className="mt-1 list-disc list-outside pl-5 grid gap-0.5">
|
||||
<li>
|
||||
Application type: <strong>Web application</strong>
|
||||
{t('settings.google.step6.appType')}{' '}
|
||||
<Untranslated reason="foreign-ui-label">Web application</Untranslated>
|
||||
</li>
|
||||
<li>Name: anything (e.g. "Officer")</li>
|
||||
<li>{t('settings.google.step6.nameAnything')}</li>
|
||||
<li>
|
||||
Authorized redirect URIs: add{' '}
|
||||
{t('settings.google.step6.redirectUris')}{' '}
|
||||
<code className="text-xs bg-duck-dark/5 dark:bg-foreground/5 px-1.5 py-0.5 rounded break-all">
|
||||
{redirectUri}
|
||||
</code>
|
||||
</li>
|
||||
<li>
|
||||
Click <strong>Create</strong>
|
||||
{t('settings.google.step6.thenClick')} <Untranslated reason="foreign-ui-label">Create</Untranslated>
|
||||
</li>
|
||||
</ul>
|
||||
</li>
|
||||
|
||||
<li>
|
||||
<strong className="text-duck-dark dark:text-foreground">Copy the credentials</strong>
|
||||
<p className="mt-1">
|
||||
A dialog will show your <strong>Client ID</strong> and <strong>Client Secret</strong>. Copy both and paste
|
||||
them into the fields below.
|
||||
</p>
|
||||
<strong className="text-duck-dark dark:text-foreground">{t('settings.google.step7.title')}</strong>
|
||||
<p className="mt-1">{t('settings.google.step7.body')}</p>
|
||||
</li>
|
||||
</ol>
|
||||
</CollapsibleContent>
|
||||
@@ -208,11 +186,12 @@ const SetupGuide = ({ redirectUri }: { redirectUri: string }) => {
|
||||
type VerifyStatus = { valid: boolean; error: string | null } | null;
|
||||
|
||||
const CredentialStatus = ({ status, isVerifying }: { status: VerifyStatus; isVerifying: boolean }) => {
|
||||
const { t } = useTranslation();
|
||||
if (isVerifying) {
|
||||
return (
|
||||
<div className="flex items-center gap-2 rounded-lg border border-duck-dark/10 dark:border-foreground/10 p-3">
|
||||
<div className="h-2.5 w-2.5 rounded-full bg-duck-dark/20 dark:bg-foreground/20 animate-pulse shrink-0" />
|
||||
<span className="text-sm text-duck-dark/50 dark:text-foreground/50">Verifying credentials...</span>
|
||||
<span className="text-sm text-duck-dark/50 dark:text-foreground/50">{t('settings.google.verifying')}</span>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
@@ -223,13 +202,14 @@ const CredentialStatus = ({ status, isVerifying }: { status: VerifyStatus; isVer
|
||||
<div className="flex items-center gap-2 rounded-lg border border-duck-dark/10 dark:border-foreground/10 p-3">
|
||||
<div className={`h-2.5 w-2.5 rounded-full shrink-0 ${status.valid ? 'bg-success' : 'bg-red-500'}`} />
|
||||
<span className={`text-sm ${status.valid ? 'text-duck-dark dark:text-foreground' : 'text-red-500'}`}>
|
||||
{status.valid ? 'Credentials valid' : (status.error ?? 'Invalid credentials')}
|
||||
{status.valid ? t('settings.google.valid') : (status.error ?? t('settings.google.invalid'))}
|
||||
</span>
|
||||
</div>
|
||||
);
|
||||
};
|
||||
|
||||
export const GoogleOAuthConfig = () => {
|
||||
const { t } = useTranslation();
|
||||
const client = useClient();
|
||||
const [isLoading, setIsLoading] = useState(true);
|
||||
const [isSaving, setIsSaving] = useState(false);
|
||||
@@ -243,7 +223,7 @@ export const GoogleOAuthConfig = () => {
|
||||
client
|
||||
.get<{ valid: boolean; error: string | null }>('/integrations/google/verify')
|
||||
.then(setVerifyStatus)
|
||||
.catch(() => setVerifyStatus({ valid: false, error: 'Verification request failed' }))
|
||||
.catch(() => setVerifyStatus({ valid: false, error: t('settings.google.verifyFailed') }))
|
||||
.finally(() => setIsVerifying(false));
|
||||
};
|
||||
|
||||
@@ -273,10 +253,10 @@ export const GoogleOAuthConfig = () => {
|
||||
setIsSaving(true);
|
||||
try {
|
||||
await client.put('/integrations/google/config', { clientId: clientId.trim(), clientSecret: clientSecret.trim() });
|
||||
toast.success('Google OAuth configuration saved');
|
||||
toast.success(t('settings.google.saved'));
|
||||
verify();
|
||||
} catch {
|
||||
toast.error('Failed to save Google OAuth configuration');
|
||||
toast.error(t('settings.google.saveFailed'));
|
||||
} finally {
|
||||
setIsSaving(false);
|
||||
}
|
||||
@@ -294,7 +274,7 @@ export const GoogleOAuthConfig = () => {
|
||||
|
||||
<form onSubmit={handleSave} className="border-t border-duck-dark/10 dark:border-foreground/10 pt-5 grid gap-5">
|
||||
<Label className="grid gap-2">
|
||||
<span className="text-duck-dark/70 dark:text-foreground/70">Client ID</span>
|
||||
<span className="text-duck-dark/70 dark:text-foreground/70">{t('settings.google.clientId')}</span>
|
||||
<Input
|
||||
className="h-11 bg-background/60 border-duck-dark/20 text-duck-dark placeholder:text-duck-dark/40"
|
||||
type="text"
|
||||
@@ -305,7 +285,7 @@ export const GoogleOAuthConfig = () => {
|
||||
</Label>
|
||||
|
||||
<Label className="grid gap-2">
|
||||
<span className="text-duck-dark/70 dark:text-foreground/70">Client Secret</span>
|
||||
<span className="text-duck-dark/70 dark:text-foreground/70">{t('settings.google.clientSecret')}</span>
|
||||
<Input
|
||||
className="h-11 bg-background/60 border-duck-dark/20 text-duck-dark placeholder:text-duck-dark/40"
|
||||
type="password"
|
||||
@@ -316,10 +296,8 @@ export const GoogleOAuthConfig = () => {
|
||||
</Label>
|
||||
|
||||
<Label className="grid gap-2">
|
||||
<span className="text-duck-dark/70 dark:text-foreground/70">Redirect URI</span>
|
||||
<p className="text-xs text-duck-dark/40 dark:text-foreground/40">
|
||||
Add this URI to your Google OAuth client's authorized redirect URIs
|
||||
</p>
|
||||
<span className="text-duck-dark/70 dark:text-foreground/70">{t('settings.google.redirectUri')}</span>
|
||||
<p className="text-xs text-duck-dark/40 dark:text-foreground/40">{t('settings.google.redirectUriHint')}</p>
|
||||
<Input
|
||||
className="h-11 bg-background/60 border-duck-dark/20 text-duck-dark/60"
|
||||
type="text"
|
||||
|
||||
@@ -10,6 +10,7 @@ import { GoogleOAuthConfig } from './GoogleOAuthConfig';
|
||||
// import { GoogleAccount } from './GoogleAccount'; // hidden — email uses IMAP app password now
|
||||
import { ApifyConfig } from './ApifyConfig';
|
||||
import { DavAppPasswords } from './DavAppPasswords';
|
||||
import { useTranslation } from '@/lib/i18n';
|
||||
|
||||
const BASE_PATH = '/settings/integrations';
|
||||
|
||||
@@ -17,15 +18,15 @@ const enterpriseSections: SettingsSection[] = [
|
||||
{
|
||||
key: 'google-oauth',
|
||||
icon: KeyRound,
|
||||
title: 'Google OAuth',
|
||||
description: 'Client ID and secret for Google APIs',
|
||||
titleKey: 'settings.sections.googleOauth.label',
|
||||
descriptionKey: 'settings.sections.googleOauth.description',
|
||||
content: <GoogleOAuthConfig />,
|
||||
},
|
||||
{
|
||||
key: 'apify',
|
||||
icon: Wrench,
|
||||
title: 'Apify',
|
||||
description: 'API token for web scraping actors',
|
||||
titleKey: 'settings.sections.apify.label',
|
||||
descriptionKey: 'settings.sections.apify.description',
|
||||
content: <ApifyConfig />,
|
||||
},
|
||||
];
|
||||
@@ -39,14 +40,14 @@ const personalSections: SettingsSection[] = [
|
||||
// key: 'google-account',
|
||||
// icon: UserCircle,
|
||||
// title: 'Google Account',
|
||||
// description: 'Connect your Google account',
|
||||
// descriptionKey: 'settings.sections.apify.description',
|
||||
// content: <GoogleAccount />,
|
||||
// },
|
||||
{
|
||||
key: 'dav-app-passwords',
|
||||
icon: CalendarDays,
|
||||
title: 'Calendar & Contacts sync',
|
||||
description: 'Per-device passwords for CalDAV/CardDAV clients',
|
||||
titleKey: 'settings.sections.davSync.label',
|
||||
descriptionKey: 'settings.sections.davSync.description',
|
||||
content: <DavAppPasswords />,
|
||||
},
|
||||
];
|
||||
@@ -60,6 +61,7 @@ const tabForSection = (section: string | undefined) =>
|
||||
personalSections.some((s) => s.key === section) ? 'personal' : 'enterprise';
|
||||
|
||||
const IntegrationsSidebar = () => {
|
||||
const { t } = useTranslation();
|
||||
const { section } = useParams<{ section?: string }>();
|
||||
const navigate = useNavigate();
|
||||
const tab = tabForSection(section);
|
||||
@@ -77,22 +79,28 @@ const IntegrationsSidebar = () => {
|
||||
<div className="p-3 pb-2">
|
||||
<div className="flex items-center gap-2.5 rounded-lg px-3 py-2 text-sm font-medium bg-duck-teal/15 text-duck-teal">
|
||||
<Puzzle className="h-4 w-4" />
|
||||
Integrations
|
||||
{t('settings.nav.integrations')}
|
||||
</div>
|
||||
</div>
|
||||
<div className="px-3 pb-2">
|
||||
<Tabs value={tab} onValueChange={setTab}>
|
||||
<TabsList className="w-full">
|
||||
<TabsTrigger value="enterprise" className="flex-1 cursor-pointer">
|
||||
Enterprise
|
||||
{t('settings.integrations.enterprise')}
|
||||
</TabsTrigger>
|
||||
<TabsTrigger value="personal" className="flex-1 cursor-pointer">
|
||||
Personal
|
||||
{t('settings.integrations.personal')}
|
||||
</TabsTrigger>
|
||||
</TabsList>
|
||||
</Tabs>
|
||||
</div>
|
||||
<SettingsSidebar basePath={BASE_PATH} icon={Puzzle} label="Integrations" sections={sections} hideHeader />
|
||||
<SettingsSidebar
|
||||
basePath={BASE_PATH}
|
||||
icon={Puzzle}
|
||||
labelKey="settings.nav.integrations"
|
||||
sections={sections}
|
||||
hideHeader
|
||||
/>
|
||||
</div>
|
||||
);
|
||||
};
|
||||
|
||||
@@ -13,6 +13,7 @@ import {
|
||||
} from '@/components/ui/select';
|
||||
import { useSettings } from 'state/useSettings';
|
||||
import { useUserVisibleModels, getProviderDisplayName, type ModelOption } from 'state/useModels';
|
||||
import { useTranslation } from '@/lib/i18n';
|
||||
|
||||
function buildGroups(models: ModelOption[]) {
|
||||
const groups: Record<string, { id: string; name: string }[]> = {};
|
||||
@@ -29,6 +30,7 @@ function buildGroups(models: ModelOption[]) {
|
||||
const NONE = '__none__';
|
||||
|
||||
export const AIModels = () => {
|
||||
const { t } = useTranslation();
|
||||
const { settings, saveSettings } = useSettings();
|
||||
const piModels = useUserVisibleModels();
|
||||
const [isSaving, setIsSaving] = useState(false);
|
||||
@@ -54,9 +56,9 @@ export const AIModels = () => {
|
||||
chat: { ...settings.chat, defaultModel: chatModel, defaultProjectModel: projectModel },
|
||||
tasks: { ...settings.tasks, defaultModel: taskModel },
|
||||
});
|
||||
toast.success('AI model defaults saved');
|
||||
toast.success(t('settings.profile.models.aiDefaultsSaved'));
|
||||
} catch {
|
||||
toast.error('Failed to save settings');
|
||||
toast.error(t('settings.profile.models.saveFailed'));
|
||||
} finally {
|
||||
setIsSaving(false);
|
||||
}
|
||||
@@ -86,25 +88,25 @@ export const AIModels = () => {
|
||||
return (
|
||||
<div className="grid gap-5">
|
||||
<Label className="grid gap-2">
|
||||
<span className="text-duck-dark/70 dark:text-foreground/70">Default Chat Model</span>
|
||||
<span className="text-duck-dark/70 dark:text-foreground/70">{t('settings.profile.models.defaultChat')}</span>
|
||||
<p className="text-xs text-duck-dark/40 dark:text-foreground/40">
|
||||
Used when starting a new chat from the home screen
|
||||
{t('settings.profile.models.defaultChatHint')}
|
||||
</p>
|
||||
{renderModelSelect(chatModel, setChatModel, 'System default')}
|
||||
</Label>
|
||||
|
||||
<Label className="grid gap-2">
|
||||
<span className="text-duck-dark/70 dark:text-foreground/70">Default Project Model</span>
|
||||
<span className="text-duck-dark/70 dark:text-foreground/70">{t('settings.profile.models.defaultProject')}</span>
|
||||
<p className="text-xs text-duck-dark/40 dark:text-foreground/40">
|
||||
Used when starting a new chat inside a project dashboard
|
||||
{t('settings.profile.models.defaultProjectHint')}
|
||||
</p>
|
||||
{renderModelSelect(projectModel, setProjectModel, 'Same as chat default')}
|
||||
</Label>
|
||||
|
||||
<Label className="grid gap-2">
|
||||
<span className="text-duck-dark/70 dark:text-foreground/70">Default Task Model</span>
|
||||
<span className="text-duck-dark/70 dark:text-foreground/70">{t('settings.profile.models.defaultTask')}</span>
|
||||
<p className="text-xs text-duck-dark/40 dark:text-foreground/40">
|
||||
Used when running tasks from the file browser
|
||||
{t('settings.profile.models.defaultTaskHint')}
|
||||
</p>
|
||||
{renderModelSelect(taskModel, setTaskModel, 'Same as chat default')}
|
||||
</Label>
|
||||
|
||||
@@ -2,6 +2,8 @@ import type { FormEvent } from 'react';
|
||||
import { useState } from 'react';
|
||||
import { useQuery, useQueryClient } from '@tanstack/react-query';
|
||||
import { toast } from 'sonner';
|
||||
import { useFormat } from 'i18n';
|
||||
import { useTranslation } from '@/lib/i18n';
|
||||
import { Copy, Ban, Plus, KeyRound, Loader2, Trash2 } from 'lucide-react';
|
||||
import { useClient } from 'hooks/useClient';
|
||||
import { Input } from '@/components/ui/input';
|
||||
@@ -36,19 +38,22 @@ type Minted = { key: string; name: string };
|
||||
|
||||
const API_KEYS_QUERY_KEY = ['API_KEYS'];
|
||||
|
||||
const formatDate = (value: string | null) =>
|
||||
value ? new Date(value).toLocaleDateString(undefined, { month: 'short', day: 'numeric', year: 'numeric' }) : null;
|
||||
|
||||
const copy = async (text: string) => {
|
||||
try {
|
||||
await copyToClipboard(text);
|
||||
toast.success('Key copied');
|
||||
} catch {
|
||||
toast.error('Could not copy — select and copy manually');
|
||||
}
|
||||
};
|
||||
// `toLocaleDateString(undefined, …)` followed the BROWSER's locale, so a Portuguese UI showed the
|
||||
// browser's dates. `useFormat` binds it to the locale the rest of the app is in (D7).
|
||||
|
||||
export const ApiKeys = () => {
|
||||
const { t } = useTranslation();
|
||||
const { date: formatDate } = useFormat();
|
||||
|
||||
const copy = async (text: string) => {
|
||||
try {
|
||||
await copyToClipboard(text);
|
||||
toast.success(t('settings.profile.apiKeys.copied'));
|
||||
} catch {
|
||||
toast.error(t('settings.profile.apiKeys.copyFailed'));
|
||||
}
|
||||
};
|
||||
|
||||
const client = useClient();
|
||||
const queryClient = useQueryClient();
|
||||
const [name, setName] = useState('');
|
||||
@@ -74,7 +79,7 @@ export const ApiKeys = () => {
|
||||
setName('');
|
||||
await refresh();
|
||||
} catch (ex) {
|
||||
toast.error(ex instanceof Error ? ex.message : 'Could not create the key');
|
||||
toast.error(ex instanceof Error ? ex.message : t('settings.profile.apiKeys.createFailed'));
|
||||
} finally {
|
||||
setIsCreating(false);
|
||||
}
|
||||
@@ -85,17 +90,17 @@ export const ApiKeys = () => {
|
||||
await client.delete(`/api-keys/${id}/record`);
|
||||
await refresh();
|
||||
} catch {
|
||||
toast.error('Could not remove it');
|
||||
toast.error(t('settings.profile.apiKeys.forgetFailed'));
|
||||
}
|
||||
};
|
||||
|
||||
const revoke = async (id: number) => {
|
||||
try {
|
||||
await client.delete(`/api-keys/${id}`);
|
||||
toast.success('Revoked — anything using that key is signed out');
|
||||
toast.success(t('settings.profile.apiKeys.revokeDone'));
|
||||
await refresh();
|
||||
} catch {
|
||||
toast.error('Could not revoke');
|
||||
toast.error(t('settings.profile.apiKeys.revokeFailed'));
|
||||
}
|
||||
};
|
||||
|
||||
@@ -116,7 +121,7 @@ export const ApiKeys = () => {
|
||||
if (isLoading) {
|
||||
return (
|
||||
<div className="flex items-center gap-2 p-6 text-sm text-muted-foreground">
|
||||
<Loader2 className="h-4 w-4 animate-spin" /> Loading keys…
|
||||
<Loader2 className="h-4 w-4 animate-spin" /> {t('settings.profile.apiKeys.loading')}
|
||||
</div>
|
||||
);
|
||||
}
|
||||
@@ -124,15 +129,13 @@ export const ApiKeys = () => {
|
||||
return (
|
||||
<div className="grid gap-5">
|
||||
<p className="text-sm text-duck-dark/70 dark:text-foreground/70">
|
||||
An API key signs in as you, without a password and without expiring. One key works everywhere — a key is not
|
||||
tied to an app. Giving each device its own is only so you can cut one off without touching the rest. Send it as{' '}
|
||||
<code className="font-mono text-xs">Authorization: Bearer …</code>.
|
||||
{t('settings.profile.apiKeys.intro')} <code className="font-mono text-xs">Authorization: Bearer …</code>.
|
||||
</p>
|
||||
|
||||
{minted && (
|
||||
<div className="grid gap-3 rounded-lg border-2 border-duck-teal/40 bg-duck-teal/5 p-4">
|
||||
<div className="text-sm font-medium text-duck-dark dark:text-foreground">
|
||||
Key for “{minted.name}” — shown once
|
||||
{t('settings.profile.apiKeys.mintedTitle', { name: minted.name })}
|
||||
</div>
|
||||
<p className="text-xs text-duck-dark/60 dark:text-foreground/60">
|
||||
This is the only time it is displayed. It's stored hashed, so it can't be shown again — if you lose it,
|
||||
@@ -143,30 +146,35 @@ export const ApiKeys = () => {
|
||||
<code className="min-w-0 flex-1 truncate rounded bg-background/70 px-2 py-1.5 font-mono text-xs">
|
||||
{minted.key}
|
||||
</code>
|
||||
<Button variant="ghost" size="sm" onClick={() => copy(minted.key)} title="Copy key">
|
||||
<Button
|
||||
variant="ghost"
|
||||
size="sm"
|
||||
onClick={() => copy(minted.key)}
|
||||
title={t('settings.profile.apiKeys.copyKey')}
|
||||
>
|
||||
<Copy className="h-3.5 w-3.5" />
|
||||
</Button>
|
||||
</div>
|
||||
|
||||
<Button variant="outline" size="sm" className="justify-self-start" onClick={() => setMinted(null)}>
|
||||
I've saved it
|
||||
{t('settings.profile.apiKeys.savedIt')}
|
||||
</Button>
|
||||
</div>
|
||||
)}
|
||||
|
||||
<form onSubmit={create} className="flex items-end gap-2">
|
||||
<Label className="grid flex-1 gap-2">
|
||||
<span className="text-duck-dark/70 dark:text-foreground/70">New key</span>
|
||||
<span className="text-duck-dark/70 dark:text-foreground/70">{t('settings.profile.apiKeys.newKey')}</span>
|
||||
<Input
|
||||
className="h-11 bg-background/60 border-duck-dark/20"
|
||||
value={name}
|
||||
onChange={(ev) => setName(ev.target.value)}
|
||||
placeholder="iPhone, Music app, laptop CLI…"
|
||||
placeholder={t('settings.profile.apiKeys.namePlaceholder')}
|
||||
/>
|
||||
</Label>
|
||||
<Button type="submit" disabled={!name.trim() || isCreating} className="h-11">
|
||||
<Plus className="mr-1.5 h-4 w-4" />
|
||||
Create
|
||||
<Plus className="me-1.5 h-4 w-4" />
|
||||
{t('settings.profile.apiKeys.create')}
|
||||
</Button>
|
||||
</form>
|
||||
|
||||
@@ -174,14 +182,16 @@ export const ApiKeys = () => {
|
||||
<div className="rounded-lg border border-dashed border-duck-dark/15 dark:border-foreground/15 p-6 text-center text-sm text-duck-dark/40 dark:text-foreground/40">
|
||||
{/* "No keys yet" would be false on an account whose keys are all revoked, and it is the sentence
|
||||
that would send somebody looking for a bug in the list. */}
|
||||
{allKeys.length === 0 ? 'No keys yet.' : 'No keys in use.'}
|
||||
{allKeys.length === 0 ? t('settings.profile.apiKeys.noneYet') : t('settings.profile.apiKeys.noneInUse')}
|
||||
</div>
|
||||
) : (
|
||||
<div className="grid gap-2">
|
||||
{keys.map((entry) => {
|
||||
const expired = !!entry.expiresAt && new Date(entry.expiresAt).getTime() <= Date.now();
|
||||
const dead = !!entry.revokedAt || expired;
|
||||
const lastUsed = formatDate(entry.lastUsedAt);
|
||||
const lastUsed = entry.lastUsedAt
|
||||
? formatDate(entry.lastUsedAt, { month: 'short', day: 'numeric', year: 'numeric' })
|
||||
: null;
|
||||
return (
|
||||
<div
|
||||
key={entry.id}
|
||||
@@ -195,14 +205,20 @@ export const ApiKeys = () => {
|
||||
<div className="min-w-0 flex-1">
|
||||
<div className="truncate text-sm text-duck-dark dark:text-foreground">
|
||||
{entry.name}
|
||||
{entry.revokedAt && <span className="ml-2 text-xs text-red-500">revoked</span>}
|
||||
{!entry.revokedAt && expired && <span className="ml-2 text-xs text-red-500">expired</span>}
|
||||
{entry.revokedAt && (
|
||||
<span className="ms-2 text-xs text-red-500">{t('settings.profile.apiKeys.revoked')}</span>
|
||||
)}
|
||||
{!entry.revokedAt && expired && (
|
||||
<span className="ms-2 text-xs text-red-500">{t('settings.profile.apiKeys.expired')}</span>
|
||||
)}
|
||||
</div>
|
||||
<div className="text-xs text-duck-dark/40 dark:text-foreground/40">
|
||||
<code className="font-mono">{entry.prefix}…</code>
|
||||
{' · '}
|
||||
{/* "never used" is the tell that an app was configured wrong, so it earns its own wording. */}
|
||||
{lastUsed ? `last used ${lastUsed}` : 'never used'}
|
||||
{lastUsed
|
||||
? t('settings.profile.apiKeys.lastUsed', { date: lastUsed })
|
||||
: t('settings.profile.apiKeys.neverUsed')}
|
||||
</div>
|
||||
</div>
|
||||
{dead ? (
|
||||
@@ -212,7 +228,7 @@ export const ApiKeys = () => {
|
||||
variant="ghost"
|
||||
size="sm"
|
||||
onClick={() => void forget(entry.id)}
|
||||
title="Remove this record"
|
||||
title={t('settings.profile.apiKeys.forget')}
|
||||
className="hover:text-red-500"
|
||||
>
|
||||
<Trash2 className="h-3.5 w-3.5" />
|
||||
@@ -222,7 +238,7 @@ export const ApiKeys = () => {
|
||||
variant="ghost"
|
||||
size="sm"
|
||||
onClick={() => void revoke(entry.id)}
|
||||
title="Revoke"
|
||||
title={t('settings.profile.apiKeys.revoke')}
|
||||
className="hover:text-red-500"
|
||||
>
|
||||
<Ban className="h-3.5 w-3.5" />
|
||||
@@ -241,8 +257,8 @@ export const ApiKeys = () => {
|
||||
className="mt-3 cursor-pointer text-xs text-duck-dark/40 underline underline-offset-2 transition-colors hover:text-duck-dark/70 dark:text-foreground/40 dark:hover:text-foreground/70"
|
||||
>
|
||||
{showRevoked
|
||||
? 'Hide revoked and expired'
|
||||
: `Show ${deadKeys.length} revoked or expired key${deadKeys.length === 1 ? '' : 's'}`}
|
||||
? t('settings.profile.apiKeys.hideDead')
|
||||
: t('settings.profile.apiKeys.showDead', { count: deadKeys.length })}
|
||||
</button>
|
||||
)}
|
||||
</div>
|
||||
|
||||
@@ -3,7 +3,8 @@ import { X, Plus, RotateCcw } from 'lucide-react';
|
||||
import { Button } from '@/components/ui/button';
|
||||
import { useDock } from 'officerdev';
|
||||
import { usePermissions } from 'hooks/usePermissions';
|
||||
import { CORE_DOCK_ITEMS, dockItemsFromPlugins, defaultDockPaths } from '@/Screens/Dashboard/Layout/Dock';
|
||||
import { useDockItems, defaultDockPaths } from '@/Screens/Dashboard/Layout/Dock';
|
||||
import { useTranslation } from '@/lib/i18n';
|
||||
|
||||
type DockPillProps = {
|
||||
label: string;
|
||||
@@ -104,10 +105,11 @@ const DropZone = ({ label, children, onDrop }: DropZoneProps) => {
|
||||
};
|
||||
|
||||
export const DockSettings = () => {
|
||||
const { t } = useTranslation();
|
||||
// Same composition as the dock itself. Offering a pin for an uninstalled feature would let someone
|
||||
// pin a tile that cannot appear, which reads as the setting being broken.
|
||||
const { plugins } = usePermissions();
|
||||
const allDockItems = useMemo(() => [...CORE_DOCK_ITEMS, ...dockItemsFromPlugins(plugins)], [plugins]);
|
||||
const allDockItems = useDockItems(plugins);
|
||||
const { items, allItems, setItems, reset } = useDock(
|
||||
allDockItems,
|
||||
useMemo(() => defaultDockPaths(plugins), [plugins]),
|
||||
@@ -193,10 +195,10 @@ export const DockSettings = () => {
|
||||
|
||||
return (
|
||||
<div className="grid gap-4">
|
||||
<DropZone label="Visible" onDrop={onDropVisible}>
|
||||
<DropZone label={t('settings.profile.dock.visible')} onDrop={onDropVisible}>
|
||||
{items.length === 0 && (
|
||||
<span className="text-xs text-duck-dark/30 dark:text-foreground/30 py-1">
|
||||
Drag items here to show in dock
|
||||
{t('settings.profile.dock.dragToShow')}
|
||||
</span>
|
||||
)}
|
||||
{items.map((item) => (
|
||||
@@ -216,9 +218,11 @@ export const DockSettings = () => {
|
||||
))}
|
||||
</DropZone>
|
||||
|
||||
<DropZone label="Hidden" onDrop={onDropHidden}>
|
||||
<DropZone label={t('settings.profile.dock.hidden')} onDrop={onDropHidden}>
|
||||
{hiddenItems.length === 0 && (
|
||||
<span className="text-xs text-duck-dark/30 dark:text-foreground/30 py-1">All items visible</span>
|
||||
<span className="text-xs text-duck-dark/30 dark:text-foreground/30 py-1">
|
||||
{t('settings.profile.dock.allVisible')}
|
||||
</span>
|
||||
)}
|
||||
{hiddenItems.map((item) => (
|
||||
<DockPill
|
||||
@@ -235,7 +239,7 @@ export const DockSettings = () => {
|
||||
|
||||
<Button type="button" variant="outline" onClick={reset} className="w-full h-9 text-sm cursor-pointer">
|
||||
<RotateCcw className="h-3.5 w-3.5 mr-1.5" />
|
||||
Reset to defaults
|
||||
{t('settings.profile.dock.reset')}
|
||||
</Button>
|
||||
</div>
|
||||
);
|
||||
|
||||
@@ -1,46 +1,67 @@
|
||||
import { useState } from 'react';
|
||||
import { useMemo, useState } from 'react';
|
||||
import { X } from 'lucide-react';
|
||||
import { Label } from '@/components/ui/label';
|
||||
import { useSettings } from 'state/useSettings';
|
||||
import { useTranslation } from '@/lib/i18n';
|
||||
import { SHIPPED_LOCALES } from '@/lib/locales';
|
||||
|
||||
const LANGUAGES = [
|
||||
{ code: 'en', label: 'English' },
|
||||
{ code: 'pt', label: 'Portuguese' },
|
||||
{ code: 'es', label: 'Spanish' },
|
||||
{ code: 'fr', label: 'French' },
|
||||
{ code: 'de', label: 'German' },
|
||||
{ code: 'it', label: 'Italian' },
|
||||
{ code: 'nl', label: 'Dutch' },
|
||||
{ code: 'ru', label: 'Russian' },
|
||||
{ code: 'zh', label: 'Chinese' },
|
||||
{ code: 'ja', label: 'Japanese' },
|
||||
{ code: 'ko', label: 'Korean' },
|
||||
{ code: 'ar', label: 'Arabic' },
|
||||
{ code: 'hi', label: 'Hindi' },
|
||||
{ code: 'tr', label: 'Turkish' },
|
||||
{ code: 'pl', label: 'Polish' },
|
||||
{ code: 'sv', label: 'Swedish' },
|
||||
{ code: 'da', label: 'Danish' },
|
||||
{ code: 'no', label: 'Norwegian' },
|
||||
{ code: 'fi', label: 'Finnish' },
|
||||
{ code: 'uk', label: 'Ukrainian' },
|
||||
{ code: 'cs', label: 'Czech' },
|
||||
{ code: 'ro', label: 'Romanian' },
|
||||
{ code: 'el', label: 'Greek' },
|
||||
{ code: 'he', label: 'Hebrew' },
|
||||
{ code: 'th', label: 'Thai' },
|
||||
{ code: 'vi', label: 'Vietnamese' },
|
||||
{ code: 'id', label: 'Indonesian' },
|
||||
{ code: 'ms', label: 'Malay' },
|
||||
];
|
||||
/**
|
||||
* Language names come from `Intl.DisplayNames`, not from the catalog.
|
||||
*
|
||||
* The runtime already knows every language's name in every locale — "German" in English, "alemão" in
|
||||
* Portuguese — so 28 names would have been 56 hand-written catalog entries that `Intl` gets right for
|
||||
* free, including for locales we have not shipped yet. Same reasoning as D7 for dates and numbers.
|
||||
*
|
||||
* The tags themselves stay a hardcoded list: this is "which languages may I claim to speak", a product
|
||||
* choice, not something to enumerate from the runtime.
|
||||
*/
|
||||
const SPOKEN_LANGUAGE_TAGS = [
|
||||
'en',
|
||||
'pt',
|
||||
'es',
|
||||
'fr',
|
||||
'de',
|
||||
'it',
|
||||
'nl',
|
||||
'ru',
|
||||
'zh',
|
||||
'ja',
|
||||
'ko',
|
||||
'ar',
|
||||
'hi',
|
||||
'tr',
|
||||
'pl',
|
||||
'sv',
|
||||
'da',
|
||||
'no',
|
||||
'fi',
|
||||
'uk',
|
||||
'cs',
|
||||
'ro',
|
||||
'el',
|
||||
'he',
|
||||
'th',
|
||||
'vi',
|
||||
'id',
|
||||
'ms',
|
||||
] as const;
|
||||
|
||||
const getLabel = (code: string) => LANGUAGES.find((l) => l.code === code)?.label ?? code;
|
||||
/** `Intl` yields "alemão" in pt; a picker row reads better capitalized. */
|
||||
const useLanguageName = () => {
|
||||
const { locale } = useTranslation();
|
||||
return useMemo(() => {
|
||||
const names = new Intl.DisplayNames([locale], { type: 'language', fallback: 'code' });
|
||||
return (code: string) => {
|
||||
const name = names.of(code) ?? code;
|
||||
return name.charAt(0).toUpperCase() + name.slice(1);
|
||||
};
|
||||
}, [locale]);
|
||||
};
|
||||
|
||||
export const Languages = () => {
|
||||
const { settings, saveSettings } = useSettings();
|
||||
const { t } = useTranslation();
|
||||
const languageName = useLanguageName();
|
||||
const { spoken, default: defaultLang, translateTo } = settings.languages;
|
||||
const [addingLang, setAddingLang] = useState('');
|
||||
|
||||
@@ -63,7 +84,7 @@ export const Languages = () => {
|
||||
save(updates);
|
||||
};
|
||||
|
||||
const availableToAdd = LANGUAGES.filter((l) => !spoken.includes(l.code));
|
||||
const availableToAdd = SPOKEN_LANGUAGE_TAGS.filter((code) => !spoken.includes(code));
|
||||
|
||||
return (
|
||||
<div className="grid gap-5">
|
||||
@@ -76,7 +97,7 @@ export const Languages = () => {
|
||||
key={code}
|
||||
className="inline-flex items-center gap-1.5 px-3 py-1.5 rounded-full bg-duck-teal/10 text-duck-teal text-sm font-medium"
|
||||
>
|
||||
{getLabel(code)}
|
||||
{languageName(code)}
|
||||
{spoken.length > 1 && (
|
||||
<button
|
||||
onClick={() => removeSpoken(code)}
|
||||
@@ -96,9 +117,9 @@ export const Languages = () => {
|
||||
className="text-sm border border-duck-dark/20 rounded-md px-3 py-1.5 bg-background/60 text-duck-dark cursor-pointer"
|
||||
>
|
||||
<option value="">{t('settings.profile.languages.addLanguage')}</option>
|
||||
{availableToAdd.map((l) => (
|
||||
<option key={l.code} value={l.code}>
|
||||
{l.label}
|
||||
{availableToAdd.map((code) => (
|
||||
<option key={code} value={code}>
|
||||
{languageName(code)}
|
||||
</option>
|
||||
))}
|
||||
</select>
|
||||
@@ -131,9 +152,9 @@ export const Languages = () => {
|
||||
onChange={(ev) => save({ ...settings.languages, translateTo: ev.target.value })}
|
||||
className="text-sm border border-duck-dark/20 rounded-md px-3 py-2 bg-background/60 text-duck-dark cursor-pointer"
|
||||
>
|
||||
{LANGUAGES.map((l) => (
|
||||
<option key={l.code} value={l.code}>
|
||||
{l.label}
|
||||
{SPOKEN_LANGUAGE_TAGS.map((code) => (
|
||||
<option key={code} value={code}>
|
||||
{languageName(code)}
|
||||
</option>
|
||||
))}
|
||||
</select>
|
||||
|
||||
@@ -13,8 +13,10 @@ import {
|
||||
} from '@/components/ui/select';
|
||||
import { useSettings } from 'state/useSettings';
|
||||
import { useUserVisibleModels, type ModelOption } from 'state/useModels';
|
||||
import { useTranslation } from '@/lib/i18n';
|
||||
|
||||
export const TaskDefaults = () => {
|
||||
const { t } = useTranslation();
|
||||
const { settings, saveSettings } = useSettings();
|
||||
const models = useUserVisibleModels();
|
||||
const [isSaving, setIsSaving] = useState(false);
|
||||
@@ -44,9 +46,9 @@ export const TaskDefaults = () => {
|
||||
setIsSaving(true);
|
||||
try {
|
||||
await saveSettings({ ...settings, tasks: { defaultProvider: 'chat', defaultModel: model } });
|
||||
toast.success('Task defaults saved');
|
||||
toast.success(t('settings.profile.models.taskDefaultsSaved'));
|
||||
} catch {
|
||||
toast.error('Failed to save settings');
|
||||
toast.error(t('settings.profile.models.saveFailed'));
|
||||
} finally {
|
||||
setIsSaving(false);
|
||||
}
|
||||
@@ -55,10 +57,10 @@ export const TaskDefaults = () => {
|
||||
return (
|
||||
<div className="grid gap-4">
|
||||
<Label className="grid gap-2">
|
||||
<span className="text-duck-dark/70">Default Model</span>
|
||||
<span className="text-duck-dark/70">{t('settings.profile.models.defaultModel')}</span>
|
||||
<Select value={model ?? ''} onValueChange={(v) => setModel(v || null)}>
|
||||
<SelectTrigger className="h-11 bg-background/60 border-duck-dark/20 text-duck-dark">
|
||||
<SelectValue placeholder="Same as chat default" />
|
||||
<SelectValue placeholder={t('settings.profile.models.sameAsChat')} />
|
||||
</SelectTrigger>
|
||||
<SelectContent className="z-[600] max-h-[300px]">
|
||||
{modelGroups.map(({ provider, models }) => (
|
||||
|
||||
@@ -7,6 +7,7 @@ import { Label } from '@/components/ui/label';
|
||||
import { Button } from '@/components/ui/button';
|
||||
import { useForm } from 'hooks/useForm';
|
||||
import { useAuth } from 'hooks/useAuth';
|
||||
import { useTranslation } from '@/lib/i18n';
|
||||
|
||||
type ProfileFormState = {
|
||||
name?: string;
|
||||
@@ -24,6 +25,7 @@ const readFileAsBase64 = (file: File): Promise<string> => {
|
||||
};
|
||||
|
||||
export const UserData = () => {
|
||||
const { t } = useTranslation();
|
||||
const { user, updateUser } = useAuth();
|
||||
const [isUpdating, setIsUpdating] = useState(false);
|
||||
const [avatarPreview, setAvatarPreview] = useState<string | null>(null);
|
||||
@@ -35,12 +37,12 @@ export const UserData = () => {
|
||||
if (!file) return;
|
||||
|
||||
if (!file.type.startsWith('image/')) {
|
||||
toast.error('Please select an image file');
|
||||
toast.error(t('settings.profile.userData.selectImage'));
|
||||
return;
|
||||
}
|
||||
|
||||
if (file.size > MAX_AVATAR_SIZE) {
|
||||
toast.error('Image must be smaller than 384KB');
|
||||
toast.error(t('settings.profile.userData.imageTooLarge'));
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -58,11 +60,11 @@ export const UserData = () => {
|
||||
name: profileForm.state.name ?? '',
|
||||
avatar: avatarPreview ?? user?.avatar ?? '',
|
||||
});
|
||||
toast.success('Profile updated');
|
||||
toast.success(t('settings.profile.userData.updated'));
|
||||
setAvatarPreview(null);
|
||||
} catch (ex) {
|
||||
const error = ex as { message?: string };
|
||||
toast.error(error.message || 'Failed to update profile');
|
||||
toast.error(error.message || t('settings.profile.userData.updateFailed'));
|
||||
} finally {
|
||||
setIsUpdating(false);
|
||||
}
|
||||
@@ -93,7 +95,7 @@ export const UserData = () => {
|
||||
|
||||
<form ref={profileForm.formRef} onSubmit={handleSubmit} className="grid gap-4">
|
||||
<Label className="grid gap-2">
|
||||
<span className="text-duck-dark/70">Email</span>
|
||||
<span className="text-duck-dark/70">{t('settings.profile.userData.email')}</span>
|
||||
<Input
|
||||
className="h-11 bg-background/60 border-duck-dark/20 text-duck-dark placeholder:text-duck-dark/40"
|
||||
type="email"
|
||||
@@ -103,7 +105,7 @@ export const UserData = () => {
|
||||
</Label>
|
||||
|
||||
<Label className="grid gap-2">
|
||||
<span className="text-duck-dark/70">Username</span>
|
||||
<span className="text-duck-dark/70">{t('settings.profile.userData.username')}</span>
|
||||
<Input
|
||||
className="h-11 bg-background/60 border-duck-dark/20 text-duck-dark placeholder:text-duck-dark/40"
|
||||
type="text"
|
||||
@@ -113,12 +115,12 @@ export const UserData = () => {
|
||||
</Label>
|
||||
|
||||
<Label className="grid gap-2">
|
||||
<span className="text-duck-dark/70">Name</span>
|
||||
<span className="text-duck-dark/70">{t('settings.profile.userData.name')}</span>
|
||||
<Input
|
||||
className="h-11 bg-background/60 border-duck-dark/20 text-duck-dark placeholder:text-duck-dark/40"
|
||||
type="text"
|
||||
name="name"
|
||||
placeholder="Your name"
|
||||
placeholder={t('settings.profile.userData.namePlaceholder')}
|
||||
autoComplete="name"
|
||||
/>
|
||||
</Label>
|
||||
@@ -128,7 +130,7 @@ export const UserData = () => {
|
||||
disabled={isUpdating}
|
||||
className="w-full h-11 bg-duck-yellow hover:bg-duck-yellow/90 text-duck-teal font-bold transition-all duration-200 hover:scale-105 cursor-pointer disabled:opacity-50 disabled:hover:scale-100"
|
||||
>
|
||||
{isUpdating ? 'Saving...' : 'Save'}
|
||||
{isUpdating ? t('common.saving') : t('common.save')}
|
||||
</Button>
|
||||
</form>
|
||||
</div>
|
||||
|
||||
@@ -12,6 +12,7 @@ import {
|
||||
} from '@/components/ui/select';
|
||||
import { useClient } from 'hooks/useClient';
|
||||
import { useSettings } from 'state/useSettings';
|
||||
import { useTranslation } from '@/lib/i18n';
|
||||
|
||||
type VoiceGroup = { label: string; voices: string[] };
|
||||
|
||||
@@ -26,6 +27,7 @@ type TtsConfig = {
|
||||
const SERVER_DEFAULT = '__server_default__';
|
||||
|
||||
export const VoicePreference = () => {
|
||||
const { t } = useTranslation();
|
||||
const client = useClient();
|
||||
const { settings, saveSettings } = useSettings();
|
||||
const [voices, setVoices] = useState<string[]>([]);
|
||||
@@ -128,13 +130,13 @@ export const VoicePreference = () => {
|
||||
<div className="grid gap-4">
|
||||
<Label className="grid gap-2">
|
||||
<div className="flex items-center gap-1.5">
|
||||
<span className="text-duck-dark/70 dark:text-foreground/70">Voice</span>
|
||||
<span className="text-duck-dark/70 dark:text-foreground/70">{t('settings.profile.voice.label')}</span>
|
||||
<button
|
||||
type="button"
|
||||
onClick={handleRefresh}
|
||||
disabled={loading}
|
||||
className="p-0.5 rounded hover:bg-duck-dark/10 dark:hover:bg-foreground/10 cursor-pointer transition-colors disabled:opacity-40"
|
||||
title="Refresh voices"
|
||||
title={t('settings.profile.voice.refresh')}
|
||||
>
|
||||
<RefreshCw
|
||||
className={`h-3 w-3 text-duck-dark/50 dark:text-foreground/50 ${loading ? 'animate-spin' : ''}`}
|
||||
@@ -144,7 +146,7 @@ export const VoicePreference = () => {
|
||||
<div className="flex items-center gap-2">
|
||||
<Select value={selectedValue} onValueChange={handleChange}>
|
||||
<SelectTrigger className="h-11 bg-background/60 border-duck-dark/20 text-duck-dark dark:text-foreground">
|
||||
<SelectValue placeholder="Server default" />
|
||||
<SelectValue placeholder={t('settings.profile.voice.serverDefault')} />
|
||||
</SelectTrigger>
|
||||
<SelectContent className="z-[600] max-h-[300px]">
|
||||
<SelectItem value={SERVER_DEFAULT}>
|
||||
@@ -175,7 +177,7 @@ export const VoicePreference = () => {
|
||||
onClick={handleListen}
|
||||
disabled={listening === 'loading' || !serverConfig}
|
||||
className="shrink-0 h-11 w-11 flex items-center justify-center rounded-md border border-duck-dark/20 bg-background/60 hover:bg-duck-dark/10 dark:hover:bg-foreground/10 cursor-pointer transition-colors disabled:opacity-40 disabled:cursor-default"
|
||||
title={listening === 'playing' ? 'Stop' : 'Listen'}
|
||||
title={listening === 'playing' ? t('settings.profile.voice.stop') : t('settings.profile.voice.listen')}
|
||||
>
|
||||
{listening === 'loading' ? (
|
||||
<Loader2 className="h-4 w-4 text-duck-dark/70 dark:text-foreground/70 animate-spin" />
|
||||
@@ -186,9 +188,7 @@ export const VoicePreference = () => {
|
||||
)}
|
||||
</button>
|
||||
</div>
|
||||
<span className="text-xs text-duck-dark/40 dark:text-foreground/40">
|
||||
Choose a voice for text-to-speech. Leave as server default to use the admin-configured voice.
|
||||
</span>
|
||||
<span className="text-xs text-duck-dark/40 dark:text-foreground/40">{t('settings.profile.voice.hint')}</span>
|
||||
</Label>
|
||||
</div>
|
||||
);
|
||||
|
||||
@@ -14,12 +14,18 @@ import { VoicePreference } from './VoicePreference';
|
||||
const BASE_PATH = '/settings/profile';
|
||||
|
||||
const sections: SettingsSection[] = [
|
||||
{ key: 'profile', icon: User, title: 'Profile', description: 'Avatar, name, and email', content: <UserData /> },
|
||||
{
|
||||
key: 'profile',
|
||||
icon: User,
|
||||
titleKey: 'settings.sections.profile.label',
|
||||
descriptionKey: 'settings.sections.profile.description',
|
||||
content: <UserData />,
|
||||
},
|
||||
{
|
||||
key: 'change-password',
|
||||
icon: Lock,
|
||||
title: 'Change Password',
|
||||
description: 'Update your password',
|
||||
titleKey: 'settings.sections.changePassword.label',
|
||||
descriptionKey: 'settings.sections.changePassword.description',
|
||||
content: <ChangePassword />,
|
||||
},
|
||||
// Beside the password rather than under Integrations, where it was until 2026-08-21. A key is not an
|
||||
@@ -29,29 +35,29 @@ const sections: SettingsSection[] = [
|
||||
{
|
||||
key: 'api-keys',
|
||||
icon: KeyRound,
|
||||
title: 'API keys',
|
||||
description: 'Keys that sign in as you, revocable one at a time',
|
||||
titleKey: 'settings.sections.apiKeys.label',
|
||||
descriptionKey: 'settings.sections.apiKeys.description',
|
||||
content: <ApiKeys />,
|
||||
},
|
||||
{
|
||||
key: 'languages',
|
||||
icon: Globe,
|
||||
title: 'Languages',
|
||||
description: 'Spoken, default, and translation',
|
||||
titleKey: 'settings.sections.languages.label',
|
||||
descriptionKey: 'settings.sections.languages.description',
|
||||
content: <Languages />,
|
||||
},
|
||||
{
|
||||
key: 'voice',
|
||||
icon: Volume2,
|
||||
title: 'Voice',
|
||||
description: 'Text-to-speech voice preference',
|
||||
titleKey: 'settings.sections.voice.label',
|
||||
descriptionKey: 'settings.sections.voice.description',
|
||||
content: <VoicePreference />,
|
||||
},
|
||||
{
|
||||
key: 'dock',
|
||||
icon: LayoutGrid,
|
||||
title: 'Dock',
|
||||
description: 'Choose and reorder dock items',
|
||||
titleKey: 'settings.sections.dock.label',
|
||||
descriptionKey: 'settings.sections.dock.description',
|
||||
content: <DockSettings />,
|
||||
},
|
||||
];
|
||||
@@ -59,7 +65,7 @@ const sections: SettingsSection[] = [
|
||||
const { Sidebar, Content } = createSettingsPanelComponents({
|
||||
basePath: BASE_PATH,
|
||||
sidebarIcon: User,
|
||||
sidebarLabel: 'Profile',
|
||||
sidebarLabelKey: 'settings.nav.profile',
|
||||
sections,
|
||||
});
|
||||
|
||||
|
||||
+44
-32
@@ -13,6 +13,7 @@ import {
|
||||
CommandList,
|
||||
} from '@/components/ui/command';
|
||||
import { useClient } from 'hooks/useClient';
|
||||
import { useTranslation } from '@/lib/i18n';
|
||||
|
||||
type VersionInfo = { version: string | null; path: string | null; globalPath: string | null };
|
||||
type StoredApiKeys = { keys: { provider: string; value: string }[] };
|
||||
@@ -38,6 +39,7 @@ type ChatProvider = { key: string; providerId: string };
|
||||
type ProbeState = { step: 'url' } | { step: 'probing' } | { step: 'auth'; probe: ProbeResult } | { step: 'saving' };
|
||||
|
||||
export const AIHarnessesSection = () => {
|
||||
const { t, tUi } = useTranslation();
|
||||
const client = useClient();
|
||||
const queryClient = useQueryClient();
|
||||
const [installing, setInstalling] = useState(false);
|
||||
@@ -168,7 +170,7 @@ export const AIHarnessesSection = () => {
|
||||
// No auth needed — save directly
|
||||
await saveLocalProvider(result, auth);
|
||||
} catch {
|
||||
toast.error('Failed to connect');
|
||||
toast.error(t('settings.server.harnesses.connectFailed'));
|
||||
setProbeState({ step: 'url' });
|
||||
}
|
||||
};
|
||||
@@ -192,13 +194,13 @@ export const AIHarnessesSection = () => {
|
||||
return;
|
||||
}
|
||||
if (result.needsAuth) {
|
||||
toast.error('Authentication failed');
|
||||
toast.error(t('settings.server.harnesses.authFailed'));
|
||||
setProbeState({ step: 'auth', probe });
|
||||
return;
|
||||
}
|
||||
await saveLocalProvider(result, auth);
|
||||
} catch {
|
||||
toast.error('Failed to connect');
|
||||
toast.error(t('settings.server.harnesses.connectFailed'));
|
||||
setProbeState({ step: 'auth', probe });
|
||||
}
|
||||
};
|
||||
@@ -218,10 +220,10 @@ export const AIHarnessesSection = () => {
|
||||
queryClient.invalidateQueries({ queryKey: ['CHAT_PROVIDERS_LOCAL_PROVIDERS'] });
|
||||
queryClient.invalidateQueries({ queryKey: ['CHAT_PROVIDERS_LOCAL_HEALTH'] });
|
||||
queryClient.invalidateQueries({ queryKey: ['CHAT_MODELS'] });
|
||||
toast.success(`Connected to ${probe.name}`);
|
||||
toast.success(t('settings.server.harnesses.connectedTo', { name: probe.name ?? '' }));
|
||||
resetLocalForm();
|
||||
} catch {
|
||||
toast.error('Failed to save provider');
|
||||
toast.error(t('settings.server.harnesses.saveFailed'));
|
||||
setProbeState({ step: 'url' });
|
||||
}
|
||||
};
|
||||
@@ -254,9 +256,9 @@ export const AIHarnessesSection = () => {
|
||||
<div className="flex flex-col gap-4">
|
||||
<div>
|
||||
<div className="flex items-center gap-3">
|
||||
<span className="text-sm font-medium text-duck-dark">Pi Mono</span>
|
||||
<span className="text-sm font-medium text-duck-dark">{t('settings.server.harnesses.piMono')}</span>
|
||||
{piMonoLoading ? (
|
||||
<span className="text-xs text-duck-dark/50">Checking...</span>
|
||||
<span className="text-xs text-duck-dark/50">{t('settings.server.harnesses.checking')}</span>
|
||||
) : piMonoVersion?.version ? (
|
||||
<div className="flex items-center gap-2">
|
||||
<span className="text-xs text-duck-dark/50">{piMonoVersion.version}</span>
|
||||
@@ -265,7 +267,7 @@ export const AIHarnessesSection = () => {
|
||||
onClick={installAgent}
|
||||
disabled={installing}
|
||||
className="p-0.5 rounded hover:bg-duck-teal/10 cursor-pointer transition-colors disabled:opacity-30"
|
||||
title="Update Pi Mono"
|
||||
title={t('settings.server.harnesses.updatePiMono')}
|
||||
>
|
||||
<RefreshCw className={`h-3 w-3 text-duck-teal ${installing ? 'animate-spin' : ''}`} />
|
||||
</button>
|
||||
@@ -285,13 +287,21 @@ export const AIHarnessesSection = () => {
|
||||
<>
|
||||
{/* Local Providers */}
|
||||
<div className="mt-6 text-xs text-duck-dark/50">
|
||||
<span className="text-sm font-medium text-duck-dark dark:text-foreground">Local Providers</span>
|
||||
<span className="text-sm font-medium text-duck-dark dark:text-foreground">
|
||||
{t('settings.server.harnesses.localProviders')}
|
||||
</span>
|
||||
<div className="mt-3 flex flex-col gap-2">
|
||||
{localProviders.map((lp: LocalProviderEntry) => (
|
||||
<div key={lp.id} className="flex items-center gap-2">
|
||||
<span
|
||||
className={`inline-block h-2 w-2 shrink-0 rounded-full ${lp.id in localHealth ? (localHealth[lp.id] ? 'bg-success' : 'bg-red-500') : 'bg-duck-dark/20'}`}
|
||||
title={lp.id in localHealth ? (localHealth[lp.id] ? 'Online' : 'Offline') : 'Checking...'}
|
||||
title={
|
||||
lp.id in localHealth
|
||||
? localHealth[lp.id]
|
||||
? 'Online'
|
||||
: 'Offline'
|
||||
: t('settings.server.harnesses.checking')
|
||||
}
|
||||
/>
|
||||
<span className="text-duck-dark/70 dark:text-foreground/70 font-medium">{lp.name}</span>
|
||||
<span className="text-duck-dark/40 dark:text-foreground/40 truncate">{lp.url}</span>
|
||||
@@ -299,7 +309,7 @@ export const AIHarnessesSection = () => {
|
||||
type="button"
|
||||
onClick={() => removeLocalProvider(lp.id)}
|
||||
className="shrink-0 p-0.5 rounded hover:bg-red-500/10 cursor-pointer transition-colors"
|
||||
title="Remove provider"
|
||||
title={t('settings.server.harnesses.removeProvider')}
|
||||
>
|
||||
<Trash2 className="h-3 w-3 text-duck-dark/30 hover:text-red-500" />
|
||||
</button>
|
||||
@@ -312,7 +322,7 @@ export const AIHarnessesSection = () => {
|
||||
<Input
|
||||
type="text"
|
||||
className="h-8 text-xs"
|
||||
placeholder="Name (e.g. My Ollama)"
|
||||
placeholder={t('settings.server.harnesses.namePlaceholder')}
|
||||
value={localName}
|
||||
onChange={(ev) => setLocalName(ev.target.value)}
|
||||
onKeyDown={(ev) => {
|
||||
@@ -340,7 +350,7 @@ export const AIHarnessesSection = () => {
|
||||
className="h-7 text-xs bg-duck-dark text-white hover:bg-duck-dark/90 dark:bg-foreground dark:text-background dark:hover:bg-foreground/90 cursor-pointer disabled:opacity-40"
|
||||
disabled={!localUrl.trim()}
|
||||
>
|
||||
Connect
|
||||
{t('settings.server.harnesses.connect')}
|
||||
</Button>
|
||||
)}
|
||||
{(probeState.step === 'probing' || probeState.step === 'saving') && (
|
||||
@@ -351,7 +361,7 @@ export const AIHarnessesSection = () => {
|
||||
onClick={resetLocalForm}
|
||||
className="text-duck-dark/40 hover:text-duck-dark/70 dark:text-foreground/40 dark:hover:text-foreground/70 cursor-pointer transition-colors text-xs"
|
||||
>
|
||||
Cancel
|
||||
{tUi('button.cancel')}
|
||||
</button>
|
||||
</div>
|
||||
</form>
|
||||
@@ -370,7 +380,7 @@ export const AIHarnessesSection = () => {
|
||||
<Input
|
||||
type="text"
|
||||
className="h-8 text-xs"
|
||||
placeholder="Username"
|
||||
placeholder={t('settings.server.harnesses.username')}
|
||||
value={authUsername}
|
||||
onChange={(ev) => setAuthUsername(ev.target.value)}
|
||||
autoFocus
|
||||
@@ -378,7 +388,7 @@ export const AIHarnessesSection = () => {
|
||||
<Input
|
||||
type="password"
|
||||
className="h-8 text-xs"
|
||||
placeholder="Password"
|
||||
placeholder={t('settings.server.harnesses.password')}
|
||||
value={authPassword}
|
||||
onChange={(ev) => setAuthPassword(ev.target.value)}
|
||||
/>
|
||||
@@ -388,7 +398,7 @@ export const AIHarnessesSection = () => {
|
||||
className="h-7 text-xs w-fit bg-duck-dark text-white hover:bg-duck-dark/90 dark:bg-foreground dark:text-background dark:hover:bg-foreground/90 cursor-pointer disabled:opacity-40"
|
||||
disabled={!authUsername || !authPassword}
|
||||
>
|
||||
Authenticate
|
||||
{t('settings.server.harnesses.authenticate')}
|
||||
</Button>
|
||||
</>
|
||||
) : (
|
||||
@@ -396,7 +406,7 @@ export const AIHarnessesSection = () => {
|
||||
<Input
|
||||
type="password"
|
||||
className="h-8 text-xs"
|
||||
placeholder="API Key"
|
||||
placeholder={t('settings.server.harnesses.apiKey')}
|
||||
value={authApiKey}
|
||||
onChange={(ev) => setAuthApiKey(ev.target.value)}
|
||||
autoFocus
|
||||
@@ -407,7 +417,7 @@ export const AIHarnessesSection = () => {
|
||||
className="h-7 text-xs w-fit bg-duck-dark text-white hover:bg-duck-dark/90 dark:bg-foreground dark:text-background dark:hover:bg-foreground/90 cursor-pointer disabled:opacity-40"
|
||||
disabled={!authApiKey}
|
||||
>
|
||||
Authenticate
|
||||
{t('settings.server.harnesses.authenticate')}
|
||||
</Button>
|
||||
</>
|
||||
)}
|
||||
@@ -423,7 +433,7 @@ export const AIHarnessesSection = () => {
|
||||
onClick={() => setAddingLocal(true)}
|
||||
>
|
||||
<Plus className="h-3.5 w-3.5 mr-1.5" />
|
||||
Connect Local Provider
|
||||
{t('settings.server.harnesses.connectLocal')}
|
||||
</Button>
|
||||
)}
|
||||
</div>
|
||||
@@ -431,7 +441,9 @@ export const AIHarnessesSection = () => {
|
||||
|
||||
{/* Remote Providers */}
|
||||
<div className="mt-6 text-xs text-duck-dark/50">
|
||||
<span className="text-sm font-medium text-duck-dark dark:text-foreground">Remote Providers</span>
|
||||
<span className="text-sm font-medium text-duck-dark dark:text-foreground">
|
||||
{t('settings.server.harnesses.remoteProviders')}
|
||||
</span>
|
||||
<div className="mt-3 flex flex-col gap-2">
|
||||
{connectedProviders.map((provider) => (
|
||||
<div key={provider.providerId} className="flex flex-col gap-2">
|
||||
@@ -457,7 +469,7 @@ export const AIHarnessesSection = () => {
|
||||
type="button"
|
||||
onClick={() => setEditingProvider(editingProvider === provider.key ? null : provider.key)}
|
||||
className="shrink-0 p-0.5 rounded hover:bg-duck-teal/10 cursor-pointer transition-colors"
|
||||
title="Edit key"
|
||||
title={t('settings.server.harnesses.editKey')}
|
||||
>
|
||||
<Pencil className="h-3 w-3 text-duck-dark/30 hover:text-duck-teal" />
|
||||
</button>
|
||||
@@ -465,7 +477,7 @@ export const AIHarnessesSection = () => {
|
||||
type="button"
|
||||
onClick={() => disconnectProvider(provider)}
|
||||
className="shrink-0 p-0.5 rounded hover:bg-red-500/10 cursor-pointer transition-colors"
|
||||
title="Disconnect provider"
|
||||
title={t('settings.server.harnesses.disconnect')}
|
||||
>
|
||||
<Trash2 className="h-3 w-3 text-duck-dark/30 hover:text-red-500" />
|
||||
</button>
|
||||
@@ -478,7 +490,7 @@ export const AIHarnessesSection = () => {
|
||||
<Input
|
||||
type="password"
|
||||
className="h-7 text-xs flex-1"
|
||||
placeholder={getStoredMasked(provider.providerId) || 'Enter API key'}
|
||||
placeholder={getStoredMasked(provider.providerId) || t('settings.server.harnesses.enterKey')}
|
||||
value={keyInputs[provider.providerId] ?? ''}
|
||||
onChange={(ev) =>
|
||||
setKeyInputs((prev) => ({ ...prev, [provider.providerId]: ev.target.value }))
|
||||
@@ -492,7 +504,7 @@ export const AIHarnessesSection = () => {
|
||||
type="submit"
|
||||
disabled={keyInputs[provider.providerId] === undefined || savingKey === provider.providerId}
|
||||
className="shrink-0 p-1 rounded hover:bg-duck-teal/10 cursor-pointer transition-colors disabled:opacity-30 disabled:cursor-default"
|
||||
title="Save key"
|
||||
title={t('settings.server.harnesses.saveKey')}
|
||||
>
|
||||
<Save className="h-3.5 w-3.5 text-duck-teal" />
|
||||
</button>
|
||||
@@ -501,7 +513,7 @@ export const AIHarnessesSection = () => {
|
||||
onClick={() => setEditingProvider(null)}
|
||||
className="text-duck-dark/40 hover:text-duck-dark/70 dark:text-foreground/40 dark:hover:text-foreground/70 cursor-pointer transition-colors text-xs"
|
||||
>
|
||||
Cancel
|
||||
{tUi('button.cancel')}
|
||||
</button>
|
||||
</form>
|
||||
)}
|
||||
@@ -524,7 +536,7 @@ export const AIHarnessesSection = () => {
|
||||
<Input
|
||||
type="password"
|
||||
className="h-7 text-xs flex-1"
|
||||
placeholder="Enter API key"
|
||||
placeholder={t('settings.server.harnesses.enterKey')}
|
||||
value={keyInputs[provider.providerId] ?? ''}
|
||||
onChange={(ev) =>
|
||||
setKeyInputs((prev) => ({ ...prev, [provider.providerId]: ev.target.value }))
|
||||
@@ -538,7 +550,7 @@ export const AIHarnessesSection = () => {
|
||||
type="submit"
|
||||
disabled={keyInputs[provider.providerId] === undefined || savingKey === provider.providerId}
|
||||
className="shrink-0 p-1 rounded hover:bg-duck-teal/10 cursor-pointer transition-colors disabled:opacity-30 disabled:cursor-default"
|
||||
title="Save key"
|
||||
title={t('settings.server.harnesses.saveKey')}
|
||||
>
|
||||
<Save className="h-3.5 w-3.5 text-duck-teal" />
|
||||
</button>
|
||||
@@ -547,7 +559,7 @@ export const AIHarnessesSection = () => {
|
||||
onClick={() => setEditingProvider(null)}
|
||||
className="text-duck-dark/40 hover:text-duck-dark/70 dark:text-foreground/40 dark:hover:text-foreground/70 cursor-pointer transition-colors text-xs"
|
||||
>
|
||||
Cancel
|
||||
{tUi('button.cancel')}
|
||||
</button>
|
||||
</form>
|
||||
);
|
||||
@@ -561,14 +573,14 @@ export const AIHarnessesSection = () => {
|
||||
onClick={() => setCommandOpen(true)}
|
||||
>
|
||||
<Plus className="h-3.5 w-3.5 mr-1.5" />
|
||||
Connect Provider
|
||||
{t('settings.server.harnesses.connectProvider')}
|
||||
</Button>
|
||||
)}
|
||||
</div>
|
||||
<CommandDialog open={commandOpen} onOpenChange={setCommandOpen}>
|
||||
<CommandInput placeholder="Search providers..." />
|
||||
<CommandInput placeholder={t('settings.server.harnesses.search')} />
|
||||
<CommandList>
|
||||
<CommandEmpty>No providers found.</CommandEmpty>
|
||||
<CommandEmpty>{t('settings.server.harnesses.none')}</CommandEmpty>
|
||||
<CommandGroup heading="Available Providers">
|
||||
{unconnectedProviders.map((provider) => (
|
||||
<CommandItem
|
||||
|
||||
+11
-11
@@ -3,6 +3,7 @@ import { Download, Hammer, Loader2, RotateCw } from 'lucide-react';
|
||||
import { toast } from 'sonner';
|
||||
import { Button } from '@/components/ui/button';
|
||||
import { useClient } from 'hooks/useClient';
|
||||
import { useTranslation } from '@/lib/i18n';
|
||||
|
||||
/**
|
||||
* The two ways to load a change without leaving the browser.
|
||||
@@ -30,6 +31,7 @@ export function errorMessage(err: unknown, fallback: string): string {
|
||||
}
|
||||
|
||||
export const MaintenanceSection = () => {
|
||||
const { t } = useTranslation();
|
||||
const client = useClient();
|
||||
const [pulling, setPulling] = useState(false);
|
||||
const [pulled, setPulled] = useState<{ from: string; to: string; commits: string[]; needs: string[] } | null>(null);
|
||||
@@ -58,11 +60,11 @@ export const MaintenanceSection = () => {
|
||||
}>('/server-settings/pull', {});
|
||||
if (!res.updated) {
|
||||
setPulled(null);
|
||||
toast.success('Already up to date');
|
||||
toast.success(t('settings.server.maintenance.upToDate'));
|
||||
return;
|
||||
}
|
||||
setPulled({ from: res.from ?? '', to: res.to ?? '', commits: res.commits, needs: res.needs });
|
||||
toast.success(`Pulled ${res.commits.length} commit${res.commits.length === 1 ? '' : 's'}`);
|
||||
toast.success(t('settings.server.maintenance.pulled', { count: res.commits.length }));
|
||||
} catch (err) {
|
||||
toast.error(errorMessage(err, 'Pull failed'));
|
||||
} finally {
|
||||
@@ -81,7 +83,7 @@ export const MaintenanceSection = () => {
|
||||
setLastBuild(`${(res.ms / 1000).toFixed(1)}s · ${res.outputs} files`);
|
||||
// Nothing reloads itself: the bundle on disk changed, this page is still the old one. Saying so is
|
||||
// the difference between "it worked" and "why does my change not show".
|
||||
toast.success('Frontend rebuilt — refresh this page to see it');
|
||||
toast.success(t('settings.server.maintenance.rebuilt'));
|
||||
} catch (err) {
|
||||
// The client throws on any status >= 400 with the raw response body as its message, so a build
|
||||
// failure arrives here as the JSON the route sent. Unwrapped, or the toast shows a reader
|
||||
@@ -96,7 +98,7 @@ export const MaintenanceSection = () => {
|
||||
setRestarting(true);
|
||||
try {
|
||||
await client.post('/server-settings/restart', {});
|
||||
toast.success('Restarting — the page will reconnect on its own');
|
||||
toast.success(t('settings.server.maintenance.restarting'));
|
||||
} catch (err) {
|
||||
/**
|
||||
* Two failures arrive here and they are opposites.
|
||||
@@ -116,7 +118,7 @@ export const MaintenanceSection = () => {
|
||||
setRestarting(false);
|
||||
return;
|
||||
}
|
||||
toast.success('Restarting — the page will reconnect on its own');
|
||||
toast.success(t('settings.server.maintenance.restarting'));
|
||||
}
|
||||
// Left disabled on the success path, deliberately: the button must not become pressable again while
|
||||
// the server is coming back.
|
||||
@@ -126,14 +128,12 @@ export const MaintenanceSection = () => {
|
||||
<div className="flex flex-col gap-6">
|
||||
<div className="flex items-start justify-between gap-6">
|
||||
<div className="min-w-0">
|
||||
<div className="text-sm font-medium text-foreground">Update the platform</div>
|
||||
<div className="text-sm font-medium text-foreground">{t('settings.server.maintenance.updateTitle')}</div>
|
||||
<p className="mt-1 text-xs text-muted-foreground">
|
||||
Pulls this server’s repository. Refuses if anything is uncommitted or the checkout has diverged — it
|
||||
will never discard local work.
|
||||
</p>
|
||||
<p className="mt-1 text-xs text-muted-foreground">
|
||||
Changes nothing that is running. Whatever the update needs is listed here, and stays your call.
|
||||
</p>
|
||||
<p className="mt-1 text-xs text-muted-foreground">{t('settings.server.maintenance.updateHint')}</p>
|
||||
{pulled && (
|
||||
<div className="mt-2 rounded-md border border-border bg-muted/40 p-2">
|
||||
<p className="font-mono text-[11px] text-muted-foreground">
|
||||
@@ -163,7 +163,7 @@ export const MaintenanceSection = () => {
|
||||
|
||||
<div className="flex items-start justify-between gap-6 border-t border-border pt-6">
|
||||
<div className="min-w-0">
|
||||
<div className="text-sm font-medium text-foreground">Rebuild the frontend</div>
|
||||
<div className="text-sm font-medium text-foreground">{t('settings.server.maintenance.rebuild')}</div>
|
||||
<p className="mt-1 text-xs text-muted-foreground">
|
||||
Picks up changes to the interface. Nothing restarts, no connection drops, and this chat keeps its session —
|
||||
refresh the page when it finishes.
|
||||
@@ -178,7 +178,7 @@ export const MaintenanceSection = () => {
|
||||
|
||||
<div className="flex items-start justify-between gap-6 border-t border-border pt-6">
|
||||
<div className="min-w-0">
|
||||
<div className="text-sm font-medium text-foreground">Restart the server</div>
|
||||
<div className="text-sm font-medium text-foreground">{t('settings.server.maintenance.restart')}</div>
|
||||
<p className="mt-1 text-xs text-muted-foreground">
|
||||
The only way to load changed server code — Bun caches modules for the life of the process, so rebuilding
|
||||
cannot see an edit to the backend.
|
||||
|
||||
@@ -8,6 +8,7 @@ import { Input } from '@/components/ui/input';
|
||||
import { Label } from '@/components/ui/label';
|
||||
import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '@/components/ui/select';
|
||||
import { useClient } from 'hooks/useClient';
|
||||
import { useTranslation } from '@/lib/i18n';
|
||||
|
||||
type OcrConfig = {
|
||||
url: string;
|
||||
@@ -15,6 +16,7 @@ type OcrConfig = {
|
||||
};
|
||||
|
||||
export const OCRSection = () => {
|
||||
const { t } = useTranslation();
|
||||
const client = useClient();
|
||||
const queryClient = useQueryClient();
|
||||
|
||||
@@ -59,9 +61,9 @@ export const OCRSection = () => {
|
||||
try {
|
||||
await client.put('/server-settings/ocr', { url, model });
|
||||
queryClient.invalidateQueries({ queryKey: ['OCR_CONFIG'] });
|
||||
toast.success('OCR settings saved');
|
||||
toast.success(t('settings.server.ocr.saved'));
|
||||
} catch {
|
||||
toast.error('Failed to save OCR settings');
|
||||
toast.error(t('settings.server.ocr.saveFailed'));
|
||||
} finally {
|
||||
setIsSaving(false);
|
||||
}
|
||||
@@ -75,7 +77,7 @@ export const OCRSection = () => {
|
||||
if (res.error) {
|
||||
toast.error(res.error);
|
||||
} else {
|
||||
toast.success('Vision model server is reachable');
|
||||
toast.success(t('settings.server.ocr.reachable'));
|
||||
}
|
||||
} catch (err: unknown) {
|
||||
const raw = (err as { message?: string })?.message;
|
||||
@@ -91,12 +93,12 @@ export const OCRSection = () => {
|
||||
}
|
||||
};
|
||||
|
||||
if (isLoading) return <p className="text-sm text-duck-dark/40">Loading...</p>;
|
||||
if (isLoading) return <p className="text-sm text-duck-dark/40">{t('settings.server.loading')}</p>;
|
||||
|
||||
return (
|
||||
<form onSubmit={handleSave} className="grid gap-4">
|
||||
<Label className="grid gap-2">
|
||||
<span className="text-duck-dark/70 dark:text-foreground/70">Vision Model Server URL</span>
|
||||
<span className="text-duck-dark/70 dark:text-foreground/70">{t('settings.server.ocr.serverUrl')}</span>
|
||||
<Input
|
||||
className="h-11 bg-background/60 border-duck-dark/20 text-duck-dark dark:text-foreground placeholder:text-duck-dark/40"
|
||||
placeholder="http://localhost:64203"
|
||||
@@ -107,13 +109,13 @@ export const OCRSection = () => {
|
||||
|
||||
<Label className="grid gap-2">
|
||||
<div className="flex items-center gap-1.5">
|
||||
<span className="text-duck-dark/70 dark:text-foreground/70">Model</span>
|
||||
<span className="text-duck-dark/70 dark:text-foreground/70">{t('settings.server.model')}</span>
|
||||
<button
|
||||
type="button"
|
||||
onClick={() => fetchModels(url)}
|
||||
disabled={modelsLoading}
|
||||
className="p-0.5 rounded hover:bg-duck-dark/10 dark:hover:bg-foreground/10 cursor-pointer transition-colors disabled:opacity-40"
|
||||
title="Refresh models"
|
||||
title={t('settings.server.ocr.refreshModels')}
|
||||
>
|
||||
<RefreshCw
|
||||
className={`h-3 w-3 text-duck-dark/50 dark:text-foreground/50 ${modelsLoading ? 'animate-spin' : ''}`}
|
||||
@@ -123,7 +125,7 @@ export const OCRSection = () => {
|
||||
{models.length > 0 ? (
|
||||
<Select value={model} onValueChange={setModel}>
|
||||
<SelectTrigger className="h-11 bg-background/60 border-duck-dark/20 text-duck-dark dark:text-foreground">
|
||||
<SelectValue placeholder="Select a model" />
|
||||
<SelectValue placeholder={t('settings.server.ocr.selectModel')} />
|
||||
</SelectTrigger>
|
||||
<SelectContent className="z-[600] max-h-[300px]">
|
||||
{models.map((m) => (
|
||||
|
||||
@@ -9,6 +9,7 @@ import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '@
|
||||
import { Switch } from '@/components/ui/switch';
|
||||
import { useClient } from 'hooks/useClient';
|
||||
import { useAuth } from 'hooks/useAuth';
|
||||
import { useTranslation } from '@/lib/i18n';
|
||||
|
||||
type Provider = 'resend' | 'smtp' | 'mailhog';
|
||||
|
||||
@@ -31,6 +32,7 @@ const PROVIDER_DEFAULTS: Record<Provider, Partial<SmtpConfig>> = {
|
||||
};
|
||||
|
||||
export const SMTPSection = () => {
|
||||
const { t } = useTranslation();
|
||||
const client = useClient();
|
||||
const queryClient = useQueryClient();
|
||||
const { user } = useAuth();
|
||||
@@ -92,9 +94,9 @@ export const SMTPSection = () => {
|
||||
try {
|
||||
await client.put('/server-settings/smtp', buildConfig());
|
||||
queryClient.invalidateQueries({ queryKey: ['SMTP_CONFIG'] });
|
||||
toast.success('SMTP settings saved');
|
||||
toast.success(t('settings.server.smtp.saved'));
|
||||
} catch {
|
||||
toast.error('Failed to save SMTP settings');
|
||||
toast.error(t('settings.server.smtp.saveFailed'));
|
||||
} finally {
|
||||
setIsSaving(false);
|
||||
}
|
||||
@@ -105,7 +107,7 @@ export const SMTPSection = () => {
|
||||
setIsTestingConnection(true);
|
||||
try {
|
||||
await client.post('/server-settings/smtp/test-connection');
|
||||
toast.success('Connection successful');
|
||||
toast.success(t('settings.server.smtp.connected'));
|
||||
} catch (err: unknown) {
|
||||
const raw = (err as { message?: string })?.message;
|
||||
let msg = 'Connection failed';
|
||||
@@ -132,7 +134,7 @@ export const SMTPSection = () => {
|
||||
if (result.error) {
|
||||
toast.error(result.error);
|
||||
} else {
|
||||
toast.success(`Test email sent to ${testEmail}`);
|
||||
toast.success(t('settings.server.smtp.testSent', { email: testEmail }));
|
||||
}
|
||||
} catch (err: unknown) {
|
||||
const raw = (err as { message?: string })?.message;
|
||||
@@ -148,7 +150,7 @@ export const SMTPSection = () => {
|
||||
}
|
||||
};
|
||||
|
||||
if (isLoading) return <p className="text-sm text-duck-dark/40">Loading...</p>;
|
||||
if (isLoading) return <p className="text-sm text-duck-dark/40">{t('settings.server.loading')}</p>;
|
||||
|
||||
const showSmtpFields = provider === 'smtp' || provider === 'mailhog';
|
||||
|
||||
@@ -156,22 +158,22 @@ export const SMTPSection = () => {
|
||||
<div className="grid gap-4">
|
||||
<form onSubmit={handleSave} className="grid gap-4">
|
||||
<Label className="grid gap-2">
|
||||
<span className="text-duck-dark/70 dark:text-foreground/70">Provider</span>
|
||||
<span className="text-duck-dark/70 dark:text-foreground/70">{t('settings.server.provider')}</span>
|
||||
<Select value={provider} onValueChange={(v) => handleProviderChange(v as Provider)}>
|
||||
<SelectTrigger className="h-11 bg-background/60 border-duck-dark/20 text-duck-dark dark:text-foreground">
|
||||
<SelectValue />
|
||||
</SelectTrigger>
|
||||
<SelectContent className="z-[600]">
|
||||
<SelectItem value="mailhog">MailHog (local testing)</SelectItem>
|
||||
<SelectItem value="resend">Resend</SelectItem>
|
||||
<SelectItem value="smtp">Custom SMTP</SelectItem>
|
||||
<SelectItem value="mailhog">{t('settings.server.smtp.mailhog')}</SelectItem>
|
||||
<SelectItem value="resend">{t('settings.server.smtp.resend')}</SelectItem>
|
||||
<SelectItem value="smtp">{t('settings.server.smtp.custom')}</SelectItem>
|
||||
</SelectContent>
|
||||
</Select>
|
||||
</Label>
|
||||
|
||||
{provider === 'resend' && (
|
||||
<Label className="grid gap-2">
|
||||
<span className="text-duck-dark/70 dark:text-foreground/70">API Key</span>
|
||||
<span className="text-duck-dark/70 dark:text-foreground/70">{t('settings.server.smtp.apiKey')}</span>
|
||||
<Input
|
||||
type="password"
|
||||
className="h-11 bg-background/60 border-duck-dark/20 text-duck-dark dark:text-foreground placeholder:text-duck-dark/40"
|
||||
@@ -186,7 +188,7 @@ export const SMTPSection = () => {
|
||||
<>
|
||||
<div className="grid grid-cols-[1fr_auto] gap-2">
|
||||
<Label className="grid gap-2">
|
||||
<span className="text-duck-dark/70 dark:text-foreground/70">Host</span>
|
||||
<span className="text-duck-dark/70 dark:text-foreground/70">{t('settings.server.smtp.host')}</span>
|
||||
<Input
|
||||
className="h-11 bg-background/60 border-duck-dark/20 text-duck-dark dark:text-foreground placeholder:text-duck-dark/40"
|
||||
placeholder="smtp.example.com"
|
||||
@@ -195,7 +197,7 @@ export const SMTPSection = () => {
|
||||
/>
|
||||
</Label>
|
||||
<Label className="grid gap-2">
|
||||
<span className="text-duck-dark/70 dark:text-foreground/70">Port</span>
|
||||
<span className="text-duck-dark/70 dark:text-foreground/70">{t('settings.server.smtp.port')}</span>
|
||||
<Input
|
||||
type="number"
|
||||
className="h-11 w-24 bg-background/60 border-duck-dark/20 text-duck-dark dark:text-foreground"
|
||||
@@ -208,16 +210,20 @@ export const SMTPSection = () => {
|
||||
<>
|
||||
<div className="grid grid-cols-2 gap-2">
|
||||
<Label className="grid gap-2">
|
||||
<span className="text-duck-dark/70 dark:text-foreground/70">Username</span>
|
||||
<span className="text-duck-dark/70 dark:text-foreground/70">
|
||||
{t('settings.server.smtp.username')}
|
||||
</span>
|
||||
<Input
|
||||
className="h-11 bg-background/60 border-duck-dark/20 text-duck-dark dark:text-foreground placeholder:text-duck-dark/40"
|
||||
placeholder="user@example.com"
|
||||
placeholder={t('settings.server.smtp.userExample')}
|
||||
value={username}
|
||||
onChange={(ev) => setUsername(ev.target.value)}
|
||||
/>
|
||||
</Label>
|
||||
<Label className="grid gap-2">
|
||||
<span className="text-duck-dark/70 dark:text-foreground/70">Password</span>
|
||||
<span className="text-duck-dark/70 dark:text-foreground/70">
|
||||
{t('settings.server.smtp.password')}
|
||||
</span>
|
||||
<Input
|
||||
type="password"
|
||||
className="h-11 bg-background/60 border-duck-dark/20 text-duck-dark dark:text-foreground"
|
||||
@@ -228,7 +234,7 @@ export const SMTPSection = () => {
|
||||
</div>
|
||||
<Label className="flex items-center gap-3">
|
||||
<Switch checked={secure} onCheckedChange={setSecure} />
|
||||
<span className="text-duck-dark/70 dark:text-foreground/70">TLS / SSL</span>
|
||||
<span className="text-duck-dark/70 dark:text-foreground/70">{t('settings.server.smtp.tls')}</span>
|
||||
</Label>
|
||||
</>
|
||||
)}
|
||||
@@ -237,7 +243,7 @@ export const SMTPSection = () => {
|
||||
|
||||
<div className="grid grid-cols-2 gap-2">
|
||||
<Label className="grid gap-2">
|
||||
<span className="text-duck-dark/70 dark:text-foreground/70">From Name</span>
|
||||
<span className="text-duck-dark/70 dark:text-foreground/70">{t('settings.server.smtp.fromName')}</span>
|
||||
<Input
|
||||
className="h-11 bg-background/60 border-duck-dark/20 text-duck-dark dark:text-foreground placeholder:text-duck-dark/40"
|
||||
value={fromName}
|
||||
@@ -245,7 +251,7 @@ export const SMTPSection = () => {
|
||||
/>
|
||||
</Label>
|
||||
<Label className="grid gap-2">
|
||||
<span className="text-duck-dark/70 dark:text-foreground/70">From Email</span>
|
||||
<span className="text-duck-dark/70 dark:text-foreground/70">{t('settings.server.smtp.fromEmail')}</span>
|
||||
<Input
|
||||
type="email"
|
||||
className="h-11 bg-background/60 border-duck-dark/20 text-duck-dark dark:text-foreground placeholder:text-duck-dark/40"
|
||||
@@ -276,12 +282,14 @@ export const SMTPSection = () => {
|
||||
</form>
|
||||
|
||||
<div className="border-t border-duck-dark/10 dark:border-foreground/10 pt-4 mt-1">
|
||||
<span className="text-sm font-medium text-duck-dark dark:text-foreground">Send Test Email</span>
|
||||
<span className="text-sm font-medium text-duck-dark dark:text-foreground">
|
||||
{t('settings.server.smtp.sendTest')}
|
||||
</span>
|
||||
<form onSubmit={handleTest} className="flex items-center gap-2 mt-2">
|
||||
<Input
|
||||
type="email"
|
||||
className="h-9 bg-background/60 border-duck-dark/20 text-duck-dark dark:text-foreground placeholder:text-duck-dark/40 flex-1"
|
||||
placeholder="recipient@example.com"
|
||||
placeholder={t('settings.server.smtp.recipientExample')}
|
||||
value={testEmail}
|
||||
onChange={(ev) => setTestEmail(ev.target.value)}
|
||||
/>
|
||||
|
||||
@@ -1,105 +0,0 @@
|
||||
import type { FormEvent } from 'react';
|
||||
import { useState, useEffect } from 'react';
|
||||
import { useQuery, useQueryClient } from '@tanstack/react-query';
|
||||
import { toast } from 'sonner';
|
||||
import { Button } from '@/components/ui/button';
|
||||
import { Input } from '@/components/ui/input';
|
||||
import { Label } from '@/components/ui/label';
|
||||
import { useClient } from 'hooks/useClient';
|
||||
|
||||
type SttConfig = {
|
||||
url: string;
|
||||
};
|
||||
|
||||
export const STTSection = () => {
|
||||
const client = useClient();
|
||||
const queryClient = useQueryClient();
|
||||
|
||||
const { data: config, isLoading } = useQuery({
|
||||
queryKey: ['STT_CONFIG'],
|
||||
queryFn: () => client.get<SttConfig | null>('/server-settings/stt'),
|
||||
});
|
||||
|
||||
const [url, setUrl] = useState('http://localhost:64201');
|
||||
const [isSaving, setIsSaving] = useState(false);
|
||||
const [isTesting, setIsTesting] = useState(false);
|
||||
|
||||
useEffect(() => {
|
||||
if (!config) return;
|
||||
setUrl(config.url);
|
||||
}, [config]);
|
||||
|
||||
const handleSave = async (ev?: FormEvent) => {
|
||||
ev?.preventDefault();
|
||||
if (isSaving) return;
|
||||
setIsSaving(true);
|
||||
try {
|
||||
await client.put('/server-settings/stt', { url });
|
||||
queryClient.invalidateQueries({ queryKey: ['STT_CONFIG'] });
|
||||
toast.success('STT settings saved');
|
||||
} catch {
|
||||
toast.error('Failed to save STT settings');
|
||||
} finally {
|
||||
setIsSaving(false);
|
||||
}
|
||||
};
|
||||
|
||||
const handleTest = async () => {
|
||||
if (isTesting) return;
|
||||
setIsTesting(true);
|
||||
try {
|
||||
const res = await client.post<{ success?: boolean; error?: string }>('/server-settings/stt/test', { url });
|
||||
if (res.error) {
|
||||
toast.error(res.error);
|
||||
} else {
|
||||
toast.success('Whisper server is reachable');
|
||||
}
|
||||
} catch (err: unknown) {
|
||||
const raw = (err as { message?: string })?.message;
|
||||
let msg = 'Connection failed';
|
||||
try {
|
||||
if (raw) msg = JSON.parse(raw).error ?? msg;
|
||||
} catch {
|
||||
/* ignore */
|
||||
}
|
||||
toast.error(msg);
|
||||
} finally {
|
||||
setIsTesting(false);
|
||||
}
|
||||
};
|
||||
|
||||
if (isLoading) return <p className="text-sm text-duck-dark/40">Loading...</p>;
|
||||
|
||||
return (
|
||||
<form onSubmit={handleSave} className="grid gap-4">
|
||||
<Label className="grid gap-2">
|
||||
<span className="text-duck-dark/70 dark:text-foreground/70">Whisper Server URL</span>
|
||||
<Input
|
||||
className="h-11 bg-background/60 border-duck-dark/20 text-duck-dark dark:text-foreground placeholder:text-duck-dark/40"
|
||||
placeholder="http://localhost:64201"
|
||||
value={url}
|
||||
onChange={(ev) => setUrl(ev.target.value)}
|
||||
/>
|
||||
</Label>
|
||||
|
||||
<div className="flex items-center gap-2">
|
||||
<Button
|
||||
type="submit"
|
||||
disabled={isSaving}
|
||||
className="flex-1 h-11 bg-duck-yellow hover:bg-duck-yellow/90 text-duck-teal font-bold transition-all duration-200 hover:scale-105 cursor-pointer disabled:opacity-50 disabled:hover:scale-100"
|
||||
>
|
||||
{isSaving ? 'Saving...' : 'Save'}
|
||||
</Button>
|
||||
<Button
|
||||
type="button"
|
||||
variant="outline"
|
||||
onClick={handleTest}
|
||||
disabled={isTesting}
|
||||
className="h-11 cursor-pointer disabled:opacity-50"
|
||||
>
|
||||
{isTesting ? 'Testing...' : 'Test'}
|
||||
</Button>
|
||||
</div>
|
||||
</form>
|
||||
);
|
||||
};
|
||||
@@ -16,6 +16,7 @@ import {
|
||||
SelectValue,
|
||||
} from '@/components/ui/select';
|
||||
import { useClient } from 'hooks/useClient';
|
||||
import { useTranslation } from '@/lib/i18n';
|
||||
|
||||
type Provider = 'openai' | 'elevenlabs';
|
||||
|
||||
@@ -33,6 +34,7 @@ const PROVIDER_DEFAULTS: Record<Provider, Partial<TtsConfig>> = {
|
||||
};
|
||||
|
||||
export const TTSSection = () => {
|
||||
const { t } = useTranslation();
|
||||
const client = useClient();
|
||||
const queryClient = useQueryClient();
|
||||
const audioRef = useRef<HTMLAudioElement | null>(null);
|
||||
@@ -110,9 +112,9 @@ export const TTSSection = () => {
|
||||
try {
|
||||
await client.put('/server-settings/tts', buildConfig());
|
||||
queryClient.invalidateQueries({ queryKey: ['TTS_CONFIG'] });
|
||||
toast.success('TTS settings saved');
|
||||
toast.success(t('settings.server.tts.saved'));
|
||||
} catch {
|
||||
toast.error('Failed to save TTS settings');
|
||||
toast.error(t('settings.server.tts.saveFailed'));
|
||||
} finally {
|
||||
setIsSaving(false);
|
||||
}
|
||||
@@ -143,27 +145,27 @@ export const TTSSection = () => {
|
||||
const audio = new Audio(audioUrl);
|
||||
audioRef.current = audio;
|
||||
audio.play();
|
||||
toast.success('Playing test audio');
|
||||
toast.success(t('settings.server.tts.playing'));
|
||||
} catch {
|
||||
toast.error('Test failed — could not reach TTS server');
|
||||
toast.error(t('settings.server.tts.testFailed'));
|
||||
} finally {
|
||||
setIsTesting(false);
|
||||
}
|
||||
};
|
||||
|
||||
if (isLoading) return <p className="text-sm text-duck-dark/40">Loading...</p>;
|
||||
if (isLoading) return <p className="text-sm text-duck-dark/40">{t('settings.server.loading')}</p>;
|
||||
|
||||
return (
|
||||
<form onSubmit={handleSave} className="grid gap-4">
|
||||
<Label className="grid gap-2">
|
||||
<span className="text-duck-dark/70 dark:text-foreground/70">Provider</span>
|
||||
<span className="text-duck-dark/70 dark:text-foreground/70">{t('settings.server.provider')}</span>
|
||||
<Select value={provider} onValueChange={(v) => handleProviderChange(v as Provider)}>
|
||||
<SelectTrigger className="h-11 bg-background/60 border-duck-dark/20 text-duck-dark dark:text-foreground">
|
||||
<SelectValue />
|
||||
</SelectTrigger>
|
||||
<SelectContent className="z-[600]">
|
||||
<SelectItem value="openai">OpenAI-compatible (Kokoro, OpenAI, etc.)</SelectItem>
|
||||
<SelectItem value="elevenlabs">ElevenLabs</SelectItem>
|
||||
<SelectItem value="openai">{t('settings.server.tts.openaiCompatible')}</SelectItem>
|
||||
<SelectItem value="elevenlabs">{t('settings.server.tts.elevenLabs')}</SelectItem>
|
||||
</SelectContent>
|
||||
</Select>
|
||||
</Label>
|
||||
@@ -195,7 +197,7 @@ export const TTSSection = () => {
|
||||
|
||||
<div className="grid grid-cols-2 gap-2">
|
||||
<Label className="grid gap-2">
|
||||
<span className="text-duck-dark/70 dark:text-foreground/70">Model</span>
|
||||
<span className="text-duck-dark/70 dark:text-foreground/70">{t('settings.server.model')}</span>
|
||||
<Input
|
||||
className="h-11 bg-background/60 border-duck-dark/20 text-duck-dark dark:text-foreground placeholder:text-duck-dark/40"
|
||||
placeholder={provider === 'openai' ? 'kokoro' : 'eleven_multilingual_v2'}
|
||||
@@ -205,13 +207,13 @@ export const TTSSection = () => {
|
||||
</Label>
|
||||
<Label className="grid gap-2">
|
||||
<div className="flex items-center gap-1.5">
|
||||
<span className="text-duck-dark/70 dark:text-foreground/70">Voice</span>
|
||||
<span className="text-duck-dark/70 dark:text-foreground/70">{t('settings.server.voice')}</span>
|
||||
<button
|
||||
type="button"
|
||||
onClick={() => fetchVoices(provider, url, apiKey, model)}
|
||||
disabled={voicesLoading}
|
||||
className="p-0.5 rounded hover:bg-duck-dark/10 dark:hover:bg-foreground/10 cursor-pointer transition-colors disabled:opacity-40"
|
||||
title="Refresh voices"
|
||||
title={t('settings.server.tts.refreshVoices')}
|
||||
>
|
||||
<RefreshCw
|
||||
className={`h-3 w-3 text-duck-dark/50 dark:text-foreground/50 ${voicesLoading ? 'animate-spin' : ''}`}
|
||||
@@ -221,7 +223,7 @@ export const TTSSection = () => {
|
||||
{voices.length > 0 ? (
|
||||
<Select value={voice} onValueChange={setVoice}>
|
||||
<SelectTrigger className="h-11 bg-background/60 border-duck-dark/20 text-duck-dark dark:text-foreground">
|
||||
<SelectValue placeholder="Select a voice" />
|
||||
<SelectValue placeholder={t('settings.server.tts.selectVoice')} />
|
||||
</SelectTrigger>
|
||||
<SelectContent className="z-[600] max-h-[300px]">
|
||||
{voiceGroups.length > 0
|
||||
|
||||
@@ -3,17 +3,24 @@ import { useState } from 'react';
|
||||
import { NavLink, Navigate, useParams } from 'react-router';
|
||||
import type { LucideIcon } from 'lucide-react';
|
||||
import { Input } from '@/components/ui/input';
|
||||
import { useTranslation, type AppTranslationKey } from '@/lib/i18n';
|
||||
|
||||
/**
|
||||
* Sections are declared as module-level consts holding JSX `content`, so they cannot call a hook —
|
||||
* they carry catalog KEYS and the renderers below resolve them. `titleKey` rather than `titleKeyName`
|
||||
* and deliberately not `title_key`: docs-check-settings.ts greps `key:\s*'…'` for route segments, and
|
||||
* a capital K keeps `titleKey` out of that match.
|
||||
*/
|
||||
export type SettingsSection = {
|
||||
key: string;
|
||||
icon: LucideIcon;
|
||||
title: string;
|
||||
description: string;
|
||||
titleKey: AppTranslationKey;
|
||||
descriptionKey: AppTranslationKey;
|
||||
content: ReactNode;
|
||||
};
|
||||
|
||||
export type SettingsSectionGroup = {
|
||||
label: string;
|
||||
labelKey: AppTranslationKey;
|
||||
icon: LucideIcon;
|
||||
sections: SettingsSection[];
|
||||
};
|
||||
@@ -21,7 +28,7 @@ export type SettingsSectionGroup = {
|
||||
type SettingsSidebarProps = {
|
||||
basePath: string;
|
||||
icon: LucideIcon;
|
||||
label: string;
|
||||
labelKey: AppTranslationKey;
|
||||
sections: SettingsSection[];
|
||||
groups?: SettingsSectionGroup[];
|
||||
hideHeader?: boolean;
|
||||
@@ -32,44 +39,51 @@ type SettingsSidebarProps = {
|
||||
* the browser knows it has been visited, and `isActive` comes from the router instead of from a global
|
||||
* that the content pane had to be told about separately.
|
||||
*/
|
||||
const SectionLink = ({ section, to }: { section: SettingsSection; to: string }) => (
|
||||
<NavLink
|
||||
to={to}
|
||||
className={({ isActive }) =>
|
||||
`flex items-start gap-2.5 py-2 px-3 rounded-lg text-left cursor-pointer transition-colors ${
|
||||
isActive
|
||||
? 'bg-duck-teal/10 text-duck-dark dark:text-foreground'
|
||||
: 'text-duck-dark/70 dark:text-foreground/70 hover:bg-duck-dark/5 dark:hover:bg-foreground/5 hover:text-duck-dark dark:hover:text-foreground'
|
||||
}`
|
||||
}
|
||||
>
|
||||
{({ isActive }) => (
|
||||
<>
|
||||
<section.icon
|
||||
className={`h-3.5 w-3.5 shrink-0 mt-0.5 ${isActive ? 'text-duck-teal' : 'text-duck-dark/40 dark:text-foreground/40'}`}
|
||||
/>
|
||||
<div className="min-w-0 flex-1">
|
||||
<div className="text-sm font-medium truncate">{section.title}</div>
|
||||
<div className="text-xs text-duck-dark/40 dark:text-foreground/40 truncate">{section.description}</div>
|
||||
</div>
|
||||
</>
|
||||
)}
|
||||
</NavLink>
|
||||
);
|
||||
const SectionLink = ({ section, to }: { section: SettingsSection; to: string }) => {
|
||||
const { t } = useTranslation();
|
||||
return (
|
||||
<NavLink
|
||||
to={to}
|
||||
className={({ isActive }) =>
|
||||
`flex items-start gap-2.5 py-2 px-3 rounded-lg text-left cursor-pointer transition-colors ${
|
||||
isActive
|
||||
? 'bg-duck-teal/10 text-duck-dark dark:text-foreground'
|
||||
: 'text-duck-dark/70 dark:text-foreground/70 hover:bg-duck-dark/5 dark:hover:bg-foreground/5 hover:text-duck-dark dark:hover:text-foreground'
|
||||
}`
|
||||
}
|
||||
>
|
||||
{({ isActive }) => (
|
||||
<>
|
||||
<section.icon
|
||||
className={`h-3.5 w-3.5 shrink-0 mt-0.5 ${isActive ? 'text-duck-teal' : 'text-duck-dark/40 dark:text-foreground/40'}`}
|
||||
/>
|
||||
<div className="min-w-0 flex-1">
|
||||
<div className="text-sm font-medium truncate">{t(section.titleKey)}</div>
|
||||
<div className="text-xs text-duck-dark/40 dark:text-foreground/40 truncate">
|
||||
{t(section.descriptionKey)}
|
||||
</div>
|
||||
</div>
|
||||
</>
|
||||
)}
|
||||
</NavLink>
|
||||
);
|
||||
};
|
||||
|
||||
export const SettingsSidebar = ({
|
||||
basePath,
|
||||
icon: Icon,
|
||||
label,
|
||||
labelKey,
|
||||
sections,
|
||||
groups,
|
||||
hideHeader,
|
||||
}: SettingsSidebarProps) => {
|
||||
const [search, setSearch] = useState('');
|
||||
const { t } = useTranslation();
|
||||
|
||||
const query = search.toLowerCase();
|
||||
// Matched against the RESOLVED words, so searching works in the language on screen.
|
||||
const matchesSearch = (s: SettingsSection) =>
|
||||
s.title.toLowerCase().includes(query) || s.description.toLowerCase().includes(query);
|
||||
t(s.titleKey).toLowerCase().includes(query) || t(s.descriptionKey).toLowerCase().includes(query);
|
||||
|
||||
return (
|
||||
<div className="flex flex-col h-full overflow-y-auto">
|
||||
@@ -77,13 +91,13 @@ export const SettingsSidebar = ({
|
||||
<div className="p-3 pb-2">
|
||||
<div className="flex items-center gap-2.5 rounded-lg px-3 py-2 text-sm font-medium bg-duck-teal/15 text-duck-teal">
|
||||
<Icon className="h-4 w-4" />
|
||||
{label}
|
||||
{t(labelKey)}
|
||||
</div>
|
||||
</div>
|
||||
)}
|
||||
<div className="px-3 pb-2">
|
||||
<Input
|
||||
placeholder="Search..."
|
||||
placeholder={t('settings.searchPlaceholder')}
|
||||
value={search}
|
||||
onChange={(ev) => setSearch(ev.target.value)}
|
||||
className="h-8 text-xs"
|
||||
@@ -95,11 +109,11 @@ export const SettingsSidebar = ({
|
||||
const filtered = group.sections.filter(matchesSearch);
|
||||
if (filtered.length === 0) return null;
|
||||
return (
|
||||
<div key={group.label}>
|
||||
<div key={group.labelKey}>
|
||||
<div className="flex items-center gap-2 px-3 pt-3 pb-1">
|
||||
<group.icon className="h-3 w-3 text-duck-dark/30 dark:text-foreground/30" />
|
||||
<span className="text-[11px] font-semibold uppercase tracking-wider text-duck-dark/30 dark:text-foreground/30">
|
||||
{group.label}
|
||||
{t(group.labelKey)}
|
||||
</span>
|
||||
</div>
|
||||
{filtered.map((s) => (
|
||||
@@ -121,6 +135,7 @@ type SettingsContentProps = {
|
||||
};
|
||||
|
||||
export const SettingsContent = ({ sections }: SettingsContentProps) => {
|
||||
const { t } = useTranslation();
|
||||
// The sidebar and this pane are two sibling panels that used to agree via a shared `useGlobal` key.
|
||||
// They agree via the URL now, so neither has to be told about the other — and neither can be the one
|
||||
// that seeds the slot, which is what made the old defaulting order matter (see §5.6).
|
||||
@@ -130,7 +145,7 @@ export const SettingsContent = ({ sections }: SettingsContentProps) => {
|
||||
if (!section) {
|
||||
return (
|
||||
<div className="h-full flex items-center justify-center">
|
||||
<p className="text-sm text-duck-dark/30 dark:text-foreground/30">Select a section</p>
|
||||
<p className="text-sm text-duck-dark/30 dark:text-foreground/30">{t('settings.selectSection')}</p>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
@@ -139,9 +154,9 @@ export const SettingsContent = ({ sections }: SettingsContentProps) => {
|
||||
<div className="h-full overflow-y-auto p-6">
|
||||
<div className="flex items-center gap-2.5 mb-1">
|
||||
<section.icon className="h-4.5 w-4.5 text-duck-teal shrink-0" />
|
||||
<h2 className="text-lg font-bold text-duck-dark dark:text-foreground">{section.title}</h2>
|
||||
<h2 className="text-lg font-bold text-duck-dark dark:text-foreground">{t(section.titleKey)}</h2>
|
||||
</div>
|
||||
<p className="text-sm text-duck-dark/50 dark:text-foreground/50 mb-6">{section.description}</p>
|
||||
<p className="text-sm text-duck-dark/50 dark:text-foreground/50 mb-6">{t(section.descriptionKey)}</p>
|
||||
<div>{section.content}</div>
|
||||
</div>
|
||||
);
|
||||
@@ -166,7 +181,7 @@ export const SettingsRoute = ({ basePath, sections, children }: SettingsRoutePro
|
||||
type CreateSettingsPanelParams = {
|
||||
basePath: string;
|
||||
sidebarIcon: LucideIcon;
|
||||
sidebarLabel: string;
|
||||
sidebarLabelKey: AppTranslationKey;
|
||||
sections?: SettingsSection[];
|
||||
groups?: SettingsSectionGroup[];
|
||||
};
|
||||
@@ -174,7 +189,7 @@ type CreateSettingsPanelParams = {
|
||||
export const createSettingsPanelComponents = ({
|
||||
basePath,
|
||||
sidebarIcon,
|
||||
sidebarLabel,
|
||||
sidebarLabelKey,
|
||||
sections = [],
|
||||
groups,
|
||||
}: CreateSettingsPanelParams) => {
|
||||
@@ -183,7 +198,7 @@ export const createSettingsPanelComponents = ({
|
||||
<SettingsSidebar
|
||||
basePath={basePath}
|
||||
icon={sidebarIcon}
|
||||
label={sidebarLabel}
|
||||
labelKey={sidebarLabelKey}
|
||||
sections={allSections}
|
||||
groups={groups}
|
||||
/>
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import { useMemo } from 'react';
|
||||
import { Bot, Hammer, Mail, Mic, ScanText, Settings, Volume2 } from 'lucide-react';
|
||||
import { Bot, Hammer, Mail, ScanText, Settings, Volume2 } from 'lucide-react';
|
||||
import type { LayoutNode, PanelComponents } from 'officerdev';
|
||||
import { WorkspaceLayout } from 'officerdev';
|
||||
|
||||
@@ -7,49 +7,53 @@ import { SettingsRoute, createSettingsPanelComponents, type SettingsSectionGroup
|
||||
import { SMTPSection } from './ServerSettings/SMTPSection';
|
||||
import { MaintenanceSection } from './ServerSettings/MaintenanceSection';
|
||||
import { TTSSection } from './ServerSettings/TTSSection';
|
||||
import { STTSection } from './ServerSettings/STTSection';
|
||||
import { OCRSection } from './ServerSettings/OCRSection';
|
||||
|
||||
const groups: SettingsSectionGroup[] = [
|
||||
{
|
||||
label: 'AI',
|
||||
labelKey: 'settings.groups.ai',
|
||||
icon: Bot,
|
||||
sections: [
|
||||
{
|
||||
key: 'tts',
|
||||
icon: Volume2,
|
||||
title: 'Text to Speech',
|
||||
description: 'TTS provider and voice',
|
||||
titleKey: 'settings.sections.tts.label',
|
||||
descriptionKey: 'settings.sections.tts.description',
|
||||
content: <TTSSection />,
|
||||
},
|
||||
{ key: 'stt', icon: Mic, title: 'Speech to Text', description: 'Whisper server URL', content: <STTSection /> },
|
||||
{
|
||||
key: 'ocr',
|
||||
icon: ScanText,
|
||||
title: 'OCR',
|
||||
description: 'Vision model for text extraction',
|
||||
titleKey: 'settings.sections.ocr.label',
|
||||
descriptionKey: 'settings.sections.ocr.description',
|
||||
content: <OCRSection />,
|
||||
},
|
||||
],
|
||||
},
|
||||
{
|
||||
label: 'Maintenance',
|
||||
labelKey: 'settings.groups.maintenance',
|
||||
icon: Hammer,
|
||||
sections: [
|
||||
{
|
||||
key: 'maintenance',
|
||||
icon: Hammer,
|
||||
title: 'Rebuild & restart',
|
||||
description: 'Load changes without a terminal',
|
||||
titleKey: 'settings.sections.maintenance.label',
|
||||
descriptionKey: 'settings.sections.maintenance.description',
|
||||
content: <MaintenanceSection />,
|
||||
},
|
||||
],
|
||||
},
|
||||
{
|
||||
label: 'Email',
|
||||
labelKey: 'settings.groups.email',
|
||||
icon: Mail,
|
||||
sections: [
|
||||
{ key: 'smtp', icon: Mail, title: 'SMTP', description: 'Email delivery provider', content: <SMTPSection /> },
|
||||
{
|
||||
key: 'smtp',
|
||||
icon: Mail,
|
||||
titleKey: 'settings.sections.smtp.label',
|
||||
descriptionKey: 'settings.sections.smtp.description',
|
||||
content: <SMTPSection />,
|
||||
},
|
||||
],
|
||||
},
|
||||
];
|
||||
@@ -59,7 +63,7 @@ const BASE_PATH = '/settings/system';
|
||||
const { Sidebar, Content, allSections } = createSettingsPanelComponents({
|
||||
basePath: BASE_PATH,
|
||||
sidebarIcon: Settings,
|
||||
sidebarLabel: 'System',
|
||||
sidebarLabelKey: 'settings.nav.system',
|
||||
groups,
|
||||
});
|
||||
|
||||
|
||||
@@ -9,6 +9,7 @@ import { Label } from '@/components/ui/label';
|
||||
import { Textarea } from '@/components/ui/textarea';
|
||||
import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '@/components/ui/select';
|
||||
import { copyToClipboard } from 'helpers/clipboard';
|
||||
import { useTranslation } from '@/lib/i18n';
|
||||
|
||||
// The owner creating an account. Until this existed the only way to add one was an INSERT in Postgres.
|
||||
//
|
||||
@@ -65,6 +66,7 @@ type CreatedAccount = {
|
||||
};
|
||||
|
||||
export const CreateUserForm = ({ roles, usersKey }: CreateUserFormProps) => {
|
||||
const { t, tUi } = useTranslation();
|
||||
const client = useClient();
|
||||
const queryClient = useQueryClient();
|
||||
const [open, setOpen] = useState(false);
|
||||
@@ -118,16 +120,19 @@ export const CreateUserForm = ({ roles, usersKey }: CreateUserFormProps) => {
|
||||
<div className="space-y-4 rounded-lg border border-duck-teal/40 bg-duck-teal/5 p-4">
|
||||
<div>
|
||||
<h3 className="text-sm font-medium">{created.email} created</h3>
|
||||
<p className="text-xs text-muted-foreground">
|
||||
Copy what you need before closing — none of it can be shown again.
|
||||
</p>
|
||||
<p className="text-xs text-muted-foreground">{t('settings.users.copyBeforeClosing')}</p>
|
||||
</div>
|
||||
|
||||
<div className="space-y-1.5">
|
||||
<Label>Password</Label>
|
||||
<Label>{t('settings.users.password')}</Label>
|
||||
<div className="flex gap-2">
|
||||
<Input readOnly value={created.password} className="font-mono" />
|
||||
<Button type="button" variant="outline" size="icon" onClick={() => copy(created.password, 'Password')}>
|
||||
<Button
|
||||
type="button"
|
||||
variant="outline"
|
||||
size="icon"
|
||||
onClick={() => copy(created.password, t('settings.users.password'))}
|
||||
>
|
||||
<Copy className="h-4 w-4" />
|
||||
</Button>
|
||||
</div>
|
||||
@@ -139,14 +144,14 @@ export const CreateUserForm = ({ roles, usersKey }: CreateUserFormProps) => {
|
||||
|
||||
{created.osUser && (
|
||||
<div className="space-y-1.5">
|
||||
<Label>Linux account</Label>
|
||||
<Label>{t('settings.users.linuxAccount')}</Label>
|
||||
<Input readOnly value={created.osUser} className="font-mono" />
|
||||
</div>
|
||||
)}
|
||||
|
||||
{created.osSshPublicKey && (
|
||||
<div className="space-y-1.5">
|
||||
<Label>Their SSH public key</Label>
|
||||
<Label>{t('settings.users.sshKey')}</Label>
|
||||
<div className="flex gap-2">
|
||||
<Textarea readOnly value={created.osSshPublicKey} rows={3} className="font-mono text-xs" />
|
||||
<Button
|
||||
@@ -162,20 +167,20 @@ export const CreateUserForm = ({ roles, usersKey }: CreateUserFormProps) => {
|
||||
permission error that says nothing about a missing key. */}
|
||||
<p className="text-xs text-muted-foreground">
|
||||
Generated on the machine; the private half never leaves it.{' '}
|
||||
<strong>Add this to their Gitea account</strong> so they can push. Retrievable later from their row.
|
||||
<strong>{t('settings.users.addToGitea')}</strong> so they can push. Retrievable later from their row.
|
||||
</p>
|
||||
</div>
|
||||
)}
|
||||
|
||||
{created.osUserError && (
|
||||
<div className="rounded-md border border-amber-500/40 bg-amber-500/10 p-3 text-xs">
|
||||
<div className="font-medium">The account works, but its Linux side did not finish</div>
|
||||
<div className="font-medium">{t('settings.users.linuxIncomplete')}</div>
|
||||
<p className="mt-1 whitespace-pre-wrap text-muted-foreground">{created.osUserError}</p>
|
||||
</div>
|
||||
)}
|
||||
|
||||
<Button type="button" onClick={close}>
|
||||
Done
|
||||
{t('settings.users.done')}
|
||||
</Button>
|
||||
</div>
|
||||
);
|
||||
@@ -185,7 +190,7 @@ export const CreateUserForm = ({ roles, usersKey }: CreateUserFormProps) => {
|
||||
return (
|
||||
<Button variant="outline" size="sm" onClick={() => setOpen(true)}>
|
||||
<UserPlus className="mr-2 h-4 w-4" />
|
||||
Add account
|
||||
{t('settings.users.addAccount')}
|
||||
</Button>
|
||||
);
|
||||
}
|
||||
@@ -194,19 +199,19 @@ export const CreateUserForm = ({ roles, usersKey }: CreateUserFormProps) => {
|
||||
<form onSubmit={submit} className="space-y-4 rounded-lg border p-4">
|
||||
<div className="flex items-start justify-between gap-2">
|
||||
<div>
|
||||
<h3 className="text-sm font-medium">New account</h3>
|
||||
<h3 className="text-sm font-medium">{t('settings.users.newAccount')}</h3>
|
||||
<p className="text-xs text-muted-foreground">
|
||||
Created active — they can sign in straight away. Tell them the password; it is not recoverable afterwards.
|
||||
</p>
|
||||
</div>
|
||||
<Button type="button" variant="ghost" size="icon" onClick={close} aria-label="Cancel">
|
||||
<Button type="button" variant="ghost" size="icon" onClick={close} aria-label={tUi('button.cancel')}>
|
||||
<X className="h-4 w-4" />
|
||||
</Button>
|
||||
</div>
|
||||
|
||||
<div className="grid gap-4 sm:grid-cols-2">
|
||||
<div className="space-y-1.5">
|
||||
<Label htmlFor="new-user-email">Email</Label>
|
||||
<Label htmlFor="new-user-email">{t('settings.users.email')}</Label>
|
||||
<Input
|
||||
id="new-user-email"
|
||||
type="email"
|
||||
@@ -218,7 +223,7 @@ export const CreateUserForm = ({ roles, usersKey }: CreateUserFormProps) => {
|
||||
</div>
|
||||
|
||||
<div className="space-y-1.5">
|
||||
<Label htmlFor="new-user-name">Name</Label>
|
||||
<Label htmlFor="new-user-name">{t('settings.users.name')}</Label>
|
||||
<Input
|
||||
id="new-user-name"
|
||||
autoComplete="off"
|
||||
@@ -229,7 +234,7 @@ export const CreateUserForm = ({ roles, usersKey }: CreateUserFormProps) => {
|
||||
</div>
|
||||
|
||||
<div className="space-y-1.5">
|
||||
<Label htmlFor="new-user-username">Username</Label>
|
||||
<Label htmlFor="new-user-username">{t('settings.users.username')}</Label>
|
||||
<Input
|
||||
id="new-user-username"
|
||||
autoComplete="off"
|
||||
@@ -237,11 +242,11 @@ export const CreateUserForm = ({ roles, usersKey }: CreateUserFormProps) => {
|
||||
onChange={(ev) => set('username')(ev.target.value)}
|
||||
required
|
||||
/>
|
||||
<p className="text-xs text-muted-foreground">Letters, numbers, dots, hyphens and underscores.</p>
|
||||
<p className="text-xs text-muted-foreground">{t('settings.users.usernameHint')}</p>
|
||||
</div>
|
||||
|
||||
<div className="space-y-1.5">
|
||||
<Label htmlFor="new-user-role">Role</Label>
|
||||
<Label htmlFor="new-user-role">{t('settings.users.role')}</Label>
|
||||
<Select value={form.role} onValueChange={set('role')}>
|
||||
<SelectTrigger id="new-user-role">
|
||||
<SelectValue />
|
||||
@@ -261,7 +266,7 @@ export const CreateUserForm = ({ roles, usersKey }: CreateUserFormProps) => {
|
||||
</div>
|
||||
|
||||
<div className="space-y-1.5 sm:col-span-2">
|
||||
<Label htmlFor="new-user-password">Password</Label>
|
||||
<Label htmlFor="new-user-password">{t('settings.users.password')}</Label>
|
||||
<div className="flex gap-2">
|
||||
<Input
|
||||
id="new-user-password"
|
||||
@@ -276,7 +281,7 @@ export const CreateUserForm = ({ roles, usersKey }: CreateUserFormProps) => {
|
||||
/>
|
||||
<Button type="button" variant="outline" size="icon" onClick={() => set('password')(generatePassword())}>
|
||||
<Dices className="h-4 w-4" />
|
||||
<span className="sr-only">Generate a password</span>
|
||||
<span className="sr-only">{t('settings.users.generatePassword')}</span>
|
||||
</Button>
|
||||
<Button
|
||||
type="button"
|
||||
@@ -285,29 +290,27 @@ export const CreateUserForm = ({ roles, usersKey }: CreateUserFormProps) => {
|
||||
disabled={!form.password}
|
||||
onClick={() => {
|
||||
void copyToClipboard(form.password);
|
||||
toast.success('Password copied');
|
||||
toast.success(t('settings.users.passwordCopied'));
|
||||
}}
|
||||
>
|
||||
<Copy className="h-4 w-4" />
|
||||
<span className="sr-only">Copy the password</span>
|
||||
<span className="sr-only">{t('settings.users.copyPassword')}</span>
|
||||
</Button>
|
||||
</div>
|
||||
<p className="text-xs text-muted-foreground">
|
||||
At least 12 characters, with upper and lower case, a number and a symbol.
|
||||
</p>
|
||||
<p className="text-xs text-muted-foreground">{t('settings.users.passwordHint')}</p>
|
||||
</div>
|
||||
|
||||
{/* Inbound only, and optional. The OUTBOUND key is generated either way — pasting one here does
|
||||
not replace it, because a key on a laptop is no use to an agent running on the server. */}
|
||||
<div className="space-y-1.5 sm:col-span-2">
|
||||
<Label htmlFor="new-user-ssh">
|
||||
Their SSH public key <span className="ml-1 text-xs opacity-60">(optional)</span>
|
||||
{t('settings.users.sshKey')} <span className="ml-1 text-xs opacity-60">(optional)</span>
|
||||
</Label>
|
||||
<Textarea
|
||||
id="new-user-ssh"
|
||||
rows={3}
|
||||
spellCheck={false}
|
||||
placeholder="ssh-ed25519 AAAAC3Nza… ana@laptop"
|
||||
placeholder={t('settings.users.sshPlaceholder')}
|
||||
className="font-mono text-xs"
|
||||
value={form.sshPublicKey}
|
||||
onChange={(ev) => set('sshPublicKey')(ev.target.value)}
|
||||
@@ -325,7 +328,7 @@ export const CreateUserForm = ({ roles, usersKey }: CreateUserFormProps) => {
|
||||
Create account
|
||||
</Button>
|
||||
<Button type="button" variant="ghost" onClick={close} disabled={saving}>
|
||||
Cancel
|
||||
{tUi('button.cancel')}
|
||||
</Button>
|
||||
</div>
|
||||
</form>
|
||||
|
||||
+16
-10
@@ -6,6 +6,7 @@ import { useClient } from 'hooks/useClient';
|
||||
import { PERMISSIONS_QUERY_KEY } from 'hooks/usePermissions';
|
||||
import { Button } from '@/components/ui/button';
|
||||
import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '@/components/ui/select';
|
||||
import { useTranslation } from '@/lib/i18n';
|
||||
|
||||
// What each ROLE may reach. Not each user — see the table comment in schema/permissions.ts for why.
|
||||
//
|
||||
@@ -37,6 +38,7 @@ type Level = 'none' | 'read' | 'write';
|
||||
const PERMISSIONS_KEY = ['ROLE_PERMISSIONS'];
|
||||
|
||||
export const PermissionsSection = () => {
|
||||
const { t, tUi } = useTranslation();
|
||||
const client = useClient();
|
||||
const queryClient = useQueryClient();
|
||||
const [role, setRole] = useState<string | null>(null);
|
||||
@@ -78,7 +80,7 @@ export const PermissionsSection = () => {
|
||||
// The owner may be editing their own view's inputs — and anyone already signed in needs the dock to
|
||||
// catch up without a reload.
|
||||
await queryClient.invalidateQueries({ queryKey: PERMISSIONS_QUERY_KEY });
|
||||
toast.success(`Saved what ${activeRole}s can reach`);
|
||||
toast.success(t('settings.users.permissionsSaved', { role: activeRole }));
|
||||
} catch (ex) {
|
||||
toast.error(ex instanceof Error ? ex.message : 'Could not save');
|
||||
} finally {
|
||||
@@ -89,12 +91,12 @@ export const PermissionsSection = () => {
|
||||
if (isLoading) {
|
||||
return (
|
||||
<div className="flex items-center gap-2 p-6 text-sm text-muted-foreground">
|
||||
<Loader2 className="h-4 w-4 animate-spin" /> Loading permissions…
|
||||
<Loader2 className="h-4 w-4 animate-spin" /> {t('settings.users.loadingPermissions')}
|
||||
</div>
|
||||
);
|
||||
}
|
||||
if (isError || !data) {
|
||||
return <div className="p-6 text-sm text-destructive">Could not load permissions.</div>;
|
||||
return <div className="p-6 text-sm text-destructive">{t('settings.users.permissionsFailed')}</div>;
|
||||
}
|
||||
|
||||
return (
|
||||
@@ -103,7 +105,11 @@ export const PermissionsSection = () => {
|
||||
hides two of them behind a click and gives no sense of "which one am I editing" at a glance. Real
|
||||
buttons, because switching role mutates a draft rather than navigating. */}
|
||||
<div className="flex flex-wrap items-center justify-between gap-3">
|
||||
<div className="flex items-center gap-1 rounded-lg border p-1" role="tablist" aria-label="Role">
|
||||
<div
|
||||
className="flex items-center gap-1 rounded-lg border p-1"
|
||||
role="tablist"
|
||||
aria-label={t('settings.users.role')}
|
||||
>
|
||||
{data.roles.map((r) => (
|
||||
<button
|
||||
key={r}
|
||||
@@ -128,9 +134,9 @@ export const PermissionsSection = () => {
|
||||
</div>
|
||||
|
||||
<p className="text-xs text-muted-foreground">
|
||||
Everything is denied unless granted here. <strong>Read</strong> allows viewing, plus changes to things that are
|
||||
only ever the person’s own — their favourites, their playlists, their devices.
|
||||
<strong> Full</strong> allows everything within the app.
|
||||
{t('settings.users.deniedUnlessGranted')} <strong>{t('settings.users.read')}</strong> allows viewing, plus
|
||||
changes to things that are only ever the person’s own — their favourites, their playlists, their devices.
|
||||
<strong> {t('settings.users.full')}</strong> allows everything within the app.
|
||||
</p>
|
||||
|
||||
<div className="divide-y rounded-lg border">
|
||||
@@ -151,9 +157,9 @@ export const PermissionsSection = () => {
|
||||
<SelectValue />
|
||||
</SelectTrigger>
|
||||
<SelectContent>
|
||||
<SelectItem value="none">No access</SelectItem>
|
||||
<SelectItem value="read">Read</SelectItem>
|
||||
<SelectItem value="write">Full</SelectItem>
|
||||
<SelectItem value="none">{t('settings.users.noAccess')}</SelectItem>
|
||||
<SelectItem value="read">{t('settings.users.read')}</SelectItem>
|
||||
<SelectItem value="write">{t('settings.users.full')}</SelectItem>
|
||||
</SelectContent>
|
||||
</Select>
|
||||
</div>
|
||||
|
||||
@@ -17,6 +17,7 @@ import {
|
||||
} from '@/components/ui/alert-dialog';
|
||||
import { CreateUserForm } from './CreateUserForm';
|
||||
import { copyToClipboard } from 'helpers/clipboard';
|
||||
import { useTranslation } from '@/lib/i18n';
|
||||
|
||||
type ManagedUser = {
|
||||
id: number;
|
||||
@@ -43,6 +44,7 @@ type UsersResponse = {
|
||||
const USERS_KEY = ['MANAGED_USERS'];
|
||||
|
||||
export const UsersSection = () => {
|
||||
const { t, tUi } = useTranslation();
|
||||
const client = useClient();
|
||||
const queryClient = useQueryClient();
|
||||
const [pendingId, setPendingId] = useState<number | null>(null);
|
||||
@@ -77,11 +79,7 @@ export const UsersSection = () => {
|
||||
* reasons to press this, and an empty answer means "leave authorized_keys alone" rather than "remove it".
|
||||
*/
|
||||
const provisionLinux = async (user: ManagedUser) => {
|
||||
const key = window.prompt(
|
||||
`Linux account for ${user.email}.\n\n` +
|
||||
`Paste an SSH public key to allow them to SSH in, or leave empty to keep the current one.`,
|
||||
'',
|
||||
);
|
||||
const key = window.prompt(t('settings.users.provisionPrompt', { email: user.email }), '');
|
||||
// Cancel is null; empty string is a deliberate "no change".
|
||||
if (key === null) return;
|
||||
|
||||
@@ -147,13 +145,13 @@ export const UsersSection = () => {
|
||||
if (isLoading) {
|
||||
return (
|
||||
<div className="flex items-center gap-2 text-sm text-muted-foreground">
|
||||
<Loader2 className="h-4 w-4 animate-spin" /> Loading accounts…
|
||||
<Loader2 className="h-4 w-4 animate-spin" /> {t('settings.users.loadingAccounts')}
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
if (isError || !data) {
|
||||
return <div className="text-sm text-destructive">Could not load the accounts.</div>;
|
||||
return <div className="text-sm text-destructive">{t('settings.users.accountsFailed')}</div>;
|
||||
}
|
||||
|
||||
return (
|
||||
@@ -173,7 +171,12 @@ export const UsersSection = () => {
|
||||
<div className="min-w-0 flex-1">
|
||||
<div className="flex items-center gap-1.5">
|
||||
<span className="truncate text-sm font-medium">{user.name || user.username || user.email}</span>
|
||||
{user.isOwner && <Crown className="h-3.5 w-3.5 shrink-0 text-duck-teal" aria-label="Server owner" />}
|
||||
{user.isOwner && (
|
||||
<Crown
|
||||
className="h-3.5 w-3.5 shrink-0 text-duck-teal"
|
||||
aria-label={t('settings.users.serverOwner')}
|
||||
/>
|
||||
)}
|
||||
</div>
|
||||
<div className="truncate text-xs text-muted-foreground">
|
||||
{user.email}
|
||||
@@ -212,11 +215,13 @@ export const UsersSection = () => {
|
||||
size="icon"
|
||||
className={`shrink-0 ${user.osUser ? 'text-muted-foreground' : 'text-amber-500'}`}
|
||||
disabled={busy}
|
||||
aria-label={user.osUser ? `Repair ${user.email}'s Linux account` : `Create a Linux account`}
|
||||
aria-label={
|
||||
user.osUser ? t('settings.users.repairFor', { email: user.email }) : t('settings.users.createLinux')
|
||||
}
|
||||
title={
|
||||
user.osUser
|
||||
? `Linux account: ${user.osUser} — click to repair or replace their SSH key`
|
||||
: 'No Linux account — click to create one'
|
||||
? t('settings.users.linuxAccountFor', { osUser: user.osUser })
|
||||
: t('settings.users.noLinux')
|
||||
}
|
||||
onClick={() => void provisionLinux(user)}
|
||||
>
|
||||
@@ -231,11 +236,11 @@ export const UsersSection = () => {
|
||||
variant="ghost"
|
||||
size="icon"
|
||||
className="shrink-0 text-muted-foreground"
|
||||
aria-label={`Copy ${user.email}'s SSH public key`}
|
||||
title="Copy their SSH public key (add it to their Gitea account)"
|
||||
aria-label={t('settings.users.copySshFor', { email: user.email })}
|
||||
title={t('settings.users.copySshTitle')}
|
||||
onClick={() => {
|
||||
void copyToClipboard(user.osSshPublicKey!);
|
||||
toast.success('Public key copied');
|
||||
toast.success(t('settings.users.publicKeyCopied'));
|
||||
}}
|
||||
>
|
||||
<KeyRound className="h-4 w-4" />
|
||||
@@ -250,8 +255,8 @@ export const UsersSection = () => {
|
||||
size="icon"
|
||||
className="shrink-0 text-muted-foreground"
|
||||
disabled={busy}
|
||||
aria-label={`Reset ${user.email}'s password`}
|
||||
title="Generate a new password — shown once, and signs them out everywhere"
|
||||
aria-label={t('settings.users.resetPasswordFor', { email: user.email })}
|
||||
title={t('settings.users.resetPasswordTitle')}
|
||||
onClick={() => setConfirmReset(user)}
|
||||
>
|
||||
{busy ? <Loader2 className="h-4 w-4 animate-spin" /> : <RotateCcw className="h-4 w-4" />}
|
||||
@@ -264,7 +269,7 @@ export const UsersSection = () => {
|
||||
className="shrink-0 text-muted-foreground hover:text-destructive"
|
||||
disabled={user.isOwner || busy}
|
||||
onClick={() => setConfirmDelete(user)}
|
||||
aria-label={`Remove ${user.email}`}
|
||||
aria-label={t('settings.users.removeFor', { email: user.email })}
|
||||
>
|
||||
{busy ? <Loader2 className="h-4 w-4 animate-spin" /> : <Trash2 className="h-4 w-4" />}
|
||||
</Button>
|
||||
@@ -282,19 +287,18 @@ export const UsersSection = () => {
|
||||
<AlertDialog open={!!confirmDelete} onOpenChange={(open) => !open && setConfirmDelete(null)}>
|
||||
<AlertDialogContent>
|
||||
<AlertDialogHeader>
|
||||
<AlertDialogTitle>Remove {confirmDelete?.email}?</AlertDialogTitle>
|
||||
<AlertDialogDescription>
|
||||
This deletes the account and everything belonging to it — passkeys, dashboards, saved layouts, and
|
||||
anything an installed plugin keeps for them. It cannot be undone.
|
||||
</AlertDialogDescription>
|
||||
<AlertDialogTitle>
|
||||
{t('settings.users.removeTitle', { email: confirmDelete?.email ?? '' })}
|
||||
</AlertDialogTitle>
|
||||
<AlertDialogDescription>{t('settings.users.removeBody')}</AlertDialogDescription>
|
||||
</AlertDialogHeader>
|
||||
<AlertDialogFooter>
|
||||
<AlertDialogCancel>Cancel</AlertDialogCancel>
|
||||
<AlertDialogCancel>{tUi('button.cancel')}</AlertDialogCancel>
|
||||
<AlertDialogAction
|
||||
className="bg-destructive text-destructive-foreground hover:bg-destructive/90"
|
||||
onClick={() => confirmDelete && void remove(confirmDelete)}
|
||||
>
|
||||
Remove account
|
||||
{t('settings.users.removeAccount')}
|
||||
</AlertDialogAction>
|
||||
</AlertDialogFooter>
|
||||
</AlertDialogContent>
|
||||
@@ -305,23 +309,16 @@ export const UsersSection = () => {
|
||||
<AlertDialog open={!!confirmReset} onOpenChange={(open) => !open && setConfirmReset(null)}>
|
||||
<AlertDialogContent>
|
||||
<AlertDialogHeader>
|
||||
<AlertDialogTitle>Reset the password for {confirmReset?.email}?</AlertDialogTitle>
|
||||
<AlertDialogTitle>{t('settings.users.resetTitle', { email: confirmReset?.email ?? '' })}</AlertDialogTitle>
|
||||
<AlertDialogDescription>
|
||||
A new password is generated and shown to you once — it is not stored anywhere and cannot be looked up
|
||||
afterwards. Their existing password stops working immediately, and they are signed out everywhere.
|
||||
{confirmReset?.osUser ? (
|
||||
<>
|
||||
{' '}
|
||||
Their Linux account ({confirmReset.osUser}) is not affected: it has no password, and SSH keys are
|
||||
unchanged.
|
||||
</>
|
||||
) : null}
|
||||
{t('settings.users.resetBody')}
|
||||
{confirmReset?.osUser ? ` ${t('settings.users.resetLinuxNote', { osUser: confirmReset.osUser })}` : null}
|
||||
</AlertDialogDescription>
|
||||
</AlertDialogHeader>
|
||||
<AlertDialogFooter>
|
||||
<AlertDialogCancel>Cancel</AlertDialogCancel>
|
||||
<AlertDialogCancel>{tUi('button.cancel')}</AlertDialogCancel>
|
||||
<AlertDialogAction onClick={() => confirmReset && void resetPassword(confirmReset)}>
|
||||
Generate a new password
|
||||
{t('settings.users.generateNewPassword')}
|
||||
</AlertDialogAction>
|
||||
</AlertDialogFooter>
|
||||
</AlertDialogContent>
|
||||
@@ -345,11 +342,11 @@ export const UsersSection = () => {
|
||||
variant="ghost"
|
||||
size="icon"
|
||||
className="shrink-0"
|
||||
aria-label="Copy the new password"
|
||||
aria-label={t('settings.users.copyNewPassword')}
|
||||
onClick={() => {
|
||||
if (!newPassword) return;
|
||||
void copyToClipboard(newPassword.password).then((ok) =>
|
||||
ok ? toast.success('Password copied') : toast.error('Could not copy — select it and copy by hand'),
|
||||
ok ? toast.success(t('settings.users.passwordCopied')) : toast.error(t('settings.users.copyFailed')),
|
||||
);
|
||||
}}
|
||||
>
|
||||
@@ -358,7 +355,7 @@ export const UsersSection = () => {
|
||||
</div>
|
||||
|
||||
<AlertDialogFooter>
|
||||
<AlertDialogAction onClick={() => setNewPassword(null)}>Done</AlertDialogAction>
|
||||
<AlertDialogAction onClick={() => setNewPassword(null)}>{t('settings.users.done')}</AlertDialogAction>
|
||||
</AlertDialogFooter>
|
||||
</AlertDialogContent>
|
||||
</AlertDialog>
|
||||
|
||||
@@ -15,15 +15,15 @@ const sections: SettingsSection[] = [
|
||||
{
|
||||
key: 'users',
|
||||
icon: Users,
|
||||
title: 'Accounts',
|
||||
description: 'Who has access, and as what',
|
||||
titleKey: 'settings.sections.accounts.label',
|
||||
descriptionKey: 'settings.sections.accounts.description',
|
||||
content: <UsersSection />,
|
||||
},
|
||||
{
|
||||
key: 'permissions',
|
||||
icon: ShieldCheck,
|
||||
title: 'Permissions',
|
||||
description: 'What each role can reach',
|
||||
titleKey: 'settings.sections.permissions.label',
|
||||
descriptionKey: 'settings.sections.permissions.description',
|
||||
content: <PermissionsSection />,
|
||||
},
|
||||
];
|
||||
@@ -33,7 +33,7 @@ const BASE_PATH = '/settings/user-management';
|
||||
const { Sidebar, Content } = createSettingsPanelComponents({
|
||||
basePath: BASE_PATH,
|
||||
sidebarIcon: UserCog,
|
||||
sidebarLabel: 'Users',
|
||||
sidebarLabelKey: 'settings.nav.users',
|
||||
sections,
|
||||
});
|
||||
|
||||
|
||||
@@ -0,0 +1,12 @@
|
||||
import type { LayoutNode } from 'officerdev';
|
||||
import { WorkspaceView } from 'officerdev';
|
||||
import { useDashboardState } from 'state/useDashboardState';
|
||||
import { defaultLayout } from './defaultLayout';
|
||||
|
||||
// /todos — the Kanban board over the repo's own `todo/` tree (one file per item, todo/README.md).
|
||||
// Selection and the theme filter are `?selected=` / `?theme=`, read by the panel itself.
|
||||
export const TodosScreen = () => {
|
||||
const workspace = useDashboardState<LayoutNode>('screens/todos', defaultLayout);
|
||||
|
||||
return <WorkspaceView workspace={workspace} locked appTypes={{ allowed: ['todo-board'], fallback: 'todo-board' }} />;
|
||||
};
|
||||
@@ -0,0 +1,8 @@
|
||||
import type { LayoutNode } from 'officerdev';
|
||||
|
||||
// One panel: the board carries its own filter bar and detail pane, driven by the URL.
|
||||
export const defaultLayout: LayoutNode = {
|
||||
type: 'panel',
|
||||
id: 'todo-board',
|
||||
appType: 'todo-board',
|
||||
};
|
||||
@@ -0,0 +1 @@
|
||||
export * from './TodosScreen';
|
||||
@@ -22,5 +22,5 @@ export * from './Dashboards';
|
||||
export * from './Terminal';
|
||||
export * from './Jobs';
|
||||
export * from './QrTransfer';
|
||||
export * from './Minesweeper';
|
||||
export * from './SendOff';
|
||||
export * from './Todos';
|
||||
|
||||
@@ -1,30 +1,11 @@
|
||||
import { useEffect } from 'react';
|
||||
import type { ReactNode } from 'react';
|
||||
import type { TranslationMap } from 'i18n';
|
||||
|
||||
import { I18nProvider, localeDirection } from 'i18n';
|
||||
import { panelCatalogs } from 'officerdev';
|
||||
import { uiCatalogs } from '@/components/locales';
|
||||
import { setNameRevision } from 'workspaces/react';
|
||||
import { useSettings } from 'state/useSettings';
|
||||
import { FALLBACK_LOCALE, SHIPPED_LOCALES } from './locales';
|
||||
import appEnGB from '../locales/en-GB.json';
|
||||
import appPtPT from '../locales/pt-PT.json';
|
||||
|
||||
const appCatalogs: TranslationMap = { 'en-GB': appEnGB, 'pt-PT': appPtPT };
|
||||
|
||||
/**
|
||||
* Deep-merges the three per-workspace catalogs (D6) into one map per shipped locale — `app.*` from
|
||||
* officer-web, `panel.*` from officerdev's panel apps, `ui.*` from shared components.
|
||||
*/
|
||||
const translations: TranslationMap = Object.fromEntries(
|
||||
SHIPPED_LOCALES.map(({ code }) => [
|
||||
code,
|
||||
{
|
||||
app: appCatalogs[code] ?? {},
|
||||
panel: panelCatalogs[code] ?? {},
|
||||
ui: uiCatalogs[code] ?? {},
|
||||
},
|
||||
]),
|
||||
);
|
||||
import { catalogues as translations } from './catalogues';
|
||||
|
||||
type I18nBridgeProps = {
|
||||
children: ReactNode;
|
||||
@@ -40,6 +21,17 @@ export const I18nBridge = ({ children }: I18nBridgeProps) => {
|
||||
document.documentElement.dir = localeDirection(locale);
|
||||
}, [locale]);
|
||||
|
||||
/*
|
||||
Panel names are thunks resolved during the framework's own render (AppRegistryEntry.name), and the
|
||||
framework is not subscribed to this provider — it has no i18n dependency at all, deliberately. So
|
||||
tell it that the words changed. It treats the value as opaque; that it happens to be a locale is
|
||||
this file's business, not the framework's.
|
||||
|
||||
Set during render rather than in an effect: an effect would leave the first paint after a locale
|
||||
switch showing the previous language's titles.
|
||||
*/
|
||||
setNameRevision(locale);
|
||||
|
||||
return (
|
||||
<I18nProvider translations={translations} locale={locale} fallbackLocale={FALLBACK_LOCALE}>
|
||||
{children}
|
||||
|
||||
@@ -0,0 +1,51 @@
|
||||
import { describe, expect, test } from 'bun:test';
|
||||
import { catalogues } from './catalogues';
|
||||
import { FALLBACK_LOCALE, SHIPPED_LOCALES } from './locales';
|
||||
|
||||
/**
|
||||
* A locale is only shipped if it is actually LOADED.
|
||||
*
|
||||
* This exists because es-ES, de-DE and fr-FR shipped dead. Every one of their 1,129 keys was translated and
|
||||
* in parity, all three were in `SHIPPED_LOCALES` so the picker offered them, and choosing one rendered the
|
||||
* entire UI in raw keys — because none of the three catalogue files had been given the `import`.
|
||||
*
|
||||
* The parity tests could not have caught it and never will: they compare JSON files to each other, and an
|
||||
* unimported file is as parity-correct as an imported one. The gap was between "the translation exists" and
|
||||
* "the app can reach it", and nothing was asking that question.
|
||||
*
|
||||
* Adding a locale touches four files. This is the one that knows whether all four happened.
|
||||
*/
|
||||
describe('every shipped locale is reachable', () => {
|
||||
const NAMESPACES = ['app', 'panel', 'ui'] as const;
|
||||
|
||||
test('SHIPPED_LOCALES is not empty and contains the fallback', () => {
|
||||
expect(SHIPPED_LOCALES.length).toBeGreaterThan(0);
|
||||
expect(SHIPPED_LOCALES.map((l) => l.code)).toContain(FALLBACK_LOCALE);
|
||||
});
|
||||
|
||||
for (const { code } of SHIPPED_LOCALES) {
|
||||
describe(code, () => {
|
||||
test('has a catalogue at all', () => {
|
||||
expect(catalogues[code]).toBeDefined();
|
||||
});
|
||||
|
||||
for (const ns of NAMESPACES) {
|
||||
// Non-empty, not merely present. The failure being pinned produced `{}` for all three, which is
|
||||
// exactly what `?? {}` yields for a locale nobody imported — present, and useless.
|
||||
test(`${ns}.* is populated`, () => {
|
||||
const catalogue = (catalogues[code] as Record<string, object> | undefined)?.[ns];
|
||||
expect(catalogue).toBeDefined();
|
||||
expect(Object.keys(catalogue ?? {}).length).toBeGreaterThan(0);
|
||||
});
|
||||
}
|
||||
|
||||
// Parity against the fallback is tested per-workspace already; this is the cheaper cross-check that
|
||||
// the MERGED catalogue is the same size, which catches a namespace wired to the wrong locale's file.
|
||||
test('is the same size as the fallback', () => {
|
||||
const count = (o: unknown): number =>
|
||||
typeof o === 'object' && o !== null ? Object.values(o).reduce<number>((n, v) => n + count(v), 0) : 1;
|
||||
expect(count(catalogues[code])).toBe(count(catalogues[FALLBACK_LOCALE]));
|
||||
});
|
||||
});
|
||||
}
|
||||
});
|
||||
@@ -0,0 +1,49 @@
|
||||
import type { TranslationMap } from 'i18n';
|
||||
import { panelCatalogs } from 'officerdev';
|
||||
import { uiCatalogs } from '@/components/locales';
|
||||
import { SHIPPED_LOCALES } from './locales';
|
||||
import appDeDE from '../locales/de-DE.json';
|
||||
import appEnGB from '../locales/en-GB.json';
|
||||
import appEsES from '../locales/es-ES.json';
|
||||
import appFrFR from '../locales/fr-FR.json';
|
||||
import appPtPT from '../locales/pt-PT.json';
|
||||
import appSvSE from '../locales/sv-SE.json';
|
||||
|
||||
/**
|
||||
* The three per-workspace catalogues, merged into one map per shipped locale (D6): `app.*` from
|
||||
* officer-web, `panel.*` from officerdev's panel apps, `ui.*` from shared components.
|
||||
*
|
||||
* ── Why this is a separate file from `I18nBridge` ──
|
||||
*
|
||||
* So it can be tested without mounting React, and it is tested because of a real failure. es-ES, de-DE and
|
||||
* fr-FR shipped translated, in perfect key parity, listed in the picker — and completely dead. All three
|
||||
* `import` lists still named only en-GB and pt-PT, so `catalogues[code]` was three empty objects and the
|
||||
* whole UI rendered untranslated in three of five languages.
|
||||
*
|
||||
* Nothing caught it. The parity tests compare the JSON FILES against each other and every file was correct;
|
||||
* a locale that is never imported is invisible to them by construction. `SHIPPED_LOCALES` is what the picker
|
||||
* reads, and it had been updated. Adding a locale was four edits in four files with no single place that
|
||||
* knew all four had happened.
|
||||
*
|
||||
* `catalogues.test.ts` is now that place: it asserts every shipped locale actually resolves to a populated
|
||||
* catalogue in all three namespaces.
|
||||
*/
|
||||
const appCatalogs: TranslationMap = {
|
||||
'en-GB': appEnGB,
|
||||
'pt-PT': appPtPT,
|
||||
'es-ES': appEsES,
|
||||
'de-DE': appDeDE,
|
||||
'fr-FR': appFrFR,
|
||||
'sv-SE': appSvSE,
|
||||
};
|
||||
|
||||
export const catalogues: TranslationMap = Object.fromEntries(
|
||||
SHIPPED_LOCALES.map(({ code }) => [
|
||||
code,
|
||||
{
|
||||
app: appCatalogs[code] ?? {},
|
||||
panel: panelCatalogs[code] ?? {},
|
||||
ui: uiCatalogs[code] ?? {},
|
||||
},
|
||||
]),
|
||||
);
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user