Merge remote-tracking branch 'origin/master' into feature/installer-adopt-checkout

apps/cli/src/app-cli-entry.ts

@@ -324,7 +324,7 @@ export class AppCLIEntry {
     try {
       return require.resolve('@deepseek-ai/dsh-frontend/dist/index.html')
     } catch {
-      throw new Error('dsh: frontend dist not built; run pnpm --filter @deepseek-ai/dsh-frontend build first')
+      throw new Error('dsh: frontend dist not built; run pnpm run build from the repository root first')
     }
   }
 }

apps/cli/tests/install-script.spec.ts

@@ -0,0 +1,155 @@
+import { chmodSync, copyFileSync, mkdirSync, readFileSync, writeFileSync } from 'node:fs'
+import { mkdtemp, rm } from 'node:fs/promises'
+import { tmpdir } from 'node:os'
+import { join } from 'node:path'
+import { fileURLToPath } from 'node:url'
+import { execa } from 'execa'
+import { afterEach, describe, expect, it } from 'vitest'
+
+const installer = fileURLToPath(new URL('../../../scripts/install.sh', import.meta.url))
+const fixtures: string[] = []
+
+const PTY_DRIVER = String.raw`
+import errno, json, os, pty, select, signal, sys, time
+script, cwd, env_json, actions_json = sys.argv[1:]
+env = os.environ.copy()
+env.update(json.loads(env_json))
+actions = json.loads(actions_json)
+pid, fd = pty.fork()
+if pid == 0:
+    os.chdir(cwd)
+    os.execvpe("sh", ["sh", script], env)
+
+output = bytearray()
+action_index = 0
+deadline = time.monotonic() + 15
+status = None
+while time.monotonic() < deadline:
+    ready, _, _ = select.select([fd], [], [], 0.05)
+    if ready:
+        try:
+            chunk = os.read(fd, 65536)
+        except OSError as error:
+            if error.errno != errno.EIO:
+                raise
+            chunk = b""
+        output.extend(chunk)
+    while action_index < len(actions) and actions[action_index]["waitFor"].encode() in output:
+        os.write(fd, actions[action_index]["send"].encode())
+        action_index += 1
+    waited, candidate = os.waitpid(pid, os.WNOHANG)
+    if waited == pid:
+        status = candidate
+        break
+
+if status is None:
+    os.kill(pid, signal.SIGKILL)
+    _, status = os.waitpid(pid, 0)
+sys.stdout.buffer.write(output)
+if action_index != len(actions):
+    sys.stderr.write(f"completed {action_index}/{len(actions)} PTY actions\n")
+    sys.exit(124)
+sys.exit(os.waitstatus_to_exitcode(status))
+`
+
+interface Action {
+  readonly waitFor: string
+  readonly send: string
+}
+
+interface Fixture {
+  readonly binDirectory: string
+  readonly launchLog: string
+  readonly pnpmLog: string
+  readonly root: string
+  readonly script: string
+}
+
+afterEach(async () => {
+  await Promise.all(fixtures.splice(0).map(async (fixture) => { await rm(fixture, { force: true, recursive: true }) }))
+})
+
+function executable(path: string, content: string): void {
+  writeFileSync(path, content)
+  chmodSync(path, 0o755)
+}
+
+async function createFixture(): Promise<Fixture> {
+  const root = await mkdtemp(join(tmpdir(), 'dsh-install-'))
+  fixtures.push(root)
+  const checkoutDirectory = join(root, 'checkout')
+  const scriptsDirectory = join(checkoutDirectory, 'scripts')
+  const sourceBinDirectory = join(checkoutDirectory, 'bin')
+  const fakeBinDirectory = join(root, 'fake-bin')
+  const binDirectory = join(root, 'path-bin')
+  for (const directory of [scriptsDirectory, sourceBinDirectory, fakeBinDirectory, binDirectory, join(root, 'home/.dsh')]) {
+    mkdirSync(directory, { recursive: true })
+  }
+  const script = join(scriptsDirectory, 'install.sh')
+  copyFileSync(installer, script)
+  const launchLog = join(root, 'launch.log')
+  const pnpmLog = join(root, 'pnpm.log')
+  executable(join(sourceBinDirectory, 'dsh'), '#!/bin/sh\nprintf \'%s\\n\' "$*" >"$DSH_TEST_LAUNCH_LOG"\n')
+  executable(join(fakeBinDirectory, 'pnpm'), `#!/bin/sh
+if [ "\${1:-}" = --version ]; then printf '11.7.0\\n'; exit 0; fi
+printf '%s\\n' "$*" >>"$DSH_TEST_PNPM_LOG"
+`)
+  await execa('git', ['init', '-q'], { cwd: checkoutDirectory })
+  await execa('git', ['add', 'bin/dsh', 'scripts/install.sh'], { cwd: checkoutDirectory })
+  await execa('git', [
+    '-c', 'user.name=dsh-test',
+    '-c', 'user.email=dsh-test@example.invalid',
+    'commit', '-qm', 'fixture',
+  ], { cwd: checkoutDirectory })
+  writeFileSync(join(root, 'home/.dsh/.env'), 'DEEPSEEK_API_KEY=test\n')
+  return { binDirectory, launchLog, pnpmLog, root, script }
+}
+
+async function runInstaller(fixture: Fixture, actions: readonly Action[]): Promise<string> {
+  const result = await execa('python3', [
+    '-c',
+    PTY_DRIVER,
+    fixture.script,
+    fixture.root,
+    JSON.stringify({
+      DSH_BIN_DIR: fixture.binDirectory,
+      DSH_HOME: join(fixture.root, 'home/.dsh'),
+      DSH_TEST_LAUNCH_LOG: fixture.launchLog,
+      DSH_TEST_PNPM_LOG: fixture.pnpmLog,
+      HOME: join(fixture.root, 'home'),
+      PATH: `${join(fixture.root, 'fake-bin')}:${fixture.binDirectory}:${process.env.PATH ?? ''}`,
+    }),
+    JSON.stringify(actions),
+  ], { reject: false, stripFinalNewline: false, timeout: 20_000 })
+  expect(result.exitCode, result.stderr).toBe(0)
+  return result.stdout
+}
+
+describe.runIf(process.platform !== 'win32')('one-line installer interface choice', { timeout: 25_000 }, () => {
+  it('builds and launches the Web UI when the default choice is accepted', async () => {
+    const fixture = await createFixture()
+
+    const output = await runInstaller(fixture, [
+      { waitFor: 'Replace it?', send: '\n' },
+      { waitFor: 'Choose an interface [1/2]:', send: '\n' },
+    ])
+
+    expect(output).toContain('launching Web UI')
+    expect(readFileSync(fixture.pnpmLog, 'utf8')).toBe('install\nrun build\n')
+    expect(readFileSync(fixture.launchLog, 'utf8')).toBe('web\n')
+  })
+
+  it('rejects an unknown choice, then launches the TUI without building', async () => {
+    const fixture = await createFixture()
+
+    const output = await runInstaller(fixture, [
+      { waitFor: 'Replace it?', send: '\n' },
+      { waitFor: 'Choose an interface [1/2]:', send: 'terminal\n' },
+      { waitFor: 'choose 1 for Web UI or 2 for TUI', send: '2\n' },
+    ])
+
+    expect(output).toContain('launching TUI')
+    expect(readFileSync(fixture.pnpmLog, 'utf8')).toBe('install\n')
+    expect(readFileSync(fixture.launchLog, 'utf8')).toBe('\n')
+  })
+})

apps/web/tests/goal-bar.e2e.ts

@@ -0,0 +1,71 @@
+// Keyless assembled-browser coverage for the goal bar over the shipped Web
+// bundles and FixtureApiClient wire. The command creates a real projected
+// goal in the fixture session; the golden pins the active strip, while the
+// clear gesture proves the acknowledged tombstone leaves neither stale chrome
+// nor a duplicate-mutation error.
+import { fileURLToPath } from 'node:url'
+import { join } from 'node:path'
+import type { Browser, Page } from 'playwright'
+import { chromium } from 'playwright'
+import { afterAll, beforeAll, describe, expect, it, onTestFailed } from 'vitest'
+import {
+  assertFixtureInventory, captureStableAria, compareOrRefreshGolden,
+  launchWebScaffold, watchConsole, webSnapshotMode, type WebScaffold,
+} from './scaffold.ts'
+import { newEnglishPage, saveFailureShot } from './support.ts'
+
+const SNAPSHOT_DIR = fileURLToPath(new URL('./snapshots/goal-bar', import.meta.url))
+const ACTIVE_EXPECTED = join(SNAPSHOT_DIR, 'active.expected.md')
+const OVERLAY = fileURLToPath(new URL('./goal-bar.overlay.yml', import.meta.url))
+const MODE = webSnapshotMode()
+
+describe('web e2e: goal bar clear convergence', () => {
+  let scaffold: WebScaffold
+  let browser: Browser
+  let page: Page
+  let tripwire: ReturnType<typeof watchConsole>
+
+  beforeAll(async () => {
+    scaffold = await launchWebScaffold({ extraOverlayPath: OVERLAY, welcomeNoticePending: true })
+    browser = await chromium.launch()
+    page = await newEnglishPage(browser)
+    tripwire = watchConsole(page)
+    await page.goto(`${scaffold.baseUrl}?fixture`, { waitUntil: 'load' })
+    await page.waitForSelector('[class*="frame"]', { timeout: 30_000 })
+  }, 120_000)
+
+  afterAll(async () => {
+    await browser?.close()
+    await scaffold?.close()
+  })
+
+  it('renders one active goal and clears it without exposing a stale error', async () => {
+    onTestFailed(() => saveFailureShot(page, 'web-e2e-goal-bar-clear'))
+    // Startup reuses the fixture workspace's blank session, keeping this
+    // command independent of alpha's running replay and pending question.
+    const input = page.getByPlaceholder('Describe what you want to build')
+    await input.waitFor({ timeout: 10_000 })
+    await input.fill('/goal guard rapid clear clicks')
+    await input.press('Enter')
+
+    const bar = page.locator('[data-goal-bar]')
+    await bar.waitFor({ timeout: 10_000 })
+    const snapshot = await captureStableAria(page, '[data-goal-bar]', scaffold.workspaceCwd)
+    await compareOrRefreshGolden(ACTIVE_EXPECTED, snapshot, MODE)
+
+    const clear = bar.getByRole('button', { name: 'Clear goal' })
+    await clear.evaluate((button) => {
+      const control = button as HTMLButtonElement
+      control.click()
+      control.click()
+    })
+    await expect.poll(() => page.locator('[data-goal-bar]').count(), { timeout: 10_000 }).toBe(0)
+    expect(await page.getByText(/no current goal/iu).count()).toBe(0)
+    expect(tripwire.pageErrors).toEqual([])
+    expect(tripwire.warnings).toEqual([])
+  }, 60_000)
+
+  it.skipIf(MODE === 'record')('keeps the fixture inventory closed', async () => {
+    await assertFixtureInventory(SNAPSHOT_DIR, ['active.expected.md'])
+  })
+})

apps/web/tests/goal-bar.overlay.yml

@@ -0,0 +1,5 @@
+# The client-side FixtureApiClient intentionally rejects settings writes, so
+# this goal-only scenario omits the durable welcome step that would otherwise
+# cover the page. Onboarding owns separate assembled-browser coverage.
+- id: ui-settings-general
+  disabled: true

apps/web/tests/snapshots/goal-bar/active.expected.md

@@ -0,0 +1,8 @@
+- img
+- text: Ongoing Goal guard rapid clear clicks
+- button "Pause goal":
+  - img
+- button "Edit goal":
+  - img
+- button "Clear goal":
+  - img

apps/web/tests/support.ts

@@ -35,7 +35,7 @@ export async function newEnglishPage(browser: Browser, height = 1000): Promise<P
 /** Fail loud on a stale checkout instead of testing yesterday's bundle. */
 export function requireDist(): void {
   if (!existsSync(DIST_INDEX)) {
-    throw new Error('web app dist not built — run `pnpm --filter @deepseek-ai/dsh-frontend build` (pnpm run test:web does this first)')
+    throw new Error('web app dist not built — run `pnpm run build` from the repository root (`pnpm run test:web` does this first)')
   }
 }
 

apps/web/tsconfig.json

@@ -50,6 +50,7 @@
     "tests/permission-policy-context.e2e.ts",
     "tests/access-confirmation.e2e.ts",
     "tests/shipped-composition.e2e.ts",
+    "tests/goal-bar.e2e.ts",
     "tests/startup-auto-selection.e2e.ts"
   ],
   "references": [