@openma/deepseek-harness-acp 0.4.15 → 0.4.17-beta.0

package/cordis.patch.yml

@@ -97,8 +97,21 @@
   disabled: true
 
 - insert:
-    # The same complete Cordis plugin embedded by other surfaces. It owns the
-    # preset plane and transport-independent ACP server, but no transport.
+    # Host-plane services must be loaded by the profile include so they come
+    # from the same dsh installation as AgentLoop and dsh-scope.  Loading
+    # either one from the ACP package's development dependency tree would mix
+    # scope identities when --dsh-path points at a newer standalone host.
+    - id: agent-presets
+      name: '@deepseek-ai/dsh-agent-presets'
+      config:
+        default: standard
+
+    - id: cordis-host-runner
+      name: '@deepseek-ai/dsh-cordis-host-runner'
+
+    # ACP's surface service owns its bridge/session server, but no transport.
+    # The host-service rows above close this profile without borrowing another
+    # profile or relying on a development node_modules tree.
     - id: acp-plugin
       name: '@openma/deepseek-harness-acp/plugin'
       config:

package/dist/bridge.js

@@ -1750,9 +1750,15 @@ function apply2(ctx, config) {
 }
 
 // src/bridge/presets.ts
+var BUILT_IN_PRESET_NAMES = {
+  standard: "Standard",
+  code: "Code",
+  minimal: "Minimal",
+  cordis: "Creator"
+};
 function presetDisplayName(preset) {
-  if (preset.id === "cordis") return "Creator";
-  if (preset.id === "code") return "Code";
+  const builtInName = BUILT_IN_PRESET_NAMES[preset.id];
+  if (builtInName !== void 0) return builtInName;
   const name5 = preset.name?.trim();
   return name5 !== void 0 && name5.length > 0 ? name5 : preset.id;
 }
@@ -1816,6 +1822,10 @@ async function apply3(ctx, config = {}) {
     }
     return void 0;
   };
+  const executeCommand = (agent, line, signal) => {
+    const execute = commandRuntime.execute;
+    return execute.length >= 4 ? execute.call(commandRuntime, agent, line, [], signal) : execute.call(commandRuntime, agent, line, signal);
+  };
   await ctx.plugin(tui_client_plugin_exports, { rpc, findAgent, advertisement: tuiClient });
   const modelCandidates = () => {
     const seen = /* @__PURE__ */ new Set();
@@ -2001,6 +2011,11 @@ async function apply3(ctx, config = {}) {
     }
     setApprovalPolicy(record, record.approvals);
   };
+  const mutateSession = (record, mutation) => {
+    const run = record.mutationTail.then(mutation);
+    record.mutationTail = run.catch(() => void 0);
+    return run;
+  };
   const listProviderRoutes = async () => {
     try {
       const raw2 = llm.listProviders();
@@ -2312,9 +2327,14 @@ async function apply3(ctx, config = {}) {
     const permission = permissionService();
     if (permission.names.includes(modeId)) {
       let bundledApproval = record.approvals;
-      permission.apply(record.agent.session, modeId, (policy) => {
-        bundledApproval = policy;
-      });
+      permission.apply(
+        record.agent.session,
+        modeId,
+        (policy) => {
+          bundledApproval = policy;
+        },
+        "selection"
+      );
       setApprovalPolicy(record, bundledApproval);
       record.modeId = permission.resolve(modeId).sandbox;
       notify(sessionId, { sessionUpdate: "current_mode_update", currentModeId: modeId });
@@ -2625,7 +2645,7 @@ async function apply3(ctx, config = {}) {
     }
     const target = matches[0];
     if (target.value === currentValue) return `already on ${target.label}`;
-    await switchModel(record, acpSessionId, target.value);
+    await mutateSession(record, () => switchModel(record, acpSessionId, target.value));
     publishCommands(acpSessionId, record);
     publishConfigOptions(acpSessionId, record);
     return `model \u2192 ${target.label}`;
@@ -2664,7 +2684,8 @@ async function apply3(ctx, config = {}) {
       model,
       approvals: modeId === "danger-full-access" ? "never" : "ask",
       cancelled: false,
-      inflight: void 0
+      inflight: void 0,
+      mutationTail: Promise.resolve()
     };
     sessions.set(sessionId, record);
     watchSubagentParent(agent);
@@ -2945,7 +2966,7 @@ async function apply3(ctx, config = {}) {
         if (commandMatch !== null && commandMatch[1] !== void 0) {
           let execution;
           try {
-            execution = await commandRuntime.execute(
+            execution = await executeCommand(
               record.agent,
               trimmed,
               new AbortController().signal
@@ -3025,7 +3046,7 @@ async function apply3(ctx, config = {}) {
           }
           case "agent":
           case "preset": {
-            await switchPreset(record, params.sessionId, value);
+            await mutateSession(record, () => switchPreset(record, params.sessionId, value));
             break;
           }
           case "effort": {
@@ -3050,7 +3071,7 @@ async function apply3(ctx, config = {}) {
             if (value !== "default" && value !== "plan") {
               throw invalidParams(`unknown collaboration mode: ${value}`);
             }
-            const execution = await commandRuntime.execute(
+            const execution = await executeCommand(
               record.agent,
               value === "plan" ? "/plan" : "/plan off",
               new AbortController().signal
@@ -3064,7 +3085,7 @@ async function apply3(ctx, config = {}) {
             break;
           }
           case "model": {
-            await switchModel(record, params.sessionId, value);
+            await mutateSession(record, () => switchModel(record, params.sessionId, value));
             break;
           }
           default:

package/dist/plugin.js

@@ -1751,9 +1751,15 @@ function apply2(ctx, config) {
 }
 
 // src/bridge/presets.ts
+var BUILT_IN_PRESET_NAMES = {
+  standard: "Standard",
+  code: "Code",
+  minimal: "Minimal",
+  cordis: "Creator"
+};
 function presetDisplayName(preset) {
-  if (preset.id === "cordis") return "Creator";
-  if (preset.id === "code") return "Code";
+  const builtInName = BUILT_IN_PRESET_NAMES[preset.id];
+  if (builtInName !== void 0) return builtInName;
   const name6 = preset.name?.trim();
   return name6 !== void 0 && name6.length > 0 ? name6 : preset.id;
 }
@@ -1817,6 +1823,10 @@ async function apply3(ctx, config = {}) {
     }
     return void 0;
   };
+  const executeCommand = (agent, line, signal) => {
+    const execute = commandRuntime.execute;
+    return execute.length >= 4 ? execute.call(commandRuntime, agent, line, [], signal) : execute.call(commandRuntime, agent, line, signal);
+  };
   await ctx.plugin(tui_client_plugin_exports, { rpc, findAgent, advertisement: tuiClient });
   const modelCandidates = () => {
     const seen = /* @__PURE__ */ new Set();
@@ -2002,6 +2012,11 @@ async function apply3(ctx, config = {}) {
     }
     setApprovalPolicy(record, record.approvals);
   };
+  const mutateSession = (record, mutation) => {
+    const run = record.mutationTail.then(mutation);
+    record.mutationTail = run.catch(() => void 0);
+    return run;
+  };
   const listProviderRoutes = async () => {
     try {
       const raw2 = llm.listProviders();
@@ -2313,9 +2328,14 @@ async function apply3(ctx, config = {}) {
     const permission = permissionService();
     if (permission.names.includes(modeId)) {
       let bundledApproval = record.approvals;
-      permission.apply(record.agent.session, modeId, (policy) => {
-        bundledApproval = policy;
-      });
+      permission.apply(
+        record.agent.session,
+        modeId,
+        (policy) => {
+          bundledApproval = policy;
+        },
+        "selection"
+      );
       setApprovalPolicy(record, bundledApproval);
       record.modeId = permission.resolve(modeId).sandbox;
       notify(sessionId, { sessionUpdate: "current_mode_update", currentModeId: modeId });
@@ -2626,7 +2646,7 @@ async function apply3(ctx, config = {}) {
     }
     const target = matches[0];
     if (target.value === currentValue) return `already on ${target.label}`;
-    await switchModel(record, acpSessionId, target.value);
+    await mutateSession(record, () => switchModel(record, acpSessionId, target.value));
     publishCommands(acpSessionId, record);
     publishConfigOptions(acpSessionId, record);
     return `model \u2192 ${target.label}`;
@@ -2665,7 +2685,8 @@ async function apply3(ctx, config = {}) {
       model,
       approvals: modeId === "danger-full-access" ? "never" : "ask",
       cancelled: false,
-      inflight: void 0
+      inflight: void 0,
+      mutationTail: Promise.resolve()
     };
     sessions.set(sessionId, record);
     watchSubagentParent(agent);
@@ -2946,7 +2967,7 @@ async function apply3(ctx, config = {}) {
         if (commandMatch !== null && commandMatch[1] !== void 0) {
           let execution;
           try {
-            execution = await commandRuntime.execute(
+            execution = await executeCommand(
               record.agent,
               trimmed,
               new AbortController().signal
@@ -3026,7 +3047,7 @@ async function apply3(ctx, config = {}) {
           }
           case "agent":
           case "preset": {
-            await switchPreset(record, params.sessionId, value);
+            await mutateSession(record, () => switchPreset(record, params.sessionId, value));
             break;
           }
           case "effort": {
@@ -3051,7 +3072,7 @@ async function apply3(ctx, config = {}) {
             if (value !== "default" && value !== "plan") {
               throw invalidParams(`unknown collaboration mode: ${value}`);
             }
-            const execution = await commandRuntime.execute(
+            const execution = await executeCommand(
               record.agent,
               value === "plan" ? "/plan" : "/plan off",
               new AbortController().signal
@@ -3065,7 +3086,7 @@ async function apply3(ctx, config = {}) {
             break;
           }
           case "model": {
-            await switchModel(record, params.sessionId, value);
+            await mutateSession(record, () => switchModel(record, params.sessionId, value));
             break;
           }
           default:

package/dist/server.js

@@ -1746,9 +1746,15 @@ function apply2(ctx, config) {
 }
 
 // src/bridge/presets.ts
+var BUILT_IN_PRESET_NAMES = {
+  standard: "Standard",
+  code: "Code",
+  minimal: "Minimal",
+  cordis: "Creator"
+};
 function presetDisplayName(preset) {
-  if (preset.id === "cordis") return "Creator";
-  if (preset.id === "code") return "Code";
+  const builtInName = BUILT_IN_PRESET_NAMES[preset.id];
+  if (builtInName !== void 0) return builtInName;
   const name5 = preset.name?.trim();
   return name5 !== void 0 && name5.length > 0 ? name5 : preset.id;
 }
@@ -1812,6 +1818,10 @@ async function apply3(ctx, config = {}) {
     }
     return void 0;
   };
+  const executeCommand = (agent, line, signal) => {
+    const execute = commandRuntime.execute;
+    return execute.length >= 4 ? execute.call(commandRuntime, agent, line, [], signal) : execute.call(commandRuntime, agent, line, signal);
+  };
   await ctx.plugin(tui_client_plugin_exports, { rpc, findAgent, advertisement: tuiClient });
   const modelCandidates = () => {
     const seen = /* @__PURE__ */ new Set();
@@ -1997,6 +2007,11 @@ async function apply3(ctx, config = {}) {
     }
     setApprovalPolicy(record, record.approvals);
   };
+  const mutateSession = (record, mutation) => {
+    const run = record.mutationTail.then(mutation);
+    record.mutationTail = run.catch(() => void 0);
+    return run;
+  };
   const listProviderRoutes = async () => {
     try {
       const raw2 = llm.listProviders();
@@ -2308,9 +2323,14 @@ async function apply3(ctx, config = {}) {
     const permission = permissionService();
     if (permission.names.includes(modeId)) {
       let bundledApproval = record.approvals;
-      permission.apply(record.agent.session, modeId, (policy) => {
-        bundledApproval = policy;
-      });
+      permission.apply(
+        record.agent.session,
+        modeId,
+        (policy) => {
+          bundledApproval = policy;
+        },
+        "selection"
+      );
       setApprovalPolicy(record, bundledApproval);
       record.modeId = permission.resolve(modeId).sandbox;
       notify(sessionId, { sessionUpdate: "current_mode_update", currentModeId: modeId });
@@ -2621,7 +2641,7 @@ async function apply3(ctx, config = {}) {
     }
     const target = matches[0];
     if (target.value === currentValue) return `already on ${target.label}`;
-    await switchModel(record, acpSessionId, target.value);
+    await mutateSession(record, () => switchModel(record, acpSessionId, target.value));
     publishCommands(acpSessionId, record);
     publishConfigOptions(acpSessionId, record);
     return `model \u2192 ${target.label}`;
@@ -2660,7 +2680,8 @@ async function apply3(ctx, config = {}) {
       model,
       approvals: modeId === "danger-full-access" ? "never" : "ask",
       cancelled: false,
-      inflight: void 0
+      inflight: void 0,
+      mutationTail: Promise.resolve()
     };
     sessions.set(sessionId, record);
     watchSubagentParent(agent);
@@ -2941,7 +2962,7 @@ async function apply3(ctx, config = {}) {
         if (commandMatch !== null && commandMatch[1] !== void 0) {
           let execution;
           try {
-            execution = await commandRuntime.execute(
+            execution = await executeCommand(
               record.agent,
               trimmed,
               new AbortController().signal
@@ -3021,7 +3042,7 @@ async function apply3(ctx, config = {}) {
           }
           case "agent":
           case "preset": {
-            await switchPreset(record, params.sessionId, value);
+            await mutateSession(record, () => switchPreset(record, params.sessionId, value));
             break;
           }
           case "effort": {
@@ -3046,7 +3067,7 @@ async function apply3(ctx, config = {}) {
             if (value !== "default" && value !== "plan") {
               throw invalidParams(`unknown collaboration mode: ${value}`);
             }
-            const execution = await commandRuntime.execute(
+            const execution = await executeCommand(
               record.agent,
               value === "plan" ? "/plan" : "/plan off",
               new AbortController().signal
@@ -3060,7 +3081,7 @@ async function apply3(ctx, config = {}) {
             break;
           }
           case "model": {
-            await switchModel(record, params.sessionId, value);
+            await mutateSession(record, () => switchModel(record, params.sessionId, value));
             break;
           }
           default:

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "0.4.15",
+  "version": "0.4.17-beta.0",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/openma-ai/deepseek-harness-acp.git"
@@ -36,6 +36,7 @@
     "start": "node --import tsx src/index.ts",
     "pretest": "npm run build",
     "test": "vitest run --exclude test/profile-install.test.ts",
+    "test:host": "vitest run test/e2e.test.ts -t \"serves session controls through the host tree\"",
     "test:install": "vitest run test/profile-install.test.ts",
     "test:watch": "vitest",
     "typecheck": "tsc --noEmit",