@sessionbus/dsh 0.1.0-pre.2 → 0.1.0-pre.6

package/README.md

@@ -1,11 +1,13 @@
 # sessionbus for DSH
 
 `@sessionbus/dsh` connects DSH roots to sessionbus and runs daemon-managed DSH lanes.
-It depends on the exact `@sessionbus/kit` prerelease `0.1.0-pre.3`.
+It depends on the exact `@sessionbus/kit` version `0.5.5`.
 It supports DeepSeek Harness `0.1.5-rc.2` and later; tested versions are
 `0.1.5-rc.2`, `0.1.6-alpha.1`, and `0.1.6-alpha.2`.
 A DSH profile must install every DSH package at one uniform DSH version; adding
 one prerelease package can otherwise pull newer prereleases through DSH's caret peers.
+The default single-tool permission grant relies on DSH's `tools/pre-execute`
+waterfall, present since the `0.1.5-rc.2` peer floor.
 `@sessionbus/dsh` is a pkg.pr.new preview until a separately reviewed trusted-
 publishing workflow exists; its first registry version must be published manually
 before trusted publishing can be configured.
@@ -13,12 +15,27 @@ The plugin reads the token once, deletes it from process.env, and retains it
 nowhere in the plugin; DSH's immutable launch snapshot keeps it for the process
 lifetime (trusted host).
 
-Create the base-only lane profile with:
+## Installation
+
+See [Installing a DSH lane host](docs/HOST-INSTALL.md) for the complete
+preflight, installation, verification, and rollback procedure.
+
+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
@@ -34,12 +51,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:
 

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.2",
+  "version": "0.1.0-pre.6",
   "type": "commonjs",
   "main": "plugin.cjs",
   "exports": "./plugin.cjs",
@@ -14,7 +14,7 @@
   },
   "dependencies": {
     "@antst/dsh-file-uploads-none": "0.1.0-alpha.18",
-    "@sessionbus/kit": "0.1.0-pre.3"
+    "@sessionbus/kit": "0.5.5"
   },
   "peerDependencies": {
     "@deepseek-ai/cordis": "^4.0.2",

package/plugin.cjs

@@ -313,6 +313,12 @@ function createRuntime(ctx, config, dependencies, prepared) {
     assertKnownArguments(args, argumentsSchema);
     return client.action(argumentsValue.action, args);
   };
+  let removeGrant;
+  try {
+    // The peer floor guarantees this waterfall; this catch covers registration errors, not feature detection.
+    removeGrant = ctx.on("tools/pre-execute", async (execution, next) =>
+      execution.name === "sessionbus" ? { kind: "allow" } : next(), { prepend: true });
+  } catch (error) { throw new Error(`cannot grant sessionbus tool permission: ${clean(error)}`); }
   const removeTool = ctx.tools.register(dependencies.defineTool({
     name: "sessionbus",
     description: "List, message, spawn and control Sessionbus sessions. Use trace mode off, events or content to configure live parent tracing for a direct child; spawn trace sets its initial mode.",
@@ -349,7 +355,7 @@ function createRuntime(ctx, config, dependencies, prepared) {
   };
   const removeReady = ctx.appReady.onReady(start);
   const close = () => {
-    removeReady(); removeCreated(); removeDisposed(); removeTitle(); removeCommand(); removeTool();
+    removeReady(); removeCreated(); removeDisposed(); removeTitle(); removeCommand(); removeGrant(); removeTool();
     for (const agent of peers.keys()) forget(agent);
     worker?.shutdown(); native.removeEvents();
   };