odai-dsh-agent 0.2.3 → 0.2.5

package/README.md

@@ -13,7 +13,7 @@ $DSH_HOME/.agent-presets/odai/
   .odai-agent.json
 ```
 
-The source composition preserves every capability row and setting from the `standard` agent surface in `@deepseek-ai/dsh@0.1.0-rc.8`, then adds the scoped Odai runtime in default `auto` mode. For rc.7, the installer restores that release's optional-provider wording; for rc.6, it additionally restores the two disabled-provider fields before hashing and publishing the managed preset. Release verification compares each rendered composition against its exact DSH Standard source; a missing, added, reordered, or changed Standard row fails the probe. Host-owned persistence, sandbox, approval, registries, and base controller selection remain in the selected DSH profile. Ordinary requests stay on that controller. Responsibility words are optional signals rather than commands: evidence-grounded task-state gaps route at any step, identical gaps are consumed once, and an identical planner/controller model remains inline without another model call. An original request that already authorizes implementation automatically continues from a frozen planner card to executor; plan-only, new-task, expanded-scope, and unknown authorization cannot do so. Reviewer children require a current hash-addressed evidence packet whose diff and latest successful test are newer than the last write. An incomplete packet keeps the current controller route so it can gather project-available evidence without claiming independent acceptance or terminating the authorized task. Every route is resolved before provider I/O; deterministic invalid persisted mappings are backed up and exact-match removed, while recoverable provider failures preserve them. Frontend route failure becomes an explicit local controller fallback without a routed receipt. `execute` remains an explicit comparison mode and `observe` changes no model or child while retaining fail-closed high-impact protection. Configured compaction streams are buffered so partial failed output cannot contaminate the inherited-route retry or replace original history.
+The source composition preserves every capability row and setting from the `standard` agent surface in `@deepseek-ai/dsh@0.1.0-rc.8`, then adds the scoped Odai runtime in default `auto` mode. For rc.7, the installer restores that release's optional-provider wording before hashing and publishing the managed preset; rc.6 is no longer supported as of `0.2.5`. Release verification compares each rendered composition against its exact DSH Standard source; a missing, added, reordered, or changed Standard row fails the probe. Host-owned persistence, sandbox, approval, registries, and base controller selection remain in the selected DSH profile. Ordinary requests stay on that controller. Responsibility words are optional signals rather than commands: evidence-grounded task-state gaps route at any step, identical gaps are consumed once, and an identical planner/controller model remains inline without another model call. An original request that already authorizes implementation automatically continues from a frozen planner card to executor; plan-only, new-task, expanded-scope, and unknown authorization cannot do so. Reviewer children require a current hash-addressed evidence packet whose diff and latest successful test are newer than the last write. An incomplete packet keeps the current controller route so it can gather project-available evidence without claiming independent acceptance or terminating the authorized task. Every route is resolved before provider I/O; deterministic invalid persisted mappings are backed up and exact-match removed, while recoverable provider failures preserve them. Frontend route failure becomes an explicit local controller fallback without a routed receipt. `execute` remains an explicit comparison mode and `observe` changes no model or child while retaining fail-closed high-impact protection. Configured compaction streams are buffered so partial failed output cannot contaminate the inherited-route retry or replace original history.
 
 The preset includes the same local long-term semantic memory runtime as the Plugin. Default `auto` mode performs no hidden model call: it automatically captures only high-confidence durable statements from the direct-human message authenticated by the latest open-turn session event, keeps ambiguous or conflicting candidates inert, and recalls only bounded active global/project records as untrusted historical context. Matching direct intent, or the compact capability gateway on a later step, exposes the controller-only `odai_memory` tool for inspection, search, confirmation, correction, physical forgetting, exact-phrase clearing, and `auto`/`off` mode changes. Recognized secrets, contact identifiers, health/crisis content, temporary instructions, hypotheses, quotes, and code are rejected; the current user and project authority always override memory. State lives at `$DSH_HOME/odai/memory/store.json`, outside `.agent-presets`, so install, update, and uninstall preserve it. An invalid or symlinked store fails closed. The matcher is not a replacement for protecting the underlying DSH session history from sensitive input.
 
@@ -31,7 +31,7 @@ With DSH already installed, run the single Agent package command below. The pack
 npx odai-dsh-agent install
 ```
 
-The installer checks `dsh -V` and currently accepts exactly `0.1.0-rc.6`, `0.1.0-rc.7`, or `0.1.0-rc.8`. It records the detected version in the managed manifest and renders that release's exact Standard composition; any other developer-preview version fails closed.
+The installer checks `dsh -V` and currently accepts exactly `0.1.0-rc.7` or `0.1.0-rc.8`; `0.2.5` rejects rc.6. It records the detected version in the managed manifest and renders that release's exact Standard composition; any other developer-preview version fails closed.
 
 `DSH_HOME` is honored. An explicit location can be supplied without changing the environment:
 
@@ -41,7 +41,7 @@ npx odai-dsh-agent install --dsh-home /path/to/dsh-home
 
 Open a new DSH session and select `Odai` from the Agent preset picker. Existing sessions retain the preset they were composed with.
 
-In supported DSH rc.6, rc.7, and rc.8 releases, the one-shot `--profile headless` driver creates a global agent directly and neither mounts nor accepts a session Agent preset. Automated Agent runs must create a Web session with `agentPreset: odai`; use the profile-wide Plugin for one-shot headless tasks.
+In supported DSH rc.7 and rc.8 releases, the one-shot `--profile headless` driver creates a global agent directly and neither mounts nor accepts a session Agent preset. Automated Agent runs must create a Web session with `agentPreset: odai`; use the profile-wide Plugin for one-shot headless tasks.
 
 The installer copies through a mode-tightened staging directory and atomically publishes the preset. Updates verify every previously managed file first, refuse to overwrite local edits, and always change the composition generation key so new sessions in a running DSH process do not reuse stale runtime code. If install or update finds recognized historical Odai audit records, it refuses to change the preset until every DSH process is stopped and the command is rerun with `--yes`. The confirmed migration adds DSH's official `ignorable: true` envelope marker, covers both plaintext and concatenated-frame Zstandard session artifacts, verifies each replacement, and retains a content-addressed backup without deleting messages or evidence. Confirmation alone is insufficient: migration also refuses when local process inspection fails or finds any active DSH process. Keep DSH stopped until the installer exits because historical runtimes do not participate in a migration lock. An unknown unmarked `odai/*` type blocks the operation instead of being assumed safe to ignore.
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "odai-dsh-agent",
-  "version": "0.2.3",
+  "version": "0.2.5",
   "description": "完整继承 DSH 标准模式 全部能力的 Odai Agent preset。主要用于治理、规划、测试、验证 等，可当成默认总控使用。",
   "license": "MIT",
   "repository": {
@@ -49,7 +49,7 @@
     "yaml": "^2.8.1"
   },
   "peerDependencies": {
-    "@deepseek-ai/dsh": "0.1.0-rc.6 || 0.1.0-rc.7 || 0.1.0-rc.8"
+    "@deepseek-ai/dsh": "0.1.0-rc.7 || 0.1.0-rc.8"
   },
   "peerDependenciesMeta": {
     "@deepseek-ai/dsh": {

package/preset/odai/runtime/index.mjs

@@ -53,6 +53,7 @@ import { createSessionEvidence, resolveSessionEvidenceRoot } from "./session-evi
 import { classifyModelRouteFailure, probeModelRoute } from "./model-route.mjs";
 import { RESPONSIBILITY_GAP_PROMPT, createResponsibilityGapTool } from "./responsibility-gap.mjs";
 import {
+  ODAI_CONTEXTUAL_TOOL_NAMES,
   ODAI_CORE_TOOL_NAMES,
   activeOdaiToolNames,
   classifyContextActivation,
@@ -640,6 +641,32 @@ function routedRoleOf(agent) {
   return undefined;
 }
 
+const ODAI_ADAPTIVE_TOOL_NAMES = new Set([...ODAI_CONTEXTUAL_TOOL_NAMES, ...ODAI_CORE_TOOL_NAMES]);
+
+function reconcileAdaptiveToolSchemas(assembly, activeNames, executableSchemas = []) {
+  if (!assembly || !Array.isArray(assembly.tools)) return assembly;
+  const active = new Set(activeNames);
+  const executableByName = new Map(
+    (Array.isArray(executableSchemas) ? executableSchemas : [])
+      .filter((tool) => active.has(tool?.name))
+      .map((tool) => [tool.name, tool]),
+  );
+  const tools = assembly.tools.filter((tool) => !ODAI_ADAPTIVE_TOOL_NAMES.has(tool?.name)
+    || (active.has(tool.name) && executableByName.has(tool.name)));
+  const present = new Set(tools.map((tool) => tool?.name));
+  const missing = activeNames
+    .filter((name) => !present.has(name) && executableByName.has(name))
+    .map((name) => executableByName.get(name));
+  if (missing.length > 0) {
+    const lastAdaptiveIndex = tools.reduce(
+      (last, tool, index) => ODAI_ADAPTIVE_TOOL_NAMES.has(tool?.name) ? index : last,
+      -1,
+    );
+    tools.splice(lastAdaptiveIndex < 0 ? tools.length : lastAdaptiveIndex + 1, 0, ...missing);
+  }
+  return tools.length === assembly.tools.length && missing.length === 0 ? assembly : { ...assembly, tools };
+}
+
 export function apply(ctx, rawConfig) {
   const config = resolveConfig(rawConfig);
   const logger = loggerFor(ctx);
@@ -951,12 +978,28 @@ export function apply(ctx, rawConfig) {
     return state;
   };
   ctx.on("system-prompt/assemble", async (assembly, context, next) => {
-    const downstream = await next();
     const agent = context.agent;
-    if (!agent) return downstream;
-    const selection = await selectSharedSkillForTurn(agent, () => selectForAgent(agent, context));
+    if (!agent) return next();
     const turn = currentAgentTurn(agent);
-    const outputSelection = isSubagentSession(agent)
+    const childSession = isSubagentSession(agent);
+    const directMessage = latestDirectUserMessage(agent);
+    const activation = contextActivationFor(agent, directMessage ? extractLatestUserText([directMessage]) : "", turn);
+    const proposedStep = (currentAgentStep(agent) ?? 0) + 1;
+    const exposureEvents = evidence.events(agent);
+    const routeCardNeeded = !childSession && (Boolean(activeRouteCard(exposureEvents))
+      || ["planner", "executor"].includes(pendingResponsibilityGap(agent, turn, proposedStep)?.responsibility)
+      || pendingResponsibilityInterruption(exposureEvents)?.responsibility === "executor");
+    // DSH builds assembly.tools before this middleware runs. Filter that snapshot and the execution registry together.
+    const activeToolNames = syncToolExposure(agent, activation, { turn, step: proposedStep, routeCard: routeCardNeeded });
+    const executableSchemas = typeof ctx.tools.schemas === "function" ? ctx.tools.schemas(agent) : [];
+    const visibleAssembly = reconcileAdaptiveToolSchemas(assembly, activeToolNames, executableSchemas);
+    if (visibleAssembly !== assembly) assembly.tools = visibleAssembly.tools;
+
+    const downstream = await next();
+    const finalExecutableSchemas = typeof ctx.tools.schemas === "function" ? ctx.tools.schemas(agent) : [];
+    const reconciledDownstream = reconcileAdaptiveToolSchemas(downstream, activeToolNames, finalExecutableSchemas);
+    const selection = await selectSharedSkillForTurn(agent, () => selectForAgent(agent, context));
+    const outputSelection = childSession
       ? Object.freeze({ policy: DEFAULT_OUTPUT_POLICY, source: "default" })
       : await selectSharedOutputPolicyForTurn(agent, turn, selectOutputForAgent);
     const selectionEvidence = {
@@ -986,12 +1029,6 @@ export function apply(ctx, rawConfig) {
       logger.warn(`Odai skill source ${selection.mode} fell back to bundled governance (${selection.reasonCode})`);
     }
     const outputPrompt = renderOutputPolicyPrompt(outputSelection.policy);
-    const childSession = isSubagentSession(agent);
-    const directMessage = latestDirectUserMessage(agent);
-    const activation = contextActivationFor(agent, directMessage ? extractLatestUserText([directMessage]) : "", turn);
-    const proposedStep = (currentAgentStep(agent) ?? 0) + 1;
-    const routeCardNeeded = !childSession && (Boolean(activeRouteCard(evidence.events(agent)))
-      || ["planner", "executor"].includes(pendingResponsibilityGap(agent, turn, proposedStep)?.responsibility));
     const routingPrompt = !activation.routingConfig
       ? ""
       : childSession
@@ -1018,8 +1055,8 @@ export function apply(ctx, rawConfig) {
       });
     }
     return {
-      ...downstream,
-      sections: downstream.sections.map((section) => {
+      ...reconciledDownstream,
+      sections: reconciledDownstream.sections.map((section) => {
         if (section.name === "odai:canonical-governance") return { ...section, text: canonicalPrompt(selection) };
         if (section.name === "odai:routing-configuration") return { ...section, text: routingPrompt };
         if (section.name === "odai:human-safety-continuity") return { ...section, text: continuityPrompt };
@@ -1307,7 +1344,7 @@ export function apply(ctx, rawConfig) {
         activeTools: activeNames,
       });
     } catch (error) {
-      logger.warn(`Odai adaptive tool exposure is unavailable; retaining the complete tool catalog: ${error instanceof Error ? error.message : String(error)}`);
+      logger.warn(`Odai adaptive execution restriction is unavailable; prompt schemas remain limited while the executable catalog stays complete: ${error instanceof Error ? error.message : String(error)}`);
       toolExposureStates.set(agent, Object.freeze({ key: "fallback", dispose: undefined }));
     }
     return activeNames;
@@ -1884,11 +1921,6 @@ export function apply(ctx, rawConfig) {
           });
         }
       }
-      const activation = contextActivationFor(agent, directText, turn);
-      const routeCardNeeded = !subagentSession && (Boolean(activeRouteCard(responsibilityEvents))
-        || ["planner", "executor"].includes(responsibilityGap?.responsibility)
-        || responsibilityContinuation?.responsibility === "executor");
-      syncToolExposure(agent, activation, { turn, step, routeCard: routeCardNeeded });
       if (interruptionNotice) {
         downstream = { ...downstream, messages: [...downstream.messages, interruptionNotice] };
       }

package/scripts/verify-agent-load.mjs

@@ -186,7 +186,7 @@ if (existsSync(developmentRuntime) && existsSync(developmentSkill)) {
 }
 await installAgentPreset({ dshHome: home, sourceRoot, dshVersion: targetDshVersion });
 
-const probePlugin = `import { existsSync, writeFileSync } from "node:fs";\nimport { bindScopeParent } from ${JSON.stringify(pathToFileURL(scopeModule).href)};\n\nexport const name = "odai-agent-scope-probe";\nexport const inject = ["systemPrompt", "tools"];\n\nexport function apply(ctx, config) {\n  const results = {};\n  let writing = Promise.resolve();\n\n  ctx.on("agent/created", ({ agent }) => {\n    writing = writing.then(async () => {\n      const preset = agent.session?.header?.agentPreset;\n      if (preset !== "standard" && preset !== "odai") return;\n\n      const assembly = await ctx.systemPrompt.assemble({ scope: agent });\n      const canonicalSections = assembly.sections.filter((section) => section.name === "odai:canonical-governance");\n      const writePath = preset === "odai" ? config.odaiWritePath : config.standardWritePath;\n      const childSession = new Proxy(agent.session, {\n        get(target, property) {\n          if (property === "header") {\n            return { ...target.header, origin: "subagent", delegationDepth: 1 };\n          }\n          return Reflect.get(target, property, target);\n        },\n      });\n      const child = { id: agent.id, session: childSession };\n      bindScopeParent(child, agent);\n      const toolResult = await ctx.tools.execute({\n        callId: \`scope-probe-\${preset}\`,\n        name: "write",\n        arguments: { file_path: writePath, content: \`\${preset} child write reached body\\n\` },\n        agent: child,\n        signal: new AbortController().signal,\n      });\n\n      let routingProtected;\n      if (preset === "odai") {\n        const routingResult = await ctx.tools.execute({\n          callId: "scope-probe-odai-routing-config",\n          name: "odai_routing_config",\n          arguments: { action: "set", responsibility: "executor", provider: "probe-provider", model: "probe-executor", reasoningEffort: "high" },\n          agent,\n          signal: new AbortController().signal,\n        });\n        routingProtected = routingResult.isError === true\n          && /NO_ADAPTER/u.test(routingResult.error?.message ?? "")\n          && !existsSync(config.routingConfigPath);\n      }\n\n      results[preset] = {\n        canonicalSectionCount: canonicalSections.length,\n        toolIsError: toolResult.isError === true,\n        toolError: toolResult.isError === true ? toolResult.error?.message : undefined,\n        writeReachedBody: existsSync(writePath),\n        ...(routingProtected === undefined ? {} : { routingProtected }),\n      };\n      if (results.standard && results.odai) {\n        writeFileSync(config.markerPath, JSON.stringify(results, null, 2) + "\\n", "utf8");\n      }\n    }).catch((error) => {\n      writeFileSync(config.markerPath, JSON.stringify({ probeError: error?.stack ?? String(error) }, null, 2) + "\\n", "utf8");\n    });\n  }, { global: true });\n}\n`;
+const probePlugin = `import { existsSync, writeFileSync } from "node:fs";\nimport { bindScopeParent } from ${JSON.stringify(pathToFileURL(scopeModule).href)};\n\nexport const name = "odai-agent-scope-probe";\nexport const inject = ["systemPrompt", "tools"];\n\nexport function apply(ctx, config) {\n  const results = {};\n  let writing = Promise.resolve();\n\n  ctx.on("agent/created", ({ agent }) => {\n    writing = writing.then(async () => {\n      const preset = agent.session?.header?.agentPreset;\n      if (preset !== "standard" && preset !== "odai") return;\n\n      const assembly = await ctx.systemPrompt.assemble({ agent, scope: agent });\n      const canonicalSections = assembly.sections.filter((section) => section.name === "odai:canonical-governance");\n      if (preset === "odai") {\n        const coldNames = assembly.tools.map((tool) => tool.name).filter((toolName) => toolName.startsWith("odai_")).sort();\n        const expectedColdNames = ["odai_context_capability", "odai_responsibility_gap"];\n        if (JSON.stringify(coldNames) !== JSON.stringify(expectedColdNames)) {\n          throw new Error(\`cold Odai tool schema mismatch: \${JSON.stringify(coldNames)}\`);\n        }\n        const hiddenResult = await ctx.tools.execute({\n          callId: "scope-probe-odai-hidden-routing",\n          name: "odai_routing_config",\n          arguments: { action: "show" },\n          agent,\n          signal: new AbortController().signal,\n        });\n        if (!hiddenResult.isError || !/unknown tool/u.test(hiddenResult.error?.message ?? "")) {\n          throw new Error(\`hidden Odai routing tool remained executable: \${JSON.stringify(hiddenResult)}\`);\n        }\n        agent.session.append("turn/start", { turn: 1 });\n        agent.session.append("step/start", { turn: 1, step: 1 });\n        const gatewayResult = await ctx.tools.execute({\n          callId: "scope-probe-odai-routing-gateway",\n          name: "odai_context_capability",\n          arguments: { capability: "routing-config" },\n          agent,\n          signal: new AbortController().signal,\n        });\n        if (gatewayResult.isError) throw new Error(\`Odai capability gateway failed: \${JSON.stringify(gatewayResult)}\`);\n        const activatedAssembly = await ctx.systemPrompt.assemble({ agent, scope: agent });\n        const activatedNames = activatedAssembly.tools.map((tool) => tool.name).filter((toolName) => toolName.startsWith("odai_")).sort();\n        const expectedActivatedNames = ["odai_context_capability", "odai_responsibility_gap", "odai_routing_config"].sort();\n        if (JSON.stringify(activatedNames) !== JSON.stringify(expectedActivatedNames)) {\n          throw new Error(\`activated Odai tool schema mismatch: \${JSON.stringify(activatedNames)}\`);\n        }\n      }\n      const writePath = preset === "odai" ? config.odaiWritePath : config.standardWritePath;\n      const childSession = new Proxy(agent.session, {\n        get(target, property) {\n          if (property === "header") {\n            return { ...target.header, origin: "subagent", delegationDepth: 1 };\n          }\n          return Reflect.get(target, property, target);\n        },\n      });\n      const child = { id: agent.id, session: childSession };\n      bindScopeParent(child, agent);\n      const toolResult = await ctx.tools.execute({\n        callId: \`scope-probe-\${preset}\`,\n        name: "write",\n        arguments: { file_path: writePath, content: \`\${preset} child write reached body\\n\` },\n        agent: child,\n        signal: new AbortController().signal,\n      });\n\n      let routingProtected;\n      if (preset === "odai") {\n        const routingResult = await ctx.tools.execute({\n          callId: "scope-probe-odai-routing-config",\n          name: "odai_routing_config",\n          arguments: { action: "set", responsibility: "executor", provider: "probe-provider", model: "probe-executor", reasoningEffort: "high" },\n          agent,\n          signal: new AbortController().signal,\n        });\n        routingProtected = routingResult.isError === true\n          && /NO_ADAPTER/u.test(routingResult.error?.message ?? "")\n          && !existsSync(config.routingConfigPath);\n      }\n\n      results[preset] = {\n        canonicalSectionCount: canonicalSections.length,\n        toolIsError: toolResult.isError === true,\n        toolError: toolResult.isError === true ? toolResult.error?.message : undefined,\n        writeReachedBody: existsSync(writePath),\n        ...(routingProtected === undefined ? {} : { routingProtected }),\n        ...(preset === "odai" ? { toolExposureSynchronized: true } : {}),\n      };\n      if (results.standard && results.odai) {\n        writeFileSync(config.markerPath, JSON.stringify(results, null, 2) + "\\n", "utf8");\n      }\n    }).catch((error) => {\n      writeFileSync(config.markerPath, JSON.stringify({ probeError: error?.stack ?? String(error) }, null, 2) + "\\n", "utf8");\n    });\n  }, { global: true });\n}\n`;
 await writeFile(probePluginPath, probePlugin, "utf8");
 await writeFile(patchPath, [
   "- insert:",
@@ -245,6 +245,9 @@ try {
     || !results.odai?.toolError?.startsWith("ODAI_SUBAGENT_BOUNDARY:")) {
     throw new Error(`odai child write was not denied by odai guard: ${JSON.stringify(results)}`);
   }
+  if (results.odai?.toolExposureSynchronized !== true) {
+    throw new Error(`odai tool schemas and execution visibility were not synchronized: ${JSON.stringify(results)}`);
+  }
   if (results.odai?.routingProtected !== true) {
     throw new Error(`odai routing tool did not reject an unavailable route without mutation: ${JSON.stringify(results)}`);
   }

package/src/installer.mjs

@@ -33,7 +33,6 @@ if (SUPPORTED_DSH_VERSIONS.length === 0 || SUPPORTED_DSH_VERSIONS.some((version)
 }
 const SOURCE_DSH_VERSION = "0.1.0-rc.8";
 const OPTIONAL_PROVIDER_COMMENTS = Object.freeze({
-  "0.1.0-rc.6": "    # Product providers are host-plane singletons. Copy this preset, then\n    # remove `disabled` from either ordinary tool row to expose that product\n    # only to agents composed from the copy.",
   "0.1.0-rc.7": "    # Production dsh does not install these optional providers. An opting-in\n    # Profile mounts each provider once on the host plane; copy this preset,\n    # then remove `disabled` from the matching tool row.",
   "0.1.0-rc.8": "    # Production dsh does not install these optional providers. Install the\n    # matching Bundle in this Profile and restart the Host, then copy this\n    # preset and remove `disabled` from the matching tool row. Host availability\n    # alone grants no tool.",
 });
@@ -85,19 +84,7 @@ export function renderAgentCompositionForDsh(composition, dshVersion = SUPPORTED
     targetComment,
     "optional-provider comment",
   );
-  if (dshVersion === "0.1.0-rc.7") return rendered;
-  rendered = replaceCompositionContract(
-    rendered,
-    "        provider: codex\n        toolName: subagent_codex\n        backgroundMode: one-shot",
-    "        provider: codex\n        toolName: subagent_codex\n        enableRunInBackground: false",
-    "Codex provider",
-  );
-  return replaceCompositionContract(
-    rendered,
-    "        provider: claude-code\n        toolName: subagent_claude_code\n        backgroundMode: one-shot",
-    "        provider: claude-code\n        toolName: subagent_claude_code\n        enableRunInBackground: false",
-    "Claude Code provider",
-  );
+  return rendered;
 }
 
 export function resolveDshHome(configured, env = process.env) {