@marifold/core 0.60.0

package/dist/profiles/ProfileResolver.js

@@ -0,0 +1,280 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ProfileResolver = void 0;
+const fs = __importStar(require("fs"));
+const path = __importStar(require("path"));
+const smol_toml_1 = require("smol-toml");
+const MarifoldError_1 = require("../errors/MarifoldError");
+const ConfigLoader_1 = require("../config/ConfigLoader");
+const ProfileManager_1 = require("./ProfileManager");
+const SAFE_PROFILE_NAME = /^[A-Za-z0-9_-]+$/;
+const BUILT_IN_DEFAULT_PROFILE = {
+    name: 'default',
+    identity: 'You are Marifold, a local-first personal AI workspace assistant.',
+    rules: 'Answer clearly and practically. Do not claim unsupported capabilities.',
+    custom: '',
+    memories: [],
+};
+class ProfileResolver {
+    profilesDir;
+    constructor(profilesDir) {
+        this.profilesDir = profilesDir;
+    }
+    load(name) {
+        this.assertSafeName(name);
+        const directoryProfile = this.loadDirectoryProfile(name);
+        if (directoryProfile)
+            return directoryProfile;
+        const jsonProfile = this.loadJsonProfile(name);
+        if (jsonProfile)
+            return jsonProfile;
+        if (name === 'default')
+            return { ...BUILT_IN_DEFAULT_PROFILE };
+        throw MarifoldError_1.MarifoldError.profileInvalid(`Profile '${name}' was not found in ${this.profilesDir}.`, name);
+    }
+    loadSettings(name) {
+        this.assertSafeName(name);
+        const profileToml = path.join(this.profilesDir, name, 'profile.toml');
+        if (!fs.existsSync(profileToml))
+            return { memories: true };
+        const raw = this.readToml(profileToml);
+        const displayName = (0, ProfileManager_1.normalizeProfileDisplayName)(optionalString(raw.display_name, `${name}.profile.toml display_name`), name);
+        const provider = optionalString(raw.provider, `${name}.profile.toml provider`);
+        const model = optionalString(raw.model, `${name}.profile.toml model`);
+        const memories = optionalBoolean(raw.memories, `${name}.profile.toml memories`) ?? true;
+        const maxContextTokens = optionalNumber(raw.max_context_tokens, `${name}.profile.toml max_context_tokens`);
+        const sessionContextTurns = optionalTurnWindow(raw.session_context_turns, `${name}.profile.toml session_context_turns`);
+        const think = optionalBoolean(raw.think, `${name}.profile.toml think`);
+        const agent = raw.agent !== undefined ? (0, ConfigLoader_1.parsePartialAgentConfig)(raw.agent, `${name}.profile.toml [agent]`) : undefined;
+        const rawMode = optionalString(raw.mode, `${name}.profile.toml mode`);
+        if (rawMode !== undefined && rawMode !== 'agent' && rawMode !== 'chat') {
+            throw MarifoldError_1.MarifoldError.profileInvalid(`Profile '${name}' has an invalid mode '${rawMode}' in profile.toml; use "agent" or "chat".`, name);
+        }
+        if ((provider && !model) || (!provider && model)) {
+            throw MarifoldError_1.MarifoldError.profileInvalid(`Profile '${name}' must set both provider and model in profile.toml, or neither.`, name);
+        }
+        return { displayName, provider, model, memories, mode: rawMode, maxContextTokens, sessionContextTurns, think, agent };
+    }
+    list() {
+        const profiles = new Map();
+        if (fs.existsSync(this.profilesDir)) {
+            for (const entry of fs.readdirSync(this.profilesDir, { withFileTypes: true })) {
+                if (entry.isDirectory() && SAFE_PROFILE_NAME.test(entry.name)) {
+                    const profilePath = path.join(this.profilesDir, entry.name);
+                    if (isProfileDirectory(profilePath)) {
+                        profiles.set(entry.name, {
+                            name: entry.name,
+                            displayName: this.resolveDisplayName(entry.name),
+                            source: 'directory',
+                            path: profilePath,
+                        });
+                    }
+                }
+                else if (entry.isFile() && entry.name.endsWith('.json')) {
+                    const name = entry.name.slice(0, -'.json'.length);
+                    if (SAFE_PROFILE_NAME.test(name) && !profiles.has(name)) {
+                        profiles.set(name, {
+                            name,
+                            displayName: name,
+                            source: 'json',
+                            path: path.join(this.profilesDir, entry.name),
+                        });
+                    }
+                }
+            }
+        }
+        if (!profiles.has('default')) {
+            profiles.set('default', { name: 'default', displayName: 'default', source: 'built-in' });
+        }
+        // Avatars live in the profile dir regardless of source — even the built-in
+        // default can carry one (setAvatar scaffolds the dir without md/toml files).
+        for (const summary of profiles.values()) {
+            const avatar = (0, ProfileManager_1.findProfileAvatar)(this.profilesDir, summary.name);
+            if (avatar)
+                summary.avatar = { mediaType: avatar.mediaType };
+        }
+        return [...profiles.values()].sort((a, b) => a.name.localeCompare(b.name));
+    }
+    detail(name) {
+        this.assertSafeName(name);
+        const summary = this.list().find(profile => profile.name === name);
+        if (!summary) {
+            throw MarifoldError_1.MarifoldError.profileInvalid(`Profile '${name}' was not found in ${this.profilesDir}.`, name);
+        }
+        if (summary.source === 'directory' && summary.path) {
+            return {
+                ...summary,
+                settings: this.loadSettings(name),
+                files: {
+                    profile: readProfileFile(path.join(summary.path, 'PROFILE.md')),
+                    rules: readProfileFile(path.join(summary.path, 'RULES.md')),
+                    custom: readProfileFile(path.join(summary.path, 'CUSTOM.md')),
+                    profileToml: readProfileFile(path.join(summary.path, 'profile.toml')),
+                },
+            };
+        }
+        if (summary.source === 'json' && summary.path) {
+            const profile = this.loadJsonProfile(name);
+            return {
+                ...summary,
+                settings: { memories: true },
+                files: {
+                    profile: { path: summary.path, content: profile?.identity ?? '' },
+                    rules: { path: summary.path, content: profile?.rules ?? '' },
+                    custom: { path: summary.path, content: profile?.custom ?? '' },
+                    profileToml: { content: '' },
+                },
+            };
+        }
+        return {
+            ...summary,
+            settings: { memories: true },
+            files: {
+                profile: { content: BUILT_IN_DEFAULT_PROFILE.identity },
+                rules: { content: BUILT_IN_DEFAULT_PROFILE.rules },
+                custom: { content: BUILT_IN_DEFAULT_PROFILE.custom ?? '' },
+                profileToml: { content: '' },
+            },
+        };
+    }
+    loadDirectoryProfile(name) {
+        const profileDir = path.join(this.profilesDir, name);
+        if (!isProfileDirectory(profileDir))
+            return undefined;
+        return {
+            name,
+            identity: readOptional(path.join(profileDir, 'PROFILE.md')),
+            rules: readOptional(path.join(profileDir, 'RULES.md')),
+            custom: readOptional(path.join(profileDir, 'CUSTOM.md')),
+            memories: [],
+        };
+    }
+    loadJsonProfile(name) {
+        const filePath = path.join(this.profilesDir, `${name}.json`);
+        if (!fs.existsSync(filePath))
+            return undefined;
+        try {
+            const raw = JSON.parse(fs.readFileSync(filePath, 'utf-8'));
+            return {
+                name,
+                identity: raw.identity ?? '',
+                rules: raw.rules ?? '',
+                custom: raw.custom,
+                memories: raw.memories ?? [],
+            };
+        }
+        catch (error) {
+            throw MarifoldError_1.MarifoldError.profileInvalid(`Profile '${name}' JSON is invalid: ${String(error)}`, name);
+        }
+    }
+    readToml(filePath) {
+        try {
+            const value = (0, smol_toml_1.parse)(fs.readFileSync(filePath, 'utf-8'));
+            if (typeof value === 'object' && value !== null && !Array.isArray(value)) {
+                return value;
+            }
+            throw new Error('TOML root must be an object.');
+        }
+        catch (error) {
+            throw MarifoldError_1.MarifoldError.profileInvalid(`Could not read profile config ${filePath}: ${String(error)}`, path.basename(path.dirname(filePath)));
+        }
+    }
+    /** Keep profile listing resilient to unrelated invalid settings; opening the
+     * profile detail still reports the underlying profile.toml error. */
+    resolveDisplayName(name) {
+        try {
+            return this.loadSettings(name).displayName ?? name;
+        }
+        catch {
+            return name;
+        }
+    }
+    assertSafeName(name) {
+        if (!SAFE_PROFILE_NAME.test(name)) {
+            throw MarifoldError_1.MarifoldError.profileInvalid(`Invalid profile name '${name}'. Use letters, numbers, underscores, or hyphens.`, name);
+        }
+    }
+}
+exports.ProfileResolver = ProfileResolver;
+function isProfileDirectory(profileDir) {
+    return fs.existsSync(profileDir) && fs.statSync(profileDir).isDirectory()
+        && (fs.existsSync(path.join(profileDir, 'PROFILE.md'))
+            || fs.existsSync(path.join(profileDir, 'RULES.md'))
+            || fs.existsSync(path.join(profileDir, 'CUSTOM.md'))
+            || fs.existsSync(path.join(profileDir, 'profile.toml')));
+}
+function readOptional(filePath) {
+    return fs.existsSync(filePath) ? fs.readFileSync(filePath, 'utf-8') : '';
+}
+function readProfileFile(filePath) {
+    return {
+        path: filePath,
+        content: readOptional(filePath),
+    };
+}
+function optionalString(value, label) {
+    if (value === undefined)
+        return undefined;
+    if (typeof value === 'string')
+        return value;
+    throw MarifoldError_1.MarifoldError.configInvalid(`Expected ${label} to be a string.`);
+}
+function optionalBoolean(value, label) {
+    if (value === undefined)
+        return undefined;
+    if (typeof value === 'boolean')
+        return value;
+    throw MarifoldError_1.MarifoldError.configInvalid(`Expected ${label} to be a boolean.`);
+}
+function optionalNumber(value, label) {
+    if (value === undefined)
+        return undefined;
+    if (typeof value === 'number' && Number.isFinite(value))
+        return value;
+    throw MarifoldError_1.MarifoldError.configInvalid(`Expected ${label} to be a number.`);
+}
+/** Parse `session_context_turns`: `"all"` (or unset) → undefined (no cap),
+ *  a non-negative integer → that many recent turns. */
+function optionalTurnWindow(value, label) {
+    if (value === undefined)
+        return undefined;
+    if (typeof value === 'string' && value.trim().toLowerCase() === 'all')
+        return undefined;
+    if (typeof value === 'number' && Number.isInteger(value) && value >= 0)
+        return value;
+    throw MarifoldError_1.MarifoldError.configInvalid(`Expected ${label} to be a non-negative integer or "all".`);
+}
+//# sourceMappingURL=ProfileResolver.js.map

package/dist/profiles/ProfileResolver.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ProfileResolver.js","sourceRoot":"","sources":["../../src/profiles/ProfileResolver.ts"],"names":[],"mappings":"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"}

package/dist/runs/RunRegistry.d.ts

@@ -0,0 +1,140 @@
+import type { ImageInput } from '@priest-ai/core';
+import { AgentEvent, AgentUsage } from '../agent/AgentEvents';
+import { AgentRunner } from '../agent/AgentRunner';
+import { ApprovalMode, ApprovalRequest, ToolKind } from '../agent/ApprovalPolicy';
+import type { RunFileInput } from '../agent/RunWorkspace';
+import { TaskStatus } from '../tasks/TaskStore';
+import { type UserInputRequest } from '../agent/UserInput';
+/** The narrow runtime slice the registry needs, so tests can fake it without a
+ * full MarifoldRuntime. `MarifoldRuntime.createRunRegistry()` binds the real one. */
+export interface RunRegistryRuntime {
+    createAgentRunner(profile?: string): AgentRunner;
+    setProfileAgentApproval(profile: string, kind: ToolKind, mode: ApprovalMode): void;
+    addProfileTrustedFolder(profile: string, folder: string): string;
+    defaultProfile(): string;
+}
+export interface RunRegistryOptions {
+    runtime: RunRegistryRuntime;
+    /** How long an approval prompt waits for an answer before auto-denying.
+     * Matches the Telegram bridge's five-minute window by default. */
+    approvalTimeoutMs?: number;
+    /** How long a clarification card may remain unanswered before the tool is
+     * returned to the model as unavailable. */
+    userInputTimeoutMs?: number;
+    /** How long a finished run (and its event buffer) stays queryable for
+     * late/reconnecting clients before eviction. */
+    finishedRunTtlMs?: number;
+    maxActiveRuns?: number;
+    /** Per-run event buffer cap; oldest events drop first (clients can backfill
+     * from the run's durable task record). */
+    maxBufferedEvents?: number;
+    log?: (message: string) => void;
+}
+/** What a client may pass when starting a run. Mirrors the AgentRunOptions
+ * surface that is safe to accept over the service boundary. */
+export interface RunStartInput {
+    objective: string;
+    profile?: string;
+    provider?: string;
+    model?: string;
+    sessionId?: string;
+    /** Display text persisted for the user turn when `objective` is an expanded
+     * skill prompt. */
+    userTurn?: string;
+    /** Replace a persisted exchange instead of appending a new one. */
+    replaceUserTurnIndex?: number;
+    think?: boolean;
+    /** Staged for lazy inspect_attachment access during the agent run. */
+    images?: ImageInput[];
+    /** Preserve attached images' original encoded bytes for this run. */
+    originalImages?: boolean;
+    /** Binary files staged read-only inside this run's isolated input folder. */
+    files?: RunFileInput[];
+    instructions?: string[];
+    maxIterations?: number;
+    forcePlan?: boolean;
+    lean?: boolean;
+    cwd?: string;
+}
+/** Snapshot view of a run for list/get responses. `status` is the TaskStatus
+ * verbatim — `running` until the terminal `done` event lands. */
+export interface RunRecord {
+    id: string;
+    objective: string;
+    profile: string;
+    status: TaskStatus;
+    taskId?: string;
+    sessionId?: string;
+    createdAt: string;
+    finishedAt?: string;
+    summary?: string;
+    usage?: AgentUsage;
+    /** Sequence number of the newest buffered event (0 = none yet). */
+    eventCount: number;
+    pendingApprovals: ApprovalRequest[];
+    pendingUserInputs: UserInputRequest[];
+}
+export interface SequencedEvent {
+    seq: number;
+    event: AgentEvent;
+}
+export type RunApprovalAction = 'once' | 'always' | 'trust' | 'deny';
+/**
+ * In-memory session state for agent runs driven across separate requests
+ * (start → event stream → approval answer → cancel). The durable record lives
+ * in TaskStore (`run.taskId`); this registry adds the live layer TaskStore
+ * cannot hold: the abort handle, pending-approval resolution, the steering
+ * queue, and a sequenced event buffer for (re)connecting subscribers.
+ */
+export declare class RunRegistry {
+    private readonly runs;
+    private readonly pending;
+    private readonly pendingUserInputs;
+    private readonly runtime;
+    private readonly approvalTimeoutMs;
+    private readonly userInputTimeoutMs;
+    private readonly finishedRunTtlMs;
+    private readonly maxActiveRuns;
+    private readonly maxBufferedEvents;
+    private readonly log?;
+    private closed;
+    constructor(options: RunRegistryOptions);
+    start(input: RunStartInput): RunRecord;
+    get(runId: string): RunRecord | undefined;
+    require(runId: string): RunRecord;
+    list(): RunRecord[];
+    /** Replay buffered events past `afterSeq`, then follow live ones. Returns
+     * after yielding the terminal `done` event (or immediately after replay when
+     * the run already finished). `signal` detaches the subscriber early. */
+    events(runId: string, afterSeq?: number, signal?: AbortSignal): AsyncGenerator<SequencedEvent, void, unknown>;
+    answerApproval(runId: string, requestId: string, action: RunApprovalAction): {
+        requestId: string;
+        approved: boolean;
+    };
+    answerUserInput(runId: string, requestId: string, value: unknown): {
+        requestId: string;
+        accepted: true;
+    };
+    /** Queue mid-run guidance; the runner drains it before its next iteration
+     * and emits a `steering` event so attached clients see it land. */
+    steer(runId: string, text: string): void;
+    /** Idempotent: aborts an active run (resolving any pending approval so the
+     * loop unblocks immediately) and reports the current status either way. */
+    cancel(runId: string): TaskStatus;
+    close(): void;
+    private pump;
+    private append;
+    private finish;
+    /** ApprovalHandler for the run: short-circuit on this run's session grants,
+     * otherwise park the request until a client answers, the timeout fires, or
+     * the run is cancelled. Mirrors TelegramBridge.requestApproval. */
+    private handleApproval;
+    private handleUserInput;
+    private waitForChange;
+    private notify;
+    private sweepFinished;
+    private toRecord;
+    private userInputKey;
+    private createRunId;
+}
+//# sourceMappingURL=RunRegistry.d.ts.map

package/dist/runs/RunRegistry.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"RunRegistry.d.ts","sourceRoot":"","sources":["../../src/runs/RunRegistry.ts"],"names":[],"mappings":"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"}