Coder/deepseek-harness
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor(cli): share app boot driver

Browse Source
This commit is contained in:
Turtle
2026-07-29 23:39:09 +08:00
parent d2270eefcd
commit c19facf9db
1 changed files with 7 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
apps/cli/src/app-cli-entry.ts
View File

@@ -11,13 +11,11 @@ import { readFileSync } from 'node:fs'
import { createRequire } from 'node:module' import { createRequire } from 'node:module'
import { networkInterfaces } from 'node:os' import { networkInterfaces } from 'node:os'
import { join, resolve } from 'node:path' import { join, resolve } from 'node:path'
import { pathToFileURL } from 'node:url'
import { Context } from 'cordis' import { Context } from 'cordis'
import type { FiberState } from 'cordis' import type { FiberState } from 'cordis'
import Loader from '@cordisjs/plugin-loader' import type { PatchOptions } from '@cordisjs/plugin-include'
import Include, { type PatchOptions } from '@cordisjs/plugin-include'
import yaml from 'js-yaml' import yaml from 'js-yaml'
import { assertEntriesLoaded, installFailLoud, loadEnv, loadOverlayPatches, loadPersonalPatches } from '@deepseek-ai/dsh-app-boot' import { boot, installFailLoud, loadEnv, loadOverlayPatches, loadPersonalPatches } from '@deepseek-ai/dsh-app-boot'
import { resolveDshHome, resolveSessionsRoot } from '@deepseek-ai/dsh-paths' import { resolveDshHome, resolveSessionsRoot } from '@deepseek-ai/dsh-paths'
// Empty type import carries the httpServer Context merge for the port read below. // Empty type import carries the httpServer Context merge for the port read below.
import type {} from '@deepseek-ai/dsh-host-webserver' import type {} from '@deepseek-ai/dsh-host-webserver'
@@ -230,12 +228,8 @@ export class AppCLIEntry {
}) })
} }
/** Loader include boot; the dev HMR row mounts before await so the fail-loud triple covers it. */ /** Shared Loader boot; the dev HMR row mounts before await so the fail-loud sweep covers it. */
private async bootTree(): Promise<void> { private async bootTree(): Promise<void> {
const ctx = new Context()
ctx.baseUrl = pathToFileURL(join(resolve(this.options.configPath), '..')).href + '/'
await ctx.plugin(Loader)
ctx.loader.builtins.include = Include
// One include of the shared base with every overlay as a sibling patch // One include of the shared base with every overlay as a sibling patch
// list: patches never cross an include boundary, so nesting them would // list: patches never cross an include boundary, so nesting them would
// silently stop reaching base rows. The surface overlay applies first, then // silently stop reaching base rows. The surface overlay applies first, then
@@ -247,28 +241,18 @@ export class AppCLIEntry {
: loadOverlayPatches('dsh', this.options.extraOverlayPath), : loadOverlayPatches('dsh', this.options.extraOverlayPath),
...this.patches, ...this.patches,
] ]
await ctx.loader.create({ this.ctx = await boot('dsh', resolve(this.options.configPath), patches, async (ctx) => {
name: 'cordis:include', if (this.options.dev) await ctx.loader.create({ name: '@deepseek-ai/dsh-client-hmr' })
config: {
path: pathToFileURL(resolve(this.options.configPath)).href,
...patches.length > 0 ? { patches } : {},
},
}) })
if (this.options.dev) {
await ctx.loader.create({ name: '@deepseek-ai/dsh-client-hmr' })
}
this.ctx = ctx
await ctx.loader.await()
} }
/** /**
* Fail-loud triple: assertEntriesLoaded catches import failures, * Shared boot catches import failures, installFailLoud catches late apply
* installFailLoud catches late apply rejections, and the all-ACTIVE sweep * rejections, and the all-ACTIVE sweep
* below catches PENDING fibers (cordis inject waiting has no timeout). * below catches PENDING fibers (cordis inject waiting has no timeout).
*/ */
private assertBoot(): void { private assertBoot(): void {
installFailLoud('dsh') installFailLoud('dsh')
assertEntriesLoaded(this.ctx, 'dsh')
const failures: string[] = [] const failures: string[] = []
for (const entry of this.ctx.loader.entries()) { for (const entry of this.ctx.loader.entries()) {
if (entry.fiber === undefined || entry.disabled) continue if (entry.fiber === undefined || entry.disabled) continue