newmark-agent 0.3.12 → 0.4.2

package/dist/cli-commands.d.ts

@@ -1,4 +1,5 @@
 export declare const CLI_COMMANDS: readonly ["state", "tool", "send", "validate-models", "fuzzy-inject", "skills-market", "memory-lab", "install-update", "compat", "compat-tool"];
+export declare function cliHelpRequested(args: string[]): boolean;
 /**
  * Compatibility discovery reads third-party metadata outside the selected
  * Newmark root. Those manifests can contain provider options, so structured

package/dist/cli-commands.js

@@ -34,6 +34,7 @@ var __importStar = (this && this.__importStar) || (function () {
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CLI_COMMANDS = void 0;
+exports.cliHelpRequested = cliHelpRequested;
 exports.redactCliSecrets = redactCliSecrets;
 exports.runCliCommand = runCliCommand;
 exports.cliCommandHelp = cliCommandHelp;
@@ -45,6 +46,7 @@ const config_1 = require("./core/config");
 const fuzzy_1 = require("./core/fuzzy");
 const provider_1 = require("./llm/provider");
 const compat_1 = require("./core/compat");
+const dshCompatibility_1 = require("./core/dshCompatibility");
 const memoryLab_1 = require("./core/memoryLab");
 const installUpdate_1 = require("./core/installUpdate");
 exports.CLI_COMMANDS = ['state', 'tool', 'send', 'validate-models', 'fuzzy-inject', 'skills-market', 'memory-lab', 'install-update', 'compat', 'compat-tool'];
@@ -83,7 +85,7 @@ const CLI_COMMAND_HELP = {
         'Inspect or apply a local/GitHub update using the selected install target.',
     ],
     compat: [
-        'Usage: Newmark.exe compat [--target all|tools|plugins|marketplaces|skills|agents|subagents] [--root <dir>]',
+        'Usage: Newmark.exe compat [--target all|tools|plugins|dsh|marketplaces|skills|agents|subagents] [--root <dir>]',
         'Discover compatible local agent, plugin, marketplace, and skill metadata.',
     ],
     'compat-tool': [
@@ -107,6 +109,7 @@ const CLI_VALUE_FLAGS = new Set([
 const CLI_BOOLEAN_FLAGS = new Set([
     '--persist', '--agent-only', '--list', '--preview-only', '--sources', '--add-source', '--check-github',
     '--from-github', '--dry-run', '--read', '--index', '--reindex', '--update', '--version', '--folder', '--help', '-h',
+    '--branch-communication',
 ]);
 function invalidCliCommandArgument(args) {
     let skipNext = false;
@@ -689,6 +692,8 @@ async function runCliCommand(root, args) {
     const conversation = argValue(args, '--conversation');
     if (conversation)
         agent.setConversation(conversation);
+    if (args.includes('--branch-communication'))
+        agent.setBranchCommunication(true);
     const language = argValue(args, '--language');
     if (language && ['auto', 'en', 'zh'].includes(language))
         agent.config.set('general', 'language', language);
@@ -988,10 +993,11 @@ async function runCliCommand(root, args) {
             target,
             compatibility: {
                 tool_schemas: ['openai_chat_completions', 'openai_responses', 'anthropic_input_schema'],
-                plugin_ecosystems: ['codex', 'claude-code', 'opencode', 'newmark'],
+                plugin_ecosystems: ['codex', 'claude-code', 'opencode', 'newmark', 'deepseek-harness'],
                 marketplace_ecosystems: ['codex', 'claude-code', 'newmark'],
                 plugin_execution: 'metadata-only by default; OpenCode JavaScript tools require explicit compat-tool invocation.',
                 mcp_activation: 'discovered from plugin/config metadata but not auto-started.',
+                dsh_compatibility: 'read-only bundle/profile/config discovery; unknown manifest keys are retained as compatibility metadata.',
                 subagent_return_contract: 'structured NewmarkSubagentRecord embedded in NewmarkToolResult while preserving legacy text output.',
             },
         };
@@ -1006,6 +1012,9 @@ async function runCliCommand(root, args) {
         if (target === 'all' || target === 'plugins') {
             payload.plugins = plugins;
         }
+        if (target === 'all' || target === 'plugins' || target === 'dsh') {
+            payload.dsh = (0, dshCompatibility_1.discoverDshCompatibility)(root);
+        }
         if (target === 'all' || target === 'marketplaces') {
             payload.marketplaces = (0, compat_1.discoverPluginMarketplaces)(root);
         }

package/dist/context/domain/types.d.ts

@@ -148,6 +148,27 @@ export interface CapabilityDescriptor {
     version: number;
 }
 export type ToolIdempotency = 'idempotent' | 'conditionally_idempotent' | 'non_idempotent';
+/** 最小执行上下文：承载 DSH 工具 execute 的 exec.signal/agent 等运行时能力。 */
+export interface ToolExecuteContext {
+    signal?: AbortSignal;
+    agent?: unknown;
+    token?: unknown;
+    [key: string]: unknown;
+}
+/** DSH ToolDefinition.execute 的运行时执行函数签名（cordis 核功能承载）。 */
+export type ToolExecuteFn = (args: unknown, context: ToolExecuteContext) => Promise<unknown> | unknown;
+/** DSH ToolDefinition.isConcurrencySafe 的运行时并发分类（cordis 核功能承载）。 */
+export type ToolConcurrencySafeFn = (args: unknown) => boolean;
+/** DSH ToolOutputDefinition.render 的模型可见内容投影。 */
+export type ToolRenderFn = (args: unknown, value: unknown) => unknown;
+/** DSH ToolOutputDefinition.presentationMeta 的可回放 UI 状态投影。 */
+export type ToolPresentationMetaFn = (args: unknown, value: unknown) => unknown;
+/** DSH ToolDefinition.finalizeContent 的同步 last-mile 内容变换（可选）。 */
+export type ToolFinalizeContentFn = (context: ToolExecuteContext, result: unknown) => unknown;
+/** DSH ToolDefinition.presentCall 的 PENDING 卡片展示投影（可选）。 */
+export type ToolPresentCallFn = (args: unknown) => unknown;
+/** DSH ToolDefinition.presentResult 的 COMPLETED 卡片展示投影（可选）。 */
+export type ToolPresentResultFn = (args: unknown, result: unknown) => unknown;
 export interface ToolDescriptor {
     toolId: string;
     capabilityId: string;
@@ -166,6 +187,22 @@ export interface ToolDescriptor {
     implementationHash?: string;
     cacheGroup: string;
     enabled: boolean;
+    /** DSH ToolDefinition.execute 承载：接入的命令式功能实现（不 import/execute DSH 代码，仅承载已安全注入的函数引用）。 */
+    execute?: ToolExecuteFn;
+    /** DSH ToolDefinition.isConcurrencySafe 承载：运行时并发分类，静态 riskLevel 的补充。 */
+    isConcurrencySafe?: ToolConcurrencySafeFn;
+    /** DSH ToolOutputDefinition.render：模型可见内容投影（功能承载）。 */
+    render?: ToolRenderFn;
+    /** DSH ToolOutputDefinition.presentationMeta：可回放 UI 状态投影（功能承载）。 */
+    presentationMeta?: ToolPresentationMetaFn;
+    /** DSH ToolDefinition.finalizeContent：同步 last-mile 内容变换（功能承载）。 */
+    finalizeContent?: ToolFinalizeContentFn;
+    /** DSH ToolDefinition.timeoutMs：协作超时预算（功能承载）。 */
+    timeoutMs?: number;
+    /** DSH ToolDefinition.presentCall：PENDING 卡片展示投影（功能承载）。 */
+    presentCall?: ToolPresentCallFn;
+    /** DSH ToolDefinition.presentResult：COMPLETED 卡片展示投影（功能承载）。 */
+    presentResult?: ToolPresentResultFn;
 }
 export interface ActiveToolManifestEntry {
     toolId: string;

package/dist/context/services/context-orchestrator.js

@@ -20,6 +20,8 @@ exports.CONTEXT_SECTION_ORDER = [
     'active_toolset_manifest',
     'build_block_startup_input',
     'build_block_metadata',
+    // Compatibility slot: linked-plan content is tool-retrieved on demand and
+    // should remain empty for ordinary model requests.
     'linked_plan',
     'active_tasks',
     'current_work_set',