diff --git a/.agents/notes/implemented/bug-fix/2026-07-23-thinking-row-disclosure-target.i18n.yaml b/.agents/notes/implemented/bug-fix/2026-07-23-thinking-row-disclosure-target.i18n.yaml new file mode 100644 index 0000000000..a2fcf167a7 --- /dev/null +++ b/.agents/notes/implemented/bug-fix/2026-07-23-thinking-row-disclosure-target.i18n.yaml @@ -0,0 +1,6 @@ +# Bilingual-pair consistency record (docs/i18n/README.md): the git blob hash of each +# side as of the last confirmed-consistent state. Both languages carry equal authority; +# after editing either side, bring the other along and re-record with: +# pnpm run verify-translation-pairing --write +2026-07-23-thinking-row-disclosure-target.md: f698c3cb0b73bf5c65b5d4b5b3f29de3080e0af6 +2026-07-23-thinking-row-disclosure-target.zh.md: 0fba5c1d8f7beec7300dcd51e118a08d57d0e74f diff --git a/.agents/notes/implemented/bug-fix/2026-07-23-thinking-row-disclosure-target.md b/.agents/notes/implemented/bug-fix/2026-07-23-thinking-row-disclosure-target.md new file mode 100644 index 0000000000..f698c3cb0b --- /dev/null +++ b/.agents/notes/implemented/bug-fix/2026-07-23-thinking-row-disclosure-target.md @@ -0,0 +1,29 @@ +# Agent Note: Thinking rows use one disclosure target + +Status: implemented + +English | [中文](2026-07-23-thinking-row-disclosure-target.zh.md) + +## Problem + +A collapsed reasoning entry presents `Think` and its one-line reasoning summary as one visual row, but an icon-only disclosure control leaves both visible labels inert. Applying title expansion to every tool row would instead break the generic tool-row contract, where the row opens details and only the leading control expands arguments. + +## Decision + +`ToolRow` exposes the opt-in `expandOnRowClick` policy. `ThinkRow` enables it so the title and reasoning summary form one accessible disclosure target; pointer clicks, Enter, and Space toggle the same component-local expanded state. Tool rows that do not opt in retain row-to-details selection and leading-control argument expansion. + +## Verification + +The component spec pins both Think click targets and the unchanged generic tool-row handoff. The keyless browser fixture loads the real sidebar and conversation bundles, opens an authored reasoning session, clicks the summary and title, and checks the disclosure state and expanded body. + +## Alternatives considered + +**Expand every tool row from its title.** Generic tool rows use row clicks for details selection, so sharing this behavior would conflate two controls. + +**Keep icon-only disclosure.** The smallest hit target remains disconnected from the labels that describe the hidden content. + +**Render separate title and summary buttons.** Two controls for one expanded state add duplicate focus stops and ambiguous semantics. + +## Consequences + +Thinking rows gain a larger pointer target and keyboard disclosure semantics without changing other tool interactions. The generic row component carries one optional policy because disclosure ownership differs between reasoning and tool calls. diff --git a/.agents/notes/implemented/bug-fix/2026-07-23-thinking-row-disclosure-target.zh.md b/.agents/notes/implemented/bug-fix/2026-07-23-thinking-row-disclosure-target.zh.md new file mode 100644 index 0000000000..0fba5c1d8f --- /dev/null +++ b/.agents/notes/implemented/bug-fix/2026-07-23-thinking-row-disclosure-target.zh.md @@ -0,0 +1,29 @@ +# Agent Note: thinking 行使用单一展开目标 + +Status: implemented + +[English](2026-07-23-thinking-row-disclosure-target.md) | 中文 + +## 问题 + +折叠的推理（reasoning）条目在同一视觉行中呈现 `Think` 和单行推理摘要，但仅图标可展开会让两个可见标签都无法交互。若让所有工具行均可通过标题展开，又会破坏通用工具行的契约：整行负责打开详情，只有前导控件负责展开参数。 + +## 决策 + +`ToolRow` 提供显式启用的 `expandOnRowClick` 策略。`ThinkRow` 启用该策略，让标题和推理摘要组成单一且无障碍的展开目标；鼠标点击、Enter 和 Space 都切换同一个组件本地展开状态。未启用该策略的工具行仍由整行完成详情选择，由前导控件展开参数。 + +## 验证 + +组件测试固定两个 Think 点击目标以及未改变的通用工具行交接行为。无密钥浏览器 fixture（测试前置数据）加载真实的侧边栏与会话 bundle，打开包含推理内容的既定会话，点击摘要与标题，并检查展开状态和展开后的正文。 + +## 考虑过的替代方案 + +**让每个工具行都可通过标题展开。** 通用工具行将整行点击用于详情选择，共享这一行为会混淆两个控件。 + +**保留仅图标展开。** 最小的点击目标仍与描述隐藏内容的标签脱节。 + +**把标题和摘要分别渲染为按钮。** 两个控件共享一个展开状态，会增加重复的焦点停靠点并产生含糊语义。 + +## 后果 + +thinking 行获得更大的鼠标点击目标和键盘展开语义，同时不改变其他工具交互。通用行组件承担一个可选策略，因为推理与工具调用的展开所有权不同。 diff --git a/.agents/notes/implemented/feature/2026-06-24-workspace-context.md b/.agents/notes/implemented/feature/2026-06-24-workspace-context.md index 3bcb0c2bea..394c0de708 100644 --- a/.agents/notes/implemented/feature/2026-06-24-workspace-context.md +++ b/.agents/notes/implemented/feature/2026-06-24-workspace-context.md @@ -12,7 +12,7 @@ The lifecycle has two distinct classes of content. The initial applicable chain ## Decision -The implementation lives in `packages/context/workspace-context` as `@deepseek-ai/dsh-workspace-context`. It is a request-context extension, not a core service or a filesystem backend. `@deepseek-ai/dsh-agent-core` mounts it for both product front doors and forwards its config. The plugin consumes `agent/session-prefix`, `tools/post-execute`, and the optional `ctx.fs` capability. +The implementation lives in `packages/context/workspace-context` as `@deepseek-ai/dsh-workspace-context`. It is a request-context extension, not a core service or a filesystem backend. The shared demo spine and Host Runtime mount it from an explicit `{ maxBytes } | false` deployment choice; `dsh web` enables a 65,536-byte budget while the Host Runtime's headless consumer disables it. The plugin consumes `agent/session-prefix`, `tools/post-execute`, and the optional `ctx.fs` capability. The plugin does not statically inject `fs`. Providerless product trees therefore boot normally and the plugin no-ops until a filesystem provider exists. All production reads go through that provider. Candidate probes resolve each path and stat the result, so a final-component symlink is followed to its target: a link to a regular file loads, while a missing path or a non-file target is a confirmed absence. Following repository-owned links across the trust boundary is a deliberate reversal of the original no-follow probe; the [instruction-symlink follow note](2026-07-21-follow-instruction-symlinks.md) owns that decision and its residual risk. The session-prefix signal and dynamic tool execution signal propagate through resolution, metadata probes, and streaming reads, so cancellation does not wait for an unrelated filesystem scan. A resolve or stat exception is classified as unavailable: it skips only that candidate and is never interpreted as the deletion of an already-loaded scope. @@ -76,7 +76,7 @@ There is intentionally no watcher. Detection occurs at the next successful struc ## Consequences -Workspace guidance is isolated per session and shared by both product front doors and every tool presentation mode. Initial instructions benefit from stable prefix caching, while nested and changed content remains durable and replayable. The generic session/agent context contract carries JSON metadata propagated through prompt-submit and post-tool `additionalContexts` arrays without flattening entries. +Workspace guidance is isolated per session and shared by the demo front doors, Web Host, and every tool presentation mode. Initial instructions benefit from stable prefix caching, while nested and changed content remains durable and replayable. The generic session/agent context contract carries JSON metadata propagated through prompt-submit and post-tool `additionalContexts` arrays without flattening entries. Repository text remains untrusted input. Lower-authority user-role framing, explicit precedence language, and delimiter escaping reduce risk but do not eliminate prompt injection. Following a candidate symlink to its target widens that surface to off-tree content, so the permission and sandbox layers that confine `ctx.fs` to trusted roots are the boundary that treats workspace files as data rather than authority (the [instruction-symlink follow note](2026-07-21-follow-instruction-symlinks.md) owns the residual risk). diff --git a/apps/cli/README.md b/apps/cli/README.md index b8ff616d59..87f5e670e3 100644 --- a/apps/cli/README.md +++ b/apps/cli/README.md @@ -1,6 +1,6 @@ # `@deepseek-ai/dsh` -The `dsh` command-line entry, following the `apps/` assembly tier proposed by the `dsh web` PR (#443): `apps/*` are product assemblies over `packages/*` libraries. This branch ships one surface — plain `dsh [config.yml]` boots the interactive TUI coding agent — and reserves the `web` and `-p`/`--prompt` subcommands for that PR so the dispatch merges as a union. +The `dsh` command-line entry follows the `apps/` assembly tier: `apps/*` are product assemblies over `packages/*` libraries. Plain `dsh [config.yml]` boots the interactive TUI coding agent, `dsh -p "task"` runs one headless turn, and `dsh web` serves the browser UI. The TUI surface: @@ -10,6 +10,8 @@ The TUI surface: - tells the agent where its own source lives: after boot it adds a prompt section naming this harness checkout, resolved from the launcher's real path so it holds under a PATH symlink and an arbitrary cwd, so the self-referential `cordis` toolset can read and modify it; - applies the personal overlay from `~/.dsh` (see [app-boot's Personal config](../../packages/ui/app-boot/README.md#personal-config)): `.env` fills environment gaps (ambient > project `.env` > personal `.env`), `config.yaml` patches the booted tree. +The Web surface treats its invoking directory as the default project and loads applicable `AGENTS.md`/`CLAUDE.md` instructions into each agent-loop request prefix with a 65,536-byte render budget. + ## Install (developer machine) Symlink the source-running launcher onto your PATH; it resolves the checkout through its own real path, so code changes apply on the next launch with no build step: diff --git a/apps/cli/src/headless.ts b/apps/cli/src/headless.ts index dc1fa192a1..303bac61f8 100644 --- a/apps/cli/src/headless.ts +++ b/apps/cli/src/headless.ts @@ -78,7 +78,12 @@ export async function runHeadless(argv: string[]): Promise { } // A missing DEEPSEEK_API_KEY throws here (plugin load is fail-loud, uncaught by design). - const host = await startHost({ boot: { persistenceRoot: './.sessions' } }) + const host = await startHost({ + boot: { + persistenceRoot: './.sessions', + workspaceContext: false, + }, + }) const api = new InProcessApiClient(host.handler) const created = await unwrap(await api.sessions.create({}), () => host.dispose()) diff --git a/apps/cli/src/web.ts b/apps/cli/src/web.ts index 02e98e78b5..66a99bb577 100644 --- a/apps/cli/src/web.ts +++ b/apps/cli/src/web.ts @@ -36,7 +36,12 @@ export async function runWeb(argv: string[]): Promise { } // A missing DEEPSEEK_API_KEY throws here (plugin load is fail-loud, uncaught by design). - const host = await startHost({ boot: { persistenceRoot: './.sessions' } }) + const host = await startHost({ + boot: { + persistenceRoot: './.sessions', + workspaceContext: { maxBytes: 65_536 }, + }, + }) // Web UI plugin chain: in-memory Loader tree over the eight UI packages, // then the registry that feeds __DSH_BOOT__ and /plugins//client.js. diff --git a/apps/web/tests/smoke-fixture.e2e.ts b/apps/web/tests/smoke-fixture.e2e.ts index 3f1c4449fd..3fccde9a79 100644 --- a/apps/web/tests/smoke-fixture.e2e.ts +++ b/apps/web/tests/smoke-fixture.e2e.ts @@ -1,10 +1,10 @@ // Keyless boot-chain smoke over the REAL carrier: startWebServer + web-plugins // registry surface + __DSH_BOOT__ injection + built shell dist in a real // chromium. First describe: manifest injection + static serving. Second -// describe: the settled success pass — six REAL tsdown bundles (the -// infrastructure four + layout/sidebar) load through the DI chain in ?fixture -// mode and the three-column frame appears in one flip. The full conversation -// round lands in smoke-real under the W5 real-host standard. +// describe: the settled success pass — seven REAL tsdown bundles (the +// infrastructure four + layout/sidebar/conversation) load through the DI +// chain in ?fixture mode and the three-column frame appears in one flip. The +// full conversation round lands in smoke-real under the W5 real-host standard. import { existsSync } from 'node:fs' import { fileURLToPath } from 'node:url' import type { Browser, Page } from 'playwright' @@ -25,6 +25,7 @@ const REAL_PLUGINS: { id: string; dir: string; inject: string[]; immediately?: b { id: '@deepseek-ai/dsh-client-i18n', dir: 'i18n', inject: [], immediately: true }, { id: '@deepseek-ai/dsh-client-ui-layout', dir: 'ui-layout', inject: ['@deepseek-ai/dsh-client-runtime'] }, { id: '@deepseek-ai/dsh-client-ui-sidebar', dir: 'ui-sidebar', inject: ['@deepseek-ai/dsh-client-ui-layout'] }, + { id: '@deepseek-ai/dsh-client-ui-conversation', dir: 'ui-conversation', inject: ['@deepseek-ai/dsh-client-ui-layout'] }, ] /** Manifest served by the fake registry: one live bundle row, one missing row. */ @@ -83,7 +84,7 @@ describe('web boot chain (keyless, real carrier)', () => { }) }) -describe('web boot chain success pass (keyless, six real bundles, ?fixture)', () => { +describe('web boot chain success pass (keyless, seven real bundles, ?fixture)', () => { const missing = REAL_PLUGINS.filter(p => !existsSync(bundlePath(p.dir))) let server: Awaited> let browser: Browser @@ -167,6 +168,34 @@ describe('web boot chain success pass (keyless, six real bundles, ?fixture)', () expect(focused).toContain('Search') }) + it('renders file tool rows and expands fixture reasoning from either click target', async () => { + onTestFailed(() => saveFailureShot(page, 'smoke-think-disclosure')) + await page.locator('[role="treeitem"]').first().click() + await page.locator('[role="treeitem"][aria-selected]').first().click() + + const thinkRoot = page.locator('[data-variant="think"]').first() + const think = thinkRoot.getByRole('button') + await think.waitFor({ state: 'visible', timeout: 10_000 }) + expect(await think.getAttribute('aria-expanded')).toBe('false') + + await thinkRoot.getByText(/^思考过程 .*reasoning 内容。$/).click() + expect(await think.getAttribute('aria-expanded')).toBe('true') + expect(await thinkRoot.locator(':scope > div').count()).toBe(2) + + await think.getByText('Think', { exact: true }).click() + expect(await think.getAttribute('aria-expanded')).toBe('false') + + const editRoot = page.locator('[data-variant="edit"]').first() + await editRoot.waitFor({ state: 'visible', timeout: 10_000 }) + expect(await editRoot.getByText('Edit', { exact: true }).count()).toBe(1) + expect(await editRoot.getByText('notes/demo.txt', { exact: true }).count()).toBe(1) + + const writeRoot = page.locator('[data-variant="write"]').first() + await writeRoot.waitFor({ state: 'visible', timeout: 10_000 }) + expect(await writeRoot.getByText('Write', { exact: true }).count()).toBe(1) + expect(await writeRoot.getByText('notes/new-demo.txt', { exact: true }).count()).toBe(1) + }) + it('stayed clean: no page errors across the whole load chain', () => { expect(pageErrors).toEqual([]) }) diff --git a/apps/web/tests/smoke-real.e2e.ts b/apps/web/tests/smoke-real.e2e.ts index a51e0c9e56..9ccdcad606 100644 --- a/apps/web/tests/smoke-real.e2e.ts +++ b/apps/web/tests/smoke-real.e2e.ts @@ -15,7 +15,8 @@ // and theme after, reload recovery last. Tests run sequentially in-file. import type { ChildProcess } from 'node:child_process' import { spawn } from 'node:child_process' -import { existsSync, mkdtempSync, readFileSync, rmSync } from 'node:fs' +import { existsSync, mkdirSync, mkdtempSync, readFileSync, rmSync, writeFileSync } from 'node:fs' +import { createServer } from 'node:http' import { createRequire } from 'node:module' import { tmpdir } from 'node:os' import { join } from 'node:path' @@ -57,6 +58,25 @@ function waitForReadyLine(child: ChildProcess): Promise { }) } +async function rpc(baseUrl: string, method: string, payload: unknown): Promise { + const response = await fetch(`${baseUrl}/api/${method}`, { + method: 'POST', + headers: { 'content-type': 'application/json' }, + body: JSON.stringify({ + type: 'client-request', + rpcId: `smoke-${method}`, + method, + payload, + }), + }) + if (!response.ok) throw new Error(`${method} failed over HTTP ${response.status}: ${await response.text()}`) + const body = await response.json() as { + result: { ok: true; value: T } | { ok: false; error: { code: string; message: string } } + } + if (!body.result.ok) throw new Error(`${method} failed: ${body.result.error.code}: ${body.result.error.message}`) + return body.result.value +} + /** W5 screenshot: evidence for the figma comparison, not a failure artifact. */ async function screen(page: Page, name: string): Promise { await page.screenshot({ path: join(REPO_ROOT, '.artifacts', `w5-${name}.png`) }) @@ -116,6 +136,91 @@ describe('dsh web keyless CLI smoke', () => { rmSync(sessionsDir, { recursive: true, force: true }) } }) + + it('injects the invoking workspace AGENTS.md into the provider request', async () => { + requireDist() + const workspace = mkdtempSync(join(tmpdir(), 'dsh-web-workspace-')) + mkdirSync(join(workspace, '.git')) + writeFileSync(join(workspace, 'AGENTS.md'), 'web-workspace-context-probe\n') + + let resolveProviderRequest!: (request: { messages?: { role?: string; content?: string }[] }) => void + const providerRequest = new Promise<{ messages?: { role?: string; content?: string }[] }>((resolve) => { + resolveProviderRequest = resolve + }) + const provider = createServer((request, response) => { + let body = '' + request.setEncoding('utf8') + request.on('data', (chunk: string) => { body += chunk }) + request.on('end', () => { + resolveProviderRequest(JSON.parse(body) as { messages?: { role?: string; content?: string }[] }) + response.writeHead(200, { 'content-type': 'text/event-stream' }) + response.end([ + 'data: {"choices":[{"delta":{"role":"assistant","content":null,"reasoning_content":""}}]}', + 'data: {"choices":[{"delta":{"content":"done"}}]}', + 'data: {"choices":[{"delta":{"content":""},"finish_reason":"stop"}],"usage":{"prompt_tokens":3,"completion_tokens":1}}', + 'data: [DONE]', + '', + ].join('\n\n')) + }) + }) + await new Promise(resolve => provider.listen(0, '127.0.0.1', resolve)) + const address = provider.address() + if (address === null || typeof address === 'string') throw new Error('mock provider did not bind a TCP port') + const tsxLoader = pathToFileURL(createRequire(join(REPO_ROOT, 'package.json')).resolve('tsx')).href + const child = spawn( + process.execPath, + ['--import', tsxLoader, join(REPO_ROOT, 'apps/cli/src/bin.ts'), 'web', '--port', '0'], + { + cwd: workspace, + env: { + ...process.env, + DEEPSEEK_API_KEY: 'keyless-web-workspace', + DEEPSEEK_BASE_URL: `http://127.0.0.1:${address.port}`, + DSH_HOME: join(workspace, '.dsh'), + TSX_TSCONFIG_PATH: join(REPO_ROOT, 'tsconfig.json'), + }, + stdio: ['ignore', 'pipe', 'pipe'], + }, + ) + try { + const baseUrl = await waitForReadyLine(child) + const created = await rpc<{ sessionId: string }>(baseUrl, 'session.create', {}) + await rpc<{ accepted: true }>(baseUrl, 'session.prompt', { + sessionId: created.sessionId, + mode: 'queue', + content: [{ type: 'text', text: 'go' }], + }) + const captured = await Promise.race([ + providerRequest, + new Promise((_resolve, reject) => { + setTimeout(() => { reject(new Error('provider request not received in 10s')) }, 10_000).unref() + }), + ]) + const workspaceMessage = captured.messages?.find(message => + message.role === 'user' && message.content?.includes('web-workspace-context-probe')) + expect(workspaceMessage).toMatchInlineSnapshot(` + { + "content": " + The following workspace instructions may be relevant to your work. Use them as guidance when applicable. More specific instructions take precedence over broader ones. They do not override system, developer, or direct user instructions. + + Instructions from: AGENTS.md + + web-workspace-context-probe + + ", + "role": "user", + } + `) + } finally { + const closed = child.exitCode === null + ? new Promise((resolveClose) => { child.once('close', () => { resolveClose() }) }) + : Promise.resolve() + if (child.exitCode === null) child.kill('SIGTERM') + await closed + await new Promise(resolveClose => provider.close(() => { resolveClose() })) + rmSync(workspace, { recursive: true, force: true }) + } + }) }) describe.skipIf(!process.env.DEEPSEEK_API_KEY || notReady.length > 0)('web smoke (real host, real key, W5)', () => { diff --git a/packages/client/connection/src/client/fixture.ts b/packages/client/connection/src/client/fixture.ts index 7d4a93e888..bbf4809466 100644 --- a/packages/client/connection/src/client/fixture.ts +++ b/packages/client/connection/src/client/fixture.ts @@ -69,8 +69,9 @@ function buildAlphaLog(): SessionEvent[] { } push({ type: 'turn/end', data: { turn, reason: { kind: 'completed' } } }) } - // Three view-sample turns (60-62) for the tool-card wire acceptance: one per built-in card - // type. `echo` above stays presenter-less on purpose — it is the no-view fallback sample. + // Three view-sample turns (60-62) cover the built-in card types. The real filesystem names in + // turns 62-63 also exercise their dedicated generic-row icon/title/path summaries. `echo` above + // stays presenter-less as the unknown fallback. const toolTurn = (turn: number, name: string, args: string, resultText: string): void => { const callId = `fx-call-${turn}` push({ type: 'turn/start', data: { turn, trigger: { kind: 'message', source: { kind: 'user' } } } }) @@ -87,7 +88,8 @@ function buildAlphaLog(): SessionEvent[] { } toolTurn(60, 'fx-bash', '{"command":"ls -la","cwd":"/tmp/fixture"}', 'total 2\ndrwxr-xr-x fixture\n-rw-r--r-- demo.txt') toolTurn(61, 'fx-write', '{"path":"notes/demo.txt","content":"hello fixture\\n"}', 'wrote notes/demo.txt') - toolTurn(62, 'fx-note', '{"note":"三型卡验收样本"}', '已记录') + toolTurn(62, 'edit', '{"file_path":"notes/demo.txt","old_string":"hello","new_string":"hello fixture"}', '已编辑') + toolTurn(63, 'write', '{"file_path":"notes/new-demo.txt","content":"hello fixture\\n"}', '已写入') return events as unknown as SessionEvent[] } @@ -112,8 +114,10 @@ function presentCall(name: string, argsRaw: string): ToolCallView | undefined { card: 'diff', title: `Write ${str(args.path)}`, diffs: [{ path: str(args.path), oldText: null, newText: str(args.content) }], } - case 'fx-note': - return { card: 'generic', title: '记录笔记', kind: 'edit', rawInput: args } + case 'edit': + return { card: 'generic', title: `Edit ${str(args.file_path)}`, kind: 'edit', rawInput: args } + case 'write': + return { card: 'generic', title: `Write ${str(args.file_path)}`, kind: 'edit', rawInput: args } default: return undefined // echo et al: the documented no-view fallback path } diff --git a/packages/client/ui-conversation/README.md b/packages/client/ui-conversation/README.md index bca5ee9a37..3bf1c3bd6e 100644 --- a/packages/client/ui-conversation/README.md +++ b/packages/client/ui-conversation/README.md @@ -2,6 +2,8 @@ Conversation domain: skeleton (header/tabs/composer/empty state), chat view (grouped step-summary flow, streaming tail isolation), ctx.toolviews named registry with bash samples, minimal details panel, scope-addressed ConversationService. Contract: api-contracts v3 §7 plus the slot terminal design (store seat / props shares). +Generic tool rows classify the built-in bash, read, search, write, and edit names into dedicated visual variants. The filesystem variants render the edit icon and `Write · ` or `Edit · ` summary while retaining the shared row-to-details interaction. + Per-session UI state (selection, composer draft, active view) lives in the declared chat store (`stores.ts` `createChatStore`): apply constructs one handle and passes it to both the conversation and details registrations, so the two session slots share one instance per session (selection written by conversation, read by details) and the framework owns instance lifecycle and draft persistence. Components are pure — the framework standard kit (`useSession`/`sessionId`/`useSessions`) and the store faces (`useStore`/`actions`) arrive automatically from the registration declaration; the inject factories contribute plain data and callbacks only (send/stop choreography, view registry read face, startSession chain). `src/client/` is organized for the future package split: `contract/` is the sole inter-domain shared face (`slots.ts` composed slot props, `views.ts` view ring, `toolview.ts` tool ring, `tool-call-model.ts`); the `skeleton/`, `chat/`, and `toolviews/` domain directories import contract files and never each other; `apply.ts` is the only assembly point allowed to import all three domains. The `/client` export surface is the contract only — `apply`/`inject`, the two service classes, and the `contract/` type families; implementation components (skeleton, chat rows) and the store factory stay internal and reach the page exclusively through apply's slot registrations (tests take them via the `./src/*` subpath). diff --git a/packages/client/ui-conversation/src/client/chat/AssistantMarkdown.tsx b/packages/client/ui-conversation/src/client/chat/AssistantMarkdown.tsx index 61ac069b1c..fd612990ce 100644 --- a/packages/client/ui-conversation/src/client/chat/AssistantMarkdown.tsx +++ b/packages/client/ui-conversation/src/client/chat/AssistantMarkdown.tsx @@ -32,6 +32,7 @@ function ThinkRow({ text, running }: { text: string; running: boolean }) { summary={firstLine(text)} body={text} state={running ? 'running' : 'ok'} + expandOnRowClick /> ) } diff --git a/packages/client/ui-conversation/src/client/chat/GenericToolCard.tsx b/packages/client/ui-conversation/src/client/chat/GenericToolCard.tsx index 32793fb804..958a90526f 100644 --- a/packages/client/ui-conversation/src/client/chat/GenericToolCard.tsx +++ b/packages/client/ui-conversation/src/client/chat/GenericToolCard.tsx @@ -4,7 +4,7 @@ import type { ReactNode } from 'react' import { - IconApiOutline14, IconBrowseOutline16, IconSearchOutline16, IconThinkOutline14, + IconApiOutline14, IconBrowseOutline16, IconEditOutline16, IconSearchOutline16, IconThinkOutline14, } from '@deepseek-ai/dsh-client-ui-primitives' import type { ToolViewProps } from '../contract/toolview.ts' import { toolRowModel, type ToolCallBlock, type ToolRowVariant } from '../contract/tool-call-model.ts' @@ -17,6 +17,8 @@ const VARIANT_ICONS: Record = { search: , read: , bash: , + write: , + edit: , others: , } diff --git a/packages/client/ui-conversation/src/client/chat/ToolRow.tsx b/packages/client/ui-conversation/src/client/chat/ToolRow.tsx index 0bb92e9f66..f1a5ce7440 100644 --- a/packages/client/ui-conversation/src/client/chat/ToolRow.tsx +++ b/packages/client/ui-conversation/src/client/chat/ToolRow.tsx @@ -4,7 +4,7 @@ // no inline output (full results live in the details panel). Expand state is // component-local view state; row click hands the selection off to the owner. -import { useState, type ReactNode } from 'react' +import { useState, type KeyboardEvent, type MouseEvent, type ReactNode } from 'react' import clsx from 'clsx' import { StateDot } from '@deepseek-ai/dsh-client-ui-primitives' import { IconChevronDownOutline14 } from '@deepseek-ai/dsh-client-ui-primitives' @@ -20,6 +20,8 @@ export interface ToolRowProps { /** Expanded-body text; null = not expandable (leading slot never toggles). */ body: string | null state: ToolRowState + /** Makes the row itself the expand control instead of only its leading icon. */ + expandOnRowClick?: boolean | undefined /** Selection handoff (row click), already bound to this call by the owner. */ onOpenDetails?: (() => void) | undefined } @@ -35,31 +37,56 @@ function leadingFor(state: ToolRowState, icon: ReactNode): ReactNode { } } -export function ToolRow({ variant, icon, title, summary, body, state, onOpenDetails }: ToolRowProps) { +export function ToolRow({ + variant, + icon, + title, + summary, + body, + state, + expandOnRowClick = false, + onOpenDetails, +}: ToolRowProps) { const [expanded, setExpanded] = useState(false) const expandable = body !== null const open = expanded && expandable + const rowExpands = expandable && expandOnRowClick + const toggleExpand = () => { + setExpanded((v) => !v) + } + const toggleFromLeading = (event: MouseEvent) => { + event.stopPropagation() + toggleExpand() + } + const toggleFromKeyboard = (event: KeyboardEvent) => { + if (!rowExpands || (event.key !== 'Enter' && event.key !== ' ')) return + event.preventDefault() + toggleExpand() + } return (
- {expandable ? ( + {expandable && !rowExpands ? ( ) : ( - {leadingFor(state, icon)} + + {open ? : leadingFor(state, icon)} + )} {title} {!open && ( diff --git a/packages/client/ui-conversation/src/client/contract/tool-call-model.ts b/packages/client/ui-conversation/src/client/contract/tool-call-model.ts index 0c3e100ec8..ea566eb248 100644 --- a/packages/client/ui-conversation/src/client/contract/tool-call-model.ts +++ b/packages/client/ui-conversation/src/client/contract/tool-call-model.ts @@ -10,18 +10,19 @@ export type { ToolCallBlock } from './toolview.ts' /** The frozen slice the chat view hands to toolview components as `block` * (both members are cache-stable references off ConversationSnapshot). */ -/** The five figma row variants (think is fed by reasoning blocks, not tool calls). */ -export type ToolRowVariant = 'think' | 'search' | 'read' | 'bash' | 'others' +/** The seven row variants (think is fed by reasoning blocks, not tool calls). */ +export type ToolRowVariant = 'think' | 'search' | 'read' | 'bash' | 'write' | 'edit' | 'others' /** Row state semantic; colors self-supplied via StateDot (design gives none). */ export type ToolRowState = 'running' | 'ok' | 'error' | 'stopped' /** Figma row titles per variant (design literals, not translatable copy). */ export const VARIANT_TITLES: Record = { - think: 'Think', search: 'Search', read: 'Read', bash: 'Bash', others: 'Tool call', + think: 'Think', search: 'Search', read: 'Read', bash: 'Bash', + write: 'Write', edit: 'Edit', others: 'Tool call', } -/** Known tool name -> variant; fs write/edit intentionally fall to others (no figma form). */ +/** Known tool name -> variant. */ const TOOL_VARIANTS: Record = { bash: 'bash', read: 'read', @@ -29,6 +30,8 @@ const TOOL_VARIANTS: Record = { web_search: 'search', grep: 'search', glob: 'search', + write: 'write', + edit: 'edit', } /** @@ -78,6 +81,8 @@ const SUMMARY_KEYS: Record = { read: ['path', 'file_path', 'url'], search: ['query', 'pattern', 'url'], think: [], + write: ['path', 'file_path'], + edit: ['path', 'file_path'], others: [], } diff --git a/packages/client/ui-conversation/tests/chat-tool-row.spec.tsx b/packages/client/ui-conversation/tests/chat-tool-row.spec.tsx index 1a381adda8..f8a74adeef 100644 --- a/packages/client/ui-conversation/tests/chat-tool-row.spec.tsx +++ b/packages/client/ui-conversation/tests/chat-tool-row.spec.tsx @@ -6,6 +6,7 @@ afterEach(cleanup) import type { RunningToolCall, ToolResultNode } from '@deepseek-ai/dsh-client-runtime/client' import type { UseSession } from '@deepseek-ai/dsh-client-ui-slots' import { classifyTool, toolRowModel } from '../src/client/contract/tool-call-model.ts' +import { AssistantMarkdown } from '../src/client/chat/AssistantMarkdown.tsx' import { ToolRow } from '../src/client/chat/ToolRow.tsx' import { GenericToolCard } from '../src/client/chat/GenericToolCard.tsx' import type { ToolViewProps } from '@deepseek-ai/dsh-client-ui-conversation/client' @@ -28,6 +29,8 @@ describe('tool-call-model', () => { expect(classifyTool('web_fetch')).toBe('read') expect(classifyTool('web_search')).toBe('search') expect(classifyTool('grep')).toBe('search') + expect(classifyTool('write')).toBe('write') + expect(classifyTool('edit')).toBe('edit') expect(classifyTool('todo_write')).toBe('others') }) @@ -48,6 +51,8 @@ describe('tool-call-model', () => { it('keeps summaries single-line and falls back for opaque args', () => { expect(toolRowModel('bash', running({ argsRaw: '{"command":"a\\nb"}' })).summary).toBe('a') expect(toolRowModel('read', running({ name: 'read', argsRaw: '{"path":"/tmp/x.ts"}' })).summary).toBe('/tmp/x.ts') + expect(toolRowModel('write', running({ name: 'write', argsRaw: '{"file_path":"src/x.ts"}' })).summary).toBe('src/x.ts') + expect(toolRowModel('edit', running({ name: 'edit', argsRaw: '{"file_path":"src/x.ts"}' })).summary).toBe('src/x.ts') // Others rows prefix the real tool name into the summary slot (figma-flows // ruling: static "Tool call" title, name rides the mutable summary). expect(toolRowModel('x', running({ argsRaw: '{"n":1}' })).summary).toBe('x · {"n":1}') @@ -114,6 +119,25 @@ describe('ToolRow', () => { }) }) +describe('ThinkRow', () => { + it('expands from either Think or the reasoning summary', () => { + const view = render( + , + ) + const row = view.getByRole('button') + + fireEvent.click(view.getByText('Inspect the session')) + expect(row.getAttribute('aria-expanded')).toBe('true') + expect(view.getByText(/Check persistence/)).toBeTruthy() + + fireEvent.click(view.getByText('Think')) + expect(row.getAttribute('aria-expanded')).toBe('false') + }) +}) + describe('GenericToolCard', () => { const props = (toolName: string, block: RunningToolCall | ToolResultNode): ToolViewProps => ({ callId: 'c1', toolName, block, @@ -138,6 +162,32 @@ describe('GenericToolCard', () => { expect(view.container.querySelector('[data-state="running"]')).not.toBeNull() }) + it('renders edit with its dedicated title, icon variant, and path summary', () => { + const view = render( + , + ) + expect(view.getByText('Edit')).toBeTruthy() + expect(view.getByText('src/x.ts')).toBeTruthy() + expect(view.container.querySelector('[data-variant="edit"]')).not.toBeNull() + expect(view.container.querySelector('svg')).not.toBeNull() + }) + + it('renders write with its dedicated title, icon variant, and path summary', () => { + const view = render( + , + ) + expect(view.getByText('Write')).toBeTruthy() + expect(view.getByText('src/x.ts')).toBeTruthy() + expect(view.container.querySelector('[data-variant="write"]')).not.toBeNull() + expect(view.container.querySelector('svg')).not.toBeNull() + }) + it('row click reaches actions.openDetails', () => { const p = props('bash', result()) const view = render() diff --git a/packages/host/runtime/README.md b/packages/host/runtime/README.md index 39f9888180..60fe4b22fa 100644 --- a/packages/host/runtime/README.md +++ b/packages/host/runtime/README.md @@ -1,6 +1,6 @@ # @deepseek-ai/dsh-host-runtime -Host runtime assembly for `dsc`: `bootHost` composes the core plugin spine (LLM service + DeepSeek adapter, sessions with JSONL persistence, system prompt, tools, agents, agent loop, local bash), `createApiProxy` implements the [`dsh-host-apiproxy`](../apiproxy/README.md) contract over that composition, and `startHost` is the one-step shell seam returning `{ api, handler, defaults, ctx, dispose }`. +Host runtime assembly for `dsh`: `bootHost` composes the core plugin spine (LLM service + DeepSeek adapter, sessions with JSONL persistence, system prompt, tools, agents, agent loop, workspace instructions, local bash), `createApiProxy` implements the [`dsh-host-apiproxy`](../apiproxy/README.md) contract over that composition, and `startHost` is the one-step shell seam returning `{ api, handler, defaults, ctx, dispose }`. Which plugins mount and with what defaults is decided only here — shells must not `ctx.plugin` to alter the assembly. `RunningHost.ctx` is a formal seam with exactly two sanctioned uses: mounting protocol front-door plugins (e.g. a future `dsh acp`) and headless session-event subscription; consuming clients must not bypass `api` through it. @@ -9,6 +9,7 @@ Which plugins mount and with what defaults is decided only here — shells must | Key | Default | Contract | |---|---:|---| | `persistenceRoot` | (required) | Root directory for JSONL session persistence. | +| `workspaceContext` | (required) | [`AGENTS.md`/`CLAUDE.md` loader](../../context/workspace-context/README.md) config with an explicit `maxBytes`, or `false` to disable it. | | `provider` | `'deepseek'` | Default provider route injected as agentOptions on create/resume and reported by `host.describe`. | | `model` | `'deepseek-v4-flash'` | Default model id, same single source as `provider`. | @@ -18,7 +19,7 @@ Unary methods take the narrow `RpcRequest

` and echo `request.rpcId`; a prompt ## Model Experience -Indirectly, through the model-facing plugins bootHost mounts and the provider/model defaults injected into created and resumed agents. +Indirectly, through the model-facing plugins bootHost mounts and the provider/model defaults injected into created and resumed agents. When `workspaceContext` is enabled, each agent-loop instance freezes the applicable workspace instructions into its logged request prefix; the owning package documents the exact [model-visible framing](../../context/workspace-context/README.md#prompt-shape). #### KV Cache effect @@ -27,5 +28,5 @@ No direct invalidation; the mounted model-facing plugins own their request-prefi ## Known Limitations and Deferred Work - **`respond` is a stub** — it always returns `not-pending`; the approval/question pending registry (stable-rpcId mint on accept, baseline replay on stream reopen, wire answerer) is the next host-side step. -- **`session.list` covers live sessions only** — cold sessions in the persistence directory are not yet merged into the listing; `host.describe.version` is a placeholder rather than the `apps/cli` package version. +- **`host.describe.version` is a placeholder** — it does not yet report the `apps/cli` package version. - **The assembly is fixed** — per-deployment plugin selection (user profile, log sinks, alternative persistence) has a documented home here but no configuration surface yet. diff --git a/packages/host/runtime/package.json b/packages/host/runtime/package.json index ea32040012..be3e9e1050 100644 --- a/packages/host/runtime/package.json +++ b/packages/host/runtime/package.json @@ -69,6 +69,7 @@ "@deepseek-ai/dsh-tool-todo": "workspace:^", "@deepseek-ai/dsh-tool-workflow": "workspace:^", "@deepseek-ai/dsh-tools": "workspace:^", + "@deepseek-ai/dsh-workspace-context": "workspace:^", "@deepseek-ai/dsh-workflow-workerthread": "workspace:^" }, "peerDependencies": { diff --git a/packages/host/runtime/src/boot.ts b/packages/host/runtime/src/boot.ts index 2e03c769b5..445a949123 100644 --- a/packages/host/runtime/src/boot.ts +++ b/packages/host/runtime/src/boot.ts @@ -23,6 +23,7 @@ import FsLocal from '@deepseek-ai/dsh-fs-local' import * as fsPolicy from '@deepseek-ai/dsh-fs-policy' import * as toolFs from '@deepseek-ai/dsh-tool-fs' import * as toolFsSearch from '@deepseek-ai/dsh-tool-fs-search' +import * as workspaceContext from '@deepseek-ai/dsh-workspace-context' import SkillService from '@deepseek-ai/dsh-skill' import * as SkillLocal from '@deepseek-ai/dsh-skill-local' import * as toolSkill from '@deepseek-ai/dsh-tool-skill' @@ -42,6 +43,8 @@ import * as spillPolicy from '@deepseek-ai/dsh-spill-policy' export interface BootHostOptions { /** Root directory for JSONL session persistence. */ persistenceRoot: string + /** Workspace-instruction byte budget/config, or false to disable AGENTS.md/CLAUDE.md loading. */ + workspaceContext: workspaceContext.Config | false /** Default provider route for created/resumed agents (defaults to 'deepseek', the only adapter bootHost registers). */ provider?: string /** Default model id (defaults to 'deepseek-v4-flash', matching the demos). */ @@ -76,7 +79,7 @@ export interface HostHandle { /** * Compose the harness host plugin assembly (the one place deciding which plugins mount and * with what defaults — shells must not alter the assembly). - * @param options - persistence root and optional default provider/model. + * @param options - persistence, workspace instructions, and optional default routing. * @returns the booted handle (ctx + defaults + dispose). */ export async function bootHost(options: BootHostOptions): Promise { @@ -109,6 +112,9 @@ export async function bootHost(options: BootHostOptions): Promise { await ctx.plugin(fsPolicy) await ctx.plugin(toolFs, {}) await ctx.plugin(toolFsSearch, {}) + if (options.workspaceContext !== false) { + await ctx.plugin(workspaceContext, options.workspaceContext) + } // Skill stack with the demo default dshHome (~/.dsh via resolveDshHome). await ctx.plugin(SkillService, {}) await ctx.plugin(SkillLocal, {}) diff --git a/packages/host/runtime/src/start.ts b/packages/host/runtime/src/start.ts index 44412cf184..94e5f22da1 100644 --- a/packages/host/runtime/src/start.ts +++ b/packages/host/runtime/src/start.ts @@ -16,10 +16,9 @@ import { createApiProxy } from './api-proxy.ts' /** Options for startHost. */ export interface StartHostOptions { /** - * Passed through to bootHost verbatim (persistenceRoot required + - * provider?/model?). Future host-level knobs (profile, log sink — any - * output added to the assembly MUST be switchable off here) land as - * additive fields. + * Passed through to bootHost verbatim. Future host-level knobs (profile, + * log sink — any output added to the assembly MUST be switchable off here) + * land as additive fields. */ boot: BootHostOptions } diff --git a/packages/host/runtime/tests/host-runtime.spec.ts b/packages/host/runtime/tests/host-runtime.spec.ts index 51e7438b0e..4aac2960d6 100644 --- a/packages/host/runtime/tests/host-runtime.spec.ts +++ b/packages/host/runtime/tests/host-runtime.spec.ts @@ -1,4 +1,4 @@ -import { mkdtempSync } from 'node:fs' +import { mkdirSync, mkdtempSync, writeFileSync } from 'node:fs' import { tmpdir } from 'node:os' import { join } from 'node:path' import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' @@ -15,11 +15,14 @@ import { bootHost, startHost, type HostHandle, type RunningHost } from '../src/i /** Scripted adapter: each model call consumes the next chunk list; 'hang' streams then waits for abort. */ class ScriptedAdapter extends LlmAdapter { + readonly requests: GenerateOptions[] = [] + constructor(private script: (StreamChunk[] | 'hang')[]) { super() } async * stream(options: GenerateOptions): AsyncIterable { + this.requests.push(options) const entry = this.script.shift() if (!entry) throw new Error('ScriptedAdapter: script exhausted') if (entry === 'hang') { @@ -79,7 +82,12 @@ afterEach(async () => { async function boot(script: (StreamChunk[] | 'hang')[] = []): Promise { host = await startHost({ - boot: { persistenceRoot: mkdtempSync(join(tmpdir(), 'dsh-host-runtime-')), provider: 'scripted', model: 'test-model' }, + boot: { + persistenceRoot: mkdtempSync(join(tmpdir(), 'dsh-host-runtime-')), + workspaceContext: false, + provider: 'scripted', + model: 'test-model', + }, }) host.ctx.llm.registerAdapter(['scripted'], new ScriptedAdapter(script)) return host @@ -87,7 +95,10 @@ async function boot(script: (StreamChunk[] | 'hang')[] = []): Promise { it('falls back to the deepseek defaults and disposes idempotently', async () => { - const handle: HostHandle = await bootHost({ persistenceRoot: mkdtempSync(join(tmpdir(), 'dsh-boot-')) }) + const handle: HostHandle = await bootHost({ + persistenceRoot: mkdtempSync(join(tmpdir(), 'dsh-boot-')), + workspaceContext: false, + }) expect(handle.defaults).toMatchObject({ provider: 'deepseek', model: 'deepseek-v4-flash' }) expect(typeof handle.defaults.cwd).toBe('string') await handle.dispose() @@ -112,6 +123,41 @@ describe('bootHost / startHost', () => { await first host = undefined }) + + it('routes workspace instructions through the assembled agent request prefix', async () => { + const workspace = mkdtempSync(join(tmpdir(), 'dsh-host-workspace-')) + mkdirSync(join(workspace, '.git')) + writeFileSync(join(workspace, 'AGENTS.md'), 'host-workspace-context-probe\n') + const adapter = new ScriptedAdapter([textResponse('done')]) + host = await startHost({ + boot: { + persistenceRoot: mkdtempSync(join(tmpdir(), 'dsh-host-workspace-sessions-')), + workspaceContext: { dshHome: join(workspace, '.dsh'), maxBytes: 65_536 }, + provider: 'scripted', + model: 'test-model', + cwd: workspace, + }, + }) + host.ctx.llm.registerAdapter(['scripted'], adapter) + const { sessionId } = expectOk(await host.api.sessions.create(request({}))) + const agent = host.ctx.agents.get(sessionId) as Agent + const idle = waitForIdle(host.ctx, agent) + + expectOk(await host.api.sessions.prompt(request({ + sessionId, + mode: 'queue' as const, + content: [{ type: 'text' as const, text: 'go' }], + }))) + await idle + + const requestText = adapter.requests[0]?.messages + .flatMap(message => message.content) + .filter(block => block.type === 'text') + .map(block => block.text) + .join('\n') ?? '' + expect(requestText).toContain('Instructions from: AGENTS.md') + expect(requestText).toContain('host-workspace-context-probe') + }) }) describe('host.describe', () => { @@ -203,7 +249,9 @@ describe('sessions.prompt / cancel', () => { describe('sessions.history', () => { it('implicitly resumes a cold session, deduplicating concurrent calls to one attach', async () => { const persistenceRoot = mkdtempSync(join(tmpdir(), 'dsh-host-resume-')) - const first = await startHost({ boot: { persistenceRoot, provider: 'scripted', model: 'test-model' } }) + const first = await startHost({ + boot: { persistenceRoot, workspaceContext: false, provider: 'scripted', model: 'test-model' }, + }) first.ctx.llm.registerAdapter(['scripted'], new ScriptedAdapter([textResponse('persisted')])) const { sessionId } = expectOk(await first.api.sessions.create(request({}))) const agent = first.ctx.agents.get(sessionId) as Agent @@ -212,7 +260,9 @@ describe('sessions.history', () => { await idle await first.dispose() - host = await startHost({ boot: { persistenceRoot, provider: 'scripted', model: 'test-model' } }) + host = await startHost({ + boot: { persistenceRoot, workspaceContext: false, provider: 'scripted', model: 'test-model' }, + }) host.ctx.llm.registerAdapter(['scripted'], new ScriptedAdapter([])) expect(host.ctx.agents.get(sessionId)).toBeUndefined() const [a, b] = await Promise.all([ diff --git a/packages/host/runtime/tsconfig.json b/packages/host/runtime/tsconfig.json index 9836e0b5fd..08efb88294 100644 --- a/packages/host/runtime/tsconfig.json +++ b/packages/host/runtime/tsconfig.json @@ -62,6 +62,9 @@ { "path": "../../fs/tool-fs-search" }, + { + "path": "../../context/workspace-context" + }, { "path": "../../llm/token-meter" }, diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index d9b18ff2e5..3e28836146 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -2077,6 +2077,9 @@ importers: '@deepseek-ai/dsh-workflow-workerthread': specifier: workspace:^ version: link:../../workflow/workflow-workerthread + '@deepseek-ai/dsh-workspace-context': + specifier: workspace:^ + version: link:../../context/workspace-context devDependencies: '@deepseek-ai/dsh-invariants': specifier: workspace:^