@securecoms/agent-bridge 0.6.0 → 0.7.0

package/dist/bin.js

@@ -7042,7 +7042,139 @@ function uninstallService(input, deps) {
 }
 
 // src/service/install-prep.ts
-import { join as join8 } from "node:path";
+import { join as join9 } from "node:path";
+
+// src/service/wire.ts
+import { join as join8, dirname as dirname5 } from "node:path";
+import { fileURLToPath } from "node:url";
+function detectHarness(home, statDir) {
+  if (statDir(`${home}/.openclaw`)) return "openclaw";
+  if (statDir(`${home}/.hermes`)) return "hermes";
+  return null;
+}
+function connectorTargetDir(home, harness) {
+  if (harness === "openclaw") return `${home}/.openclaw/local-plugins/securecoms`;
+  return `${home}/.hermes/local-plugins/securecoms`;
+}
+function connectorsSrcDir(importMetaUrl) {
+  const pkgRoot = dirname5(dirname5(fileURLToPath(importMetaUrl)));
+  return join8(pkgRoot, "connectors", "openclaw");
+}
+function parseArg(argv, flag) {
+  const i = argv.indexOf(flag);
+  return i >= 0 ? argv[i + 1] : void 0;
+}
+function resolveEntry(deps) {
+  const identityArg = parseArg(deps.argv, "--identity");
+  if (!identityArg) {
+    deps.log("wire: missing --identity <id|slug>");
+    return null;
+  }
+  const entry = deps.readFleet().find((e) => e.identityId === identityArg || e.slug === identityArg);
+  if (!entry) {
+    deps.log(`wire: unknown identity "${identityArg}" (not found in the local fleet)`);
+    return null;
+  }
+  const harnessArg = parseArg(deps.argv, "--harness");
+  if (harnessArg !== "openclaw" && harnessArg !== "hermes") {
+    deps.log("wire: missing/invalid --harness <openclaw|hermes> (auto-detection did not resolve one)");
+    return null;
+  }
+  return { entry, harness: harnessArg };
+}
+function runWire(deps) {
+  const resolved = resolveEntry(deps);
+  if (!resolved) return 1;
+  const { entry, harness } = resolved;
+  if (harness === "hermes") {
+    deps.log(
+      "[securecoms] Hermes connector is not available yet (fast-follow); detection and target dir only. Nothing installed."
+    );
+    return 1;
+  }
+  const targetDir = connectorTargetDir(deps.home, harness);
+  deps.copyConnector(deps.connectorsSrcDir, targetDir);
+  deps.writeBinding(targetDir, entry.identityId);
+  if (typeof entry.port === "number") {
+    const h = deps.getHealth(entry.port);
+    if (h && (h.agent_sessions ?? 0) >= 1) {
+      deps.log(`wire: ${entry.slug} attached (agent_sessions=${h.agent_sessions})`);
+    } else {
+      deps.log(`wire: connector installed but not yet attached \u2014 restart the harness to pick it up.`);
+    }
+  } else {
+    deps.log(`wire: connector installed (no bridge port known yet) \u2014 restart the harness to pick it up.`);
+  }
+  return 0;
+}
+function runUnwire(deps) {
+  const resolved = resolveEntry(deps);
+  if (!resolved) return 1;
+  const { harness } = resolved;
+  if (harness === "hermes") {
+    deps.log("[securecoms] Hermes connector is not available yet (fast-follow); nothing to remove.");
+    return 0;
+  }
+  deps.removeBinding(connectorTargetDir(deps.home, harness));
+  return 0;
+}
+
+// src/service/harness-wire.ts
+function customFacts(input) {
+  const ws = `ws://127.0.0.1:${input.port ?? "<PORT>"}/v1/ws`;
+  return [
+    `  bridge WS:   ${ws}`,
+    `  token file:  ${input.tokenFilePath}`,
+    `  Bring your own connector: open the WS with the bearer token read from that file.`,
+    `  Protocol reference: the "WebSocket" section of the agent-bridge README.`
+  ].join("\n");
+}
+function autoWireHarness(input, deps) {
+  const h = input.harness;
+  if (!h || h === "none") return { echo: "", wired: false, error: false };
+  const retry = `agent-bridge wire --harness openclaw --identity ${input.slug}`;
+  if (h === "openclaw") {
+    const parent = `${input.home}/.openclaw`;
+    if (!deps.statDir(parent)) {
+      return {
+        echo: `[securecoms] OpenClaw not found at ~/.openclaw \u2014 the bridge service is installed, but the harness was NOT wired.
+  Install OpenClaw, then re-run install, or run: ${retry}
+  (or re-run install with --harness custom).`,
+        wired: false,
+        error: true
+      };
+    }
+    const targetDir = connectorTargetDir(input.home, "openclaw");
+    try {
+      const prev = deps.readBinding(targetDir);
+      deps.copyConnector(input.connectorsSrcDir, targetDir);
+      deps.writeBinding(targetDir, input.identityId);
+      const rebind = prev && prev !== input.identityId ? `
+  rebind: ${prev} \u2192 ${input.identityId}` : "";
+      return {
+        echo: `[securecoms] OpenClaw connector installed and bound to identity ${input.identityId}.${rebind}
+  Now restart OpenClaw to pick up the connector.`,
+        wired: true,
+        error: false
+      };
+    } catch (e) {
+      return {
+        echo: `[securecoms] the bridge service is installed, but wiring the OpenClaw connector FAILED: ${e.message}
+  Retry after fixing the path: ${retry}`,
+        wired: false,
+        error: true
+      };
+    }
+  }
+  if (h === "hermes") {
+    return { echo: `[securecoms] Hermes turnkey connector is coming (Phase 2). For now drive Hermes via the custom WS path:
+${customFacts(input)}`, wired: false, error: false };
+  }
+  return { echo: `[securecoms] Custom harness \u2014 bring your own connector:
+${customFacts(input)}`, wired: false, error: false };
+}
+
+// src/service/install-prep.ts
 function assertReadableCredential(absPath, deps) {
   let raw;
   try {
@@ -7065,10 +7197,10 @@ function assertReadableCredential(absPath, deps) {
   return { deviceId: json2.device_id, identityId: json2.identity_id, issuedAt };
 }
 function durableDir(home, slug) {
-  return join8(home, `securecoms-agent-${slug}`);
+  return join9(home, `securecoms-agent-${slug}`);
 }
 function durableCredentialPath(home, slug) {
-  return join8(durableDir(home, slug), `${slug}.json`);
+  return join9(durableDir(home, slug), `${slug}.json`);
 }
 function takeCustody(args2, deps) {
   const dir = durableDir(args2.home, args2.slug);
@@ -7115,7 +7247,7 @@ function readSiblingDefs(dir, prefix, deps) {
   for (const n of names) {
     if (!n.startsWith(prefix)) continue;
     try {
-      out.push(deps.readFile(join8(dir, n)));
+      out.push(deps.readFile(join9(dir, n)));
     } catch {
     }
   }
@@ -7147,15 +7279,6 @@ async function verifyDaemonUp(args2, deps) {
   }
   return false;
 }
-function harnessSnippet(args2) {
-  const label = args2.harness === "hermes" ? "Hermes" : args2.harness === "openclaw" ? "OpenClaw" : "your harness";
-  return [
-    `# ${label}: optional daemon-supervised path. Prefer 'agent-bridge wire' + the connection file.`,
-    `SECURECOMS_BRIDGE_URL=ws://127.0.0.1:${args2.port}/v1/ws`,
-    `SECURECOMS_CONNECTION_FILE=~/.securecoms/connections/${args2.identityId}.json`,
-    `SECURECOMS_BRIDGE_TOKEN_FILE=${args2.tokenFilePath}`
-  ].join("\n");
-}
 async function orchestrateInstall(ctx) {
   const parsed = assertReadableCredential(ctx.credentialAbsPath, ctx.prepDeps);
   const stemForSlug = ctx.label ?? ctx.credentialAbsPath.replace(/^.*[\\/]/, "").replace(/\.[^.]*$/, "");
@@ -7189,22 +7312,24 @@ async function orchestrateInstall(ctx) {
     `  token:   ${result.tokenHint}`,
     `  (Re-running install is the only way to update a live credential \u2014 replacing the download alone does nothing.)`
   ];
-  let harnessSnippetShown = false;
-  if (ctx.harness && ctx.harness !== "none") {
-    lines.push(
-      "",
-      `Primary: run 'agent-bridge wire --identity ${slug}' to attach a harness; the daemon writes ~/.securecoms/connections/${parsed.identityId}.json on startup.`,
-      "",
-      "Optional (daemon-supervised):",
-      harnessSnippet({ slug, port, tokenFilePath: result.tokenHint, harness: ctx.harness, identityId: parsed.identityId })
-    );
-    harnessSnippetShown = true;
-  }
-  return { echo: lines.join("\n") + "\n", harnessSnippetShown };
+  const wire = autoWireHarness(
+    {
+      harness: ctx.harness,
+      identityId: parsed.identityId,
+      slug,
+      port,
+      home: ctx.home,
+      tokenFilePath: result.tokenHint,
+      connectorsSrcDir: ctx.connectorsSrcDir
+    },
+    ctx.autoWireDeps
+  );
+  if (wire.echo) lines.push("", wire.echo);
+  return { echo: lines.join("\n") + "\n", harnessWired: wire.wired, harnessError: wire.error };
 }
 
 // src/service/fleet.ts
-import { dirname as dirname5 } from "node:path";
+import { dirname as dirname6 } from "node:path";
 function parseArgFromDef(def, flag) {
   const esc = flag.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
   const re = new RegExp(`${esc}(?:<\\/string>\\s*<string>|\\s+)([^<\\s]+)`);
@@ -7248,7 +7373,7 @@ function readFleet(deps) {
       let identityId = `unknown:${slug}`, deviceId = "", label = slug, env = "unknown";
       let credDir = null;
       if (credPath) {
-        credDir = dirname5(credPath);
+        credDir = dirname6(credPath);
         try {
           const c = JSON.parse(deps.readFile(credPath));
           if (c.identity_id) identityId = c.identity_id;
@@ -7314,81 +7439,6 @@ function renderStatusTable(rows) {
   return [fmt(head), ...body.map(fmt)].join("\n") + "\n";
 }
 
-// src/service/wire.ts
-import { join as join9, dirname as dirname6 } from "node:path";
-import { fileURLToPath } from "node:url";
-function detectHarness(home, statDir) {
-  if (statDir(`${home}/.openclaw`)) return "openclaw";
-  if (statDir(`${home}/.hermes`)) return "hermes";
-  return null;
-}
-function connectorTargetDir(home, harness) {
-  if (harness === "openclaw") return `${home}/.openclaw/local-plugins/securecoms`;
-  return `${home}/.hermes/local-plugins/securecoms`;
-}
-function connectorsSrcDir(importMetaUrl) {
-  const pkgRoot = dirname6(dirname6(fileURLToPath(importMetaUrl)));
-  return join9(pkgRoot, "connectors", "openclaw");
-}
-function parseArg(argv, flag) {
-  const i = argv.indexOf(flag);
-  return i >= 0 ? argv[i + 1] : void 0;
-}
-function resolveEntry(deps) {
-  const identityArg = parseArg(deps.argv, "--identity");
-  if (!identityArg) {
-    deps.log("wire: missing --identity <id|slug>");
-    return null;
-  }
-  const entry = deps.readFleet().find((e) => e.identityId === identityArg || e.slug === identityArg);
-  if (!entry) {
-    deps.log(`wire: unknown identity "${identityArg}" (not found in the local fleet)`);
-    return null;
-  }
-  const harnessArg = parseArg(deps.argv, "--harness");
-  if (harnessArg !== "openclaw" && harnessArg !== "hermes") {
-    deps.log("wire: missing/invalid --harness <openclaw|hermes> (auto-detection did not resolve one)");
-    return null;
-  }
-  return { entry, harness: harnessArg };
-}
-function runWire(deps) {
-  const resolved = resolveEntry(deps);
-  if (!resolved) return 1;
-  const { entry, harness } = resolved;
-  if (harness === "hermes") {
-    deps.log(
-      "[securecoms] Hermes connector is not available yet (fast-follow); detection and target dir only. Nothing installed."
-    );
-    return 1;
-  }
-  const targetDir = connectorTargetDir(deps.home, harness);
-  deps.copyConnector(deps.connectorsSrcDir, targetDir);
-  deps.writeBinding(targetDir, entry.identityId);
-  if (typeof entry.port === "number") {
-    const h = deps.getHealth(entry.port);
-    if (h && (h.agent_sessions ?? 0) >= 1) {
-      deps.log(`wire: ${entry.slug} attached (agent_sessions=${h.agent_sessions})`);
-    } else {
-      deps.log(`wire: connector installed but not yet attached \u2014 restart the harness to pick it up.`);
-    }
-  } else {
-    deps.log(`wire: connector installed (no bridge port known yet) \u2014 restart the harness to pick it up.`);
-  }
-  return 0;
-}
-function runUnwire(deps) {
-  const resolved = resolveEntry(deps);
-  if (!resolved) return 1;
-  const { harness } = resolved;
-  if (harness === "hermes") {
-    deps.log("[securecoms] Hermes connector is not available yet (fast-follow); nothing to remove.");
-    return 0;
-  }
-  deps.removeBinding(connectorTargetDir(deps.home, harness));
-  return 0;
-}
-
 // src/service/connection-file.ts
 import {
   chmodSync,
@@ -7622,6 +7672,14 @@ function realWriteBinding(dstDir, identityId) {
   mkdirSync2(dstDir, { recursive: true });
   writeFileSync3(join11(dstDir, "securecoms.binding.json"), JSON.stringify({ identity_id: identityId }) + "\n", { mode: 384 });
 }
+function realReadBinding(dstDir) {
+  try {
+    const parsed = JSON.parse(readFileSync7(join11(dstDir, "securecoms.binding.json"), "utf8"));
+    return parsed.identity_id ?? null;
+  } catch {
+    return null;
+  }
+}
 function realRemoveBinding(dstDir) {
   rmSync(join11(dstDir, "securecoms.binding.json"), { force: true });
 }
@@ -7684,6 +7742,17 @@ async function runServiceVerb(verb) {
         explicitPort: portStr ? Number(portStr) : void 0,
         harness: argOrEnv("--harness", "SECURECOMS_HARNESS"),
         home: homedir2(),
+        connectorsSrcDir: connectorsSrcDir(import.meta.url),
+        autoWireDeps: {
+          statDir: realStatDir,
+          // reuse bin.ts:235
+          readBinding: realReadBinding,
+          copyConnector: realCopyConnector,
+          // bin.ts:212 — one copy impl
+          writeBinding: realWriteBinding,
+          // bin.ts:226 — writes {identity_id}
+          log: (s) => process.stderr.write(s + "\n")
+        },
         prepDeps: realPrepDeps(),
         // O-1: the real installService is 2-arg; partially apply the deps so
         // orchestrateInstall only ever sees the 1-arg seam.
@@ -7701,6 +7770,7 @@ async function runServiceVerb(verb) {
         })
       });
       process.stdout.write(r.echo);
+      if (r.harnessError) process.exit(1);
     } else {
       const input = {
         credentialPath: credentialPath ?? "",

package/dist/service/harness-wire.d.ts

@@ -0,0 +1,21 @@
+export interface AutoWireInput {
+    harness: string | undefined;
+    identityId: string;
+    slug: string;
+    port: number | null;
+    home: string;
+    tokenFilePath: string;
+    connectorsSrcDir: string;
+}
+export interface AutoWireDeps {
+    statDir: (p: string) => boolean;
+    readBinding: (dstDir: string) => string | null;
+    copyConnector: (srcDir: string, dstDir: string) => void;
+    writeBinding: (dstDir: string, identityId: string) => void;
+    log: (s: string) => void;
+}
+export declare function autoWireHarness(input: AutoWireInput, deps: AutoWireDeps): {
+    echo: string;
+    wired: boolean;
+    error: boolean;
+};

package/dist/service/install-prep.d.ts

@@ -1,4 +1,5 @@
 import { type ServiceInput } from "./config.js";
+import { type AutoWireDeps } from "./harness-wire.js";
 export interface PrepDeps {
     readFile: (p: string) => string;
     writeFileMode: (p: string, data: string, mode: number) => void;
@@ -37,13 +38,6 @@ export declare function verifyDaemonUp(args: {
     attempts?: number;
     delayMs?: number;
 }, deps: PrepDeps): Promise<boolean>;
-export declare function harnessSnippet(args: {
-    slug: string;
-    port: number;
-    tokenFilePath: string;
-    harness: string;
-    identityId: string;
-}): string;
 export interface OrchestrateInstallCtx {
     credentialAbsPath: string;
     label?: string;
@@ -52,7 +46,9 @@ export interface OrchestrateInstallCtx {
     home: string;
     launchAgentsDir?: string;
     systemdDir?: string;
+    connectorsSrcDir: string;
     prepDeps: PrepDeps;
+    autoWireDeps: AutoWireDeps;
     installService: (input: ServiceInput) => {
         label: string;
         filePath: string;
@@ -65,5 +61,6 @@ export interface OrchestrateInstallCtx {
 }
 export declare function orchestrateInstall(ctx: OrchestrateInstallCtx): Promise<{
     echo: string;
-    harnessSnippetShown: boolean;
+    harnessWired: boolean;
+    harnessError: boolean;
 }>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@securecoms/agent-bridge",
-  "version": "0.6.0",
+  "version": "0.7.0",
   "type": "module",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",