@sessionbus/dsh 0.1.0-pre.4 → 0.1.0-pre.7

package/README.md

@@ -19,13 +19,25 @@ lifetime (trusted host).
 
 See [Installing a DSH lane host](docs/HOST-INSTALL.md) for the complete
 preflight, installation, verification, and rollback procedure.
+Its provider-parity step must be completed for both the lane and plain peer
+profiles before either one runs a model turn.
 
-Create the base-only lane profile with:
+Create the base-only lane profile for the package-owned `sessionbus-dsh`
+product with:
 
 ```sh
 dsh plugin --profile sessionbus add @sessionbus/dsh && dsh plugin --profile sessionbus exec sessionbus-dsh-install
 ```
 
+On a host that already uses dashi, one product can own both peers and lanes:
+
+```sh
+dsh plugin --profile sessionbus add @sessionbus/dsh && dsh plugin --profile sessionbus exec sessionbus-dsh-install --product dashi
+```
+
+In that form `SESSIONBUS_PRODUCTS` contains `dashi`, not `sessionbus-dsh`,
+and the daemon maps it to `@antst/dashi-launcher`'s `dashi` bin.
+
 Add the peer plugin to another profile, such as `web`, with:
 
 ```sh
@@ -41,12 +53,12 @@ operator-chosen identifier matching `^[a-z0-9][a-z0-9-]{0,31}$`.
 Non-web profiles also receive the no-upload provider required by DSH's Session
 Controller; ordinary text prompts work while file-upload receipts are rejected.
 
-Register the daemon's `sessionbus-dsh` product command as the package's
-`sessionbus-dsh` bin. With a launch token it selects the installed `sessionbus`
-profile; without one it forwards arguments to `dsh` unchanged.
-The daemon finds that command on `PATH`, so install this package alongside
-`dsh` at the host level too—for example, run `pnpm add @sessionbus/dsh` in the
-directory where `dsh` is installed—so both bins share one `node_modules/.bin`.
+For the two-product form, register the daemon's `sessionbus-dsh` product as the
+package's `sessionbus-dsh` bin. For the one-product form, register only `dashi`
+as the `dashi` bin. Both launchers select the installed `sessionbus` profile
+when given a launch token. Install the selected launcher alongside `dsh` at the
+host level and put their shared `node_modules/.bin` on the daemon service's
+`PATH`; the `dashi` launcher resolves its child `dsh` by name.
 
 Uninstall without invoking DSH by running the installed bin from the profile:
 
@@ -62,4 +74,8 @@ installer removes the package first, then strips its managed `sessionbus` and
 `SESSIONBUS_GROUPS` configures peer identities only. Lane membership is owned
 by the daemon; the plugin accepts and does not consume groups in `session.open`.
 
+## Run results
+
+A DSH error before its input commit returns `failed`, native stop reason `error`, and result `<code>: <message>` verbatim from the durable `turn/end`.
+
 See [Lane without a TUI](docs/LANE-WITHOUT-TUI.md) for the daemon launch contract.

package/install.mjs

@@ -6,7 +6,7 @@ import path from "node:path";
 import { fileURLToPath } from "node:url";
 import { spawnSync } from "node:child_process";
 
-const profilePatch = `- id: system-prompt
+const profilePatch = (product) => `- id: system-prompt
   config:
     persona: >-
       You are a coding agent powered by the {{model}} model. Your working directory is {{cwd}}.
@@ -26,7 +26,7 @@ const profilePatch = `- id: system-prompt
     - { id: session-controller, name: '@deepseek-ai/dsh-api-session-controller' }
     - id: sessionbus
       name: '@sessionbus/dsh'
-      config: { mode: lane, product: sessionbus-dsh }
+      config: { mode: lane, product: ${product} }
 `;
 const peerPatch = (product) => `- insert:
     - { id: sessionbus, name: '@sessionbus/dsh', config: { product: ${product} } }
@@ -133,8 +133,9 @@ export function install(profileNames = [], options = {}) {
   const root = options.root || path.dirname(fileURLToPath(import.meta.url));
   const run = options.run || ((args) => spawnSync("dsh", args, { cwd: root, encoding: "utf8" }));
   const names = [...new Set(profileNames.length ? profileNames : ["sessionbus"])];
+  const laneProduct = options.product ?? "sessionbus-dsh";
   if (options.product !== undefined && (typeof options.product !== "string" || !productPattern.test(options.product))) throw new Error(`invalid product ${JSON.stringify(options.product)}; expected ^[a-z0-9][a-z0-9-]{0,31}$`);
-  if (names.includes("sessionbus") && options.product !== undefined && options.product !== "sessionbus-dsh") throw new Error("the sessionbus profile product must be sessionbus-dsh");
+  if (names.includes("sessionbus") && !["sessionbus-dsh", "dashi"].includes(laneProduct)) throw new Error("the sessionbus profile product must be sessionbus-dsh or dashi");
   if (names.some((name) => name !== "sessionbus") && options.product === undefined) throw new Error("--product is required for peer profiles");
   for (const name of names) {
     if (!validProfile(name)) throw new Error(`invalid profile name ${JSON.stringify(name)}`);
@@ -159,7 +160,7 @@ export function install(profileNames = [], options = {}) {
       dsh: { profile: { bundles: ["@deepseek-ai/dsh-base"], patchReload: "startup" } },
     };
     writeChanged(manifestFile, `${JSON.stringify(manifest, null, 2)}\n`);
-    writeChanged(path.join(profile, "cordis.patch.yml"), profilePatch);
+    writeChanged(path.join(profile, "cordis.patch.yml"), profilePatch(laneProduct));
   }
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sessionbus/dsh",
-  "version": "0.1.0-pre.4",
+  "version": "0.1.0-pre.7",
   "type": "commonjs",
   "main": "plugin.cjs",
   "exports": "./plugin.cjs",

package/plugin.cjs

@@ -191,15 +191,23 @@ class NativeSession {
       run.turn = run.openTurn;
     }
     if (event.type === "assistant/message" && run.turn === event.data.turn) run.output += textOf(event.data.message);
-    if (event.type === "turn/end" && run.turn === event.data.turn) {
-      try { run.end = terminal(event.data.reason); }
+    const earlyError = event.type === "turn/end" && run.turn === null && run.openTurn === event.data.turn && event.data.reason?.kind === "error";
+    if (event.type === "turn/end" && (run.turn === event.data.turn || earlyError)) {
+      try {
+        run.end = terminal(event.data.reason);
+        if (earlyError) run.output = `${event.data.reason.error.code}: ${event.data.reason.error.message}`;
+      }
       catch (error) { run.endError = error; }
     }
   }
 
   async run(cancel, token, input) {
     if (token.Interrupted()) return { outcome: "interrupted", result: "" };
-    const message = this.message(input);
+    // @sessionbus/kit sdk/js/index.js:108-120 passes its text or delivery seed here.
+    const delivery = typeof input?.delivery?.body === "string" ? input.delivery : undefined;
+    const body = typeof input === "string" ? input : typeof input?.text === "string" ? input.text : delivery?.body;
+    if (body === undefined) throw new Error("sessionbus received an unexpected run input seed shape");
+    const message = this.message(body);
     const record = { message, openTurn: null, turn: null, output: "", cancelled: deferred() };
     const receipt = this.receipt(message, this.agent.session, cancel);
     this.active = record;
@@ -211,6 +219,7 @@ class NativeSession {
       try { this.agent.followup(message); }
       catch (error) { receipt.reject(error); throw error; }
       await receipt.promise;
+      if (delivery) await token.ReportDelivery({ disposition: "injected" });
       const idle = this.agent.whenIdle();
       idle.catch(() => {});
       await Promise.race([idle, record.cancelled.promise]);