@murmurv2/cli 2.11.0 → 2.12.0

package/README.md

@@ -1,15 +1,15 @@
 # Murmur CLI
 
-Install once, join with a private invitation file, and connect an AI client to
-Murmur's encrypted messaging mesh. The executable is `murmur`.
+Set up your Identity, exchange an Invitation and a Reply, and connect your
+Assistant to Murmur. The executable is `murmur`.
 
-The public npm release is pending. After `@murmurv2/cli@2.11.0` is published,
-use the command below. Until publication is confirmed, use a GitHub release
-asset; older public registry packages do not contain the current fixes.
-Maintainers rehearsing a release use only their coordinator-approved registry.
+`@murmurv2/cli@2.12.0` is published on npm (28 Sep 2026). `@murmurv2/*` packages
+published before that release are frozen and do not contain the current fixes;
+install the pinned version below or use a GitHub release asset. Step-by-step
+installation of the desktop app is on https://murmurconnect.com/#install.
 
 ```sh
-npm install --global @murmurv2/cli@2.11.0
+npm install --global @murmurv2/cli@2.12.0
 murmur version --json
 ```
 
@@ -19,7 +19,19 @@ The tarball includes the CLI, daemon, MCP entry, and prebuilt Windows x64 servic
 helper. It does not include a desktop application. On Windows PowerShell use
 `npm.cmd` and `murmur.cmd` if execution policy blocks the PowerShell shims.
 
-Run the following with the same absolute profile path on each line:
+Use the same absolute profile path for every command below.
+
+To create an Invitation, use `murmur invite --data-dir /absolute/profile`.
+It prints one `MURMUR:` line. Add `--out /private/invitation.txt` for a private
+file copy; `--json` returns the line in `invitation` and the
+`containsBrokerCredential` flag. If that flag is true, an application must explain
+that the Invitation contains a Server access key and obtain confirmation before
+copying it. Send it personally to your colleague.
+If the profile uses a private Server address, ask for that Server's public address
+and add `--broker nats://server.example.com:4222`. The Invitation uses this address;
+the Service keeps its existing settings. A private override is also refused.
+
+To accept an Invitation:
 
 ```sh
 murmur join --agent-id YOUR-AGENT --invite-file /private/invite.txt --reply-out /private/reply.txt --data-dir /absolute/profile
@@ -30,10 +42,16 @@ murmur clients configure --client codex-cli --data-dir /absolute/profile
 murmur doctor --peer HOST-AGENT --data-dir /absolute/profile --json
 ```
 
-The invitation host must import your reply file and reload its own peer
-configuration before the roundtrip check can succeed. Keep the invitation and
-reply outside the profile, in an existing private directory. Do not paste them
-into chat or edit `agent-config.json` manually.
+For an application that accepts pasted lines, use `join --invite-stdin` and
+`add-peer --reply-stdin`, sending the line on the subprocess input stream, never
+as a command argument. `join` prints the Reply as one `MURMUR:` line;
+`--reply-out` is optional. With `--json`, the Reply is in `reply`.
+
+The inviting person imports the Reply with `add-peer`. A 2.12 Service reads
+changed Contacts automatically; no manual restart is needed. The command reports
+a pending reload, not proof that the running Service has applied it. Start the
+Service if it is not running, then check the connection. Keep optional files
+outside the Identity folder, in an existing private directory.
 
 Choose an installed client reported by `clients detect`; configuration preserves
 unrelated settings and refuses conflicting Murmur entries. Reload that client,
@@ -51,3 +69,10 @@ prefix in place while its service and client configuration refer to it.
 
 [`docs/setup-onboarding.md`](https://github.com/alexfrmn/murmur/blob/main/docs/setup-onboarding.md)
 documents the shared commands and their evidence limits.
+
+On Windows, `murmur logs path --data-dir <profile> --json` verifies the native
+Service's profile before returning its existing readable folder under
+`%ProgramData%\Murmur\logs\<service-name>`. The response uses
+`murmur.logs/1` with `source: "native"`. Missing or unverified Services and folders
+are refused; the command does not create directories or change the Service.
+Pass the same `--service-name` used during installation when it was customized.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@murmurv2/cli",
-  "version": "2.11.0",
+  "version": "2.12.0",
   "type": "module",
   "main": "runtime/packages/setup/dist/src/index.js",
   "types": "runtime/packages/setup/dist/src/index.d.ts",
@@ -33,6 +33,7 @@
     "access": "public"
   },
   "description": "Murmur CLI — invite-based setup, background service, client configuration and diagnostics.",
+  "mcpName": "io.github.alexfrmn/murmur",
   "files": [
     "bin/murmur-npm.mjs",
     "runtime",

package/runtime/npm-runtime-manifest.json

@@ -1,26 +1,26 @@
 {
   "schema": "murmur.npm-cli/1",
-  "sourceCommit": "91279e5249e265cfe54dcd0904d9ae92fbb18ec5",
+  "sourceCommit": "e7f389c97146dd305a19099eeb1ea00eda56c423",
   "sourceDirty": false,
-  "declaredVersion": "2.11.0",
-  "sourceLockSha256": "4317a76743610366f9b5846993c7c201bc2c0c4fcabfda2d5448e7ff921a9647",
+  "declaredVersion": "2.12.0",
+  "sourceLockSha256": "7e3f544f7c022f5f608051e88175d7cf2770d05668e2a992675c98e1cc3d91fb",
   "windowsHelper": {
     "component": "windows-service",
     "platform": "windows",
     "arch": "amd64",
-    "version": "2.11.0",
-    "sourceCommit": "91279e5249e265cfe54dcd0904d9ae92fbb18ec5",
-    "sha256": "877f76eb7791c5a83b1a33dce0eaa7aa497eabdee2f877d750d695355cac76ab",
-    "size": 3128320,
+    "version": "2.12.0",
+    "sourceCommit": "e7f389c97146dd305a19099eeb1ea00eda56c423",
+    "sha256": "7bb31d2080d23c5e8bcf690f03560259e9ffd421b6e6c7b2ccffb61e9b03a760",
+    "size": 3145216,
     "nativeVersionExecuted": false
   },
   "files": {
     "package.json": {
-      "sha256": "7670e3b33c8ef783813b1b8860726f9dd2ba2bcdc7c49da05f2780d89fdc0d6b",
+      "sha256": "0c78cdd67aa02fefa10be5eecc0df994c5f83702d059659c84b5145ef540cbc7",
       "size": 83
     },
     "packages/setup/package.json": {
-      "sha256": "ac61a66e834fcbad44a2fbed34dc2f7573309f1245bdd8e83dd9540803758df2",
+      "sha256": "7b0ffea9e6209e96737be35da3c282cadb9db183c685fc69d0baa4015760fdab",
       "size": 132
     },
     "packages/setup/dist/src/appdata.d.ts": {
@@ -32,44 +32,44 @@
       "size": 2678
     },
     "packages/setup/dist/src/cli.d.ts": {
-      "sha256": "6da2fbea536a227db1e8b1d7646d4554cd6e071b05240d5489203eaf007c72e2",
-      "size": 418
+      "sha256": "45ddc7e1eac91a7eb922339b3f01a39a28cf027789309b477eb4ffcfdd020682",
+      "size": 462
     },
     "packages/setup/dist/src/cli.js": {
-      "sha256": "13ab60762776c1750da857762f3957a08340e41c651cab6274f3a678b0480d31",
-      "size": 8745
+      "sha256": "91a5d9f7eaf505a2d4a4f55064d2eb219bda51bbc9de516d22c6304948ff87f3",
+      "size": 11014
     },
     "packages/setup/dist/src/clients.d.ts": {
       "sha256": "74291be39ef9cffab6d483e38d955cdc0100e9d5ba0d734d77cad8d2f1fc01fb",
       "size": 4380
     },
     "packages/setup/dist/src/clients.js": {
-      "sha256": "1098fe951626980c0c5717d8a211d282db5d6c4acfd09a055b8ebd2d1b9362ab",
-      "size": 13670
+      "sha256": "82d84903dd069c0ecad709a25d221b9a20b0b6e6f3f43e244dea01803a60f2d6",
+      "size": 14339
     },
     "packages/setup/dist/src/commands.d.ts": {
-      "sha256": "63f0a5e9834ca75bced2079cb4c4f0e087c1c7cd14ad958aeda5234bcd80337e",
-      "size": 1316
+      "sha256": "c930b1058ff2d45be38f74df2251a722fe0f1599b5d7afbc6bf74d17a780633c",
+      "size": 1417
     },
     "packages/setup/dist/src/commands.js": {
-      "sha256": "eef7c76c21383b2dba733ce4967afa964c547a263333a380606b05eb197fb04f",
-      "size": 5731
+      "sha256": "68f47c53dab225057d09c192cd941f509d39d3cbdc7868b74d5e8494df0e806c",
+      "size": 6416
     },
     "packages/setup/dist/src/config.d.ts": {
-      "sha256": "b244629bb9a19d4a48b813c817733d998efea543e8daec99e282010d4e784499",
-      "size": 1346
+      "sha256": "4ddeda3137d82b8fa82fa3c723b14fb37fd05ad1ca7cc2683fa09c32df56cdb2",
+      "size": 1489
     },
     "packages/setup/dist/src/config.js": {
-      "sha256": "9ad91d6d9408f72166ed363eacac4496b1e831ccdda10cd28375f6e21521ef4e",
-      "size": 3212
+      "sha256": "12d1594dca385cda8da9e628743ca64794bc7d6e314787090b7af4e8517dc517",
+      "size": 9034
     },
     "packages/setup/dist/src/doctor.d.ts": {
-      "sha256": "115b7cf132e4101fe4964173787902d9585f586ee83aa9ae1694161bd646804f",
-      "size": 827
+      "sha256": "212bdd1979f01c3d19c32e686a42472df645598afaf8ac979e6f59d3076a6329",
+      "size": 1159
     },
     "packages/setup/dist/src/doctor.js": {
-      "sha256": "9e240e1f0796ce5e3a6e64dbcc41c56a9febd285c2276f88bb15dde6d68c201e",
-      "size": 11225
+      "sha256": "1132cacce959550b1cd746275406b1cbb52525e5065aa7805c5e87eb54c69cbe",
+      "size": 12658
     },
     "packages/setup/dist/src/file-identity.d.ts": {
       "sha256": "1f5845364d263c80167ed533e46a02751a008d3993a6894aae50a13f646e6767",
@@ -87,21 +87,37 @@
       "sha256": "8d863cf184dd6837b7d6544a202f6b2a19787b37e82bac379decc8a07268a7a0",
       "size": 236
     },
+    "packages/setup/dist/src/invitation-server.d.ts": {
+      "sha256": "6456bba1de8ddf8c9a520a4631f972cd79ebf66428f4673af6692e7136b6bc97",
+      "size": 159
+    },
+    "packages/setup/dist/src/invitation-server.js": {
+      "sha256": "e6e1de957d76191e7695bcad51ce7049cc3db7cf92d82b682d43584ec00c4401",
+      "size": 2555
+    },
+    "packages/setup/dist/src/message-status.d.ts": {
+      "sha256": "047356037a4e6f93468e044473da6c32e210653276c69f89a311f189f2bf7b28",
+      "size": 272
+    },
+    "packages/setup/dist/src/message-status.js": {
+      "sha256": "0fd0339db07a43133018c54da572017b8ab4423a37698c80a8bf2aa6a6de3b2d",
+      "size": 576
+    },
     "packages/setup/dist/src/onboarding.d.ts": {
-      "sha256": "b76892619695c2bd9298248d4e7557dce832a688aca0106c02939c4ae0352277",
-      "size": 1141
+      "sha256": "7510056f60fdebb183143a53fed8d4495d361a0e2b05f8c8601d959e51ba7f67",
+      "size": 1440
     },
     "packages/setup/dist/src/onboarding.js": {
-      "sha256": "caaec0a7f9e8f685185b096bccf1741ae93e7f64983602833ef4e1ccbff70544",
-      "size": 14985
+      "sha256": "a27a426a21de33b6c5017a26d248a75875f8caffbf274ba1139e2ab1f876e116",
+      "size": 16248
     },
     "packages/setup/dist/src/outbox-attention.d.ts": {
       "sha256": "a96effdd0e47701836fb93ab0c24a30d78f29fc0f3e7193406067535532ff962",
       "size": 1606
     },
     "packages/setup/dist/src/outbox-attention.js": {
-      "sha256": "db70b6eed2338efe0c2875dbca9c0306cce3c940f0f7f09f3dff7c528ca377af",
-      "size": 5113
+      "sha256": "45c0cacd468907860415439ab519e39b07d154e1f64e90bf0dc62e135305aa92",
+      "size": 4326
     },
     "packages/setup/dist/src/paths.d.ts": {
       "sha256": "5c9ce9ac87f5fa90124fa071cc6a5d2176d045fc41de58deb53a0e3ef5d85504",
@@ -116,24 +132,24 @@
       "size": 591
     },
     "packages/setup/dist/src/platform/darwin.js": {
-      "sha256": "b361a9481c12aa5952dd9c18f30cf612f2126bef87993e6808acf38e56ae7422",
-      "size": 12996
+      "sha256": "b4a71ef4bf4cb215464e5678772c1f6c55f1da4960126d39741cb30c8d57ee92",
+      "size": 13212
     },
     "packages/setup/dist/src/platform/linux.d.ts": {
       "sha256": "989d39cc9d5c73c9dae7dc926344fa2c6dde5e80f0a8d7657d5ce1f774da9b44",
       "size": 375
     },
     "packages/setup/dist/src/platform/linux.js": {
-      "sha256": "ab86ab63919d8df3c5c8ccd3bec1d34b4926d847911c56ecf5f8acbcc6404e26",
-      "size": 9042
+      "sha256": "e4086029fa68b02d6f090b8b257b1387c3e7bfdba502d4fc7ca5cfbc07404bab",
+      "size": 9087
     },
     "packages/setup/dist/src/platform/windows.d.ts": {
       "sha256": "9f2cb7a20c26f936c9878ca5d525edd7486142392452db47c49e5676e98e2808",
       "size": 1123
     },
     "packages/setup/dist/src/platform/windows.js": {
-      "sha256": "1a6db62bf38dd56fe78a115e30dc003aef892453265add5e338f8b32beedb87c",
-      "size": 10787
+      "sha256": "d43f31edb07bf0ee37a4a7e28176a9e3087c47467ceefddc2a6c85c9299d8391",
+      "size": 14546
     },
     "packages/setup/dist/src/private-file.d.ts": {
       "sha256": "dd574a6f2135aa13064a45b452275aada896402243a4d147f7c417afe8199c4a",
@@ -168,16 +184,16 @@
       "size": 984
     },
     "packages/setup/dist/src/status.d.ts": {
-      "sha256": "426841217d3f9f6248a63d65fb708af3aa38cd481bad1390a68d1ec1a3910124",
-      "size": 4244
+      "sha256": "1906f6e98e70e33c0ff3d232410e84a9e44d992910447b789b78eed30b0f0469",
+      "size": 4720
     },
     "packages/setup/dist/src/status.js": {
-      "sha256": "ddc80da3c1843cf84137b2543805c6c4cdf3316efe44870e6151476c1ca6d27c",
-      "size": 13155
+      "sha256": "2149709708a996047e94f7f4fe809bdfb7bfc79f346288509f0143e2ef822002",
+      "size": 18057
     },
     "packages/setup/dist/src/types.d.ts": {
-      "sha256": "2d9d05df2818b22a2be5050288cfe9837f2669814218cbeca1be64b19a079463",
-      "size": 1506
+      "sha256": "d19a3e3aec782eea861e83b42121608a4251b100f940d2f9918e06496bf1a027",
+      "size": 2195
     },
     "packages/setup/dist/src/types.js": {
       "sha256": "8e609bb71c20b858c77f0e9f90bb1319db8477b13f9f965f1a1e18524bf50881",
@@ -196,12 +212,20 @@
       "size": 505
     },
     "packages/setup/dist/src/verdict.js": {
-      "sha256": "3b3265b31dc366745a42a48ac56655d838586197bba9774a0b47c90c02a9099b",
-      "size": 7929
+      "sha256": "aa9deab4aa1872307673a24ac6c9c5cd2725810d51ed8b4eeaa780664a84239b",
+      "size": 8136
+    },
+    "packages/setup/dist/src/wake-attention.d.ts": {
+      "sha256": "dfcff1d3f6be50e4a55ba6f9310a1600341b041cc1fe68c1752d79684993beee",
+      "size": 431
+    },
+    "packages/setup/dist/src/wake-attention.js": {
+      "sha256": "62623206ebaba33150c381ccb24ee5a523e4c81a4dafc9d6ce2620941f375686",
+      "size": 2384
     },
     "packages/setup/bin/murmur.mjs": {
-      "sha256": "6761c1030f648455e3b99499cd1fa7a356b091700dbbcb2392623315243c5bb5",
-      "size": 1408
+      "sha256": "bb3ce6c03540f9c9ced3a4408651a0c916062a124592426f4f9b8f2447f5f043",
+      "size": 1675
     },
     "packages/mcp-server/package.json": {
       "sha256": "89c47db7851f89caec72da4f215ebc21cf1e294aeef3b45d2583562d846ab035",
@@ -212,8 +236,8 @@
       "size": 31
     },
     "scripts/murmur-daemon.mjs": {
-      "sha256": "e3f7a2dfcb842ea4a908fd0e10ab6c5f066ea3034af51991c3326a1bcf808be6",
-      "size": 22863
+      "sha256": "5012e4d309bbf0a03c730e47689b187309e15676d2bcc8a474aa331a12a1b503",
+      "size": 24198
     },
     "scripts/murmur-shell-send.mjs": {
       "sha256": "5e0ae14f59b634f89751c0487edbf7b9f03f95b0a38e55d5619d392bd2343eee",
@@ -228,16 +252,16 @@
       "size": 10755
     },
     "scripts/codex-app-server-wake.mjs": {
-      "sha256": "8b3d975498f5904d42a18bc345a943a4707d9b147f5ae81fd050645796e97c26",
-      "size": 26600
+      "sha256": "08d263afca8bdd2baf3232f36bdcfb14e80ea60dca82d52a0df215d8ccfd96a3",
+      "size": 34121
     },
     "scripts/murmur-jetstream-advisory.mjs": {
       "sha256": "4232c92418d46bd4c6bc4785641dd226f58a79e35211e51a469a8d469065e0a7",
       "size": 326
     },
     "scripts/wake-monitor.mjs": {
-      "sha256": "416dd71e7e93b6827d9e603438804856cd38e7b575d9842ee33442a856a07cef",
-      "size": 31907
+      "sha256": "f51f1c6f7653d60d5eb9877b4a17f1d69fd6c75a0b65cf56c9c26767cd2378bf",
+      "size": 33488
     },
     "scripts/lease.mjs": {
       "sha256": "c380ec90c0b5cef4d010df4d59793f86f0dc319c82039997c3d8884a9e92f56e",
@@ -248,8 +272,12 @@
       "size": 3280
     },
     "scripts/daemon-observation.mjs": {
-      "sha256": "cef36ccf407d3c45c11ad796c709f05176faedc2af7adfdd0f618d306a03f459",
-      "size": 2349
+      "sha256": "2c36283c8e77ae0a77758bf65e5f80599d4ef409bb393adae527549c3994da73",
+      "size": 5665
+    },
+    "scripts/daemon-link-watch.mjs": {
+      "sha256": "081b8d30f883b4daef7f3e18f01ad46f999ee3a77c3cbce5be920a8dc50d963e",
+      "size": 2313
     },
     "scripts/ack-security.mjs": {
       "sha256": "bb769e874b6d4144b074596ba4c99dac4b6987b1e0e2967ffcf5fa73962e41a1",
@@ -259,9 +287,17 @@
       "sha256": "e373b1ff7801bde10c016cb5d24fefdec39382127008a5c359c804338bd5dc13",
       "size": 5282
     },
+    "scripts/daemon-contacts.mjs": {
+      "sha256": "f12cb7b790d677bab7f3e36434ef3b54a6274d16ac3c6f15bb6f86ca5c86e37f",
+      "size": 3190
+    },
+    "scripts/daemon-flush-tick.mjs": {
+      "sha256": "1d47a46549861d5ad60323e8db4fdf85c33d84c9fb786d4aa29cfc306dc8128c",
+      "size": 1239
+    },
     "scripts/wake-drain-claude.mjs": {
-      "sha256": "9f5d95c4242b56cd01b09e2198bb3dc4cbd819d8acf1bf664016f364279ca046",
-      "size": 22815
+      "sha256": "e32308b0f2840c760eacbf53fdccf0c9de8e22e150f29d1f7f22194e58777de6",
+      "size": 25611
     },
     "plugins/claude-code/.claude-plugin/plugin.json": {
       "sha256": "39743b9ea55f475c767dba430e1014fcfa19648e95ddcf0da9b0128f1744ec88",
@@ -292,8 +328,8 @@
       "size": 705
     },
     "bin/murmur-svc.exe": {
-      "sha256": "877f76eb7791c5a83b1a33dce0eaa7aa497eabdee2f877d750d695355cac76ab",
-      "size": 3128320
+      "sha256": "7bb31d2080d23c5e8bcf690f03560259e9ffd421b6e6c7b2ccffb61e9b03a760",
+      "size": 3145216
     }
   }
 }

package/runtime/package.json

@@ -1 +1 @@
-{"name":"murmur","private":true,"version":"2.11.0","engines":{"node":">=22.13.0"}}
+{"name":"murmur","private":true,"version":"2.12.0","engines":{"node":">=22.13.0"}}

package/runtime/packages/setup/bin/murmur.mjs

@@ -12,15 +12,17 @@ try { await checkRuntime(); }
 catch (error) { process.stderr.write(error.message + '\n'); process.exit(1); }
 // Dynamic imports let the capability check run before the engine imports SQLite.
 const { main, isRawCliOutput } = await import('../dist/src/cli.js');
-const { safeError } = await import('../dist/src/config.js');
+const { safeError, humanError } = await import('../dist/src/config.js');
 const lineMode = process.argv[2] === 'status' && process.argv.includes('--line');
 try {
   const result = await main(process.argv.slice(2));
-  if (isRawCliOutput(result)) {
+  if (!process.argv.includes('--json') && (result?.schema === 'murmur.invite/1' || result?.schema === 'murmur.join/1')) {
+    process.stdout.write((result.invitation ?? result.reply) + '\n');
+  } else if (isRawCliOutput(result)) {
     if (result.text) process.stdout.write(result.text + '\n');
   } else process.stdout.write(JSON.stringify(result) + '\n');
 } catch (error) {
   if (lineMode) process.stdout.write('Murmur: unknown (status.command-failed)\n');
-  process.stderr.write(safeError(error) + '\n');
+  process.stderr.write((process.argv.includes('--json') ? safeError(error) : humanError(error)) + '\n');
   process.exitCode = 1;
 }

package/runtime/packages/setup/dist/src/cli.d.ts

@@ -6,4 +6,4 @@ export interface RawCliOutput {
 }
 export declare const rawCliOutput: (text: string) => RawCliOutput;
 export declare const isRawCliOutput: (value: unknown) => value is RawCliOutput;
-export declare function main(args: string[], adapter?: PlatformAdapter): Promise<unknown>;
+export declare function main(args: string[], adapter?: PlatformAdapter, input?: AsyncIterable<Uint8Array | string>): Promise<unknown>;

package/runtime/packages/setup/dist/src/cli.js

@@ -1,6 +1,7 @@
 import { configureClient, previewClientConfiguration } from './clients.js';
 import { prepareReplyTest, checkReplyTest } from './reply-test.js';
 import { listOutboxAttention, setOutboxDismissed } from './outbox-attention.js';
+import { dismissWake } from './wake-attention.js';
 import { initialize, invite, join, importPeer } from './onboarding.js';
 import { runDoctor } from './doctor.js';
 import { parseArgs } from 'node:util';
@@ -34,7 +35,7 @@ export function platformAdapter() {
 export const rawCliOutput = (text) => ({ kind: 'raw', text });
 export const isRawCliOutput = (value) => !!value && typeof value === 'object'
     && value.kind === 'raw' && typeof value.text === 'string';
-export async function main(args, adapter = platformAdapter()) {
+export async function main(args, adapter = platformAdapter(), input = process.stdin) {
     // `murmur --version` is the first thing people type after npm install; answer it like `murmur version`.
     if (args.some(a => a === '--version' || a === '-v') && args.every(a => ['--version', '-v', '--json'].includes(a)))
         return readVersion();
@@ -42,8 +43,9 @@ export async function main(args, adapter = platformAdapter()) {
     try {
         parsed = parseArgs({ args, allowPositionals: true, options: {
                 'msg-id': { type: 'string' }, 'expected-state': { type: 'string' }, 'expected-agent': { type: 'string' },
-                'agent-id': { type: 'string' }, 'broker-url': { type: 'string' }, 'token-file': { type: 'string' }, 'invite-file': { type: 'string' }, 'reply-file': { type: 'string' }, 'reply-out': { type: 'string' }, out: { type: 'string' },
-                client: { type: 'string' }, replace: { type: 'boolean' }, 'plan-id': { type: 'string' }, 'test-token': { type: 'string' }, json: { type: 'boolean' }, line: { type: 'boolean' }, limit: { type: 'string' }, peer: { type: 'string' }, timeout: { type: 'string' }, 'data-dir': { type: 'string' }, 'service-name': { type: 'string' }, apply: { type: 'boolean' }, help: { type: 'boolean' },
+                'agent-id': { type: 'string' }, 'broker-url': { type: 'string' }, broker: { type: 'string' }, 'token-file': { type: 'string' }, 'invite-file': { type: 'string' }, 'reply-file': { type: 'string' }, 'reply-out': { type: 'string' }, out: { type: 'string' },
+                'invite-stdin': { type: 'boolean' }, 'reply-stdin': { type: 'boolean' },
+                client: { type: 'string' }, replace: { type: 'boolean' }, 'replace-previous': { type: 'boolean' }, 'plan-id': { type: 'string' }, 'test-token': { type: 'string' }, json: { type: 'boolean' }, line: { type: 'boolean' }, limit: { type: 'string' }, peer: { type: 'string' }, timeout: { type: 'string' }, 'data-dir': { type: 'string' }, 'service-name': { type: 'string' }, apply: { type: 'boolean' }, help: { type: 'boolean' },
             } });
     }
     catch (error) {
@@ -52,7 +54,7 @@ export async function main(args, adapter = platformAdapter()) {
     }
     const { values, positionals } = parsed;
     if (values.help || !positionals.length)
-        return { commands: ['version --json', 'updates check|enable|disable --json', 'init --agent-id ID --broker-url URL [--token-file FILE]', 'invite --out FILE', 'join --agent-id ID --invite-file FILE --reply-out FILE', 'add-peer --reply-file FILE', 'status --json|--line', 'doctor --json [--peer AGENT] [--timeout MILLISECONDS]', 'logs path --json', 'service install|start|stop|uninstall', 'clients detect', 'clients preview --client ID', 'clients configure --client ID [--replace] [--plan-id SHA256]', 'reply-test prepare --peer AGENT', 'reply-test check --test-token TOKEN', 'wake pause|resume [--apply]', 'inbox read [--limit 1..100]', 'inbox mark-read', 'outbox list --json', 'outbox dismiss|restore --msg-id ID --expected-state TOKEN --expected-agent ID', 'mcp serve --data-dir ABSOLUTE'],
+        return { commands: ['version --json', 'updates check|enable|disable --json', 'init --agent-id ID --broker-url URL [--token-file FILE]', 'invite [--out FILE] [--broker PUBLIC_URL] [--json]', 'join --agent-id ID (--invite-stdin|--invite-file FILE) [--reply-out FILE] [--json]', 'add-peer (--reply-stdin|--reply-file FILE)', 'status --json|--line', 'doctor --json [--peer AGENT] [--timeout MILLISECONDS]', 'logs path --json', 'service install [--replace-previous]|start|stop|uninstall', 'clients detect', 'clients preview --client ID', 'clients configure --client ID [--replace] [--plan-id SHA256]', 'reply-test prepare --peer AGENT', 'reply-test check --test-token TOKEN', 'wake pause|resume [--apply]', 'wake dismiss --msg-id ID --expected-agent ID', 'inbox read [--limit 1..100]', 'inbox mark-read', 'outbox list --json', 'outbox dismiss|restore --msg-id ID --expected-state TOKEN --expected-agent ID', 'mcp serve --data-dir ABSOLUTE'],
             options: ['--data-dir ABSOLUTE', '--service-name NAME'], note: 'Windows service mutations require an elevated terminal and the matching native helper.' };
     const [command, action, extra] = positionals;
     if (extra)
@@ -72,12 +74,34 @@ export async function main(args, adapter = platformAdapter()) {
         throw new Error('cli.required-option:' + name); return value; };
     if (command === 'init' && !action)
         return initialize(context, { agentId: required('agent-id'), brokerUrl: required('broker-url'), tokenFile: values['token-file'] });
+    const onboardingInput = async (kind) => {
+        if (values[`${kind}-file`] !== undefined && values[`${kind}-stdin`])
+            throw new Error('onboarding.input-conflict');
+        if (!values[`${kind}-stdin`]) {
+            if (!values[`${kind}-file`])
+                throw new Error('onboarding.input-required');
+            return undefined;
+        }
+        if (input === process.stdin && process.stdin.isTTY)
+            throw new Error('onboarding.stdin-required');
+        const chunks = [];
+        let size = 0;
+        for await (const chunk of input) {
+            const bytes = Buffer.from(chunk);
+            size += bytes.length;
+            if (size > 16384)
+                throw new Error('onboarding.input-too-large');
+            chunks.push(bytes);
+        }
+        return Buffer.concat(chunks).toString('utf8');
+    };
     if (command === 'invite' && !action)
-        return invite(context, required('out'));
+        return invite(context, values.out, { brokerUrl: values.broker });
     if (command === 'join' && !action)
-        return join(context, { agentId: required('agent-id'), inviteFile: required('invite-file'), replyOut: required('reply-out') });
+        return join(context, { agentId: required('agent-id'), inviteFile: values['invite-file'],
+            invitation: await onboardingInput('invite'), replyOut: values['reply-out'] });
     if (command === 'add-peer' && !action)
-        return importPeer(context, required('reply-file'));
+        return importPeer(context, values['reply-file'], await onboardingInput('reply'));
     if (command === 'status' && !action) {
         const status = await readStatus({ context, adapter });
         return values.line ? rawCliOutput(renderStatusLine(status)) : status;
@@ -97,8 +121,11 @@ export async function main(args, adapter = platformAdapter()) {
         return rawCliOutput('');
     }
     if (command === 'logs' && action === 'path') {
-        if (process.platform === 'win32')
-            throw new Error('logs.windows-native-location-unavailable');
+        if (process.platform === 'win32') {
+            if (!adapter.logDirectory)
+                throw new Error('logs.windows-native-location-unavailable');
+            return readLogPath(context, adapter);
+        }
         return readLogPath(context);
     }
     if (command === 'doctor' && !action)
@@ -115,11 +142,24 @@ export async function main(args, adapter = platformAdapter()) {
         return checkReplyTest(context, required('test-token'));
     if (command === 'wake' && ['pause', 'resume'].includes(action))
         return setWakeEnabled(context, adapter, action === 'resume', values.apply);
+    if (command === 'wake' && action === 'dismiss')
+        return dismissWake(context, required('msg-id'), required('expected-agent'));
     if (command === 'inbox' && action === 'read')
         return readInbox(context, values.limit === undefined ? 20 : Number(values.limit));
     if (command === 'inbox' && action === 'mark-read')
         return markInboxRead(context);
     if (command === 'service' && ['install', 'start', 'stop', 'uninstall'].includes(action)) {
+        if (values['replace-previous']) {
+            // One elevated command: remove the previous installation's Service, then install this one.
+            if (action !== 'install')
+                throw new Error('cli.replace-previous-only-for-install');
+            if (!adapter.removePrevious)
+                throw new Error('service.replace-previous-unavailable');
+            await adapter.removePrevious(context);
+        }
+        // Evaluated after a removal, so a process that outlived the removed Service still blocks install.
+        if ((await readStatus({ context, adapter })).service.state === 'running-unmanaged')
+            throw new Error('service.running-unmanaged');
         const operation = adapter[action];
         if (!operation)
             throw new Error('service.uninstall-unavailable');

package/runtime/packages/setup/dist/src/clients.js

@@ -69,7 +69,9 @@ const hookPath = (value) => `"${value.replaceAll('\\', '/')}"`;
 const WAKE_WINDOW_SECONDS = 28800;
 /** The node wake drain (docs/wake-native.md): polls the store after each turn and wakes the session. */
 function desiredWakeHook(c) {
-    return { type: 'command', asyncRewake: true,
+    // Claude Code ends a hook without its own `timeout` after 600 s (hooks reference, asyncRewake);
+    // the entry carries the same window the drain script is asked for, or the script never gets it.
+    return { type: 'command', asyncRewake: true, timeout: WAKE_WINDOW_SECONDS,
         command: `${hookPath(c.nodePath)} --no-warnings ${hookPath(path.join(c.repoRoot, 'scripts', 'wake-drain-claude.mjs'))} --db ${hookPath(c.storePath)} --max-seconds ${WAKE_WINDOW_SECONDS}` };
 }
 const isMurmurWakeHook = (hook) => object(hook) && typeof hook.command === 'string' && hook.command.includes('wake-drain-claude');
@@ -150,8 +152,12 @@ function desiredEntry(c) {
 async function planFor(c, client, current, settings) {
     const config = await loadConfig(c), { original, key } = clientDocument(client, current.text);
     const entry = desiredEntry(c), previous = original[key]?.murmur;
-    const action = isDeepStrictEqual(previous, entry) ? 'unchanged' : previous === undefined ? 'add' : 'replace';
+    const entryAction = isDeepStrictEqual(previous, entry) ? 'unchanged' : previous === undefined ? 'add' : 'replace';
     const wakeHook = settings && { settingsPath: claudeSettingsPath(client.configPath), action: planWakeHook(c, settings.text).action };
+    // The plan's action speaks for both files: an app that sees 'replace' asks the person and
+    // passes --replace, so a Stop hook written by an earlier version (no timeout, #273) is
+    // upgraded instead of failing with client.wake-hook-conflict while the MCP entry is unchanged.
+    const action = wakeHook?.action === 'replace' ? 'replace' : entryAction === 'unchanged' && wakeHook?.action === 'add' ? 'add' : entryAction;
     // Bind confirmation to the target, exact bytes and selected identity/runtime.
     // No existing commands, environment values, auth or config contents leave the engine.
     const planId = createHash('sha256').update(JSON.stringify([client.id, client.configPath, current,

package/runtime/packages/setup/dist/src/commands.d.ts

@@ -1,6 +1,6 @@
 import type { PlatformAdapter, ServiceContext } from './types.js';
 /** Observe the configured directory only; this does not prove a live daemon's log destination. */
-export declare function readLogPath(context: ServiceContext): Promise<{
+export declare function readLogPath(context: ServiceContext, adapter?: PlatformAdapter): Promise<{
     schema: string;
     agentId: string;
     dataDir: string;
@@ -30,6 +30,8 @@ export declare function readInbox(context: ServiceContext, limit?: number): Prom
     readCursor: number | null;
     unread: number | null;
     messages: {
+        assistantRead: boolean | null;
+        wake_error: string | null;
         unread: boolean | null;
     }[];
 }>;