|
|
@@ -1,9 +1,9 @@
|
|
|
-import { mkdtemp, readFile, stat, writeFile } from 'node:fs/promises'
|
|
|
+import { mkdir, mkdtemp, readFile, stat, writeFile } from 'node:fs/promises'
|
|
|
import { tmpdir } from 'node:os'
|
|
|
import { fileURLToPath } from 'node:url'
|
|
|
import { dirname, join } from 'node:path'
|
|
|
import { Context } from 'cordis'
|
|
|
-import { boot, loadOverlayPatches } from '@deepseek-ai/dsh-app-boot'
|
|
|
+import { boot, healProfilesModuleFallback, loadOverlayPatches } from '@deepseek-ai/dsh-app-boot'
|
|
|
import { SessionId } from '@deepseek-ai/dsh-session'
|
|
|
import type { Agent } from '@deepseek-ai/dsh-agent'
|
|
|
import type { PatchOptions } from '@cordisjs/plugin-include'
|
|
|
@@ -13,8 +13,12 @@ import { resolveSessionPreset, SETTINGS_NAMESPACE } from '@deepseek-ai/dsh-agent
|
|
|
import type {} from '@deepseek-ai/dsh-tools'
|
|
|
|
|
|
const CONFIG_DIR = fileURLToPath(new URL('../config/', import.meta.url))
|
|
|
-const BASE_CONFIG = join(CONFIG_DIR, 'base.cordis.yml')
|
|
|
-const WEB_OVERLAY = join(CONFIG_DIR, 'web.cordis.yml')
|
|
|
+const REPO_ROOT = fileURLToPath(new URL('../../..', import.meta.url))
|
|
|
+/** The shipped Web surface: the dsh-base and dsh-web-app bundle patches over an empty preset root. */
|
|
|
+const BASE_PATCH = join(REPO_ROOT, 'packages/bundle/base/cordis.patch.yml')
|
|
|
+const WEB_PATCH = join(REPO_ROOT, 'packages/bundle/web-app/cordis.patch.yml')
|
|
|
+/** The installation anchor whose dependency surface the preset module fallback mirrors. */
|
|
|
+const INSTALL_ANCHOR = join(REPO_ROOT, 'apps/cli/package.json')
|
|
|
|
|
|
/**
|
|
|
* Boot the shipped Web composition, minus the rows that would bind a port,
|
|
|
@@ -24,7 +28,8 @@ const WEB_OVERLAY = join(CONFIG_DIR, 'web.cordis.yml')
|
|
|
async function bootWeb(settingsFile: string, extra: PatchOptions[] = []): Promise<Context> {
|
|
|
const storageRoot = join(dirname(settingsFile), 'storages')
|
|
|
const patches: PatchOptions[] = [
|
|
|
- ...loadOverlayPatches('dsh-test', WEB_OVERLAY),
|
|
|
+ ...loadOverlayPatches('dsh-test', BASE_PATCH),
|
|
|
+ ...loadOverlayPatches('dsh-test', WEB_PATCH),
|
|
|
// The settings row defaults to `$DSH_HOME/settings.yaml`. Left alone it
|
|
|
// reads the developer's own document — and since the default preset is a
|
|
|
// setting, a stored `agent-presets.default` would decide this file's
|
|
|
@@ -44,6 +49,11 @@ async function bootWeb(settingsFile: string, extra: PatchOptions[] = []): Promis
|
|
|
// moved into the presets that a host row still waits for. The boot audit
|
|
|
// is that assertion.
|
|
|
{ id: 'webserver', disabled: true },
|
|
|
+ // The web bundle's runtime row injects `httpServer`, so it cannot
|
|
|
+ // activate without the bound port disabled above. It owns dist serving
|
|
|
+ // and the URL prompt line — surface glue, not anything that decides an
|
|
|
+ // agent's capabilities, which is all this file asserts.
|
|
|
+ { id: 'web-runtime', disabled: true },
|
|
|
{ id: 'telemetry-otel', disabled: true },
|
|
|
{ id: 'modules', disabled: true },
|
|
|
{ id: 'connection', disabled: true },
|
|
|
@@ -62,7 +72,17 @@ async function bootWeb(settingsFile: string, extra: PatchOptions[] = []): Promis
|
|
|
},
|
|
|
...extra,
|
|
|
]
|
|
|
- return await boot('dsh-test', BASE_CONFIG, patches)
|
|
|
+ // The surface is patch layers over an empty preset root, so the root sits
|
|
|
+ // outside this workspace and bare plugin names cannot resolve by Node's
|
|
|
+ // upward walk. The flat fallback the preset boot maintains is what makes
|
|
|
+ // them resolvable — the same mechanism, not a test-only shim.
|
|
|
+ const home = dirname(settingsFile)
|
|
|
+ healProfilesModuleFallback(INSTALL_ANCHOR, home)
|
|
|
+ const profileDir = join(home, 'profiles', 'spec')
|
|
|
+ await mkdir(profileDir, { recursive: true })
|
|
|
+ const rootConfig = join(profileDir, 'cordis.yml')
|
|
|
+ await writeFile(rootConfig, '[]\n')
|
|
|
+ return await boot('dsh-test', rootConfig, patches)
|
|
|
}
|
|
|
|
|
|
const toolNames = (ctx: Context, agent?: Agent): string[] =>
|
|
|
@@ -339,7 +359,7 @@ describe('authoring a preset on the shipped composition', () => {
|
|
|
let userRoot: string
|
|
|
|
|
|
beforeAll(async () => {
|
|
|
- userRoot = join(await mkdtemp(join(tmpdir(), 'dsh-preset-authoring-')), 'presets')
|
|
|
+ userRoot = join(await mkdtemp(join(tmpdir(), 'dsh-preset-authoring-')), 'profiles')
|
|
|
const settingsFile = join(await mkdtemp(join(tmpdir(), 'dsh-preset-authoring-settings-')), 'settings.yaml')
|
|
|
await writeFile(settingsFile, '{}\n')
|
|
|
authorCtx = await bootWeb(settingsFile, [{
|
Yichen Jiang