@north-light/cli 0.3.439 → 0.3.440

package/dist/clients/attach/viewer.js

@@ -1,5 +1,5 @@
 import{createRequire as __cr}from'node:module';import{fileURLToPath as __fu}from'node:url';import{dirname as __dn}from'node:path';const require=__cr(import.meta.url),__filename=__fu(import.meta.url),__dirname=__dn(__filename);
-var JMn=Object.create;var gAe=Object.defineProperty;var XMn=Object.getOwnPropertyDescriptor;var ZMn=Object.getOwnPropertyNames;var e1n=Object.getPrototypeOf,t1n=Object.prototype.hasOwnProperty;var re=(t=>typeof require<"u"?require:typeof Proxy<"u"?new Proxy(t,{get:(e,n)=>(typeof require<"u"?require:e)[n]}):t)(function(t){if(typeof require<"u")return require.apply(this,arguments);throw Error('Dynamic require of "'+t+'" is not supported')});var h=(t,e)=>()=>(t&&(e=t(t=0)),e);var $=(t,e)=>()=>(e||t((e={exports:{}}).exports,e),e.exports),ar=(t,e)=>{for(var n in e)gAe(t,n,{get:e[n],enumerable:!0})},n1n=(t,e,n,r)=>{if(e&&typeof e=="object"||typeof e=="function")for(let i of ZMn(e))!t1n.call(t,i)&&i!==n&&gAe(t,i,{get:()=>e[i],enumerable:!(r=XMn(e,i))||r.enumerable});return t};var Jt=(t,e,n)=>(n=t!=null?JMn(e1n(t)):{},n1n(e||!t||!t.__esModule?gAe(n,"default",{value:t,enumerable:!0}):n,t));function yAe(t,e=!1){return t==="."&&e?!0:t.length>0&&!t.startsWith("/")&&!t.includes("..")&&!t.includes(":")&&!t.includes("\\")&&!/\s/.test(t)&&!t.split("/").some((n,r,i)=>n==="."||n===""&&r!==i.length-1)&&(!e||!t.endsWith("/"))}function AAe(t){if(t==="crtr:llm"||t==="crtr:act"||t==="crtr:schedule")return{kind:t.slice(5),value:t};if(t==="crtr:files:share")return{kind:"share",value:t};if(t==="crtr:memory:manage:user")return{kind:"memory",access:"manage",holder:"user"};let e=/^crtr:memory:(read|rw):user(?::(.+))?$/.exec(t);if(e&&(e[2]===void 0||yAe(e[2])))return{kind:"memory",access:e[1],holder:"user",path:e[2]};if(e=/^crtr:memory:(read|rw):app:([A-Za-z0-9_-]{1,64})(?::profile:([A-Za-z0-9_-]{1,64})(?::(.+))?)?$/.exec(t),e&&(e[4]===void 0||yAe(e[4])))return{kind:"memory",access:e[1],holder:`app:${e[2]}`,profile:e[3],path:e[4]};if(e=/^crtr:files:(read|rw):(user|app:[A-Za-z0-9_-]{1,64}):(.+)$/.exec(t),e&&yAe(e[3],!0))return{kind:"files",access:e[1],holder:e[2],path:e[3]};if(e=/^crtr:(conversations|objects):read:app:([A-Za-z0-9_-]{1,64})$/.exec(t),e)return{kind:e[1],value:t};if(e=/^crtr:peer:([A-Za-z0-9_-]{1,64})$/.exec(t),e)return{kind:"peer",value:t};if(e=/^([^:]+):([^:]+)$/.exec(t),e&&e[1]!=="crtr"&&Ktt.test(e[1])&&Ktt.test(e[2]))return{kind:"provider",value:t};throw new TypeError(`Unsupported scope: ${t}`)}function BV(t,e){let n=AAe(t);if(e&&(n.kind==="memory"||n.kind==="files")&&n.holder.startsWith("app:")&&n.holder!==e)throw new TypeError(`Unsupported scope: ${t}`);return t}function r1n(t,e){return t===void 0?!0:e===void 0?!1:t===e||t.endsWith("/")&&e.startsWith(t)}function ed(t,e){let n=AAe(t),r=AAe(e);return n.kind!==r.kind?!1:n.kind==="memory"&&r.kind==="memory"?n.holder===r.holder&&(n.access===r.access||n.access==="manage"||n.access==="rw"&&r.access==="read")&&(n.profile===void 0||n.profile===r.profile)&&r1n(n.path,r.path):n.kind==="files"&&r.kind==="files"?n.holder===r.holder&&(n.access==="rw"||r.access==="read")&&(n.path==="."||n.path===r.path||r.path.startsWith(`${n.path}/`)):t===e}var Ktt,eM=h(()=>{"use strict";Ktt=/^[A-Za-z0-9_-]{1,64}$/});import{lstatSync as i1n,readFileSync as o1n,readdirSync as s1n}from"node:fs";import{join as wAe}from"node:path";function qS(){return process.env.CRTR_NODE_ID}function a1n(t){for(let e of["broker-launch.json","cron-launch.json"]){let n=wAe(t,e);if(i1n(n,{throwIfNoEntry:!1})?.isFile())return n}}function c1n(){if(process.platform==="linux")try{let t="/run/crtr/nodes",e=new Set(o1n("/proc/self/mountinfo","utf8").split(`
+var JMn=Object.create;var gAe=Object.defineProperty;var XMn=Object.getOwnPropertyDescriptor;var ZMn=Object.getOwnPropertyNames;var e1n=Object.getPrototypeOf,t1n=Object.prototype.hasOwnProperty;var re=(t=>typeof require<"u"?require:typeof Proxy<"u"?new Proxy(t,{get:(e,n)=>(typeof require<"u"?require:e)[n]}):t)(function(t){if(typeof require<"u")return require.apply(this,arguments);throw Error('Dynamic require of "'+t+'" is not supported')});var h=(t,e)=>()=>(t&&(e=t(t=0)),e);var $=(t,e)=>()=>(e||t((e={exports:{}}).exports,e),e.exports),ar=(t,e)=>{for(var n in e)gAe(t,n,{get:e[n],enumerable:!0})},n1n=(t,e,n,r)=>{if(e&&typeof e=="object"||typeof e=="function")for(let i of ZMn(e))!t1n.call(t,i)&&i!==n&&gAe(t,i,{get:()=>e[i],enumerable:!(r=XMn(e,i))||r.enumerable});return t};var Jt=(t,e,n)=>(n=t!=null?JMn(e1n(t)):{},n1n(e||!t||!t.__esModule?gAe(n,"default",{value:t,enumerable:!0}):n,t));function yAe(t,e=!1){return t==="."&&e?!0:t.length>0&&!t.startsWith("/")&&!t.includes("..")&&!t.includes(":")&&!t.includes("\\")&&!/\s/.test(t)&&!t.split("/").some((n,r,i)=>n==="."||n===""&&r!==i.length-1)&&(!e||!t.endsWith("/"))}function AAe(t){if(t==="crtr:llm"||t==="crtr:act"||t==="crtr:schedule")return{kind:t.slice(5),value:t};if(t==="crtr:files:share")return{kind:"share",value:t};if(t==="crtr:memory:manage:user")return{kind:"memory",access:"manage",holder:"user"};let e=/^crtr:memory:(read|rw):user(?::(.+))?$/.exec(t);if(e&&(e[2]===void 0||yAe(e[2])))return{kind:"memory",access:e[1],holder:"user",path:e[2]};if(e=/^crtr:memory:(read|rw):app:([A-Za-z0-9_-]{1,64})(?::profile:([A-Za-z0-9_-]{1,64})(?::(.+))?)?$/.exec(t),e&&(e[4]===void 0||yAe(e[4])))return{kind:"memory",access:e[1],holder:`app:${e[2]}`,profile:e[3],path:e[4]};if(e=/^crtr:files:(read|rw):(user|app:[A-Za-z0-9_-]{1,64}):(.+)$/.exec(t),e&&yAe(e[3],!0))return{kind:"files",access:e[1],holder:e[2],path:e[3]};if(e=/^crtr:(?:(conversations):read|(objects):(?:read|message|spawn)):app:([A-Za-z0-9_-]{1,64})$/.exec(t),e)return{kind:e[1]??e[2],value:t};if(e=/^crtr:peer:([A-Za-z0-9_-]{1,64})$/.exec(t),e)return{kind:"peer",value:t};if(e=/^([^:]+):([^:]+)$/.exec(t),e&&e[1]!=="crtr"&&Ktt.test(e[1])&&Ktt.test(e[2]))return{kind:"provider",value:t};throw new TypeError(`Unsupported scope: ${t}`)}function BV(t,e){let n=AAe(t);if(e&&(n.kind==="memory"||n.kind==="files")&&n.holder.startsWith("app:")&&n.holder!==e)throw new TypeError(`Unsupported scope: ${t}`);return t}function r1n(t,e){return t===void 0?!0:e===void 0?!1:t===e||t.endsWith("/")&&e.startsWith(t)}function ed(t,e){let n=AAe(t),r=AAe(e);return n.kind!==r.kind?!1:n.kind==="memory"&&r.kind==="memory"?n.holder===r.holder&&(n.access===r.access||n.access==="manage"||n.access==="rw"&&r.access==="read")&&(n.profile===void 0||n.profile===r.profile)&&r1n(n.path,r.path):n.kind==="files"&&r.kind==="files"?n.holder===r.holder&&(n.access==="rw"||r.access==="read")&&(n.path==="."||n.path===r.path||r.path.startsWith(`${n.path}/`)):t===e}var Ktt,eM=h(()=>{"use strict";Ktt=/^[A-Za-z0-9_-]{1,64}$/});import{lstatSync as i1n,readFileSync as o1n,readdirSync as s1n}from"node:fs";import{join as wAe}from"node:path";function qS(){return process.env.CRTR_NODE_ID}function a1n(t){for(let e of["broker-launch.json","cron-launch.json"]){let n=wAe(t,e);if(i1n(n,{throwIfNoEntry:!1})?.isFile())return n}}function c1n(){if(process.platform==="linux")try{let t="/run/crtr/nodes",e=new Set(o1n("/proc/self/mountinfo","utf8").split(`
 `).map(r=>r.split(" ")[4])),n=s1n(t,{withFileTypes:!0}).filter(r=>r.isDirectory()&&/^[a-zA-Z0-9][a-zA-Z0-9-]{0,127}$/.test(r.name)&&e.has(wAe(t,r.name))&&a1n(wAe(t,r.name))!==void 0);return n.length===1?n[0].name:void 0}catch{return}}function GS(){return c1n()!==void 0}function $V(){return process.env.CRTR_GRANTEE}function FV(){return process.env.CRTR_EXECUTION_ID}function xAe(){return process.env.CRTR_PROFILE_ID}function N0(){return process.env.CRTR_HOME}function Ytt(){let t=process.env.CRTR_PIDFILE;return t!==void 0&&t!==""?t:void 0}function Jtt(){return process.env.CRTR_NO_DAEMON_AUTOSTART==="1"}var X_i,Z_i,evi,tvi,cs=h(()=>{"use strict";X_i=5*6e4,Z_i=300*1e3,evi=60*1e3;tvi=5*6e4});import{existsSync as u1n,readFileSync as l1n}from"node:fs";import{dirname as Xtt,join as d1n,parse as p1n}from"node:path";import{fileURLToPath as f1n}from"node:url";function m1n(t,e){let n=Xtt(t),r=p1n(n).root;for(;;){let i=d1n(n,"package.json");if(u1n(i))try{if(JSON.parse(l1n(i,"utf8")).name===e)return n}catch{return null}if(n===r)return null;n=Xtt(n)}}function Ztt(){let t="@earendil-works/pi-coding-agent",e;try{e=f1n(import.meta.resolve(t))}catch(r){throw new Error(`crouter install is missing bundled ${t}; reinstall crouter. ${r.message}`)}let n=m1n(e,t);if(n===null)throw new Error(`could not locate bundled ${t} package root from ${e}`);return n}var bAe=h(()=>{"use strict"});var ent=h(()=>{"use strict";bAe();try{process.env.PI_PACKAGE_DIR=Ztt()}catch{}});function h1n(t){if(!(typeof process>"u"||!process.versions?.bun||Object.keys(process.env).length>0)){if(UV===null){UV=new Map;try{let{readFileSync:e}=re("node:fs"),n=e("/proc/self/environ","utf-8");for(let r of n.split("\0")){let i=r.indexOf("=");i>0&&UV.set(r.slice(0,i),r.slice(i+1))}}catch{}}return UV.get(t)}}function xn(t,e){return e?.[t]||(typeof process<"u"?process.env[t]:void 0)||h1n(t)||void 0}var UV,td=h(()=>{UV=null});function QV(t){return t.replaceAll("&","&amp;").replaceAll("<","&lt;").replaceAll(">","&gt;").replaceAll('"',"&quot;").replaceAll("'","&#39;")}function tnt(t){let e=QV(t.title),n=QV(t.heading),r=QV(t.message),i=t.details?QV(t.details):void 0;return`<!doctype html>
 <html lang="en">
 <head>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@north-light/cli",
-  "version": "0.3.439",
+  "version": "0.3.440",
   "description": "crtr — agent runtime with memory, plugins, and marketplaces",
   "type": "module",
   "main": "dist/index.js",
@@ -137,7 +137,7 @@
   },
   "license": "UNLICENSED",
   "dependencies": {
-    "@north-light/identity": "0.3.439",
+    "@north-light/identity": "0.3.440",
     "@earendil-works/pi-agent-core": "1.1.0",
     "@earendil-works/pi-ai": "1.1.0",
     "@earendil-works/pi-coding-agent": "1.1.0",

package/packages/crouter-identity/dist/index.d.ts

@@ -22,7 +22,7 @@ export interface IdTokenClaims extends JWTPayload {
     family_name?: string;
     picture?: string;
 }
-export type Scope = 'crtr:llm' | 'crtr:act' | 'crtr:schedule' | `crtr:memory:${'read' | 'rw'}:user${'' | `:${string}`}` | 'crtr:memory:manage:user' | `crtr:memory:${'read' | 'rw'}:app:${string}` | `crtr:files:${'read' | 'rw'}:${'user' | `app:${string}`}:${string}` | 'crtr:files:share' | `crtr:${'conversations' | 'objects'}:read:app:${string}` | `crtr:peer:${string}` | `${string}:${string}`;
+export type Scope = 'crtr:llm' | 'crtr:act' | 'crtr:schedule' | `crtr:memory:${'read' | 'rw'}:user${'' | `:${string}`}` | 'crtr:memory:manage:user' | `crtr:memory:${'read' | 'rw'}:app:${string}` | `crtr:files:${'read' | 'rw'}:${'user' | `app:${string}`}:${string}` | 'crtr:files:share' | `crtr:${'conversations' | 'objects'}:read:app:${string}` | `crtr:objects:${'message' | 'spawn'}:app:${string}` | `crtr:peer:${string}` | `${string}:${string}`;
 /** App-memory form keys omit the app id. */
 export declare const ENFORCED: ReadonlySet<string>;
 export declare function parseScope(value: string, grantee?: string): Scope;
@@ -73,6 +73,34 @@ export declare function verifyAccessToken(options: {
     issuer: string;
     audience: string;
 }): Promise<AccessTokenClaims>;
+/** The claims of a machine token: one machine of an account calling another (or the account relay). It names the
+ *  person and the calling machine and carries no grant, so it authorizes nothing on its own. */
+export interface MachineTokenClaims extends JWTPayload {
+    iss: string;
+    /** The single audience: a peer machine URL or the relay origin. */
+    aud: string;
+    /** The account's person, `user:<id>`. */
+    sub: string;
+    /** Always equal to `sub`. */
+    grantee: string;
+    client_id: string;
+    /** The calling machine, `runtime:<id>`. */
+    machine_id: string;
+    exp: number;
+}
+/**
+ * Verifies a machine token: ES256 with typ `at+jwt`, signature against `jwks`, `iss` = `issuer`, `aud` a string equal
+ * to `audience` (the sole audience), and `exp`. `sub` must be `user:<id>`, `grantee` must equal `sub`, `machine_id`
+ * must be `runtime:<id>` and `client_id` a non-empty string. A token carrying a `grant`, `rev` or `scope` claim is
+ * refused, so an app grant token never verifies here; `verifyAccessToken` requires an `app:` grantee, so a machine
+ * token never verifies there.
+ */
+export declare function verifyMachineToken(options: {
+    token: string;
+    jwks: JSONWebKeySet | JwksCache;
+    issuer: string;
+    audience: string;
+}): Promise<MachineTokenClaims>;
 /** One level of the outbound token's RFC 8693 `act` nesting: the actor, and the actor it acted for. */
 export interface OutboundActor {
     sub: string;

package/packages/crouter-identity/dist/index.js

@@ -31,9 +31,10 @@ function selector(value) {
     match = /^crtr:files:(read|rw):(user|app:[A-Za-z0-9_-]{1,64}):(.+)$/.exec(value);
     if (match && validPath(match[3], true))
         return { kind: 'files', access: match[1], holder: match[2], path: match[3] };
-    match = /^crtr:(conversations|objects):read:app:([A-Za-z0-9_-]{1,64})$/.exec(value);
+    // read, message and spawn are three unrelated scopes: `covers` is exact equality for them.
+    match = /^crtr:(?:(conversations):read|(objects):(?:read|message|spawn)):app:([A-Za-z0-9_-]{1,64})$/.exec(value);
     if (match)
-        return { kind: match[1], value };
+        return { kind: (match[1] ?? match[2]), value };
     match = /^crtr:peer:([A-Za-z0-9_-]{1,64})$/.exec(value);
     if (match)
         return { kind: 'peer', value };
@@ -226,6 +227,28 @@ export async function verifyAccessToken(options) {
         throw new Error('Invalid access token claims');
     return payload;
 }
+/**
+ * Verifies a machine token: ES256 with typ `at+jwt`, signature against `jwks`, `iss` = `issuer`, `aud` a string equal
+ * to `audience` (the sole audience), and `exp`. `sub` must be `user:<id>`, `grantee` must equal `sub`, `machine_id`
+ * must be `runtime:<id>` and `client_id` a non-empty string. A token carrying a `grant`, `rev` or `scope` claim is
+ * refused, so an app grant token never verifies here; `verifyAccessToken` requires an `app:` grantee, so a machine
+ * token never verifies there.
+ */
+export async function verifyMachineToken(options) {
+    const header = decodeProtectedHeader(options.token);
+    if (header.typ !== 'at+jwt' || header.alg !== 'ES256')
+        throw new Error('Invalid machine token header');
+    const keys = await keySet(options.jwks, header.kid);
+    const { payload } = await jwtVerify(options.token, createLocalJWKSet(keys), {
+        issuer: options.issuer, audience: options.audience, algorithms: ['ES256'], typ: 'at+jwt', requiredClaims: ['exp'],
+    });
+    if (payload.aud !== options.audience || !validatePrincipal(payload.sub, 'user') || payload.grantee !== payload.sub ||
+        !validatePrincipal(payload.machine_id, 'runtime') || !nonEmptyString(payload.client_id) || typeof payload.exp !== 'number' ||
+        payload.grant !== undefined || payload.rev !== undefined || payload.scope !== undefined) {
+        throw new Error('Invalid machine token claims');
+    }
+    return payload;
+}
 function nonEmptyString(value) {
     return typeof value === 'string' && value !== '';
 }

package/packages/crouter-identity/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@north-light/identity",
-  "version": "0.3.439",
+  "version": "0.3.440",
   "description": "Northlight access-token verification and scope rules",
   "type": "module",
   "main": "./dist/index.js",

package/runtime.lock.json

@@ -1,12 +1,12 @@
 {
   "name": "@north-light/cli",
-  "version": "0.3.439",
+  "version": "0.3.440",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@north-light/cli",
-      "version": "0.3.439",
+      "version": "0.3.440",
       "hasInstallScript": true,
       "license": "UNLICENSED",
       "workspaces": [
@@ -18,7 +18,7 @@
         "@earendil-works/pi-ai": "1.1.0",
         "@earendil-works/pi-coding-agent": "1.1.0",
         "@earendil-works/pi-tui": "1.1.0",
-        "@north-light/identity": "0.3.439",
+        "@north-light/identity": "0.3.440",
         "cron-parser": "^5.6.0",
         "esbuild": "^0.27.7",
         "jose": "^6.2.12",
@@ -12095,17 +12095,17 @@
     },
     "packages/crouter-api": {
       "name": "@north-light/api",
-      "version": "0.3.439",
+      "version": "0.3.440",
       "license": "UNLICENSED"
     },
     "packages/crouter-env-docker": {
       "name": "@north-light/env-docker",
-      "version": "0.3.439",
+      "version": "0.3.440",
       "license": "UNLICENSED"
     },
     "packages/crouter-identity": {
       "name": "@north-light/identity",
-      "version": "0.3.439",
+      "version": "0.3.440",
       "license": "UNLICENSED",
       "dependencies": {
         "jose": "^6.2.1"
@@ -12113,20 +12113,20 @@
     },
     "packages/crouter-plugin": {
       "name": "@north-light/plugin",
-      "version": "0.3.439",
+      "version": "0.3.440",
       "license": "UNLICENSED",
       "dependencies": {
-        "@north-light/api": "0.3.439",
-        "@north-light/identity": "0.3.439"
+        "@north-light/api": "0.3.440",
+        "@north-light/identity": "0.3.440"
       }
     },
     "packages/crouter-sdk": {
       "name": "@north-light/sdk",
-      "version": "0.3.439",
+      "version": "0.3.440",
       "license": "UNLICENSED",
       "dependencies": {
-        "@north-light/api": "0.3.439",
-        "@north-light/identity": "0.3.439",
+        "@north-light/api": "0.3.440",
+        "@north-light/identity": "0.3.440",
         "jose": "^6.2.1"
       },
       "bin": {