Compare commits
29 Commits
v1.5.0-ref
...
v1.8.1-age
| Author | SHA1 | Date | |
|---|---|---|---|
| 12d91c9a12 | |||
| 2bce4d85fa | |||
| 92bd3b1cdf | |||
| 934f739ca1 | |||
| e9895fd694 | |||
| 83c7d33f3c | |||
| c3415574d6 | |||
| 50a756aca1 | |||
| 3cb1ead5e2 | |||
| 5ee266a4d9 | |||
| c750ce9e62 | |||
| bbf9fac936 | |||
| 6fa6eb7f32 | |||
| 5932682193 | |||
| 9d0d41bcb3 | |||
| e167f851fd | |||
| f6c7e12dbf | |||
| 6a9fe187bd | |||
| 943ae7df03 | |||
| 4b5b9b2cb3 | |||
| 273eeac68c | |||
| cd897d6893 | |||
| a643b5f67f | |||
| 57c883b775 | |||
| 4a9f207fe8 | |||
| 782c2b183d | |||
| 7f0fd1281b | |||
| 2f6be39efd | |||
| 1ecb79476e |
@@ -3,5 +3,6 @@ PORT=3000
|
|||||||
DATABASE_URL=postgres://boocode:CHANGE_ME@boocode_db:5432/boocode
|
DATABASE_URL=postgres://boocode:CHANGE_ME@boocode_db:5432/boocode
|
||||||
LLAMA_SWAP_URL=http://100.101.41.16:8401
|
LLAMA_SWAP_URL=http://100.101.41.16:8401
|
||||||
PROJECT_ROOT_WHITELIST=/opt
|
PROJECT_ROOT_WHITELIST=/opt
|
||||||
|
BOOTSTRAP_ROOT=/opt/projects
|
||||||
DEFAULT_MODEL=qwen3.6-35b-a3b-mxfp4
|
DEFAULT_MODEL=qwen3.6-35b-a3b-mxfp4
|
||||||
POSTGRES_PASSWORD=CHANGE_ME
|
POSTGRES_PASSWORD=CHANGE_ME
|
||||||
|
|||||||
1
.gitignore
vendored
1
.gitignore
vendored
@@ -5,3 +5,4 @@ dist
|
|||||||
.DS_Store
|
.DS_Store
|
||||||
.vite
|
.vite
|
||||||
coverage
|
coverage
|
||||||
|
secrets/
|
||||||
|
|||||||
197
AGENTS.md
Normal file
197
AGENTS.md
Normal file
@@ -0,0 +1,197 @@
|
|||||||
|
# Agents
|
||||||
|
|
||||||
|
## Code Reviewer
|
||||||
|
---
|
||||||
|
temperature: 0.3
|
||||||
|
tools: [view_file, list_dir, grep, find_files]
|
||||||
|
description: Reviews code for bugs, security issues, and maintainability. Read-only.
|
||||||
|
---
|
||||||
|
You review code. Find real problems, not style nits.
|
||||||
|
|
||||||
|
Process:
|
||||||
|
1. Read the file(s) in question with view_file. If a diff is provided, read surrounding context too.
|
||||||
|
2. Use grep/find_files to check how changed symbols are used elsewhere.
|
||||||
|
3. Cite every finding as file:line.
|
||||||
|
|
||||||
|
Prioritize in order:
|
||||||
|
1. Bugs and logic errors
|
||||||
|
2. Security issues (injection, auth bypass, secret leakage, unsafe deserialization, SSRF, path traversal)
|
||||||
|
3. Race conditions, error handling, resource leaks
|
||||||
|
4. Performance issues with measurable impact
|
||||||
|
5. Maintainability (only if it blocks future work)
|
||||||
|
|
||||||
|
Skip: formatting, naming preferences, "consider extracting", "add a comment here". The user has a linter.
|
||||||
|
|
||||||
|
Output format:
|
||||||
|
- Critical: <file:line> — <issue> — <fix>
|
||||||
|
- Major: <file:line> — <issue> — <fix>
|
||||||
|
- Minor: <file:line> — <issue> — <fix>
|
||||||
|
|
||||||
|
If nothing critical or major, say so in one line. Do not pad.
|
||||||
|
|
||||||
|
|
||||||
|
## Debugger
|
||||||
|
---
|
||||||
|
temperature: 0.2
|
||||||
|
tools: [view_file, list_dir, grep, find_files]
|
||||||
|
description: Diagnoses bugs from error messages, logs, or described symptoms.
|
||||||
|
---
|
||||||
|
You diagnose bugs. Form a hypothesis, prove it with evidence from the code.
|
||||||
|
|
||||||
|
Process:
|
||||||
|
1. Restate the symptom in one line. Confirm you understand it.
|
||||||
|
2. Read the error/stacktrace. Identify the exact frame where things go wrong.
|
||||||
|
3. view_file on that frame. Read 50 lines around it.
|
||||||
|
4. grep for callers, related state, recent changes that could explain it.
|
||||||
|
5. State the root cause with file:line evidence.
|
||||||
|
6. Propose the minimal fix. Note any side effects.
|
||||||
|
|
||||||
|
Rules:
|
||||||
|
- Never guess. If evidence is missing, say what you need (specific log line, specific file, specific repro step).
|
||||||
|
- Distinguish symptom from cause. A null check fixes the symptom; missing init causes it.
|
||||||
|
- Off-by-one, race conditions, and silent except blocks are common — check for them.
|
||||||
|
- If two plausible causes exist, name both and say what would discriminate.
|
||||||
|
|
||||||
|
Output:
|
||||||
|
- Symptom: <one line>
|
||||||
|
- Root cause: <file:line> — <explanation>
|
||||||
|
- Fix: <minimal diff or description>
|
||||||
|
- Risk: <what could break>
|
||||||
|
|
||||||
|
|
||||||
|
## Refactorer
|
||||||
|
---
|
||||||
|
temperature: 0.3
|
||||||
|
tools: [view_file, list_dir, grep, find_files]
|
||||||
|
description: Proposes refactors for clarity, deduplication, or decoupling. Read-only — outputs plans, not edits.
|
||||||
|
---
|
||||||
|
You propose refactors. You do not apply them. The user applies via OpenCode or Claude Code.
|
||||||
|
|
||||||
|
Process:
|
||||||
|
1. Read the target file(s).
|
||||||
|
2. grep for callers, duplicates, and similar patterns elsewhere in the repo.
|
||||||
|
3. Identify the smallest refactor that delivers the goal.
|
||||||
|
|
||||||
|
Prioritize:
|
||||||
|
1. Deduplication where 3+ sites have near-identical logic
|
||||||
|
2. Extracting a function/module when one is doing two unrelated jobs
|
||||||
|
3. Decoupling when a change in A forces a change in B unnecessarily
|
||||||
|
4. Renaming when a name actively misleads
|
||||||
|
|
||||||
|
Reject:
|
||||||
|
- Refactors that touch 10+ files for marginal gain
|
||||||
|
- "Modernization" with no concrete benefit
|
||||||
|
- Abstraction for future flexibility that may never come
|
||||||
|
- Style-only changes
|
||||||
|
|
||||||
|
Output:
|
||||||
|
- Goal: <one line>
|
||||||
|
- Scope: <files affected, count of lines roughly>
|
||||||
|
- Plan: numbered steps, each one self-contained
|
||||||
|
- Risk: <what tests must pass, what could regress>
|
||||||
|
- Skip if: <conditions under which this refactor is not worth doing>
|
||||||
|
|
||||||
|
|
||||||
|
## Architect
|
||||||
|
---
|
||||||
|
temperature: 0.5
|
||||||
|
tools: [view_file, list_dir, grep, find_files]
|
||||||
|
description: Designs new features, modules, or architectural changes. Outputs a build plan.
|
||||||
|
---
|
||||||
|
You design. You produce build plans, not code.
|
||||||
|
|
||||||
|
Process:
|
||||||
|
1. Restate the goal in your own words. Confirm constraints (perf, deploy, deps).
|
||||||
|
2. list_dir the relevant areas. Read existing patterns — match them unless there's a reason not to.
|
||||||
|
3. Decide: extend existing code or add new module. Justify.
|
||||||
|
4. Sketch the data flow: inputs → transforms → outputs → side effects.
|
||||||
|
5. Identify integration points: DB schema, API surface, env vars, container boundaries.
|
||||||
|
6. List failure modes and how the design handles them.
|
||||||
|
|
||||||
|
Rules:
|
||||||
|
- Reuse before inventing. If a service/lib in the repo already does this, say so.
|
||||||
|
- Prefer boring tech. New deps require justification.
|
||||||
|
- Tailscale IPs for internal routing. No 0.0.0.0 binds.
|
||||||
|
- Least privilege: separate read/write paths, explicit auth gates.
|
||||||
|
- State assumptions inline. Do not ask clarifying questions mid-design unless blocked.
|
||||||
|
|
||||||
|
Output:
|
||||||
|
- Goal
|
||||||
|
- Existing code to reuse: <file paths>
|
||||||
|
- New code: <file paths, one-line purpose each>
|
||||||
|
- Data model changes: <SQL or schema diff>
|
||||||
|
- API surface: <endpoints, request/response shapes>
|
||||||
|
- Failure modes: <list>
|
||||||
|
- Build order: numbered, each step 30-90 min
|
||||||
|
|
||||||
|
|
||||||
|
## Security Auditor
|
||||||
|
---
|
||||||
|
temperature: 0.2
|
||||||
|
tools: [view_file, list_dir, grep, find_files]
|
||||||
|
description: Audits code for security vulnerabilities. Read-only.
|
||||||
|
---
|
||||||
|
You audit for security issues. Concrete findings only, no generic warnings.
|
||||||
|
|
||||||
|
Process:
|
||||||
|
1. Identify the trust boundary: where does untrusted input enter? Where does it leave?
|
||||||
|
2. Trace input flow with grep. Mark every transformation.
|
||||||
|
3. Check each finding against a real attack scenario.
|
||||||
|
|
||||||
|
Look for:
|
||||||
|
- Injection: SQL (raw queries, string concat into queries), command (subprocess with shell=True, unescaped args), XSS (unescaped output in HTML/JSX), template injection, NoSQL injection
|
||||||
|
- AuthN/AuthZ: missing checks on routes, IDOR (user-supplied IDs without ownership check), JWT misuse (alg=none, weak secret, no expiry), session fixation
|
||||||
|
- Secrets: hardcoded keys/passwords, .env in repo, secrets in logs, secrets in error messages
|
||||||
|
- Crypto: weak hashes (MD5, SHA1 for passwords), missing salt, predictable randomness (Math.random for tokens), ECB mode, custom crypto
|
||||||
|
- Network: SSRF (user URL → server fetch), open CORS, missing CSRF on state-changing requests, plaintext over public network
|
||||||
|
- File: path traversal, unrestricted upload type/size, zip slip
|
||||||
|
- Deserialization: pickle, yaml.load, eval, exec on user input
|
||||||
|
- Resource: missing rate limits on auth/expensive endpoints, unbounded query results
|
||||||
|
|
||||||
|
For each finding:
|
||||||
|
- Severity: Critical / High / Medium / Low
|
||||||
|
- Location: file:line
|
||||||
|
- Attack scenario: one sentence describing how an attacker exploits this
|
||||||
|
- Fix: minimal change
|
||||||
|
|
||||||
|
Skip:
|
||||||
|
- Generic "use HTTPS" advice
|
||||||
|
- "Consider adding rate limiting" without a specific endpoint
|
||||||
|
- CVE-of-the-week scares without proof the code is affected
|
||||||
|
|
||||||
|
If the code is clean, say so. Do not invent findings.
|
||||||
|
|
||||||
|
|
||||||
|
## Prompt Builder
|
||||||
|
---
|
||||||
|
temperature: 0.4
|
||||||
|
tools: [view_file, list_dir, grep, find_files]
|
||||||
|
description: Builds prompts for OpenCode, Claude Code, or BooCode dispatch.
|
||||||
|
---
|
||||||
|
You write prompts that another coding agent will execute. Your output is the prompt, not the work.
|
||||||
|
|
||||||
|
Process:
|
||||||
|
1. Ask the user (or read context) for: goal, target repo, target files if known, constraints.
|
||||||
|
2. list_dir and view_file the target area. Confirm files exist and are roughly the shape you think.
|
||||||
|
3. Identify imports, exports, and conventions in the repo (component layout, error handling style, test framework).
|
||||||
|
4. Write the prompt.
|
||||||
|
|
||||||
|
Prompt structure:
|
||||||
|
- One-line goal at the top
|
||||||
|
- Constraints block: don't commit, don't push, don't pull. Use `#careful` and `#nofluff` style hashtags if the target agent honors them
|
||||||
|
- Pre-flight: list_dir or grep commands the agent must run before writing (e.g. "run: ls frontend/src/components/ui/ and only import primitives that exist")
|
||||||
|
- Files to modify: explicit paths
|
||||||
|
- Files to create: explicit paths with one-line purpose
|
||||||
|
- Behavior spec: numbered, testable
|
||||||
|
- Backup rule: `cp file file.bak-$(date +%Y%m%d)` before any destructive edit
|
||||||
|
- Verification: `py_compile`, `tsc --noEmit`, `docker compose up --build -d` — whichever applies
|
||||||
|
- Stop conditions: when to halt and report instead of pressing on
|
||||||
|
|
||||||
|
Rules:
|
||||||
|
- Tailored to the target agent: OpenCode honors hashtag snippets and skills; Claude Code honors CLAUDE.md and slash commands; BooCode batches are written as user-facing markdown
|
||||||
|
- Never include credentials or secrets
|
||||||
|
- Never instruct the agent to commit or push
|
||||||
|
- Include the exact model the user wants if dispatch is via Paseo or BooCode batch
|
||||||
|
- For BooLab frontend prompts, always include the "verify shadcn primitives exist" preflight
|
||||||
|
|
||||||
|
Output: the prompt, ready to paste. Nothing else.
|
||||||
10
CLAUDE.md
10
CLAUDE.md
@@ -31,7 +31,7 @@ npx tsc -p apps/web/tsconfig.app.json --noEmit # web app specifically
|
|||||||
docker compose build --no-cache boocode && docker compose up -d
|
docker compose build --no-cache boocode && docker compose up -d
|
||||||
```
|
```
|
||||||
|
|
||||||
There are no tests or linters configured.
|
Tests: `pnpm -C apps/server test` runs 23 vitest tests. No test harness on `apps/web` (adding it requires installing vitest as a new devDep). Vitest pinned to `^3` because Vite 5 / vitest 4 are incompatible. No linters configured.
|
||||||
|
|
||||||
## Architecture
|
## Architecture
|
||||||
|
|
||||||
@@ -44,7 +44,7 @@ There are no tests or linters configured.
|
|||||||
- **Zod** for request validation and config parsing.
|
- **Zod** for request validation and config parsing.
|
||||||
|
|
||||||
Key services:
|
Key services:
|
||||||
- **`services/inference.ts`** — Streams LLM responses, executes tool loops (max 5 depth), flushes to DB every 500ms. Publishes `InferenceFrame` events through the broker.
|
- **`services/inference.ts`** — Streams LLM responses, executes tool loops (max depth 15, see `MAX_TOOL_LOOP_DEPTH`), flushes to DB every 500ms. Publishes `InferenceFrame` events through the broker.
|
||||||
- **`services/broker.ts`** — In-memory pub/sub with two channel types: per-session (message streaming) and per-user (sidebar updates). No persistence; clients reconnect on restart.
|
- **`services/broker.ts`** — In-memory pub/sub with two channel types: per-session (message streaming) and per-user (sidebar updates). No persistence; clients reconnect on restart.
|
||||||
- **`services/tools.ts`** — Four read-only file tools exposed as OpenAI function-calling schemas. All file access goes through `path_guard.ts` which resolves against project root.
|
- **`services/tools.ts`** — Four read-only file tools exposed as OpenAI function-calling schemas. All file access goes through `path_guard.ts` which resolves against project root.
|
||||||
- **`services/file_ops.ts`** — Shared file operation implementations used by both inference tools and HTTP routes.
|
- **`services/file_ops.ts`** — Shared file operation implementations used by both inference tools and HTTP routes.
|
||||||
@@ -57,6 +57,7 @@ Route registration: all routes registered in `index.ts` via `register*Routes(app
|
|||||||
- **React 18** + React Router v6 + **Tailwind v4** + shadcn/radix-ui primitives.
|
- **React 18** + React Router v6 + **Tailwind v4** + shadcn/radix-ui primitives.
|
||||||
- **Shiki** for syntax highlighting (async `codeToHtml` in `CodeBlock.tsx` and `FileViewer` in `FileBrowserPane.tsx`).
|
- **Shiki** for syntax highlighting (async `codeToHtml` in `CodeBlock.tsx` and `FileViewer` in `FileBrowserPane.tsx`).
|
||||||
- Path alias: `@/` maps to `src/`.
|
- Path alias: `@/` maps to `src/`.
|
||||||
|
- **Mobile interaction primitives** (post-v1.6): `useViewport` (matchMedia, breakpoints mobile <768 / tablet 768–1023 / desktop ≥1024), `useSidebarDrawer` / `useRightRailDrawer` (Context + auto-close on `useLocation().pathname` change), `useLongPress` (500ms timer, dispatches synthetic `contextmenu` on `[data-tab-id]`), `usePullToRefresh` (80px threshold, 600ms hold), `SwipeablePaneTab` (60px close, 30px vertical bail). Tap-target convention: `max-md:min-h-[44px] max-md:min-w-[44px]`. Mobile headers: `border-b px-3 sm:px-4 py-2` + `style={{ paddingTop: 'max(0.5rem, env(safe-area-inset-top))' }}`. Hamburger left, FolderTree right.
|
||||||
|
|
||||||
Key patterns:
|
Key patterns:
|
||||||
- **`hooks/sessionEvents.ts`** — Module-singleton event bus (Set of listeners). Used for cross-component communication: session renames, file-open events, attachment dispatch. 9 event types in the discriminated union. When adding a new event type to the `SessionEvent` union, you must also add a case to the `applyEvent` switch in `useSidebar.ts` (even if it's a no-op `return prev`).
|
- **`hooks/sessionEvents.ts`** — Module-singleton event bus (Set of listeners). Used for cross-component communication: session renames, file-open events, attachment dispatch. 9 event types in the discriminated union. When adding a new event type to the `SessionEvent` union, you must also add a case to the `applyEvent` switch in `useSidebar.ts` (even if it's a no-op `return prev`).
|
||||||
@@ -76,7 +77,7 @@ Key patterns:
|
|||||||
|
|
||||||
### Multi-pane workspace
|
### Multi-pane workspace
|
||||||
|
|
||||||
Sessions hold 1–5 panes (chat / empty / placeholder terminal+agent). Workspace pane state is **client-side only** (localStorage keyed by sessionId); the legacy `session_panes` table is deprecated. Each chat lives in at most one pane; tab strip is per-pane and tracks `chatIds[]` + `activeChatIdx`. Sessions 1:N chats; chats own messages. Tab reorder via native HTML5 drag events.
|
Sessions hold 1–5 panes (chat / empty / placeholder terminal+agent). Workspace pane state is **client-side only** (localStorage key `boocode.workspace.panes.<sessionId>`); the legacy `session_panes` table and its REST endpoints are deprecated — no `/api/panes/*` routes exist. Each chat lives in at most one pane; tab strip is per-pane and tracks `chatIds[]` + `activeChatIdx`. Sessions 1:N chats; chats own messages. Tab reorder via native HTML5 drag events.
|
||||||
|
|
||||||
## Database
|
## Database
|
||||||
|
|
||||||
@@ -88,12 +89,13 @@ Position-shift pattern for panes (legacy `session_panes` table): negate-and-rest
|
|||||||
|
|
||||||
## Environment
|
## Environment
|
||||||
|
|
||||||
Required: `DATABASE_URL`, `LLAMA_SWAP_URL`. Optional: `PORT` (3000), `HOST` (0.0.0.0), `PROJECT_ROOT_WHITELIST` (/opt), `DEFAULT_MODEL`, `LOG_LEVEL`.
|
Required: `DATABASE_URL`, `LLAMA_SWAP_URL`. Optional: `PORT` (3000), `HOST` (0.0.0.0), `PROJECT_ROOT_WHITELIST` (/opt, read-only scope for add-existing path resolution), `BOOTSTRAP_ROOT` (/opt/projects, writable scope for create-new-project bootstrap mkdir target — host must `mkdir -p /opt/projects` before container start), `DEFAULT_MODEL`, `LOG_LEVEL`.
|
||||||
|
|
||||||
## Workflow
|
## Workflow
|
||||||
|
|
||||||
- Sam reviews all diffs and commits manually. Do not commit unless explicitly asked.
|
- Sam reviews all diffs and commits manually. Do not commit unless explicitly asked.
|
||||||
- Deploy: `cd /opt/boocode && docker compose up --build -d` (or `docker compose build --no-cache boocode && docker compose up -d` if you suspect a layer-cache issue).
|
- Deploy: `cd /opt/boocode && docker compose up --build -d` (or `docker compose build --no-cache boocode && docker compose up -d` if you suspect a layer-cache issue).
|
||||||
|
- Git push to Gitea: `GIT_SSH_COMMAND="ssh -i /opt/boocode/secrets/boocode_gitea -o IdentitiesOnly=yes" git push origin <branch>`. The default agent identity is rejected; the in-repo deploy key (`secrets/`, gitignored) is the working one. Transient `Connection reset by peer` retries cleanly after `sleep 5`.
|
||||||
- Don't accumulate `.bak-*` files. Clean them up in the same batch or immediately after merge.
|
- Don't accumulate `.bak-*` files. Clean them up in the same batch or immediately after merge.
|
||||||
- Fastify global JSON parser tolerates empty bodies (overridden in `index.ts`); bodyless POSTs (archive, unarchive, stop) work without setting `Content-Type` tricks on the client.
|
- Fastify global JSON parser tolerates empty bodies (overridden in `index.ts`); bodyless POSTs (archive, unarchive, stop) work without setting `Content-Type` tricks on the client.
|
||||||
- Event dedup discipline: for any mutation the server publishes via `broker.publishUser`, do NOT add a local `sessionEvents.emit(...)` after the API call — `useUserEvents` forwards the WS frame onto the bus. Frontend mutation handlers must be idempotent (dedup by id, no-op on already-present).
|
- Event dedup discipline: for any mutation the server publishes via `broker.publishUser`, do NOT add a local `sessionEvents.emit(...)` after the API call — `useUserEvents` forwards the WS frame onto the bus. Frontend mutation handlers must be idempotent (dedup by id, no-op on already-present).
|
||||||
|
|||||||
@@ -19,7 +19,8 @@ RUN pnpm deploy --filter=@boocode/server --prod --legacy /out/server
|
|||||||
|
|
||||||
|
|
||||||
FROM node:20-alpine AS runtime
|
FROM node:20-alpine AS runtime
|
||||||
RUN apk add --no-cache ripgrep
|
RUN apk add --no-cache ripgrep git openssh-client
|
||||||
|
RUN mkdir -p /root/.ssh && ssh-keyscan -p 2222 -H 100.114.205.53 git.indifferentketchup.com >> /root/.ssh/known_hosts && chmod 700 /root/.ssh && chmod 600 /root/.ssh/known_hosts
|
||||||
WORKDIR /app
|
WORKDIR /app
|
||||||
|
|
||||||
COPY --from=builder /out/server ./
|
COPY --from=builder /out/server ./
|
||||||
|
|||||||
@@ -7,7 +7,8 @@
|
|||||||
"scripts": {
|
"scripts": {
|
||||||
"dev": "tsx watch src/index.ts",
|
"dev": "tsx watch src/index.ts",
|
||||||
"build": "tsc && node -e \"import('node:fs').then(fs=>fs.copyFileSync('src/schema.sql','dist/schema.sql'))\"",
|
"build": "tsc && node -e \"import('node:fs').then(fs=>fs.copyFileSync('src/schema.sql','dist/schema.sql'))\"",
|
||||||
"typecheck": "tsc --noEmit"
|
"typecheck": "tsc --noEmit",
|
||||||
|
"test": "vitest run"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@fastify/static": "^7.0.4",
|
"@fastify/static": "^7.0.4",
|
||||||
@@ -21,6 +22,7 @@
|
|||||||
"@types/node": "^20.14.10",
|
"@types/node": "^20.14.10",
|
||||||
"@types/ws": "^8.5.10",
|
"@types/ws": "^8.5.10",
|
||||||
"tsx": "^4.16.2",
|
"tsx": "^4.16.2",
|
||||||
"typescript": "^5.5.0"
|
"typescript": "^5.5.0",
|
||||||
|
"vitest": "^3.2.4"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -7,6 +7,7 @@ const ConfigSchema = z.object({
|
|||||||
DATABASE_URL: z.string().url(),
|
DATABASE_URL: z.string().url(),
|
||||||
LLAMA_SWAP_URL: z.string().url(),
|
LLAMA_SWAP_URL: z.string().url(),
|
||||||
PROJECT_ROOT_WHITELIST: z.string().default('/opt'),
|
PROJECT_ROOT_WHITELIST: z.string().default('/opt'),
|
||||||
|
BOOTSTRAP_ROOT: z.string().default('/opt/projects'),
|
||||||
DEFAULT_MODEL: z.string().default('qwen3.6-35b-a3b-mxfp4'),
|
DEFAULT_MODEL: z.string().default('qwen3.6-35b-a3b-mxfp4'),
|
||||||
LOG_LEVEL: z.string().default('info'),
|
LOG_LEVEL: z.string().default('info'),
|
||||||
GITEA_BASE_URL: z.string().url().default('https://git.indifferentketchup.com'),
|
GITEA_BASE_URL: z.string().url().default('https://git.indifferentketchup.com'),
|
||||||
|
|||||||
@@ -14,6 +14,7 @@ import { registerChatRoutes } from './routes/chats.js';
|
|||||||
import { registerSidebarRoutes } from './routes/sidebar.js';
|
import { registerSidebarRoutes } from './routes/sidebar.js';
|
||||||
import { registerWebSocket } from './routes/ws.js';
|
import { registerWebSocket } from './routes/ws.js';
|
||||||
import { registerModelRoutes } from './routes/models.js';
|
import { registerModelRoutes } from './routes/models.js';
|
||||||
|
import { registerAgentRoutes } from './routes/agents.js';
|
||||||
import { createInferenceRunner } from './services/inference.js';
|
import { createInferenceRunner } from './services/inference.js';
|
||||||
import { createBroker } from './services/broker.js';
|
import { createBroker } from './services/broker.js';
|
||||||
|
|
||||||
@@ -57,6 +58,7 @@ async function main() {
|
|||||||
registerSessionRoutes(app, sql, config, broker);
|
registerSessionRoutes(app, sql, config, broker);
|
||||||
registerSettingsRoutes(app, sql);
|
registerSettingsRoutes(app, sql);
|
||||||
registerModelRoutes(app, config);
|
registerModelRoutes(app, config);
|
||||||
|
registerAgentRoutes(app, sql);
|
||||||
registerSidebarRoutes(app, sql);
|
registerSidebarRoutes(app, sql);
|
||||||
registerChatRoutes(app, sql, broker);
|
registerChatRoutes(app, sql, broker);
|
||||||
|
|
||||||
|
|||||||
92
apps/server/src/routes/__tests__/projects.test.ts
Normal file
92
apps/server/src/routes/__tests__/projects.test.ts
Normal file
@@ -0,0 +1,92 @@
|
|||||||
|
import { describe, it, expect, beforeAll, afterAll } from 'vitest';
|
||||||
|
import { mkdtemp, mkdir, rm, realpath, symlink, writeFile } from 'node:fs/promises';
|
||||||
|
import { tmpdir } from 'node:os';
|
||||||
|
import { join } from 'node:path';
|
||||||
|
import { resolveProjectPath } from '../projects.js';
|
||||||
|
|
||||||
|
describe('resolveProjectPath', () => {
|
||||||
|
let scratch: string;
|
||||||
|
let whitelist: string;
|
||||||
|
let outside: string;
|
||||||
|
|
||||||
|
beforeAll(async () => {
|
||||||
|
// mkdtemp returns a real path on most platforms, but symlink-resolve it
|
||||||
|
// anyway to defeat /tmp -> /private/tmp style indirection on macOS, and
|
||||||
|
// keep this stable for the comparisons below.
|
||||||
|
scratch = await realpath(await mkdtemp(join(tmpdir(), 'boocode-projects-test-')));
|
||||||
|
whitelist = join(scratch, 'wl');
|
||||||
|
outside = join(scratch, 'other');
|
||||||
|
await mkdir(whitelist, { recursive: true });
|
||||||
|
await mkdir(outside, { recursive: true });
|
||||||
|
});
|
||||||
|
|
||||||
|
afterAll(async () => {
|
||||||
|
if (scratch) {
|
||||||
|
await rm(scratch, { recursive: true, force: true });
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
it('returns real path and basename for a valid subdirectory under the whitelist', async () => {
|
||||||
|
const projectDir = join(whitelist, 'my-project');
|
||||||
|
await mkdir(projectDir);
|
||||||
|
const result = await resolveProjectPath(projectDir, whitelist);
|
||||||
|
expect('error' in result).toBe(false);
|
||||||
|
if ('error' in result) return; // narrow
|
||||||
|
expect(result.real).toBe(projectDir);
|
||||||
|
expect(result.name).toBe('my-project');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('rejects a path outside the whitelist', async () => {
|
||||||
|
const projectDir = join(outside, 'foo');
|
||||||
|
await mkdir(projectDir);
|
||||||
|
const result = await resolveProjectPath(projectDir, whitelist);
|
||||||
|
expect('error' in result).toBe(true);
|
||||||
|
if (!('error' in result)) return;
|
||||||
|
expect(result.error.toLowerCase()).toContain('path must be under');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('rejects relative paths', async () => {
|
||||||
|
const result = await resolveProjectPath('relative/path', whitelist);
|
||||||
|
expect('error' in result).toBe(true);
|
||||||
|
if (!('error' in result)) return;
|
||||||
|
expect(result.error.toLowerCase()).toContain('absolute');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('rejects nonexistent paths', async () => {
|
||||||
|
const result = await resolveProjectPath('/nonexistent/foo-boocode-test', whitelist);
|
||||||
|
expect('error' in result).toBe(true);
|
||||||
|
if (!('error' in result)) return;
|
||||||
|
expect(result.error.toLowerCase()).toContain('does not exist');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('rejects symlink escapes (realpath resolution catches traversal)', async () => {
|
||||||
|
// Create a symlink INSIDE the whitelist that points OUTSIDE. realpath
|
||||||
|
// should resolve through it and the resulting real path should fail the
|
||||||
|
// whitelist scope check.
|
||||||
|
const escapeLink = join(whitelist, 'escape-link');
|
||||||
|
await symlink(outside, escapeLink);
|
||||||
|
const result = await resolveProjectPath(escapeLink, whitelist);
|
||||||
|
expect('error' in result).toBe(true);
|
||||||
|
if (!('error' in result)) return;
|
||||||
|
expect(result.error.toLowerCase()).toContain('path must be under');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('rejects the whitelist directory itself as a project root', async () => {
|
||||||
|
// A project's parent can't be the project. The scope check must require
|
||||||
|
// the candidate path to be strictly below the whitelist (whitelist + sep
|
||||||
|
// prefix), not just equal to it.
|
||||||
|
const result = await resolveProjectPath(whitelist, whitelist);
|
||||||
|
expect('error' in result).toBe(true);
|
||||||
|
if (!('error' in result)) return;
|
||||||
|
expect(result.error.toLowerCase()).toContain('path must be under');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('rejects non-directory targets (file under whitelist)', async () => {
|
||||||
|
const filePath = join(whitelist, 'a-file.txt');
|
||||||
|
await writeFile(filePath, 'content', 'utf8');
|
||||||
|
const result = await resolveProjectPath(filePath, whitelist);
|
||||||
|
expect('error' in result).toBe(true);
|
||||||
|
if (!('error' in result)) return;
|
||||||
|
expect(result.error.toLowerCase()).toContain('not a directory');
|
||||||
|
});
|
||||||
|
});
|
||||||
20
apps/server/src/routes/agents.ts
Normal file
20
apps/server/src/routes/agents.ts
Normal file
@@ -0,0 +1,20 @@
|
|||||||
|
import type { FastifyInstance } from 'fastify';
|
||||||
|
import type { Sql } from '../db.js';
|
||||||
|
import { getAgentsForProject } from '../services/agents.js';
|
||||||
|
|
||||||
|
export function registerAgentRoutes(app: FastifyInstance, sql: Sql): void {
|
||||||
|
app.get<{ Params: { id: string } }>(
|
||||||
|
'/api/projects/:id/agents',
|
||||||
|
async (req, reply) => {
|
||||||
|
const rows = await sql<{ path: string }[]>`
|
||||||
|
SELECT path FROM projects WHERE id = ${req.params.id}
|
||||||
|
`;
|
||||||
|
if (rows.length === 0) {
|
||||||
|
reply.code(404);
|
||||||
|
return { error: 'project not found' };
|
||||||
|
}
|
||||||
|
// getAgentsForProject handles AGENTS.md presence/parse/cache; never throws.
|
||||||
|
return await getAgentsForProject(rows[0]!.path);
|
||||||
|
}
|
||||||
|
);
|
||||||
|
}
|
||||||
@@ -9,6 +9,7 @@ import type { Project, AvailableProject } from '../types/api.js';
|
|||||||
import { resolveProjectRoot, PathScopeError } from '../services/path_guard.js';
|
import { resolveProjectRoot, PathScopeError } from '../services/path_guard.js';
|
||||||
import { listDir, viewFile } from '../services/file_ops.js';
|
import { listDir, viewFile } from '../services/file_ops.js';
|
||||||
import { getProjectFiles } from '../services/file_index.js';
|
import { getProjectFiles } from '../services/file_index.js';
|
||||||
|
import { getGitMeta } from '../services/git_meta.js';
|
||||||
import {
|
import {
|
||||||
bootstrapProject,
|
bootstrapProject,
|
||||||
BootstrapNameError,
|
BootstrapNameError,
|
||||||
@@ -41,7 +42,7 @@ async function isDir(path: string): Promise<boolean> {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
async function resolveProjectPath(
|
export async function resolveProjectPath(
|
||||||
raw: string,
|
raw: string,
|
||||||
whitelist: string
|
whitelist: string
|
||||||
): Promise<{ real: string; name: string } | { error: string }> {
|
): Promise<{ real: string; name: string } | { error: string }> {
|
||||||
@@ -53,7 +54,7 @@ async function resolveProjectPath(
|
|||||||
return { error: 'path does not exist' };
|
return { error: 'path does not exist' };
|
||||||
}
|
}
|
||||||
const whitelistReal = await realpath(whitelist);
|
const whitelistReal = await realpath(whitelist);
|
||||||
if (real !== whitelistReal && !real.startsWith(whitelistReal + sep)) {
|
if (!real.startsWith(whitelistReal + sep)) {
|
||||||
return { error: `path must be under ${whitelist}` };
|
return { error: `path must be under ${whitelist}` };
|
||||||
}
|
}
|
||||||
if (!(await isDir(real))) return { error: 'path is not a directory' };
|
if (!(await isDir(real))) return { error: 'path is not a directory' };
|
||||||
@@ -381,6 +382,38 @@ export function registerProjectRoutes(
|
|||||||
}
|
}
|
||||||
);
|
);
|
||||||
|
|
||||||
|
// GET /api/projects/:id/git
|
||||||
|
// v1.8 mobile-tabs: feeds the header branch indicator and is the same
|
||||||
|
// resolver the model's git_status tool uses. Returns 200 with branch=null
|
||||||
|
// for non-git directories (not 404) so the UI can degrade gracefully.
|
||||||
|
app.get<{ Params: { id: string } }>(
|
||||||
|
'/api/projects/:id/git',
|
||||||
|
async (req, reply) => {
|
||||||
|
const { id } = req.params;
|
||||||
|
const rows = await sql<Project[]>`
|
||||||
|
SELECT id, name, path, added_at, last_session_id, status, gitea_remote
|
||||||
|
FROM projects WHERE id = ${id}
|
||||||
|
`;
|
||||||
|
if (rows.length === 0) {
|
||||||
|
reply.code(404);
|
||||||
|
return { error: 'not found' };
|
||||||
|
}
|
||||||
|
const project = rows[0]!;
|
||||||
|
let projectRoot: string;
|
||||||
|
try {
|
||||||
|
projectRoot = await resolveProjectRoot(project.path);
|
||||||
|
} catch (err) {
|
||||||
|
if (err instanceof PathScopeError) {
|
||||||
|
reply.code(404);
|
||||||
|
return { error: err.message };
|
||||||
|
}
|
||||||
|
throw err;
|
||||||
|
}
|
||||||
|
const meta = await getGitMeta(projectRoot);
|
||||||
|
return meta ?? { branch: null, is_dirty: false, ahead: 0, behind: 0 };
|
||||||
|
}
|
||||||
|
);
|
||||||
|
|
||||||
// GET /api/projects/:id/files
|
// GET /api/projects/:id/files
|
||||||
app.get<{ Params: { id: string } }>(
|
app.get<{ Params: { id: string } }>(
|
||||||
'/api/projects/:id/files',
|
'/api/projects/:id/files',
|
||||||
|
|||||||
@@ -5,17 +5,20 @@ import type { Config } from '../config.js';
|
|||||||
import type { Broker } from '../services/broker.js';
|
import type { Broker } from '../services/broker.js';
|
||||||
import type { Session } from '../types/api.js';
|
import type { Session } from '../types/api.js';
|
||||||
import { getSetting } from './settings.js';
|
import { getSetting } from './settings.js';
|
||||||
|
import { getAgentsForProject } from '../services/agents.js';
|
||||||
|
|
||||||
const CreateBody = z.object({
|
const CreateBody = z.object({
|
||||||
name: z.string().min(1).max(200).optional(),
|
name: z.string().min(1).max(200).optional(),
|
||||||
model: z.string().min(1).max(200).optional(),
|
model: z.string().min(1).max(200).optional(),
|
||||||
system_prompt: z.string().max(8000).optional(),
|
system_prompt: z.string().max(8000).optional(),
|
||||||
|
agent_id: z.string().min(1).max(200).nullable().optional(),
|
||||||
});
|
});
|
||||||
|
|
||||||
const PatchBody = z.object({
|
const PatchBody = z.object({
|
||||||
name: z.string().min(1).max(200).optional(),
|
name: z.string().min(1).max(200).optional(),
|
||||||
model: z.string().min(1).max(200).optional(),
|
model: z.string().min(1).max(200).optional(),
|
||||||
system_prompt: z.string().max(8000).optional(),
|
system_prompt: z.string().max(8000).optional(),
|
||||||
|
agent_id: z.string().min(1).max(200).nullable().optional(),
|
||||||
});
|
});
|
||||||
|
|
||||||
async function resolveDefaultModel(sql: Sql, config: Config): Promise<string> {
|
async function resolveDefaultModel(sql: Sql, config: Config): Promise<string> {
|
||||||
@@ -24,6 +27,13 @@ async function resolveDefaultModel(sql: Sql, config: Config): Promise<string> {
|
|||||||
return config.DEFAULT_MODEL;
|
return config.DEFAULT_MODEL;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// First agent in the project's effective list (file-defined or builtin),
|
||||||
|
// or null if somehow none exist.
|
||||||
|
async function resolveDefaultAgent(projectPath: string): Promise<string | null> {
|
||||||
|
const { agents } = await getAgentsForProject(projectPath);
|
||||||
|
return agents[0]?.id ?? null;
|
||||||
|
}
|
||||||
|
|
||||||
export function registerSessionRoutes(
|
export function registerSessionRoutes(
|
||||||
app: FastifyInstance,
|
app: FastifyInstance,
|
||||||
sql: Sql,
|
sql: Sql,
|
||||||
@@ -40,7 +50,7 @@ export function registerSessionRoutes(
|
|||||||
}
|
}
|
||||||
const status = req.query.status === 'archived' ? 'archived' : 'open';
|
const status = req.query.status === 'archived' ? 'archived' : 'open';
|
||||||
const rows = await sql<Session[]>`
|
const rows = await sql<Session[]>`
|
||||||
SELECT id, project_id, name, model, system_prompt, status, created_at, updated_at
|
SELECT id, project_id, name, model, system_prompt, status, created_at, updated_at, agent_id
|
||||||
FROM sessions
|
FROM sessions
|
||||||
WHERE project_id = ${req.params.id} AND status = ${status}
|
WHERE project_id = ${req.params.id} AND status = ${status}
|
||||||
ORDER BY updated_at DESC
|
ORDER BY updated_at DESC
|
||||||
@@ -57,11 +67,14 @@ export function registerSessionRoutes(
|
|||||||
reply.code(400);
|
reply.code(400);
|
||||||
return { error: 'invalid body', details: parsed.error.flatten() };
|
return { error: 'invalid body', details: parsed.error.flatten() };
|
||||||
}
|
}
|
||||||
const project = await sql`SELECT id FROM projects WHERE id = ${req.params.id}`;
|
const project = await sql<{ id: string; path: string }[]>`
|
||||||
|
SELECT id, path FROM projects WHERE id = ${req.params.id}
|
||||||
|
`;
|
||||||
if (project.length === 0) {
|
if (project.length === 0) {
|
||||||
reply.code(404);
|
reply.code(404);
|
||||||
return { error: 'project not found' };
|
return { error: 'project not found' };
|
||||||
}
|
}
|
||||||
|
const projectPath = project[0]!.path;
|
||||||
|
|
||||||
let model = parsed.data.model;
|
let model = parsed.data.model;
|
||||||
if (!model) {
|
if (!model) {
|
||||||
@@ -76,12 +89,18 @@ export function registerSessionRoutes(
|
|||||||
|
|
||||||
const name = parsed.data.name ?? 'New session';
|
const name = parsed.data.name ?? 'New session';
|
||||||
const systemPrompt = parsed.data.system_prompt ?? '';
|
const systemPrompt = parsed.data.system_prompt ?? '';
|
||||||
|
// If the client provided agent_id (string or null), use it; otherwise
|
||||||
|
// resolve to the project's first agent (file-defined or builtin), or null.
|
||||||
|
const agentId =
|
||||||
|
parsed.data.agent_id !== undefined
|
||||||
|
? parsed.data.agent_id
|
||||||
|
: await resolveDefaultAgent(projectPath);
|
||||||
|
|
||||||
const row = await sql.begin(async (tx) => {
|
const row = await sql.begin(async (tx) => {
|
||||||
const [session] = await tx<Session[]>`
|
const [session] = await tx<Session[]>`
|
||||||
INSERT INTO sessions (project_id, name, model, system_prompt)
|
INSERT INTO sessions (project_id, name, model, system_prompt, agent_id)
|
||||||
VALUES (${req.params.id}, ${name}, ${model}, ${systemPrompt})
|
VALUES (${req.params.id}, ${name}, ${model}, ${systemPrompt}, ${agentId})
|
||||||
RETURNING id, project_id, name, model, system_prompt, status, created_at, updated_at
|
RETURNING id, project_id, name, model, system_prompt, status, created_at, updated_at, agent_id
|
||||||
`;
|
`;
|
||||||
await tx`
|
await tx`
|
||||||
INSERT INTO chats (session_id, name, status)
|
INSERT INTO chats (session_id, name, status)
|
||||||
@@ -101,7 +120,7 @@ export function registerSessionRoutes(
|
|||||||
|
|
||||||
app.get<{ Params: { id: string } }>('/api/sessions/:id', async (req, reply) => {
|
app.get<{ Params: { id: string } }>('/api/sessions/:id', async (req, reply) => {
|
||||||
const rows = await sql<Session[]>`
|
const rows = await sql<Session[]>`
|
||||||
SELECT id, project_id, name, model, system_prompt, status, created_at, updated_at
|
SELECT id, project_id, name, model, system_prompt, status, created_at, updated_at, agent_id
|
||||||
FROM sessions WHERE id = ${req.params.id}
|
FROM sessions WHERE id = ${req.params.id}
|
||||||
`;
|
`;
|
||||||
if (rows.length === 0) {
|
if (rows.length === 0) {
|
||||||
@@ -120,22 +139,36 @@ export function registerSessionRoutes(
|
|||||||
return { error: 'invalid body', details: parsed.error.flatten() };
|
return { error: 'invalid body', details: parsed.error.flatten() };
|
||||||
}
|
}
|
||||||
const { name, model, system_prompt } = parsed.data;
|
const { name, model, system_prompt } = parsed.data;
|
||||||
|
// agent_id is tri-state on the wire: omitted = no change, null = clear,
|
||||||
|
// string = set. CASE WHEN inside SET handles all three atomically.
|
||||||
|
const agentIdProvided = parsed.data.agent_id !== undefined;
|
||||||
|
const newAgentId = parsed.data.agent_id ?? null;
|
||||||
|
// Read the prior name so the post-update publish can skip no-op renames
|
||||||
|
// (PATCH { name: "Foo" } where the session is already "Foo"). The window
|
||||||
|
// between SELECT and UPDATE is sub-millisecond in the same request handler;
|
||||||
|
// a concurrent rename in that gap would just mean one stale publish, which
|
||||||
|
// existing clients dedup by id.
|
||||||
|
const before = await sql<{ name: string }[]>`
|
||||||
|
SELECT name FROM sessions WHERE id = ${req.params.id}
|
||||||
|
`;
|
||||||
|
const priorName = before[0]?.name;
|
||||||
const rows = await sql<Session[]>`
|
const rows = await sql<Session[]>`
|
||||||
UPDATE sessions
|
UPDATE sessions
|
||||||
SET
|
SET
|
||||||
name = COALESCE(${name ?? null}, name),
|
name = COALESCE(${name ?? null}, name),
|
||||||
model = COALESCE(${model ?? null}, model),
|
model = COALESCE(${model ?? null}, model),
|
||||||
system_prompt = COALESCE(${system_prompt ?? null}, system_prompt),
|
system_prompt = COALESCE(${system_prompt ?? null}, system_prompt),
|
||||||
|
agent_id = CASE WHEN ${agentIdProvided} THEN ${newAgentId} ELSE agent_id END,
|
||||||
updated_at = clock_timestamp()
|
updated_at = clock_timestamp()
|
||||||
WHERE id = ${req.params.id}
|
WHERE id = ${req.params.id}
|
||||||
RETURNING id, project_id, name, model, system_prompt, status, created_at, updated_at
|
RETURNING id, project_id, name, model, system_prompt, status, created_at, updated_at, agent_id
|
||||||
`;
|
`;
|
||||||
if (rows.length === 0) {
|
if (rows.length === 0) {
|
||||||
reply.code(404);
|
reply.code(404);
|
||||||
return { error: 'session not found' };
|
return { error: 'session not found' };
|
||||||
}
|
}
|
||||||
const session = rows[0]!;
|
const session = rows[0]!;
|
||||||
if (name !== undefined) {
|
if (name !== undefined && session.name !== priorName) {
|
||||||
broker.publishUser('default', {
|
broker.publishUser('default', {
|
||||||
type: 'session_renamed',
|
type: 'session_renamed',
|
||||||
session_id: session.id,
|
session_id: session.id,
|
||||||
@@ -174,7 +207,7 @@ export function registerSessionRoutes(
|
|||||||
const rows = await sql<Session[]>`
|
const rows = await sql<Session[]>`
|
||||||
UPDATE sessions SET status = 'open', updated_at = clock_timestamp()
|
UPDATE sessions SET status = 'open', updated_at = clock_timestamp()
|
||||||
WHERE id = ${req.params.id} AND status = 'archived'
|
WHERE id = ${req.params.id} AND status = 'archived'
|
||||||
RETURNING id, project_id, name, model, system_prompt, status, created_at, updated_at
|
RETURNING id, project_id, name, model, system_prompt, status, created_at, updated_at, agent_id
|
||||||
`;
|
`;
|
||||||
if (rows.length === 0) {
|
if (rows.length === 0) {
|
||||||
reply.code(404);
|
reply.code(404);
|
||||||
|
|||||||
@@ -153,3 +153,8 @@ BEGIN
|
|||||||
CHECK (status IN ('open', 'archived'));
|
CHECK (status IN ('open', 'archived'));
|
||||||
END IF;
|
END IF;
|
||||||
END $$;
|
END $$;
|
||||||
|
|
||||||
|
-- v1.x-batch9: per-session agent reference. Agent definitions are not stored in
|
||||||
|
-- the DB; they live in builtins (services/agents.ts) and a per-project AGENTS.md.
|
||||||
|
-- agent_id is the slugified agent name. NULL means "use BooCode defaults".
|
||||||
|
ALTER TABLE sessions ADD COLUMN IF NOT EXISTS agent_id TEXT;
|
||||||
|
|||||||
237
apps/server/src/services/__tests__/inference.test.ts
Normal file
237
apps/server/src/services/__tests__/inference.test.ts
Normal file
@@ -0,0 +1,237 @@
|
|||||||
|
import { describe, it, expect } from 'vitest';
|
||||||
|
import { buildMessagesPayload } from '../inference.js';
|
||||||
|
import type {
|
||||||
|
Message,
|
||||||
|
MessageRole,
|
||||||
|
Project,
|
||||||
|
Session,
|
||||||
|
ToolCall,
|
||||||
|
ToolResult,
|
||||||
|
} from '../../types/api.js';
|
||||||
|
|
||||||
|
// ---- fixtures ---------------------------------------------------------------
|
||||||
|
|
||||||
|
function makeSession(overrides: Partial<Session> = {}): Session {
|
||||||
|
return {
|
||||||
|
id: 'sess',
|
||||||
|
project_id: 'proj',
|
||||||
|
name: 'test session',
|
||||||
|
model: 'test-model',
|
||||||
|
system_prompt: '',
|
||||||
|
status: 'open',
|
||||||
|
created_at: new Date(0).toISOString(),
|
||||||
|
updated_at: new Date(0).toISOString(),
|
||||||
|
...overrides,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
function makeProject(overrides: Partial<Project> = {}): Project {
|
||||||
|
return {
|
||||||
|
id: 'proj',
|
||||||
|
name: 'test project',
|
||||||
|
path: '/tmp/proj',
|
||||||
|
added_at: new Date(0).toISOString(),
|
||||||
|
last_session_id: null,
|
||||||
|
status: 'open',
|
||||||
|
gitea_remote: null,
|
||||||
|
...overrides,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
let counter = 0;
|
||||||
|
function makeMessage(
|
||||||
|
role: MessageRole,
|
||||||
|
content: string,
|
||||||
|
overrides: Partial<Message> = {}
|
||||||
|
): Message {
|
||||||
|
counter += 1;
|
||||||
|
return {
|
||||||
|
id: `m${counter}`,
|
||||||
|
session_id: 'sess',
|
||||||
|
chat_id: 'chat',
|
||||||
|
role,
|
||||||
|
content,
|
||||||
|
kind: 'message',
|
||||||
|
tool_calls: null,
|
||||||
|
tool_results: null,
|
||||||
|
status: 'complete',
|
||||||
|
last_seq: 0,
|
||||||
|
tokens_used: null,
|
||||||
|
ctx_used: null,
|
||||||
|
ctx_max: null,
|
||||||
|
started_at: null,
|
||||||
|
finished_at: null,
|
||||||
|
created_at: new Date(counter * 1000).toISOString(),
|
||||||
|
...overrides,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
// ---- tests ------------------------------------------------------------------
|
||||||
|
|
||||||
|
describe('buildMessagesPayload', () => {
|
||||||
|
it('prepends a system prompt containing the project path', () => {
|
||||||
|
const session = makeSession();
|
||||||
|
const project = makeProject({ path: '/tmp/my-proj' });
|
||||||
|
const result = buildMessagesPayload(session, project, []);
|
||||||
|
expect(result).toHaveLength(1);
|
||||||
|
expect(result[0]!.role).toBe('system');
|
||||||
|
expect(result[0]!.content).toContain('/tmp/my-proj');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('appends session.system_prompt to the system message when set', () => {
|
||||||
|
const session = makeSession({ system_prompt: 'Be terse.' });
|
||||||
|
const project = makeProject();
|
||||||
|
const result = buildMessagesPayload(session, project, []);
|
||||||
|
expect(result).toHaveLength(1);
|
||||||
|
expect(result[0]!.role).toBe('system');
|
||||||
|
expect(result[0]!.content).toContain('Be terse.');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('returns user/assistant messages in order when no compact marker is present', () => {
|
||||||
|
const session = makeSession();
|
||||||
|
const project = makeProject();
|
||||||
|
const history: Message[] = [
|
||||||
|
makeMessage('user', 'hi'),
|
||||||
|
makeMessage('assistant', 'hello'),
|
||||||
|
makeMessage('user', 'how are you'),
|
||||||
|
makeMessage('assistant', 'great'),
|
||||||
|
];
|
||||||
|
const result = buildMessagesPayload(session, project, history);
|
||||||
|
// 1 system + 4 history messages
|
||||||
|
expect(result).toHaveLength(5);
|
||||||
|
expect(result[0]!.role).toBe('system');
|
||||||
|
expect(result[1]).toMatchObject({ role: 'user', content: 'hi' });
|
||||||
|
expect(result[2]).toMatchObject({ role: 'assistant', content: 'hello' });
|
||||||
|
expect(result[3]).toMatchObject({ role: 'user', content: 'how are you' });
|
||||||
|
expect(result[4]).toMatchObject({ role: 'assistant', content: 'great' });
|
||||||
|
});
|
||||||
|
|
||||||
|
it('starts from the latest compact marker, emitting it as a system message', () => {
|
||||||
|
const session = makeSession();
|
||||||
|
const project = makeProject();
|
||||||
|
const history: Message[] = [
|
||||||
|
makeMessage('user', 'old1'),
|
||||||
|
makeMessage('assistant', 'oldreply1'),
|
||||||
|
makeMessage('user', 'old2'),
|
||||||
|
makeMessage('assistant', 'compacted summary text', { kind: 'compact' }),
|
||||||
|
makeMessage('user', 'new1'),
|
||||||
|
makeMessage('assistant', 'newreply1'),
|
||||||
|
];
|
||||||
|
const result = buildMessagesPayload(session, project, history);
|
||||||
|
// Expect: leading base-system prompt, then the compact as system, then
|
||||||
|
// the user/assistant pair following it.
|
||||||
|
expect(result).toHaveLength(4);
|
||||||
|
expect(result[0]!.role).toBe('system');
|
||||||
|
expect(result[1]).toMatchObject({
|
||||||
|
role: 'system',
|
||||||
|
content: 'compacted summary text',
|
||||||
|
});
|
||||||
|
expect(result[2]).toMatchObject({ role: 'user', content: 'new1' });
|
||||||
|
expect(result[3]).toMatchObject({ role: 'assistant', content: 'newreply1' });
|
||||||
|
});
|
||||||
|
|
||||||
|
it('uses only the most recent compact when multiple are present', () => {
|
||||||
|
const session = makeSession();
|
||||||
|
const project = makeProject();
|
||||||
|
const history: Message[] = [
|
||||||
|
makeMessage('user', 'u1'),
|
||||||
|
makeMessage('assistant', 'first compact summary', { kind: 'compact' }),
|
||||||
|
makeMessage('user', 'u2'),
|
||||||
|
makeMessage('assistant', 'second compact summary', { kind: 'compact' }),
|
||||||
|
makeMessage('user', 'u3'),
|
||||||
|
makeMessage('assistant', 'final reply'),
|
||||||
|
];
|
||||||
|
const result = buildMessagesPayload(session, project, history);
|
||||||
|
// Expect: base system + latest compact as system + the two messages
|
||||||
|
// following it. The earlier compact and pre-compact history are dropped.
|
||||||
|
expect(result).toHaveLength(4);
|
||||||
|
expect(result[0]!.role).toBe('system');
|
||||||
|
expect(result[1]).toMatchObject({
|
||||||
|
role: 'system',
|
||||||
|
content: 'second compact summary',
|
||||||
|
});
|
||||||
|
expect(result[2]).toMatchObject({ role: 'user', content: 'u3' });
|
||||||
|
expect(result[3]).toMatchObject({ role: 'assistant', content: 'final reply' });
|
||||||
|
// None of the earlier content should leak through
|
||||||
|
const concatenated = result.map((m) => m.content ?? '').join(' ');
|
||||||
|
expect(concatenated).not.toContain('first compact summary');
|
||||||
|
expect(concatenated).not.toContain('u1');
|
||||||
|
expect(concatenated).not.toContain('u2');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('skips streaming and cancelled assistant rows', () => {
|
||||||
|
const session = makeSession();
|
||||||
|
const project = makeProject();
|
||||||
|
const history: Message[] = [
|
||||||
|
makeMessage('user', 'hi'),
|
||||||
|
makeMessage('assistant', 'partial...', { status: 'streaming' }),
|
||||||
|
makeMessage('assistant', 'cancelled fragment', { status: 'cancelled' }),
|
||||||
|
makeMessage('assistant', 'final answer'),
|
||||||
|
];
|
||||||
|
const result = buildMessagesPayload(session, project, history);
|
||||||
|
// 1 system + 1 user + 1 assistant (only the complete one)
|
||||||
|
expect(result).toHaveLength(3);
|
||||||
|
expect(result[1]).toMatchObject({ role: 'user', content: 'hi' });
|
||||||
|
expect(result[2]).toMatchObject({ role: 'assistant', content: 'final answer' });
|
||||||
|
});
|
||||||
|
|
||||||
|
it('round-trips an assistant-with-tool_calls followed by its tool result', () => {
|
||||||
|
const session = makeSession();
|
||||||
|
const project = makeProject();
|
||||||
|
const toolCall: ToolCall = {
|
||||||
|
id: 'call_abc',
|
||||||
|
name: 'view_file',
|
||||||
|
args: { path: 'src/index.ts' },
|
||||||
|
};
|
||||||
|
const toolResult: ToolResult = {
|
||||||
|
tool_call_id: 'call_abc',
|
||||||
|
output: { contents: 'console.log(1)' },
|
||||||
|
truncated: false,
|
||||||
|
};
|
||||||
|
const history: Message[] = [
|
||||||
|
makeMessage('user', 'show me the file'),
|
||||||
|
makeMessage('assistant', '', { tool_calls: [toolCall] }),
|
||||||
|
makeMessage('tool', '', { tool_results: toolResult }),
|
||||||
|
makeMessage('assistant', 'here it is'),
|
||||||
|
];
|
||||||
|
const result = buildMessagesPayload(session, project, history);
|
||||||
|
// 1 system + 1 user + 1 assistant(tool_calls) + 1 tool + 1 assistant
|
||||||
|
expect(result).toHaveLength(5);
|
||||||
|
expect(result[1]).toMatchObject({ role: 'user', content: 'show me the file' });
|
||||||
|
expect(result[2]!.role).toBe('assistant');
|
||||||
|
expect(result[2]!.tool_calls).toBeDefined();
|
||||||
|
expect(result[2]!.tool_calls).toHaveLength(1);
|
||||||
|
expect(result[2]!.tool_calls![0]).toMatchObject({
|
||||||
|
id: 'call_abc',
|
||||||
|
type: 'function',
|
||||||
|
function: { name: 'view_file' },
|
||||||
|
});
|
||||||
|
// The OpenAI shape stringifies args.
|
||||||
|
expect(result[2]!.tool_calls![0]!.function.arguments).toBe(
|
||||||
|
JSON.stringify({ path: 'src/index.ts' })
|
||||||
|
);
|
||||||
|
// assistant with empty content should be serialized as content: null
|
||||||
|
expect(result[2]!.content).toBeNull();
|
||||||
|
expect(result[3]).toMatchObject({
|
||||||
|
role: 'tool',
|
||||||
|
tool_call_id: 'call_abc',
|
||||||
|
});
|
||||||
|
// Non-string tool output is JSON-stringified.
|
||||||
|
expect(result[3]!.content).toBe(JSON.stringify({ contents: 'console.log(1)' }));
|
||||||
|
expect(result[4]).toMatchObject({ role: 'assistant', content: 'here it is' });
|
||||||
|
});
|
||||||
|
|
||||||
|
it('skips tool rows with no tool_results', () => {
|
||||||
|
const session = makeSession();
|
||||||
|
const project = makeProject();
|
||||||
|
const history: Message[] = [
|
||||||
|
makeMessage('user', 'do it'),
|
||||||
|
makeMessage('tool', '', { tool_results: null }),
|
||||||
|
makeMessage('assistant', 'done'),
|
||||||
|
];
|
||||||
|
const result = buildMessagesPayload(session, project, history);
|
||||||
|
// 1 system + 1 user + 1 assistant; the empty tool row is dropped.
|
||||||
|
expect(result).toHaveLength(3);
|
||||||
|
expect(result.find((m) => m.role === 'tool')).toBeUndefined();
|
||||||
|
});
|
||||||
|
});
|
||||||
47
apps/server/src/services/__tests__/project_bootstrap.test.ts
Normal file
47
apps/server/src/services/__tests__/project_bootstrap.test.ts
Normal file
@@ -0,0 +1,47 @@
|
|||||||
|
import { describe, it, expect } from 'vitest';
|
||||||
|
import { sanitizeFolderName } from '../project_bootstrap.js';
|
||||||
|
|
||||||
|
describe('sanitizeFolderName', () => {
|
||||||
|
it('passes through a normal slug-like name', () => {
|
||||||
|
expect(sanitizeFolderName('my-project')).toBe('my-project');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('lowercases and replaces whitespace with hyphens', () => {
|
||||||
|
expect(sanitizeFolderName('Hello World')).toBe('hello-world');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('strips path-traversal characters', () => {
|
||||||
|
// dots and slashes fall outside [a-z0-9-] and are removed entirely.
|
||||||
|
expect(sanitizeFolderName('../etc/passwd')).toBe('etcpasswd');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('strips trailing and leading dots and slashes', () => {
|
||||||
|
expect(sanitizeFolderName('./foo/')).toBe('foo');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('collapses runs of hyphens and strips leading/trailing ones', () => {
|
||||||
|
expect(sanitizeFolderName('---foo---')).toBe('foo');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('returns empty string when nothing survives sanitization', () => {
|
||||||
|
// NOTE: sanitizeFolderName itself does NOT throw — it returns ''. The
|
||||||
|
// BootstrapNameError is raised by the caller (bootstrapProject) when the
|
||||||
|
// sanitized result fails the SAFE_NAME regex. The spec's "throws" phrasing
|
||||||
|
// refers to that caller-level validation, not this pure function.
|
||||||
|
expect(sanitizeFolderName('...')).toBe('');
|
||||||
|
expect(sanitizeFolderName(' ')).toBe('');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('strips control characters and null bytes', () => {
|
||||||
|
// Null bytes and control characters are not in [a-z0-9-] so they're
|
||||||
|
// filtered out (effectively rejected as folder-name content).
|
||||||
|
expect(sanitizeFolderName('my\x00proj\x01')).toBe('myproj');
|
||||||
|
expect(sanitizeFolderName('foo\x00bar')).toBe('foobar');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('truncates names longer than 64 characters', () => {
|
||||||
|
const long = 'a'.repeat(100);
|
||||||
|
expect(sanitizeFolderName(long)).toBe('a'.repeat(64));
|
||||||
|
expect(sanitizeFolderName(long)).toHaveLength(64);
|
||||||
|
});
|
||||||
|
});
|
||||||
301
apps/server/src/services/agents.ts
Normal file
301
apps/server/src/services/agents.ts
Normal file
@@ -0,0 +1,301 @@
|
|||||||
|
import { promises as fs } from 'node:fs';
|
||||||
|
import { join } from 'node:path';
|
||||||
|
import type { Agent, AgentsResponse, AgentParseError } from '../types/api.js';
|
||||||
|
|
||||||
|
// v1.8.1: global agents live at /data/AGENTS.md inside the container
|
||||||
|
// (./data:/data:ro mount on the host). Per-project AGENTS.md at the project
|
||||||
|
// root overrides global by name. In-code builtins are gone — the seed file is
|
||||||
|
// the contents of the previous BUILTIN_AGENTS list, copied into /data/AGENTS.md
|
||||||
|
// once on first deploy.
|
||||||
|
const GLOBAL_AGENTS_PATH = '/data/AGENTS.md';
|
||||||
|
const CACHE_TTL_MS = 60_000;
|
||||||
|
|
||||||
|
// Tools whitelist universe matches services/tools.ts ALL_TOOLS. Keep in sync.
|
||||||
|
const ALL_TOOL_NAMES = ['view_file', 'list_dir', 'grep', 'find_files', 'git_status'] as const;
|
||||||
|
const DEFAULT_TOOLS: string[] = [...ALL_TOOL_NAMES];
|
||||||
|
const DEFAULT_TEMPERATURE = 0.7;
|
||||||
|
|
||||||
|
export function slugify(name: string): string {
|
||||||
|
return name
|
||||||
|
.toLowerCase()
|
||||||
|
.replace(/[^a-z0-9]+/g, '-')
|
||||||
|
.replace(/^-+|-+$/g, '');
|
||||||
|
}
|
||||||
|
|
||||||
|
// ---- AGENTS.md parser ------------------------------------------------------
|
||||||
|
|
||||||
|
interface ParsedFrontmatter {
|
||||||
|
temperature?: number;
|
||||||
|
tools?: string[];
|
||||||
|
description?: string;
|
||||||
|
model?: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
function stripQuotes(s: string): string {
|
||||||
|
if (
|
||||||
|
s.length >= 2 &&
|
||||||
|
(s[0] === '"' || s[0] === "'") &&
|
||||||
|
s[0] === s[s.length - 1]
|
||||||
|
) {
|
||||||
|
return s.slice(1, -1);
|
||||||
|
}
|
||||||
|
return s;
|
||||||
|
}
|
||||||
|
|
||||||
|
function parseFrontmatter(yaml: string): { data: ParsedFrontmatter; errors: string[] } {
|
||||||
|
const data: ParsedFrontmatter = {};
|
||||||
|
const errors: string[] = [];
|
||||||
|
const lines = yaml.split('\n');
|
||||||
|
let arrayKey: 'tools' | null = null;
|
||||||
|
|
||||||
|
for (const rawLine of lines) {
|
||||||
|
const line = rawLine.trim();
|
||||||
|
if (line.length === 0) continue;
|
||||||
|
|
||||||
|
// Block-list continuation: "- value" under a key that was set to empty
|
||||||
|
if (arrayKey && line.startsWith('- ')) {
|
||||||
|
data[arrayKey]!.push(line.slice(2).trim());
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
arrayKey = null;
|
||||||
|
|
||||||
|
const colonIdx = line.indexOf(':');
|
||||||
|
if (colonIdx < 0) continue;
|
||||||
|
const key = line.slice(0, colonIdx).trim();
|
||||||
|
const valueRaw = line.slice(colonIdx + 1).trim();
|
||||||
|
|
||||||
|
if (key === 'temperature') {
|
||||||
|
const n = Number(valueRaw);
|
||||||
|
if (Number.isFinite(n)) data.temperature = n;
|
||||||
|
else errors.push(`temperature must be a number (got "${valueRaw}")`);
|
||||||
|
} else if (key === 'tools') {
|
||||||
|
if (valueRaw === '') {
|
||||||
|
data.tools = [];
|
||||||
|
arrayKey = 'tools';
|
||||||
|
} else if (valueRaw.startsWith('[') && valueRaw.endsWith(']')) {
|
||||||
|
const inner = valueRaw.slice(1, -1);
|
||||||
|
data.tools = inner
|
||||||
|
.split(',')
|
||||||
|
.map((s) => stripQuotes(s.trim()))
|
||||||
|
.filter((s) => s.length > 0);
|
||||||
|
} else {
|
||||||
|
// Loose form: "tools: a, b, c"
|
||||||
|
data.tools = valueRaw
|
||||||
|
.split(',')
|
||||||
|
.map((s) => stripQuotes(s.trim()))
|
||||||
|
.filter((s) => s.length > 0);
|
||||||
|
}
|
||||||
|
} else if (key === 'description') {
|
||||||
|
data.description = stripQuotes(valueRaw);
|
||||||
|
} else if (key === 'model') {
|
||||||
|
data.model = stripQuotes(valueRaw);
|
||||||
|
}
|
||||||
|
// Unknown keys silently ignored — forward-compat.
|
||||||
|
}
|
||||||
|
|
||||||
|
return { data, errors };
|
||||||
|
}
|
||||||
|
|
||||||
|
interface RawSection {
|
||||||
|
name: string;
|
||||||
|
body: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
function splitSections(content: string): RawSection[] {
|
||||||
|
// Split by lines matching exactly "## <name>". Level-3+ headings are body content.
|
||||||
|
const sections: RawSection[] = [];
|
||||||
|
let currentName: string | null = null;
|
||||||
|
let currentLines: string[] = [];
|
||||||
|
|
||||||
|
for (const line of content.split('\n')) {
|
||||||
|
const h2 = /^##\s+(.+?)\s*$/.exec(line);
|
||||||
|
const h3 = line.startsWith('### ');
|
||||||
|
if (h2 && !h3) {
|
||||||
|
if (currentName !== null) {
|
||||||
|
sections.push({ name: currentName, body: currentLines.join('\n') });
|
||||||
|
}
|
||||||
|
currentName = h2[1]!.trim();
|
||||||
|
currentLines = [];
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
if (currentName !== null) {
|
||||||
|
currentLines.push(line);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (currentName !== null) {
|
||||||
|
sections.push({ name: currentName, body: currentLines.join('\n') });
|
||||||
|
}
|
||||||
|
return sections;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Throws on malformed section — caller handles per-block error collection.
|
||||||
|
function parseAgentSection(section: RawSection): Omit<Agent, 'source'> {
|
||||||
|
const lines = section.body.split('\n');
|
||||||
|
|
||||||
|
// Opening "---" fence must be the first non-empty line.
|
||||||
|
let openIdx = -1;
|
||||||
|
for (let i = 0; i < lines.length; i++) {
|
||||||
|
const t = lines[i]!.trim();
|
||||||
|
if (t === '') continue;
|
||||||
|
if (t === '---') {
|
||||||
|
openIdx = i;
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
if (openIdx < 0) {
|
||||||
|
throw new Error('missing opening --- fence after heading');
|
||||||
|
}
|
||||||
|
let closeIdx = -1;
|
||||||
|
for (let i = openIdx + 1; i < lines.length; i++) {
|
||||||
|
if (lines[i]!.trim() === '---') {
|
||||||
|
closeIdx = i;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (closeIdx < 0) {
|
||||||
|
throw new Error('missing closing --- fence');
|
||||||
|
}
|
||||||
|
const yamlText = lines.slice(openIdx + 1, closeIdx).join('\n');
|
||||||
|
const systemPrompt = lines.slice(closeIdx + 1).join('\n').trim();
|
||||||
|
|
||||||
|
const { data: fm, errors: fmErrors } = parseFrontmatter(yamlText);
|
||||||
|
if (fmErrors.length > 0) {
|
||||||
|
throw new Error(fmErrors.join('; '));
|
||||||
|
}
|
||||||
|
|
||||||
|
const filteredTools = Array.isArray(fm.tools)
|
||||||
|
? fm.tools.filter((t): t is string =>
|
||||||
|
(ALL_TOOL_NAMES as readonly string[]).includes(t),
|
||||||
|
)
|
||||||
|
: DEFAULT_TOOLS;
|
||||||
|
|
||||||
|
return {
|
||||||
|
id: slugify(section.name),
|
||||||
|
name: section.name,
|
||||||
|
description: fm.description ?? '',
|
||||||
|
system_prompt: systemPrompt,
|
||||||
|
temperature: typeof fm.temperature === 'number' ? fm.temperature : DEFAULT_TEMPERATURE,
|
||||||
|
tools: filteredTools,
|
||||||
|
model: typeof fm.model === 'string' && fm.model.length > 0 ? fm.model : null,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
interface ParseResult {
|
||||||
|
agents: Omit<Agent, 'source'>[];
|
||||||
|
errors: AgentParseError[];
|
||||||
|
}
|
||||||
|
|
||||||
|
// v1.8.1: parse each `## Name` block independently. A failure in one block
|
||||||
|
// does not abort the rest of the file — we collect a per-agent error and
|
||||||
|
// keep parsing. Server logs a console.warn for each skipped agent.
|
||||||
|
export function parseAgentsMd(content: string): ParseResult {
|
||||||
|
const sections = splitSections(content);
|
||||||
|
const agents: Omit<Agent, 'source'>[] = [];
|
||||||
|
const errors: AgentParseError[] = [];
|
||||||
|
|
||||||
|
for (const section of sections) {
|
||||||
|
try {
|
||||||
|
agents.push(parseAgentSection(section));
|
||||||
|
} catch (err) {
|
||||||
|
const reason = err instanceof Error ? err.message : String(err);
|
||||||
|
console.warn(`agents: skipped "${section.name}" — ${reason}`);
|
||||||
|
errors.push({ agent_name: section.name, reason });
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return { agents, errors };
|
||||||
|
}
|
||||||
|
|
||||||
|
// ---- mtime-keyed cache + public API ----------------------------------------
|
||||||
|
|
||||||
|
interface CacheEntry {
|
||||||
|
globalMtime: number | null;
|
||||||
|
projectMtime: number | null;
|
||||||
|
cachedAt: number;
|
||||||
|
result: AgentsResponse;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Keyed by projectPath ('' is fine — no project case, e.g. tests). Two files
|
||||||
|
// participate in the cache key (global + project); editing either bumps the
|
||||||
|
// corresponding mtime so the next read sees a miss without a watcher.
|
||||||
|
const cache = new Map<string, CacheEntry>();
|
||||||
|
|
||||||
|
export function invalidateAgentsCache(projectPath?: string): void {
|
||||||
|
if (projectPath === undefined) {
|
||||||
|
cache.clear();
|
||||||
|
} else {
|
||||||
|
cache.delete(projectPath);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async function safeStat(path: string): Promise<number | null> {
|
||||||
|
try {
|
||||||
|
const s = await fs.stat(path);
|
||||||
|
return s.mtimeMs;
|
||||||
|
} catch {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async function safeRead(path: string): Promise<string | null> {
|
||||||
|
try {
|
||||||
|
return await fs.readFile(path, 'utf8');
|
||||||
|
} catch {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
export async function getAgentsForProject(projectPath: string): Promise<AgentsResponse> {
|
||||||
|
const projectAgentsPath = projectPath ? join(projectPath, 'AGENTS.md') : null;
|
||||||
|
|
||||||
|
const [globalMtime, projectMtime] = await Promise.all([
|
||||||
|
safeStat(GLOBAL_AGENTS_PATH),
|
||||||
|
projectAgentsPath ? safeStat(projectAgentsPath) : Promise.resolve(null),
|
||||||
|
]);
|
||||||
|
|
||||||
|
const cacheKey = projectPath || '__none__';
|
||||||
|
const cached = cache.get(cacheKey);
|
||||||
|
const now = Date.now();
|
||||||
|
if (
|
||||||
|
cached &&
|
||||||
|
cached.globalMtime === globalMtime &&
|
||||||
|
cached.projectMtime === projectMtime &&
|
||||||
|
now - cached.cachedAt < CACHE_TTL_MS
|
||||||
|
) {
|
||||||
|
return cached.result;
|
||||||
|
}
|
||||||
|
|
||||||
|
const [globalContent, projectContent] = await Promise.all([
|
||||||
|
globalMtime !== null ? safeRead(GLOBAL_AGENTS_PATH) : Promise.resolve(null),
|
||||||
|
projectAgentsPath && projectMtime !== null ? safeRead(projectAgentsPath) : Promise.resolve(null),
|
||||||
|
]);
|
||||||
|
|
||||||
|
const errors: AgentParseError[] = [];
|
||||||
|
const byName = new Map<string, Agent>();
|
||||||
|
|
||||||
|
if (globalContent !== null) {
|
||||||
|
const r = parseAgentsMd(globalContent);
|
||||||
|
for (const a of r.agents) byName.set(a.name, { ...a, source: 'global' });
|
||||||
|
errors.push(...r.errors);
|
||||||
|
}
|
||||||
|
if (projectContent !== null) {
|
||||||
|
const r = parseAgentsMd(projectContent);
|
||||||
|
for (const a of r.agents) byName.set(a.name, { ...a, source: 'project' });
|
||||||
|
errors.push(...r.errors);
|
||||||
|
}
|
||||||
|
|
||||||
|
const result: AgentsResponse = {
|
||||||
|
agents: Array.from(byName.values()),
|
||||||
|
errors,
|
||||||
|
};
|
||||||
|
cache.set(cacheKey, { globalMtime, projectMtime, cachedAt: now, result });
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
|
export async function getAgentById(
|
||||||
|
projectPath: string,
|
||||||
|
agentId: string,
|
||||||
|
): Promise<Agent | null> {
|
||||||
|
const { agents } = await getAgentsForProject(projectPath);
|
||||||
|
return agents.find((a) => a.id === agentId) ?? null;
|
||||||
|
}
|
||||||
@@ -144,4 +144,23 @@ export async function maybeAutoNameChat(
|
|||||||
updated_at: updated[0]!.updated_at,
|
updated_at: updated[0]!.updated_at,
|
||||||
});
|
});
|
||||||
ctx.log.info({ chatId, name }, 'chat auto-named');
|
ctx.log.info({ chatId, name }, 'chat auto-named');
|
||||||
|
|
||||||
|
// Propagate to the parent session if it's still on its default name.
|
||||||
|
// The WHERE guard makes the check atomic — if the user has already
|
||||||
|
// renamed (or a prior chat already propagated), this UPDATE matches
|
||||||
|
// zero rows and we do nothing. First chat wins; manual renames win.
|
||||||
|
const renamedSession = await ctx.sql<{ id: string; name: string }[]>`
|
||||||
|
UPDATE sessions
|
||||||
|
SET name = ${name}
|
||||||
|
WHERE id = ${sessionId} AND name = 'New session'
|
||||||
|
RETURNING id, name
|
||||||
|
`;
|
||||||
|
if (renamedSession.length > 0) {
|
||||||
|
ctx.publishUser({
|
||||||
|
type: 'session_renamed',
|
||||||
|
session_id: sessionId,
|
||||||
|
name,
|
||||||
|
});
|
||||||
|
ctx.log.info({ sessionId, name }, 'session auto-named from chat');
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -33,6 +33,7 @@ async function snapMtimes(root: string): Promise<MtimeSnap> {
|
|||||||
const rootStat = await fs.stat(root);
|
const rootStat = await fs.stat(root);
|
||||||
let gitHead: number | null = null;
|
let gitHead: number | null = null;
|
||||||
let gitIndex: number | null = null;
|
let gitIndex: number | null = null;
|
||||||
|
// best-effort; ignore failure because the project may not be a git repo
|
||||||
try { gitHead = (await fs.stat(path.join(root, '.git', 'HEAD'))).mtimeMs; } catch {}
|
try { gitHead = (await fs.stat(path.join(root, '.git', 'HEAD'))).mtimeMs; } catch {}
|
||||||
try { gitIndex = (await fs.stat(path.join(root, '.git', 'index'))).mtimeMs; } catch {}
|
try { gitIndex = (await fs.stat(path.join(root, '.git', 'index'))).mtimeMs; } catch {}
|
||||||
return { root: rootStat.mtimeMs, gitHead, gitIndex };
|
return { root: rootStat.mtimeMs, gitHead, gitIndex };
|
||||||
|
|||||||
92
apps/server/src/services/git_meta.ts
Normal file
92
apps/server/src/services/git_meta.ts
Normal file
@@ -0,0 +1,92 @@
|
|||||||
|
import { execFile } from 'node:child_process';
|
||||||
|
import { promisify } from 'node:util';
|
||||||
|
|
||||||
|
const execFileAsync = promisify(execFile);
|
||||||
|
|
||||||
|
const CACHE_TTL_MS = 30_000;
|
||||||
|
const GIT_TIMEOUT_MS = 2_000;
|
||||||
|
// Cap stdout size so a pathological repo can't blow the buffer. Branch + status
|
||||||
|
// porcelain + diverge counts never approach this on a real repo.
|
||||||
|
const GIT_MAX_BUFFER = 1024 * 1024;
|
||||||
|
|
||||||
|
export interface GitMeta {
|
||||||
|
branch: string | null;
|
||||||
|
is_dirty: boolean;
|
||||||
|
ahead: number;
|
||||||
|
behind: number;
|
||||||
|
}
|
||||||
|
|
||||||
|
interface CacheEntry {
|
||||||
|
at: number;
|
||||||
|
value: GitMeta | null;
|
||||||
|
}
|
||||||
|
|
||||||
|
const cache = new Map<string, CacheEntry>();
|
||||||
|
|
||||||
|
// Runs a single git invocation with a hard 2s timeout. Returns null on any
|
||||||
|
// failure (non-zero exit, timeout, git not installed) so callers can decide
|
||||||
|
// how to degrade. Stderr is intentionally swallowed; we don't surface git's
|
||||||
|
// error text to the model or UI.
|
||||||
|
async function runGit(args: string[], cwd: string): Promise<string | null> {
|
||||||
|
try {
|
||||||
|
const { stdout } = await execFileAsync('git', args, {
|
||||||
|
cwd,
|
||||||
|
timeout: GIT_TIMEOUT_MS,
|
||||||
|
windowsHide: true,
|
||||||
|
maxBuffer: GIT_MAX_BUFFER,
|
||||||
|
});
|
||||||
|
return stdout.toString();
|
||||||
|
} catch {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
export async function getGitMeta(rootPath: string): Promise<GitMeta | null> {
|
||||||
|
const cached = cache.get(rootPath);
|
||||||
|
const now = Date.now();
|
||||||
|
if (cached && now - cached.at < CACHE_TTL_MS) {
|
||||||
|
return cached.value;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Three calls in parallel. rev-parse establishes repo + branch name;
|
||||||
|
// status --porcelain detects dirtiness with no false-positives from formatting;
|
||||||
|
// rev-list --left-right --count compares HEAD to upstream and is allowed to
|
||||||
|
// fail silently (returns null → ahead/behind = 0) when no upstream is set.
|
||||||
|
const [branchOut, statusOut, divergedOut] = await Promise.all([
|
||||||
|
runGit(['rev-parse', '--abbrev-ref', 'HEAD'], rootPath),
|
||||||
|
runGit(['status', '--porcelain'], rootPath),
|
||||||
|
runGit(['rev-list', '--left-right', '--count', 'HEAD...@{upstream}'], rootPath),
|
||||||
|
]);
|
||||||
|
|
||||||
|
// If rev-parse fails, this isn't a git repo (or git isn't installed). Cache
|
||||||
|
// the null result so the next 30s of requests don't re-probe.
|
||||||
|
if (branchOut === null) {
|
||||||
|
cache.set(rootPath, { at: now, value: null });
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
const branch = branchOut.trim() || null;
|
||||||
|
const is_dirty = statusOut !== null && statusOut.trim().length > 0;
|
||||||
|
|
||||||
|
let ahead = 0;
|
||||||
|
let behind = 0;
|
||||||
|
if (divergedOut !== null) {
|
||||||
|
const match = divergedOut.trim().match(/^(\d+)\s+(\d+)/);
|
||||||
|
if (match) {
|
||||||
|
ahead = Number(match[1]);
|
||||||
|
behind = Number(match[2]);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
const value: GitMeta = { branch, is_dirty, ahead, behind };
|
||||||
|
cache.set(rootPath, { at: now, value });
|
||||||
|
return value;
|
||||||
|
}
|
||||||
|
|
||||||
|
export function invalidateGitMetaCache(rootPath?: string): void {
|
||||||
|
if (rootPath) {
|
||||||
|
cache.delete(rootPath);
|
||||||
|
} else {
|
||||||
|
cache.clear();
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,16 +1,17 @@
|
|||||||
import type { FastifyBaseLogger } from 'fastify';
|
import type { FastifyBaseLogger } from 'fastify';
|
||||||
import type { Sql } from '../db.js';
|
import type { Sql } from '../db.js';
|
||||||
import type { Config } from '../config.js';
|
import type { Config } from '../config.js';
|
||||||
import type { Message, Project, Session, ToolCall, UserStreamFrame } from '../types/api.js';
|
import type { Agent, Message, Project, Session, ToolCall, UserStreamFrame } from '../types/api.js';
|
||||||
import { ALL_TOOLS, TOOLS_BY_NAME, toolJsonSchemas } from './tools.js';
|
import { ALL_TOOLS, TOOLS_BY_NAME, toolJsonSchemas, type ToolJsonSchema } from './tools.js';
|
||||||
import { PathScopeError, resolveProjectRoot } from './path_guard.js';
|
import { PathScopeError, resolveProjectRoot } from './path_guard.js';
|
||||||
import { maybeAutoNameChat } from './auto_name.js';
|
import { maybeAutoNameChat } from './auto_name.js';
|
||||||
|
import { getAgentById } from './agents.js';
|
||||||
|
|
||||||
const BASE_SYSTEM_PROMPT = (projectPath: string) =>
|
const BASE_SYSTEM_PROMPT = (projectPath: string) =>
|
||||||
`You are BooCode Chat, a code investigation assistant. The user is working on a project located at ${projectPath}. Use the file-read tools (view_file, list_dir, grep, find_files) to investigate code when needed. Be concise. Cite file paths and line numbers when discussing code. Do not hallucinate file contents — read the file first. Tool results may be truncated; if so, narrow your query rather than guessing.`;
|
`You are BooCode Chat, a code investigation assistant. The user is working on a project located at ${projectPath}. Use the file-read tools (view_file, list_dir, grep, find_files) to investigate code when needed. Be concise. Cite file paths and line numbers when discussing code. Do not hallucinate file contents — read the file first. Tool results may be truncated; if so, narrow your query rather than guessing.`;
|
||||||
|
|
||||||
const DB_FLUSH_INTERVAL_MS = 500;
|
const DB_FLUSH_INTERVAL_MS = 500;
|
||||||
const MAX_TOOL_LOOP_DEPTH = 5;
|
const MAX_TOOL_LOOP_DEPTH = 15;
|
||||||
|
|
||||||
export interface InferenceFrame {
|
export interface InferenceFrame {
|
||||||
type:
|
type:
|
||||||
@@ -91,16 +92,32 @@ export interface InferenceContext {
|
|||||||
publishUser: (frame: UserStreamFrame) => void;
|
publishUser: (frame: UserStreamFrame) => void;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Resolution order: base prompt < agent.system_prompt < session.system_prompt.
|
||||||
|
// Agent prompts layer on top of the base; session prompt is the most specific
|
||||||
|
// override and stacks last so callers can append per-session instructions.
|
||||||
|
export function buildSystemPrompt(
|
||||||
|
project: Project,
|
||||||
|
session: Session,
|
||||||
|
agent: Agent | null
|
||||||
|
): string {
|
||||||
|
let out = BASE_SYSTEM_PROMPT(project.path);
|
||||||
|
if (agent && agent.system_prompt.trim().length > 0) {
|
||||||
|
out += '\n\n' + agent.system_prompt.trim();
|
||||||
|
}
|
||||||
|
if (session.system_prompt && session.system_prompt.trim().length > 0) {
|
||||||
|
out += '\n\n' + session.system_prompt.trim();
|
||||||
|
}
|
||||||
|
return out;
|
||||||
|
}
|
||||||
|
|
||||||
export function buildMessagesPayload(
|
export function buildMessagesPayload(
|
||||||
session: Session,
|
session: Session,
|
||||||
project: Project,
|
project: Project,
|
||||||
history: Message[]
|
history: Message[],
|
||||||
|
agent: Agent | null = null
|
||||||
): OpenAiMessage[] {
|
): OpenAiMessage[] {
|
||||||
const out: OpenAiMessage[] = [];
|
const out: OpenAiMessage[] = [];
|
||||||
let systemPrompt = BASE_SYSTEM_PROMPT(project.path);
|
const systemPrompt = buildSystemPrompt(project, session, agent);
|
||||||
if (session.system_prompt && session.system_prompt.trim().length > 0) {
|
|
||||||
systemPrompt += '\n\n' + session.system_prompt.trim();
|
|
||||||
}
|
|
||||||
out.push({ role: 'system', content: systemPrompt });
|
out.push({ role: 'system', content: systemPrompt });
|
||||||
|
|
||||||
// Find the latest compact marker — only send messages from that point onwards
|
// Find the latest compact marker — only send messages from that point onwards
|
||||||
@@ -161,7 +178,7 @@ async function loadContext(
|
|||||||
chatId: string
|
chatId: string
|
||||||
): Promise<{ session: Session; project: Project; history: Message[] } | null> {
|
): Promise<{ session: Session; project: Project; history: Message[] } | null> {
|
||||||
const sessionRows = await sql<Session[]>`
|
const sessionRows = await sql<Session[]>`
|
||||||
SELECT id, project_id, name, model, system_prompt, status, created_at, updated_at
|
SELECT id, project_id, name, model, system_prompt, status, created_at, updated_at, agent_id
|
||||||
FROM sessions WHERE id = ${sessionId}
|
FROM sessions WHERE id = ${sessionId}
|
||||||
`;
|
`;
|
||||||
if (sessionRows.length === 0) return null;
|
if (sessionRows.length === 0) return null;
|
||||||
@@ -217,11 +234,18 @@ interface StreamResult {
|
|||||||
nCtx: number | null;
|
nCtx: number | null;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
interface StreamOptions {
|
||||||
|
// null = omit tools entirely (compact phase); [] = caller stripped all tools
|
||||||
|
// (rare; we still omit from the request body to avoid OpenAI 400).
|
||||||
|
tools: ToolJsonSchema[] | null;
|
||||||
|
temperature?: number;
|
||||||
|
}
|
||||||
|
|
||||||
async function streamCompletion(
|
async function streamCompletion(
|
||||||
ctx: InferenceContext,
|
ctx: InferenceContext,
|
||||||
model: string,
|
model: string,
|
||||||
messages: OpenAiMessage[],
|
messages: OpenAiMessage[],
|
||||||
includeTools: boolean,
|
opts: StreamOptions,
|
||||||
onDelta: (content: string) => void,
|
onDelta: (content: string) => void,
|
||||||
signal?: AbortSignal
|
signal?: AbortSignal
|
||||||
): Promise<StreamResult> {
|
): Promise<StreamResult> {
|
||||||
@@ -231,10 +255,13 @@ async function streamCompletion(
|
|||||||
stream: true,
|
stream: true,
|
||||||
stream_options: { include_usage: true },
|
stream_options: { include_usage: true },
|
||||||
};
|
};
|
||||||
if (includeTools) {
|
if (opts.tools && opts.tools.length > 0) {
|
||||||
body['tools'] = toolJsonSchemas();
|
body['tools'] = opts.tools;
|
||||||
body['tool_choice'] = 'auto';
|
body['tool_choice'] = 'auto';
|
||||||
}
|
}
|
||||||
|
if (typeof opts.temperature === 'number') {
|
||||||
|
body['temperature'] = opts.temperature;
|
||||||
|
}
|
||||||
|
|
||||||
const res = await fetch(`${ctx.config.LLAMA_SWAP_URL}/v1/chat/completions`, {
|
const res = await fetch(`${ctx.config.LLAMA_SWAP_URL}/v1/chat/completions`, {
|
||||||
method: 'POST',
|
method: 'POST',
|
||||||
@@ -366,7 +393,8 @@ async function executeStreamPhase(
|
|||||||
args: TurnArgs,
|
args: TurnArgs,
|
||||||
session: Session,
|
session: Session,
|
||||||
messages: OpenAiMessage[],
|
messages: OpenAiMessage[],
|
||||||
state: StreamPhaseState
|
state: StreamPhaseState,
|
||||||
|
agent: Agent | null
|
||||||
): Promise<StreamResult> {
|
): Promise<StreamResult> {
|
||||||
const { sessionId, chatId, assistantMessageId, signal } = args;
|
const { sessionId, chatId, assistantMessageId, signal } = args;
|
||||||
|
|
||||||
@@ -407,12 +435,20 @@ async function executeStreamPhase(
|
|||||||
}, DB_FLUSH_INTERVAL_MS);
|
}, DB_FLUSH_INTERVAL_MS);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
// Tool whitelist: if an agent is set, filter the global tool list to only the
|
||||||
|
// tool names it allows. Unknown names in agent.tools are dropped silently
|
||||||
|
// (handled here by intersection). When no agent: send all tools.
|
||||||
|
const effectiveTools: ToolJsonSchema[] = agent
|
||||||
|
? toolJsonSchemas().filter((t) => agent.tools.includes(t.function.name))
|
||||||
|
: toolJsonSchemas();
|
||||||
|
const effectiveTemperature = agent?.temperature;
|
||||||
|
|
||||||
try {
|
try {
|
||||||
return await streamCompletion(
|
return await streamCompletion(
|
||||||
ctx,
|
ctx,
|
||||||
session.model,
|
session.model,
|
||||||
messages,
|
messages,
|
||||||
true,
|
{ tools: effectiveTools, temperature: effectiveTemperature },
|
||||||
(delta) => {
|
(delta) => {
|
||||||
state.accumulated += delta;
|
state.accumulated += delta;
|
||||||
ctx.publish(sessionId, {
|
ctx.publish(sessionId, {
|
||||||
@@ -457,6 +493,9 @@ async function handleAbortOrError(
|
|||||||
RETURNING project_id, name, updated_at
|
RETURNING project_id, name, updated_at
|
||||||
`;
|
`;
|
||||||
ctx.publishUser({ type: 'session_updated', session_id: sessionId, project_id: failSessRow!.project_id, name: failSessRow!.name, updated_at: failSessRow!.updated_at });
|
ctx.publishUser({ type: 'session_updated', session_id: sessionId, project_id: failSessRow!.project_id, name: failSessRow!.name, updated_at: failSessRow!.updated_at });
|
||||||
|
// v1.8 mobile-tabs: cancellation is a user-initiated stop, treat as idle;
|
||||||
|
// genuine errors flip the dot red.
|
||||||
|
ctx.publishUser({ type: 'chat_status', chat_id: chatId, status: isAbort ? 'idle' : 'error', at: new Date().toISOString() });
|
||||||
if (isAbort) {
|
if (isAbort) {
|
||||||
ctx.publish(sessionId, {
|
ctx.publish(sessionId, {
|
||||||
type: 'message_complete',
|
type: 'message_complete',
|
||||||
@@ -602,6 +641,7 @@ async function finalizeCompletion(
|
|||||||
RETURNING project_id, name, updated_at
|
RETURNING project_id, name, updated_at
|
||||||
`;
|
`;
|
||||||
ctx.publishUser({ type: 'session_updated', session_id: sessionId, project_id: completeSessRow!.project_id, name: completeSessRow!.name, updated_at: completeSessRow!.updated_at });
|
ctx.publishUser({ type: 'session_updated', session_id: sessionId, project_id: completeSessRow!.project_id, name: completeSessRow!.name, updated_at: completeSessRow!.updated_at });
|
||||||
|
ctx.publishUser({ type: 'chat_status', chat_id: chatId, status: 'idle', at: new Date().toISOString() });
|
||||||
ctx.publish(sessionId, {
|
ctx.publish(sessionId, {
|
||||||
type: 'message_complete',
|
type: 'message_complete',
|
||||||
message_id: assistantMessageId,
|
message_id: assistantMessageId,
|
||||||
@@ -647,6 +687,7 @@ async function runAssistantTurn(
|
|||||||
chat_id: chatId,
|
chat_id: chatId,
|
||||||
error: 'tool loop depth exceeded',
|
error: 'tool loop depth exceeded',
|
||||||
});
|
});
|
||||||
|
ctx.publishUser({ type: 'chat_status', chat_id: chatId, status: 'error', at: new Date().toISOString() });
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -657,12 +698,18 @@ async function runAssistantTurn(
|
|||||||
}
|
}
|
||||||
const { session, project, history } = loaded;
|
const { session, project, history } = loaded;
|
||||||
const projectRoot = await resolveProjectRoot(project.path);
|
const projectRoot = await resolveProjectRoot(project.path);
|
||||||
const messages = buildMessagesPayload(session, project, history);
|
// Agent resolution is per-turn so PATCH agent_id mid-conversation takes
|
||||||
|
// effect on the next message. Unknown agent_id returns null silently —
|
||||||
|
// session falls back to base prompt + all tools + default temperature.
|
||||||
|
const agent = session.agent_id
|
||||||
|
? await getAgentById(project.path, session.agent_id)
|
||||||
|
: null;
|
||||||
|
const messages = buildMessagesPayload(session, project, history, agent);
|
||||||
|
|
||||||
const state: StreamPhaseState = { accumulated: '', startedAt: null };
|
const state: StreamPhaseState = { accumulated: '', startedAt: null };
|
||||||
let result: StreamResult;
|
let result: StreamResult;
|
||||||
try {
|
try {
|
||||||
result = await executeStreamPhase(ctx, args, session, messages, state);
|
result = await executeStreamPhase(ctx, args, session, messages, state, agent);
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
await handleAbortOrError(ctx, args, state.accumulated, err);
|
await handleAbortOrError(ctx, args, state.accumulated, err);
|
||||||
return;
|
return;
|
||||||
@@ -720,7 +767,7 @@ async function runCompact(
|
|||||||
ctx,
|
ctx,
|
||||||
session.model,
|
session.model,
|
||||||
messagesForSummary,
|
messagesForSummary,
|
||||||
false,
|
{ tools: null },
|
||||||
(delta) => {
|
(delta) => {
|
||||||
content += delta;
|
content += delta;
|
||||||
ctx.publish(sessionId, {
|
ctx.publish(sessionId, {
|
||||||
@@ -778,6 +825,9 @@ export function createInferenceRunner(
|
|||||||
...ctx,
|
...ctx,
|
||||||
publishUser: (frame) => publishUserFn(user, frame),
|
publishUser: (frame) => publishUserFn(user, frame),
|
||||||
};
|
};
|
||||||
|
// v1.8 mobile-tabs: announce working before the async loop starts so
|
||||||
|
// every device subscribed to the user channel sees the amber dot.
|
||||||
|
callCtx.publishUser({ type: 'chat_status', chat_id: chatId, status: 'working', at: new Date().toISOString() });
|
||||||
const controller = new AbortController();
|
const controller = new AbortController();
|
||||||
let resolveCompleted!: () => void;
|
let resolveCompleted!: () => void;
|
||||||
const completed = new Promise<void>((res) => { resolveCompleted = res; });
|
const completed = new Promise<void>((res) => { resolveCompleted = res; });
|
||||||
|
|||||||
@@ -82,11 +82,13 @@ export async function bootstrapProject(
|
|||||||
throw new BootstrapNameError(`invalid name after sanitization: "${folder}"`);
|
throw new BootstrapNameError(`invalid name after sanitization: "${folder}"`);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Whitelist resolution
|
// Bootstrap target resolution. Uses BOOTSTRAP_ROOT (writable), not
|
||||||
const whitelistReal = await realpath(config.PROJECT_ROOT_WHITELIST);
|
// PROJECT_ROOT_WHITELIST (which may be a wider read-only scope for
|
||||||
const fullPath = resolve(whitelistReal, folder);
|
// add-existing flow).
|
||||||
if (!fullPath.startsWith(whitelistReal + sep)) {
|
const bootstrapReal = await realpath(config.BOOTSTRAP_ROOT);
|
||||||
throw new BootstrapPathError('path escapes whitelist');
|
const fullPath = resolve(bootstrapReal, folder);
|
||||||
|
if (!fullPath.startsWith(bootstrapReal + sep)) {
|
||||||
|
throw new BootstrapPathError('path escapes bootstrap root');
|
||||||
}
|
}
|
||||||
if (existsSync(fullPath)) {
|
if (existsSync(fullPath)) {
|
||||||
throw new BootstrapCollisionError(`path already exists: ${fullPath}`);
|
throw new BootstrapCollisionError(`path already exists: ${fullPath}`);
|
||||||
@@ -144,7 +146,8 @@ export async function bootstrapProject(
|
|||||||
|
|
||||||
// Step 6: git remote add + push
|
// Step 6: git remote add + push
|
||||||
try {
|
try {
|
||||||
await execFileAsync('git', ['remote', 'add', 'origin', repo.ssh_url], { cwd: fullPath });
|
const sshUrl = repo.ssh_url.replace('git.indifferentketchup.com', '100.114.205.53');
|
||||||
|
await execFileAsync('git', ['remote', 'add', 'origin', sshUrl], { cwd: fullPath });
|
||||||
await execFileAsync('git', ['push', '-u', 'origin', 'main'], { cwd: fullPath });
|
await execFileAsync('git', ['push', '-u', 'origin', 'main'], { cwd: fullPath });
|
||||||
gitea_pushed = true;
|
gitea_pushed = true;
|
||||||
log.info({ folder }, 'project_bootstrap: pushed to gitea');
|
log.info({ folder }, 'project_bootstrap: pushed to gitea');
|
||||||
|
|||||||
@@ -3,6 +3,7 @@ import { resolve, basename, relative } from 'node:path';
|
|||||||
import { z } from 'zod';
|
import { z } from 'zod';
|
||||||
import { pathGuard, PathScopeError } from './path_guard.js';
|
import { pathGuard, PathScopeError } from './path_guard.js';
|
||||||
import { grep as fileOpsGrep, findFiles as fileOpsFindFiles } from './file_ops.js';
|
import { grep as fileOpsGrep, findFiles as fileOpsFindFiles } from './file_ops.js';
|
||||||
|
import { getGitMeta } from './git_meta.js';
|
||||||
|
|
||||||
const MAX_FILE_BYTES = 5 * 1024 * 1024;
|
const MAX_FILE_BYTES = 5 * 1024 * 1024;
|
||||||
const DEFAULT_VIEW_LINES = 200;
|
const DEFAULT_VIEW_LINES = 200;
|
||||||
@@ -266,11 +267,45 @@ export const findFiles: ToolDef<FindFilesInputT> = {
|
|||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
|
||||||
|
// v1.8 Level 1 branch awareness: gives the model a read-only view of the
|
||||||
|
// project's git state. No path input — operates on the inference-resolved
|
||||||
|
// project root via getGitMeta. Subprocess runs with a 2s timeout (see git_meta).
|
||||||
|
const GitStatusInput = z.object({}).strict();
|
||||||
|
type GitStatusInputT = z.infer<typeof GitStatusInput>;
|
||||||
|
|
||||||
|
export const gitStatus: ToolDef<GitStatusInputT> = {
|
||||||
|
name: 'git_status',
|
||||||
|
description:
|
||||||
|
"Returns the current git branch, whether the working tree is dirty, and ahead/behind counts vs upstream. Read-only. Use when you need to know which branch the user is currently working on.",
|
||||||
|
inputSchema: GitStatusInput,
|
||||||
|
jsonSchema: {
|
||||||
|
type: 'function',
|
||||||
|
function: {
|
||||||
|
name: 'git_status',
|
||||||
|
description:
|
||||||
|
'Returns the current git branch, dirty flag, and ahead/behind counts vs upstream. Read-only.',
|
||||||
|
parameters: {
|
||||||
|
type: 'object',
|
||||||
|
properties: {},
|
||||||
|
additionalProperties: false,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
async execute(_input, projectRoot) {
|
||||||
|
const meta = await getGitMeta(projectRoot);
|
||||||
|
if (meta === null) {
|
||||||
|
return { repo: false, branch: null, is_dirty: false, ahead: 0, behind: 0 };
|
||||||
|
}
|
||||||
|
return { repo: true, ...meta };
|
||||||
|
},
|
||||||
|
};
|
||||||
|
|
||||||
export const ALL_TOOLS: ReadonlyArray<ToolDef<unknown>> = [
|
export const ALL_TOOLS: ReadonlyArray<ToolDef<unknown>> = [
|
||||||
viewFile as ToolDef<unknown>,
|
viewFile as ToolDef<unknown>,
|
||||||
listDir as ToolDef<unknown>,
|
listDir as ToolDef<unknown>,
|
||||||
grep as ToolDef<unknown>,
|
grep as ToolDef<unknown>,
|
||||||
findFiles as ToolDef<unknown>,
|
findFiles as ToolDef<unknown>,
|
||||||
|
gitStatus as ToolDef<unknown>,
|
||||||
];
|
];
|
||||||
|
|
||||||
export const TOOLS_BY_NAME: Record<string, ToolDef<unknown>> = Object.fromEntries(
|
export const TOOLS_BY_NAME: Record<string, ToolDef<unknown>> = Object.fromEntries(
|
||||||
|
|||||||
@@ -28,6 +28,36 @@ export interface Session {
|
|||||||
status: SessionStatus;
|
status: SessionStatus;
|
||||||
created_at: string;
|
created_at: string;
|
||||||
updated_at: string;
|
updated_at: string;
|
||||||
|
agent_id: string | null;
|
||||||
|
}
|
||||||
|
|
||||||
|
// v1.8.1: agents come from two sources. 'global' = /data/AGENTS.md (always
|
||||||
|
// loaded inside the container), 'project' = per-project override at
|
||||||
|
// <root>/AGENTS.md. Project entries override global by name (case-sensitive).
|
||||||
|
export type AgentSource = 'global' | 'project';
|
||||||
|
|
||||||
|
export interface Agent {
|
||||||
|
id: string; // slug of name; stable handle stored in sessions.agent_id
|
||||||
|
name: string;
|
||||||
|
description: string;
|
||||||
|
system_prompt: string;
|
||||||
|
temperature: number;
|
||||||
|
tools: string[]; // whitelist of tool names; empty = no tools allowed
|
||||||
|
model: string | null; // null means "session.model wins"
|
||||||
|
source: AgentSource;
|
||||||
|
}
|
||||||
|
|
||||||
|
// One entry per malformed `## Name` block. Per-block errors don't fail the
|
||||||
|
// whole file — the loader returns parsed-successfully agents AND the list of
|
||||||
|
// skipped ones so the UI can show a non-blocking warning chip.
|
||||||
|
export interface AgentParseError {
|
||||||
|
agent_name: string;
|
||||||
|
reason: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface AgentsResponse {
|
||||||
|
agents: Agent[];
|
||||||
|
errors: AgentParseError[];
|
||||||
}
|
}
|
||||||
|
|
||||||
// KEEP IN SYNC: apps/server/src/schema.sql chats_status_chk
|
// KEEP IN SYNC: apps/server/src/schema.sql chats_status_chk
|
||||||
@@ -225,6 +255,14 @@ export interface ProjectUpdatedFrame {
|
|||||||
project_id: string;
|
project_id: string;
|
||||||
name: string;
|
name: string;
|
||||||
}
|
}
|
||||||
|
// v1.8 mobile-tabs: server can't know about client-side panes, so status
|
||||||
|
// is keyed by chat_id. Frontend dot derives pane status from pane.activeChatId.
|
||||||
|
export interface ChatStatusFrame {
|
||||||
|
type: 'chat_status';
|
||||||
|
chat_id: string;
|
||||||
|
status: 'working' | 'idle' | 'error';
|
||||||
|
at: string;
|
||||||
|
}
|
||||||
export type UserStreamFrame =
|
export type UserStreamFrame =
|
||||||
| ProjectCreatedFrame
|
| ProjectCreatedFrame
|
||||||
| ProjectDeletedFrame
|
| ProjectDeletedFrame
|
||||||
@@ -240,4 +278,5 @@ export type UserStreamFrame =
|
|||||||
| ChatDeletedFrame
|
| ChatDeletedFrame
|
||||||
| ProjectArchivedFrame
|
| ProjectArchivedFrame
|
||||||
| ProjectUnarchivedFrame
|
| ProjectUnarchivedFrame
|
||||||
| ProjectUpdatedFrame;
|
| ProjectUpdatedFrame
|
||||||
|
| ChatStatusFrame;
|
||||||
|
|||||||
@@ -10,5 +10,6 @@
|
|||||||
"declaration": false,
|
"declaration": false,
|
||||||
"sourceMap": true
|
"sourceMap": true
|
||||||
},
|
},
|
||||||
"include": ["src/**/*"]
|
"include": ["src/**/*"],
|
||||||
|
"exclude": ["src/**/__tests__/**", "**/*.test.ts"]
|
||||||
}
|
}
|
||||||
|
|||||||
9
apps/server/vitest.config.ts
Normal file
9
apps/server/vitest.config.ts
Normal file
@@ -0,0 +1,9 @@
|
|||||||
|
import { defineConfig } from 'vitest/config';
|
||||||
|
|
||||||
|
export default defineConfig({
|
||||||
|
test: {
|
||||||
|
environment: 'node',
|
||||||
|
globals: false,
|
||||||
|
include: ['src/**/__tests__/**/*.test.ts'],
|
||||||
|
},
|
||||||
|
});
|
||||||
@@ -8,6 +8,9 @@ import { Project } from '@/pages/Project';
|
|||||||
import { Session } from '@/pages/Session';
|
import { Session } from '@/pages/Session';
|
||||||
import { Toaster } from '@/components/ui/sonner';
|
import { Toaster } from '@/components/ui/sonner';
|
||||||
import { useUserEvents } from '@/hooks/useUserEvents';
|
import { useUserEvents } from '@/hooks/useUserEvents';
|
||||||
|
import { SidebarDrawerProvider, useSidebarDrawer } from '@/hooks/useSidebarDrawer';
|
||||||
|
import { RightRailDrawerProvider, useRightRailDrawer } from '@/hooks/useRightRailDrawer';
|
||||||
|
import { useViewport } from '@/hooks/useViewport';
|
||||||
|
|
||||||
function SessionRightRail() {
|
function SessionRightRail() {
|
||||||
const { id } = useParams<{ id: string }>();
|
const { id } = useParams<{ id: string }>();
|
||||||
@@ -18,17 +21,51 @@ function SessionRightRail() {
|
|||||||
function RightRailForSession({ sessionId }: { sessionId: string }) {
|
function RightRailForSession({ sessionId }: { sessionId: string }) {
|
||||||
const [projectId, setProjectId] = useState<string | null>(null);
|
const [projectId, setProjectId] = useState<string | null>(null);
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
api.sessions.get(sessionId).then((s) => setProjectId(s.project_id)).catch(() => {});
|
api.sessions
|
||||||
|
.get(sessionId)
|
||||||
|
.then((s) => setProjectId(s.project_id))
|
||||||
|
.catch((err) => console.warn('RightRail: failed to fetch session', err));
|
||||||
}, [sessionId]);
|
}, [sessionId]);
|
||||||
if (!projectId) return null;
|
if (!projectId) return null;
|
||||||
|
// v1.6.2: rendered on all viewports. On mobile, RightRail itself renders as
|
||||||
|
// a right-side drawer toggled by the header's FolderTree button (via
|
||||||
|
// useRightRailDrawer). On desktop, it renders inline as before with its
|
||||||
|
// own internal open/close state.
|
||||||
return <RightRail projectId={projectId} />;
|
return <RightRail projectId={projectId} />;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function MobileBackdrop() {
|
||||||
|
const { open, setOpen } = useSidebarDrawer();
|
||||||
|
const { isMobile } = useViewport();
|
||||||
|
if (!isMobile || !open) return null;
|
||||||
|
return (
|
||||||
|
<div
|
||||||
|
className="fixed inset-0 z-30 bg-black/40 md:hidden"
|
||||||
|
onClick={() => setOpen(false)}
|
||||||
|
aria-hidden="true"
|
||||||
|
/>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
function MobileRightRailBackdrop() {
|
||||||
|
const { open, setOpen } = useRightRailDrawer();
|
||||||
|
const { isMobile } = useViewport();
|
||||||
|
if (!isMobile || !open) return null;
|
||||||
|
return (
|
||||||
|
<div
|
||||||
|
className="fixed inset-0 z-30 bg-black/40 md:hidden"
|
||||||
|
onClick={() => setOpen(false)}
|
||||||
|
aria-hidden="true"
|
||||||
|
/>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
function AppShell() {
|
function AppShell() {
|
||||||
useUserEvents();
|
useUserEvents();
|
||||||
return (
|
return (
|
||||||
<div className="dark h-screen flex bg-background text-foreground">
|
<div className="dark h-screen flex bg-background text-foreground">
|
||||||
<ProjectSidebar />
|
<ProjectSidebar />
|
||||||
|
<MobileBackdrop />
|
||||||
<main className="flex-1 flex flex-col min-w-0">
|
<main className="flex-1 flex flex-col min-w-0">
|
||||||
<Routes>
|
<Routes>
|
||||||
<Route path="/" element={<Home />} />
|
<Route path="/" element={<Home />} />
|
||||||
@@ -36,6 +73,7 @@ function AppShell() {
|
|||||||
<Route path="/session/:id" element={<Session />} />
|
<Route path="/session/:id" element={<Session />} />
|
||||||
</Routes>
|
</Routes>
|
||||||
</main>
|
</main>
|
||||||
|
<MobileRightRailBackdrop />
|
||||||
<Routes>
|
<Routes>
|
||||||
<Route path="/session/:id" element={<SessionRightRail />} />
|
<Route path="/session/:id" element={<SessionRightRail />} />
|
||||||
</Routes>
|
</Routes>
|
||||||
@@ -47,7 +85,11 @@ function AppShell() {
|
|||||||
export default function App() {
|
export default function App() {
|
||||||
return (
|
return (
|
||||||
<BrowserRouter>
|
<BrowserRouter>
|
||||||
<AppShell />
|
<SidebarDrawerProvider>
|
||||||
|
<RightRailDrawerProvider>
|
||||||
|
<AppShell />
|
||||||
|
</RightRailDrawerProvider>
|
||||||
|
</SidebarDrawerProvider>
|
||||||
</BrowserRouter>
|
</BrowserRouter>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -8,6 +8,8 @@ import type {
|
|||||||
SidebarResponse,
|
SidebarResponse,
|
||||||
ListDirResult,
|
ListDirResult,
|
||||||
ViewFileResult,
|
ViewFileResult,
|
||||||
|
AgentsResponse,
|
||||||
|
GitMeta,
|
||||||
} from './types';
|
} from './types';
|
||||||
|
|
||||||
export class ApiError extends Error {
|
export class ApiError extends Error {
|
||||||
@@ -86,6 +88,8 @@ export const api = {
|
|||||||
request<ViewFileResult>(`/api/projects/${id}/view_file?path=${encodeURIComponent(path)}`),
|
request<ViewFileResult>(`/api/projects/${id}/view_file?path=${encodeURIComponent(path)}`),
|
||||||
files: (id: string) =>
|
files: (id: string) =>
|
||||||
request<{ files: string[] }>(`/api/projects/${id}/files`),
|
request<{ files: string[] }>(`/api/projects/${id}/files`),
|
||||||
|
git: (id: string) =>
|
||||||
|
request<GitMeta>(`/api/projects/${id}/git`),
|
||||||
},
|
},
|
||||||
|
|
||||||
sessions: {
|
sessions: {
|
||||||
@@ -93,7 +97,7 @@ export const api = {
|
|||||||
request<Session[]>(`/api/projects/${projectId}/sessions${status ? `?status=${status}` : ''}`),
|
request<Session[]>(`/api/projects/${projectId}/sessions${status ? `?status=${status}` : ''}`),
|
||||||
create: (
|
create: (
|
||||||
projectId: string,
|
projectId: string,
|
||||||
body: { name?: string; model?: string; system_prompt?: string }
|
body: { name?: string; model?: string; system_prompt?: string; agent_id?: string | null }
|
||||||
) =>
|
) =>
|
||||||
request<Session>(`/api/projects/${projectId}/sessions`, {
|
request<Session>(`/api/projects/${projectId}/sessions`, {
|
||||||
method: 'POST',
|
method: 'POST',
|
||||||
@@ -102,7 +106,7 @@ export const api = {
|
|||||||
get: (id: string) => request<Session>(`/api/sessions/${id}`),
|
get: (id: string) => request<Session>(`/api/sessions/${id}`),
|
||||||
update: (
|
update: (
|
||||||
id: string,
|
id: string,
|
||||||
body: Partial<Pick<Session, 'name' | 'model' | 'system_prompt'>>
|
body: Partial<Pick<Session, 'name' | 'model' | 'system_prompt' | 'agent_id'>>
|
||||||
) =>
|
) =>
|
||||||
request<Session>(`/api/sessions/${id}`, {
|
request<Session>(`/api/sessions/${id}`, {
|
||||||
method: 'PATCH',
|
method: 'PATCH',
|
||||||
@@ -179,6 +183,11 @@ export const api = {
|
|||||||
|
|
||||||
models: () => request<ModelInfo[]>('/api/models'),
|
models: () => request<ModelInfo[]>('/api/models'),
|
||||||
|
|
||||||
|
agents: {
|
||||||
|
list: (projectId: string) =>
|
||||||
|
request<AgentsResponse>(`/api/projects/${projectId}/agents`),
|
||||||
|
},
|
||||||
|
|
||||||
settings: {
|
settings: {
|
||||||
get: () => request<Record<string, unknown>>('/api/settings'),
|
get: () => request<Record<string, unknown>>('/api/settings'),
|
||||||
patch: (body: Record<string, unknown>) =>
|
patch: (body: Record<string, unknown>) =>
|
||||||
|
|||||||
@@ -27,6 +27,33 @@ export interface Session {
|
|||||||
status: SessionStatus;
|
status: SessionStatus;
|
||||||
created_at: string;
|
created_at: string;
|
||||||
updated_at: string;
|
updated_at: string;
|
||||||
|
agent_id: string | null;
|
||||||
|
}
|
||||||
|
|
||||||
|
// v1.8.1: 'global' = /data/AGENTS.md (always-on), 'project' = per-project
|
||||||
|
// override at <root>/AGENTS.md. In-code builtins were retired; the seed file
|
||||||
|
// lives at /data/AGENTS.md.
|
||||||
|
export type AgentSource = 'global' | 'project';
|
||||||
|
|
||||||
|
export interface Agent {
|
||||||
|
id: string;
|
||||||
|
name: string;
|
||||||
|
description: string;
|
||||||
|
system_prompt: string;
|
||||||
|
temperature: number;
|
||||||
|
tools: string[];
|
||||||
|
model: string | null;
|
||||||
|
source: AgentSource;
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface AgentParseError {
|
||||||
|
agent_name: string;
|
||||||
|
reason: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface AgentsResponse {
|
||||||
|
agents: Agent[];
|
||||||
|
errors: AgentParseError[];
|
||||||
}
|
}
|
||||||
|
|
||||||
export const CHAT_STATUSES = ['open', 'archived'] as const;
|
export const CHAT_STATUSES = ['open', 'archived'] as const;
|
||||||
@@ -156,6 +183,15 @@ export interface PaneUpdateRequest {
|
|||||||
position?: number;
|
position?: number;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// v1.8 mobile-tabs: shape returned by GET /api/projects/:id/git. Mirrors
|
||||||
|
// services/git_meta.ts on the server. branch=null means "not a git repo".
|
||||||
|
export interface GitMeta {
|
||||||
|
branch: string | null;
|
||||||
|
is_dirty: boolean;
|
||||||
|
ahead: number;
|
||||||
|
behind: number;
|
||||||
|
}
|
||||||
|
|
||||||
export type WorkspacePaneKind = 'chat' | 'terminal' | 'agent' | 'empty';
|
export type WorkspacePaneKind = 'chat' | 'terminal' | 'agent' | 'empty';
|
||||||
|
|
||||||
export interface WorkspacePane {
|
export interface WorkspacePane {
|
||||||
@@ -191,6 +227,5 @@ export type WsFrame =
|
|||||||
finished_at?: string | null;
|
finished_at?: string | null;
|
||||||
}
|
}
|
||||||
| { type: 'messages_deleted'; message_ids: string[]; chat_id?: string }
|
| { type: 'messages_deleted'; message_ids: string[]; chat_id?: string }
|
||||||
| { type: 'session_renamed'; session_id: string; name: string; chat_id?: string }
|
|
||||||
| { type: 'chat_renamed'; chat_id: string; name: string }
|
| { type: 'chat_renamed'; chat_id: string; name: string }
|
||||||
| { type: 'error'; message_id?: string; chat_id?: string; error: string };
|
| { type: 'error'; message_id?: string; chat_id?: string; error: string };
|
||||||
|
|||||||
121
apps/web/src/components/AgentPicker.tsx
Normal file
121
apps/web/src/components/AgentPicker.tsx
Normal file
@@ -0,0 +1,121 @@
|
|||||||
|
import { useEffect, useState } from 'react';
|
||||||
|
import { Check, ChevronDown } from 'lucide-react';
|
||||||
|
import { toast } from 'sonner';
|
||||||
|
import { api } from '@/api/client';
|
||||||
|
import type { Agent, AgentParseError } from '@/api/types';
|
||||||
|
import {
|
||||||
|
DropdownMenu,
|
||||||
|
DropdownMenuContent,
|
||||||
|
DropdownMenuItem,
|
||||||
|
DropdownMenuSeparator,
|
||||||
|
DropdownMenuTrigger,
|
||||||
|
} from '@/components/ui/dropdown-menu';
|
||||||
|
|
||||||
|
interface Props {
|
||||||
|
projectId: string;
|
||||||
|
value: string | null;
|
||||||
|
onChange: (agentId: string | null) => void | Promise<void>;
|
||||||
|
}
|
||||||
|
|
||||||
|
export function AgentPicker({ projectId, value, onChange }: Props) {
|
||||||
|
const [agents, setAgents] = useState<Agent[] | null>(null);
|
||||||
|
const [parseErrors, setParseErrors] = useState<AgentParseError[]>([]);
|
||||||
|
const [error, setError] = useState<string | null>(null);
|
||||||
|
const [open, setOpen] = useState(false);
|
||||||
|
|
||||||
|
// v1.8.1: per-agent parse errors are non-blocking. Silent if any agents
|
||||||
|
// loaded successfully; a gray warning toast fires only when EVERY agent
|
||||||
|
// in AGENTS.md failed to parse. Server logs a console.warn either way.
|
||||||
|
useEffect(() => {
|
||||||
|
let cancelled = false;
|
||||||
|
setAgents(null);
|
||||||
|
setParseErrors([]);
|
||||||
|
setError(null);
|
||||||
|
api.agents
|
||||||
|
.list(projectId)
|
||||||
|
.then((res) => {
|
||||||
|
if (cancelled) return;
|
||||||
|
setAgents(res.agents);
|
||||||
|
setParseErrors(res.errors);
|
||||||
|
if (res.errors.length > 0 && res.agents.length === 0) {
|
||||||
|
toast.warning(
|
||||||
|
`AGENTS.md: ${res.errors.length} agent${res.errors.length === 1 ? '' : 's'} failed to parse, none loaded`,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
})
|
||||||
|
.catch((err) => {
|
||||||
|
if (cancelled) return;
|
||||||
|
setError(err instanceof Error ? err.message : 'failed to load agents');
|
||||||
|
});
|
||||||
|
return () => {
|
||||||
|
cancelled = true;
|
||||||
|
};
|
||||||
|
}, [projectId]);
|
||||||
|
|
||||||
|
const selectedAgent = agents?.find((a) => a.id === value) ?? null;
|
||||||
|
const triggerLabel = value === null
|
||||||
|
? 'No agent'
|
||||||
|
: selectedAgent?.name ?? value;
|
||||||
|
|
||||||
|
return (
|
||||||
|
<DropdownMenu open={open} onOpenChange={setOpen}>
|
||||||
|
<DropdownMenuTrigger asChild>
|
||||||
|
<button
|
||||||
|
type="button"
|
||||||
|
className="text-xs text-muted-foreground hover:text-foreground flex items-center gap-1 px-1.5 py-0.5 rounded hover:bg-muted/60"
|
||||||
|
title={selectedAgent?.description ?? undefined}
|
||||||
|
>
|
||||||
|
<span className="truncate max-w-[160px]">{triggerLabel}</span>
|
||||||
|
<ChevronDown className="size-3 opacity-70" />
|
||||||
|
</button>
|
||||||
|
</DropdownMenuTrigger>
|
||||||
|
<DropdownMenuContent align="start" className="max-h-80 overflow-y-auto w-72">
|
||||||
|
{error && (
|
||||||
|
<div className="px-2 py-1.5 text-xs text-destructive">{error}</div>
|
||||||
|
)}
|
||||||
|
{agents === null && !error && (
|
||||||
|
<div className="px-2 py-1.5 text-xs text-muted-foreground">Loading…</div>
|
||||||
|
)}
|
||||||
|
{agents !== null && (
|
||||||
|
<>
|
||||||
|
<DropdownMenuItem
|
||||||
|
onSelect={() => void onChange(null)}
|
||||||
|
className="text-xs"
|
||||||
|
>
|
||||||
|
<Check className={`size-3 ${value === null ? 'opacity-100' : 'opacity-0'}`} />
|
||||||
|
<span className="font-medium">No agent</span>
|
||||||
|
</DropdownMenuItem>
|
||||||
|
{agents.length > 0 && <DropdownMenuSeparator />}
|
||||||
|
{agents.map((a) => (
|
||||||
|
<DropdownMenuItem
|
||||||
|
key={a.id}
|
||||||
|
onSelect={() => void onChange(a.id)}
|
||||||
|
className="text-xs flex-col items-start gap-0.5"
|
||||||
|
>
|
||||||
|
<div className="flex items-center gap-1.5">
|
||||||
|
<Check
|
||||||
|
className={`size-3 ${a.id === value ? 'opacity-100' : 'opacity-0'}`}
|
||||||
|
/>
|
||||||
|
<span className="font-medium">{a.name}</span>
|
||||||
|
</div>
|
||||||
|
{a.description && (
|
||||||
|
<span className="text-muted-foreground pl-[18px] truncate w-full">
|
||||||
|
{a.description}
|
||||||
|
</span>
|
||||||
|
)}
|
||||||
|
</DropdownMenuItem>
|
||||||
|
))}
|
||||||
|
{parseErrors.length > 0 && (
|
||||||
|
<div
|
||||||
|
className="px-2 py-1.5 mt-1 text-xs text-amber-500 border-t border-border"
|
||||||
|
title={parseErrors.map((e) => `${e.agent_name}: ${e.reason}`).join('\n')}
|
||||||
|
>
|
||||||
|
{parseErrors.length} agent{parseErrors.length === 1 ? '' : 's'} skipped
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
</>
|
||||||
|
)}
|
||||||
|
</DropdownMenuContent>
|
||||||
|
</DropdownMenu>
|
||||||
|
);
|
||||||
|
}
|
||||||
92
apps/web/src/components/BottomSheet.tsx
Normal file
92
apps/web/src/components/BottomSheet.tsx
Normal file
@@ -0,0 +1,92 @@
|
|||||||
|
import { useEffect, useRef, useState, type ReactNode, type TouchEvent } from 'react';
|
||||||
|
import { cn } from '@/lib/utils';
|
||||||
|
|
||||||
|
interface Props {
|
||||||
|
open: boolean;
|
||||||
|
onClose: () => void;
|
||||||
|
children: ReactNode;
|
||||||
|
title?: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Past this drag distance, release dismisses the sheet.
|
||||||
|
const SWIPE_DISMISS_THRESHOLD_PX = 80;
|
||||||
|
|
||||||
|
export function BottomSheet({ open, onClose, children, title }: Props) {
|
||||||
|
const [dragY, setDragY] = useState(0);
|
||||||
|
const startYRef = useRef<number | null>(null);
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
if (!open) return;
|
||||||
|
const onKey = (e: KeyboardEvent) => {
|
||||||
|
if (e.key === 'Escape') onClose();
|
||||||
|
};
|
||||||
|
window.addEventListener('keydown', onKey);
|
||||||
|
return () => window.removeEventListener('keydown', onKey);
|
||||||
|
}, [open, onClose]);
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
if (!open) {
|
||||||
|
setDragY(0);
|
||||||
|
startYRef.current = null;
|
||||||
|
}
|
||||||
|
}, [open]);
|
||||||
|
|
||||||
|
function onTouchStart(e: TouchEvent<HTMLDivElement>) {
|
||||||
|
const t = e.touches[0];
|
||||||
|
if (!t) return;
|
||||||
|
startYRef.current = t.clientY;
|
||||||
|
}
|
||||||
|
function onTouchMove(e: TouchEvent<HTMLDivElement>) {
|
||||||
|
const t = e.touches[0];
|
||||||
|
if (!t || startYRef.current === null) return;
|
||||||
|
const dy = t.clientY - startYRef.current;
|
||||||
|
// Clamp to downward drags so the sheet doesn't "rubber-band" up.
|
||||||
|
if (dy > 0) setDragY(dy);
|
||||||
|
}
|
||||||
|
function onTouchEnd() {
|
||||||
|
if (dragY > SWIPE_DISMISS_THRESHOLD_PX) {
|
||||||
|
onClose();
|
||||||
|
} else {
|
||||||
|
setDragY(0);
|
||||||
|
}
|
||||||
|
startYRef.current = null;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!open) return null;
|
||||||
|
|
||||||
|
return (
|
||||||
|
<>
|
||||||
|
<div
|
||||||
|
className="fixed inset-0 z-40 bg-black/40"
|
||||||
|
onClick={onClose}
|
||||||
|
aria-hidden="true"
|
||||||
|
/>
|
||||||
|
<div
|
||||||
|
role="dialog"
|
||||||
|
aria-modal="true"
|
||||||
|
className={cn(
|
||||||
|
'fixed inset-x-0 bottom-0 z-50 rounded-t-2xl border-t border-border bg-popover text-popover-foreground shadow-2xl',
|
||||||
|
'transition-transform duration-150 will-change-transform',
|
||||||
|
'max-h-[70vh] flex flex-col',
|
||||||
|
)}
|
||||||
|
style={{
|
||||||
|
transform: `translateY(${dragY}px)`,
|
||||||
|
paddingBottom: 'env(safe-area-inset-bottom)',
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
<div
|
||||||
|
onTouchStart={onTouchStart}
|
||||||
|
onTouchMove={onTouchMove}
|
||||||
|
onTouchEnd={onTouchEnd}
|
||||||
|
className="flex flex-col items-center pt-2 pb-1 select-none touch-none"
|
||||||
|
>
|
||||||
|
<div className="w-10 h-1 bg-muted-foreground/40 rounded-full" />
|
||||||
|
{title && (
|
||||||
|
<div className="mt-1 text-sm font-medium text-muted-foreground">{title}</div>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
<div className="flex-1 overflow-y-auto">{children}</div>
|
||||||
|
</div>
|
||||||
|
</>
|
||||||
|
);
|
||||||
|
}
|
||||||
55
apps/web/src/components/ChatContextPopover.tsx
Normal file
55
apps/web/src/components/ChatContextPopover.tsx
Normal file
@@ -0,0 +1,55 @@
|
|||||||
|
import type { ChatContextStats } from '@/hooks/useChatContextStats';
|
||||||
|
|
||||||
|
interface Props {
|
||||||
|
stats: ChatContextStats | null;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Formats a token count into a compact k/m-suffix string.
|
||||||
|
* - < 1_000 → raw integer (e.g. "42")
|
||||||
|
* - 1_000–999_999 → "Nk" or "N.Nk" (e.g. "30k", "12.5k", "100k")
|
||||||
|
* - >= 1_000_000 → "Nm" or "N.Nm" (e.g. "1m", "1.5m", "100m")
|
||||||
|
*
|
||||||
|
* Drops a trailing ".0" so we get "30k" instead of "30.0k".
|
||||||
|
*/
|
||||||
|
function formatTokens(n: number): string {
|
||||||
|
if (n < 1000) return String(n);
|
||||||
|
if (n < 1_000_000) {
|
||||||
|
const k = n / 1000;
|
||||||
|
return k >= 100 ? `${Math.round(k)}k` : `${k.toFixed(1).replace(/\.0$/, '')}k`;
|
||||||
|
}
|
||||||
|
const m = n / 1_000_000;
|
||||||
|
return m >= 100 ? `${Math.round(m)}m` : `${m.toFixed(1).replace(/\.0$/, '')}m`;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Color thresholds:
|
||||||
|
* - > 85% → text-destructive
|
||||||
|
* - >= 60% → text-amber-500
|
||||||
|
* - else → text-muted-foreground
|
||||||
|
* (85% itself falls into the amber band.)
|
||||||
|
*/
|
||||||
|
function percentColorClass(percent: number): string {
|
||||||
|
if (percent > 85) return 'text-destructive';
|
||||||
|
if (percent >= 60) return 'text-amber-500';
|
||||||
|
return 'text-muted-foreground';
|
||||||
|
}
|
||||||
|
|
||||||
|
export function ChatContextPopover({ stats }: Props) {
|
||||||
|
if (!stats) return null;
|
||||||
|
return (
|
||||||
|
<div className="absolute bottom-full right-4 mb-4 z-20 pointer-events-none">
|
||||||
|
<div className="rounded-md border border-border bg-card text-card-foreground shadow-sm px-3 py-2 text-xs min-w-[140px]">
|
||||||
|
<div className="text-muted-foreground/80 text-[10px] uppercase tracking-wide mb-0.5">
|
||||||
|
Context window
|
||||||
|
</div>
|
||||||
|
<div className={`text-base font-medium ${percentColorClass(stats.percent)}`}>
|
||||||
|
{stats.percent}% used
|
||||||
|
</div>
|
||||||
|
<div className="text-muted-foreground text-[10px] font-mono">
|
||||||
|
{formatTokens(stats.used)} / {formatTokens(stats.max)} tokens
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
@@ -1,27 +1,47 @@
|
|||||||
import { useCallback, useEffect, useRef, useState, type KeyboardEvent } from 'react';
|
import { useCallback, useEffect, useRef, useState, type DragEvent, type KeyboardEvent } from 'react';
|
||||||
import { Send } from 'lucide-react';
|
import { Send } from 'lucide-react';
|
||||||
import { toast } from 'sonner';
|
import { toast } from 'sonner';
|
||||||
import { Textarea } from '@/components/ui/textarea';
|
import { Textarea } from '@/components/ui/textarea';
|
||||||
import { Button } from '@/components/ui/button';
|
import { Button } from '@/components/ui/button';
|
||||||
import { flattenToMessage, inferLanguage, type Attachment } from '@/lib/attachments';
|
import {
|
||||||
|
flattenToMessage,
|
||||||
|
inferLanguage,
|
||||||
|
looksBinary,
|
||||||
|
MAX_FILE_SIZE_BYTES,
|
||||||
|
PASTE_INLINE_MAX_LINES,
|
||||||
|
type Attachment,
|
||||||
|
} from '@/lib/attachments';
|
||||||
import { AttachmentChip } from '@/components/AttachmentChip';
|
import { AttachmentChip } from '@/components/AttachmentChip';
|
||||||
import { AttachmentPreviewModal } from '@/components/AttachmentPreviewModal';
|
import { AttachmentPreviewModal } from '@/components/AttachmentPreviewModal';
|
||||||
import { FileMentionPopover } from '@/components/FileMentionPopover';
|
import { FileMentionPopover } from '@/components/FileMentionPopover';
|
||||||
|
import { DropOverlay } from '@/components/DropOverlay';
|
||||||
|
import { AgentPicker } from '@/components/AgentPicker';
|
||||||
import { api } from '@/api/client';
|
import { api } from '@/api/client';
|
||||||
import { sessionEvents } from '@/hooks/sessionEvents';
|
import { sessionEvents } from '@/hooks/sessionEvents';
|
||||||
|
import { useViewport } from '@/hooks/useViewport';
|
||||||
|
|
||||||
|
const MAX_ATTACHMENTS = 10;
|
||||||
|
|
||||||
interface Props {
|
interface Props {
|
||||||
disabled?: boolean;
|
disabled?: boolean;
|
||||||
projectId: string;
|
projectId: string;
|
||||||
|
// Batch 9: optional so callers that pre-date the agent picker still compile.
|
||||||
|
// When omitted, the toolbar row is hidden entirely.
|
||||||
|
agentId?: string | null;
|
||||||
|
onAgentChange?: (agentId: string | null) => void | Promise<void>;
|
||||||
onSend: (content: string) => void | Promise<void>;
|
onSend: (content: string) => void | Promise<void>;
|
||||||
onForceSend?: (content: string) => void | Promise<void>;
|
onForceSend?: (content: string) => void | Promise<void>;
|
||||||
}
|
}
|
||||||
|
|
||||||
export function ChatInput({ disabled, projectId, onSend, onForceSend }: Props) {
|
export function ChatInput({ disabled, projectId, agentId, onAgentChange, onSend, onForceSend }: Props) {
|
||||||
|
const { isMobile } = useViewport();
|
||||||
const [value, setValue] = useState('');
|
const [value, setValue] = useState('');
|
||||||
const [busy, setBusy] = useState(false);
|
const [busy, setBusy] = useState(false);
|
||||||
const [attachments, setAttachments] = useState<Attachment[]>([]);
|
const [attachments, setAttachments] = useState<Attachment[]>([]);
|
||||||
const [previewAttachment, setPreviewAttachment] = useState<Attachment | null>(null);
|
const [previewAttachment, setPreviewAttachment] = useState<Attachment | null>(null);
|
||||||
|
const [isDraggingOver, setIsDraggingOver] = useState(false);
|
||||||
|
const dropRootRef = useRef<HTMLDivElement | null>(null);
|
||||||
|
const pasteCounterRef = useRef(0);
|
||||||
const [mentionState, setMentionState] = useState<{
|
const [mentionState, setMentionState] = useState<{
|
||||||
open: boolean;
|
open: boolean;
|
||||||
query: string;
|
query: string;
|
||||||
@@ -33,8 +53,8 @@ export function ChatInput({ disabled, projectId, onSend, onForceSend }: Props) {
|
|||||||
|
|
||||||
function addAttachment(a: Attachment) {
|
function addAttachment(a: Attachment) {
|
||||||
setAttachments(prev => {
|
setAttachments(prev => {
|
||||||
if (prev.length >= 10) {
|
if (prev.length >= MAX_ATTACHMENTS) {
|
||||||
toast.error('Max 10 attachments per message');
|
toast.error(`Max ${MAX_ATTACHMENTS} attachments per message`);
|
||||||
return prev;
|
return prev;
|
||||||
}
|
}
|
||||||
return [...prev, a];
|
return [...prev, a];
|
||||||
@@ -183,8 +203,169 @@ export function ChatInput({ disabled, projectId, onSend, onForceSend }: Props) {
|
|||||||
|
|
||||||
const closeMention = useCallback(() => setMentionState(null), []);
|
const closeMention = useCallback(() => setMentionState(null), []);
|
||||||
|
|
||||||
|
// ---- Drag & drop (F1 + F3 + F4) ----------------------------------------
|
||||||
|
// The drop zone is the outer ChatInput container (ref'd as dropRootRef).
|
||||||
|
// onDragLeave only clears the highlight when the cursor leaves the
|
||||||
|
// container, not when it crosses into a child element.
|
||||||
|
|
||||||
|
async function processDroppedFile(file: File) {
|
||||||
|
// Size gate
|
||||||
|
if (file.size > MAX_FILE_SIZE_BYTES) {
|
||||||
|
const mb = (file.size / (1024 * 1024)).toFixed(1);
|
||||||
|
toast.error(`File ${file.name} is too large (${mb} MB). Limit is 5 MB.`);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
// Read once as ArrayBuffer so we can do byte-level binary detection
|
||||||
|
// before deciding whether to decode as text.
|
||||||
|
let buf: ArrayBuffer;
|
||||||
|
try {
|
||||||
|
buf = await file.arrayBuffer();
|
||||||
|
} catch (err) {
|
||||||
|
toast.error(`Failed to read ${file.name}: ${err instanceof Error ? err.message : String(err)}`);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
if (looksBinary(buf)) {
|
||||||
|
toast.error(`${file.name} appears to be binary.`);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
const text = new TextDecoder('utf-8', { fatal: false }).decode(buf);
|
||||||
|
addAttachment({
|
||||||
|
id: crypto.randomUUID(),
|
||||||
|
kind: 'file',
|
||||||
|
filename: file.name,
|
||||||
|
language: inferLanguage(file.name),
|
||||||
|
content: text,
|
||||||
|
source: 'drop',
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
function isFolderItem(item: DataTransferItem | undefined): boolean {
|
||||||
|
if (!item) return false;
|
||||||
|
// webkitGetAsEntry is non-standard but supported in Chromium + Safari.
|
||||||
|
// If unavailable, we conservatively treat the entry as a file.
|
||||||
|
const entry =
|
||||||
|
typeof item.webkitGetAsEntry === 'function' ? item.webkitGetAsEntry() : null;
|
||||||
|
if (entry && entry.isDirectory) return true;
|
||||||
|
// Heuristic fallback: folders dragged from Finder have type === '' and
|
||||||
|
// a 0-byte File. The empty-type alone isn't reliable for files (some
|
||||||
|
// plaintext drops also lack a type), so we only flag when the entry
|
||||||
|
// explicitly says directory.
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
async function handleDroppedItems(dt: DataTransfer) {
|
||||||
|
// Snapshot items first because reading files inside the loop can
|
||||||
|
// detach the DataTransfer between awaits.
|
||||||
|
const itemsArray: { file: File | null; isFolder: boolean }[] = [];
|
||||||
|
if (dt.items && dt.items.length > 0) {
|
||||||
|
for (let i = 0; i < dt.items.length; i++) {
|
||||||
|
const it = dt.items[i];
|
||||||
|
if (!it || it.kind !== 'file') continue;
|
||||||
|
const folder = isFolderItem(it);
|
||||||
|
const file = folder ? null : it.getAsFile();
|
||||||
|
itemsArray.push({ file, isFolder: folder });
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
for (let i = 0; i < dt.files.length; i++) {
|
||||||
|
const f = dt.files[i];
|
||||||
|
if (f) itemsArray.push({ file: f, isFolder: false });
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
let remainingSlots = MAX_ATTACHMENTS - attachments.length;
|
||||||
|
let folderRejected = false;
|
||||||
|
for (const { file, isFolder } of itemsArray) {
|
||||||
|
if (isFolder) {
|
||||||
|
if (!folderRejected) {
|
||||||
|
toast.error('Folders are not supported');
|
||||||
|
folderRejected = true;
|
||||||
|
}
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
if (!file) continue;
|
||||||
|
if (remainingSlots <= 0) {
|
||||||
|
toast.error(`Attachment limit reached (${MAX_ATTACHMENTS}).`);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
await processDroppedFile(file);
|
||||||
|
remainingSlots -= 1;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function onDragEnter(e: DragEvent<HTMLDivElement>) {
|
||||||
|
if (disabled || busy) return;
|
||||||
|
e.preventDefault();
|
||||||
|
setIsDraggingOver(true);
|
||||||
|
}
|
||||||
|
|
||||||
|
function onDragOver(e: DragEvent<HTMLDivElement>) {
|
||||||
|
if (disabled || busy) return;
|
||||||
|
e.preventDefault();
|
||||||
|
e.dataTransfer.dropEffect = 'copy';
|
||||||
|
}
|
||||||
|
|
||||||
|
function onDragLeave(e: DragEvent<HTMLDivElement>) {
|
||||||
|
// Only clear when the cursor actually leaves the root container.
|
||||||
|
// relatedTarget is the element being entered; if it's inside the root,
|
||||||
|
// ignore — we're just crossing into a child.
|
||||||
|
const root = dropRootRef.current;
|
||||||
|
if (!root) return;
|
||||||
|
const related = e.relatedTarget as Node | null;
|
||||||
|
if (related && root.contains(related)) return;
|
||||||
|
setIsDraggingOver(false);
|
||||||
|
}
|
||||||
|
|
||||||
|
function onDrop(e: DragEvent<HTMLDivElement>) {
|
||||||
|
e.preventDefault();
|
||||||
|
setIsDraggingOver(false);
|
||||||
|
if (disabled || busy) return;
|
||||||
|
void handleDroppedItems(e.dataTransfer);
|
||||||
|
}
|
||||||
|
// ---- end Drag & drop -----------------------------------------------------
|
||||||
|
|
||||||
|
// ---- Paste-as-attachment (F2) -------------------------------------------
|
||||||
|
// Pasting >PASTE_INLINE_MAX_LINES lines of text becomes a chip rather than
|
||||||
|
// inline content. Image pastes are rejected with a toast. If both text and
|
||||||
|
// image are present (e.g. screenshot tool that sets both), prefer text.
|
||||||
|
|
||||||
|
function onPaste(e: React.ClipboardEvent<HTMLTextAreaElement>) {
|
||||||
|
const cd = e.clipboardData;
|
||||||
|
if (!cd) return;
|
||||||
|
const text = cd.getData('text/plain');
|
||||||
|
const hasImage = Array.from(cd.items ?? []).some((it) =>
|
||||||
|
it.type.startsWith('image/'),
|
||||||
|
);
|
||||||
|
if (text) {
|
||||||
|
const lineCount = text.split('\n').length;
|
||||||
|
if (lineCount > PASTE_INLINE_MAX_LINES) {
|
||||||
|
e.preventDefault();
|
||||||
|
pasteCounterRef.current += 1;
|
||||||
|
addAttachment({
|
||||||
|
id: crypto.randomUUID(),
|
||||||
|
kind: 'paste',
|
||||||
|
filename: `pasted-${pasteCounterRef.current}.txt`,
|
||||||
|
language: 'plaintext',
|
||||||
|
content: text,
|
||||||
|
source: 'paste',
|
||||||
|
});
|
||||||
|
}
|
||||||
|
// <= threshold: let default paste insert inline.
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
if (hasImage) {
|
||||||
|
e.preventDefault();
|
||||||
|
toast.error('Image paste is not supported. Drop a file or paste text.');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
// ---- end Paste-as-attachment --------------------------------------------
|
||||||
|
|
||||||
function onKeyDown(e: KeyboardEvent<HTMLTextAreaElement>) {
|
function onKeyDown(e: KeyboardEvent<HTMLTextAreaElement>) {
|
||||||
if (mentionState?.open) return;
|
if (mentionState?.open) return;
|
||||||
|
// IME safety: never act on Enter while an IME composition is in flight
|
||||||
|
// (CJK input methods commit composition via Enter). Without this, the
|
||||||
|
// first Enter of a Japanese/Chinese/Korean composition would submit
|
||||||
|
// instead of finalizing the candidate.
|
||||||
|
if (e.nativeEvent.isComposing) return;
|
||||||
if (e.key === 'Enter' && e.shiftKey && (e.metaKey || e.ctrlKey) && onForceSend) {
|
if (e.key === 'Enter' && e.shiftKey && (e.metaKey || e.ctrlKey) && onForceSend) {
|
||||||
e.preventDefault();
|
e.preventDefault();
|
||||||
void forceSubmit();
|
void forceSubmit();
|
||||||
@@ -195,7 +376,9 @@ export function ChatInput({ disabled, projectId, onSend, onForceSend }: Props) {
|
|||||||
void submit();
|
void submit();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (e.key === 'Enter' && !e.shiftKey) {
|
// Bare Enter: sends on desktop, inserts a newline on mobile (per spec —
|
||||||
|
// send is via the dedicated button on touch devices).
|
||||||
|
if (e.key === 'Enter' && !e.shiftKey && !isMobile) {
|
||||||
e.preventDefault();
|
e.preventDefault();
|
||||||
void submit();
|
void submit();
|
||||||
}
|
}
|
||||||
@@ -219,7 +402,16 @@ export function ChatInput({ disabled, projectId, onSend, onForceSend }: Props) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className="border-t">
|
<div
|
||||||
|
ref={dropRootRef}
|
||||||
|
className="border-t relative"
|
||||||
|
style={{ paddingBottom: 'env(safe-area-inset-bottom)' }}
|
||||||
|
onDragEnter={onDragEnter}
|
||||||
|
onDragOver={onDragOver}
|
||||||
|
onDragLeave={onDragLeave}
|
||||||
|
onDrop={onDrop}
|
||||||
|
>
|
||||||
|
<DropOverlay visible={isDraggingOver} />
|
||||||
<div className="max-w-[1000px] mx-auto w-full">
|
<div className="max-w-[1000px] mx-auto w-full">
|
||||||
{attachments.length > 0 && (
|
{attachments.length > 0 && (
|
||||||
<div className="flex flex-wrap gap-1.5 px-4 pt-3">
|
<div className="flex flex-wrap gap-1.5 px-4 pt-3">
|
||||||
@@ -233,13 +425,30 @@ export function ChatInput({ disabled, projectId, onSend, onForceSend }: Props) {
|
|||||||
))}
|
))}
|
||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
|
{/* Batch 9 toolbar — agent picker. Sits above the input row so it
|
||||||
|
doesn't compete with the send button for vertical alignment.
|
||||||
|
When Batch 7 lands, ModelPicker and the + button join this row. */}
|
||||||
|
{onAgentChange && (
|
||||||
|
<div className="px-4 pt-2 flex items-center gap-1.5">
|
||||||
|
<AgentPicker
|
||||||
|
projectId={projectId}
|
||||||
|
value={agentId ?? null}
|
||||||
|
onChange={onAgentChange}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
<div className="px-4 py-3 flex items-end gap-2">
|
<div className="px-4 py-3 flex items-end gap-2">
|
||||||
<Textarea
|
<Textarea
|
||||||
ref={textareaRef}
|
ref={textareaRef}
|
||||||
value={value}
|
value={value}
|
||||||
onChange={handleChange}
|
onChange={handleChange}
|
||||||
onKeyDown={onKeyDown}
|
onKeyDown={onKeyDown}
|
||||||
placeholder="Ask about this project. Enter to send, Shift+Enter for newline."
|
onPaste={onPaste}
|
||||||
|
placeholder={
|
||||||
|
isMobile
|
||||||
|
? 'Ask about this project. Tap send to submit.'
|
||||||
|
: 'Ask about this project. Enter to send · Shift+Enter for newline.'
|
||||||
|
}
|
||||||
disabled={disabled || busy}
|
disabled={disabled || busy}
|
||||||
rows={3}
|
rows={3}
|
||||||
className="resize-none min-h-[68px] max-h-[240px]"
|
className="resize-none min-h-[68px] max-h-[240px]"
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
import { useState } from 'react';
|
import { useState } from 'react';
|
||||||
import { History, MessageSquare, Plus, X } from 'lucide-react';
|
import { History, MessageSquare, Plus, X } from 'lucide-react';
|
||||||
import type { Chat, WorkspacePane } from '@/api/types';
|
import type { Chat, WorkspacePane } from '@/api/types';
|
||||||
|
import { StatusDot } from '@/components/StatusDot';
|
||||||
import {
|
import {
|
||||||
ContextMenu,
|
ContextMenu,
|
||||||
ContextMenuContent,
|
ContextMenuContent,
|
||||||
@@ -8,6 +9,7 @@ import {
|
|||||||
ContextMenuSeparator,
|
ContextMenuSeparator,
|
||||||
ContextMenuTrigger,
|
ContextMenuTrigger,
|
||||||
} from '@/components/ui/context-menu';
|
} from '@/components/ui/context-menu';
|
||||||
|
import { useLongPress } from '@/hooks/useLongPress';
|
||||||
import { cn } from '@/lib/utils';
|
import { cn } from '@/lib/utils';
|
||||||
|
|
||||||
interface Props {
|
interface Props {
|
||||||
@@ -40,6 +42,18 @@ export function ChatTabBar({
|
|||||||
const [renamingId, setRenamingId] = useState<string | null>(null);
|
const [renamingId, setRenamingId] = useState<string | null>(null);
|
||||||
const [renameValue, setRenameValue] = useState('');
|
const [renameValue, setRenameValue] = useState('');
|
||||||
|
|
||||||
|
// Long-press: dispatch a synthetic contextmenu event on the tab so the
|
||||||
|
// existing Radix ContextMenuTrigger opens at the touch coordinates. Works
|
||||||
|
// because asChild composition makes the tab div the trigger element.
|
||||||
|
const longPress = useLongPress(({ clientX, clientY, target }) => {
|
||||||
|
if (!target || !(target instanceof Element)) return;
|
||||||
|
const tab = target.closest('[data-tab-id]') as HTMLElement | null;
|
||||||
|
if (!tab) return;
|
||||||
|
tab.dispatchEvent(
|
||||||
|
new MouseEvent('contextmenu', { bubbles: true, cancelable: true, clientX, clientY }),
|
||||||
|
);
|
||||||
|
});
|
||||||
|
|
||||||
function startRename(chatId: string, currentName: string | null) {
|
function startRename(chatId: string, currentName: string | null) {
|
||||||
setRenamingId(chatId);
|
setRenamingId(chatId);
|
||||||
setRenameValue(currentName ?? '');
|
setRenameValue(currentName ?? '');
|
||||||
@@ -53,7 +67,7 @@ export function ChatTabBar({
|
|||||||
}
|
}
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className="flex items-center border-b border-border bg-muted/20 h-8 shrink-0 overflow-x-auto">
|
<div className="flex items-center border-b border-border bg-muted/20 h-8 shrink-0 overflow-x-auto max-md:hidden">
|
||||||
{tabs.map((chat, tabIdx) => {
|
{tabs.map((chat, tabIdx) => {
|
||||||
const isActive = tabIdx === pane.activeChatIdx;
|
const isActive = tabIdx === pane.activeChatIdx;
|
||||||
const isLast = tabIdx === tabs.length - 1;
|
const isLast = tabIdx === tabs.length - 1;
|
||||||
@@ -63,7 +77,13 @@ export function ChatTabBar({
|
|||||||
<ContextMenu key={chat.id}>
|
<ContextMenu key={chat.id}>
|
||||||
<ContextMenuTrigger asChild>
|
<ContextMenuTrigger asChild>
|
||||||
<div
|
<div
|
||||||
|
data-tab-id={chat.id}
|
||||||
onClick={() => onSwitchTab(tabIdx)}
|
onClick={() => onSwitchTab(tabIdx)}
|
||||||
|
onTouchStart={longPress.onTouchStart}
|
||||||
|
onTouchMove={longPress.onTouchMove}
|
||||||
|
onTouchEnd={longPress.onTouchEnd}
|
||||||
|
onTouchCancel={longPress.onTouchCancel}
|
||||||
|
style={{ WebkitTouchCallout: 'none' }}
|
||||||
className={cn(
|
className={cn(
|
||||||
'group flex items-center gap-1.5 px-3 py-1.5 text-xs border-r border-border cursor-default select-none shrink-0',
|
'group flex items-center gap-1.5 px-3 py-1.5 text-xs border-r border-border cursor-default select-none shrink-0',
|
||||||
isActive
|
isActive
|
||||||
@@ -72,6 +92,7 @@ export function ChatTabBar({
|
|||||||
)}
|
)}
|
||||||
>
|
>
|
||||||
<MessageSquare size={12} className="shrink-0" />
|
<MessageSquare size={12} className="shrink-0" />
|
||||||
|
<StatusDot chatId={chat.id} />
|
||||||
{renamingId === chat.id ? (
|
{renamingId === chat.id ? (
|
||||||
<input
|
<input
|
||||||
autoFocus
|
autoFocus
|
||||||
@@ -96,7 +117,7 @@ export function ChatTabBar({
|
|||||||
e.stopPropagation();
|
e.stopPropagation();
|
||||||
onRemoveTab(chat.id);
|
onRemoveTab(chat.id);
|
||||||
}}
|
}}
|
||||||
className="p-0.5 hover:bg-muted rounded opacity-0 group-hover:opacity-60 hover:!opacity-100 shrink-0"
|
className="inline-flex items-center justify-center p-0.5 hover:bg-muted rounded opacity-0 group-hover:opacity-60 hover:!opacity-100 shrink-0 max-md:min-h-[44px] max-md:min-w-[44px] max-md:opacity-100"
|
||||||
aria-label="Close tab"
|
aria-label="Close tab"
|
||||||
>
|
>
|
||||||
<X size={10} />
|
<X size={10} />
|
||||||
@@ -104,6 +125,10 @@ export function ChatTabBar({
|
|||||||
</div>
|
</div>
|
||||||
</ContextMenuTrigger>
|
</ContextMenuTrigger>
|
||||||
<ContextMenuContent>
|
<ContextMenuContent>
|
||||||
|
<ContextMenuItem onSelect={() => onNewChat()}>
|
||||||
|
New chat
|
||||||
|
</ContextMenuItem>
|
||||||
|
<ContextMenuSeparator />
|
||||||
<ContextMenuItem onSelect={() => startRename(chat.id, chat.name)}>
|
<ContextMenuItem onSelect={() => startRename(chat.id, chat.name)}>
|
||||||
Rename
|
Rename
|
||||||
</ContextMenuItem>
|
</ContextMenuItem>
|
||||||
@@ -142,7 +167,7 @@ export function ChatTabBar({
|
|||||||
<button
|
<button
|
||||||
type="button"
|
type="button"
|
||||||
onClick={onNewChat}
|
onClick={onNewChat}
|
||||||
className="p-1 rounded text-muted-foreground hover:bg-muted hover:text-foreground"
|
className="inline-flex items-center justify-center p-1 rounded text-muted-foreground hover:bg-muted hover:text-foreground max-md:min-h-[44px] max-md:min-w-[44px]"
|
||||||
aria-label="New chat"
|
aria-label="New chat"
|
||||||
title="New chat"
|
title="New chat"
|
||||||
>
|
>
|
||||||
@@ -152,7 +177,7 @@ export function ChatTabBar({
|
|||||||
type="button"
|
type="button"
|
||||||
onClick={onShowHistory}
|
onClick={onShowHistory}
|
||||||
className={cn(
|
className={cn(
|
||||||
'p-1 rounded text-muted-foreground hover:bg-muted hover:text-foreground',
|
'inline-flex items-center justify-center p-1 rounded text-muted-foreground hover:bg-muted hover:text-foreground max-md:min-h-[44px] max-md:min-w-[44px]',
|
||||||
pane.kind === 'empty' && 'text-foreground bg-muted/50'
|
pane.kind === 'empty' && 'text-foreground bg-muted/50'
|
||||||
)}
|
)}
|
||||||
aria-label="Session history"
|
aria-label="Session history"
|
||||||
@@ -164,7 +189,7 @@ export function ChatTabBar({
|
|||||||
<button
|
<button
|
||||||
type="button"
|
type="button"
|
||||||
onClick={onRemovePane}
|
onClick={onRemovePane}
|
||||||
className="p-1 rounded text-muted-foreground hover:bg-muted hover:text-foreground"
|
className="inline-flex items-center justify-center p-1 rounded text-muted-foreground hover:bg-muted hover:text-foreground max-md:min-h-[44px] max-md:min-w-[44px]"
|
||||||
aria-label="Close pane"
|
aria-label="Close pane"
|
||||||
title="Close pane"
|
title="Close pane"
|
||||||
>
|
>
|
||||||
|
|||||||
@@ -103,7 +103,7 @@ export function CreateProjectModal({ open, onOpenChange }: Props) {
|
|||||||
/>
|
/>
|
||||||
{name && (
|
{name && (
|
||||||
<div className="text-xs text-muted-foreground font-mono">
|
<div className="text-xs text-muted-foreground font-mono">
|
||||||
Folder: /opt/{folderPreview || <span className="text-destructive">(empty after sanitization)</span>}
|
Folder: /opt/projects/{folderPreview || <span className="text-destructive">(empty after sanitization)</span>}
|
||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
18
apps/web/src/components/DropOverlay.tsx
Normal file
18
apps/web/src/components/DropOverlay.tsx
Normal file
@@ -0,0 +1,18 @@
|
|||||||
|
interface Props {
|
||||||
|
visible: boolean;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Visual cue layered over the ChatInput while a drag is in progress.
|
||||||
|
// Pointer-events: none so the underlying drop handler still receives the
|
||||||
|
// drop event. Renders nothing when not visible (cheap and out of layout).
|
||||||
|
export function DropOverlay({ visible }: Props) {
|
||||||
|
if (!visible) return null;
|
||||||
|
return (
|
||||||
|
<div
|
||||||
|
className="absolute inset-0 z-10 pointer-events-none flex items-center justify-center rounded border-2 border-dashed border-primary bg-background/85"
|
||||||
|
aria-hidden="true"
|
||||||
|
>
|
||||||
|
<div className="text-sm font-medium text-primary">Drop to attach</div>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
@@ -266,11 +266,11 @@ function ActionRow({
|
|||||||
|
|
||||||
return (
|
return (
|
||||||
<>
|
<>
|
||||||
<div className="flex gap-1 opacity-0 group-hover:opacity-100 transition-opacity">
|
<div className="flex gap-1 opacity-0 group-hover:opacity-100 transition-opacity max-md:opacity-100">
|
||||||
<button
|
<button
|
||||||
type="button"
|
type="button"
|
||||||
onClick={() => void copy()}
|
onClick={() => void copy()}
|
||||||
className="inline-flex items-center justify-center size-6 rounded text-muted-foreground hover:bg-muted hover:text-foreground"
|
className="inline-flex items-center justify-center size-6 rounded text-muted-foreground hover:bg-muted hover:text-foreground max-md:min-h-[44px] max-md:min-w-[44px]"
|
||||||
aria-label="Copy message"
|
aria-label="Copy message"
|
||||||
title="Copy"
|
title="Copy"
|
||||||
>
|
>
|
||||||
@@ -281,7 +281,7 @@ function ActionRow({
|
|||||||
type="button"
|
type="button"
|
||||||
onClick={() => void regenerate()}
|
onClick={() => void regenerate()}
|
||||||
disabled={!canRegen || regenerating}
|
disabled={!canRegen || regenerating}
|
||||||
className="inline-flex items-center justify-center size-6 rounded text-muted-foreground hover:bg-muted hover:text-foreground disabled:opacity-40 disabled:cursor-not-allowed"
|
className="inline-flex items-center justify-center size-6 rounded text-muted-foreground hover:bg-muted hover:text-foreground disabled:opacity-40 disabled:cursor-not-allowed max-md:min-h-[44px] max-md:min-w-[44px]"
|
||||||
aria-label="Regenerate message"
|
aria-label="Regenerate message"
|
||||||
title="Regenerate"
|
title="Regenerate"
|
||||||
>
|
>
|
||||||
@@ -292,7 +292,7 @@ function ActionRow({
|
|||||||
type="button"
|
type="button"
|
||||||
onClick={() => void fork()}
|
onClick={() => void fork()}
|
||||||
disabled={!canFork || forking}
|
disabled={!canFork || forking}
|
||||||
className="inline-flex items-center justify-center size-6 rounded text-muted-foreground hover:bg-muted hover:text-foreground disabled:opacity-40 disabled:cursor-not-allowed"
|
className="inline-flex items-center justify-center size-6 rounded text-muted-foreground hover:bg-muted hover:text-foreground disabled:opacity-40 disabled:cursor-not-allowed max-md:min-h-[44px] max-md:min-w-[44px]"
|
||||||
aria-label="Fork from here"
|
aria-label="Fork from here"
|
||||||
title="Fork from here"
|
title="Fork from here"
|
||||||
>
|
>
|
||||||
@@ -302,7 +302,7 @@ function ActionRow({
|
|||||||
type="button"
|
type="button"
|
||||||
onClick={() => setDeleteOpen(true)}
|
onClick={() => setDeleteOpen(true)}
|
||||||
disabled={!canDelete}
|
disabled={!canDelete}
|
||||||
className="inline-flex items-center justify-center size-6 rounded text-muted-foreground hover:bg-muted hover:text-destructive disabled:opacity-40 disabled:cursor-not-allowed"
|
className="inline-flex items-center justify-center size-6 rounded text-muted-foreground hover:bg-muted hover:text-destructive disabled:opacity-40 disabled:cursor-not-allowed max-md:min-h-[44px] max-md:min-w-[44px]"
|
||||||
aria-label="Delete message"
|
aria-label="Delete message"
|
||||||
title="Delete message"
|
title="Delete message"
|
||||||
>
|
>
|
||||||
@@ -476,7 +476,7 @@ export function MessageBubble({ message, sessionChats }: Props) {
|
|||||||
if (message.role === 'user') {
|
if (message.role === 'user') {
|
||||||
return (
|
return (
|
||||||
<div className="group flex flex-col items-end gap-1">
|
<div className="group flex flex-col items-end gap-1">
|
||||||
<div className="max-w-[80%] rounded-lg bg-primary text-primary-foreground px-3 py-2 text-sm whitespace-pre-wrap">
|
<div className="max-w-[80%] rounded-lg bg-primary text-primary-foreground px-3 py-2 text-sm whitespace-pre-wrap break-words min-w-0">
|
||||||
{message.content}
|
{message.content}
|
||||||
</div>
|
</div>
|
||||||
<ActionRow message={message} />
|
<ActionRow message={message} />
|
||||||
@@ -495,7 +495,7 @@ export function MessageBubble({ message, sessionChats }: Props) {
|
|||||||
<ToolCallCard key={tc.id} toolCall={tc} />
|
<ToolCallCard key={tc.id} toolCall={tc} />
|
||||||
))}
|
))}
|
||||||
{(hasContent || (!hasToolCalls && isStreaming)) && (
|
{(hasContent || (!hasToolCalls && isStreaming)) && (
|
||||||
<div className="max-w-[90%] text-sm leading-relaxed space-y-2">
|
<div className="max-w-[90%] text-sm leading-relaxed space-y-2 break-words min-w-0">
|
||||||
{hasContent ? <MarkdownBody content={message.content} /> : null}
|
{hasContent ? <MarkdownBody content={message.content} /> : null}
|
||||||
{isStreaming && (
|
{isStreaming && (
|
||||||
<span className="inline-block w-1.5 h-3.5 align-baseline bg-muted-foreground/60 animate-pulse" />
|
<span className="inline-block w-1.5 h-3.5 align-baseline bg-muted-foreground/60 animate-pulse" />
|
||||||
|
|||||||
207
apps/web/src/components/MobileTabSwitcher.tsx
Normal file
207
apps/web/src/components/MobileTabSwitcher.tsx
Normal file
@@ -0,0 +1,207 @@
|
|||||||
|
import { useState } from 'react';
|
||||||
|
import {
|
||||||
|
Bot,
|
||||||
|
ChevronDown,
|
||||||
|
Edit2,
|
||||||
|
MessageSquare,
|
||||||
|
MoreHorizontal,
|
||||||
|
Terminal,
|
||||||
|
X,
|
||||||
|
} from 'lucide-react';
|
||||||
|
import { toast } from 'sonner';
|
||||||
|
import type { Chat, WorkspacePane } from '@/api/types';
|
||||||
|
import { BottomSheet } from '@/components/BottomSheet';
|
||||||
|
import { StatusDot } from '@/components/StatusDot';
|
||||||
|
import {
|
||||||
|
DropdownMenu,
|
||||||
|
DropdownMenuContent,
|
||||||
|
DropdownMenuItem,
|
||||||
|
DropdownMenuTrigger,
|
||||||
|
} from '@/components/ui/dropdown-menu';
|
||||||
|
import { useLongPress } from '@/hooks/useLongPress';
|
||||||
|
import { cn } from '@/lib/utils';
|
||||||
|
|
||||||
|
interface Props {
|
||||||
|
panes: WorkspacePane[];
|
||||||
|
activePaneIdx: number;
|
||||||
|
chats: Chat[];
|
||||||
|
onSwitchPane: (idx: number) => void;
|
||||||
|
onRemovePane: (idx: number) => void;
|
||||||
|
onRenameChat: (chatId: string, name: string) => Promise<void>;
|
||||||
|
}
|
||||||
|
|
||||||
|
function paneIcon(kind: WorkspacePane['kind']) {
|
||||||
|
if (kind === 'terminal') return <Terminal size={14} />;
|
||||||
|
if (kind === 'agent') return <Bot size={14} />;
|
||||||
|
return <MessageSquare size={14} />;
|
||||||
|
}
|
||||||
|
|
||||||
|
function paneActiveChatId(pane: WorkspacePane | undefined): string | null {
|
||||||
|
if (!pane) return null;
|
||||||
|
if (pane.chatId) return pane.chatId;
|
||||||
|
const idx = pane.activeChatIdx;
|
||||||
|
if (idx < 0 || idx >= pane.chatIds.length) return null;
|
||||||
|
return pane.chatIds[idx] ?? null;
|
||||||
|
}
|
||||||
|
|
||||||
|
function paneLabel(pane: WorkspacePane, chats: Chat[]): string {
|
||||||
|
const cid = paneActiveChatId(pane);
|
||||||
|
if (cid) {
|
||||||
|
const c = chats.find((x) => x.id === cid);
|
||||||
|
if (c) return c.name ?? 'New chat';
|
||||||
|
}
|
||||||
|
if (pane.kind === 'chat') return 'Chat';
|
||||||
|
if (pane.kind === 'terminal') return 'Terminal';
|
||||||
|
if (pane.kind === 'agent') return 'Agent';
|
||||||
|
return 'Empty';
|
||||||
|
}
|
||||||
|
|
||||||
|
export function MobileTabSwitcher({
|
||||||
|
panes,
|
||||||
|
activePaneIdx,
|
||||||
|
chats,
|
||||||
|
onSwitchPane,
|
||||||
|
onRemovePane,
|
||||||
|
onRenameChat,
|
||||||
|
}: Props) {
|
||||||
|
const [open, setOpen] = useState(false);
|
||||||
|
const [renamingChatId, setRenamingChatId] = useState<string | null>(null);
|
||||||
|
const [renameValue, setRenameValue] = useState('');
|
||||||
|
|
||||||
|
const active = panes[activePaneIdx];
|
||||||
|
const activeLabel = active ? paneLabel(active, chats) : 'Empty';
|
||||||
|
const activeChatId = paneActiveChatId(active);
|
||||||
|
|
||||||
|
// Long-press mirrors ChatTabBar: synthesize a contextmenu event on the row
|
||||||
|
// so the trailing kebab's Radix DropdownMenu opens at the touch point.
|
||||||
|
const longPress = useLongPress(({ clientX, clientY, target }) => {
|
||||||
|
if (!target || !(target instanceof Element)) return;
|
||||||
|
const row = target.closest('[data-pane-id]') as HTMLElement | null;
|
||||||
|
if (!row) return;
|
||||||
|
const trigger = row.querySelector('[data-pane-kebab]') as HTMLElement | null;
|
||||||
|
if (trigger) {
|
||||||
|
trigger.click();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
row.dispatchEvent(
|
||||||
|
new MouseEvent('contextmenu', { bubbles: true, cancelable: true, clientX, clientY }),
|
||||||
|
);
|
||||||
|
});
|
||||||
|
|
||||||
|
function startRename(chatId: string, currentName: string | null) {
|
||||||
|
setRenamingChatId(chatId);
|
||||||
|
setRenameValue(currentName ?? '');
|
||||||
|
}
|
||||||
|
async function finishRename() {
|
||||||
|
if (renamingChatId && renameValue.trim()) {
|
||||||
|
try {
|
||||||
|
await onRenameChat(renamingChatId, renameValue.trim());
|
||||||
|
} catch (err) {
|
||||||
|
toast.error(err instanceof Error ? err.message : 'rename failed');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
setRenamingChatId(null);
|
||||||
|
}
|
||||||
|
|
||||||
|
function handleSwitchPane(idx: number) {
|
||||||
|
onSwitchPane(idx);
|
||||||
|
setOpen(false);
|
||||||
|
}
|
||||||
|
|
||||||
|
return (
|
||||||
|
<>
|
||||||
|
<button
|
||||||
|
type="button"
|
||||||
|
onClick={() => setOpen(true)}
|
||||||
|
className="flex-1 inline-flex items-center gap-1.5 min-h-[44px] px-3 text-sm rounded-full bg-muted/40 hover:bg-muted/70 text-foreground min-w-0"
|
||||||
|
aria-label="Switch pane"
|
||||||
|
>
|
||||||
|
<span className="shrink-0 text-muted-foreground">{paneIcon(active?.kind ?? 'chat')}</span>
|
||||||
|
<StatusDot chatId={activeChatId} />
|
||||||
|
<span className="truncate flex-1 text-left">{activeLabel}</span>
|
||||||
|
<ChevronDown size={14} className="opacity-60 shrink-0" />
|
||||||
|
</button>
|
||||||
|
|
||||||
|
<BottomSheet open={open} onClose={() => setOpen(false)} title="Panes">
|
||||||
|
<ul className="px-2 py-2 space-y-1">
|
||||||
|
{panes.map((pane, idx) => {
|
||||||
|
const isActive = idx === activePaneIdx;
|
||||||
|
const cid = paneActiveChatId(pane);
|
||||||
|
const chat = cid ? chats.find((c) => c.id === cid) ?? null : null;
|
||||||
|
const label = paneLabel(pane, chats);
|
||||||
|
return (
|
||||||
|
<li
|
||||||
|
key={pane.id}
|
||||||
|
data-pane-id={pane.id}
|
||||||
|
onTouchStart={longPress.onTouchStart}
|
||||||
|
onTouchMove={longPress.onTouchMove}
|
||||||
|
onTouchEnd={longPress.onTouchEnd}
|
||||||
|
onTouchCancel={longPress.onTouchCancel}
|
||||||
|
onClick={() => handleSwitchPane(idx)}
|
||||||
|
style={{ WebkitTouchCallout: 'none' }}
|
||||||
|
className={cn(
|
||||||
|
'flex items-center gap-2 px-3 py-2 rounded min-h-[48px] cursor-default select-none',
|
||||||
|
isActive
|
||||||
|
? 'bg-accent/40 border-l-2 border-primary'
|
||||||
|
: 'hover:bg-muted/50',
|
||||||
|
)}
|
||||||
|
>
|
||||||
|
<span className="shrink-0 text-muted-foreground">{paneIcon(pane.kind)}</span>
|
||||||
|
<StatusDot chatId={cid ?? null} />
|
||||||
|
{renamingChatId === cid && cid ? (
|
||||||
|
<input
|
||||||
|
autoFocus
|
||||||
|
value={renameValue}
|
||||||
|
onChange={(e) => setRenameValue(e.target.value)}
|
||||||
|
onBlur={() => void finishRename()}
|
||||||
|
onKeyDown={(e) => {
|
||||||
|
if (e.key === 'Enter') void finishRename();
|
||||||
|
if (e.key === 'Escape') setRenamingChatId(null);
|
||||||
|
}}
|
||||||
|
onClick={(e) => e.stopPropagation()}
|
||||||
|
className="bg-transparent border-b border-border text-sm outline-none flex-1 min-w-0"
|
||||||
|
/>
|
||||||
|
) : (
|
||||||
|
<span className="truncate flex-1 text-sm">{label}</span>
|
||||||
|
)}
|
||||||
|
{isActive && (
|
||||||
|
<span aria-hidden="true" className="text-primary text-xs shrink-0">
|
||||||
|
✓
|
||||||
|
</span>
|
||||||
|
)}
|
||||||
|
<DropdownMenu>
|
||||||
|
<DropdownMenuTrigger asChild>
|
||||||
|
<button
|
||||||
|
type="button"
|
||||||
|
data-pane-kebab
|
||||||
|
onClick={(e) => e.stopPropagation()}
|
||||||
|
className="inline-flex items-center justify-center p-1 rounded text-muted-foreground hover:bg-muted hover:text-foreground min-h-[44px] min-w-[44px]"
|
||||||
|
aria-label="Pane options"
|
||||||
|
>
|
||||||
|
<MoreHorizontal size={14} />
|
||||||
|
</button>
|
||||||
|
</DropdownMenuTrigger>
|
||||||
|
<DropdownMenuContent align="end">
|
||||||
|
{chat && (
|
||||||
|
<DropdownMenuItem onSelect={() => startRename(chat.id, chat.name)}>
|
||||||
|
<Edit2 size={14} /> Rename chat
|
||||||
|
</DropdownMenuItem>
|
||||||
|
)}
|
||||||
|
<DropdownMenuItem
|
||||||
|
disabled={panes.length <= 1}
|
||||||
|
onSelect={() => onRemovePane(idx)}
|
||||||
|
>
|
||||||
|
<X size={14} /> Close pane
|
||||||
|
</DropdownMenuItem>
|
||||||
|
</DropdownMenuContent>
|
||||||
|
</DropdownMenu>
|
||||||
|
</li>
|
||||||
|
);
|
||||||
|
})}
|
||||||
|
</ul>
|
||||||
|
{/* v1.8: New-pane button moved out of the sheet to the header row 2
|
||||||
|
(see NewPaneMenu). Sheet is for switching only. */}
|
||||||
|
</BottomSheet>
|
||||||
|
</>
|
||||||
|
);
|
||||||
|
}
|
||||||
44
apps/web/src/components/NewPaneMenu.tsx
Normal file
44
apps/web/src/components/NewPaneMenu.tsx
Normal file
@@ -0,0 +1,44 @@
|
|||||||
|
import { Bot, MessageSquare, Plus, Terminal } from 'lucide-react';
|
||||||
|
import {
|
||||||
|
DropdownMenu,
|
||||||
|
DropdownMenuContent,
|
||||||
|
DropdownMenuItem,
|
||||||
|
DropdownMenuTrigger,
|
||||||
|
} from '@/components/ui/dropdown-menu';
|
||||||
|
|
||||||
|
interface Props {
|
||||||
|
onAddPane: (kind: 'chat' | 'terminal' | 'agent') => void;
|
||||||
|
disabled?: boolean;
|
||||||
|
}
|
||||||
|
|
||||||
|
// v1.8 row-2 right cluster: mirrors the desktop Workspace.tsx Split dropdown.
|
||||||
|
// Terminal and Agent items pass through to addSplitPane which already shows
|
||||||
|
// "coming soon" toasts; rendering them here matches the Batch 3 workspace
|
||||||
|
// model so the UI is forward-compatible with BooTerm/BooCoder.
|
||||||
|
export function NewPaneMenu({ onAddPane, disabled }: Props) {
|
||||||
|
return (
|
||||||
|
<DropdownMenu>
|
||||||
|
<DropdownMenuTrigger asChild>
|
||||||
|
<button
|
||||||
|
type="button"
|
||||||
|
disabled={disabled}
|
||||||
|
className="inline-flex items-center justify-center min-h-[44px] min-w-[44px] rounded-full bg-muted/40 hover:bg-muted/70 text-foreground disabled:opacity-40 disabled:cursor-not-allowed shrink-0"
|
||||||
|
aria-label="New pane"
|
||||||
|
>
|
||||||
|
<Plus size={16} />
|
||||||
|
</button>
|
||||||
|
</DropdownMenuTrigger>
|
||||||
|
<DropdownMenuContent align="end">
|
||||||
|
<DropdownMenuItem onSelect={() => onAddPane('chat')}>
|
||||||
|
<MessageSquare size={14} /> New chat
|
||||||
|
</DropdownMenuItem>
|
||||||
|
<DropdownMenuItem onSelect={() => onAddPane('terminal')}>
|
||||||
|
<Terminal size={14} /> New terminal
|
||||||
|
</DropdownMenuItem>
|
||||||
|
<DropdownMenuItem onSelect={() => onAddPane('agent')}>
|
||||||
|
<Bot size={14} /> New agent
|
||||||
|
</DropdownMenuItem>
|
||||||
|
</DropdownMenuContent>
|
||||||
|
</DropdownMenu>
|
||||||
|
);
|
||||||
|
}
|
||||||
@@ -19,8 +19,10 @@ import {
|
|||||||
} from '@/components/ui/dialog';
|
} from '@/components/ui/dialog';
|
||||||
import { AddProjectModal } from './AddProjectModal';
|
import { AddProjectModal } from './AddProjectModal';
|
||||||
import { api } from '@/api/client';
|
import { api } from '@/api/client';
|
||||||
import { sessionEvents } from '@/hooks/sessionEvents';
|
|
||||||
import { useSidebar } from '@/hooks/useSidebar';
|
import { useSidebar } from '@/hooks/useSidebar';
|
||||||
|
import { useSidebarDrawer } from '@/hooks/useSidebarDrawer';
|
||||||
|
import { useViewport } from '@/hooks/useViewport';
|
||||||
|
import { usePullToRefresh } from '@/hooks/usePullToRefresh';
|
||||||
import type { SidebarProject } from '@/api/types';
|
import type { SidebarProject } from '@/api/types';
|
||||||
import { giteaUrlFor } from '@/lib/projectUrls';
|
import { giteaUrlFor } from '@/lib/projectUrls';
|
||||||
import { cn } from '@/lib/utils';
|
import { cn } from '@/lib/utils';
|
||||||
@@ -186,7 +188,8 @@ export function ProjectSidebar() {
|
|||||||
if (!trimmed) return;
|
if (!trimmed) return;
|
||||||
try {
|
try {
|
||||||
await api.sessions.update(sessionId, { name: trimmed });
|
await api.sessions.update(sessionId, { name: trimmed });
|
||||||
sessionEvents.emit({ type: 'session_renamed', session_id: sessionId, name: trimmed });
|
// Server publishes session_renamed via broker.publishUser; useUserEvents
|
||||||
|
// forwards onto the bus. No local emit needed.
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
toast.error(err instanceof Error ? err.message : 'failed to rename session');
|
toast.error(err instanceof Error ? err.message : 'failed to rename session');
|
||||||
}
|
}
|
||||||
@@ -195,8 +198,24 @@ export function ProjectSidebar() {
|
|||||||
const rowCls = (active: boolean) =>
|
const rowCls = (active: boolean) =>
|
||||||
active ? 'bg-sidebar-accent text-sidebar-accent-foreground' : 'hover:bg-sidebar-accent/60';
|
active ? 'bg-sidebar-accent text-sidebar-accent-foreground' : 'hover:bg-sidebar-accent/60';
|
||||||
|
|
||||||
|
const { open: drawerOpen } = useSidebarDrawer();
|
||||||
|
const { isMobile } = useViewport();
|
||||||
|
const pull = usePullToRefresh(() => retry(), { enabled: isMobile });
|
||||||
|
|
||||||
|
// On mobile the sidebar is a slide-in drawer (fixed, z-40, off-screen by
|
||||||
|
// default). On desktop it sits inline as a normal flex column. The
|
||||||
|
// backdrop is rendered by AppShell; drawer-open state lives in
|
||||||
|
// SidebarDrawerProvider.
|
||||||
|
const asideCls = isMobile
|
||||||
|
? cn(
|
||||||
|
'fixed inset-y-0 left-0 z-40 w-60 border-r bg-sidebar text-sidebar-foreground flex flex-col',
|
||||||
|
'transition-transform duration-200 ease-out',
|
||||||
|
drawerOpen ? 'translate-x-0' : '-translate-x-full',
|
||||||
|
)
|
||||||
|
: 'w-60 shrink-0 border-r bg-sidebar text-sidebar-foreground flex flex-col h-screen';
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<aside className="w-60 shrink-0 border-r bg-sidebar text-sidebar-foreground flex flex-col h-screen">
|
<aside className={asideCls}>
|
||||||
<div className="px-4 py-3 border-b flex items-center justify-between">
|
<div className="px-4 py-3 border-b flex items-center justify-between">
|
||||||
<NavLink to="/" className="font-semibold tracking-tight text-base">
|
<NavLink to="/" className="font-semibold tracking-tight text-base">
|
||||||
BooCode
|
BooCode
|
||||||
@@ -206,7 +225,30 @@ export function ProjectSidebar() {
|
|||||||
</Button>
|
</Button>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<nav className="flex-1 overflow-y-auto py-2">
|
{isMobile && (pull.pullDist > 0 || pull.refreshing) && (
|
||||||
|
<div
|
||||||
|
className="flex items-center justify-center text-[10px] uppercase tracking-wide text-muted-foreground border-b overflow-hidden shrink-0"
|
||||||
|
style={{
|
||||||
|
height: pull.refreshing ? 32 : Math.min(pull.pullDist, 80),
|
||||||
|
transition: pull.pullDist === 0 && !pull.refreshing ? 'height 0.2s ease' : undefined,
|
||||||
|
}}
|
||||||
|
aria-live="polite"
|
||||||
|
>
|
||||||
|
{pull.refreshing
|
||||||
|
? 'Refreshing…'
|
||||||
|
: pull.pullDist >= 80
|
||||||
|
? 'Release to refresh'
|
||||||
|
: 'Pull to refresh'}
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
|
||||||
|
<nav
|
||||||
|
className="flex-1 overflow-y-auto py-2"
|
||||||
|
onTouchStart={isMobile ? pull.onTouchStart : undefined}
|
||||||
|
onTouchMove={isMobile ? pull.onTouchMove : undefined}
|
||||||
|
onTouchEnd={isMobile ? pull.onTouchEnd : undefined}
|
||||||
|
onTouchCancel={isMobile ? pull.onTouchEnd : undefined}
|
||||||
|
>
|
||||||
{loading && data == null && (
|
{loading && data == null && (
|
||||||
<div className="space-y-2 px-2">
|
<div className="space-y-2 px-2">
|
||||||
{[0, 1, 2, 3].map((i) => (
|
{[0, 1, 2, 3].map((i) => (
|
||||||
|
|||||||
@@ -4,8 +4,11 @@ import { api } from '@/api/client';
|
|||||||
import type { FileEntry } from '@/api/types';
|
import type { FileEntry } from '@/api/types';
|
||||||
import { inferLanguage } from '@/lib/attachments';
|
import { inferLanguage } from '@/lib/attachments';
|
||||||
import { sessionEvents } from '@/hooks/sessionEvents';
|
import { sessionEvents } from '@/hooks/sessionEvents';
|
||||||
|
import { useRightRailDrawer } from '@/hooks/useRightRailDrawer';
|
||||||
|
import { useViewport } from '@/hooks/useViewport';
|
||||||
import { FileViewerOverlay } from '@/components/FileViewerOverlay';
|
import { FileViewerOverlay } from '@/components/FileViewerOverlay';
|
||||||
import { Input } from '@/components/ui/input';
|
import { Input } from '@/components/ui/input';
|
||||||
|
import { cn } from '@/lib/utils';
|
||||||
|
|
||||||
interface Props {
|
interface Props {
|
||||||
projectId: string;
|
projectId: string;
|
||||||
@@ -25,6 +28,8 @@ function joinPath(parent: string, name: string): string {
|
|||||||
}
|
}
|
||||||
|
|
||||||
export function RightRail({ projectId }: Props) {
|
export function RightRail({ projectId }: Props) {
|
||||||
|
const { isMobile } = useViewport();
|
||||||
|
const { open: drawerOpen, setOpen: setDrawerOpen } = useRightRailDrawer();
|
||||||
const [open, setOpen] = useState(() => {
|
const [open, setOpen] = useState(() => {
|
||||||
try { return localStorage.getItem(`${STORAGE_KEY}.open`) !== 'false'; } catch { return true; }
|
try { return localStorage.getItem(`${STORAGE_KEY}.open`) !== 'false'; } catch { return true; }
|
||||||
});
|
});
|
||||||
@@ -34,7 +39,21 @@ export function RightRail({ projectId }: Props) {
|
|||||||
const [fullFileList, setFullFileList] = useState<string[] | null>(null);
|
const [fullFileList, setFullFileList] = useState<string[] | null>(null);
|
||||||
const [viewerFile, setViewerFile] = useState<{ path: string; content: string } | null>(null);
|
const [viewerFile, setViewerFile] = useState<{ path: string; content: string } | null>(null);
|
||||||
|
|
||||||
|
// Combined open state: on mobile use the global drawer state (toggled by
|
||||||
|
// the Session header's FolderTree button); on desktop use the persistent
|
||||||
|
// internal state.
|
||||||
|
const isOpen = isMobile ? drawerOpen : open;
|
||||||
|
const closeRail = useCallback(() => {
|
||||||
|
if (isMobile) setDrawerOpen(false);
|
||||||
|
else setOpen(false);
|
||||||
|
}, [isMobile, setDrawerOpen]);
|
||||||
|
const openRail = useCallback(() => {
|
||||||
|
if (isMobile) setDrawerOpen(true);
|
||||||
|
else setOpen(true);
|
||||||
|
}, [isMobile, setDrawerOpen]);
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
|
// best-effort; ignore failure because localStorage may be unavailable (quota, private mode)
|
||||||
try { localStorage.setItem(`${STORAGE_KEY}.open`, String(open)); } catch {}
|
try { localStorage.setItem(`${STORAGE_KEY}.open`, String(open)); } catch {}
|
||||||
}, [open]);
|
}, [open]);
|
||||||
|
|
||||||
@@ -55,9 +74,9 @@ export function RightRail({ projectId }: Props) {
|
|||||||
}, [projectId]);
|
}, [projectId]);
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if (!open) return;
|
if (!isOpen) return;
|
||||||
if (!cache.has('')) void loadDir('');
|
if (!cache.has('')) void loadDir('');
|
||||||
}, [open, cache, loadDir]);
|
}, [isOpen, cache, loadDir]);
|
||||||
|
|
||||||
function toggleDir(dirPath: string) {
|
function toggleDir(dirPath: string) {
|
||||||
setExpandedDirs((prev) => {
|
setExpandedDirs((prev) => {
|
||||||
@@ -107,12 +126,14 @@ export function RightRail({ projectId }: Props) {
|
|||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
return sessionEvents.subscribe((event) => {
|
return sessionEvents.subscribe((event) => {
|
||||||
if (event.type !== 'open_file_in_browser') return;
|
if (event.type !== 'open_file_in_browser') return;
|
||||||
if (!open) setOpen(true);
|
if (!isOpen) openRail();
|
||||||
void openFile(event.path);
|
void openFile(event.path);
|
||||||
});
|
});
|
||||||
}, [open, projectId]);
|
}, [isOpen, openRail, projectId]);
|
||||||
|
|
||||||
if (!open) {
|
// Desktop closed state: render the floating chevron handle. Mobile never
|
||||||
|
// shows the handle — the toggle lives in the Session header on mobile.
|
||||||
|
if (!isMobile && !open) {
|
||||||
return (
|
return (
|
||||||
<button
|
<button
|
||||||
type="button"
|
type="button"
|
||||||
@@ -127,15 +148,25 @@ export function RightRail({ projectId }: Props) {
|
|||||||
|
|
||||||
const rootEntries = cache.get('') ?? [];
|
const rootEntries = cache.get('') ?? [];
|
||||||
|
|
||||||
|
// Mobile: render as fixed-position right-side drawer (always mounted so
|
||||||
|
// the transform transition can animate in/out). Desktop: inline aside.
|
||||||
|
const asideCls = isMobile
|
||||||
|
? cn(
|
||||||
|
'fixed inset-y-0 right-0 z-40 w-[85vw] max-w-sm border-l bg-sidebar flex flex-col overflow-hidden',
|
||||||
|
'transition-transform duration-200 ease-out',
|
||||||
|
drawerOpen ? 'translate-x-0' : 'translate-x-full',
|
||||||
|
)
|
||||||
|
: 'w-64 shrink-0 border-l bg-sidebar flex flex-col h-full overflow-hidden';
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<>
|
<>
|
||||||
<aside className="w-64 shrink-0 border-l bg-sidebar flex flex-col h-full overflow-hidden">
|
<aside className={asideCls}>
|
||||||
<div className="flex items-center gap-2 px-3 py-2 border-b shrink-0">
|
<div className="flex items-center gap-2 px-3 py-2 border-b shrink-0">
|
||||||
<span className="text-xs font-medium flex-1">Files</span>
|
<span className="text-xs font-medium flex-1">Files</span>
|
||||||
<button
|
<button
|
||||||
type="button"
|
type="button"
|
||||||
onClick={() => setOpen(false)}
|
onClick={closeRail}
|
||||||
className="p-1 rounded hover:bg-muted text-muted-foreground"
|
className="p-1 rounded hover:bg-muted text-muted-foreground max-md:min-h-[44px] max-md:min-w-[44px]"
|
||||||
aria-label="Close file browser"
|
aria-label="Close file browser"
|
||||||
>
|
>
|
||||||
<PanelRightClose size={14} />
|
<PanelRightClose size={14} />
|
||||||
|
|||||||
36
apps/web/src/components/StatusDot.tsx
Normal file
36
apps/web/src/components/StatusDot.tsx
Normal file
@@ -0,0 +1,36 @@
|
|||||||
|
import { useChatStatus, type DerivedStatus } from '@/hooks/useChatStatus';
|
||||||
|
import { cn } from '@/lib/utils';
|
||||||
|
|
||||||
|
interface Props {
|
||||||
|
chatId: string | null | undefined;
|
||||||
|
className?: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
const STATUS_CLASS: Record<DerivedStatus, string> = {
|
||||||
|
working: 'bg-amber-500 animate-pulse',
|
||||||
|
idle_warm: 'bg-emerald-500',
|
||||||
|
idle_cold: 'bg-muted-foreground/40',
|
||||||
|
error: 'bg-destructive',
|
||||||
|
};
|
||||||
|
|
||||||
|
const STATUS_LABEL: Record<DerivedStatus, string> = {
|
||||||
|
working: 'working',
|
||||||
|
idle_warm: 'idle',
|
||||||
|
idle_cold: 'idle',
|
||||||
|
error: 'error',
|
||||||
|
};
|
||||||
|
|
||||||
|
export function StatusDot({ chatId, className }: Props) {
|
||||||
|
const status = useChatStatus(chatId);
|
||||||
|
return (
|
||||||
|
<span
|
||||||
|
aria-label={`Status: ${STATUS_LABEL[status]}`}
|
||||||
|
title={STATUS_LABEL[status]}
|
||||||
|
className={cn(
|
||||||
|
'inline-block w-1.5 h-1.5 rounded-full shrink-0',
|
||||||
|
STATUS_CLASS[status],
|
||||||
|
className,
|
||||||
|
)}
|
||||||
|
/>
|
||||||
|
);
|
||||||
|
}
|
||||||
103
apps/web/src/components/SwipeablePaneTab.tsx
Normal file
103
apps/web/src/components/SwipeablePaneTab.tsx
Normal file
@@ -0,0 +1,103 @@
|
|||||||
|
import { useRef, useState } from 'react';
|
||||||
|
import type { TouchEvent } from 'react';
|
||||||
|
import { cn } from '@/lib/utils';
|
||||||
|
|
||||||
|
interface Props {
|
||||||
|
label: string;
|
||||||
|
isActive: boolean;
|
||||||
|
onTap: () => void;
|
||||||
|
onClose: () => void;
|
||||||
|
canClose: boolean;
|
||||||
|
}
|
||||||
|
|
||||||
|
const CLOSE_THRESHOLD = 60;
|
||||||
|
const MAX_TRAVEL = 120;
|
||||||
|
const VERTICAL_BAIL = 30;
|
||||||
|
|
||||||
|
// Pane tab with horizontal swipe-to-close (mobile only). Tracks horizontal
|
||||||
|
// finger movement; if vertical exceeds VERTICAL_BAIL the gesture is cancelled
|
||||||
|
// (so vertical scroll still works). On release past CLOSE_THRESHOLD, the
|
||||||
|
// onClose callback fires. Otherwise the tab snaps back. Hand-rolled per spec.
|
||||||
|
export function SwipeablePaneTab({ label, isActive, onTap, onClose, canClose }: Props) {
|
||||||
|
const [translateX, setTranslateX] = useState(0);
|
||||||
|
const [dragging, setDragging] = useState(false);
|
||||||
|
const startRef = useRef<{ x: number; y: number; bailed: boolean } | null>(null);
|
||||||
|
|
||||||
|
const onTouchStart = (e: TouchEvent) => {
|
||||||
|
if (!canClose) return;
|
||||||
|
const t = e.touches[0];
|
||||||
|
if (!t) return;
|
||||||
|
startRef.current = { x: t.clientX, y: t.clientY, bailed: false };
|
||||||
|
setDragging(true);
|
||||||
|
};
|
||||||
|
|
||||||
|
const onTouchMove = (e: TouchEvent) => {
|
||||||
|
const start = startRef.current;
|
||||||
|
if (!start || start.bailed) return;
|
||||||
|
const t = e.touches[0];
|
||||||
|
if (!t) return;
|
||||||
|
const dx = t.clientX - start.x;
|
||||||
|
const dy = t.clientY - start.y;
|
||||||
|
if (Math.abs(dy) > VERTICAL_BAIL) {
|
||||||
|
start.bailed = true;
|
||||||
|
setTranslateX(0);
|
||||||
|
setDragging(false);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
if (dx < 0) {
|
||||||
|
setTranslateX(Math.max(dx, -MAX_TRAVEL));
|
||||||
|
} else {
|
||||||
|
setTranslateX(0);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
const onTouchEnd = () => {
|
||||||
|
const start = startRef.current;
|
||||||
|
startRef.current = null;
|
||||||
|
setDragging(false);
|
||||||
|
if (!start || start.bailed) {
|
||||||
|
setTranslateX(0);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
const tx = translateX;
|
||||||
|
if (tx <= -CLOSE_THRESHOLD) {
|
||||||
|
onClose();
|
||||||
|
// Don't reset translateX; the parent will unmount this tab.
|
||||||
|
} else {
|
||||||
|
setTranslateX(0);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
// Opacity fades from 1 -> 0.4 as the tab approaches the close threshold.
|
||||||
|
const opacity =
|
||||||
|
translateX < 0
|
||||||
|
? Math.max(0.4, 1 - (Math.abs(translateX) / CLOSE_THRESHOLD) * 0.6)
|
||||||
|
: 1;
|
||||||
|
|
||||||
|
return (
|
||||||
|
<button
|
||||||
|
type="button"
|
||||||
|
onClick={onTap}
|
||||||
|
onTouchStart={onTouchStart}
|
||||||
|
onTouchMove={onTouchMove}
|
||||||
|
onTouchEnd={onTouchEnd}
|
||||||
|
onTouchCancel={onTouchEnd}
|
||||||
|
style={{
|
||||||
|
transform: `translateX(${translateX}px)`,
|
||||||
|
opacity,
|
||||||
|
// Only animate when releasing (snap-back); during drag the transform
|
||||||
|
// tracks the finger 1:1 for a tight feel.
|
||||||
|
transition: dragging ? undefined : 'transform 0.15s ease, opacity 0.15s ease',
|
||||||
|
}}
|
||||||
|
className={cn(
|
||||||
|
'shrink-0 px-3 py-2 text-xs rounded min-h-[44px] min-w-[44px]',
|
||||||
|
isActive
|
||||||
|
? 'bg-background text-foreground border'
|
||||||
|
: 'text-muted-foreground hover:bg-muted/40',
|
||||||
|
)}
|
||||||
|
aria-current={isActive ? 'true' : undefined}
|
||||||
|
>
|
||||||
|
<span className="truncate max-w-[140px] inline-block">{label}</span>
|
||||||
|
</button>
|
||||||
|
);
|
||||||
|
}
|
||||||
@@ -1,8 +1,8 @@
|
|||||||
import { useCallback } from 'react';
|
|
||||||
import { PanelRight, MessageSquare, Terminal, Bot } from 'lucide-react';
|
import { PanelRight, MessageSquare, Terminal, Bot } from 'lucide-react';
|
||||||
import type { Chat, WorkspacePane } from '@/api/types';
|
import type { Chat, WorkspacePane } from '@/api/types';
|
||||||
import { useWorkspacePanes, MAX_PANES } from '@/hooks/useWorkspacePanes';
|
import { MAX_PANES, type UseWorkspacePanesResult } from '@/hooks/useWorkspacePanes';
|
||||||
import { useSessionChats } from '@/hooks/useSessionChats';
|
import type { UseSessionChatsResult } from '@/hooks/useSessionChats';
|
||||||
|
import { useViewport } from '@/hooks/useViewport';
|
||||||
import { ChatPane } from '@/components/panes/ChatPane';
|
import { ChatPane } from '@/components/panes/ChatPane';
|
||||||
import { ChatTabBar } from '@/components/ChatTabBar';
|
import { ChatTabBar } from '@/components/ChatTabBar';
|
||||||
import { SessionLandingPage } from '@/components/SessionLandingPage';
|
import { SessionLandingPage } from '@/components/SessionLandingPage';
|
||||||
@@ -17,14 +17,27 @@ import { cn } from '@/lib/utils';
|
|||||||
interface Props {
|
interface Props {
|
||||||
sessionId: string;
|
sessionId: string;
|
||||||
projectId: string;
|
projectId: string;
|
||||||
|
// Batch 9: threaded down to ChatPane → ChatInput → AgentPicker.
|
||||||
|
agentId?: string | null;
|
||||||
|
onAgentChange?: (agentId: string | null) => void | Promise<void>;
|
||||||
|
// v1.8: panes + chats hoisted into Session.tsx so the mobile header pill
|
||||||
|
// (MobileTabSwitcher) can share state with the pane grid.
|
||||||
|
panesHook: UseWorkspacePanesResult;
|
||||||
|
chatsHook: UseSessionChatsResult;
|
||||||
}
|
}
|
||||||
|
|
||||||
export function Workspace({ sessionId, projectId }: Props) {
|
export function Workspace({
|
||||||
|
sessionId,
|
||||||
|
projectId,
|
||||||
|
agentId,
|
||||||
|
onAgentChange,
|
||||||
|
panesHook,
|
||||||
|
chatsHook,
|
||||||
|
}: Props) {
|
||||||
const {
|
const {
|
||||||
panes,
|
panes,
|
||||||
activePaneIdx,
|
activePaneIdx,
|
||||||
setActivePaneIdx,
|
setActivePaneIdx,
|
||||||
activePaneIdxRef,
|
|
||||||
openChatInPane,
|
openChatInPane,
|
||||||
switchTab,
|
switchTab,
|
||||||
removeTab,
|
removeTab,
|
||||||
@@ -34,8 +47,6 @@ export function Workspace({ sessionId, projectId }: Props) {
|
|||||||
showLandingPage,
|
showLandingPage,
|
||||||
addSplitPane,
|
addSplitPane,
|
||||||
removePane,
|
removePane,
|
||||||
removeChatFromPanes,
|
|
||||||
initializeFirstChatIfEmpty,
|
|
||||||
handlePaneDragStart,
|
handlePaneDragStart,
|
||||||
handlePaneDragOver,
|
handlePaneDragOver,
|
||||||
handlePaneDragLeave,
|
handlePaneDragLeave,
|
||||||
@@ -43,15 +54,7 @@ export function Workspace({ sessionId, projectId }: Props) {
|
|||||||
handlePaneDragEnd,
|
handlePaneDragEnd,
|
||||||
dragOverIdx,
|
dragOverIdx,
|
||||||
draggingIdxRef,
|
draggingIdxRef,
|
||||||
} = useWorkspacePanes(sessionId);
|
} = panesHook;
|
||||||
|
|
||||||
// Thin wrapper so useSessionChats can route open_chat_in_active_pane events
|
|
||||||
// without knowing about pane indexing.
|
|
||||||
const openChatInActivePane = useCallback(
|
|
||||||
(chatId: string) => openChatInPane(activePaneIdxRef.current, chatId),
|
|
||||||
[openChatInPane, activePaneIdxRef],
|
|
||||||
);
|
|
||||||
|
|
||||||
const {
|
const {
|
||||||
chats,
|
chats,
|
||||||
createChat,
|
createChat,
|
||||||
@@ -60,12 +63,9 @@ export function Workspace({ sessionId, projectId }: Props) {
|
|||||||
deleteChat,
|
deleteChat,
|
||||||
renameChat,
|
renameChat,
|
||||||
handleLandingSend,
|
handleLandingSend,
|
||||||
} = useSessionChats(sessionId, {
|
} = chatsHook;
|
||||||
removeChatFromPanes,
|
|
||||||
openChatInPane,
|
const { isMobile } = useViewport();
|
||||||
openChatInActivePane,
|
|
||||||
initializeFirstChatIfEmpty,
|
|
||||||
});
|
|
||||||
|
|
||||||
function chatsForPane(pane: WorkspacePane): Chat[] {
|
function chatsForPane(pane: WorkspacePane): Chat[] {
|
||||||
return pane.chatIds
|
return pane.chatIds
|
||||||
@@ -75,78 +75,101 @@ export function Workspace({ sessionId, projectId }: Props) {
|
|||||||
|
|
||||||
return (
|
return (
|
||||||
<div className="flex flex-col h-full min-h-0">
|
<div className="flex flex-col h-full min-h-0">
|
||||||
<div className="flex items-center gap-2 border-b border-border bg-muted/20 px-3 py-1.5 shrink-0">
|
{!isMobile && (
|
||||||
<DropdownMenu>
|
<div className="flex items-center gap-2 border-b border-border bg-muted/20 px-3 py-1.5 shrink-0">
|
||||||
<DropdownMenuTrigger asChild>
|
<DropdownMenu>
|
||||||
<button
|
<DropdownMenuTrigger asChild>
|
||||||
type="button"
|
<button
|
||||||
disabled={panes.length >= MAX_PANES}
|
type="button"
|
||||||
className={cn(
|
disabled={panes.length >= MAX_PANES}
|
||||||
'flex items-center gap-1 text-xs px-2 py-1 rounded hover:bg-muted',
|
className={cn(
|
||||||
panes.length >= MAX_PANES && 'opacity-40 cursor-not-allowed hover:bg-transparent'
|
'flex items-center gap-1 text-xs px-2 py-1 rounded hover:bg-muted',
|
||||||
)}
|
panes.length >= MAX_PANES && 'opacity-40 cursor-not-allowed hover:bg-transparent'
|
||||||
>
|
)}
|
||||||
<PanelRight size={14} />
|
>
|
||||||
Split
|
<PanelRight size={14} />
|
||||||
</button>
|
Split
|
||||||
</DropdownMenuTrigger>
|
</button>
|
||||||
<DropdownMenuContent>
|
</DropdownMenuTrigger>
|
||||||
<DropdownMenuItem onSelect={() => addSplitPane('chat')}>
|
<DropdownMenuContent>
|
||||||
<MessageSquare size={14} /> Chat
|
<DropdownMenuItem onSelect={() => addSplitPane('chat')}>
|
||||||
</DropdownMenuItem>
|
<MessageSquare size={14} /> Chat
|
||||||
<DropdownMenuItem onSelect={() => addSplitPane('terminal')}>
|
</DropdownMenuItem>
|
||||||
<Terminal size={14} /> Terminal
|
<DropdownMenuItem onSelect={() => addSplitPane('terminal')}>
|
||||||
</DropdownMenuItem>
|
<Terminal size={14} /> Terminal
|
||||||
<DropdownMenuItem onSelect={() => addSplitPane('agent')}>
|
</DropdownMenuItem>
|
||||||
<Bot size={14} /> Agent
|
<DropdownMenuItem onSelect={() => addSplitPane('agent')}>
|
||||||
</DropdownMenuItem>
|
<Bot size={14} /> Agent
|
||||||
</DropdownMenuContent>
|
</DropdownMenuItem>
|
||||||
</DropdownMenu>
|
</DropdownMenuContent>
|
||||||
</div>
|
</DropdownMenu>
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
|
||||||
|
{/* v1.8: mobile multi-pane SwipeablePaneTab strip removed; the header
|
||||||
|
pill (MobileTabSwitcher) is the mobile pane switcher. */}
|
||||||
|
|
||||||
<div
|
<div
|
||||||
className="flex-1 grid min-h-0"
|
className={cn('flex-1 min-h-0', isMobile ? 'flex' : 'grid')}
|
||||||
style={{
|
style={
|
||||||
gridTemplateColumns: `repeat(${panes.length}, minmax(0, 1fr))`,
|
isMobile
|
||||||
}}
|
? undefined
|
||||||
|
: { gridTemplateColumns: `repeat(${panes.length}, minmax(0, 1fr))` }
|
||||||
|
}
|
||||||
>
|
>
|
||||||
{panes.map((pane, idx) => (
|
{panes.map((pane, idx) => {
|
||||||
|
const visible = !isMobile || idx === activePaneIdx;
|
||||||
|
if (!visible) return null;
|
||||||
|
return (
|
||||||
<div
|
<div
|
||||||
key={pane.id}
|
key={pane.id}
|
||||||
className={cn(
|
className={cn(
|
||||||
'flex flex-col h-full min-h-0 border-r border-border last:border-r-0 relative',
|
'flex flex-col h-full min-h-0 border-r border-border last:border-r-0 relative',
|
||||||
idx === activePaneIdx && 'ring-1 ring-inset ring-ring/20',
|
isMobile ? 'flex-1 w-full' : undefined,
|
||||||
dragOverIdx === idx && draggingIdxRef.current !== idx &&
|
!isMobile && idx === activePaneIdx && 'ring-1 ring-inset ring-ring/20',
|
||||||
|
!isMobile && dragOverIdx === idx && draggingIdxRef.current !== idx &&
|
||||||
'before:absolute before:inset-y-0 before:left-0 before:w-0.5 before:bg-primary before:z-10'
|
'before:absolute before:inset-y-0 before:left-0 before:w-0.5 before:bg-primary before:z-10'
|
||||||
)}
|
)}
|
||||||
onClick={() => setActivePaneIdx(idx)}
|
onClick={() => setActivePaneIdx(idx)}
|
||||||
onDragOver={panes.length > 1 ? handlePaneDragOver(idx) : undefined}
|
onDragOver={!isMobile && panes.length > 1 ? handlePaneDragOver(idx) : undefined}
|
||||||
onDragLeave={panes.length > 1 ? handlePaneDragLeave : undefined}
|
onDragLeave={!isMobile && panes.length > 1 ? handlePaneDragLeave : undefined}
|
||||||
onDrop={panes.length > 1 ? handlePaneDrop(idx) : undefined}
|
onDrop={!isMobile && panes.length > 1 ? handlePaneDrop(idx) : undefined}
|
||||||
>
|
>
|
||||||
<div
|
<div
|
||||||
draggable={panes.length > 1}
|
draggable={!isMobile && panes.length > 1}
|
||||||
onDragStart={panes.length > 1 ? handlePaneDragStart(idx) : undefined}
|
onDragStart={!isMobile && panes.length > 1 ? handlePaneDragStart(idx) : undefined}
|
||||||
onDragEnd={panes.length > 1 ? handlePaneDragEnd : undefined}
|
onDragEnd={!isMobile && panes.length > 1 ? handlePaneDragEnd : undefined}
|
||||||
>
|
>
|
||||||
<ChatTabBar
|
{/* Hidden on mobile per v1.8: chat-within-pane navigation
|
||||||
pane={pane}
|
is not exposed on small screens; users switch panes via
|
||||||
tabs={chatsForPane(pane)}
|
the header pill instead. */}
|
||||||
onSwitchTab={(tabIdx) => switchTab(idx, tabIdx)}
|
{!isMobile && (
|
||||||
onRemoveTab={(chatId) => removeTab(idx, chatId)}
|
<ChatTabBar
|
||||||
onCloseOthers={(chatId) => closeOtherTabs(idx, chatId)}
|
pane={pane}
|
||||||
onCloseToRight={(chatId) => closeTabsToRight(idx, chatId)}
|
tabs={chatsForPane(pane)}
|
||||||
onCloseAll={() => closeAllTabs(idx)}
|
onSwitchTab={(tabIdx) => switchTab(idx, tabIdx)}
|
||||||
onNewChat={() => void createChat(idx)}
|
onRemoveTab={(chatId) => removeTab(idx, chatId)}
|
||||||
onShowHistory={() => showLandingPage(idx)}
|
onCloseOthers={(chatId) => closeOtherTabs(idx, chatId)}
|
||||||
onRename={renameChat}
|
onCloseToRight={(chatId) => closeTabsToRight(idx, chatId)}
|
||||||
onRemovePane={panes.length > 1 ? () => removePane(idx) : undefined}
|
onCloseAll={() => closeAllTabs(idx)}
|
||||||
/>
|
onNewChat={() => void createChat(idx)}
|
||||||
|
onShowHistory={() => showLandingPage(idx)}
|
||||||
|
onRename={renameChat}
|
||||||
|
onRemovePane={panes.length > 1 ? () => removePane(idx) : undefined}
|
||||||
|
/>
|
||||||
|
)}
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div className="flex-1 min-h-0 overflow-hidden">
|
<div className="flex-1 min-h-0 overflow-hidden">
|
||||||
{pane.kind === 'chat' && pane.chatId ? (
|
{pane.kind === 'chat' && pane.chatId ? (
|
||||||
<ChatPane sessionId={sessionId} chatId={pane.chatId} projectId={projectId} sessionChats={chats} />
|
<ChatPane
|
||||||
|
sessionId={sessionId}
|
||||||
|
chatId={pane.chatId}
|
||||||
|
projectId={projectId}
|
||||||
|
agentId={agentId}
|
||||||
|
onAgentChange={onAgentChange}
|
||||||
|
sessionChats={chats}
|
||||||
|
/>
|
||||||
) : (
|
) : (
|
||||||
<SessionLandingPage
|
<SessionLandingPage
|
||||||
sessionId={sessionId}
|
sessionId={sessionId}
|
||||||
@@ -165,7 +188,8 @@ export function Workspace({ sessionId, projectId }: Props) {
|
|||||||
)}
|
)}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
))}
|
);
|
||||||
|
})}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -3,8 +3,10 @@ import { ChevronDown, Square, X } from 'lucide-react';
|
|||||||
import { toast } from 'sonner';
|
import { toast } from 'sonner';
|
||||||
import { api } from '@/api/client';
|
import { api } from '@/api/client';
|
||||||
import { useSessionStream } from '@/hooks/useSessionStream';
|
import { useSessionStream } from '@/hooks/useSessionStream';
|
||||||
|
import { useChatContextStats } from '@/hooks/useChatContextStats';
|
||||||
import { MessageList } from '@/components/MessageList';
|
import { MessageList } from '@/components/MessageList';
|
||||||
import { ChatInput } from '@/components/ChatInput';
|
import { ChatInput } from '@/components/ChatInput';
|
||||||
|
import { ChatContextPopover } from '@/components/ChatContextPopover';
|
||||||
import {
|
import {
|
||||||
DropdownMenu,
|
DropdownMenu,
|
||||||
DropdownMenuContent,
|
DropdownMenuContent,
|
||||||
@@ -16,10 +18,13 @@ interface Props {
|
|||||||
sessionId: string;
|
sessionId: string;
|
||||||
chatId: string;
|
chatId: string;
|
||||||
projectId: string;
|
projectId: string;
|
||||||
|
// Batch 9: optional, threaded down to ChatInput's agent picker.
|
||||||
|
agentId?: string | null;
|
||||||
|
onAgentChange?: (agentId: string | null) => void | Promise<void>;
|
||||||
sessionChats?: import('@/api/types').Chat[];
|
sessionChats?: import('@/api/types').Chat[];
|
||||||
}
|
}
|
||||||
|
|
||||||
export function ChatPane({ sessionId, chatId, projectId, sessionChats }: Props) {
|
export function ChatPane({ sessionId, chatId, projectId, agentId, onAgentChange, sessionChats }: Props) {
|
||||||
const stream = useSessionStream(sessionId);
|
const stream = useSessionStream(sessionId);
|
||||||
const lastErrorRef = useRef<string | null>(null);
|
const lastErrorRef = useRef<string | null>(null);
|
||||||
const [queue, setQueue] = useState<string[]>([]);
|
const [queue, setQueue] = useState<string[]>([]);
|
||||||
@@ -37,6 +42,7 @@ export function ChatPane({ sessionId, chatId, projectId, sessionChats }: Props)
|
|||||||
|
|
||||||
const chatMessages = stream.messages.filter((m) => m.chat_id === chatId);
|
const chatMessages = stream.messages.filter((m) => m.chat_id === chatId);
|
||||||
const streaming = chatMessages.some((m) => m.status === 'streaming');
|
const streaming = chatMessages.some((m) => m.status === 'streaming');
|
||||||
|
const contextStats = useChatContextStats(chatId, chatMessages);
|
||||||
|
|
||||||
// Auto-send next queued message when streaming completes
|
// Auto-send next queued message when streaming completes
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
@@ -117,7 +123,7 @@ export function ChatPane({ sessionId, chatId, projectId, sessionChats }: Props)
|
|||||||
<DropdownMenuTrigger asChild>
|
<DropdownMenuTrigger asChild>
|
||||||
<button
|
<button
|
||||||
type="button"
|
type="button"
|
||||||
className="p-0.5 hover:bg-muted rounded shrink-0"
|
className="inline-flex items-center justify-center p-0.5 hover:bg-muted rounded shrink-0 max-md:min-h-[44px] max-md:min-w-[44px]"
|
||||||
aria-label="Queued message options"
|
aria-label="Queued message options"
|
||||||
>
|
>
|
||||||
<ChevronDown size={12} />
|
<ChevronDown size={12} />
|
||||||
@@ -135,7 +141,7 @@ export function ChatPane({ sessionId, chatId, projectId, sessionChats }: Props)
|
|||||||
<button
|
<button
|
||||||
type="button"
|
type="button"
|
||||||
onClick={() => removeQueued(i)}
|
onClick={() => removeQueued(i)}
|
||||||
className="p-0.5 hover:bg-muted rounded shrink-0"
|
className="inline-flex items-center justify-center p-0.5 hover:bg-muted rounded shrink-0 max-md:min-h-[44px] max-md:min-w-[44px]"
|
||||||
aria-label="Cancel queued message"
|
aria-label="Cancel queued message"
|
||||||
>
|
>
|
||||||
<X size={12} />
|
<X size={12} />
|
||||||
@@ -153,7 +159,7 @@ export function ChatPane({ sessionId, chatId, projectId, sessionChats }: Props)
|
|||||||
<button
|
<button
|
||||||
type="button"
|
type="button"
|
||||||
onClick={() => void handleStop()}
|
onClick={() => void handleStop()}
|
||||||
className="flex items-center gap-1.5 text-xs px-3 py-1 rounded-full border hover:bg-muted text-muted-foreground hover:text-foreground"
|
className="flex items-center gap-1.5 text-xs px-3 py-1 rounded-full border hover:bg-muted text-muted-foreground hover:text-foreground max-md:min-h-[44px] max-md:px-5"
|
||||||
>
|
>
|
||||||
<Square size={10} className="fill-current" />
|
<Square size={10} className="fill-current" />
|
||||||
Stop generating
|
Stop generating
|
||||||
@@ -162,7 +168,17 @@ export function ChatPane({ sessionId, chatId, projectId, sessionChats }: Props)
|
|||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
|
|
||||||
<ChatInput disabled={false} projectId={projectId} onSend={handleSend} onForceSend={streaming ? handleForceSend : undefined} />
|
<div className="relative">
|
||||||
|
<ChatContextPopover stats={contextStats} />
|
||||||
|
<ChatInput
|
||||||
|
disabled={false}
|
||||||
|
projectId={projectId}
|
||||||
|
agentId={agentId}
|
||||||
|
onAgentChange={onAgentChange}
|
||||||
|
onSend={handleSend}
|
||||||
|
onForceSend={streaming ? handleForceSend : undefined}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -115,6 +115,16 @@ export interface ProjectUpdatedEvent {
|
|||||||
name: string;
|
name: string;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// v1.8 mobile-tabs: broadcast on user channel from inference.ts so any device
|
||||||
|
// subscribed sees a chat working/idle/error. Frontend stores per-chat; panes
|
||||||
|
// derive their dot from pane.activeChatId.
|
||||||
|
export interface ChatStatusEvent {
|
||||||
|
type: 'chat_status';
|
||||||
|
chat_id: string;
|
||||||
|
status: 'working' | 'idle' | 'error';
|
||||||
|
at: string;
|
||||||
|
}
|
||||||
|
|
||||||
export type SessionEvent =
|
export type SessionEvent =
|
||||||
| SessionRenamedEvent
|
| SessionRenamedEvent
|
||||||
| ProjectCreatedEvent
|
| ProjectCreatedEvent
|
||||||
@@ -134,7 +144,8 @@ export type SessionEvent =
|
|||||||
| ChatDeletedEvent
|
| ChatDeletedEvent
|
||||||
| ProjectArchivedEvent
|
| ProjectArchivedEvent
|
||||||
| ProjectUnarchivedEvent
|
| ProjectUnarchivedEvent
|
||||||
| ProjectUpdatedEvent;
|
| ProjectUpdatedEvent
|
||||||
|
| ChatStatusEvent;
|
||||||
type Listener = (event: SessionEvent) => void;
|
type Listener = (event: SessionEvent) => void;
|
||||||
|
|
||||||
const listeners = new Set<Listener>();
|
const listeners = new Set<Listener>();
|
||||||
|
|||||||
37
apps/web/src/hooks/useChatContextStats.ts
Normal file
37
apps/web/src/hooks/useChatContextStats.ts
Normal file
@@ -0,0 +1,37 @@
|
|||||||
|
import { useMemo } from 'react';
|
||||||
|
import type { Message } from '@/api/types';
|
||||||
|
|
||||||
|
export interface ChatContextStats {
|
||||||
|
used: number;
|
||||||
|
max: number;
|
||||||
|
percent: number;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Returns the latest context-window usage for the given chat, derived from the
|
||||||
|
* assistant message (with both ctx_used and ctx_max populated) having the most
|
||||||
|
* recent created_at. Returns null when no such message exists.
|
||||||
|
*
|
||||||
|
* Re-evaluates whenever the `messages` reference or `chatId` changes, which
|
||||||
|
* matches the cadence of streaming updates from `useSessionStream`.
|
||||||
|
*/
|
||||||
|
export function useChatContextStats(
|
||||||
|
chatId: string,
|
||||||
|
messages: Message[],
|
||||||
|
): ChatContextStats | null {
|
||||||
|
return useMemo(() => {
|
||||||
|
let latest: Message | null = null;
|
||||||
|
for (const m of messages) {
|
||||||
|
if (m.chat_id !== chatId) continue;
|
||||||
|
if (m.role !== 'assistant') continue;
|
||||||
|
if (m.ctx_used == null || m.ctx_max == null) continue;
|
||||||
|
if (!latest || m.created_at > latest.created_at) latest = m;
|
||||||
|
}
|
||||||
|
if (!latest || latest.ctx_used == null || latest.ctx_max == null) return null;
|
||||||
|
const used = latest.ctx_used;
|
||||||
|
const max = latest.ctx_max;
|
||||||
|
if (max <= 0) return null;
|
||||||
|
const percent = Math.round((used / max) * 100);
|
||||||
|
return { used, max, percent };
|
||||||
|
}, [chatId, messages]);
|
||||||
|
}
|
||||||
71
apps/web/src/hooks/useChatStatus.ts
Normal file
71
apps/web/src/hooks/useChatStatus.ts
Normal file
@@ -0,0 +1,71 @@
|
|||||||
|
import { useEffect, useState } from 'react';
|
||||||
|
import { sessionEvents } from './sessionEvents';
|
||||||
|
|
||||||
|
export type RawStatus = 'working' | 'idle' | 'error';
|
||||||
|
export type DerivedStatus = 'working' | 'idle_warm' | 'idle_cold' | 'error';
|
||||||
|
|
||||||
|
// Window during which an idle dot stays green; after this, it fades to gray.
|
||||||
|
const WARM_WINDOW_MS = 30_000;
|
||||||
|
const TICK_MS = 5_000;
|
||||||
|
|
||||||
|
interface Entry {
|
||||||
|
status: RawStatus;
|
||||||
|
at: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Module-scope shared state so every StatusDot in the app shares one map
|
||||||
|
// (mirrors useSidebar's singleton pattern). The map is ephemeral — cleared on
|
||||||
|
// page reload; WS reconnect repopulates as new frames arrive.
|
||||||
|
const statuses = new Map<string, Entry>();
|
||||||
|
const subscribers = new Set<() => void>();
|
||||||
|
|
||||||
|
function notify(): void {
|
||||||
|
for (const s of subscribers) {
|
||||||
|
try { s(); } catch { /* swallow */ }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Guard against duplicate listeners during Vite HMR.
|
||||||
|
const G = globalThis as Record<string, unknown>;
|
||||||
|
if (!G.__boocode_chat_status_subscribed) {
|
||||||
|
G.__boocode_chat_status_subscribed = true;
|
||||||
|
sessionEvents.subscribe((ev) => {
|
||||||
|
if (ev.type !== 'chat_status') return;
|
||||||
|
statuses.set(ev.chat_id, { status: ev.status, at: ev.at });
|
||||||
|
notify();
|
||||||
|
});
|
||||||
|
// Single shared ticker: re-notify so any green dot whose 30s window just
|
||||||
|
// expired re-renders as gray. We only notify if there's something warm —
|
||||||
|
// avoids waking sleeping components for nothing.
|
||||||
|
setInterval(() => {
|
||||||
|
const now = Date.now();
|
||||||
|
for (const entry of statuses.values()) {
|
||||||
|
if (entry.status === 'idle') {
|
||||||
|
const age = now - new Date(entry.at).getTime();
|
||||||
|
if (age < WARM_WINDOW_MS + TICK_MS) {
|
||||||
|
notify();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}, TICK_MS);
|
||||||
|
}
|
||||||
|
|
||||||
|
function derive(entry: Entry | undefined): DerivedStatus {
|
||||||
|
if (!entry) return 'idle_cold';
|
||||||
|
if (entry.status === 'working') return 'working';
|
||||||
|
if (entry.status === 'error') return 'error';
|
||||||
|
const age = Date.now() - new Date(entry.at).getTime();
|
||||||
|
return age < WARM_WINDOW_MS ? 'idle_warm' : 'idle_cold';
|
||||||
|
}
|
||||||
|
|
||||||
|
export function useChatStatus(chatId: string | null | undefined): DerivedStatus {
|
||||||
|
const [, force] = useState({});
|
||||||
|
useEffect(() => {
|
||||||
|
const sub = () => force({});
|
||||||
|
subscribers.add(sub);
|
||||||
|
return () => { subscribers.delete(sub); };
|
||||||
|
}, []);
|
||||||
|
if (!chatId) return 'idle_cold';
|
||||||
|
return derive(statuses.get(chatId));
|
||||||
|
}
|
||||||
75
apps/web/src/hooks/useLongPress.ts
Normal file
75
apps/web/src/hooks/useLongPress.ts
Normal file
@@ -0,0 +1,75 @@
|
|||||||
|
import { useCallback, useRef } from 'react';
|
||||||
|
import type { TouchEvent } from 'react';
|
||||||
|
|
||||||
|
interface LongPressHandlers {
|
||||||
|
onTouchStart: (e: TouchEvent) => void;
|
||||||
|
onTouchMove: (e: TouchEvent) => void;
|
||||||
|
onTouchEnd: (e: TouchEvent) => void;
|
||||||
|
onTouchCancel: (e: TouchEvent) => void;
|
||||||
|
}
|
||||||
|
|
||||||
|
interface Options {
|
||||||
|
ms?: number;
|
||||||
|
// Suppress the synthetic click that follows touchend when long-press fired.
|
||||||
|
suppressClickOnFire?: boolean;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Hand-rolled long-press detector. Starts a timer on touchstart; cancels on
|
||||||
|
// touchmove or early touchend; fires the callback on timer expiry. Caller is
|
||||||
|
// expected to suppress text-selection callout via CSS (-webkit-touch-callout).
|
||||||
|
export function useLongPress(
|
||||||
|
callback: (touch: { clientX: number; clientY: number; target: EventTarget | null }) => void,
|
||||||
|
{ ms = 500, suppressClickOnFire = true }: Options = {},
|
||||||
|
): LongPressHandlers {
|
||||||
|
const timerRef = useRef<number | null>(null);
|
||||||
|
const firedRef = useRef(false);
|
||||||
|
|
||||||
|
const clear = useCallback(() => {
|
||||||
|
if (timerRef.current !== null) {
|
||||||
|
window.clearTimeout(timerRef.current);
|
||||||
|
timerRef.current = null;
|
||||||
|
}
|
||||||
|
}, []);
|
||||||
|
|
||||||
|
const onTouchStart = useCallback(
|
||||||
|
(e: TouchEvent) => {
|
||||||
|
firedRef.current = false;
|
||||||
|
const touch = e.touches[0];
|
||||||
|
if (!touch) return;
|
||||||
|
const x = touch.clientX;
|
||||||
|
const y = touch.clientY;
|
||||||
|
const target = e.target;
|
||||||
|
clear();
|
||||||
|
timerRef.current = window.setTimeout(() => {
|
||||||
|
firedRef.current = true;
|
||||||
|
callback({ clientX: x, clientY: y, target });
|
||||||
|
}, ms);
|
||||||
|
},
|
||||||
|
[callback, ms, clear],
|
||||||
|
);
|
||||||
|
|
||||||
|
const onTouchMove = useCallback(() => {
|
||||||
|
clear();
|
||||||
|
}, [clear]);
|
||||||
|
|
||||||
|
const onTouchEnd = useCallback(
|
||||||
|
(e: TouchEvent) => {
|
||||||
|
clear();
|
||||||
|
if (firedRef.current && suppressClickOnFire) {
|
||||||
|
// Block the synthetic click that follows touchend; the long-press
|
||||||
|
// already handled the gesture.
|
||||||
|
e.preventDefault();
|
||||||
|
}
|
||||||
|
},
|
||||||
|
[clear, suppressClickOnFire],
|
||||||
|
);
|
||||||
|
|
||||||
|
const onTouchCancel = useCallback(
|
||||||
|
(_e: TouchEvent) => {
|
||||||
|
clear();
|
||||||
|
},
|
||||||
|
[clear],
|
||||||
|
);
|
||||||
|
|
||||||
|
return { onTouchStart, onTouchMove, onTouchEnd, onTouchCancel };
|
||||||
|
}
|
||||||
41
apps/web/src/hooks/useProjectGit.ts
Normal file
41
apps/web/src/hooks/useProjectGit.ts
Normal file
@@ -0,0 +1,41 @@
|
|||||||
|
import { useEffect, useState } from 'react';
|
||||||
|
import { api } from '@/api/client';
|
||||||
|
import type { GitMeta } from '@/api/types';
|
||||||
|
|
||||||
|
const POLL_INTERVAL_MS = 30_000;
|
||||||
|
|
||||||
|
// Live-ish git meta for the project header indicator. Backed by the server's
|
||||||
|
// 30s cache, so a 30s client poll plus the cache TTL bounds total staleness
|
||||||
|
// to ~60s in the worst case. Returns null while the first fetch is in flight
|
||||||
|
// or if the request failed.
|
||||||
|
export function useProjectGit(projectId: string | null | undefined): GitMeta | null {
|
||||||
|
const [meta, setMeta] = useState<GitMeta | null>(null);
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
if (!projectId) {
|
||||||
|
setMeta(null);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
let cancelled = false;
|
||||||
|
|
||||||
|
const fetchOnce = () => {
|
||||||
|
api.projects
|
||||||
|
.git(projectId)
|
||||||
|
.then((m) => {
|
||||||
|
if (!cancelled) setMeta(m);
|
||||||
|
})
|
||||||
|
.catch(() => {
|
||||||
|
if (!cancelled) setMeta(null);
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|
||||||
|
fetchOnce();
|
||||||
|
const t = setInterval(fetchOnce, POLL_INTERVAL_MS);
|
||||||
|
return () => {
|
||||||
|
cancelled = true;
|
||||||
|
clearInterval(t);
|
||||||
|
};
|
||||||
|
}, [projectId]);
|
||||||
|
|
||||||
|
return meta;
|
||||||
|
}
|
||||||
77
apps/web/src/hooks/usePullToRefresh.ts
Normal file
77
apps/web/src/hooks/usePullToRefresh.ts
Normal file
@@ -0,0 +1,77 @@
|
|||||||
|
import { useCallback, useRef, useState } from 'react';
|
||||||
|
import type { TouchEvent } from 'react';
|
||||||
|
|
||||||
|
interface Options {
|
||||||
|
threshold?: number;
|
||||||
|
enabled?: boolean;
|
||||||
|
maxPull?: number;
|
||||||
|
}
|
||||||
|
|
||||||
|
interface Handlers {
|
||||||
|
onTouchStart: (e: TouchEvent<HTMLElement>) => void;
|
||||||
|
onTouchMove: (e: TouchEvent<HTMLElement>) => void;
|
||||||
|
onTouchEnd: () => void;
|
||||||
|
pullDist: number;
|
||||||
|
refreshing: boolean;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Hand-rolled pull-to-refresh: records the initial Y on touchstart only if
|
||||||
|
// the target is scrolled to the top, then tracks downward pull on touchmove.
|
||||||
|
// On touchend, fires onRefresh if the pull exceeded the threshold.
|
||||||
|
export function usePullToRefresh(
|
||||||
|
onRefresh: () => void | Promise<void>,
|
||||||
|
{ threshold = 80, enabled = true, maxPull = 120 }: Options = {},
|
||||||
|
): Handlers {
|
||||||
|
const [pullDist, setPullDist] = useState(0);
|
||||||
|
const [refreshing, setRefreshing] = useState(false);
|
||||||
|
const startYRef = useRef<number | null>(null);
|
||||||
|
|
||||||
|
const onTouchStart = useCallback(
|
||||||
|
(e: TouchEvent<HTMLElement>) => {
|
||||||
|
if (!enabled || refreshing) return;
|
||||||
|
const target = e.currentTarget as HTMLElement;
|
||||||
|
if (target.scrollTop > 0) return;
|
||||||
|
const t = e.touches[0];
|
||||||
|
if (!t) return;
|
||||||
|
startYRef.current = t.clientY;
|
||||||
|
},
|
||||||
|
[enabled, refreshing],
|
||||||
|
);
|
||||||
|
|
||||||
|
const onTouchMove = useCallback(
|
||||||
|
(e: TouchEvent<HTMLElement>) => {
|
||||||
|
if (!enabled || refreshing || startYRef.current === null) return;
|
||||||
|
const t = e.touches[0];
|
||||||
|
if (!t) return;
|
||||||
|
const delta = t.clientY - startYRef.current;
|
||||||
|
if (delta > 0) {
|
||||||
|
setPullDist(Math.min(delta, maxPull));
|
||||||
|
} else {
|
||||||
|
setPullDist(0);
|
||||||
|
}
|
||||||
|
},
|
||||||
|
[enabled, refreshing, maxPull],
|
||||||
|
);
|
||||||
|
|
||||||
|
const onTouchEnd = useCallback(() => {
|
||||||
|
if (!enabled || refreshing) {
|
||||||
|
startYRef.current = null;
|
||||||
|
setPullDist(0);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
const fired = pullDist >= threshold && startYRef.current !== null;
|
||||||
|
startYRef.current = null;
|
||||||
|
setPullDist(0);
|
||||||
|
if (fired) {
|
||||||
|
setRefreshing(true);
|
||||||
|
Promise.resolve(onRefresh())
|
||||||
|
.catch(() => {})
|
||||||
|
.finally(() => {
|
||||||
|
// Hold the indicator briefly so the action feels intentional.
|
||||||
|
window.setTimeout(() => setRefreshing(false), 600);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}, [enabled, refreshing, pullDist, threshold, onRefresh]);
|
||||||
|
|
||||||
|
return { onTouchStart, onTouchMove, onTouchEnd, pullDist, refreshing };
|
||||||
|
}
|
||||||
35
apps/web/src/hooks/useRightRailDrawer.tsx
Normal file
35
apps/web/src/hooks/useRightRailDrawer.tsx
Normal file
@@ -0,0 +1,35 @@
|
|||||||
|
import { createContext, useCallback, useContext, useEffect, useState } from 'react';
|
||||||
|
import type { ReactNode } from 'react';
|
||||||
|
import { useLocation } from 'react-router-dom';
|
||||||
|
|
||||||
|
interface RightRailDrawerState {
|
||||||
|
open: boolean;
|
||||||
|
setOpen: (open: boolean) => void;
|
||||||
|
toggle: () => void;
|
||||||
|
}
|
||||||
|
|
||||||
|
const Ctx = createContext<RightRailDrawerState | null>(null);
|
||||||
|
|
||||||
|
export function RightRailDrawerProvider({ children }: { children: ReactNode }) {
|
||||||
|
const [open, setOpen] = useState(false);
|
||||||
|
const location = useLocation();
|
||||||
|
|
||||||
|
// Auto-close on route change. Same pattern as useSidebarDrawer — keeps the
|
||||||
|
// drawer from leaking between sessions when the user navigates.
|
||||||
|
useEffect(() => {
|
||||||
|
setOpen(false);
|
||||||
|
}, [location.pathname]);
|
||||||
|
|
||||||
|
const toggle = useCallback(() => setOpen((v) => !v), []);
|
||||||
|
|
||||||
|
return <Ctx.Provider value={{ open, setOpen, toggle }}>{children}</Ctx.Provider>;
|
||||||
|
}
|
||||||
|
|
||||||
|
export function useRightRailDrawer(): RightRailDrawerState {
|
||||||
|
const ctx = useContext(Ctx);
|
||||||
|
if (!ctx) {
|
||||||
|
// Soft fallback so consumers don't crash if rendered outside a provider.
|
||||||
|
return { open: false, setOpen: () => {}, toggle: () => {} };
|
||||||
|
}
|
||||||
|
return ctx;
|
||||||
|
}
|
||||||
@@ -2,6 +2,10 @@ import { useEffect, useRef, useState } from 'react';
|
|||||||
import type { Message, WsFrame } from '@/api/types';
|
import type { Message, WsFrame } from '@/api/types';
|
||||||
import { sessionEvents } from './sessionEvents';
|
import { sessionEvents } from './sessionEvents';
|
||||||
|
|
||||||
|
// session_renamed frame removed from WsFrame — it was declared but never
|
||||||
|
// published on the per-session WS channel (server publishes via broker.publishUser
|
||||||
|
// since v1.4). chat_renamed remains; auto_name.ts publishes it on session WS.
|
||||||
|
|
||||||
interface State {
|
interface State {
|
||||||
messages: Message[];
|
messages: Message[];
|
||||||
connected: boolean;
|
connected: boolean;
|
||||||
@@ -118,14 +122,6 @@ function applyFrame(state: State, frame: WsFrame): State {
|
|||||||
messages: state.messages.filter((m) => !removeSet.has(m.id)),
|
messages: state.messages.filter((m) => !removeSet.has(m.id)),
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
case 'session_renamed': {
|
|
||||||
sessionEvents.emit({
|
|
||||||
type: 'session_renamed',
|
|
||||||
session_id: frame.session_id,
|
|
||||||
name: frame.name,
|
|
||||||
});
|
|
||||||
return state;
|
|
||||||
}
|
|
||||||
case 'chat_renamed': {
|
case 'chat_renamed': {
|
||||||
sessionEvents.emit({
|
sessionEvents.emit({
|
||||||
type: 'chat_updated',
|
type: 'chat_updated',
|
||||||
@@ -147,6 +143,11 @@ function applyFrame(state: State, frame: WsFrame): State {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Matches useUserEvents — exponential backoff with the same ceiling so the
|
||||||
|
// two channels reconnect on the same cadence after a network handoff.
|
||||||
|
const RECONNECT_INITIAL_MS = 1000;
|
||||||
|
const RECONNECT_MAX_MS = 30_000;
|
||||||
|
|
||||||
export function useSessionStream(sessionId: string | undefined) {
|
export function useSessionStream(sessionId: string | undefined) {
|
||||||
const [state, setState] = useState<State>({ messages: [], connected: false, error: null });
|
const [state, setState] = useState<State>({ messages: [], connected: false, error: null });
|
||||||
const wsRef = useRef<WebSocket | null>(null);
|
const wsRef = useRef<WebSocket | null>(null);
|
||||||
@@ -156,32 +157,52 @@ export function useSessionStream(sessionId: string | undefined) {
|
|||||||
|
|
||||||
setState({ messages: [], connected: false, error: null });
|
setState({ messages: [], connected: false, error: null });
|
||||||
|
|
||||||
const proto = window.location.protocol === 'https:' ? 'wss' : 'ws';
|
let unmounted = false;
|
||||||
const url = `${proto}://${window.location.host}/api/ws/sessions/${sessionId}`;
|
let reconnectTimer: ReturnType<typeof setTimeout> | null = null;
|
||||||
const ws = new WebSocket(url);
|
let reconnectDelay = RECONNECT_INITIAL_MS;
|
||||||
wsRef.current = ws;
|
|
||||||
|
|
||||||
ws.onopen = () => {
|
const connect = () => {
|
||||||
setState((s) => ({ ...s, connected: true, error: null }));
|
if (unmounted) return;
|
||||||
};
|
const proto = window.location.protocol === 'https:' ? 'wss' : 'ws';
|
||||||
ws.onmessage = (ev) => {
|
const url = `${proto}://${window.location.host}/api/ws/sessions/${sessionId}`;
|
||||||
try {
|
const ws = new WebSocket(url);
|
||||||
const frame = JSON.parse(typeof ev.data === 'string' ? ev.data : '') as WsFrame;
|
wsRef.current = ws;
|
||||||
setState((s) => applyFrame(s, frame));
|
|
||||||
} catch (err) {
|
ws.onopen = () => {
|
||||||
console.warn('bad ws frame', err);
|
reconnectDelay = RECONNECT_INITIAL_MS;
|
||||||
}
|
setState((s) => ({ ...s, connected: true, error: null }));
|
||||||
};
|
};
|
||||||
ws.onerror = () => {
|
ws.onmessage = (ev) => {
|
||||||
setState((s) => ({ ...s, error: 'websocket error' }));
|
try {
|
||||||
};
|
const frame = JSON.parse(typeof ev.data === 'string' ? ev.data : '') as WsFrame;
|
||||||
ws.onclose = () => {
|
setState((s) => applyFrame(s, frame));
|
||||||
setState((s) => ({ ...s, connected: false }));
|
} catch (err) {
|
||||||
|
console.warn('bad ws frame', err);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
// v1.8.1: WS errors no longer surface as user-facing toasts here. The
|
||||||
|
// user-channel hook (useUserEvents) owns the debounced "reconnecting…"
|
||||||
|
// UI; this channel just reconnects silently on the same backoff.
|
||||||
|
ws.onerror = () => {
|
||||||
|
try { ws.close(); } catch {}
|
||||||
|
};
|
||||||
|
ws.onclose = () => {
|
||||||
|
if (unmounted) return;
|
||||||
|
setState((s) => ({ ...s, connected: false }));
|
||||||
|
const delay = reconnectDelay;
|
||||||
|
reconnectDelay = Math.min(reconnectDelay * 2, RECONNECT_MAX_MS);
|
||||||
|
reconnectTimer = setTimeout(connect, delay);
|
||||||
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
connect();
|
||||||
|
|
||||||
return () => {
|
return () => {
|
||||||
|
unmounted = true;
|
||||||
|
if (reconnectTimer) clearTimeout(reconnectTimer);
|
||||||
|
const ws = wsRef.current;
|
||||||
wsRef.current = null;
|
wsRef.current = null;
|
||||||
ws.close();
|
if (ws) try { ws.close(); } catch {}
|
||||||
};
|
};
|
||||||
}, [sessionId]);
|
}, [sessionId]);
|
||||||
|
|
||||||
|
|||||||
@@ -171,6 +171,7 @@ function applyEvent(prev: SidebarResponse, event: import('./sessionEvents').Sess
|
|||||||
case 'chat_archived':
|
case 'chat_archived':
|
||||||
case 'chat_unarchived':
|
case 'chat_unarchived':
|
||||||
case 'chat_deleted':
|
case 'chat_deleted':
|
||||||
|
case 'chat_status':
|
||||||
return prev;
|
return prev;
|
||||||
case 'project_archived': {
|
case 'project_archived': {
|
||||||
const next = prev.projects.filter((p) => p.id !== event.project_id);
|
const next = prev.projects.filter((p) => p.id !== event.project_id);
|
||||||
|
|||||||
36
apps/web/src/hooks/useSidebarDrawer.tsx
Normal file
36
apps/web/src/hooks/useSidebarDrawer.tsx
Normal file
@@ -0,0 +1,36 @@
|
|||||||
|
import { createContext, useCallback, useContext, useEffect, useState } from 'react';
|
||||||
|
import type { ReactNode } from 'react';
|
||||||
|
import { useLocation } from 'react-router-dom';
|
||||||
|
|
||||||
|
interface SidebarDrawerState {
|
||||||
|
open: boolean;
|
||||||
|
setOpen: (open: boolean) => void;
|
||||||
|
toggle: () => void;
|
||||||
|
}
|
||||||
|
|
||||||
|
const Ctx = createContext<SidebarDrawerState | null>(null);
|
||||||
|
|
||||||
|
export function SidebarDrawerProvider({ children }: { children: ReactNode }) {
|
||||||
|
const [open, setOpen] = useState(false);
|
||||||
|
const location = useLocation();
|
||||||
|
|
||||||
|
// Auto-close on navigation. Effect fires once on mount too (open default
|
||||||
|
// is false, so no observable effect) and on every pathname change after.
|
||||||
|
useEffect(() => {
|
||||||
|
setOpen(false);
|
||||||
|
}, [location.pathname]);
|
||||||
|
|
||||||
|
const toggle = useCallback(() => setOpen((v) => !v), []);
|
||||||
|
|
||||||
|
return <Ctx.Provider value={{ open, setOpen, toggle }}>{children}</Ctx.Provider>;
|
||||||
|
}
|
||||||
|
|
||||||
|
export function useSidebarDrawer(): SidebarDrawerState {
|
||||||
|
const ctx = useContext(Ctx);
|
||||||
|
if (!ctx) {
|
||||||
|
// Soft fallback so consumers don't crash if rendered outside a provider.
|
||||||
|
// In practice all top-level routes are inside the provider.
|
||||||
|
return { open: false, setOpen: () => {}, toggle: () => {} };
|
||||||
|
}
|
||||||
|
return ctx;
|
||||||
|
}
|
||||||
@@ -1,5 +1,6 @@
|
|||||||
import { useEffect } from 'react';
|
import { useEffect } from 'react';
|
||||||
import { sessionEvents } from './sessionEvents';
|
import { sessionEvents } from './sessionEvents';
|
||||||
|
import { createWsReconnectToast } from './wsReconnectToast';
|
||||||
|
|
||||||
const RECONNECT_INITIAL_MS = 1000;
|
const RECONNECT_INITIAL_MS = 1000;
|
||||||
const RECONNECT_MAX_MS = 30000;
|
const RECONNECT_MAX_MS = 30000;
|
||||||
@@ -11,6 +12,20 @@ export function useUserEvents(): void {
|
|||||||
let reconnectDelay = RECONNECT_INITIAL_MS;
|
let reconnectDelay = RECONNECT_INITIAL_MS;
|
||||||
let unmounted = false;
|
let unmounted = false;
|
||||||
|
|
||||||
|
// v1.8.1: silent on the first disconnect; gray "reconnecting…" after 3
|
||||||
|
// fails / 15 s; red "connection lost" with a Retry Now action after 60 s.
|
||||||
|
const reconnectToast = createWsReconnectToast({
|
||||||
|
label: 'Live updates',
|
||||||
|
onRetryNow: () => {
|
||||||
|
if (reconnectTimer) {
|
||||||
|
clearTimeout(reconnectTimer);
|
||||||
|
reconnectTimer = null;
|
||||||
|
reconnectDelay = RECONNECT_INITIAL_MS;
|
||||||
|
connect();
|
||||||
|
}
|
||||||
|
},
|
||||||
|
});
|
||||||
|
|
||||||
const connect = () => {
|
const connect = () => {
|
||||||
if (unmounted) return;
|
if (unmounted) return;
|
||||||
const url = new URL('/api/ws/user', window.location.href);
|
const url = new URL('/api/ws/user', window.location.href);
|
||||||
@@ -19,6 +34,7 @@ export function useUserEvents(): void {
|
|||||||
|
|
||||||
ws.onopen = () => {
|
ws.onopen = () => {
|
||||||
reconnectDelay = RECONNECT_INITIAL_MS;
|
reconnectDelay = RECONNECT_INITIAL_MS;
|
||||||
|
reconnectToast.onConnected();
|
||||||
};
|
};
|
||||||
|
|
||||||
ws.onmessage = (ev) => {
|
ws.onmessage = (ev) => {
|
||||||
@@ -34,13 +50,15 @@ export function useUserEvents(): void {
|
|||||||
|
|
||||||
ws.onclose = () => {
|
ws.onclose = () => {
|
||||||
if (unmounted) return;
|
if (unmounted) return;
|
||||||
|
reconnectToast.onFailure();
|
||||||
const delay = reconnectDelay;
|
const delay = reconnectDelay;
|
||||||
reconnectDelay = Math.min(reconnectDelay * 2, RECONNECT_MAX_MS);
|
reconnectDelay = Math.min(reconnectDelay * 2, RECONNECT_MAX_MS);
|
||||||
reconnectTimer = setTimeout(connect, delay);
|
reconnectTimer = setTimeout(connect, delay);
|
||||||
};
|
};
|
||||||
|
|
||||||
ws.onerror = () => {
|
ws.onerror = () => {
|
||||||
// close handler will trigger reconnect
|
// close handler will trigger reconnect; best-effort, ignore failure
|
||||||
|
// because the socket may already be closing
|
||||||
try { ws?.close(); } catch {}
|
try { ws?.close(); } catch {}
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
@@ -49,6 +67,7 @@ export function useUserEvents(): void {
|
|||||||
|
|
||||||
return () => {
|
return () => {
|
||||||
unmounted = true;
|
unmounted = true;
|
||||||
|
reconnectToast.dispose();
|
||||||
if (reconnectTimer) clearTimeout(reconnectTimer);
|
if (reconnectTimer) clearTimeout(reconnectTimer);
|
||||||
if (ws) try { ws.close(); } catch {}
|
if (ws) try { ws.close(); } catch {}
|
||||||
};
|
};
|
||||||
|
|||||||
45
apps/web/src/hooks/useViewport.ts
Normal file
45
apps/web/src/hooks/useViewport.ts
Normal file
@@ -0,0 +1,45 @@
|
|||||||
|
import { useEffect, useState } from 'react';
|
||||||
|
|
||||||
|
// Breakpoints (px): mobile <768, tablet 768-1023, desktop >=1024.
|
||||||
|
const MOBILE_MAX = 767;
|
||||||
|
const TABLET_MAX = 1023;
|
||||||
|
|
||||||
|
export interface ViewportSnapshot {
|
||||||
|
isMobile: boolean;
|
||||||
|
isTablet: boolean;
|
||||||
|
width: number;
|
||||||
|
}
|
||||||
|
|
||||||
|
function snapshot(): ViewportSnapshot {
|
||||||
|
if (typeof window === 'undefined') {
|
||||||
|
return { isMobile: false, isTablet: false, width: 1280 };
|
||||||
|
}
|
||||||
|
const width = window.innerWidth;
|
||||||
|
return {
|
||||||
|
isMobile: width <= MOBILE_MAX,
|
||||||
|
isTablet: width > MOBILE_MAX && width <= TABLET_MAX,
|
||||||
|
width,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
// matchMedia-based, no resize polling. We listen to two breakpoint queries
|
||||||
|
// and recompute the snapshot on any change.
|
||||||
|
export function useViewport(): ViewportSnapshot {
|
||||||
|
const [state, setState] = useState<ViewportSnapshot>(snapshot);
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
if (typeof window === 'undefined') return;
|
||||||
|
const mobileMq = window.matchMedia(`(max-width: ${MOBILE_MAX}px)`);
|
||||||
|
const tabletMq = window.matchMedia(`(min-width: ${MOBILE_MAX + 1}px) and (max-width: ${TABLET_MAX}px)`);
|
||||||
|
const update = () => setState(snapshot());
|
||||||
|
mobileMq.addEventListener('change', update);
|
||||||
|
tabletMq.addEventListener('change', update);
|
||||||
|
update();
|
||||||
|
return () => {
|
||||||
|
mobileMq.removeEventListener('change', update);
|
||||||
|
tabletMq.removeEventListener('change', update);
|
||||||
|
};
|
||||||
|
}, []);
|
||||||
|
|
||||||
|
return state;
|
||||||
|
}
|
||||||
95
apps/web/src/hooks/wsReconnectToast.ts
Normal file
95
apps/web/src/hooks/wsReconnectToast.ts
Normal file
@@ -0,0 +1,95 @@
|
|||||||
|
import { toast } from 'sonner';
|
||||||
|
|
||||||
|
// v1.8.1 thresholds. First disconnect is silent — mobile Authelia idle timeouts
|
||||||
|
// and tab suspensions trip reconnects constantly and the old red "websocket
|
||||||
|
// error" toast made the app feel broken. Only escalate once the failure is
|
||||||
|
// sustained.
|
||||||
|
const TOAST_AFTER_FAILS = 3;
|
||||||
|
const TOAST_AFTER_MS = 15_000;
|
||||||
|
const PERSISTENT_AFTER_MS = 60_000;
|
||||||
|
|
||||||
|
export interface WsReconnectToast {
|
||||||
|
onFailure(): void;
|
||||||
|
onConnected(): void;
|
||||||
|
dispose(): void;
|
||||||
|
}
|
||||||
|
|
||||||
|
interface Options {
|
||||||
|
label: string; // shown in the toast (e.g. "Live updates")
|
||||||
|
onRetryNow: () => void; // user clicked the "Retry now" action
|
||||||
|
}
|
||||||
|
|
||||||
|
// Per-connection toast wrapper. Caller drives it from the WS lifecycle:
|
||||||
|
// onFailure — after each failed connection attempt
|
||||||
|
// onConnected — after a successful onopen
|
||||||
|
// dispose — on hook unmount
|
||||||
|
// The wrapper itself runs no timers and does not change the caller's reconnect
|
||||||
|
// cadence; it only decides when to show / dismiss the toast.
|
||||||
|
export function createWsReconnectToast(opts: Options): WsReconnectToast {
|
||||||
|
let firstFailureAt: number | null = null;
|
||||||
|
let failureCount = 0;
|
||||||
|
let reconnectingId: string | number | null = null;
|
||||||
|
let persistentId: string | number | null = null;
|
||||||
|
|
||||||
|
function dismissReconnecting(): void {
|
||||||
|
if (reconnectingId !== null) {
|
||||||
|
toast.dismiss(reconnectingId);
|
||||||
|
reconnectingId = null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
function dismissPersistent(): void {
|
||||||
|
if (persistentId !== null) {
|
||||||
|
toast.dismiss(persistentId);
|
||||||
|
persistentId = null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return {
|
||||||
|
onFailure() {
|
||||||
|
if (firstFailureAt === null) firstFailureAt = Date.now();
|
||||||
|
failureCount += 1;
|
||||||
|
const elapsed = Date.now() - firstFailureAt;
|
||||||
|
|
||||||
|
// Escalate to red error + Retry button after PERSISTENT_AFTER_MS. Replaces
|
||||||
|
// the gray toast if it's still showing.
|
||||||
|
if (persistentId === null && elapsed >= PERSISTENT_AFTER_MS) {
|
||||||
|
dismissReconnecting();
|
||||||
|
persistentId = toast.error(`${opts.label}: connection lost`, {
|
||||||
|
duration: Infinity,
|
||||||
|
action: {
|
||||||
|
label: 'Retry now',
|
||||||
|
onClick: () => {
|
||||||
|
dismissReconnecting();
|
||||||
|
dismissPersistent();
|
||||||
|
opts.onRetryNow();
|
||||||
|
},
|
||||||
|
},
|
||||||
|
});
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Gray "reconnecting…" toast once we've crossed either threshold.
|
||||||
|
if (
|
||||||
|
reconnectingId === null &&
|
||||||
|
persistentId === null &&
|
||||||
|
(failureCount >= TOAST_AFTER_FAILS || elapsed >= TOAST_AFTER_MS)
|
||||||
|
) {
|
||||||
|
reconnectingId = toast.warning(`${opts.label}: reconnecting…`, {
|
||||||
|
duration: Infinity,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
},
|
||||||
|
onConnected() {
|
||||||
|
firstFailureAt = null;
|
||||||
|
failureCount = 0;
|
||||||
|
dismissReconnecting();
|
||||||
|
dismissPersistent();
|
||||||
|
},
|
||||||
|
dispose() {
|
||||||
|
firstFailureAt = null;
|
||||||
|
failureCount = 0;
|
||||||
|
dismissReconnecting();
|
||||||
|
dismissPersistent();
|
||||||
|
},
|
||||||
|
};
|
||||||
|
}
|
||||||
@@ -8,6 +8,34 @@ export type Attachment = {
|
|||||||
source: '@' | 'line-select' | 'drop' | 'paste';
|
source: '@' | 'line-select' | 'drop' | 'paste';
|
||||||
};
|
};
|
||||||
|
|
||||||
|
// v1.7: caps shared between drag-drop and paste-as-attachment so both paths
|
||||||
|
// reject the same way. Match the existing 10-attachment cap in
|
||||||
|
// ChatInput.addAttachment.
|
||||||
|
export const MAX_FILE_SIZE_BYTES = 5 * 1024 * 1024; // 5 MB
|
||||||
|
export const PASTE_INLINE_MAX_LINES = 8;
|
||||||
|
|
||||||
|
// First-8KB null-byte scan. Returns true if the content looks binary.
|
||||||
|
// Accepts a string (post-decode), an ArrayBuffer (pre-decode), or a Uint8Array.
|
||||||
|
// For binary files like PNG, scanning bytes is more reliable than scanning
|
||||||
|
// post-UTF-8-decode strings because invalid sequences may be replaced rather
|
||||||
|
// than preserved.
|
||||||
|
export function looksBinary(content: string | ArrayBuffer | Uint8Array): boolean {
|
||||||
|
const SCAN_BYTES = 8192;
|
||||||
|
if (typeof content === 'string') {
|
||||||
|
const max = Math.min(content.length, SCAN_BYTES);
|
||||||
|
for (let i = 0; i < max; i++) {
|
||||||
|
if (content.charCodeAt(i) === 0) return true;
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
const bytes = content instanceof Uint8Array ? content : new Uint8Array(content);
|
||||||
|
const max = Math.min(bytes.length, SCAN_BYTES);
|
||||||
|
for (let i = 0; i < max; i++) {
|
||||||
|
if (bytes[i] === 0) return true;
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
export const LANG_MAP: Record<string, string> = {
|
export const LANG_MAP: Record<string, string> = {
|
||||||
ts: 'typescript', tsx: 'tsx', js: 'javascript', jsx: 'jsx',
|
ts: 'typescript', tsx: 'tsx', js: 'javascript', jsx: 'jsx',
|
||||||
mjs: 'javascript', cjs: 'javascript',
|
mjs: 'javascript', cjs: 'javascript',
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
import { useEffect, useState } from 'react';
|
import { useEffect, useState } from 'react';
|
||||||
import { ChevronDown, ChevronRight, Folder, RotateCcw } from 'lucide-react';
|
import { ChevronDown, ChevronRight, Folder, FolderTree, Menu, RotateCcw } from 'lucide-react';
|
||||||
import { toast } from 'sonner';
|
import { toast } from 'sonner';
|
||||||
import { Button } from '@/components/ui/button';
|
import { Button } from '@/components/ui/button';
|
||||||
import { AddProjectModal } from '@/components/AddProjectModal';
|
import { AddProjectModal } from '@/components/AddProjectModal';
|
||||||
@@ -8,6 +8,9 @@ import { api } from '@/api/client';
|
|||||||
import type { Project } from '@/api/types';
|
import type { Project } from '@/api/types';
|
||||||
import { sessionEvents } from '@/hooks/sessionEvents';
|
import { sessionEvents } from '@/hooks/sessionEvents';
|
||||||
import { useSidebar } from '@/hooks/useSidebar';
|
import { useSidebar } from '@/hooks/useSidebar';
|
||||||
|
import { useSidebarDrawer } from '@/hooks/useSidebarDrawer';
|
||||||
|
import { useRightRailDrawer } from '@/hooks/useRightRailDrawer';
|
||||||
|
import { useViewport } from '@/hooks/useViewport';
|
||||||
|
|
||||||
export function Home() {
|
export function Home() {
|
||||||
const { data } = useSidebar();
|
const { data } = useSidebar();
|
||||||
@@ -15,6 +18,9 @@ export function Home() {
|
|||||||
const [createOpen, setCreateOpen] = useState(false);
|
const [createOpen, setCreateOpen] = useState(false);
|
||||||
const [archived, setArchived] = useState<Project[] | null>(null);
|
const [archived, setArchived] = useState<Project[] | null>(null);
|
||||||
const [showArchived, setShowArchived] = useState(false);
|
const [showArchived, setShowArchived] = useState(false);
|
||||||
|
const { setOpen: setSidebarOpen } = useSidebarDrawer();
|
||||||
|
const { toggle: toggleRightRail } = useRightRailDrawer();
|
||||||
|
const { isMobile } = useViewport();
|
||||||
|
|
||||||
const empty = data ? data.projects.length === 0 : false;
|
const empty = data ? data.projects.length === 0 : false;
|
||||||
|
|
||||||
@@ -70,8 +76,32 @@ export function Home() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className="flex-1 flex flex-col items-center px-6 py-12 overflow-y-auto">
|
<div className="flex-1 flex flex-col min-h-0">
|
||||||
<div className="w-full max-w-md space-y-6">
|
{isMobile && (
|
||||||
|
<header
|
||||||
|
className="border-b px-3 sm:px-4 py-2 flex items-center gap-1.5 shrink-0 text-sm"
|
||||||
|
style={{ paddingTop: 'max(0.5rem, env(safe-area-inset-top))' }}
|
||||||
|
>
|
||||||
|
<button
|
||||||
|
type="button"
|
||||||
|
onClick={() => setSidebarOpen(true)}
|
||||||
|
className="inline-flex items-center justify-center -ml-1 min-w-[44px] min-h-[44px] rounded text-muted-foreground hover:bg-muted hover:text-foreground shrink-0"
|
||||||
|
aria-label="Open sidebar"
|
||||||
|
>
|
||||||
|
<Menu className="size-5" />
|
||||||
|
</button>
|
||||||
|
<button
|
||||||
|
type="button"
|
||||||
|
onClick={toggleRightRail}
|
||||||
|
className="inline-flex items-center justify-center -mr-1 ml-auto min-w-[44px] min-h-[44px] rounded text-muted-foreground hover:bg-muted hover:text-foreground shrink-0"
|
||||||
|
aria-label="Toggle file browser"
|
||||||
|
>
|
||||||
|
<FolderTree className="size-5" />
|
||||||
|
</button>
|
||||||
|
</header>
|
||||||
|
)}
|
||||||
|
<div className="flex-1 flex flex-col items-center px-6 py-12 overflow-y-auto">
|
||||||
|
<div className="w-full max-w-md space-y-6">
|
||||||
<div className="text-center space-y-3">
|
<div className="text-center space-y-3">
|
||||||
{empty ? (
|
{empty ? (
|
||||||
<>
|
<>
|
||||||
@@ -127,9 +157,10 @@ export function Home() {
|
|||||||
)}
|
)}
|
||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
|
</div>
|
||||||
|
<AddProjectModal open={addOpen} onOpenChange={setAddOpen} onAdded={() => {}} />
|
||||||
|
<CreateProjectModal open={createOpen} onOpenChange={setCreateOpen} />
|
||||||
</div>
|
</div>
|
||||||
<AddProjectModal open={addOpen} onOpenChange={setAddOpen} onAdded={() => {}} />
|
|
||||||
<CreateProjectModal open={createOpen} onOpenChange={setCreateOpen} />
|
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,12 +1,14 @@
|
|||||||
import { useEffect, useState } from 'react';
|
import { useEffect, useState } from 'react';
|
||||||
import { Link, useNavigate, useParams } from 'react-router-dom';
|
import { Link, useNavigate, useParams } from 'react-router-dom';
|
||||||
import { Plus, MessageSquare, Trash2, ChevronDown, ChevronRight, RotateCcw } from 'lucide-react';
|
import { Plus, MessageSquare, Trash2, ChevronDown, ChevronRight, RotateCcw, Menu } from 'lucide-react';
|
||||||
import { toast } from 'sonner';
|
import { toast } from 'sonner';
|
||||||
import { api } from '@/api/client';
|
import { api } from '@/api/client';
|
||||||
import type { Project as ProjectType, Session } from '@/api/types';
|
import type { Project as ProjectType, Session } from '@/api/types';
|
||||||
import { Button } from '@/components/ui/button';
|
import { Button } from '@/components/ui/button';
|
||||||
import { sessionEvents } from '@/hooks/sessionEvents';
|
import { sessionEvents } from '@/hooks/sessionEvents';
|
||||||
import { useSessions } from '@/hooks/useSessions';
|
import { useSessions } from '@/hooks/useSessions';
|
||||||
|
import { useSidebarDrawer } from '@/hooks/useSidebarDrawer';
|
||||||
|
import { useViewport } from '@/hooks/useViewport';
|
||||||
|
|
||||||
export function Project() {
|
export function Project() {
|
||||||
const { id } = useParams<{ id: string }>();
|
const { id } = useParams<{ id: string }>();
|
||||||
@@ -16,6 +18,8 @@ export function Project() {
|
|||||||
const [creating, setCreating] = useState(false);
|
const [creating, setCreating] = useState(false);
|
||||||
const [archivedSessions, setArchivedSessions] = useState<Session[] | null>(null);
|
const [archivedSessions, setArchivedSessions] = useState<Session[] | null>(null);
|
||||||
const [showArchived, setShowArchived] = useState(false);
|
const [showArchived, setShowArchived] = useState(false);
|
||||||
|
const { setOpen: setDrawerOpen } = useSidebarDrawer();
|
||||||
|
const { isMobile } = useViewport();
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if (!id) return;
|
if (!id) return;
|
||||||
@@ -76,18 +80,33 @@ export function Project() {
|
|||||||
|
|
||||||
return (
|
return (
|
||||||
<div className="flex-1 flex flex-col">
|
<div className="flex-1 flex flex-col">
|
||||||
<header className="border-b px-6 py-3 flex items-center justify-between">
|
<header
|
||||||
<div>
|
className="border-b px-3 sm:px-6 py-2 sm:py-3 flex items-center justify-between gap-2"
|
||||||
<h1 className="text-lg font-semibold tracking-tight">
|
style={{ paddingTop: 'max(0.5rem, env(safe-area-inset-top))' }}
|
||||||
{project?.name ?? '…'}
|
>
|
||||||
</h1>
|
<div className="flex items-center gap-2 min-w-0">
|
||||||
<div className="text-xs text-muted-foreground font-mono">
|
{isMobile && (
|
||||||
{project?.path}
|
<button
|
||||||
|
type="button"
|
||||||
|
onClick={() => setDrawerOpen(true)}
|
||||||
|
className="inline-flex items-center justify-center -ml-1 min-w-[44px] min-h-[44px] rounded text-muted-foreground hover:bg-muted hover:text-foreground shrink-0"
|
||||||
|
aria-label="Open sidebar"
|
||||||
|
>
|
||||||
|
<Menu className="size-5" />
|
||||||
|
</button>
|
||||||
|
)}
|
||||||
|
<div className="min-w-0">
|
||||||
|
<h1 className="text-base sm:text-lg font-semibold tracking-tight truncate">
|
||||||
|
{project?.name ?? '…'}
|
||||||
|
</h1>
|
||||||
|
<div className="text-xs text-muted-foreground font-mono truncate hidden sm:block">
|
||||||
|
{project?.path}
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<Button onClick={handleNew} disabled={creating}>
|
<Button onClick={handleNew} disabled={creating} className="shrink-0" aria-label="New session">
|
||||||
<Plus />
|
<Plus />
|
||||||
New session
|
<span className="hidden sm:inline">New session</span>
|
||||||
</Button>
|
</Button>
|
||||||
</header>
|
</header>
|
||||||
|
|
||||||
|
|||||||
@@ -1,77 +1,162 @@
|
|||||||
import { useEffect, useState } from 'react';
|
import { useCallback, useEffect, useState } from 'react';
|
||||||
import { Link, useNavigate, useParams } from 'react-router-dom';
|
import {
|
||||||
import { ChevronRight } from 'lucide-react';
|
Link,
|
||||||
|
useLocation,
|
||||||
|
useNavigate,
|
||||||
|
useParams,
|
||||||
|
useSearchParams,
|
||||||
|
} from 'react-router-dom';
|
||||||
|
import { ChevronRight, FolderTree, Menu } from 'lucide-react';
|
||||||
import { api } from '@/api/client';
|
import { api } from '@/api/client';
|
||||||
import type { Project, Session as SessionType } from '@/api/types';
|
import type { Project, Session as SessionType } from '@/api/types';
|
||||||
import { sessionEvents } from '@/hooks/sessionEvents';
|
import { sessionEvents } from '@/hooks/sessionEvents';
|
||||||
import { useActivePane } from '@/hooks/useActivePane';
|
import { useActivePane } from '@/hooks/useActivePane';
|
||||||
|
import { useSidebarDrawer } from '@/hooks/useSidebarDrawer';
|
||||||
|
import { useRightRailDrawer } from '@/hooks/useRightRailDrawer';
|
||||||
|
import { useViewport } from '@/hooks/useViewport';
|
||||||
|
import { useWorkspacePanes, MAX_PANES } from '@/hooks/useWorkspacePanes';
|
||||||
|
import { useSessionChats } from '@/hooks/useSessionChats';
|
||||||
|
import { useProjectGit } from '@/hooks/useProjectGit';
|
||||||
import { Workspace } from '@/components/Workspace';
|
import { Workspace } from '@/components/Workspace';
|
||||||
import { ModelPicker } from '@/components/ModelPicker';
|
import { ModelPicker } from '@/components/ModelPicker';
|
||||||
|
import { MobileTabSwitcher } from '@/components/MobileTabSwitcher';
|
||||||
|
import { NewPaneMenu } from '@/components/NewPaneMenu';
|
||||||
|
import { cn } from '@/lib/utils';
|
||||||
|
|
||||||
export function Session() {
|
export function Session() {
|
||||||
const { id } = useParams<{ id: string }>();
|
const { id } = useParams<{ id: string }>();
|
||||||
|
if (!id) return null;
|
||||||
|
// v1.8: key on id so route navigation remounts SessionInner — the hoisted
|
||||||
|
// useWorkspacePanes + useSessionChats then reinitialize cleanly from the
|
||||||
|
// new sessionId instead of carrying stale state across sessions.
|
||||||
|
return <SessionInner key={id} sessionId={id} />;
|
||||||
|
}
|
||||||
|
|
||||||
|
function SessionInner({ sessionId }: { sessionId: string }) {
|
||||||
const navigate = useNavigate();
|
const navigate = useNavigate();
|
||||||
|
const location = useLocation();
|
||||||
|
const [searchParams] = useSearchParams();
|
||||||
const [session, setSession] = useState<SessionType | null>(null);
|
const [session, setSession] = useState<SessionType | null>(null);
|
||||||
const [project, setProject] = useState<Project | null>(null);
|
const [project, setProject] = useState<Project | null>(null);
|
||||||
const [name, setName] = useState('');
|
const [name, setName] = useState('');
|
||||||
const [editingName, setEditingName] = useState(false);
|
const [editingName, setEditingName] = useState(false);
|
||||||
const active = useActivePane();
|
const active = useActivePane();
|
||||||
|
const { setOpen: setDrawerOpen } = useSidebarDrawer();
|
||||||
|
const { toggle: toggleRightRail } = useRightRailDrawer();
|
||||||
|
const { isMobile } = useViewport();
|
||||||
|
|
||||||
|
// v1.8: pane + chat state hoisted into Session so the mobile header pill
|
||||||
|
// (MobileTabSwitcher) shares one source of truth with the pane grid below.
|
||||||
|
const panesHook = useWorkspacePanes(sessionId);
|
||||||
|
const {
|
||||||
|
panes,
|
||||||
|
activePaneIdx,
|
||||||
|
setActivePaneIdx,
|
||||||
|
openChatInPane,
|
||||||
|
activePaneIdxRef,
|
||||||
|
addSplitPane,
|
||||||
|
removePane,
|
||||||
|
removeChatFromPanes,
|
||||||
|
initializeFirstChatIfEmpty,
|
||||||
|
} = panesHook;
|
||||||
|
|
||||||
|
const openChatInActivePane = useCallback(
|
||||||
|
(chatId: string) => openChatInPane(activePaneIdxRef.current, chatId),
|
||||||
|
[openChatInPane, activePaneIdxRef],
|
||||||
|
);
|
||||||
|
const chatsHook = useSessionChats(sessionId, {
|
||||||
|
removeChatFromPanes,
|
||||||
|
openChatInPane,
|
||||||
|
openChatInActivePane,
|
||||||
|
initializeFirstChatIfEmpty,
|
||||||
|
});
|
||||||
|
const { chats, renameChat } = chatsHook;
|
||||||
|
|
||||||
|
// v1.8 Level 1: branch indicator. Polls every 30s; server caches the same
|
||||||
|
// span so back-to-back loads are cheap. Returns null until the first fetch
|
||||||
|
// resolves or if the project isn't a git repo.
|
||||||
|
const git = useProjectGit(project?.id);
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if (!id) return;
|
|
||||||
setSession(null);
|
setSession(null);
|
||||||
setProject(null);
|
setProject(null);
|
||||||
let cancelled = false;
|
let cancelled = false;
|
||||||
api.sessions
|
api.sessions
|
||||||
.get(id)
|
.get(sessionId)
|
||||||
.then((s) => {
|
.then((s) => {
|
||||||
if (cancelled) return;
|
if (cancelled) return;
|
||||||
setSession(s);
|
setSession(s);
|
||||||
setName(s.name);
|
setName(s.name);
|
||||||
sessionEvents.emit({
|
sessionEvents.emit({
|
||||||
type: 'session_loaded',
|
type: 'session_loaded',
|
||||||
session_id: id,
|
session_id: sessionId,
|
||||||
project_id: s.project_id,
|
project_id: s.project_id,
|
||||||
});
|
});
|
||||||
// Load project for breadcrumb. Listing is fine — small N, cached by client.
|
|
||||||
api.projects.list().then((projects) => {
|
api.projects.list().then((projects) => {
|
||||||
if (cancelled) return;
|
if (cancelled) return;
|
||||||
const p = projects.find((x) => x.id === s.project_id);
|
const p = projects.find((x) => x.id === s.project_id);
|
||||||
if (p) setProject(p);
|
if (p) setProject(p);
|
||||||
}).catch(() => {});
|
}).catch((err) => console.warn('Session: failed to load project for breadcrumb', err));
|
||||||
})
|
})
|
||||||
.catch(() => {});
|
.catch((err) => console.warn('Session: failed to fetch session', err));
|
||||||
return () => {
|
return () => {
|
||||||
cancelled = true;
|
cancelled = true;
|
||||||
};
|
};
|
||||||
}, [id]);
|
}, [sessionId]);
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if (!id) return;
|
|
||||||
return sessionEvents.subscribe((event) => {
|
return sessionEvents.subscribe((event) => {
|
||||||
if (event.type === 'session_renamed' && event.session_id === id) {
|
if (event.type === 'session_renamed' && event.session_id === sessionId) {
|
||||||
setSession((prev) => (prev ? { ...prev, name: event.name } : prev));
|
setSession((prev) => (prev ? { ...prev, name: event.name } : prev));
|
||||||
setName((prev) => (editingName ? prev : event.name));
|
setName((prev) => (editingName ? prev : event.name));
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (
|
if (
|
||||||
(event.type === 'session_deleted' || event.type === 'session_archived') &&
|
(event.type === 'session_deleted' || event.type === 'session_archived') &&
|
||||||
event.session_id === id
|
event.session_id === sessionId
|
||||||
) {
|
) {
|
||||||
navigate(`/project/${event.project_id}`);
|
navigate(`/project/${event.project_id}`);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}, [id, editingName, navigate]);
|
}, [sessionId, editingName, navigate]);
|
||||||
|
|
||||||
|
// v1.8: URL ?pane= sync (mobile only). Lifted from Workspace.tsx so
|
||||||
|
// MobileTabSwitcher's onSwitchPane can push the same URL state and the
|
||||||
|
// browser Back button continues to walk pane history on mobile.
|
||||||
|
useEffect(() => {
|
||||||
|
if (!isMobile || panes.length === 0) return;
|
||||||
|
const paneId = searchParams.get('pane');
|
||||||
|
if (!paneId) {
|
||||||
|
if (activePaneIdx !== 0) setActivePaneIdx(0);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
const idx = panes.findIndex((p) => p.id === paneId);
|
||||||
|
if (idx >= 0 && idx !== activePaneIdx) setActivePaneIdx(idx);
|
||||||
|
}, [isMobile, searchParams, panes, activePaneIdx, setActivePaneIdx]);
|
||||||
|
|
||||||
|
const switchActivePane = useCallback(
|
||||||
|
(idx: number) => {
|
||||||
|
setActivePaneIdx(idx);
|
||||||
|
if (isMobile) {
|
||||||
|
const pane = panes[idx];
|
||||||
|
if (!pane) return;
|
||||||
|
const params = new URLSearchParams(location.search);
|
||||||
|
params.set('pane', pane.id);
|
||||||
|
navigate(`${location.pathname}?${params.toString()}`);
|
||||||
|
}
|
||||||
|
},
|
||||||
|
[setActivePaneIdx, isMobile, panes, navigate, location.pathname, location.search],
|
||||||
|
);
|
||||||
|
|
||||||
async function saveName() {
|
async function saveName() {
|
||||||
if (!id || !session) return;
|
if (!session) return;
|
||||||
const trimmed = name.trim();
|
const trimmed = name.trim();
|
||||||
if (!trimmed || trimmed === session.name) {
|
if (!trimmed || trimmed === session.name) {
|
||||||
setName(session.name);
|
setName(session.name);
|
||||||
setEditingName(false);
|
setEditingName(false);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
const updated = await api.sessions.update(id, { name: trimmed });
|
const updated = await api.sessions.update(sessionId, { name: trimmed });
|
||||||
setSession(updated);
|
setSession(updated);
|
||||||
setEditingName(false);
|
setEditingName(false);
|
||||||
// Server publishes session_renamed via broker.publishUser; no local emit needed.
|
// Server publishes session_renamed via broker.publishUser; no local emit needed.
|
||||||
@@ -79,80 +164,180 @@ export function Session() {
|
|||||||
|
|
||||||
// Workspace only sets activeFile for file-browser panes; checking it alone
|
// Workspace only sets activeFile for file-browser panes; checking it alone
|
||||||
// suffices and is forward-compatible with future pane kinds.
|
// suffices and is forward-compatible with future pane kinds.
|
||||||
const showActiveFile = active.sessionId === id && !!active.activeFile;
|
const showActiveFile = active.sessionId === sessionId && !!active.activeFile;
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className="flex-1 flex flex-col min-h-0">
|
<div className="flex-1 flex flex-col min-h-0">
|
||||||
<header className="border-b px-4 py-2 flex items-center gap-1.5 shrink-0 text-sm">
|
<header
|
||||||
<Link to="/" className="text-muted-foreground hover:text-foreground">
|
className={cn(
|
||||||
Projects
|
'border-b shrink-0 text-sm',
|
||||||
</Link>
|
isMobile
|
||||||
<ChevronRight className="size-3 text-muted-foreground/60" />
|
? 'flex flex-col gap-1.5 px-3 py-2'
|
||||||
{project ? (
|
: 'flex items-center gap-1.5 px-3 sm:px-4 py-2',
|
||||||
<Link
|
|
||||||
to={`/project/${project.id}`}
|
|
||||||
className="text-muted-foreground hover:text-foreground truncate max-w-[200px]"
|
|
||||||
title={project.name}
|
|
||||||
>
|
|
||||||
{project.name}
|
|
||||||
</Link>
|
|
||||||
) : (
|
|
||||||
<span className="text-muted-foreground/60">…</span>
|
|
||||||
)}
|
)}
|
||||||
<ChevronRight className="size-3 text-muted-foreground/60" />
|
style={{ paddingTop: 'max(0.5rem, env(safe-area-inset-top))' }}
|
||||||
{editingName ? (
|
>
|
||||||
<input
|
{isMobile ? (
|
||||||
autoFocus
|
|
||||||
value={name}
|
|
||||||
onChange={(e) => setName(e.target.value)}
|
|
||||||
onBlur={() => void saveName()}
|
|
||||||
onKeyDown={(e) => {
|
|
||||||
if (e.key === 'Enter') void saveName();
|
|
||||||
if (e.key === 'Escape') {
|
|
||||||
setName(session?.name ?? '');
|
|
||||||
setEditingName(false);
|
|
||||||
}
|
|
||||||
}}
|
|
||||||
className="bg-transparent border-b border-border px-1 py-0.5 text-sm font-medium outline-none focus:border-ring"
|
|
||||||
/>
|
|
||||||
) : (
|
|
||||||
<button
|
|
||||||
type="button"
|
|
||||||
className="text-sm font-medium hover:underline truncate max-w-[280px]"
|
|
||||||
onClick={() => setEditingName(true)}
|
|
||||||
title={session?.name ?? ''}
|
|
||||||
>
|
|
||||||
{session?.name ?? '…'}
|
|
||||||
</button>
|
|
||||||
)}
|
|
||||||
{showActiveFile && active.activeFile && (
|
|
||||||
<>
|
<>
|
||||||
<span className="text-muted-foreground/40 mx-1">·</span>
|
{/* v1.8 mobile row 1: hamburger | repo+branch | ModelPicker | FolderTree.
|
||||||
<span
|
Gear/kebab cluster lands in Batch 7; ModelPicker stays here until
|
||||||
className="text-xs font-mono text-muted-foreground truncate max-w-[320px]"
|
then so mobile users keep model-switching access. */}
|
||||||
title={active.activeFile}
|
<div className="flex items-center gap-1.5">
|
||||||
>
|
<button
|
||||||
{active.activeFile}
|
type="button"
|
||||||
</span>
|
onClick={() => setDrawerOpen(true)}
|
||||||
</>
|
className="inline-flex items-center justify-center -ml-1 min-w-[44px] min-h-[44px] rounded text-muted-foreground hover:bg-muted hover:text-foreground shrink-0"
|
||||||
)}
|
aria-label="Open sidebar"
|
||||||
<div className="ml-auto">
|
>
|
||||||
{session && (
|
<Menu className="size-5" />
|
||||||
<div className="inline-flex items-center rounded-full bg-muted/40 hover:bg-muted/70 px-1">
|
</button>
|
||||||
<ModelPicker
|
|
||||||
value={session.model}
|
<div className="flex-1 min-w-0 flex items-center justify-center gap-1.5">
|
||||||
onChange={async (model) => {
|
{project ? (
|
||||||
const updated = await api.sessions.update(session.id, { model });
|
<span className="text-sm font-medium truncate" title={project.name}>
|
||||||
setSession(updated);
|
{project.name}
|
||||||
}}
|
</span>
|
||||||
|
) : (
|
||||||
|
<span className="text-muted-foreground/60">…</span>
|
||||||
|
)}
|
||||||
|
{git?.branch && (
|
||||||
|
<span
|
||||||
|
className="text-muted-foreground/80 text-xs truncate"
|
||||||
|
title={`branch: ${git.branch}${git.is_dirty ? ' (dirty)' : ''}`}
|
||||||
|
>
|
||||||
|
· {git.branch}
|
||||||
|
</span>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{session && (
|
||||||
|
<div className="inline-flex items-center rounded-full bg-muted/40 hover:bg-muted/70 px-1 shrink-0">
|
||||||
|
<ModelPicker
|
||||||
|
value={session.model}
|
||||||
|
onChange={async (model) => {
|
||||||
|
const updated = await api.sessions.update(session.id, { model });
|
||||||
|
setSession(updated);
|
||||||
|
}}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
|
||||||
|
<button
|
||||||
|
type="button"
|
||||||
|
onClick={toggleRightRail}
|
||||||
|
className="inline-flex items-center justify-center -mr-1 min-w-[44px] min-h-[44px] rounded text-muted-foreground hover:bg-muted hover:text-foreground shrink-0"
|
||||||
|
aria-label="Toggle file browser"
|
||||||
|
>
|
||||||
|
<FolderTree className="size-5" />
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{/* v1.8 mobile row 2: pane-switcher pill + new-pane menu. Pill
|
||||||
|
expands; NewPaneMenu is the trailing 44x44 trigger. */}
|
||||||
|
<div className="flex items-center gap-1.5">
|
||||||
|
<MobileTabSwitcher
|
||||||
|
panes={panes}
|
||||||
|
activePaneIdx={activePaneIdx}
|
||||||
|
chats={chats}
|
||||||
|
onSwitchPane={switchActivePane}
|
||||||
|
onRemovePane={removePane}
|
||||||
|
onRenameChat={renameChat}
|
||||||
|
/>
|
||||||
|
<NewPaneMenu
|
||||||
|
onAddPane={addSplitPane}
|
||||||
|
disabled={panes.length >= MAX_PANES}
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
)}
|
</>
|
||||||
</div>
|
) : (
|
||||||
|
<>
|
||||||
|
{/* Desktop: unchanged single-row header. */}
|
||||||
|
<div className="hidden sm:flex items-center gap-1.5 min-w-0">
|
||||||
|
<Link to="/" className="text-muted-foreground hover:text-foreground shrink-0 text-xs">
|
||||||
|
Projects
|
||||||
|
</Link>
|
||||||
|
<ChevronRight className="size-3 text-muted-foreground/60 shrink-0" />
|
||||||
|
{project ? (
|
||||||
|
<Link
|
||||||
|
to={`/project/${project.id}`}
|
||||||
|
className="text-muted-foreground hover:text-foreground truncate max-w-[200px]"
|
||||||
|
title={project.name}
|
||||||
|
>
|
||||||
|
{project.name}
|
||||||
|
</Link>
|
||||||
|
) : (
|
||||||
|
<span className="text-muted-foreground/60">…</span>
|
||||||
|
)}
|
||||||
|
<ChevronRight className="size-3 text-muted-foreground/60 shrink-0" />
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{editingName ? (
|
||||||
|
<input
|
||||||
|
autoFocus
|
||||||
|
value={name}
|
||||||
|
onChange={(e) => setName(e.target.value)}
|
||||||
|
onBlur={() => void saveName()}
|
||||||
|
onKeyDown={(e) => {
|
||||||
|
if (e.key === 'Enter') void saveName();
|
||||||
|
if (e.key === 'Escape') {
|
||||||
|
setName(session?.name ?? '');
|
||||||
|
setEditingName(false);
|
||||||
|
}
|
||||||
|
}}
|
||||||
|
className="bg-transparent border-b border-border px-1 py-0.5 text-sm font-medium outline-none focus:border-ring min-w-0"
|
||||||
|
/>
|
||||||
|
) : (
|
||||||
|
<button
|
||||||
|
type="button"
|
||||||
|
className="text-sm font-medium hover:underline truncate max-w-[280px] min-w-0"
|
||||||
|
onClick={() => setEditingName(true)}
|
||||||
|
title={session?.name ?? ''}
|
||||||
|
>
|
||||||
|
{session?.name ?? '…'}
|
||||||
|
</button>
|
||||||
|
)}
|
||||||
|
|
||||||
|
{showActiveFile && active.activeFile && (
|
||||||
|
<>
|
||||||
|
<span className="text-muted-foreground/40 mx-1">·</span>
|
||||||
|
<span
|
||||||
|
className="text-xs font-mono text-muted-foreground truncate max-w-[200px]"
|
||||||
|
title={active.activeFile}
|
||||||
|
>
|
||||||
|
{active.activeFile}
|
||||||
|
</span>
|
||||||
|
</>
|
||||||
|
)}
|
||||||
|
|
||||||
|
<div className="ml-auto shrink-0">
|
||||||
|
{session && (
|
||||||
|
<div className="inline-flex items-center rounded-full bg-muted/40 hover:bg-muted/70 px-1">
|
||||||
|
<ModelPicker
|
||||||
|
value={session.model}
|
||||||
|
onChange={async (model) => {
|
||||||
|
const updated = await api.sessions.update(session.id, { model });
|
||||||
|
setSession(updated);
|
||||||
|
}}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
</>
|
||||||
|
)}
|
||||||
</header>
|
</header>
|
||||||
|
|
||||||
{id && session && (
|
{session && (
|
||||||
<Workspace sessionId={id} projectId={session.project_id} />
|
<Workspace
|
||||||
|
sessionId={sessionId}
|
||||||
|
projectId={session.project_id}
|
||||||
|
agentId={session.agent_id}
|
||||||
|
onAgentChange={async (agent_id) => {
|
||||||
|
const updated = await api.sessions.update(session.id, { agent_id });
|
||||||
|
setSession(updated);
|
||||||
|
}}
|
||||||
|
panesHook={panesHook}
|
||||||
|
chatsHook={chatsHook}
|
||||||
|
/>
|
||||||
)}
|
)}
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
|
|||||||
340
boocode_roadmap.md
Normal file
340
boocode_roadmap.md
Normal file
@@ -0,0 +1,340 @@
|
|||||||
|
# BooCode v1.x — Roadmap
|
||||||
|
|
||||||
|
Last updated: 2026-05-16
|
||||||
|
|
||||||
|
## Overview
|
||||||
|
|
||||||
|
BooCode is a standalone code-chat tool at `/opt/boocode/`. Read-only by design — pick a project, chat with a local LLM that has file-inspection tools, get streaming responses over WebSocket.
|
||||||
|
|
||||||
|
Live at `https://code.indifferentketchup.com` (Caddy → Authelia → Tailscale → `100.114.205.53:9500`).
|
||||||
|
|
||||||
|
**Architectural commitments:**
|
||||||
|
|
||||||
|
- No embeddings. The model uses file-view tools (`view_file`, `list_dir`, `grep`, `find_files`) + sidecar analyzers (codecontext, codesight). Walked away from the RAG pipeline May 2026.
|
||||||
|
- Read-only in v1.x. Write tools land in BooCoder (separate container, post-v1.x).
|
||||||
|
- One Postgres (`boocode_db`), one frontend SPA, container-per-service for new capabilities.
|
||||||
|
|
||||||
|
External code lifted from / referenced in: see `boocode_code_review.md` for full inventory.
|
||||||
|
|
||||||
|
-----
|
||||||
|
|
||||||
|
## Batch summary
|
||||||
|
|
||||||
|
|Batch |Theme |Status |Branch / Notes |
|
||||||
|
|------------------------------------------|-----------------------------------------------------------------------------------|-----------|---------------------------------------|
|
||||||
|
|1 |Markdown, Copy + Regen, tok/s + ctx, AI naming |✅ Done |`v1.1-batch1` merged |
|
||||||
|
|2 |Sidebar restructure |✅ Done |`v1.1-batch2` merged |
|
||||||
|
|3 |Pane system, FileBrowserPane + Shiki, cross-tab |✅ Done |`v1.1-batch3` merged |
|
||||||
|
|3.5 |Chip infrastructure, `@file`, line-select |✅ Done |merged |
|
||||||
|
|4 (v1.2) |Chats inside sessions, right-rail, `/compact`, archive, force-send |✅ Done |merged |
|
||||||
|
|4.1–4.4 |Project archive, sidebar context, Gitea API, bootstrap |✅ Done |merged |
|
||||||
|
|v1.5 cleanup |resolveProjectPath, BOOTSTRAP_ROOT, vitest pin |✅ Done |merged |
|
||||||
|
|v1.6 mobile |Drawer, single-pane, long-press, IME-safe, pull-to-refresh, swipe-close |✅ Done |merged |
|
||||||
|
|v1.6.1 |RightRail mobile wrapper fix |✅ Done |merged |
|
||||||
|
|Tool-loop bump |MAX_TOOL_LOOP_DEPTH 5→15 |✅ Done |merged |
|
||||||
|
|v1.6.2 |Workspace + Session+Project headers + ChatTabBar new-chat + RightRail mobile drawer|🔄 In flight|`v1.6.2-mobile-ui-fixes` |
|
||||||
|
|**v1.8 mobile tabs** |**Bottom-sheet pane switcher + cross-tab `pane_status` WS sync + StatusDot on tabs**|**Next up**|`v1.8-mobile-tabs`; hand-rolled sheet |
|
||||||
|
|9 (REORDERED, DECOUPLED) |Agents (Tier 2): `AGENTS.md`, per-agent temp/tools, picker in ChatInput toolbar |✅ Implemented, uncommitted|six builtins; on `main` awaiting commit|
|
||||||
|
|5 |Fork message, delete message, header polish |Planned | |
|
||||||
|
|6 |Drag-drop file + paste-as-attachment |Planned |thin extension of 3.5 chips |
|
||||||
|
|7 |Settings drawer: system prompt, web search toggle, agent entry |Planned |adds SettingsDrawer agent entry (Batch 9 deferred half) |
|
||||||
|
|8 |Web search backend: SearXNG `web_search` + `web_fetch` |Planned | |
|
||||||
|
|10 |BooTerm: separate container, xterm.js + node-pty + tmux |Planned | |
|
||||||
|
|11 — Architect: codebase map |codecontext sidecar + MCP tool wiring |Planned |from nmakod/codecontext |
|
||||||
|
|11b — Architect: repo health |call graph, circular deps, dead code |Planned |from spirituslab/codesight |
|
||||||
|
|12 — Tool approval + plan/act mode |Read-only invariant, per-tool gating |Planned |from cline |
|
||||||
|
|13 — Append-only event log |Replace messages-table semantics |Planned |from OpenHands V1 |
|
||||||
|
|14 — BooCoder: pending changes |Sandboxed edit queue, atomic apply |Post-v1.x |from plandex |
|
||||||
|
|15 — BooCoder runtime isolation |Per-session Docker sandbox |Post-v1.x |from OpenHands |
|
||||||
|
|16 — Multi-provider LLM |Optional litellm-style abstraction |Optional |from pi-ai |
|
||||||
|
|17 — Workflow graphs |Multi-agent coordination |Far future |from microsoft/agent-framework concepts|
|
||||||
|
|
||||||
|
**Old Batch 12 (codebase indexer w/ Harrier embeddings) — REMOVED.** Replaced by Batch 11/11b sidecar approach. See `boocode_code_review.md` decisions log.
|
||||||
|
|
||||||
|
**Batch 9 reordered ahead of 5–8, 10.** Picker mounts in `ChatInput.tsx` toolbar only. SettingsDrawer agent entry rolled into Batch 7 when it lands. No UI dependency on Batches 5/6/7, so it can ship anytime after v1.6.2.
|
||||||
|
|
||||||
|
-----
|
||||||
|
|
||||||
|
## Batch details (planned / new)
|
||||||
|
|
||||||
|
### Batch 9 — Agents (Tier 2, DECOUPLED)
|
||||||
|
|
||||||
|
**Spec:** `boocode_batch9.md` with the deltas below.
|
||||||
|
|
||||||
|
**Status:** Next up after v1.6.2 merges. Decoupled from Batch 7.
|
||||||
|
|
||||||
|
**Deltas from `boocode_batch9.md`:**
|
||||||
|
|
||||||
|
1. Builtin defaults in `agents.ts` OMIT the `model` field. Resolution order makes `session.model` win when `agent.model` is null. Spec line 30 example is misleading — do not hardcode any model in builtins.
|
||||||
|
2. Builtin defaults are the six agents shipped in `/opt/boocode/AGENTS.md`: **Code Reviewer, Debugger, Refactorer, Architect, Security Auditor, Prompt Builder.** If project root `AGENTS.md` exists, only its agents show. If absent, show the six builtins.
|
||||||
|
3. AgentPicker mounts in `ChatInput.tsx` toolbar between ModelPicker and the `+` button. **No `SettingsDrawer.tsx` or `Header.tsx` changes in this batch.**
|
||||||
|
4. SettingsDrawer agent entry + Header active-agent badge moved to Batch 7.
|
||||||
|
|
||||||
|
**Files to create:**
|
||||||
|
|
||||||
|
- `apps/server/src/services/agents.ts` — parser, six builtin defaults, mtime-keyed cache.
|
||||||
|
- `apps/server/src/routes/agents.ts` — `GET /api/projects/:id/agents`.
|
||||||
|
- `apps/web/src/components/AgentPicker.tsx` — dropdown, matches ModelPicker pattern.
|
||||||
|
|
||||||
|
**Files to modify:**
|
||||||
|
|
||||||
|
- `apps/server/src/schema.sql` — `ALTER TABLE sessions ADD COLUMN IF NOT EXISTS agent_id TEXT;`
|
||||||
|
- `apps/server/src/services/inference.ts` — resolution order: `effective_system_prompt`, `effective_model`, `effective_temperature`, `effective_tools` from session + agent + project. Filter tools array against agent whitelist before sending to llama-swap.
|
||||||
|
- `apps/server/src/routes/sessions.ts` — PATCH accepts `agent_id`.
|
||||||
|
- `apps/server/src/types/api.ts` — Agent type, extend Session with `agent_id`.
|
||||||
|
- `apps/web/src/api/client.ts`, `apps/web/src/api/types.ts` — Agent type, `api.agents.list(projectId)`.
|
||||||
|
- `apps/web/src/components/ChatInput.tsx` — mount AgentPicker.
|
||||||
|
|
||||||
|
**Testing plan (manual, before locking temps):**
|
||||||
|
|
||||||
|
- Drop `/opt/boocode/AGENTS.md` (six agents, no `model` field on any).
|
||||||
|
- For each of the 7 keeper models, switch session model and run the same target prompt against each agent. Log tok/s, instruction-following quality.
|
||||||
|
- Adjust per-agent temperature in `AGENTS.md` based on results.
|
||||||
|
- A/B candidates: qwen3.6-35b-a3b-mxfp4 (daily), qwopus3.6-35b-a3b-q4 (reasoning), qwopus3.5-27b-q4, qwen3.6-27b-ud-q4-xl, nemotron-3-nano-30b, gemma-4-26b-a4b-mxfp4, qwen3-coder-30b-apex.
|
||||||
|
|
||||||
|
**Dependencies:** v1.6.2 merged.
|
||||||
|
|
||||||
|
-----
|
||||||
|
|
||||||
|
### Batch 11 — Architect: codebase map (REVISED)
|
||||||
|
|
||||||
|
**Inspiration / lift:** `nmakod/codecontext` (MIT, Go binary).
|
||||||
|
|
||||||
|
**What it gives BooCode:** an architect-grade codebase overview without embeddings. Codecontext parses the repo with tree-sitter, extracts symbols, builds import/dependency relationships, and exposes the result via an MCP server with 8 tools. The model gets a structural map of any codebase on demand.
|
||||||
|
|
||||||
|
**Why this replaces the original Batch 11 (aider PageRank port):** codecontext is a finished binary in our stack language (Go), with watch mode, incremental updates, framework detection, and git-co-change-based semantic neighborhoods (no embeddings). The aider port would be reimplementing what codecontext already ships.
|
||||||
|
|
||||||
|
**Scope:**
|
||||||
|
|
||||||
|
- Add `codecontext` sidecar container to `docker-compose.yml`. Mount the project root read-only. One sidecar per BooCode instance — projects are addressed by absolute path.
|
||||||
|
- Wire each codecontext MCP tool into BooCode’s `inference/tools.ts` as a native tool the model can call:
|
||||||
|
- `repo_overview(project_id)` → codecontext `get_codebase_overview`
|
||||||
|
- `repo_file_analysis(project_id, path)` → `get_file_analysis`
|
||||||
|
- `repo_symbol_info(project_id, symbol)` → `get_symbol_info`
|
||||||
|
- `repo_search_symbols(project_id, query)` → `search_symbols`
|
||||||
|
- `repo_dependencies(project_id, path)` → `get_dependencies`
|
||||||
|
- `repo_semantic_neighborhoods(project_id, path)` → `get_semantic_neighborhoods` (git co-change)
|
||||||
|
- `repo_framework_analysis(project_id)` → `get_framework_analysis`
|
||||||
|
- `path_guard.ts` extension: incorporate `continuedev/continue` `DEFAULT_SECURITY_IGNORE_FILETYPES` so codecontext can’t surface `.env`, `.pem`, keys, etc.
|
||||||
|
- Fallback grammars: drop `Aider-AI/aider`‘s `aider/queries/tree-sitter-*.scm` files for any language codecontext doesn’t cover. Use them via an in-process tree-sitter wrapper *only if* a project needs an unsupported language. Defer wrapper build until that’s an actual gap.
|
||||||
|
|
||||||
|
**Where it goes:** new `apps/server/src/architect/` directory. No new tables — codecontext maintains its own state on disk. New env: `CODECONTEXT_URL=http://codecontext:8765` (MCP endpoint).
|
||||||
|
|
||||||
|
**Decisions to make at recon time:**
|
||||||
|
|
||||||
|
- Bundle the binary directly in the BooCode Dockerfile, or run codecontext as its own service? Sidecar is cleaner. Bundle is one less container.
|
||||||
|
- How does the model discover codecontext tools — register them statically in the tools registry, or proxy MCP `tools/list` at startup?
|
||||||
|
|
||||||
|
**Dependencies:** none. Can ship before Batches 5–10.
|
||||||
|
|
||||||
|
-----
|
||||||
|
|
||||||
|
### Batch 11b — Architect: repo health (NEW)
|
||||||
|
|
||||||
|
**Inspiration / lift:** `spirituslab/codesight` (MIT-ish, TS/Node).
|
||||||
|
|
||||||
|
**What it gives BooCode:** complement to Batch 11. Where codecontext answers “what is this codebase,” repo health answers “what’s wrong with this codebase.” Call graph, circular dependency detection, dead code flagging.
|
||||||
|
|
||||||
|
**Scope:**
|
||||||
|
|
||||||
|
- Port codesight’s `analyze.mjs` analyzer core into `apps/server/src/architect/repo_health.ts`. Drop the VS Code extension shell. Keep:
|
||||||
|
- Symbol extraction (already overlaps codecontext — call codecontext where possible, only redo what’s needed for graph edges).
|
||||||
|
- Call graph builder (function-to-function edges).
|
||||||
|
- Circular dependency detector.
|
||||||
|
- Dead code detector (exported symbols never imported or called).
|
||||||
|
- New tool: `repo_health(project_id)` returning `{ circular_dependencies: [...], dead_code: [...] }`. Output respects codesight’s documented false-positive caveats (customElements.define, framework entry points, dynamic imports) — surface those in the tool description so the model doesn’t trust dead-code flags blindly.
|
||||||
|
- Cache results in `boocode_db` keyed by `(project_id, file_hashes)`. Invalidate on file change via file-index hash check.
|
||||||
|
|
||||||
|
**Decisions:**
|
||||||
|
|
||||||
|
- Build it in-process (Node) vs spawn a CLI? In-process is simpler. Spawn matches codecontext sidecar pattern but adds latency.
|
||||||
|
|
||||||
|
**Dependencies:** Batch 11 merged (so we can reuse codecontext’s parse output where possible). Can be deferred until after Batches 5–10.
|
||||||
|
|
||||||
|
-----
|
||||||
|
|
||||||
|
### Batch 12 — Tool approval gating + plan/act mode
|
||||||
|
|
||||||
|
**Inspiration / lift:** `cline/cline` (Apache-2.0).
|
||||||
|
|
||||||
|
**What it gives BooCode:** per-session control over which tools the model can call. Lays the groundwork for BooCoder by building the gating mechanism before there are any write tools to gate.
|
||||||
|
|
||||||
|
**Scope:**
|
||||||
|
|
||||||
|
- New column `sessions.tool_approval_mode TEXT` — values: `read_only` (v1.x default), `plan`, `act_auto`, `act_approve`.
|
||||||
|
- New column `sessions.approved_tools JSONB` — per-session whitelist for `act_approve` mode.
|
||||||
|
- Tool registry refactor: tools tagged `read_only` or `write`. In `read_only` mode (v1.x), write tools never appear in the model’s tools array. In `plan` mode, same — write tools hidden, model produces a plan only. `act_*` modes unlock writes (post-v1.x).
|
||||||
|
- UI: mode picker in SettingsDrawer (Batch 7 dependency). Inline indicator in chat header.
|
||||||
|
|
||||||
|
**Dependencies:** Batch 7 (SettingsDrawer).
|
||||||
|
|
||||||
|
-----
|
||||||
|
|
||||||
|
### Batch 13 — Append-only event log
|
||||||
|
|
||||||
|
**Inspiration / lift:** `OpenHands/OpenHands` V1 (MIT).
|
||||||
|
|
||||||
|
**What it gives BooCode:** replaces the ad-hoc `messages` table semantics with a typed event stream. Unlocks rewind, time-travel, and clean handoff semantics for multi-agent flows.
|
||||||
|
|
||||||
|
**Scope:**
|
||||||
|
|
||||||
|
- New `session_events` table: `(id, session_id, ts, kind, payload JSONB, parent_id)`. Event kinds: `user_message`, `assistant_message`, `tool_call`, `tool_result`, `pane_action`, `mode_change`, `system`.
|
||||||
|
- Existing `messages` table becomes a derived view over `session_events` for backward compatibility, then deprecated over a release.
|
||||||
|
- Inference loop emits events instead of mutating message rows.
|
||||||
|
- Frontend `useSessionStream` reducer rewritten to consume events.
|
||||||
|
|
||||||
|
**Migration is non-trivial.** Plan in a dedicated batch with explicit cutover window.
|
||||||
|
|
||||||
|
**Dependencies:** Batches 5 (fork/delete) and 7 (settings) merged. Must not be in flight with other backend work.
|
||||||
|
|
||||||
|
-----
|
||||||
|
|
||||||
|
### Batch 14 — BooCoder: pending changes
|
||||||
|
|
||||||
|
**Inspiration / lift:** `plandex-ai/plandex` (MIT).
|
||||||
|
|
||||||
|
**What it gives BooCode:** safe write tools. Edits queue in a virtual layer; nothing touches the filesystem until explicit `/apply`.
|
||||||
|
|
||||||
|
**Scope:**
|
||||||
|
|
||||||
|
- New container `boocoder` at `100.114.205.53:9502`. Owns write tools (`edit_file`, `create_file`, `delete_file`, `apply_pending`, `rewind`).
|
||||||
|
- New table `pending_changes (id, session_id, file_path, diff TEXT, status, created_at)`. Status: `pending`, `applied`, `rejected`.
|
||||||
|
- Tools execute against the pending-changes layer, not the filesystem. `apply_pending` is the only path that touches disk. `rewind` rolls back a `pending`-id back to disk state.
|
||||||
|
- BooCode chat container stays read-only (`/opt:/opt:ro`). BooCoder mounts `/opt/repos:/opt/repos:rw` and uses git worktree pattern from paseo for isolation.
|
||||||
|
- Frontend: new pane kind `pending_diff` shows the queued diff inline with Approve/Reject per chunk.
|
||||||
|
|
||||||
|
**Dependencies:** Batches 12 (gating) + 13 (events). Don’t start until both are live.
|
||||||
|
|
||||||
|
-----
|
||||||
|
|
||||||
|
### Batch 15 — BooCoder runtime isolation
|
||||||
|
|
||||||
|
**Inspiration / lift:** `OpenHands/OpenHands` (MIT).
|
||||||
|
|
||||||
|
**What it gives BooCode:** per-session Docker sandbox for BooCoder writes. Closes the `/opt:ro` mount risk identified in v1.x open items.
|
||||||
|
|
||||||
|
**Scope:**
|
||||||
|
|
||||||
|
- Per-session container spawned by BooCoder on first write. Container has only the project’s path mounted, not `/opt`.
|
||||||
|
- Container lifecycle: spawn on first write call, idle-timeout after 30 min, recreate on resume.
|
||||||
|
- Action execution server pattern: HTTP API inside the container, BooCoder calls in. Standard OpenHands runtime contract.
|
||||||
|
|
||||||
|
**Dependencies:** Batch 14.
|
||||||
|
|
||||||
|
-----
|
||||||
|
|
||||||
|
### Batch 16 — Multi-provider LLM abstraction
|
||||||
|
|
||||||
|
**Inspiration / lift:** `earendil-works/pi` `pi-ai` (MIT).
|
||||||
|
|
||||||
|
**What it gives BooCode:** optional non-llama-swap inference paths (Anthropic, OpenAI, Mistral direct). Currently we have one provider (llama-swap) and the existing `streamCompletion` is hardcoded to OpenAI-compatible at that endpoint.
|
||||||
|
|
||||||
|
**Scope:**
|
||||||
|
|
||||||
|
- Provider abstraction: `interface LLMProvider { stream(req): AsyncIterator<Frame> }`.
|
||||||
|
- Built-in: llama-swap (current), Anthropic, OpenAI (Codex-style).
|
||||||
|
- Per-session `provider_id` column.
|
||||||
|
|
||||||
|
**Status:** **Optional. Skip unless a concrete need surfaces.** llama-swap covers daily driver work.
|
||||||
|
|
||||||
|
-----
|
||||||
|
|
||||||
|
### Batch 17 — Workflow graphs
|
||||||
|
|
||||||
|
**Inspiration / lift:** `microsoft/agent-framework` (MIT) — concepts only.
|
||||||
|
|
||||||
|
**What it gives BooCode:** multi-agent coordination. Architect → Coder → Reviewer → Verifier handoffs orchestrated by a YAML-defined workflow.
|
||||||
|
|
||||||
|
**Status:** **Far future.** Read agent-framework’s `docs/decisions/` ADRs. Don’t port code — Azure/.NET-heavy.
|
||||||
|
|
||||||
|
**Dependencies:** Batches 12 (modes), 13 (events). Realistically a v2.x topic.
|
||||||
|
|
||||||
|
-----
|
||||||
|
|
||||||
|
## Order of operations
|
||||||
|
|
||||||
|
Two tracks. Pick one to drive next.
|
||||||
|
|
||||||
|
**Track A — Finish v1.x mobile + polish then agents:**
|
||||||
|
|
||||||
|
- v1.6.2 ships (in flight)
|
||||||
|
- **Batch 9 (agents)** — decoupled, can land next; no UI dependency on 5/6/7
|
||||||
|
- Batches 5, 6, 7, 8 in order. Each is small, frontend-heavy, no architecture risk. Batch 7 absorbs SettingsDrawer agent entry.
|
||||||
|
|
||||||
|
**Track B — Begin architect capabilities in parallel:**
|
||||||
|
|
||||||
|
- Batch 11 (codecontext sidecar) — biggest single capability jump. Frontend stays the same; new tools appear to the model.
|
||||||
|
- Batch 11b (repo health) — follow-up.
|
||||||
|
- Batch 12 (gating) — sets up everything post-v1.x.
|
||||||
|
|
||||||
|
Recommendation: ship v1.6.2, then **Batch 9 (agents)** next so the test bed exists before Track A continues. Then Track A through Batch 7. Batch 11 can run in parallel with Batches 8–10 since 11 has no UI dependency.
|
||||||
|
|
||||||
|
-----
|
||||||
|
|
||||||
|
## Architecture target state
|
||||||
|
|
||||||
|
### Containers
|
||||||
|
|
||||||
|
|Container |Port |Mount |Purpose |Status |
|
||||||
|
|-------------|--------------------------------|--------------------------|------------------------------|--------|
|
||||||
|
|`boocode` |`100.114.205.53:9500` |`/opt:/opt:ro` |Chat + read-only tools + SPA |Live |
|
||||||
|
|`boocode_db` |`127.0.0.1:5500` |`boocode_pgdata` volume |Postgres 16-alpine |Live |
|
||||||
|
|`codecontext`|`100.114.205.53:8765` (internal)|project root :ro |MCP server for architect tools|Batch 11|
|
||||||
|
|`booterm` |`100.114.205.53:9501` |`/opt/repos:/opt/repos:rw`|Terminals (tmux + node-pty) |Batch 10|
|
||||||
|
|`boocoder` |`100.114.205.53:9502` |per-session sandbox |Write tools |Batch 14|
|
||||||
|
|
||||||
|
### Schema additions
|
||||||
|
|
||||||
|
**Batch 9:** `sessions.agent_id TEXT` (nullable; references AGENTS.md by slug).
|
||||||
|
**Batch 11:** none (codecontext stateless on disk).
|
||||||
|
**Batch 11b:** `repo_health_cache (project_id, file_hashes_sig, payload JSONB, created_at)`.
|
||||||
|
**Batch 12:** `sessions.tool_approval_mode`, `sessions.approved_tools`.
|
||||||
|
**Batch 13:** `session_events`; deprecate `messages` long-tail.
|
||||||
|
**Batch 14:** `pending_changes`.
|
||||||
|
|
||||||
|
-----
|
||||||
|
|
||||||
|
## Lift sources (summary)
|
||||||
|
|
||||||
|
Full inventory in `boocode_code_review.md`. Headline items:
|
||||||
|
|
||||||
|
|Source |Used for |Where |
|
||||||
|
|--------------------------------------|----------------------------------------|---------------------|
|
||||||
|
|nmakod/codecontext (MIT, Go) |Architect: codebase map sidecar |Batch 11 |
|
||||||
|
|spirituslab/codesight (MIT-ish, TS) |Architect: repo health analyzer |Batch 11b |
|
||||||
|
|Aider-AI/aider (Apache-2.0) |Fallback `.scm` grammars (60+ languages)|Batch 11 (fallback) |
|
||||||
|
|continuedev/continue (Apache-2.0) |DEFAULT_SECURITY_IGNORE_FILETYPES |Batch 11 prep |
|
||||||
|
|cline/cline (Apache-2.0) |Plan/Act mode pattern |Batch 12 |
|
||||||
|
|plandex-ai/plandex (MIT) |Pending-changes data model |Batch 14 |
|
||||||
|
|OpenHands/OpenHands (MIT) |Event log + sandbox runtime |Batches 13, 15 |
|
||||||
|
|aimasteracc/tree-sitter-analyzer (MIT)|Outline-first response patterns |Reference |
|
||||||
|
|earendil-works/pi (MIT) |Multi-provider LLM |Batch 16 (optional) |
|
||||||
|
|rshah515/claude-code-subagents (MIT) |Reference for builtin agent prompts |Batch 9 (six builtins)|
|
||||||
|
|microsoft/agent-framework (MIT) |Workflow concepts |Batch 17 (far future)|
|
||||||
|
|
||||||
|
-----
|
||||||
|
|
||||||
|
## Decisions log
|
||||||
|
|
||||||
|
- **Embeddings dropped from BooCode.** Replaced RAG with file-view tools + sidecar analyzers.
|
||||||
|
- **Original Batch 11 (aider PageRank port) replaced** by codecontext sidecar approach.
|
||||||
|
- **Original Batch 12 (codebase indexer w/ Harrier) removed** entirely. No embedding infrastructure in BooCode v1.x.
|
||||||
|
- **Globstar parked** — not an architect tool, future verify-before-commit candidate only.
|
||||||
|
- **codeprysm rejected** — embedding-based; node/edge taxonomy noted as reference if we ever build our own graph.
|
||||||
|
- **Batch 9 decoupled from Batch 7 (2026-05-16).** AgentPicker mounts in `ChatInput.tsx` toolbar only. SettingsDrawer agent entry and Header active-agent badge moved to Batch 7. Builtin defaults shipped: six agents (Code Reviewer, Debugger, Refactorer, Architect, Security Auditor, Prompt Builder) with no `model` field — session model wins by default.
|
||||||
|
|
||||||
|
-----
|
||||||
|
|
||||||
|
## Workflow
|
||||||
|
|
||||||
|
Each batch:
|
||||||
|
|
||||||
|
1. Verify previous batch merged.
|
||||||
|
2. Dispatch via Paseo to Claude Code at `/opt/boocode`.
|
||||||
|
3. Claude Code recon → blocking questions → implement → hand back.
|
||||||
|
4. Compliance review in separate Claude chat.
|
||||||
|
5. Deploy: `docker compose up --build -d`.
|
||||||
|
6. Smoke test.
|
||||||
|
7. Sam commits and pushes.
|
||||||
|
|
||||||
|
Sam reviews all diffs. Sam commits. Never git pull/push/commit on his behalf.
|
||||||
@@ -9,7 +9,15 @@ services:
|
|||||||
environment:
|
environment:
|
||||||
DATABASE_URL: postgres://boocode:${POSTGRES_PASSWORD}@boocode_db:5432/boocode
|
DATABASE_URL: postgres://boocode:${POSTGRES_PASSWORD}@boocode_db:5432/boocode
|
||||||
volumes:
|
volumes:
|
||||||
- /opt:/opt:rw
|
# Read-only mount for legacy/existing project add-existing flow.
|
||||||
|
- /opt:/opt:ro
|
||||||
|
# Writable mount only for the create-new-project bootstrap target.
|
||||||
|
# Host must `mkdir -p /opt/projects` before container start.
|
||||||
|
- /opt/projects:/opt/projects:rw
|
||||||
|
- ./secrets/boocode_gitea:/root/.ssh/id_ed25519:ro
|
||||||
|
# v1.8.1: global agents file. Host seeds it once before deploy:
|
||||||
|
# cp /opt/boocode/AGENTS.md /opt/boocode/data/AGENTS.md
|
||||||
|
- ./data:/data:ro
|
||||||
depends_on:
|
depends_on:
|
||||||
- boocode_db
|
- boocode_db
|
||||||
networks:
|
networks:
|
||||||
|
|||||||
322
pnpm-lock.yaml
generated
322
pnpm-lock.yaml
generated
@@ -45,6 +45,9 @@ importers:
|
|||||||
typescript:
|
typescript:
|
||||||
specifier: ^5.5.0
|
specifier: ^5.5.0
|
||||||
version: 5.9.3
|
version: 5.9.3
|
||||||
|
vitest:
|
||||||
|
specifier: ^3.2.4
|
||||||
|
version: 3.2.4(@types/debug@4.1.13)(@types/node@20.19.41)(lightningcss@1.32.0)(msw@2.14.6(@types/node@20.19.41)(typescript@5.9.3))
|
||||||
|
|
||||||
apps/web:
|
apps/web:
|
||||||
dependencies:
|
dependencies:
|
||||||
@@ -1697,9 +1700,15 @@ packages:
|
|||||||
'@types/babel__traverse@7.28.0':
|
'@types/babel__traverse@7.28.0':
|
||||||
resolution: {integrity: sha512-8PvcXf70gTDZBgt9ptxJ8elBeBjcLOAcOtoO/mPJjtji1+CdGbHgm77om1GrsPxsiE+uXIpNSK64UYaIwQXd4Q==}
|
resolution: {integrity: sha512-8PvcXf70gTDZBgt9ptxJ8elBeBjcLOAcOtoO/mPJjtji1+CdGbHgm77om1GrsPxsiE+uXIpNSK64UYaIwQXd4Q==}
|
||||||
|
|
||||||
|
'@types/chai@5.2.3':
|
||||||
|
resolution: {integrity: sha512-Mw558oeA9fFbv65/y4mHtXDs9bPnFMZAL/jxdPFUpOHHIXX91mcgEHbS5Lahr+pwZFR8A7GQleRWeI6cGFC2UA==}
|
||||||
|
|
||||||
'@types/debug@4.1.13':
|
'@types/debug@4.1.13':
|
||||||
resolution: {integrity: sha512-KSVgmQmzMwPlmtljOomayoR89W4FynCAi3E8PPs7vmDVPe84hT+vGPKkJfThkmXs0x0jAaa9U8uW8bbfyS2fWw==}
|
resolution: {integrity: sha512-KSVgmQmzMwPlmtljOomayoR89W4FynCAi3E8PPs7vmDVPe84hT+vGPKkJfThkmXs0x0jAaa9U8uW8bbfyS2fWw==}
|
||||||
|
|
||||||
|
'@types/deep-eql@4.0.2':
|
||||||
|
resolution: {integrity: sha512-c9h9dVVMigMPc4bwTvC5dxqtqJZwQPePsWjPlpSOnojbor6pGqdk541lfA7AqFQr5pB1BRdq0juY9db81BwyFw==}
|
||||||
|
|
||||||
'@types/estree-jsx@1.0.5':
|
'@types/estree-jsx@1.0.5':
|
||||||
resolution: {integrity: sha512-52CcUVNFyfb1A2ALocQw/Dd1BQFNmSdkuC3BkZ6iqhdMfQz7JWOFRuJFloOzjk+6WijU56m9oKXFAXc7o3Towg==}
|
resolution: {integrity: sha512-52CcUVNFyfb1A2ALocQw/Dd1BQFNmSdkuC3BkZ6iqhdMfQz7JWOFRuJFloOzjk+6WijU56m9oKXFAXc7o3Towg==}
|
||||||
|
|
||||||
@@ -1756,6 +1765,35 @@ packages:
|
|||||||
peerDependencies:
|
peerDependencies:
|
||||||
vite: ^4.2.0 || ^5.0.0 || ^6.0.0 || ^7.0.0
|
vite: ^4.2.0 || ^5.0.0 || ^6.0.0 || ^7.0.0
|
||||||
|
|
||||||
|
'@vitest/expect@3.2.4':
|
||||||
|
resolution: {integrity: sha512-Io0yyORnB6sikFlt8QW5K7slY4OjqNX9jmJQ02QDda8lyM6B5oNgVWoSoKPac8/kgnCUzuHQKrSLtu/uOqqrig==}
|
||||||
|
|
||||||
|
'@vitest/mocker@3.2.4':
|
||||||
|
resolution: {integrity: sha512-46ryTE9RZO/rfDd7pEqFl7etuyzekzEhUbTW3BvmeO/BcCMEgq59BKhek3dXDWgAj4oMK6OZi+vRr1wPW6qjEQ==}
|
||||||
|
peerDependencies:
|
||||||
|
msw: ^2.4.9
|
||||||
|
vite: ^5.0.0 || ^6.0.0 || ^7.0.0-0
|
||||||
|
peerDependenciesMeta:
|
||||||
|
msw:
|
||||||
|
optional: true
|
||||||
|
vite:
|
||||||
|
optional: true
|
||||||
|
|
||||||
|
'@vitest/pretty-format@3.2.4':
|
||||||
|
resolution: {integrity: sha512-IVNZik8IVRJRTr9fxlitMKeJeXFFFN0JaB9PHPGQ8NKQbGpfjlTx9zO4RefN8gp7eqjNy8nyK3NZmBzOPeIxtA==}
|
||||||
|
|
||||||
|
'@vitest/runner@3.2.4':
|
||||||
|
resolution: {integrity: sha512-oukfKT9Mk41LreEW09vt45f8wx7DordoWUZMYdY/cyAk7w5TWkTRCNZYF7sX7n2wB7jyGAl74OxgwhPgKaqDMQ==}
|
||||||
|
|
||||||
|
'@vitest/snapshot@3.2.4':
|
||||||
|
resolution: {integrity: sha512-dEYtS7qQP2CjU27QBC5oUOxLE/v5eLkGqPE0ZKEIDGMs4vKWe7IjgLOeauHsR0D5YuuycGRO5oSRXnwnmA78fQ==}
|
||||||
|
|
||||||
|
'@vitest/spy@3.2.4':
|
||||||
|
resolution: {integrity: sha512-vAfasCOe6AIK70iP5UD11Ac4siNUNJ9i/9PZ3NKx07sG6sUxeag1LWdNrMWeKKYBLlzuK+Gn65Yd5nyL6ds+nw==}
|
||||||
|
|
||||||
|
'@vitest/utils@3.2.4':
|
||||||
|
resolution: {integrity: sha512-fB2V0JFrQSMsCo9HiSq3Ezpdv4iYaXRG1Sx8edX3MwxfyNn83mKiGzOcH+Fkxt4MHxr3y42fQi1oeAInqgX2QA==}
|
||||||
|
|
||||||
abstract-logging@2.0.1:
|
abstract-logging@2.0.1:
|
||||||
resolution: {integrity: sha512-2BjRTZxTPvheOvGbBslFSYOUkr+SjPtOnrLP33f+VIWLzezQpZcqVg7ja3L4dBXmzzgwT+a029jRx5PCi3JuiA==}
|
resolution: {integrity: sha512-2BjRTZxTPvheOvGbBslFSYOUkr+SjPtOnrLP33f+VIWLzezQpZcqVg7ja3L4dBXmzzgwT+a029jRx5PCi3JuiA==}
|
||||||
|
|
||||||
@@ -1809,6 +1847,10 @@ packages:
|
|||||||
resolution: {integrity: sha512-ik3ZgC9dY/lYVVM++OISsaYDeg1tb0VtP5uL3ouh1koGOaUMDPpbFIei4JkFimWUFPn90sbMNMXQAIVOlnYKJA==}
|
resolution: {integrity: sha512-ik3ZgC9dY/lYVVM++OISsaYDeg1tb0VtP5uL3ouh1koGOaUMDPpbFIei4JkFimWUFPn90sbMNMXQAIVOlnYKJA==}
|
||||||
engines: {node: '>=10'}
|
engines: {node: '>=10'}
|
||||||
|
|
||||||
|
assertion-error@2.0.1:
|
||||||
|
resolution: {integrity: sha512-Izi8RQcffqCeNVgFigKli1ssklIbpHnCYc6AknXGYoB6grJqyeby7jv12JUQgmTAnIDnbck1uxksT4dzN3PWBA==}
|
||||||
|
engines: {node: '>=12'}
|
||||||
|
|
||||||
ast-types@0.16.1:
|
ast-types@0.16.1:
|
||||||
resolution: {integrity: sha512-6t10qk83GOG8p0vKmaCr8eiilZwO171AvbROMtvvNiwrTly62t+7XkA8RdIIVbpMhCASAsxgAzdRSwh6nw/5Dg==}
|
resolution: {integrity: sha512-6t10qk83GOG8p0vKmaCr8eiilZwO171AvbROMtvvNiwrTly62t+7XkA8RdIIVbpMhCASAsxgAzdRSwh6nw/5Dg==}
|
||||||
engines: {node: '>=4'}
|
engines: {node: '>=4'}
|
||||||
@@ -1863,6 +1905,10 @@ packages:
|
|||||||
resolution: {integrity: sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==}
|
resolution: {integrity: sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==}
|
||||||
engines: {node: '>= 0.8'}
|
engines: {node: '>= 0.8'}
|
||||||
|
|
||||||
|
cac@6.7.14:
|
||||||
|
resolution: {integrity: sha512-b6Ilus+c3RrdDk+JhLKUAQfzzgLEPy6wcXqS7f/xe1EETvsDP6GORG7SFuOs6cID5YkqchW/LXZbX5bc8j7ZcQ==}
|
||||||
|
engines: {node: '>=8'}
|
||||||
|
|
||||||
call-bind-apply-helpers@1.0.2:
|
call-bind-apply-helpers@1.0.2:
|
||||||
resolution: {integrity: sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ==}
|
resolution: {integrity: sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ==}
|
||||||
engines: {node: '>= 0.4'}
|
engines: {node: '>= 0.4'}
|
||||||
@@ -1881,6 +1927,10 @@ packages:
|
|||||||
ccount@2.0.1:
|
ccount@2.0.1:
|
||||||
resolution: {integrity: sha512-eyrF0jiFpY+3drT6383f1qhkbGsLSifNAjA61IUjZjmLCWjItY6LB9ft9YhoDgwfmclB2zhu51Lc7+95b8NRAg==}
|
resolution: {integrity: sha512-eyrF0jiFpY+3drT6383f1qhkbGsLSifNAjA61IUjZjmLCWjItY6LB9ft9YhoDgwfmclB2zhu51Lc7+95b8NRAg==}
|
||||||
|
|
||||||
|
chai@5.3.3:
|
||||||
|
resolution: {integrity: sha512-4zNhdJD/iOjSH0A05ea+Ke6MU5mmpQcbQsSOkgdaUMJ9zTlDTD/GYlwohmIE2u0gaxHYiVHEn1Fw9mZ/ktJWgw==}
|
||||||
|
engines: {node: '>=18'}
|
||||||
|
|
||||||
chalk@5.6.2:
|
chalk@5.6.2:
|
||||||
resolution: {integrity: sha512-7NzBL0rN6fMUW+f7A6Io4h40qQlG+xGmtMxfbnH/K7TAtt8JQWVQK+6g0UXKMeVJoyV5EkkNsErQ8pVD3bLHbA==}
|
resolution: {integrity: sha512-7NzBL0rN6fMUW+f7A6Io4h40qQlG+xGmtMxfbnH/K7TAtt8JQWVQK+6g0UXKMeVJoyV5EkkNsErQ8pVD3bLHbA==}
|
||||||
engines: {node: ^12.17.0 || ^14.13 || >=16.0.0}
|
engines: {node: ^12.17.0 || ^14.13 || >=16.0.0}
|
||||||
@@ -1897,6 +1947,10 @@ packages:
|
|||||||
character-reference-invalid@2.0.1:
|
character-reference-invalid@2.0.1:
|
||||||
resolution: {integrity: sha512-iBZ4F4wRbyORVsu0jPV7gXkOsGYjGHPmAyv+HiHG8gi5PtC9KI2j1+v8/tlibRvjoWX027ypmG/n0HtO5t7unw==}
|
resolution: {integrity: sha512-iBZ4F4wRbyORVsu0jPV7gXkOsGYjGHPmAyv+HiHG8gi5PtC9KI2j1+v8/tlibRvjoWX027ypmG/n0HtO5t7unw==}
|
||||||
|
|
||||||
|
check-error@2.1.3:
|
||||||
|
resolution: {integrity: sha512-PAJdDJusoxnwm1VwW07VWwUN1sl7smmC3OKggvndJFadxxDRyFJBX/ggnu/KE4kQAB7a3Dp8f/YXC1FlUprWmA==}
|
||||||
|
engines: {node: '>= 16'}
|
||||||
|
|
||||||
class-variance-authority@0.7.1:
|
class-variance-authority@0.7.1:
|
||||||
resolution: {integrity: sha512-Ka+9Trutv7G8M6WT6SeiRWz792K5qEqIGEGzXKhAE6xOWAY6pPH8U+9IY3oCMv6kqTmLsv7Xh/2w2RigkePMsg==}
|
resolution: {integrity: sha512-Ka+9Trutv7G8M6WT6SeiRWz792K5qEqIGEGzXKhAE6xOWAY6pPH8U+9IY3oCMv6kqTmLsv7Xh/2w2RigkePMsg==}
|
||||||
|
|
||||||
@@ -2021,6 +2075,10 @@ packages:
|
|||||||
babel-plugin-macros:
|
babel-plugin-macros:
|
||||||
optional: true
|
optional: true
|
||||||
|
|
||||||
|
deep-eql@5.0.2:
|
||||||
|
resolution: {integrity: sha512-h5k/5U50IJJFpzfL6nO9jaaumfjO/f2NjK/oYB2Djzm4p9L+3T9qWpZqZ2hAbLPuuYq9wrU08WQyBTL5GbPk5Q==}
|
||||||
|
engines: {node: '>=6'}
|
||||||
|
|
||||||
deepmerge@4.3.1:
|
deepmerge@4.3.1:
|
||||||
resolution: {integrity: sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==}
|
resolution: {integrity: sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==}
|
||||||
engines: {node: '>=0.10.0'}
|
engines: {node: '>=0.10.0'}
|
||||||
@@ -2121,6 +2179,9 @@ packages:
|
|||||||
resolution: {integrity: sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==}
|
resolution: {integrity: sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==}
|
||||||
engines: {node: '>= 0.4'}
|
engines: {node: '>= 0.4'}
|
||||||
|
|
||||||
|
es-module-lexer@1.7.0:
|
||||||
|
resolution: {integrity: sha512-jEQoCwk8hyb2AZziIOLhDqpm5+2ww5uIE6lkO/6jcOCusfk6LhMHpXXfBLXTZ7Ydyt0j4VoUQv6uGNYbdW+kBA==}
|
||||||
|
|
||||||
es-object-atoms@1.1.1:
|
es-object-atoms@1.1.1:
|
||||||
resolution: {integrity: sha512-FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA==}
|
resolution: {integrity: sha512-FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA==}
|
||||||
engines: {node: '>= 0.4'}
|
engines: {node: '>= 0.4'}
|
||||||
@@ -2154,6 +2215,9 @@ packages:
|
|||||||
estree-util-is-identifier-name@3.0.0:
|
estree-util-is-identifier-name@3.0.0:
|
||||||
resolution: {integrity: sha512-hFtqIDZTIUZ9BXLb8y4pYGyk6+wekIivNVTcmvk8NoOh+VeRn5y6cEHzbURrWbfp1fIqdVipilzj+lfaadNZmg==}
|
resolution: {integrity: sha512-hFtqIDZTIUZ9BXLb8y4pYGyk6+wekIivNVTcmvk8NoOh+VeRn5y6cEHzbURrWbfp1fIqdVipilzj+lfaadNZmg==}
|
||||||
|
|
||||||
|
estree-walker@3.0.3:
|
||||||
|
resolution: {integrity: sha512-7RUKfXgSMMkzt6ZuXmqapOurLGPPfgj6l9uRZ7lRGolvk0y2yocc35LdcxKC5PQZdn2DMqioAQ2NoWcrTKmm6g==}
|
||||||
|
|
||||||
etag@1.8.1:
|
etag@1.8.1:
|
||||||
resolution: {integrity: sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==}
|
resolution: {integrity: sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==}
|
||||||
engines: {node: '>= 0.6'}
|
engines: {node: '>= 0.6'}
|
||||||
@@ -2174,6 +2238,10 @@ packages:
|
|||||||
resolution: {integrity: sha512-9Be3ZoN4LmYR90tUoVu2te2BsbzHfhJyfEiAVfz7N5/zv+jduIfLrV2xdQXOHbaD6KgpGdO9PRPM1Y4Q9QkPkA==}
|
resolution: {integrity: sha512-9Be3ZoN4LmYR90tUoVu2te2BsbzHfhJyfEiAVfz7N5/zv+jduIfLrV2xdQXOHbaD6KgpGdO9PRPM1Y4Q9QkPkA==}
|
||||||
engines: {node: ^18.19.0 || >=20.5.0}
|
engines: {node: ^18.19.0 || >=20.5.0}
|
||||||
|
|
||||||
|
expect-type@1.3.0:
|
||||||
|
resolution: {integrity: sha512-knvyeauYhqjOYvQ66MznSMs83wmHrCycNEN6Ao+2AeYEfxUIkuiVxdEa1qlGEPK+We3n0THiDciYSsCcgW/DoA==}
|
||||||
|
engines: {node: '>=12.0.0'}
|
||||||
|
|
||||||
express-rate-limit@8.5.2:
|
express-rate-limit@8.5.2:
|
||||||
resolution: {integrity: sha512-5Kb34ipNX694DH48vN9irak1Qx30nb0PLYHXfJgw4YEjiC3ZEmZJhwOp+VfiCYwFzvFTdB9QkArYS5kXa2cx2A==}
|
resolution: {integrity: sha512-5Kb34ipNX694DH48vN9irak1Qx30nb0PLYHXfJgw4YEjiC3ZEmZJhwOp+VfiCYwFzvFTdB9QkArYS5kXa2cx2A==}
|
||||||
engines: {node: '>= 16'}
|
engines: {node: '>= 16'}
|
||||||
@@ -2529,6 +2597,9 @@ packages:
|
|||||||
js-tokens@4.0.0:
|
js-tokens@4.0.0:
|
||||||
resolution: {integrity: sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==}
|
resolution: {integrity: sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==}
|
||||||
|
|
||||||
|
js-tokens@9.0.1:
|
||||||
|
resolution: {integrity: sha512-mxa9E9ITFOt0ban3j6L5MpjwegGz6lBQmM1IJkWeBZGcMxto50+eWdjC/52xDbS2vy0k7vIMK0Fe2wfL9OQSpQ==}
|
||||||
|
|
||||||
js-yaml@4.1.1:
|
js-yaml@4.1.1:
|
||||||
resolution: {integrity: sha512-qQKT4zQxXl8lLwBtHMWwaTcGfFOZviOJet3Oy/xmGk2gZH677CJM9EvtfdSkgWcATZhj/55JZ0rmy3myCT5lsA==}
|
resolution: {integrity: sha512-qQKT4zQxXl8lLwBtHMWwaTcGfFOZviOJet3Oy/xmGk2gZH677CJM9EvtfdSkgWcATZhj/55JZ0rmy3myCT5lsA==}
|
||||||
hasBin: true
|
hasBin: true
|
||||||
@@ -2653,6 +2724,9 @@ packages:
|
|||||||
resolution: {integrity: sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==}
|
resolution: {integrity: sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==}
|
||||||
hasBin: true
|
hasBin: true
|
||||||
|
|
||||||
|
loupe@3.2.1:
|
||||||
|
resolution: {integrity: sha512-CdzqowRJCeLU72bHvWqwRBBlLcMEtIvGrlvef74kMnV2AolS9Y8xUv1I0U/MNAWMhBlKIoyuEgoJ0t/bbwHbLQ==}
|
||||||
|
|
||||||
lru-cache@10.4.3:
|
lru-cache@10.4.3:
|
||||||
resolution: {integrity: sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==}
|
resolution: {integrity: sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==}
|
||||||
|
|
||||||
@@ -2998,6 +3072,13 @@ packages:
|
|||||||
path-to-regexp@8.4.2:
|
path-to-regexp@8.4.2:
|
||||||
resolution: {integrity: sha512-qRcuIdP69NPm4qbACK+aDogI5CBDMi1jKe0ry5rSQJz8JVLsC7jV8XpiJjGRLLol3N+R5ihGYcrPLTno6pAdBA==}
|
resolution: {integrity: sha512-qRcuIdP69NPm4qbACK+aDogI5CBDMi1jKe0ry5rSQJz8JVLsC7jV8XpiJjGRLLol3N+R5ihGYcrPLTno6pAdBA==}
|
||||||
|
|
||||||
|
pathe@2.0.3:
|
||||||
|
resolution: {integrity: sha512-WUjGcAqP1gQacoQe+OBJsFA7Ld4DyXuUIjZ5cc75cLHvJ7dtNsTugphxIADwspS+AraAUePCKrSVtPLFj/F88w==}
|
||||||
|
|
||||||
|
pathval@2.0.1:
|
||||||
|
resolution: {integrity: sha512-//nshmD55c46FuFw26xV/xFAaB5HF9Xdap7HJBBnrKdAd6/GxDBaNA1870O79+9ueg61cZLSVc+OaFlfmObYVQ==}
|
||||||
|
engines: {node: '>= 14.16'}
|
||||||
|
|
||||||
picocolors@1.1.1:
|
picocolors@1.1.1:
|
||||||
resolution: {integrity: sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==}
|
resolution: {integrity: sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==}
|
||||||
|
|
||||||
@@ -3308,6 +3389,9 @@ packages:
|
|||||||
resolution: {integrity: sha512-ZX99e6tRweoUXqR+VBrslhda51Nh5MTQwou5tnUDgbtyM0dBgmhEDtWGP/xbKn6hqfPRHujUNwz5fy/wbbhnpw==}
|
resolution: {integrity: sha512-ZX99e6tRweoUXqR+VBrslhda51Nh5MTQwou5tnUDgbtyM0dBgmhEDtWGP/xbKn6hqfPRHujUNwz5fy/wbbhnpw==}
|
||||||
engines: {node: '>= 0.4'}
|
engines: {node: '>= 0.4'}
|
||||||
|
|
||||||
|
siginfo@2.0.0:
|
||||||
|
resolution: {integrity: sha512-ybx0WO1/8bSBLEWXZvEd7gMW3Sn3JFlW3TvX1nREbDLRNQNaeNN8WK0meBwPdAaOI7TtRRRJn/Es1zhrrCHu7g==}
|
||||||
|
|
||||||
signal-exit@3.0.7:
|
signal-exit@3.0.7:
|
||||||
resolution: {integrity: sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==}
|
resolution: {integrity: sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==}
|
||||||
|
|
||||||
@@ -3342,6 +3426,9 @@ packages:
|
|||||||
resolution: {integrity: sha512-UcjcJOWknrNkF6PLX83qcHM6KHgVKNkV62Y8a5uYDVv9ydGQVwAHMKqHdJje1VTWpljG0WYpCDhrCdAOYH4TWg==}
|
resolution: {integrity: sha512-UcjcJOWknrNkF6PLX83qcHM6KHgVKNkV62Y8a5uYDVv9ydGQVwAHMKqHdJje1VTWpljG0WYpCDhrCdAOYH4TWg==}
|
||||||
engines: {node: '>= 10.x'}
|
engines: {node: '>= 10.x'}
|
||||||
|
|
||||||
|
stackback@0.0.2:
|
||||||
|
resolution: {integrity: sha512-1XMJE5fQo1jGH6Y/7ebnwPOBEkIEnT4QF32d5R1+VXdXveM0IBMJt8zfaxX1P3QhVwrYe+576+jkANtSS2mBbw==}
|
||||||
|
|
||||||
statuses@2.0.1:
|
statuses@2.0.1:
|
||||||
resolution: {integrity: sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==}
|
resolution: {integrity: sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==}
|
||||||
engines: {node: '>= 0.8'}
|
engines: {node: '>= 0.8'}
|
||||||
@@ -3350,6 +3437,9 @@ packages:
|
|||||||
resolution: {integrity: sha512-DvEy55V3DB7uknRo+4iOGT5fP1slR8wQohVdknigZPMpMstaKJQWhwiYBACJE3Ul2pTnATihhBYnRhZQHGBiRw==}
|
resolution: {integrity: sha512-DvEy55V3DB7uknRo+4iOGT5fP1slR8wQohVdknigZPMpMstaKJQWhwiYBACJE3Ul2pTnATihhBYnRhZQHGBiRw==}
|
||||||
engines: {node: '>= 0.8'}
|
engines: {node: '>= 0.8'}
|
||||||
|
|
||||||
|
std-env@3.10.0:
|
||||||
|
resolution: {integrity: sha512-5GS12FdOZNliM5mAOxFRg7Ir0pWz8MdpYm6AY6VPkGpbA7ZzmbzNcBJQ0GPvvyWgcY7QAhCgf9Uy89I03faLkg==}
|
||||||
|
|
||||||
stdin-discarder@0.2.2:
|
stdin-discarder@0.2.2:
|
||||||
resolution: {integrity: sha512-UhDfHmA92YAlNnCfhmq0VeNL5bDbiZGg7sZ2IvPsXubGkiNa9EC+tUTsjBRsYUAz87btI6/1wf4XoVvQ3uRnmQ==}
|
resolution: {integrity: sha512-UhDfHmA92YAlNnCfhmq0VeNL5bDbiZGg7sZ2IvPsXubGkiNa9EC+tUTsjBRsYUAz87btI6/1wf4XoVvQ3uRnmQ==}
|
||||||
engines: {node: '>=18'}
|
engines: {node: '>=18'}
|
||||||
@@ -3402,6 +3492,9 @@ packages:
|
|||||||
resolution: {integrity: sha512-aulFJcD6YK8V1G7iRB5tigAP4TsHBZZrOV8pjV++zdUwmeV8uzbY7yn6h9MswN62adStNZFuCIx4haBnRuMDaw==}
|
resolution: {integrity: sha512-aulFJcD6YK8V1G7iRB5tigAP4TsHBZZrOV8pjV++zdUwmeV8uzbY7yn6h9MswN62adStNZFuCIx4haBnRuMDaw==}
|
||||||
engines: {node: '>=18'}
|
engines: {node: '>=18'}
|
||||||
|
|
||||||
|
strip-literal@3.1.0:
|
||||||
|
resolution: {integrity: sha512-8r3mkIM/2+PpjHoOtiAW8Rg3jJLHaV7xPwG+YRGrv6FP0wwk/toTpATxWYOW0BKdWwl82VT2tFYi5DlROa0Mxg==}
|
||||||
|
|
||||||
style-to-js@1.1.21:
|
style-to-js@1.1.21:
|
||||||
resolution: {integrity: sha512-RjQetxJrrUJLQPHbLku6U/ocGtzyjbJMP9lCNK7Ag0CNh690nSH8woqWH9u16nMjYBAok+i7JO1NP2pOy8IsPQ==}
|
resolution: {integrity: sha512-RjQetxJrrUJLQPHbLku6U/ocGtzyjbJMP9lCNK7Ag0CNh690nSH8woqWH9u16nMjYBAok+i7JO1NP2pOy8IsPQ==}
|
||||||
|
|
||||||
@@ -3428,6 +3521,28 @@ packages:
|
|||||||
tiny-invariant@1.3.3:
|
tiny-invariant@1.3.3:
|
||||||
resolution: {integrity: sha512-+FbBPE1o9QAYvviau/qC5SE3caw21q3xkvWKBtja5vgqOWIHHJ3ioaq1VPfn/Szqctz2bU/oYeKd9/z5BL+PVg==}
|
resolution: {integrity: sha512-+FbBPE1o9QAYvviau/qC5SE3caw21q3xkvWKBtja5vgqOWIHHJ3ioaq1VPfn/Szqctz2bU/oYeKd9/z5BL+PVg==}
|
||||||
|
|
||||||
|
tinybench@2.9.0:
|
||||||
|
resolution: {integrity: sha512-0+DUvqWMValLmha6lr4kD8iAMK1HzV0/aKnCtWb9v9641TnP/MFb7Pc2bxoxQjTXAErryXVgUOfv2YqNllqGeg==}
|
||||||
|
|
||||||
|
tinyexec@0.3.2:
|
||||||
|
resolution: {integrity: sha512-KQQR9yN7R5+OSwaK0XQoj22pwHoTlgYqmUscPYoknOoWCWfj/5/ABTMRi69FrKU5ffPVh5QcFikpWJI/P1ocHA==}
|
||||||
|
|
||||||
|
tinyglobby@0.2.16:
|
||||||
|
resolution: {integrity: sha512-pn99VhoACYR8nFHhxqix+uvsbXineAasWm5ojXoN8xEwK5Kd3/TrhNn1wByuD52UxWRLy8pu+kRMniEi6Eq9Zg==}
|
||||||
|
engines: {node: '>=12.0.0'}
|
||||||
|
|
||||||
|
tinypool@1.1.1:
|
||||||
|
resolution: {integrity: sha512-Zba82s87IFq9A9XmjiX5uZA/ARWDrB03OHlq+Vw1fSdt0I+4/Kutwy8BP4Y/y/aORMo61FQ0vIb5j44vSo5Pkg==}
|
||||||
|
engines: {node: ^18.0.0 || >=20.0.0}
|
||||||
|
|
||||||
|
tinyrainbow@2.0.0:
|
||||||
|
resolution: {integrity: sha512-op4nsTR47R6p0vMUUoYl/a+ljLFVtlfaXkLQmqfLR1qHma1h/ysYk4hEXZ880bf2CYgTskvTa/e196Vd5dDQXw==}
|
||||||
|
engines: {node: '>=14.0.0'}
|
||||||
|
|
||||||
|
tinyspy@4.0.4:
|
||||||
|
resolution: {integrity: sha512-azl+t0z7pw/z958Gy9svOTuzqIk6xq+NSheJzn5MMWtWTFywIacg2wUlzKFGtt3cthx0r2SxMK0yzJOR0IES7Q==}
|
||||||
|
engines: {node: '>=14.0.0'}
|
||||||
|
|
||||||
tldts-core@7.0.30:
|
tldts-core@7.0.30:
|
||||||
resolution: {integrity: sha512-uiHN8PIB1VmWyS98eZYja4xzlYqeFZVjb4OuYlJQnZAuJhMw4PbKQOKgHKhBdJR3FE/t5mUQ1Kd80++B+qhD1Q==}
|
resolution: {integrity: sha512-uiHN8PIB1VmWyS98eZYja4xzlYqeFZVjb4OuYlJQnZAuJhMw4PbKQOKgHKhBdJR3FE/t5mUQ1Kd80++B+qhD1Q==}
|
||||||
|
|
||||||
@@ -3572,6 +3687,11 @@ packages:
|
|||||||
vfile@6.0.3:
|
vfile@6.0.3:
|
||||||
resolution: {integrity: sha512-KzIbH/9tXat2u30jf+smMwFCsno4wHVdNmzFyL+T/L3UGqqk6JKfVqOFOZEpZSHADH1k40ab6NUIXZq422ov3Q==}
|
resolution: {integrity: sha512-KzIbH/9tXat2u30jf+smMwFCsno4wHVdNmzFyL+T/L3UGqqk6JKfVqOFOZEpZSHADH1k40ab6NUIXZq422ov3Q==}
|
||||||
|
|
||||||
|
vite-node@3.2.4:
|
||||||
|
resolution: {integrity: sha512-EbKSKh+bh1E1IFxeO0pg1n4dvoOTt0UDiXMd/qn++r98+jPO1xtJilvXldeuQ8giIB5IkpjCgMleHMNEsGH6pg==}
|
||||||
|
engines: {node: ^18.0.0 || ^20.0.0 || >=22.0.0}
|
||||||
|
hasBin: true
|
||||||
|
|
||||||
vite@5.4.21:
|
vite@5.4.21:
|
||||||
resolution: {integrity: sha512-o5a9xKjbtuhY6Bi5S3+HvbRERmouabWbyUcpXXUA1u+GNUKoROi9byOJ8M0nHbHYHkYICiMlqxkg1KkYmm25Sw==}
|
resolution: {integrity: sha512-o5a9xKjbtuhY6Bi5S3+HvbRERmouabWbyUcpXXUA1u+GNUKoROi9byOJ8M0nHbHYHkYICiMlqxkg1KkYmm25Sw==}
|
||||||
engines: {node: ^18.0.0 || >=20.0.0}
|
engines: {node: ^18.0.0 || >=20.0.0}
|
||||||
@@ -3603,6 +3723,34 @@ packages:
|
|||||||
terser:
|
terser:
|
||||||
optional: true
|
optional: true
|
||||||
|
|
||||||
|
vitest@3.2.4:
|
||||||
|
resolution: {integrity: sha512-LUCP5ev3GURDysTWiP47wRRUpLKMOfPh+yKTx3kVIEiu5KOMeqzpnYNsKyOoVrULivR8tLcks4+lga33Whn90A==}
|
||||||
|
engines: {node: ^18.0.0 || ^20.0.0 || >=22.0.0}
|
||||||
|
hasBin: true
|
||||||
|
peerDependencies:
|
||||||
|
'@edge-runtime/vm': '*'
|
||||||
|
'@types/debug': ^4.1.12
|
||||||
|
'@types/node': ^18.0.0 || ^20.0.0 || >=22.0.0
|
||||||
|
'@vitest/browser': 3.2.4
|
||||||
|
'@vitest/ui': 3.2.4
|
||||||
|
happy-dom: '*'
|
||||||
|
jsdom: '*'
|
||||||
|
peerDependenciesMeta:
|
||||||
|
'@edge-runtime/vm':
|
||||||
|
optional: true
|
||||||
|
'@types/debug':
|
||||||
|
optional: true
|
||||||
|
'@types/node':
|
||||||
|
optional: true
|
||||||
|
'@vitest/browser':
|
||||||
|
optional: true
|
||||||
|
'@vitest/ui':
|
||||||
|
optional: true
|
||||||
|
happy-dom:
|
||||||
|
optional: true
|
||||||
|
jsdom:
|
||||||
|
optional: true
|
||||||
|
|
||||||
web-streams-polyfill@3.3.3:
|
web-streams-polyfill@3.3.3:
|
||||||
resolution: {integrity: sha512-d2JWLCivmZYTSIoge9MsgFCZrt571BikcWGYkjC1khllbTeDlGqZ2D8vD8E/lJa8WGWbb7Plm8/XJYV7IJHZZw==}
|
resolution: {integrity: sha512-d2JWLCivmZYTSIoge9MsgFCZrt571BikcWGYkjC1khllbTeDlGqZ2D8vD8E/lJa8WGWbb7Plm8/XJYV7IJHZZw==}
|
||||||
engines: {node: '>= 8'}
|
engines: {node: '>= 8'}
|
||||||
@@ -3617,6 +3765,11 @@ packages:
|
|||||||
engines: {node: ^16.13.0 || >=18.0.0}
|
engines: {node: ^16.13.0 || >=18.0.0}
|
||||||
hasBin: true
|
hasBin: true
|
||||||
|
|
||||||
|
why-is-node-running@2.3.0:
|
||||||
|
resolution: {integrity: sha512-hUrmaWBdVDcxvYqnyh09zunKzROWjbZTiNy8dBEjkS7ehEDQibXJ7XvlmtbwuTclUiIyN+CyXQD4Vmko8fNm8w==}
|
||||||
|
engines: {node: '>=8'}
|
||||||
|
hasBin: true
|
||||||
|
|
||||||
wrap-ansi@7.0.0:
|
wrap-ansi@7.0.0:
|
||||||
resolution: {integrity: sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==}
|
resolution: {integrity: sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==}
|
||||||
engines: {node: '>=10'}
|
engines: {node: '>=10'}
|
||||||
@@ -5196,10 +5349,17 @@ snapshots:
|
|||||||
dependencies:
|
dependencies:
|
||||||
'@babel/types': 7.29.0
|
'@babel/types': 7.29.0
|
||||||
|
|
||||||
|
'@types/chai@5.2.3':
|
||||||
|
dependencies:
|
||||||
|
'@types/deep-eql': 4.0.2
|
||||||
|
assertion-error: 2.0.1
|
||||||
|
|
||||||
'@types/debug@4.1.13':
|
'@types/debug@4.1.13':
|
||||||
dependencies:
|
dependencies:
|
||||||
'@types/ms': 2.1.0
|
'@types/ms': 2.1.0
|
||||||
|
|
||||||
|
'@types/deep-eql@4.0.2': {}
|
||||||
|
|
||||||
'@types/estree-jsx@1.0.5':
|
'@types/estree-jsx@1.0.5':
|
||||||
dependencies:
|
dependencies:
|
||||||
'@types/estree': 1.0.8
|
'@types/estree': 1.0.8
|
||||||
@@ -5261,6 +5421,49 @@ snapshots:
|
|||||||
transitivePeerDependencies:
|
transitivePeerDependencies:
|
||||||
- supports-color
|
- supports-color
|
||||||
|
|
||||||
|
'@vitest/expect@3.2.4':
|
||||||
|
dependencies:
|
||||||
|
'@types/chai': 5.2.3
|
||||||
|
'@vitest/spy': 3.2.4
|
||||||
|
'@vitest/utils': 3.2.4
|
||||||
|
chai: 5.3.3
|
||||||
|
tinyrainbow: 2.0.0
|
||||||
|
|
||||||
|
'@vitest/mocker@3.2.4(msw@2.14.6(@types/node@20.19.41)(typescript@5.9.3))(vite@5.4.21(@types/node@20.19.41)(lightningcss@1.32.0))':
|
||||||
|
dependencies:
|
||||||
|
'@vitest/spy': 3.2.4
|
||||||
|
estree-walker: 3.0.3
|
||||||
|
magic-string: 0.30.21
|
||||||
|
optionalDependencies:
|
||||||
|
msw: 2.14.6(@types/node@20.19.41)(typescript@5.9.3)
|
||||||
|
vite: 5.4.21(@types/node@20.19.41)(lightningcss@1.32.0)
|
||||||
|
|
||||||
|
'@vitest/pretty-format@3.2.4':
|
||||||
|
dependencies:
|
||||||
|
tinyrainbow: 2.0.0
|
||||||
|
|
||||||
|
'@vitest/runner@3.2.4':
|
||||||
|
dependencies:
|
||||||
|
'@vitest/utils': 3.2.4
|
||||||
|
pathe: 2.0.3
|
||||||
|
strip-literal: 3.1.0
|
||||||
|
|
||||||
|
'@vitest/snapshot@3.2.4':
|
||||||
|
dependencies:
|
||||||
|
'@vitest/pretty-format': 3.2.4
|
||||||
|
magic-string: 0.30.21
|
||||||
|
pathe: 2.0.3
|
||||||
|
|
||||||
|
'@vitest/spy@3.2.4':
|
||||||
|
dependencies:
|
||||||
|
tinyspy: 4.0.4
|
||||||
|
|
||||||
|
'@vitest/utils@3.2.4':
|
||||||
|
dependencies:
|
||||||
|
'@vitest/pretty-format': 3.2.4
|
||||||
|
loupe: 3.2.1
|
||||||
|
tinyrainbow: 2.0.0
|
||||||
|
|
||||||
abstract-logging@2.0.1: {}
|
abstract-logging@2.0.1: {}
|
||||||
|
|
||||||
accepts@2.0.0:
|
accepts@2.0.0:
|
||||||
@@ -5301,6 +5504,8 @@ snapshots:
|
|||||||
dependencies:
|
dependencies:
|
||||||
tslib: 2.8.1
|
tslib: 2.8.1
|
||||||
|
|
||||||
|
assertion-error@2.0.1: {}
|
||||||
|
|
||||||
ast-types@0.16.1:
|
ast-types@0.16.1:
|
||||||
dependencies:
|
dependencies:
|
||||||
tslib: 2.8.1
|
tslib: 2.8.1
|
||||||
@@ -5360,6 +5565,8 @@ snapshots:
|
|||||||
|
|
||||||
bytes@3.1.2: {}
|
bytes@3.1.2: {}
|
||||||
|
|
||||||
|
cac@6.7.14: {}
|
||||||
|
|
||||||
call-bind-apply-helpers@1.0.2:
|
call-bind-apply-helpers@1.0.2:
|
||||||
dependencies:
|
dependencies:
|
||||||
es-errors: 1.3.0
|
es-errors: 1.3.0
|
||||||
@@ -5376,6 +5583,14 @@ snapshots:
|
|||||||
|
|
||||||
ccount@2.0.1: {}
|
ccount@2.0.1: {}
|
||||||
|
|
||||||
|
chai@5.3.3:
|
||||||
|
dependencies:
|
||||||
|
assertion-error: 2.0.1
|
||||||
|
check-error: 2.1.3
|
||||||
|
deep-eql: 5.0.2
|
||||||
|
loupe: 3.2.1
|
||||||
|
pathval: 2.0.1
|
||||||
|
|
||||||
chalk@5.6.2: {}
|
chalk@5.6.2: {}
|
||||||
|
|
||||||
character-entities-html4@2.1.0: {}
|
character-entities-html4@2.1.0: {}
|
||||||
@@ -5386,6 +5601,8 @@ snapshots:
|
|||||||
|
|
||||||
character-reference-invalid@2.0.1: {}
|
character-reference-invalid@2.0.1: {}
|
||||||
|
|
||||||
|
check-error@2.1.3: {}
|
||||||
|
|
||||||
class-variance-authority@0.7.1:
|
class-variance-authority@0.7.1:
|
||||||
dependencies:
|
dependencies:
|
||||||
clsx: 2.1.1
|
clsx: 2.1.1
|
||||||
@@ -5474,6 +5691,8 @@ snapshots:
|
|||||||
|
|
||||||
dedent@1.7.2: {}
|
dedent@1.7.2: {}
|
||||||
|
|
||||||
|
deep-eql@5.0.2: {}
|
||||||
|
|
||||||
deepmerge@4.3.1: {}
|
deepmerge@4.3.1: {}
|
||||||
|
|
||||||
default-browser-id@5.0.1: {}
|
default-browser-id@5.0.1: {}
|
||||||
@@ -5556,6 +5775,8 @@ snapshots:
|
|||||||
|
|
||||||
es-errors@1.3.0: {}
|
es-errors@1.3.0: {}
|
||||||
|
|
||||||
|
es-module-lexer@1.7.0: {}
|
||||||
|
|
||||||
es-object-atoms@1.1.1:
|
es-object-atoms@1.1.1:
|
||||||
dependencies:
|
dependencies:
|
||||||
es-errors: 1.3.0
|
es-errors: 1.3.0
|
||||||
@@ -5625,6 +5846,10 @@ snapshots:
|
|||||||
|
|
||||||
estree-util-is-identifier-name@3.0.0: {}
|
estree-util-is-identifier-name@3.0.0: {}
|
||||||
|
|
||||||
|
estree-walker@3.0.3:
|
||||||
|
dependencies:
|
||||||
|
'@types/estree': 1.0.8
|
||||||
|
|
||||||
etag@1.8.1: {}
|
etag@1.8.1: {}
|
||||||
|
|
||||||
eventsource-parser@3.0.8: {}
|
eventsource-parser@3.0.8: {}
|
||||||
@@ -5660,6 +5885,8 @@ snapshots:
|
|||||||
strip-final-newline: 4.0.0
|
strip-final-newline: 4.0.0
|
||||||
yoctocolors: 2.1.2
|
yoctocolors: 2.1.2
|
||||||
|
|
||||||
|
expect-type@1.3.0: {}
|
||||||
|
|
||||||
express-rate-limit@8.5.2(express@5.2.1):
|
express-rate-limit@8.5.2(express@5.2.1):
|
||||||
dependencies:
|
dependencies:
|
||||||
express: 5.2.1
|
express: 5.2.1
|
||||||
@@ -6053,6 +6280,8 @@ snapshots:
|
|||||||
|
|
||||||
js-tokens@4.0.0: {}
|
js-tokens@4.0.0: {}
|
||||||
|
|
||||||
|
js-tokens@9.0.1: {}
|
||||||
|
|
||||||
js-yaml@4.1.1:
|
js-yaml@4.1.1:
|
||||||
dependencies:
|
dependencies:
|
||||||
argparse: 2.0.1
|
argparse: 2.0.1
|
||||||
@@ -6149,6 +6378,8 @@ snapshots:
|
|||||||
dependencies:
|
dependencies:
|
||||||
js-tokens: 4.0.0
|
js-tokens: 4.0.0
|
||||||
|
|
||||||
|
loupe@3.2.1: {}
|
||||||
|
|
||||||
lru-cache@10.4.3: {}
|
lru-cache@10.4.3: {}
|
||||||
|
|
||||||
lru-cache@5.1.1:
|
lru-cache@5.1.1:
|
||||||
@@ -6700,6 +6931,10 @@ snapshots:
|
|||||||
|
|
||||||
path-to-regexp@8.4.2: {}
|
path-to-regexp@8.4.2: {}
|
||||||
|
|
||||||
|
pathe@2.0.3: {}
|
||||||
|
|
||||||
|
pathval@2.0.1: {}
|
||||||
|
|
||||||
picocolors@1.1.1: {}
|
picocolors@1.1.1: {}
|
||||||
|
|
||||||
picomatch@2.3.2: {}
|
picomatch@2.3.2: {}
|
||||||
@@ -7178,6 +7413,8 @@ snapshots:
|
|||||||
side-channel-map: 1.0.1
|
side-channel-map: 1.0.1
|
||||||
side-channel-weakmap: 1.0.2
|
side-channel-weakmap: 1.0.2
|
||||||
|
|
||||||
|
siginfo@2.0.0: {}
|
||||||
|
|
||||||
signal-exit@3.0.7: {}
|
signal-exit@3.0.7: {}
|
||||||
|
|
||||||
signal-exit@4.1.0: {}
|
signal-exit@4.1.0: {}
|
||||||
@@ -7201,10 +7438,14 @@ snapshots:
|
|||||||
|
|
||||||
split2@4.2.0: {}
|
split2@4.2.0: {}
|
||||||
|
|
||||||
|
stackback@0.0.2: {}
|
||||||
|
|
||||||
statuses@2.0.1: {}
|
statuses@2.0.1: {}
|
||||||
|
|
||||||
statuses@2.0.2: {}
|
statuses@2.0.2: {}
|
||||||
|
|
||||||
|
std-env@3.10.0: {}
|
||||||
|
|
||||||
stdin-discarder@0.2.2: {}
|
stdin-discarder@0.2.2: {}
|
||||||
|
|
||||||
stream-shift@1.0.3: {}
|
stream-shift@1.0.3: {}
|
||||||
@@ -7258,6 +7499,10 @@ snapshots:
|
|||||||
|
|
||||||
strip-final-newline@4.0.0: {}
|
strip-final-newline@4.0.0: {}
|
||||||
|
|
||||||
|
strip-literal@3.1.0:
|
||||||
|
dependencies:
|
||||||
|
js-tokens: 9.0.1
|
||||||
|
|
||||||
style-to-js@1.1.21:
|
style-to-js@1.1.21:
|
||||||
dependencies:
|
dependencies:
|
||||||
style-to-object: 1.0.14
|
style-to-object: 1.0.14
|
||||||
@@ -7280,6 +7525,21 @@ snapshots:
|
|||||||
|
|
||||||
tiny-invariant@1.3.3: {}
|
tiny-invariant@1.3.3: {}
|
||||||
|
|
||||||
|
tinybench@2.9.0: {}
|
||||||
|
|
||||||
|
tinyexec@0.3.2: {}
|
||||||
|
|
||||||
|
tinyglobby@0.2.16:
|
||||||
|
dependencies:
|
||||||
|
fdir: 6.5.0(picomatch@4.0.4)
|
||||||
|
picomatch: 4.0.4
|
||||||
|
|
||||||
|
tinypool@1.1.1: {}
|
||||||
|
|
||||||
|
tinyrainbow@2.0.0: {}
|
||||||
|
|
||||||
|
tinyspy@4.0.4: {}
|
||||||
|
|
||||||
tldts-core@7.0.30: {}
|
tldts-core@7.0.30: {}
|
||||||
|
|
||||||
tldts@7.0.30:
|
tldts@7.0.30:
|
||||||
@@ -7419,6 +7679,24 @@ snapshots:
|
|||||||
'@types/unist': 3.0.3
|
'@types/unist': 3.0.3
|
||||||
vfile-message: 4.0.3
|
vfile-message: 4.0.3
|
||||||
|
|
||||||
|
vite-node@3.2.4(@types/node@20.19.41)(lightningcss@1.32.0):
|
||||||
|
dependencies:
|
||||||
|
cac: 6.7.14
|
||||||
|
debug: 4.4.3
|
||||||
|
es-module-lexer: 1.7.0
|
||||||
|
pathe: 2.0.3
|
||||||
|
vite: 5.4.21(@types/node@20.19.41)(lightningcss@1.32.0)
|
||||||
|
transitivePeerDependencies:
|
||||||
|
- '@types/node'
|
||||||
|
- less
|
||||||
|
- lightningcss
|
||||||
|
- sass
|
||||||
|
- sass-embedded
|
||||||
|
- stylus
|
||||||
|
- sugarss
|
||||||
|
- supports-color
|
||||||
|
- terser
|
||||||
|
|
||||||
vite@5.4.21(@types/node@20.19.41)(lightningcss@1.32.0):
|
vite@5.4.21(@types/node@20.19.41)(lightningcss@1.32.0):
|
||||||
dependencies:
|
dependencies:
|
||||||
esbuild: 0.21.5
|
esbuild: 0.21.5
|
||||||
@@ -7429,6 +7707,45 @@ snapshots:
|
|||||||
fsevents: 2.3.3
|
fsevents: 2.3.3
|
||||||
lightningcss: 1.32.0
|
lightningcss: 1.32.0
|
||||||
|
|
||||||
|
vitest@3.2.4(@types/debug@4.1.13)(@types/node@20.19.41)(lightningcss@1.32.0)(msw@2.14.6(@types/node@20.19.41)(typescript@5.9.3)):
|
||||||
|
dependencies:
|
||||||
|
'@types/chai': 5.2.3
|
||||||
|
'@vitest/expect': 3.2.4
|
||||||
|
'@vitest/mocker': 3.2.4(msw@2.14.6(@types/node@20.19.41)(typescript@5.9.3))(vite@5.4.21(@types/node@20.19.41)(lightningcss@1.32.0))
|
||||||
|
'@vitest/pretty-format': 3.2.4
|
||||||
|
'@vitest/runner': 3.2.4
|
||||||
|
'@vitest/snapshot': 3.2.4
|
||||||
|
'@vitest/spy': 3.2.4
|
||||||
|
'@vitest/utils': 3.2.4
|
||||||
|
chai: 5.3.3
|
||||||
|
debug: 4.4.3
|
||||||
|
expect-type: 1.3.0
|
||||||
|
magic-string: 0.30.21
|
||||||
|
pathe: 2.0.3
|
||||||
|
picomatch: 4.0.4
|
||||||
|
std-env: 3.10.0
|
||||||
|
tinybench: 2.9.0
|
||||||
|
tinyexec: 0.3.2
|
||||||
|
tinyglobby: 0.2.16
|
||||||
|
tinypool: 1.1.1
|
||||||
|
tinyrainbow: 2.0.0
|
||||||
|
vite: 5.4.21(@types/node@20.19.41)(lightningcss@1.32.0)
|
||||||
|
vite-node: 3.2.4(@types/node@20.19.41)(lightningcss@1.32.0)
|
||||||
|
why-is-node-running: 2.3.0
|
||||||
|
optionalDependencies:
|
||||||
|
'@types/debug': 4.1.13
|
||||||
|
'@types/node': 20.19.41
|
||||||
|
transitivePeerDependencies:
|
||||||
|
- less
|
||||||
|
- lightningcss
|
||||||
|
- msw
|
||||||
|
- sass
|
||||||
|
- sass-embedded
|
||||||
|
- stylus
|
||||||
|
- sugarss
|
||||||
|
- supports-color
|
||||||
|
- terser
|
||||||
|
|
||||||
web-streams-polyfill@3.3.3: {}
|
web-streams-polyfill@3.3.3: {}
|
||||||
|
|
||||||
which@2.0.2:
|
which@2.0.2:
|
||||||
@@ -7439,6 +7756,11 @@ snapshots:
|
|||||||
dependencies:
|
dependencies:
|
||||||
isexe: 3.1.5
|
isexe: 3.1.5
|
||||||
|
|
||||||
|
why-is-node-running@2.3.0:
|
||||||
|
dependencies:
|
||||||
|
siginfo: 2.0.0
|
||||||
|
stackback: 0.0.2
|
||||||
|
|
||||||
wrap-ansi@7.0.0:
|
wrap-ansi@7.0.0:
|
||||||
dependencies:
|
dependencies:
|
||||||
ansi-styles: 4.3.0
|
ansi-styles: 4.3.0
|
||||||
|
|||||||
Reference in New Issue
Block a user