The fork was pinned at upstream v0.18.0. That is the entire reason the window
ran TWO sidebars and TWO near-identical panel toggles: DSH 2.0.10 ships its own
right sidebar (@deepseek-ai/dsh-client-ui-sidebar-right), and upstream only
adopted it in v0.19.0-alpha.1 — which arrived after our fork point. v0.19.1 is
also the one upstream line whose support range actually matches our host
(engines.dsh >=0.1.5-rc.1, 14 DSH peers ^0.1.5-rc.1, host = 0.1.5-rc.2), so it
is the only tag the host's startup precheck accepts.
What upstream v0.18.0 → v0.19.1 brings
- src/client/native/{index,surface,tab-adapter}.tsx: every tab the plugin can
draw becomes an OFFICIAL native tab type + body, and an external plugin's
descriptor registered later gets its native type too. This is what retires
the fork's own right panel — and with it the duplicate toggle cluster
(`toggleCluster` is gone from v0.19.1).
- native tab-chip icons via the `sidebar.right.pane.tab.title` seat, coloured
built-in tab icons, file/folder glyphs from DSH's own `FileTypeIcon`.
- guide descriptions (DSH renders them while the guide lists <= 4 entries),
tab bodies that fill the panel, and the 0.1.5-rc.2 adaptation work we were
carrying by hand (peer/devDep pinning, primitives' transitive devDeps).
How the sync was done
Rebuilt the tree from the v0.19.1 tag rather than resolving 53 conflicted
files: our v0.18.0 delta was measured first and is only (a) one mechanical
rename `dsh-better-sidebar` -> `dsh-apes-sidebar` and (b) ten real edits. So:
tag tree + rename (scoped: code/config/scripts/tests/README, while the 46
historical docs/plans records and switch.sh's upstream package name stay
untouched) + re-applied deltas + our apes module.
Fork deltas re-applied on the new base
- src/client/apes/ (icons / locales / tabs): the three apes:* information-layer
tabs (agents / apps / profile), registered through the same BetterSidebarService
as the builtins — which is exactly why they now ride upstream's native adapter
into the official sidebar for free.
- identity: package.json (name/version 1.2.0/description/forkedFrom), dsh.plugin.json
(id/version), SIDEBAR_SERVICE_VERSION 1.2.0, README fork notice,
docs/external-plugin-guide.md.
- scripts/switch.sh + the pnpm switch* scripts (apes <-> upstream two-line switch).
- tests/apes-tabs.spec.ts (unescaped: it starts from the v0.19.1 base).
Dropped
- the Phase A native-registration spike (`apes/native-tabs.tsx` + its spec): it
re-derived by hand exactly what upstream's native layer already does — the
hand-written bridge is dead weight now, and v0.19.1's own e2e/jsdom lanes
cover the same seat contract far better.
- the unused apesProfileGuideDesc key and the two package.json.bak.* backups.
Verified on the new base: typecheck clean; build clean; 1351 passed / 9 skipped
(128 files), up from 1255 on the old base.
102 lines
4.3 KiB
TypeScript
102 lines
4.3 KiB
TypeScript
import { describe, expect, it } from 'vitest'
|
|
import { spawnSync } from 'node:child_process'
|
|
import { mkdtempSync, realpathSync, rmSync, writeFileSync } from 'node:fs'
|
|
import { tmpdir } from 'node:os'
|
|
import { join, resolve } from 'node:path'
|
|
import { parseWorktreeList, resolveWorktree, status, worktrees } from '../src/git.ts'
|
|
|
|
const IDENTITY = {
|
|
GIT_AUTHOR_NAME: 'dsh-apes-sidebar-test',
|
|
GIT_AUTHOR_EMAIL: 'test@dsh.invalid',
|
|
GIT_COMMITTER_NAME: 'dsh-apes-sidebar-test',
|
|
GIT_COMMITTER_EMAIL: 'test@dsh.invalid',
|
|
}
|
|
|
|
function git(cwd: string, args: string[]): string {
|
|
const result = spawnSync('git', ['-C', cwd, ...args], {
|
|
encoding: 'utf8',
|
|
env: { ...process.env, ...IDENTITY },
|
|
})
|
|
if (result.status !== 0) throw new Error(result.stderr || `git ${args.join(' ')} failed`)
|
|
return result.stdout
|
|
}
|
|
|
|
describe('linked Git worktrees', () => {
|
|
it('parses porcelain records with spaces in checkout paths', () => {
|
|
expect(parseWorktreeList([
|
|
'worktree C:/repo/main checkout',
|
|
'HEAD abc',
|
|
'branch refs/heads/main',
|
|
'',
|
|
'worktree C:/repo/agent checkout',
|
|
'HEAD def',
|
|
'detached',
|
|
'',
|
|
].join('\n'))).toEqual([
|
|
{ path: 'C:/repo/main checkout', branch: 'main', locked: false, prunable: false },
|
|
{ path: 'C:/repo/agent checkout', branch: 'HEAD', locked: false, prunable: false },
|
|
])
|
|
})
|
|
|
|
it('preserves locked metadata and marks stale records prunable', () => {
|
|
expect(parseWorktreeList([
|
|
'worktree C:/repo/locked',
|
|
'HEAD abc',
|
|
'branch refs/heads/locked',
|
|
'locked in use',
|
|
'',
|
|
'worktree C:/repo/missing',
|
|
'HEAD def',
|
|
'prunable gitdir file points to non-existent location',
|
|
'',
|
|
].join('\0'))).toEqual([
|
|
{ path: 'C:/repo/locked', branch: 'locked', locked: true, prunable: false },
|
|
{ path: 'C:/repo/missing', branch: 'HEAD', locked: false, prunable: true },
|
|
])
|
|
})
|
|
|
|
it('discovers dirty linked checkouts and fences selected targets', async () => {
|
|
const root = mkdtempSync(join(tmpdir(), 'dsh-sidebar-worktrees-'))
|
|
const main = join(root, 'main')
|
|
const agent = join(root, 'agent worktree')
|
|
try {
|
|
git(root, ['init', '-q', main])
|
|
git(main, ['checkout', '-q', '-b', 'main'])
|
|
writeFileSync(join(main, 'tracked.txt'), 'base\n')
|
|
git(main, ['add', '-A'])
|
|
git(main, ['commit', '-q', '-m', 'base'])
|
|
git(main, ['worktree', 'add', '-q', '-b', 'agent', agent])
|
|
writeFileSync(join(agent, 'tracked.txt'), 'changed by agent\n')
|
|
// macOS tmpdir() keeps the /var symlink while git reports the resolved
|
|
// /private/var prefix; on Windows TEMP is often the 8.3 short form
|
|
// (C:\Users\RUNNER~1\...) while git reports the long path. The NATIVE
|
|
// realpath resolves both aliasings (libuv's GetFinalPathNameByHandle
|
|
// expands 8.3 names) — canonicalize every path handed to git APIs.
|
|
const agentPath = realpathSync.native(agent)
|
|
|
|
const listed = await worktrees(main)
|
|
expect(listed).toHaveLength(2)
|
|
expect(listed.find(entry => entry.current)).toMatchObject({ branch: 'main', changes: 0 })
|
|
expect(listed.find(entry => !entry.current)).toMatchObject({ branch: 'agent', changes: 1 })
|
|
expect(resolve(await resolveWorktree(main, agentPath))).toBe(resolve(agentPath))
|
|
expect((await status(await resolveWorktree(main, agentPath))).entries).toEqual([
|
|
{ path: 'tracked.txt', xy: ' M' },
|
|
])
|
|
await expect(resolveWorktree(main, root)).rejects.toThrow('unknown linked worktree')
|
|
|
|
// Git retains administrative metadata after a checkout directory is
|
|
// deleted, reporting the record as prunable. It must disappear from both
|
|
// the selector inventory and the accepted command-target allowlist.
|
|
rmSync(agent, { recursive: true, force: true })
|
|
const remaining = await worktrees(main)
|
|
expect(remaining).toHaveLength(1)
|
|
expect(resolve(remaining[0]!.path)).toBe(resolve(realpathSync.native(main)))
|
|
expect(remaining[0]!.current).toBe(true)
|
|
await expect(resolveWorktree(main, agentPath)).rejects.toThrow('unknown linked worktree')
|
|
} finally {
|
|
try { git(main, ['worktree', 'remove', '--force', agent]) } catch { /* fixture may not be fully initialized */ }
|
|
rmSync(root, { recursive: true, force: true })
|
|
}
|
|
})
|
|
})
|