@north-light/crouter 0.3.318 → 0.3.319

package/dist/core/asset-root.js

@@ -1,18 +1 @@
-import { existsSync } from 'node:fs';
-import { dirname, join } from 'node:path';
-import { fileURLToPath } from 'node:url';
-/** The source or runtime directory containing every shipped asset tree.
- *
- * `import.meta.url` names the module when loaded directly, but names the
- * attach viewer bundle when esbuild inlines this module. Walking to the
- * directory marked by the built-in assets preserves one resolution rule for
- * both loading contexts. */
-export function assetRoot() {
-    for (let current = dirname(fileURLToPath(import.meta.url));; current = dirname(current)) {
-        if (existsSync(join(current, 'builtin-memory')) && existsSync(join(current, 'builtin-pi-packages')))
-            return current;
-        const parent = dirname(current);
-        if (parent === current)
-            throw new Error(`cannot locate crouter assets from ${import.meta.url}`);
-    }
-}
+var m=Object.defineProperty;var e=(r,o)=>m(r,"name",{value:o,configurable:!0});import{existsSync as i}from"node:fs";import{dirname as t,join as n}from"node:path";import{fileURLToPath as a}from"node:url";function u(){for(let r=t(a(import.meta.url));;r=t(r)){if(i(n(r,"builtin-memory"))&&i(n(r,"builtin-pi-packages")))return r;if(t(r)===r)throw new Error(`cannot locate crouter assets from ${import.meta.url}`)}}e(u,"assetRoot");export{u as assetRoot};

package/dist/core/auth-file.js

@@ -1,179 +1,2 @@
-// auth-file.ts — crouter's view of pi's `auth.json`.
-//
-// pi 0.82 removed `AuthStorage` from its public surface: credentials are now an app-owned
-// `CredentialStore` that `ModelRuntime` consumes. crouter needs both halves of that:
-//
-//  - `CrouterCredentialStore` — the auth.json half of the store handed to
-//    `ModelRuntime.create()`. It reads the file fresh under the lock on every call, so a
-//    runtime never serves a cached view that a concurrent broker or viewer has moved past.
-//    Runtimes are actually handed `PoolCredentialStore`, which wraps this one and serves the
-//    managed providers (anthropic, openai-codex) from the subscription pool instead; auth.json
-//    holds a managed record only as a hand-written api_key.
-//  - the `read/set/delete` helpers below — the credential half of transactions
-//    crouter runs itself (the daemon's already-obtained OAuth credential, the Providers panel's
-//    non-managed removal).
-//
-// Every path takes the SAME proper-lockfile lock on auth.json that pi takes, so crouter and
-// pi processes still exclude each other.
-import { execSync } from 'node:child_process';
-import { homedir } from 'node:os';
-import { join } from 'node:path';
-import { LockedJsonFile } from './locked-file.js';
-export function defaultAuthPath() {
-    return join(homedir(), '.pi', 'agent', 'auth.json');
-}
-function parse(current) {
-    if (current === undefined || current.trim() === '')
-        return {};
-    // A corrupt credential file is never equivalent to an empty one: throwing here keeps a
-    // write from silently deleting every other provider's credential.
-    const parsed = JSON.parse(current);
-    return parsed !== null && typeof parsed === 'object' ? parsed : {};
-}
-function serialize(data) {
-    return `${JSON.stringify(data, null, 2)}\n`;
-}
-const ENV_NAME_PREFIX = /^[A-Za-z_][A-Za-z0-9_]*/;
-const ENV_NAME = /^[A-Za-z_][A-Za-z0-9_]*$/;
-const commandValues = new Map();
-function runValueCommand(command) {
-    if (commandValues.has(command))
-        return commandValues.get(command);
-    let value;
-    try {
-        value = execSync(command, { encoding: 'utf-8', timeout: 10_000, stdio: ['ignore', 'pipe', 'ignore'] }).trim() || undefined;
-    }
-    catch {
-        value = undefined;
-    }
-    commandValues.set(command, value);
-    return value;
-}
-/**
- * Resolve a stored api-key value the way pi does before handing it to a provider: a leading
- * `!` runs the rest as a shell command (cached for the process), and `$VAR` / `${VAR}`
- * interpolate from the credential's own env then `process.env` (`$$` and `$!` escape a
- * literal `$`/`!`); an unset reference resolves the whole value to undefined. pi's resolver
- * is internal to the coding agent and its credential store — which crouter replaces — is the
- * only place it runs, so an auth.json holding `"key": "$ANTHROPIC_API_KEY"` would otherwise
- * be sent to the provider verbatim.
- */
-export function resolveCredentialValue(config, env) {
-    if (config.startsWith('!'))
-        return runValueCommand(config.slice(1));
-    let resolved = '';
-    let index = 0;
-    while (index < config.length) {
-        const dollar = config.indexOf('$', index);
-        if (dollar < 0) {
-            resolved += config.slice(index);
-            break;
-        }
-        resolved += config.slice(index, dollar);
-        const next = config[dollar + 1];
-        if (next === '$' || next === '!') {
-            resolved += next;
-            index = dollar + 2;
-            continue;
-        }
-        let name;
-        let end = dollar + 1;
-        if (next === '{') {
-            const close = config.indexOf('}', dollar + 2);
-            const inner = close < 0 ? undefined : config.slice(dollar + 2, close);
-            if (inner !== undefined && ENV_NAME.test(inner)) {
-                name = inner;
-                end = close + 1;
-            }
-        }
-        else {
-            const match = ENV_NAME_PREFIX.exec(config.slice(dollar + 1));
-            if (match !== null) {
-                name = match[0];
-                end = dollar + 1 + name.length;
-            }
-        }
-        if (name === undefined) {
-            // Not an env reference — a literal `$`.
-            resolved += '$';
-            index = dollar + 1;
-            continue;
-        }
-        const value = env?.[name] || process.env[name];
-        if (value === undefined || value === '')
-            return undefined;
-        resolved += value;
-        index = end;
-    }
-    return resolved;
-}
-/** Read all stored credentials. Lock-free: every writer replaces auth.json by atomic
- *  rename, so a reader either sees the old whole file or the new one. Taking the lock here
- *  would be pure cost — pi asks for every registered provider (~75 reads) each time it
- *  builds a model runtime, and those contended acquisitions cost seconds per broker boot. */
-export async function readAuthCredentials(authPath = defaultAuthPath()) {
-    return parse(new LockedJsonFile(authPath).readUnlocked());
-}
-/** Read one provider's stored credential. */
-export async function readAuthCredential(providerId, authPath = defaultAuthPath()) {
-    return (await readAuthCredentials(authPath))[providerId];
-}
-/** Persist one provider's credential under the auth.json lock, leaving every other entry intact. */
-export async function setAuthCredential(providerId, credential, authPath = defaultAuthPath()) {
-    await new LockedJsonFile(authPath).withLockAsync(async (current) => {
-        const data = parse(current);
-        data[providerId] = credential;
-        return { result: undefined, next: serialize(data) };
-    });
-}
-/** Remove one provider's credential (logout) under the auth.json lock. Returns
- * whether a record was removed from the exact snapshot this write replaced. */
-export async function deleteAuthCredential(providerId, authPath = defaultAuthPath()) {
-    return new LockedJsonFile(authPath).withLockAsync(async (current) => {
-        const data = parse(current);
-        const removed = Object.hasOwn(data, providerId);
-        delete data[providerId];
-        return { result: removed, next: serialize(data) };
-    });
-}
-/**
- * The `CredentialStore` crouter hands to `ModelRuntime`. Backed directly by auth.json rather
- * than by an in-memory cache, so `modify` is a real cross-process read-modify-write: pi's
- * locked OAuth refresh inside `Models.getAuth()` and crouter's own credential writes serialize
- * against each other on one lock.
- */
-export class CrouterCredentialStore {
-    authPath;
-    file;
-    constructor(authPath = defaultAuthPath()) {
-        this.authPath = authPath;
-        this.file = new LockedJsonFile(authPath);
-    }
-    async read(providerId) {
-        const credential = await readAuthCredential(providerId, this.authPath);
-        if (credential?.type !== 'api_key' || credential.key === undefined)
-            return credential;
-        return { ...credential, key: resolveCredentialValue(credential.key, credential.env) };
-    }
-    async list() {
-        // Lock-free for the same reason as `readAuthCredentials`.
-        return Object.entries(parse(this.file.readUnlocked())).map(([providerId, credential]) => ({
-            providerId,
-            type: credential.type,
-        }));
-    }
-    async modify(providerId, fn) {
-        return this.file.withLockAsync(async (current) => {
-            const data = parse(current);
-            const next = await fn(data[providerId]);
-            // Per the CredentialStore contract, `undefined` leaves the entry unchanged.
-            if (next === undefined)
-                return { result: data[providerId] };
-            data[providerId] = next;
-            return { result: next, next: serialize(data) };
-        });
-    }
-    async delete(providerId) {
-        await deleteAuthCredential(providerId, this.authPath);
-    }
-}
+var m=Object.defineProperty;var a=(e,t)=>m(e,"name",{value:t,configurable:!0});import{execSync as w}from"node:child_process";import{homedir as A}from"node:os";import{join as k}from"node:path";import{LockedJsonFile as d}from"./locked-file.js";function c(){return k(A(),".pi","agent","auth.json")}a(c,"defaultAuthPath");function l(e){if(e===void 0||e.trim()==="")return{};const t=JSON.parse(e);return t!==null&&typeof t=="object"?t:{}}a(l,"parse");function p(e){return`${JSON.stringify(e,null,2)}
+`}a(p,"serialize");const _=/^[A-Za-z_][A-Za-z0-9_]*/,C=/^[A-Za-z_][A-Za-z0-9_]*$/,x=new Map;function O(e){if(x.has(e))return x.get(e);let t;try{t=w(e,{encoding:"utf-8",timeout:1e4,stdio:["ignore","pipe","ignore"]}).trim()||void 0}catch{t=void 0}return x.set(e,t),t}a(O,"runValueCommand");function N(e,t){if(e.startsWith("!"))return O(e.slice(1));let n="",i=0;for(;i<e.length;){const r=e.indexOf("$",i);if(r<0){n+=e.slice(i);break}n+=e.slice(i,r);const s=e[r+1];if(s==="$"||s==="!"){n+=s,i=r+2;continue}let u,f=r+1;if(s==="{"){const o=e.indexOf("}",r+2),y=o<0?void 0:e.slice(r+2,o);y!==void 0&&C.test(y)&&(u=y,f=o+1)}else{const o=_.exec(e.slice(r+1));o!==null&&(u=o[0],f=r+1+u.length)}if(u===void 0){n+="$",i=r+1;continue}const h=t?.[u]||process.env[u];if(h===void 0||h==="")return;n+=h,i=f}return n}a(N,"resolveCredentialValue");async function j(e=c()){return l(new d(e).readUnlocked())}a(j,"readAuthCredentials");async function z(e,t=c()){return(await j(t))[e]}a(z,"readAuthCredential");async function L(e,t,n=c()){await new d(n).withLockAsync(async i=>{const r=l(i);return r[e]=t,{result:void 0,next:p(r)}})}a(L,"setAuthCredential");async function E(e,t=c()){return new d(t).withLockAsync(async n=>{const i=l(n),r=Object.hasOwn(i,e);return delete i[e],{result:r,next:p(i)}})}a(E,"deleteAuthCredential");class S{static{a(this,"CrouterCredentialStore")}authPath;file;constructor(t=c()){this.authPath=t,this.file=new d(t)}async read(t){const n=await z(t,this.authPath);return n?.type!=="api_key"||n.key===void 0?n:{...n,key:N(n.key,n.env)}}async list(){return Object.entries(l(this.file.readUnlocked())).map(([t,n])=>({providerId:t,type:n.type}))}async modify(t,n){return this.file.withLockAsync(async i=>{const r=l(i),s=await n(r[t]);return s===void 0?{result:r[t]}:(r[t]=s,{result:s,next:p(r)})})}async delete(t){await E(t,this.authPath)}}export{S as CrouterCredentialStore,c as defaultAuthPath,E as deleteAuthCredential,z as readAuthCredential,j as readAuthCredentials,N as resolveCredentialValue,L as setAuthCredential};

package/dist/core/auth-interaction.js

@@ -1,94 +1,3 @@
-// auth-interaction.ts — the one adapter from pi 0.82's `AuthInteraction` onto pi's
-// `LoginDialogComponent`.
-//
-// pi 0.82 collapsed the old six-callback login bag (`onAuth`/`onPrompt`/`onProgress`/
-// `onManualCodeInput`/`onDeviceCode`/`onSelect`) into a single `AuthInteraction`
-// (`signal` + `prompt()` + `notify()`). Both crouter login surfaces — `crtr sys setup`'s
-// Providers panel and the attach viewer's `/login` overlay — drive the SAME
-// `LoginDialogComponent`, so the mapping lives here once instead of twice.
-/** Race a pending prompt against EVERY live signal, rejecting with pi's own cancel
- *  error. Both the interaction-wide signal (cancel of the whole login) and the
- *  per-prompt signal must be honored: an OAuth flow may issue a prompt with no
- *  signal of its own after the flow was already cancelled, and racing only the
- *  per-prompt signal would strand that prompt forever. */
-async function withAbort(pending, signals) {
-    const live = signals.filter((s) => s !== undefined);
-    if (live.length === 0)
-        return pending;
-    const cleanups = [];
-    const aborted = new Promise((_resolve, reject) => {
-        for (const signal of live) {
-            const onAbort = () => reject(new Error('Login cancelled'));
-            signal.addEventListener('abort', onAbort, { once: true });
-            cleanups.push(() => signal.removeEventListener('abort', onAbort));
-        }
-    });
-    try {
-        return await Promise.race([pending, aborted]);
-    }
-    finally {
-        for (const cleanup of cleanups)
-            cleanup();
-    }
-}
-/**
- * Build the `AuthInteraction` for one login flow on `dialog`.
- *
- * `select` prompts render as a numbered list through the dialog's normal text input:
- * the dialog occupies crouter's single inline slot in both surfaces, so swapping in pi's
- * separate selector component (what pi's own interactive mode does) has nowhere to go.
- */
-export function dialogAuthInteraction(dialog, options = {}) {
-    const { openBrowser, onChange, isActive } = options;
-    const active = () => (isActive ? isActive() : !dialog.signal.aborted);
-    const changed = () => onChange?.();
-    return {
-        signal: dialog.signal,
-        notify(event) {
-            if (!active())
-                return;
-            switch (event.type) {
-                case 'auth_url':
-                    dialog.showAuth(event.url, event.instructions);
-                    openBrowser?.(event.url);
-                    break;
-                case 'device_code':
-                    dialog.showDeviceCode(event);
-                    dialog.showWaiting('Waiting for authentication...');
-                    openBrowser?.(event.verificationUri);
-                    break;
-                case 'info':
-                    dialog.showInfo(event.message, event.links);
-                    break;
-                case 'progress':
-                    dialog.showProgress(event.message);
-                    break;
-            }
-            changed();
-        },
-        async prompt(prompt) {
-            // Already cancelled: reject WITHOUT putting the dialog into a prompt state
-            // it would never leave.
-            if (dialog.signal.aborted || prompt.signal?.aborted === true)
-                throw new Error('Login cancelled');
-            let pending;
-            if (prompt.type === 'select') {
-                const menu = prompt.options.map((option, index) => `${index + 1}. ${option.label}`).join('\n');
-                pending = dialog.showPrompt(`${prompt.message}\n${menu}`, '1').then((answer) => {
-                    const id = prompt.options[Number.parseInt(answer, 10) - 1]?.id;
-                    if (id === undefined)
-                        throw new Error('Login cancelled');
-                    return id;
-                });
-            }
-            else if (prompt.type === 'manual_code') {
-                pending = dialog.showManualInput(prompt.message);
-            }
-            else {
-                pending = dialog.showPrompt(prompt.message, prompt.placeholder);
-            }
-            changed();
-            return withAbort(pending, [dialog.signal, prompt.signal]);
-        },
-    };
-}
+var w=Object.defineProperty;var o=(n,t)=>w(n,"name",{value:t,configurable:!0});async function b(n,t){const a=t.filter(r=>r!==void 0);if(a.length===0)return n;const i=[],c=new Promise((r,u)=>{for(const e of a){const s=o(()=>u(new Error("Login cancelled")),"onAbort");e.addEventListener("abort",s,{once:!0}),i.push(()=>e.removeEventListener("abort",s))}});try{return await Promise.race([n,c])}finally{for(const r of i)r()}}o(b,"withAbort");function d(n,t={}){const{openBrowser:a,onChange:i,isActive:c}=t,r=o(()=>c?c():!n.signal.aborted,"active"),u=o(()=>i?.(),"changed");return{signal:n.signal,notify(e){if(r()){switch(e.type){case"auth_url":n.showAuth(e.url,e.instructions),a?.(e.url);break;case"device_code":n.showDeviceCode(e),n.showWaiting("Waiting for authentication..."),a?.(e.verificationUri);break;case"info":n.showInfo(e.message,e.links);break;case"progress":n.showProgress(e.message);break}u()}},async prompt(e){if(n.signal.aborted||e.signal?.aborted===!0)throw new Error("Login cancelled");let s;if(e.type==="select"){const f=e.options.map((h,l)=>`${l+1}. ${h.label}`).join(`
+`);s=n.showPrompt(`${e.message}
+${f}`,"1").then(h=>{const l=e.options[Number.parseInt(h,10)-1]?.id;if(l===void 0)throw new Error("Login cancelled");return l})}else e.type==="manual_code"?s=n.showManualInput(e.message):s=n.showPrompt(e.message,e.placeholder);return u(),b(s,[n.signal,e.signal])}}}o(d,"dialogAuthInteraction");export{d as dialogAuthInteraction};

package/dist/core/auto-update.js

@@ -1,94 +1,4 @@
-import { spawn } from 'node:child_process';
-import { readConfig, readState, updateState } from './config.js';
-import { nowIso } from './fs-utils.js';
-import { info } from './output.js';
-import { SELF_UPDATE_SCRIPT, selfCheck, contentCheck } from './self-update.js';
-import { envDebug } from '../shared/env.js';
-const HOUR_MS = 60 * 60 * 1000;
-const SKIP_SUBCOMMANDS = new Set([
-    'update',
-    'help',
-    '--help',
-    '-h',
-    '--version',
-    '-v',
-]);
-function shouldSkipForArgv(argv) {
-    const sub = argv[2];
-    if (sub === undefined)
-        return true;
-    return SKIP_SUBCOMMANDS.has(sub);
-}
-function withinInterval(lastIso, intervalHours) {
-    if (!lastIso)
-        return false;
-    const last = Date.parse(lastIso);
-    if (!Number.isFinite(last))
-        return false;
-    return Date.now() - last < intervalHours * HOUR_MS;
-}
-function spawnDetachedSelfUpdate() {
-    const child = spawn(process.execPath, [SELF_UPDATE_SCRIPT], {
-        detached: true,
-        stdio: 'ignore',
-    });
-    child.unref();
-}
-function spawnDetachedContentUpdate() {
-    const child = spawn('crtr', ['update', '--content'], {
-        detached: true,
-        stdio: 'ignore',
-    });
-    child.unref();
-}
-export function maybeAutoUpdate(argv) {
-    try {
-        if (process.env.CRTR_NO_AUTO_UPDATE === '1')
-            return;
-        if (shouldSkipForArgv(argv))
-            return;
-        const cfg = readConfig('user');
-        const { crtr, content, interval_hours } = cfg.auto_update;
-        if (crtr === false && content === false)
-            return;
-        const state = readState('user');
-        if (state.last_self_check === undefined) {
-            updateState('user', (s) => {
-                s.last_self_check = nowIso();
-            });
-            return;
-        }
-        if (withinInterval(state.last_self_check, interval_hours))
-            return;
-        updateState('user', (s) => {
-            s.last_self_check = nowIso();
-        });
-        if (crtr === 'notify') {
-            const r = selfCheck();
-            if (r !== null && r.latest !== r.current) {
-                process.stderr.write(`crtr: v${r.latest} available (current ${r.current}) — run \`crtr sys update\`\n`);
-            }
-        }
-        else if (crtr === 'apply') {
-            info('applying self-update in background');
-            spawnDetachedSelfUpdate();
-        }
-        if (content === 'notify') {
-            const stale = contentCheck().filter((e) => !e.up_to_date && !e.unreachable);
-            if (stale.length > 0) {
-                const list = stale.map((e) => `${e.kind} ${e.name}`).join(', ');
-                process.stderr.write(`crtr: updates available for ${list} — run \`crtr sys update\`\n`);
-            }
-        }
-        else if (content === 'apply') {
-            info('applying content updates in background');
-            spawnDetachedContentUpdate();
-        }
-    }
-    catch (e) {
-        if (envDebug()) {
-            const msg = e instanceof Error ? e.message : String(e);
-            process.stderr.write(`crtr: auto-update hook error: ${msg}\n`);
-        }
-    }
-}
+var h=Object.defineProperty;var s=(r,e)=>h(r,"name",{value:e,configurable:!0});import{spawn as u}from"node:child_process";import{readConfig as _,readState as m,updateState as f}from"./config.js";import{nowIso as l}from"./fs-utils.js";import{info as p}from"./output.js";import{SELF_UPDATE_SCRIPT as g,selfCheck as S,contentCheck as k}from"./self-update.js";import{envDebug as v}from"../shared/env.js";const w=3600*1e3,y=new Set(["update","help","--help","-h","--version","-v"]);function b(r){const e=r[2];return e===void 0?!0:y.has(e)}s(b,"shouldSkipForArgv");function D(r,e){if(!r)return!1;const n=Date.parse(r);return Number.isFinite(n)?Date.now()-n<e*w:!1}s(D,"withinInterval");function U(){u(process.execPath,[g],{detached:!0,stdio:"ignore"}).unref()}s(U,"spawnDetachedSelfUpdate");function C(){u("crtr",["update","--content"],{detached:!0,stdio:"ignore"}).unref()}s(C,"spawnDetachedContentUpdate");function F(r){try{if(process.env.CRTR_NO_AUTO_UPDATE==="1"||b(r))return;const e=_("user"),{crtr:n,content:a,interval_hours:d}=e.auto_update;if(n===!1&&a===!1)return;const c=m("user");if(c.last_self_check===void 0){f("user",t=>{t.last_self_check=l()});return}if(D(c.last_self_check,d))return;if(f("user",t=>{t.last_self_check=l()}),n==="notify"){const t=S();t!==null&&t.latest!==t.current&&process.stderr.write(`crtr: v${t.latest} available (current ${t.current}) \u2014 run \`crtr sys update\`
+`)}else n==="apply"&&(p("applying self-update in background"),U());if(a==="notify"){const t=k().filter(o=>!o.up_to_date&&!o.unreachable);if(t.length>0){const o=t.map(i=>`${i.kind} ${i.name}`).join(", ");process.stderr.write(`crtr: updates available for ${o} \u2014 run \`crtr sys update\`
+`)}}else a==="apply"&&(p("applying content updates in background"),C())}catch(e){if(v()){const n=e instanceof Error?e.message:String(e);process.stderr.write(`crtr: auto-update hook error: ${n}
+`)}}}s(F,"maybeAutoUpdate");export{F as maybeAutoUpdate};