@xrkseek/harness 0.6.23 → 0.7.0-rc.2

package/node_modules/@xrkseek/server-host/dist/index.js

@@ -15,8 +15,8 @@ import { watchPolicyFile } from "./policy-file-watch.js";
 import { createA2aInboundPublicHandler } from "./a2a-inbound-public.js";
 import { createCronApiHandler } from "./cron-http.js";
 import { tryMountHostIsolatingWorkflowEngine } from "./workflow-engine-mount.js";
-import { applyXrkProductBootPolicy, chainPublicHandlers, ensureDshCompatHostPlugin, DSH_COMPAT_HOST_PLUGIN_ID, createLiveHostPluginsPublicHandler, createHttpServer, createXrkPluginPublicHandler, createSidebarPublicHandler, prewarmDshCompatAdapters, shutdownDshCompatServices, applyHostPackageByName, stopHostPackage, listHostAppliedPackages, invokeDshCompatRpc, attachDshCompatUpgrades, DSH_SETTINGS_NAMESPACES, DSH_SETTINGS_DEFAULTS, runPluginMutate, ensureXrkPlatformClientBootEntries, injectBootIntoHtml, injectBootThemeIntoHtml, injectMobileAccessShellIntoHtml, loadBootManifestFromWebDist, mergeWebBootManifests, resolveWebBootManifest, createXrkWalletPort, createMobileAccessGateChecker, createMobileAccessGateHandler, loadSidebarPrefs, createAutoReviewToolPre, isAutoReviewEnabled, setAutoReviewEnabled, setImFaceAdmitHook, } from "@xrkseek/server-http";
-import { attachFaceUpgrades, bindSubagentTools, bindSessionQueryTools, createFaceRuntime, IM_AGENT_PRESET_ID, IM_WORKSPACE_ID, QICHUANG_AGENT_PRESET_ID, XIANGYANG_WORKSPACE_ID, isOrchestrationWorkspaceId, effectiveHostApiKey, ensureMcpLiveIfIdle, isLoopbackAddress, timingSafeStringEqual, listCredentialSlots, peekSettingsYamlSection, publishRemoteEvent, createSessionRoutingLlm, liveRouteAllowsImageInput, resolveSessionCwd, ensureSessionWorkingDirectory, setSessionWorkingDirectory, createSessionWorktree, canonicalAgentPresetId, resolveAgentPresetProfile, effectiveSessionAgentPreset, tryHandleFaceHttp, isPluginSoftDisabledAt, readDisabledPluginIdsAt, readManagedPackageIndexAt, reconcileManagedProcessPlugins, snapshotSessionWorkspace, SNAPSHOT_DRAIN_BUDGET_MS, applyRosterToolPolicy, migrateAutoSessionsToFullAccess, approvePendingAutoReview, createCollabBoardFragmentProvider, createSessionCapabilityFragmentProvider, createSessionPostureFragmentProvider, canvasWorkspaceIdForSession, memberPackSkillsDir, resolveSessionModelSelection, credentialsSet, settingsMutateFace, communityLoopbackBaseUrlCollision, existingPiAiProvider, mergeCommunityProviderModels, } from "@xrkseek/server-face";
+import { applyXrkProductBootPolicy, chainPublicHandlers, ensureDshCompatHostPlugin, ensureSunflowerFreePlugin, remountSunflowerFreePlugin, applySunflowerFreeEgressSettings, DSH_COMPAT_HOST_PLUGIN_ID, SUNFLOWER_FREE_PLUGIN_ID, SUNFLOWER_FREE_BRAND_ID, createLiveHostPluginsPublicHandler, createHttpServer, createXrkPluginPublicHandler, createSidebarPublicHandler, prewarmDshCompatAdapters, shutdownDshCompatServices, applyHostPackageByName, stopHostPackage, listHostAppliedPackages, invokeDshCompatRpc, attachDshCompatUpgrades, DSH_SETTINGS_NAMESPACES, DSH_SETTINGS_DEFAULTS, runPluginMutate, ensureXrkPlatformClientBootEntries, injectBootIntoHtml, injectBootThemeIntoHtml, injectMobileAccessShellIntoHtml, loadBootManifestFromWebDist, mergeWebBootManifests, resolveWebBootManifest, createXrkWalletPort, armAccessGateForListen, createMobileAccessGateChecker, createMobileAccessGateHandler, loadSidebarPrefs, createAutoReviewToolPre, isAutoReviewEnabled, setAutoReviewEnabled, setImFaceAdmitHook, } from "@xrkseek/server-http";
+import { attachFaceUpgrades, bindSubagentTools, bindSessionQueryTools, createFaceRuntime, IM_AGENT_PRESET_ID, IM_WORKSPACE_ID, QICHUANG_AGENT_PRESET_ID, XIANGYANG_WORKSPACE_ID, isOrchestrationWorkspaceId, effectiveHostApiKey, ensureMcpLiveIfIdle, timingSafeStringEqual, listCredentialSlots, peekSettingsYamlSection, publishRemoteEvent, createSessionRoutingLlm, liveRouteAllowsImageInput, resolveSessionCwd, ensureSessionWorkingDirectory, setSessionWorkingDirectory, createSessionWorktree, canonicalAgentPresetId, resolveAgentPresetProfile, effectiveSessionAgentPreset, tryHandleFaceHttp, isPluginSoftDisabledAt, readDisabledPluginIdsAt, readManagedPackageIndexAt, reconcileManagedProcessPlugins, snapshotSessionWorkspace, SNAPSHOT_DRAIN_BUDGET_MS, applyRosterToolPolicy, migrateAutoSessionsToFullAccess, approvePendingAutoReview, createBossStatusFragmentProvider, createCollabBoardFragmentProvider, createSeatIdentityFragmentProvider, createSessionCapabilityFragmentProvider, createSessionPostureFragmentProvider, createInstructionAuthorityFragmentProvider, canvasWorkspaceIdForSession, memberPackSkillsDir, resolveSessionModelSelection, credentialsSet, settingsMutateFace, communityLoopbackBaseUrlCollision, existingPiAiProvider, mergeCommunityProviderModels, } from "@xrkseek/server-face";
 import { createPluginLoader, composeHostPolicyEngine, wireCompositionChannels, wireCompositionLlm, collectChannelPluginRegistrations, isOptionalBundleEnabledAt, } from "@xrkseek/server-loader";
 import { existsSync } from "node:fs";
 import { access } from "node:fs/promises";
@@ -258,11 +258,18 @@ export function createHostManager() {
             // background so the xrk-app:// Fetch bridge can open without waiting for
             // every extension ESM graph (Cursor-like first paint).
             const deferManagedPlugins = String(process.env.XRK_SURFACE ?? "").trim() === "desktop";
+            // Built-ins loaded outside pluginsDir (dsh-compat Host fiber + sunflower
+            // free LLM). Without preserveIds, Desktop's deferred reconcile unregisters
+            // them → dispose clears XRK_SUNFLOWER_SIDECAR_KEY while the brand stays.
+            const builtInPreserveIds = [
+                DSH_COMPAT_HOST_PLUGIN_ID,
+                SUNFLOWER_FREE_PLUGIN_ID,
+            ];
             let loadedPluginIds = [];
             const loadManagedPlugins = async () => {
                 if (!managedPluginsRootReady())
                     return;
-                const bootPlugins = await reconcileManagedProcessPlugins(loader, resolvedPluginsDir, { preserveIds: [DSH_COMPAT_HOST_PLUGIN_ID] });
+                const bootPlugins = await reconcileManagedProcessPlugins(loader, resolvedPluginsDir, { preserveIds: [...builtInPreserveIds] });
                 loadedPluginIds = [...bootPlugins.ids];
                 for (const failure of bootPlugins.failures) {
                     log?.warn(`plugin load failed (${failure.id}): ${failure.message}`);
@@ -772,8 +779,8 @@ export function createHostManager() {
                 // hot-switch without agentCache invalidate mid-turn.
                 return agentCache.resolve(sessionId, async () => {
                     const pluginSettings = pluginSettingsBox.read?.() ?? {};
-                    // Child inject: skip parent persona; advanced pack skills → child
-                    // catalog only (never parent). Curated memory is not in the pack.
+                    // Child inject: same standing + convention as parents; only XRK.md
+                    // ledger is audience-gated. Advanced pack skills → child catalog.
                     let childWorkspaceInject;
                     if (parentSessionId) {
                         const link = faceBox.runtime?.subagents.getByChild(sessionId);
@@ -798,6 +805,32 @@ export function createHostManager() {
                             ...(extraSkillDirs.length > 0 ? { extraSkillDirs } : {}),
                         };
                     }
+                    else {
+                        // Top-level identity (干员家): same inject as parents minus XRK.md;
+                        // seat playbook still lives on cwd AGENTS / roster.
+                        const identity = faceBox.runtime?.sessionIdentities.get(sessionId);
+                        if (identity) {
+                            const rt = faceBox.runtime;
+                            const home = rt?.agentRoster.findHome(identity.memberId);
+                            const member = home && rt
+                                ? rt.agentRoster.get(home.rosterWorkspaceId, identity.memberId)
+                                : undefined;
+                            const audience = member?.inject === "subagent"
+                                ? "subagent"
+                                : "minimal";
+                            const extraSkillDirs = [];
+                            if (member?.kind === "advanced" && rt && home) {
+                                const skillsRoot = memberPackSkillsDir(member.scope === "global" ? "global" : home.rosterWorkspaceId, member.id, rt.agentRoster.home);
+                                if (existsSync(skillsRoot)) {
+                                    extraSkillDirs.push(skillsRoot);
+                                }
+                            }
+                            childWorkspaceInject = {
+                                audience,
+                                ...(extraSkillDirs.length > 0 ? { extraSkillDirs } : {}),
+                            };
+                        }
+                    }
                     const agent = await factory({
                         sessionId,
                         store,
@@ -1011,8 +1044,11 @@ export function createHostManager() {
                         ...(faceBox.runtime
                             ? {
                                 contextFragmentProviders: [
+                                    createInstructionAuthorityFragmentProvider(),
                                     createSessionCapabilityFragmentProvider(faceBox.runtime),
                                     createSessionPostureFragmentProvider(faceBox.runtime),
+                                    createBossStatusFragmentProvider(faceBox.runtime),
+                                    createSeatIdentityFragmentProvider(faceBox.runtime),
                                     createCollabBoardFragmentProvider(faceBox.runtime),
                                 ],
                                 workingDirectoryTools: {
@@ -1062,6 +1098,18 @@ export function createHostManager() {
                                     : {}),
                             }
                             : {}),
+                        // Claude Code `$.ui.ask` → Face question broker (same surface as
+                        // ask_user). Live getter: Face may finish wiring after this
+                        // composition starts building during boot.
+                        userQuestions: {
+                            ask: (input) => {
+                                const broker = faceBox.questions ?? faceBox.runtime?.questions;
+                                if (!broker) {
+                                    return Promise.reject(new Error("$.ui.ask: Face question broker is not ready yet"));
+                                }
+                                return broker.ask(input.agent.session.id, input.questions, input.signal);
+                            },
+                        },
                         autoReviewPre: createAutoReviewToolPre({
                             xrkHome: resolveXrkHome(),
                             // Master switch (Settings) AND session preset === auto (DSH).
@@ -1531,7 +1579,9 @@ export function createHostManager() {
                     workspaceRoot: config.runtime.workspaceRoot,
                     preset: config.runtime.preset,
                 }),
-                version: "0.0.0",
+                version: options?.version?.trim()
+                    || process.env.XRK_PRODUCT_VERSION?.trim()
+                    || "0.0.0",
                 defaultAgentPreset: canonicalAgentPresetId(config.runtime.preset),
                 registry,
                 attachments,
@@ -1564,6 +1614,9 @@ export function createHostManager() {
                         ...(options?.registry?.trim()
                             ? { registry: options.registry.trim() }
                             : {}),
+                        ...(options?.proxy?.trim()
+                            ? { proxy: options.proxy.trim() }
+                            : {}),
                         ...(options?.onChunk !== undefined
                             ? { onChunk: options.onChunk }
                             : {}),
@@ -1577,7 +1630,7 @@ export function createHostManager() {
                         ...(options?.reloadIds !== undefined
                             ? { reloadIds: options.reloadIds }
                             : {}),
-                        preserveIds: [DSH_COMPAT_HOST_PLUGIN_ID],
+                        preserveIds: [...builtInPreserveIds],
                     });
                     loadedPluginIds = [...synced.ids];
                     for (const failure of synced.failures) {
@@ -1599,6 +1652,29 @@ export function createHostManager() {
                         },
                     }
                     : {}),
+                // Settings → 向日葵免费 egress: remount sidecar + re-probe without Host restart.
+                // Serialized so overlapping Saves cannot dispose/load the same plugin twice.
+                // Reads `faceBox.runtime` (assigned after createFaceRuntime returns).
+                syncSunflowerFree: (() => {
+                    let chain = Promise.resolve();
+                    return () => {
+                        const run = async () => {
+                            const rt = faceBox.runtime;
+                            if (!rt) {
+                                return { loaded: false, unloaded: false };
+                            }
+                            registry.unregisterBrand(SUNFLOWER_FREE_BRAND_ID);
+                            const result = await remountSunflowerFreePlugin(loader, rt);
+                            refreshFacePlugins();
+                            await invalidateAgents();
+                            log?.info(`sunflower-free remount loaded=${result.loaded} unloaded=${result.unloaded}`);
+                            return result;
+                        };
+                        const next = chain.then(run, run);
+                        chain = next.then(() => undefined, () => undefined);
+                        return next;
+                    };
+                })(),
                 ...(config.runtime.webDist
                     ? { webPlugins: faceWebPlugins }
                     : {}),
@@ -1817,6 +1893,11 @@ export function createHostManager() {
                     : "";
                 const tavily = faceRuntime.credentials.peek("web.tavily");
                 const brave = faceRuntime.credentials.peek("web.brave");
+                // Dedicated web.deepseek, else chat llm.deepseek / env (same Bearer key).
+                const deepseek = faceRuntime.credentials.peek("web.deepseek") ??
+                    faceRuntime.credentials.peek("llm.deepseek") ??
+                    process.env.XRK_DEEPSEEK_SEARCH_API_KEY?.trim() ??
+                    process.env.DEEPSEEK_API_KEY?.trim();
                 const webSearch = {
                     ...(provider && provider !== "auto" ? { provider } : {}),
                     ...(region ? { region } : {}),
@@ -1830,6 +1911,7 @@ export function createHostManager() {
                             braveApiKey: brave ?? process.env.XRK_BRAVE_SEARCH_API_KEY?.trim() ?? "",
                         }
                         : {}),
+                    ...(deepseek ? { deepseekApiKey: deepseek } : {}),
                 };
                 const injectMaxCharsRaw = injectNs.injectMaxChars;
                 const injectMaxChars = typeof injectMaxCharsRaw === "number" &&
@@ -2078,7 +2160,7 @@ export function createHostManager() {
                     : undefined;
                 const localeNs = faceRuntime.settingsNamespaces.view("locale")
                     .value;
-                const asLocale = (raw) => raw === "zh" || raw === "en" ? raw : undefined;
+                const asLocale = (raw) => raw === "zh" || raw === "en" || raw === "ja" ? raw : undefined;
                 // Explicit Settings choice wins; older desktop builds stored the shell
                 // language in the `ui` namespace (`ui.locale`) and never wrote
                 // `locale.preference`, so honour it instead of dropping to the
@@ -2193,9 +2275,10 @@ export function createHostManager() {
                             void invalidateAgents();
                         return;
                     }
+                    // llm-deepseek / llm-pi-ai: Face publishes `llm/adapters-updated` only
+                    // when adapter-affecting fields change (not providerOrder). Catalog
+                    // order refreshes via document-updated alone — do not remount Agents.
                     if (ns === "agent-default-model" ||
-                        ns === "llm-deepseek" ||
-                        ns === "llm-pi-ai" ||
                         ns === "agent-loop" ||
                         ns === "bash" ||
                         ns === "web-search" ||
@@ -2237,28 +2320,60 @@ export function createHostManager() {
                     slot.revision,
                 ]);
             };
-            const mobileAccessGate = createMobileAccessGateChecker({
+            const bindHost = String(config.runtime.host ?? "127.0.0.1").trim();
+            const ownLanHosts = (() => {
+                const h = bindHost.toLowerCase();
+                const m = /^(\d+)\.(\d+)\.(\d+)\.(\d+)$/.exec(h);
+                if (!m)
+                    return [];
+                const a = Number(m[1]);
+                const b = Number(m[2]);
+                if (a === 10 ||
+                    (a === 192 && b === 168) ||
+                    (a === 172 && b >= 16 && b <= 31) ||
+                    (a === 169 && b === 254)) {
+                    return [h];
+                }
+                return [];
+            })();
+            const mobileAccessOptions = {
                 xrkHome: resolveXrkHome(),
-            });
-            const faceCheckAuth = (r) => {
-                if (!mobileAccessGate(r))
-                    return false;
-                const expected = effectiveHostApiKey(faceRuntime);
-                if (!expected)
-                    return true;
+                ...(ownLanHosts.length > 0 ? { ownLanHosts } : {}),
+            };
+            const pinAccessGate = createMobileAccessGateChecker(mobileAccessOptions);
+            const pinAccessHandler = createMobileAccessGateHandler(mobileAccessOptions);
+            /** Bearer / x-api-key for automation; elevates past PIN on WAN/LAN. */
+            const requestHostApiKey = (r) => {
                 const auth = r.headers.authorization;
                 const headerKey = r.headers["x-api-key"];
                 const bearer = typeof auth === "string" && auth.startsWith("Bearer ")
                     ? auth.slice("Bearer ".length)
                     : undefined;
-                const key = bearer ?? (typeof headerKey === "string" ? headerKey : undefined);
-                if (timingSafeStringEqual(key, expected))
-                    return true;
-                // DSH Web 同源不带 Authorization；本机回环放行。
-                return !key && isLoopbackAddress(r.socket.remoteAddress);
+                return (bearer ?? (typeof headerKey === "string" ? headerKey : undefined));
+            };
+            const apiKeyElevates = (r) => {
+                const expected = effectiveHostApiKey(faceRuntime);
+                if (!expected)
+                    return false;
+                return timingSafeStringEqual(requestHostApiKey(r), expected);
+            };
+            // Loopback / bind LAN free; WAN + foreign LAN need PIN *or* Host API key.
+            // Browser after PIN must not also need XRK_API_KEY (shell omits Authorization).
+            const mobileAccessGate = (r) => pinAccessGate(r) || apiKeyElevates(r);
+            const faceCheckAuth = (r) => mobileAccessGate(r);
+            const mobileAccessPublicHandler = async (req, res) => {
+                if (apiKeyElevates(req))
+                    return false;
+                return pinAccessHandler(req, res);
             };
             await ensureDshCompatHostPlugin(loader);
-            refreshFacePlugins();
+            // 向日葵免费车道：随产品内置的 LLM 插件。车道不可达时插件返回空
+            // `llmBrands`，该 provider 不会进入 registry/catalog，启动不受影响。
+            // 出口代理来自 Settings → 向日葵免费（空 = 直连），loader 无参加载
+            // 插件，所以先桥接到 env 再 load。
+            // createPlugin may spawn Bun + fetch Kilo — never await on the spawn
+            // critical path (DSH listen-first); see runOptionalWarmupAfterListen.
+            applySunflowerFreeEgressSettings(faceRuntime);
             const hostWireCtx = {
                 pluginsDir: resolvedPluginsDir,
                 xrkHome: resolveXrkHome(),
@@ -2387,7 +2502,8 @@ export function createHostManager() {
                 },
             };
             hostWireRef.ctx = hostWireCtx;
-            await prewarmDshCompatAdapters(hostWireCtx);
+            // Upgrade/public routes lazy-ensure the registry on first hit; prewarm
+            // only avoids a cold first request — scheduled in runOptionalWarmupAfterListen.
             syncCordisHostApplied();
             const http = createHttpServer({
                 host: config.runtime.host,
@@ -2424,7 +2540,7 @@ export function createHostManager() {
                             return undefined;
                         }
                     },
-                }), createMobileAccessGateHandler({ xrkHome: resolveXrkHome() }), createSidebarPublicHandler({
+                }), mobileAccessPublicHandler, createSidebarPublicHandler({
                     xrkHome: resolveXrkHome(),
                     defaultCwd: faceRuntime.workspaceRoot,
                     resolveSessionCwd: (sessionId) => resolveSessionCwd(faceRuntime, sessionId),
@@ -2534,16 +2650,44 @@ export function createHostManager() {
             const addr = shouldListen
                 ? await http.listen()
                 : { host: config.runtime.host, port: 0 };
+            process.env.XRK_SERVE_HOST = String(addr.host);
+            process.env.XRK_SERVE_PORT = String(addr.port);
             if (shouldListen) {
                 log?.info(`listening ${config.runtime.host}:${addr.port}`);
+                const armed = armAccessGateForListen(mobileAccessOptions, String(addr.host), addr.port);
+                if (armed.armed) {
+                    log?.info(`access gate armed · open ${armed.origin} · PIN ${armed.wanToken} (non-bind / public Host)`);
+                }
             }
             else {
                 log?.info("http stack ready (listen disabled — pipe / fetch transport)");
             }
+            const runOptionalWarmupAfterListen = async () => {
+                // Defense in depth: if preserveIds ever drops sunflower, re-ensure
+                // so SIDECAR_KEY / sidecar stay alive for the free lane.
+                // After listen: await direct→proxy cascade (does not block HTTP bind).
+                const prevAwait = process.env.XRK_SUNFLOWER_AWAIT_PROBE;
+                process.env.XRK_SUNFLOWER_AWAIT_PROBE = "1";
+                try {
+                    await ensureSunflowerFreePlugin(loader);
+                }
+                finally {
+                    if (prevAwait === undefined) {
+                        delete process.env.XRK_SUNFLOWER_AWAIT_PROBE;
+                    }
+                    else {
+                        process.env.XRK_SUNFLOWER_AWAIT_PROBE = prevAwait;
+                    }
+                }
+                refreshFacePlugins();
+                rebuildPolicyEngine();
+                await prewarmDshCompatAdapters(hostWireCtx);
+                syncCordisHostApplied();
+            };
             if (deferManagedPlugins) {
                 void loadManagedPlugins()
-                    .then(() => {
-                    rebuildPolicyEngine();
+                    .then(async () => {
+                    await runOptionalWarmupAfterListen();
                     log?.info(`desktop process plugins ready (${String(loadedPluginIds.length)})`);
                 })
                     .catch((err) => {
@@ -2551,6 +2695,16 @@ export function createHostManager() {
                     log?.warn(`desktop process-plugin reconcile failed: ${message}`);
                 });
             }
+            else {
+                void runOptionalWarmupAfterListen()
+                    .then(() => {
+                    log?.info("optional boot warmup ready (sunflower · dsh-compat)");
+                })
+                    .catch((err) => {
+                    const message = err instanceof Error ? err.message : String(err);
+                    log?.warn(`optional boot warmup failed: ${message}`);
+                });
+            }
             {
                 // Env/config specs auto-connect after HTTP (CI/headless).
                 // File-sourced Settings share Face `ensureMcpLiveIfIdle` with