@ours.network/mcp 1.2.0-nightly.4 → 1.2.0-nightly.5

package/README.md

@@ -3,8 +3,8 @@
 The agent-facing MCP adapter for the shared ours daemon.
 
 `ours-mcp` does not contain, start, configure, or install a daemon. Install
-`@ours.network/cli@2.2.0`, configure it with `ours config setup`, and start the
-single shared service with `ours daemon start` (or `ours daemon install-service`).
+`@ours.network/daemon`, configure it with `ours-daemon config setup`, and start the
+single shared service with `ours-daemon start` (or `ours-daemon install-service`).
 
 ## MCP configuration
 
@@ -28,37 +28,16 @@ Legacy daemon variables such as `OURS_AUTOSTART`, `OURS_TRANSPORT`, and
 `OURS_UNIT_DIR` are rejected. Named `--application` selections are also rejected;
 use the SDK daemon selection variables instead.
 
-For an installer-selected server profile, `@ours.network/cli` loads the fixed
-`@ours.network/mcp/network-integration` export and mounts these tools on the
-daemon's existing authenticated `/mcp` listener. The installer writes one
-`networkMcp` object in the daemon config:
+The plugins include `@ours.network/mcp` and launch its local stdio server.
+Tools call the selected daemon through `@ours.network/sdk` using the existing
+authenticated HTTP API. The profile contains `endpoint`, `expectedInstanceId`,
+and `credentialPath`; the endpoint can be localhost or a remote origin.
+No remote MCP endpoint is used. The daemon does not need the MCP package.
 
-```json
-{
-  "networkMcp": {
-    "profile": {
-      "endpoint": "http://127.0.0.1:3050",
-      "expectedInstanceId": "56bd6f1f-2df1-4844-9a46-d558c021e00f",
-      "credentialPath": "/private/ours/server-client-token"
-    },
-    "applicationConfigPath": "/private/ours/application-identities.json"
-  }
-}
-```
-
-The profile credential is an issued client credential. The integration never
-reads the server's master secret, starts another listener, or attaches before
-the first tool call. It exposes the selected instance's application names at
-`ours://application-identities` and keeps arrival watches scoped to each real
-MCP transport.
-
-In this network mode, a host bridge stages `send_file.path` through the SDK byte
-upload route. `save_file` returns an `oursHostSave` intent for that bridge, and
-final success is produced only after the host has downloaded and written the
-bytes. The shared profile, native-owner-record and file-adapter source lives in
-`src/host-client/` so client packages can bundle it into their own entrypoints.
-Native records receive their host-private root explicitly; they do not derive a
-client path from the server application config.
+Local file paths are interpreted by the local MCP process: `send_file` uploads
+local bytes through the SDK, `save_file` downloads to local disk, and
+`define_local_identity_file` writes the local workspace file. Native session
+records and application identity visibility remain on the client host.
 
 Host-client helpers select explicit `OURS_CONFIG` first, otherwise the private
 `~/.ours-client/profile.json` when present, otherwise their existing unmanaged
@@ -116,8 +95,8 @@ names remain recorded but are not rendered; idempotent close/remove cleans them.
 ## Compatibility CLI
 
 Former ours-mcp lifecycle entry points remain compatibility aliases that
-delegate argv, stdio, and exit status to `ours daemon`. The `ours` executable
-must be on `PATH`, or its exact path may be provided through `OURS_CLI`. No
+delegate argv, stdio, and exit status to `ours-daemon`. The `ours-daemon` executable
+must be on `PATH`, or its exact path may be provided through `OURS_DAEMON_CLI`. No
 command falls back to an embedded daemon.
 
 `ours-mcp watch [identity]` streams inbound JSON Lines. With no identity argument,
@@ -139,9 +118,10 @@ that finds old packet state refuses startup without changing it. Operators may
 back it up and must remove it themselves before starting clean; installers never
 delete identity state implicitly.
 
-The external-history and typed-command integration requires the published `@ours.network/sdk@3.7.0`
-and `@ours.network/cli@2.2.0` artifacts. Both are pinned exactly so registry-only
-installs use the validated contract; there is no compatibility fallback.
+The SDK dependency is pinned to the published thin client `3.8.1-nightly.9`.
+Native integration tests use `@ours.network/daemon@3.8.1-nightly.1` as a development
+dependency. Production MCP installs do not include a daemon; operators install
+and manage `ours-daemon` separately.
 
 ## Typed commands
 

package/dist/cli.js

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
-import{spawn as Gt}from"node:child_process";import{readFileSync as Vt,realpathSync as V}from"node:fs";import{fileURLToPath as Wt}from"node:url";import{attachOursClient as B,resolveDaemonConfig as Yt}from"@ours.network/sdk";import{randomUUID as z}from"node:crypto";import{chmod as X,mkdir as Q,readFile as Z,rename as tt,unlink as et,writeFile as nt}from"node:fs/promises";import{homedir as rt}from"node:os";import{dirname as it,resolve as u}from"node:path";var R=1,ot="OURS_MCP_CONFIG",T=/^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/,st=()=>({version:1,daemons:{},instances:{}});function v(t=process.env){let e=(t[ot]??"").trim();return u(e||u(rt(),".ours-mcp","config.json"))}function x(t,e,n,r){if(!t||typeof t!="object"||Array.isArray(t))throw new Error(`Invalid ours-mcp application identity config at ${e}: "${n}s" must be an object.`);let i={};for(let[o,s]of Object.entries(t)){if(!s||typeof s!="object"||Array.isArray(s))throw new Error(`Invalid ours-mcp application identity config at ${e}: ${n} ${JSON.stringify(o)} must be an object.`);let a=s;if(!Array.isArray(a.identities)||a.identities.some(l=>typeof l!="string"||l.length===0))throw new Error(`Invalid ours-mcp application identity config at ${e}: ${n} ${JSON.stringify(o)} has an invalid identity list.`);i[r(o)]={identities:[...new Set(a.identities)].sort()}}return i}function at(t,e){let n;try{n=JSON.parse(t)}catch(s){throw new Error(`Invalid ours-mcp application identity config at ${e}: ${String(s)}`)}if(!n||typeof n!="object"||Array.isArray(n))throw new Error(`Invalid ours-mcp application identity config at ${e}: expected an object.`);let r=n;if(r.version!==R)throw new Error(`Unsupported ours-mcp application identity config version at ${e}: expected ${R}, found ${String(r.version)}.`);let i=x(r.daemons,e,"daemon",u),o=r.instances===void 0?{}:x(r.instances,e,"instance",s=>{if(!T.test(s))throw new Error(`Invalid ours-mcp application identity config at ${e}: instance ${JSON.stringify(s)} must be a lowercase UUID.`);return s});return{version:1,daemons:i,instances:o}}async function y(t){try{return at(await Z(t,"utf8"),t)}catch(e){if(e.code==="ENOENT")return st();throw e}}async function _(t,e){let n=it(t);await Q(n,{recursive:!0,mode:448});let r=`${t}.${process.pid}.${z()}.tmp`;try{await nt(r,`${JSON.stringify(e,null,2)}
-`,{mode:384,flag:"wx"}),await tt(r,t),await X(t,384)}catch(i){try{await et(r)}catch{}throw i}}var f=class{stateDir;instanceId;path;constructor(e,n={}){if(typeof e=="string")this.stateDir=u(e),this.instanceId=null;else{if(!e||!T.test(e.instanceId))throw new Error("Application identity instanceId must be a lowercase UUID.");this.stateDir=null,this.instanceId=e.instanceId}this.path=u(n.path??v(n.env))}rows(e){return this.instanceId===null?e.daemons:e.instances}key(){return this.instanceId??this.stateDir}async list(){let e=await y(this.path);return[...this.rows(e)[this.key()]?.identities??[]]}async has(e){return(await this.list()).includes(e)}async add(e){if(!e)throw new Error("Cannot add an empty identity name to ours-mcp.");let n=await y(this.path),r=this.rows(n),i=this.key(),o=r[i]?.identities??[];o.includes(e)||(r[i]={identities:[...o,e].sort()},await _(this.path,n))}async remove(e){let n=await y(this.path),r=this.rows(n),i=this.key(),o=r[i];if(!o?.identities.includes(e))return;let s=o.identities.filter(a=>a!==e);s.length===0?delete r[i]:r[i]={identities:s},await _(this.path,n)}};async function $(t,e){let n=new Set(await t.list());return e.filter(r=>n.has(r.name))}import{existsSync as ct,lstatSync as U,readFileSync as dt}from"node:fs";import{homedir as A}from"node:os";import{resolve as m}from"node:path";var I=["endpoint","expectedInstanceId","credentialPath"],lt=["port","stateDir","apiToken","apiVisibility"],pt=/^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/,ut=["OURS_API_TOKEN","OURS_PORT","OURS_STATE_DIR","OURS_DAEMON_ID"];function d(t){return new Error(`Invalid external host profile: ${t}`)}function E(t){if(!t||typeof t!="object"||Array.isArray(t))throw d("expected a complete host profile object.");let e=t;if(I.filter(l=>Object.hasOwn(e,l)).length!==I.length)throw d("expected a complete host profile tuple: endpoint, expectedInstanceId, credentialPath.");let r=lt.filter(l=>Object.hasOwn(e,l));if(r.length)throw d(`legacy selection keys cannot be mixed with a host profile (${r.join(", ")}).`);let i=e.endpoint,o=e.expectedInstanceId,s=e.credentialPath;if(typeof i!="string"||i.trim()!==i||i==="")throw d("endpoint must be a non-empty HTTP or HTTPS origin.");if(typeof o!="string"||!pt.test(o))throw d("expectedInstanceId must be a lowercase UUID.");if(typeof s!="string"||s===""||!s.startsWith("/")||m(s)!==s)throw d("credentialPath must be a normalized absolute path.");let a;try{a=new URL(i)}catch{throw d("endpoint must be an HTTP or HTTPS origin.")}if(a.protocol!=="http:"&&a.protocol!=="https:"||a.username||a.password||a.pathname!=="/"||a.search||a.hash)throw d("endpoint must be an HTTP or HTTPS origin without credentials, path, query, or fragment.");return{endpoint:a.origin,expectedInstanceId:o,credentialPath:s}}function ft(t){let e;try{e=dt(t,"utf8")}catch{throw new Error(`Cannot read host profile ${JSON.stringify(t)}.`)}let n;try{n=JSON.parse(e)}catch{throw d(`config ${JSON.stringify(t)} is not valid JSON.`)}if(!n||typeof n!="object"||Array.isArray(n))throw d(`config ${JSON.stringify(t)} must be an object.`);return n}function mt(t){let e;try{e=U(t)}catch{throw new Error(`Cannot read host profile ${JSON.stringify(t)}.`)}if(!e.isFile())throw d(`config ${JSON.stringify(t)} must be a regular file.`);let n=process.getuid?.();if(n===void 0||e.uid!==n)throw d(`config ${JSON.stringify(t)} must be owned by the current user.`);if(e.mode&63)throw d(`config ${JSON.stringify(t)} must have private permissions.`)}function wt(t){let e=ft(t);return I.filter(r=>Object.hasOwn(e,r)).length===0?null:(mt(t),E(e))}function ht(t,e){return(t[e]??"").trim()!==""}function gt(t=process.env){let e=(t.OURS_CONFIG??"").trim(),n=m(t.HOME||A(),".ours-client","profile.json"),r=e;if(!r)try{U(n),r=n}catch(s){if(s.code!=="ENOENT")throw new Error(`Cannot read host profile ${JSON.stringify(n)}.`);if(r=m(A(),".ours","config.json"),!ct(r))return null}let i=wt(r);if(i===null){if(m(r)===n)throw d("managed client config must contain a complete host profile tuple.");return null}let o=ut.filter(s=>ht(t,s));if(o.length)throw d(`${o.join(", ")} conflicts with host-profile mode.`);return{profile:i,configPath:r}}function S(t=process.env){return gt(t)?.profile??null}import{createHash as bt,randomUUID as Ct}from"node:crypto";import{chmod as j,mkdir as Rt,readFile as xt,rename as _t,unlink as Tt,writeFile as $t}from"node:fs/promises";import{dirname as H,join as At,resolve as Ut}from"node:path";import{attachOursClient as kt}from"@ours.network/sdk";import{createHash as yt}from"node:crypto";import{openSync as vt,closeSync as It,lstatSync as N,mkdirSync as Et,chmodSync as St,constants as w}from"node:fs";import{join as k}from"node:path";import{createRequire as D}from"node:module";var Nt=5e3,p=null,L=!1;function Ot(){if(p)return p;if(L)throw new Error("No SQLite implementation available for native session guard");L=!0;try{return p=D(import.meta.url)("node:sqlite").DatabaseSync,p}catch{try{let t=D(import.meta.url)("better-sqlite3");return p=t.default??t,p}catch{throw new Error("Native session guard requires node:sqlite (Node >=22.13) or better-sqlite3")}}}function Pt(t){try{let n=vt(t,w.O_RDWR|w.O_CREAT|w.O_EXCL|w.O_NOFOLLOW,384);It(n)}catch(n){if(n.code!=="EEXIST")throw n}let e=N(t);if(!e.isFile()||e.uid!==process.getuid()||e.mode&63||e.nlink!==1)throw new Error("Native session guard file must be an owner-only regular file")}function J(t){let e=process.getuid(),n=k(`/tmp/ours-${e}`,"session-guards");Et(n,{recursive:!0,mode:448});try{St(n,448)}catch{}let r=yt("sha256").update(t).digest("hex"),i=k(n,`${r}.guard`);Pt(i);let o=N(i),s=Ot(),a=new s(i);try{let l=N(i);if(o.dev!==l.dev||o.ino!==l.ino||o.mode!==l.mode||o.uid!==l.uid)throw new Error("Native session guard file changed during acquisition");return a.exec(`PRAGMA busy_timeout=${Nt}; BEGIN EXCLUSIVE`),()=>{try{a.close()}catch{}}}catch(l){try{a.close()}catch{}throw l}}var P=1,F=/^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/,O=new Map,h=new Map;function Dt(t){if(typeof t!="string"||t.length===0||t.length>4096||t.trim()!==t||t.includes("\0"))throw new Error("Native session metadata is missing or invalid for this host-profile tool call.");return t}function Lt(t,e,n){if(!t||!t.startsWith("/")||Ut(t)!==t)throw new Error("Native session host record root must be a normalized absolute path.");if(!F.test(e))throw new Error("Native session daemon instance must be a lowercase UUID.");let r=bt("sha256").update(Dt(n),"utf8").digest("hex");return At(t,"sessions",e,`${r}.json`)}function Jt(t,e){let n;try{n=JSON.parse(t)}catch(o){throw new Error(`Invalid native session record at ${e}: ${String(o)}`)}if(!n||typeof n!="object"||Array.isArray(n))throw new Error(`Invalid native session record at ${e}: expected an object.`);let r=n;if(Object.keys(r).sort().join(",")!=="ownerInstanceId,state,version"||r.version!==P||typeof r.ownerInstanceId!="string"||!F.test(r.ownerInstanceId)||!["active","pending","ended"].includes(String(r.state)))throw new Error(`Invalid native session record at ${e}.`);return r}async function M(t){try{return Jt(await xt(t,"utf8"),t)}catch(e){if(e.code==="ENOENT")return null;throw e}}async function q(t,e){let n=H(t);await Rt(n,{recursive:!0,mode:448}),await j(n,448);let r=`${t}.${process.pid}.${Ct()}.tmp`;try{await $t(r,`${JSON.stringify(e,null,2)}
-`,{mode:384,flag:"wx"}),await _t(r,t),await j(t,384)}catch(i){try{await Tt(r)}catch{}throw i}}async function jt(t,e){let n=h.get(t)??Promise.resolve(),r,i=new Promise(a=>{r=a}),o=n.catch(()=>{}).then(()=>i);h.set(t,o),await n.catch(()=>{});let s;try{return s=J(t),await e()}finally{try{s?.()}finally{r(),h.get(t)===o&&h.delete(t)}}}function Ht(t,e){return kt({endpoint:t.endpoint,expectedInstanceId:t.expectedInstanceId,credentialPath:t.credentialPath,sessionMode:"external",leaseToken:e,env:{}})}async function Ft(t,e,n){let r=O.get(t),i=r?.ownerInstanceId===n?await r.promise:await Ht(e,n);try{await i.releaseLease()}finally{r?.ownerInstanceId!==n&&await i.close()}}async function Mt(t,e,n){await Ft(t,e,n);let r=await M(t);r?.state==="pending"&&r.ownerInstanceId===n&&await q(t,{version:P,ownerInstanceId:n,state:"ended"});let i=O.get(t);i?.ownerInstanceId===n&&(O.delete(t),i.promise.then(o=>o.close()).catch(()=>{}))}async function G(t,e,n=process.env){return qt(t,e,H(v(n)))}async function qt(t,e,n){let r=E(t),i=Lt(n,r.expectedInstanceId,e);await jt(i,async()=>{let o=await M(i);o===null||o.state==="ended"||(o.state==="active"&&(o={version:P,ownerInstanceId:o.ownerInstanceId,state:"pending"},await q(i,o)),await Mt(i,r,o.ownerInstanceId))})}var b="1.2.0-nightly.4",c=t=>{process.stdout.write(`${t}
-`)},K=t=>{process.stderr.write(`${t}
-`)},W=t=>Number.isInteger(t)&&t>1,Y=Number(process.env.OURS_CLIENT_PID),g=W(Y)?Y:W(process.ppid)?process.ppid:process.pid,C=(process.env.CLAUDE_CODE_SESSION_ID??"").trim()||`ours-mcp:${g}`,Bt=(process.env.OURS_BIND_IDENTITY??"").trim()||void 0,Kt=new Set(["start","stop","restart","serve","run","status","install-service","uninstall-service"]);function zt(t){if(t.some(e=>e==="--application"||e.startsWith("--application=")))throw new Error("`--application` is no longer supported. ours-mcp connects to one coherently selected shared daemon; use OURS_CONFIG or a matching OURS_PORT + OURS_STATE_DIR selection.")}async function Xt(t){let n=(process.env.OURS_CLI??"").trim()||"ours";await new Promise((r,i)=>{let o=Gt(n,t,{stdio:"inherit",env:process.env});o.once("error",s=>{if(s.code==="ENOENT"){i(new Error(`Cannot find the ${JSON.stringify(n)} CLI. Install @ours.network/cli@2.7.2, put \`ours\` on PATH, or set OURS_CLI to its executable path.`));return}i(s)}),o.once("exit",(s,a)=>{if(a){process.kill(process.pid,a);return}process.exitCode=s??1,r()})})}async function Qt(){let t=new URL("./connector.js",import.meta.url),{runConnector:e}=await import(t.href);await e({leaseToken:C,clientPid:g,version:b,bindIdentity:Bt})}async function Zt(){let t=S(process.env);if(t!==null){let n;try{n=JSON.parse(Vt(0,"utf8"))}catch{throw new Error("SessionEnd requires valid hook JSON on stdin.")}let r=n?.session_id;if(typeof r!="string"||!r.trim())throw new Error("SessionEnd hook input must contain a non-empty session_id.");await G(t,r,process.env);return}await(await B({leaseToken:C,clientPid:g})).releaseLease()}function te(t,e){return JSON.stringify({identity:t,...e})}async function ee(t,e,n){for await(let r of t.watchNotifications(e,{kinds:["inbound"],signal:n}))c(te(e,r))}async function ne(t){if(t.length>1||t[0]?.startsWith("-"))throw new Error("Usage: ours-mcp watch [identity]");if(S(process.env)!==null)throw new Error("External owner context is required.");let e=Yt(),n=new f(e.expectStateDir);await n.list();let r=await B({leaseToken:C,clientPid:g}),i=t[0]?.trim(),o;i?o=[i]:o=(await $(n,await r.identities())).map(a=>a.name);let s=new AbortController;process.once("SIGINT",()=>s.abort()),process.once("SIGTERM",()=>s.abort()),K(`ours-mcp watch: ${o.length===0?"no application identities":`watching ${o.join(", ")}`}`),await Promise.all(o.map(a=>ee(r,a,s.signal)))}function re(){c(`ours-mcp ${b} \u2014 MCP adapter for the shared ours daemon`),c(""),c("Usage: ours-mcp <command> [options]"),c("  proxy                 run the stdio MCP server (never starts a daemon)"),c("  session-end           release this harness session and clean up its temporary identities"),c("  watch [identity]      stream inbound JSON Lines; without a name, only ours-mcp identities"),c("  start|stop|restart|serve|status"),c("  install-service|uninstall-service"),c("                        compatibility aliases for `ours daemon <command>`"),c("  version               print the ours-mcp package version"),c(""),c("Daemon configuration and identity CLI operations moved to @ours.network/cli@2.7.2:"),c("  ours config setup"),c("  ours identity --help")}async function ie(){let t=process.argv.slice(2);zt(t);let e=t.shift()??"help";if(Kt.has(e)){await Xt(["daemon",e==="run"?"serve":e,...t]);return}switch(e){case"proxy":if(t.length)throw new Error("Usage: ours-mcp proxy");await Qt();return;case"session-end":if(t.length)throw new Error("Usage: ours-mcp session-end");await Zt();return;case"watch":await ne(t);return;case"setup":throw new Error("ours-mcp no longer owns daemon configuration. Run `ours config setup` instead.");case"create-root":case"define-local-identity-file":case"voice-setup":case"voice-status":case"stt-setup":case"stt-status":throw new Error(`ours-mcp ${e} moved to the \`ours\` CLI. Run \`ours --help\` for the typed replacement.`);case"version":case"--version":case"-v":c(b);return;case"help":case"--help":case"-h":re();return;default:throw new Error(`Unknown command ${JSON.stringify(e)}. Run \`ours-mcp --help\`.`)}}function oe(){if(!process.argv[1])return!1;try{return V(process.argv[1])===V(Wt(import.meta.url))}catch{return!1}}var se=oe();se&&ie().catch(t=>{K(`ours-mcp error: ${t instanceof Error?t.message:String(t)}`),process.exitCode=1});
+import{spawn as Yt}from"node:child_process";import{readFileSync as Bt,realpathSync as Q}from"node:fs";import{fileURLToPath as Kt}from"node:url";import{attachOursClient as et,resolveDaemonConfig as zt}from"@ours.network/sdk";import{randomUUID as rt}from"node:crypto";import{chmod as it,mkdir as ot,readFile as st,rename as at,unlink as ct,writeFile as dt}from"node:fs/promises";import{homedir as lt}from"node:os";import{dirname as pt,resolve as f}from"node:path";var T=1,ut="OURS_MCP_CONFIG",D=/^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/,ft=()=>({version:1,daemons:{},instances:{}});function w(t=process.env){let e=(t[ut]??"").trim();return f(e||f(lt(),".ours-mcp","config.json"))}function A(t,e,n,r){if(!t||typeof t!="object"||Array.isArray(t))throw new Error(`Invalid ours-mcp application identity config at ${e}: "${n}s" must be an object.`);let i={};for(let[o,s]of Object.entries(t)){if(!s||typeof s!="object"||Array.isArray(s))throw new Error(`Invalid ours-mcp application identity config at ${e}: ${n} ${JSON.stringify(o)} must be an object.`);let a=s;if(!Array.isArray(a.identities)||a.identities.some(l=>typeof l!="string"||l.length===0))throw new Error(`Invalid ours-mcp application identity config at ${e}: ${n} ${JSON.stringify(o)} has an invalid identity list.`);i[r(o)]={identities:[...new Set(a.identities)].sort()}}return i}function mt(t,e){let n;try{n=JSON.parse(t)}catch(s){throw new Error(`Invalid ours-mcp application identity config at ${e}: ${String(s)}`)}if(!n||typeof n!="object"||Array.isArray(n))throw new Error(`Invalid ours-mcp application identity config at ${e}: expected an object.`);let r=n;if(r.version!==T)throw new Error(`Unsupported ours-mcp application identity config version at ${e}: expected ${T}, found ${String(r.version)}.`);let i=A(r.daemons,e,"daemon",f),o=r.instances===void 0?{}:A(r.instances,e,"instance",s=>{if(!D.test(s))throw new Error(`Invalid ours-mcp application identity config at ${e}: instance ${JSON.stringify(s)} must be a lowercase UUID.`);return s});return{version:1,daemons:i,instances:o}}async function O(t){try{return mt(await st(t,"utf8"),t)}catch(e){if(e.code==="ENOENT")return ft();throw e}}async function $(t,e){let n=pt(t);await ot(n,{recursive:!0,mode:448});let r=`${t}.${process.pid}.${rt()}.tmp`;try{await dt(r,`${JSON.stringify(e,null,2)}
+`,{mode:384,flag:"wx"}),await at(r,t),await it(t,384)}catch(i){try{await ct(r)}catch{}throw i}}var m=class{stateDir;instanceId;path;constructor(e,n={}){if(typeof e=="string")this.stateDir=f(e),this.instanceId=null;else{if(!e||!D.test(e.instanceId))throw new Error("Application identity instanceId must be a lowercase UUID.");this.stateDir=null,this.instanceId=e.instanceId}this.path=f(n.path??w(n.env))}rows(e){return this.instanceId===null?e.daemons:e.instances}key(){return this.instanceId??this.stateDir}async list(){let e=await O(this.path);return[...this.rows(e)[this.key()]?.identities??[]]}async has(e){return(await this.list()).includes(e)}async add(e){if(!e)throw new Error("Cannot add an empty identity name to ours-mcp.");let n=await O(this.path),r=this.rows(n),i=this.key(),o=r[i]?.identities??[];o.includes(e)||(r[i]={identities:[...o,e].sort()},await $(this.path,n))}async remove(e){let n=await O(this.path),r=this.rows(n),i=this.key(),o=r[i];if(!o?.identities.includes(e))return;let s=o.identities.filter(a=>a!==e);s.length===0?delete r[i]:r[i]={identities:s},await $(this.path,n)}};async function U(t,e){let n=new Set(await t.list());return e.filter(r=>n.has(r.name))}import{existsSync as wt,lstatSync as L,readFileSync as ht}from"node:fs";import{homedir as k}from"node:os";import{resolve as h}from"node:path";var N=["endpoint","expectedInstanceId","credentialPath"],gt=["port","stateDir","apiToken","apiVisibility"],yt=/^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/,vt=["OURS_API_TOKEN","OURS_PORT","OURS_STATE_DIR","OURS_DAEMON_ID"];function d(t){return new Error(`Invalid external host profile: ${t}`)}function g(t){if(!t||typeof t!="object"||Array.isArray(t))throw d("expected a complete host profile object.");let e=t;if(N.filter(l=>Object.hasOwn(e,l)).length!==N.length)throw d("expected a complete host profile tuple: endpoint, expectedInstanceId, credentialPath.");let r=gt.filter(l=>Object.hasOwn(e,l));if(r.length)throw d(`legacy selection keys cannot be mixed with a host profile (${r.join(", ")}).`);let i=e.endpoint,o=e.expectedInstanceId,s=e.credentialPath;if(typeof i!="string"||i.trim()!==i||i==="")throw d("endpoint must be a non-empty HTTP or HTTPS origin.");if(typeof o!="string"||!yt.test(o))throw d("expectedInstanceId must be a lowercase UUID.");if(typeof s!="string"||s===""||!s.startsWith("/")||h(s)!==s)throw d("credentialPath must be a normalized absolute path.");let a;try{a=new URL(i)}catch{throw d("endpoint must be an HTTP or HTTPS origin.")}if(a.protocol!=="http:"&&a.protocol!=="https:"||a.username||a.password||a.pathname!=="/"||a.search||a.hash)throw d("endpoint must be an HTTP or HTTPS origin without credentials, path, query, or fragment.");return{endpoint:a.origin,expectedInstanceId:o,credentialPath:s}}function It(t){let e;try{e=ht(t,"utf8")}catch{throw new Error(`Cannot read host profile ${JSON.stringify(t)}.`)}let n;try{n=JSON.parse(e)}catch{throw d(`config ${JSON.stringify(t)} is not valid JSON.`)}if(!n||typeof n!="object"||Array.isArray(n))throw d(`config ${JSON.stringify(t)} must be an object.`);return n}function Et(t){let e;try{e=L(t)}catch{throw new Error(`Cannot read host profile ${JSON.stringify(t)}.`)}if(!e.isFile())throw d(`config ${JSON.stringify(t)} must be a regular file.`);let n=process.getuid?.();if(n===void 0||e.uid!==n)throw d(`config ${JSON.stringify(t)} must be owned by the current user.`);if(e.mode&63)throw d(`config ${JSON.stringify(t)} must have private permissions.`)}function St(t){let e=It(t);return N.filter(r=>Object.hasOwn(e,r)).length===0?null:(Et(t),g(e))}function Ot(t,e){return(t[e]??"").trim()!==""}function Nt(t=process.env){let e=(t.OURS_CONFIG??"").trim(),n=h(t.HOME||k(),".ours-client","profile.json"),r=e;if(!r)try{L(n),r=n}catch(s){if(s.code!=="ENOENT")throw new Error(`Cannot read host profile ${JSON.stringify(n)}.`);if(r=h(k(),".ours","config.json"),!wt(r))return null}let i=St(r);if(i===null){if(h(r)===n)throw d("managed client config must contain a complete host profile tuple.");return null}let o=vt.filter(s=>Ot(t,s));if(o.length)throw d(`${o.join(", ")} conflicts with host-profile mode.`);return{profile:i,configPath:r}}function P(t=process.env){return Nt(t)?.profile??null}import{createHash as $t,randomUUID as G}from"node:crypto";import{chmod as M,mkdir as Dt,readFile as Ut,rename as kt,unlink as Lt,writeFile as Jt}from"node:fs/promises";import{dirname as C,join as jt,resolve as Ht}from"node:path";import{attachOursClient as Ft}from"@ours.network/sdk";import{createHash as Pt}from"node:crypto";import{openSync as bt,closeSync as Ct,lstatSync as b,mkdirSync as _t,chmodSync as Rt,constants as y}from"node:fs";import{join as J}from"node:path";import{createRequire as j}from"node:module";var xt=5e3,u=null,H=!1;function Tt(){if(u)return u;if(H)throw new Error("No SQLite implementation available for native session guard");H=!0;try{return u=j(import.meta.url)("node:sqlite").DatabaseSync,u}catch{try{let t=j(import.meta.url)("better-sqlite3");return u=t.default??t,u}catch{throw new Error("Native session guard requires node:sqlite (Node >=22.13) or better-sqlite3")}}}function At(t){try{let n=bt(t,y.O_RDWR|y.O_CREAT|y.O_EXCL|y.O_NOFOLLOW,384);Ct(n)}catch(n){if(n.code!=="EEXIST")throw n}let e=b(t);if(!e.isFile()||e.uid!==process.getuid()||e.mode&63||e.nlink!==1)throw new Error("Native session guard file must be an owner-only regular file")}function F(t){let e=process.getuid(),n=J(`/tmp/ours-${e}`,"session-guards");_t(n,{recursive:!0,mode:448});try{Rt(n,448)}catch{}let r=Pt("sha256").update(t).digest("hex"),i=J(n,`${r}.guard`);At(i);let o=b(i),s=Tt(),a=new s(i);try{let l=b(i);if(o.dev!==l.dev||o.ino!==l.ino||o.mode!==l.mode||o.uid!==l.uid)throw new Error("Native session guard file changed during acquisition");return a.exec(`PRAGMA busy_timeout=${xt}; BEGIN EXCLUSIVE`),()=>{try{a.close()}catch{}}}catch(l){try{a.close()}catch{}throw l}}var E=1,V=/^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/,p=new Map,v=new Map;function Mt(t){if(typeof t!="string"||t.length===0||t.length>4096||t.trim()!==t||t.includes("\0"))throw new Error("Native session metadata is missing or invalid for this host-profile tool call.");return t}function W(t,e,n){if(!t||!t.startsWith("/")||Ht(t)!==t)throw new Error("Native session host record root must be a normalized absolute path.");if(!V.test(e))throw new Error("Native session daemon instance must be a lowercase UUID.");let r=$t("sha256").update(Mt(n),"utf8").digest("hex");return jt(t,"sessions",e,`${r}.json`)}function qt(t,e){let n;try{n=JSON.parse(t)}catch(o){throw new Error(`Invalid native session record at ${e}: ${String(o)}`)}if(!n||typeof n!="object"||Array.isArray(n))throw new Error(`Invalid native session record at ${e}: expected an object.`);let r=n;if(Object.keys(r).sort().join(",")!=="ownerInstanceId,state,version"||r.version!==E||typeof r.ownerInstanceId!="string"||!V.test(r.ownerInstanceId)||!["active","pending","ended"].includes(String(r.state)))throw new Error(`Invalid native session record at ${e}.`);return r}async function I(t){try{return qt(await Ut(t,"utf8"),t)}catch(e){if(e.code==="ENOENT")return null;throw e}}async function _(t,e){let n=C(t);await Dt(n,{recursive:!0,mode:448}),await M(n,448);let r=`${t}.${process.pid}.${G()}.tmp`;try{await Jt(r,`${JSON.stringify(e,null,2)}
+`,{mode:384,flag:"wx"}),await kt(r,t),await M(t,384)}catch(i){try{await Lt(r)}catch{}throw i}}async function Y(t,e){let n=v.get(t)??Promise.resolve(),r,i=new Promise(a=>{r=a}),o=n.catch(()=>{}).then(()=>i);v.set(t,o),await n.catch(()=>{});let s;try{return s=F(t),await e()}finally{try{s?.()}finally{r(),v.get(t)===o&&v.delete(t)}}}function B(t,e){return Ft({endpoint:t.endpoint,expectedInstanceId:t.expectedInstanceId,credentialPath:t.credentialPath,sessionMode:"external",leaseToken:e,env:{}})}function q(t,e,n){let r=p.get(t);if(r?.ownerInstanceId===n)return r.promise;r&&(p.delete(t),r.promise.then(s=>s.close()).catch(()=>{}));let i=B(e,n),o={ownerInstanceId:n,promise:i};return p.set(t,o),i.catch(()=>{p.get(t)===o&&p.delete(t)}),i}async function Gt(t,e,n){let r=p.get(t),i=r?.ownerInstanceId===n?await r.promise:await B(e,n);try{await i.releaseLease()}finally{r?.ownerInstanceId!==n&&await i.close()}}async function K(t,e,n){await Gt(t,e,n);let r=await I(t);r?.state==="pending"&&r.ownerInstanceId===n&&await _(t,{version:E,ownerInstanceId:n,state:"ended"});let i=p.get(t);i?.ownerInstanceId===n&&(p.delete(t),i.promise.then(o=>o.close()).catch(()=>{}))}async function z(t,e,n=process.env){return Vt(t,e,C(w(n)))}async function Vt(t,e,n){let r=g(t),i=W(n,r.expectedInstanceId,e);return Y(i,async()=>{let o=await I(i);if(o?.state==="pending"&&(await K(i,r,o.ownerInstanceId),o=await I(i)),o?.state==="active")return q(i,r,o.ownerInstanceId);let s=G();return await _(i,{version:E,ownerInstanceId:s,state:"active"}),q(i,r,s)})}async function X(t,e,n=process.env){return Wt(t,e,C(w(n)))}async function Wt(t,e,n){let r=g(t),i=W(n,r.expectedInstanceId,e);await Y(i,async()=>{let o=await I(i);o===null||o.state==="ended"||(o.state==="active"&&(o={version:E,ownerInstanceId:o.ownerInstanceId,state:"pending"},await _(i,o)),await K(i,r,o.ownerInstanceId))})}var R="1.2.0-nightly.5",c=t=>{process.stdout.write(`${t}
+`)},nt=t=>{process.stderr.write(`${t}
+`)},Z=t=>Number.isInteger(t)&&t>1,tt=Number(process.env.OURS_CLIENT_PID),S=Z(tt)?tt:Z(process.ppid)?process.ppid:process.pid,x=(process.env.CLAUDE_CODE_SESSION_ID??"").trim()||`ours-mcp:${S}`,Xt=(process.env.OURS_BIND_IDENTITY??"").trim()||void 0,Qt=new Set(["start","stop","restart","serve","run","status","install-service","uninstall-service"]);function Zt(t){if(t.some(e=>e==="--application"||e.startsWith("--application=")))throw new Error("`--application` is no longer supported. ours-mcp connects to one coherently selected shared daemon; use OURS_CONFIG or a matching OURS_PORT + OURS_STATE_DIR selection.")}async function te(t){let n=(process.env.OURS_DAEMON_CLI??"").trim()||"ours-daemon";await new Promise((r,i)=>{let o=Yt(n,t,{stdio:"inherit",env:process.env});o.once("error",s=>{if(s.code==="ENOENT"){i(new Error(`Cannot find the ${JSON.stringify(n)} CLI. Install @ours.network/daemon, put \`ours-daemon\` on PATH, or set OURS_DAEMON_CLI to its executable path.`));return}i(s)}),o.once("exit",(s,a)=>{if(a){process.kill(process.pid,a);return}process.exitCode=s??1,r()})})}async function ee(){let t=new URL("./connector.js",import.meta.url),{runConnector:e}=await import(t.href);await e({leaseToken:x,clientPid:S,version:R,bindIdentity:Xt})}async function ne(){let t=P(process.env);if(t!==null){let n;try{n=JSON.parse(Bt(0,"utf8"))}catch{throw new Error("SessionEnd requires valid hook JSON on stdin.")}let r=n?.session_id;if(typeof r!="string"||!r.trim())throw new Error("SessionEnd hook input must contain a non-empty session_id.");await X(t,r,process.env);return}await(await et({leaseToken:x,clientPid:S})).releaseLease()}function re(t,e){return JSON.stringify({identity:t,...e})}async function ie(t,e,n){for await(let r of t.watchNotifications(e,{kinds:["inbound"],signal:n}))c(re(e,r))}async function oe(t){if(t.length>1||t[0]?.startsWith("-"))throw new Error("Usage: ours-mcp watch [identity]");let e=P(process.env),n=new m(e?{instanceId:e.expectedInstanceId}:zt().expectStateDir);await n.list();let r=e?await z(e,(process.env.CLAUDE_CODE_SESSION_ID??"").trim()):await et({leaseToken:x,clientPid:S}),i=t[0]?.trim(),o;i?o=[i]:o=(await U(n,await r.identities())).map(a=>a.name);let s=new AbortController;process.once("SIGINT",()=>s.abort()),process.once("SIGTERM",()=>s.abort()),nt(`ours-mcp watch: ${o.length===0?"no application identities":`watching ${o.join(", ")}`}`);try{await Promise.all(o.map(a=>ie(r,a,s.signal)))}finally{await r.close()}}function se(){c(`ours-mcp ${R} \u2014 MCP adapter for the shared ours daemon`),c(""),c("Usage: ours-mcp <command> [options]"),c("  proxy                 run the stdio MCP server (never starts a daemon)"),c("  session-end           release this harness session and clean up its temporary identities"),c("  watch [identity]      stream inbound JSON Lines; without a name, only ours-mcp identities"),c("  start|stop|restart|serve|status"),c("  install-service|uninstall-service"),c("                        compatibility aliases for `ours-daemon <command>`"),c("  version               print the ours-mcp package version"),c(""),c("Daemon administration uses @ours.network/daemon; API commands use @ours.network/cli:"),c("  ours-daemon config setup"),c("  ours identity --help")}async function ae(){let t=process.argv.slice(2);Zt(t);let e=t.shift()??"help";if(Qt.has(e)){await te([e==="run"?"serve":e,...t]);return}switch(e){case"proxy":if(t.length)throw new Error("Usage: ours-mcp proxy");await ee();return;case"session-end":if(t.length)throw new Error("Usage: ours-mcp session-end");await ne();return;case"watch":await oe(t);return;case"setup":throw new Error("ours-mcp no longer owns daemon configuration. Run `ours-daemon config setup` instead.");case"create-root":case"define-local-identity-file":case"voice-setup":case"voice-status":case"stt-setup":case"stt-status":throw new Error(`ours-mcp ${e} moved to the \`ours\` CLI. Run \`ours --help\` for the typed replacement.`);case"version":case"--version":case"-v":c(R);return;case"help":case"--help":case"-h":se();return;default:throw new Error(`Unknown command ${JSON.stringify(e)}. Run \`ours-mcp --help\`.`)}}function ce(){if(!process.argv[1])return!1;try{return Q(process.argv[1])===Q(Kt(import.meta.url))}catch{return!1}}var de=ce();de&&ae().catch(t=>{nt(`ours-mcp error: ${t instanceof Error?t.message:String(t)}`),process.exitCode=1});