@ouro.bot/cli 0.1.0-alpha.13 → 0.1.0-alpha.131

package/dist/heart/safe-workspace.js

@@ -0,0 +1,381 @@
+"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.resetSafeWorkspaceSelection = resetSafeWorkspaceSelection;
+exports.getActiveSafeWorkspaceSelection = getActiveSafeWorkspaceSelection;
+exports.ensureSafeRepoWorkspace = ensureSafeRepoWorkspace;
+exports.resolveSafeRepoPath = resolveSafeRepoPath;
+exports.resolveSafeShellExecution = resolveSafeShellExecution;
+const fs = __importStar(require("fs"));
+const path = __importStar(require("path"));
+const child_process_1 = require("child_process");
+const identity_1 = require("./identity");
+const runtime_1 = require("../nerves/runtime");
+let activeSelection = null;
+let cleanupHookRegistered = false;
+function workspaceSelectionStateFile(workspaceBase) {
+    return path.join(workspaceBase, ".active-safe-workspace.json");
+}
+function getOptionalFsFn(name) {
+    try {
+        return fs[name];
+    }
+    catch {
+        return undefined;
+    }
+}
+function shouldPersistSelection(options) {
+    return options.persistSelection ?? options.workspaceRoot === undefined;
+}
+function isPersistedSelectionShape(value) {
+    if (!value || typeof value !== "object")
+        return false;
+    const candidate = value;
+    return (typeof candidate.runtimeKind === "string"
+        && typeof candidate.repoRoot === "string"
+        && typeof candidate.workspaceRoot === "string"
+        && typeof candidate.workspaceBranch === "string"
+        && (candidate.sourceBranch === null || typeof candidate.sourceBranch === "string")
+        && typeof candidate.sourceCloneUrl === "string"
+        && typeof candidate.cleanupAfterMerge === "boolean"
+        && typeof candidate.created === "boolean"
+        && typeof candidate.note === "string");
+}
+function loadPersistedSelection(workspaceBase, options) {
+    const existsSync = options.existsSync ?? fs.existsSync;
+    const readFileSync = options.readFileSync ?? getOptionalFsFn("readFileSync");
+    const unlinkSync = options.unlinkSync ?? getOptionalFsFn("unlinkSync");
+    const stateFile = workspaceSelectionStateFile(workspaceBase);
+    if (!existsSync(stateFile))
+        return null;
+    if (!readFileSync)
+        return null;
+    try {
+        const raw = readFileSync(stateFile, "utf-8");
+        const parsed = JSON.parse(raw);
+        if (!isPersistedSelectionShape(parsed) || !existsSync(parsed.workspaceRoot)) {
+            try {
+                unlinkSync?.(stateFile);
+            }
+            catch {
+                // best effort
+            }
+            return null;
+        }
+        return parsed;
+    }
+    catch {
+        try {
+            unlinkSync?.(stateFile);
+        }
+        catch {
+            // best effort
+        }
+        return null;
+    }
+}
+function persistSelectionState(workspaceBase, selection, options) {
+    const mkdirSync = options.mkdirSync ?? fs.mkdirSync;
+    const writeFileSync = options.writeFileSync ?? getOptionalFsFn("writeFileSync");
+    if (!writeFileSync)
+        return;
+    mkdirSync(workspaceBase, { recursive: true });
+    writeFileSync(workspaceSelectionStateFile(workspaceBase), JSON.stringify(selection, null, 2), "utf-8");
+}
+function defaultNow() {
+    return Date.now();
+}
+function resolveAgentName(explicit) {
+    if (explicit && explicit.trim().length > 0)
+        return explicit.trim();
+    try {
+        return (0, identity_1.getAgentName)();
+    }
+    catch {
+        return "slugger";
+    }
+}
+function runGit(cwd, args, spawnSync) {
+    return spawnSync("git", args, { cwd, stdio: ["ignore", "pipe", "pipe"] });
+}
+function readStdout(result) {
+    return (result.stdout ?? Buffer.from("")).toString("utf-8").trim();
+}
+function readStderr(result) {
+    return (result.stderr ?? Buffer.from("")).toString("utf-8").trim();
+}
+function assertGitOk(result, action) {
+    if (result.error) {
+        throw result.error;
+    }
+    if (result.status !== 0) {
+        const detail = readStderr(result) || readStdout(result) || `exit ${result.status ?? "unknown"}`;
+        throw new Error(`${action} failed: ${detail}`);
+    }
+    return readStdout(result);
+}
+function isGitClone(repoRoot, spawnSync) {
+    const result = runGit(repoRoot, ["rev-parse", "--is-inside-work-tree"], spawnSync);
+    return result.status === 0 && readStdout(result) === "true";
+}
+function readCurrentBranch(repoRoot, spawnSync) {
+    return assertGitOk(runGit(repoRoot, ["rev-parse", "--abbrev-ref", "HEAD"], spawnSync), "git branch read");
+}
+function ensureFetchedOrigin(repoRoot, spawnSync) {
+    assertGitOk(runGit(repoRoot, ["fetch", "origin"], spawnSync), "git fetch origin");
+}
+function ensureMainFastForward(repoRoot, spawnSync) {
+    assertGitOk(runGit(repoRoot, ["pull", "--ff-only", "origin", "main"], spawnSync), "git pull --ff-only origin main");
+}
+function createDedicatedWorktree(repoRoot, workspaceRoot, branchSuffix, existsSync, mkdirSync, rmSync, spawnSync) {
+    mkdirSync(path.dirname(workspaceRoot), { recursive: true });
+    const branchName = `slugger/${branchSuffix}`;
+    if (existsSync(workspaceRoot)) {
+        rmSync(workspaceRoot, { recursive: true, force: true });
+    }
+    assertGitOk(runGit(repoRoot, ["worktree", "add", "-B", branchName, workspaceRoot, "origin/main"], spawnSync), "git worktree add");
+    return { workspaceRoot, created: true, branchName };
+}
+function createScratchClone(workspaceRoot, cloneUrl, existsSync, mkdirSync, rmSync, spawnSync) {
+    mkdirSync(path.dirname(workspaceRoot), { recursive: true });
+    if (existsSync(workspaceRoot)) {
+        rmSync(workspaceRoot, { recursive: true, force: true });
+    }
+    const result = spawnSync("git", ["clone", "--depth", "1", "--branch", "main", cloneUrl, workspaceRoot], {
+        stdio: ["ignore", "pipe", "pipe"],
+    });
+    assertGitOk(result, "git clone");
+    return { workspaceRoot, created: true, branchName: "main" };
+}
+const REPO_LOCAL_SHELL_COMMAND = /^(?:[A-Za-z_][A-Za-z0-9_]*=\S+\s+)*(git|npm|npx|node|pnpm|yarn|bun|rg|sed|cat|ls|find|grep|vitest|tsc|eslint)\b/;
+function looksRepoLocalShellCommand(command) {
+    return REPO_LOCAL_SHELL_COMMAND.test(command.trim());
+}
+function registerCleanupHook(options) {
+    if (cleanupHookRegistered)
+        return;
+    cleanupHookRegistered = true;
+    process.on("exit", () => {
+        if (!activeSelection?.cleanupAfterMerge)
+            return;
+        try {
+            options.rmSync(activeSelection.workspaceRoot, { recursive: true, force: true });
+        }
+        catch {
+            // best effort
+        }
+    });
+}
+function resetSafeWorkspaceSelection(options = {}) {
+    activeSelection = null;
+    if (!options.keepCleanupHookRegistered) {
+        cleanupHookRegistered = false;
+    }
+}
+function getActiveSafeWorkspaceSelection() {
+    return activeSelection;
+}
+function refreshSelectionWorkspaceBranch(selection, spawnSync) {
+    try {
+        if (!isGitClone(selection.workspaceRoot, spawnSync)) {
+            return selection;
+        }
+        const liveBranch = readCurrentBranch(selection.workspaceRoot, spawnSync);
+        if (liveBranch === selection.workspaceBranch) {
+            return selection;
+        }
+        return { ...selection, workspaceBranch: liveBranch };
+    }
+    catch {
+        return selection;
+    }
+}
+function ensureSafeRepoWorkspace(options = {}) {
+    const agentName = resolveAgentName(options.agentName);
+    const workspaceBase = options.workspaceRoot ?? (0, identity_1.getAgentRepoWorkspacesRoot)(agentName);
+    const persistSelection = shouldPersistSelection(options);
+    const spawnSync = options.spawnSync ?? child_process_1.spawnSync;
+    const existsSync = options.existsSync ?? fs.existsSync;
+    const mkdirSync = options.mkdirSync ?? fs.mkdirSync;
+    const rmSync = options.rmSync ?? fs.rmSync;
+    if (activeSelection) {
+        const refreshed = refreshSelectionWorkspaceBranch(activeSelection, spawnSync);
+        activeSelection = refreshed;
+        return refreshed;
+    }
+    const repoRoot = options.repoRoot ?? (0, identity_1.getRepoRoot)();
+    const canonicalRepoUrl = options.canonicalRepoUrl ?? identity_1.HARNESS_CANONICAL_REPO_URL;
+    const now = options.now ?? defaultNow;
+    const stamp = String(now());
+    registerCleanupHook({ rmSync });
+    if (persistSelection) {
+        const restored = loadPersistedSelection(workspaceBase, options);
+        if (restored) {
+            const refreshed = refreshSelectionWorkspaceBranch(restored, spawnSync);
+            activeSelection = refreshed;
+            persistSelectionState(workspaceBase, refreshed, options);
+            (0, runtime_1.emitNervesEvent)({
+                component: "workspace",
+                event: "workspace.safe_repo_restored",
+                message: "restored safe repo workspace after runtime restart",
+                meta: {
+                    runtimeKind: refreshed.runtimeKind,
+                    repoRoot: refreshed.repoRoot,
+                    workspaceRoot: refreshed.workspaceRoot,
+                    workspaceBranch: refreshed.workspaceBranch,
+                    sourceBranch: refreshed.sourceBranch,
+                    cleanupAfterMerge: refreshed.cleanupAfterMerge,
+                },
+            });
+            return refreshed;
+        }
+    }
+    let selection;
+    if (isGitClone(repoRoot, spawnSync)) {
+        const branch = readCurrentBranch(repoRoot, spawnSync);
+        ensureFetchedOrigin(repoRoot, spawnSync);
+        if (branch === "main") {
+            ensureMainFastForward(repoRoot, spawnSync);
+            const worktreeRoot = path.join(workspaceBase, `ouroboros-main-${stamp}`);
+            const created = createDedicatedWorktree(repoRoot, worktreeRoot, `safe-workspace-${stamp}`, existsSync, mkdirSync, rmSync, spawnSync);
+            selection = {
+                runtimeKind: "clone-main",
+                repoRoot,
+                workspaceRoot: created.workspaceRoot,
+                workspaceBranch: created.branchName,
+                sourceBranch: branch,
+                sourceCloneUrl: canonicalRepoUrl,
+                cleanupAfterMerge: false,
+                created: created.created,
+                note: `running from clone on main; fast-forwarded and created dedicated worktree ${created.workspaceRoot}`,
+            };
+        }
+        else {
+            const worktreeRoot = path.join(workspaceBase, `ouroboros-origin-main-${stamp}`);
+            const created = createDedicatedWorktree(repoRoot, worktreeRoot, `safe-workspace-${stamp}`, existsSync, mkdirSync, rmSync, spawnSync);
+            selection = {
+                runtimeKind: "clone-non-main",
+                repoRoot,
+                workspaceRoot: created.workspaceRoot,
+                workspaceBranch: created.branchName,
+                sourceBranch: branch,
+                sourceCloneUrl: canonicalRepoUrl,
+                cleanupAfterMerge: false,
+                created: created.created,
+                note: `running from branch ${branch}; defaulted new work from origin/main in dedicated worktree ${created.workspaceRoot}`,
+            };
+        }
+    }
+    else {
+        const scratchRoot = path.join(workspaceBase, `ouroboros-scratch-${stamp}`);
+        const created = createScratchClone(scratchRoot, canonicalRepoUrl, existsSync, mkdirSync, rmSync, spawnSync);
+        selection = {
+            runtimeKind: "installed-runtime",
+            repoRoot,
+            workspaceRoot: created.workspaceRoot,
+            workspaceBranch: created.branchName,
+            sourceBranch: null,
+            sourceCloneUrl: canonicalRepoUrl,
+            cleanupAfterMerge: true,
+            created: created.created,
+            note: `running from installed runtime/wrapper; created scratch clone ${created.workspaceRoot} from ${canonicalRepoUrl}`,
+        };
+    }
+    activeSelection = selection;
+    if (persistSelection) {
+        persistSelectionState(workspaceBase, selection, options);
+    }
+    (0, runtime_1.emitNervesEvent)({
+        component: "workspace",
+        event: "workspace.safe_repo_acquired",
+        message: "acquired safe repo workspace before local edits",
+        meta: {
+            runtimeKind: selection.runtimeKind,
+            repoRoot: selection.repoRoot,
+            workspaceRoot: selection.workspaceRoot,
+            workspaceBranch: selection.workspaceBranch,
+            sourceBranch: selection.sourceBranch,
+            sourceCloneUrl: selection.sourceCloneUrl,
+            cleanupAfterMerge: selection.cleanupAfterMerge,
+        },
+    });
+    return selection;
+}
+function resolveSafeRepoPath(options) {
+    const rawRequestedPath = options.requestedPath;
+    const repoRoot = path.resolve(options.repoRoot ?? (0, identity_1.getRepoRoot)());
+    if (!path.isAbsolute(rawRequestedPath) && !rawRequestedPath.startsWith("~")) {
+        const selection = activeSelection ?? ensureSafeRepoWorkspace(options);
+        return {
+            selection,
+            resolvedPath: path.resolve(selection.workspaceRoot, rawRequestedPath),
+        };
+    }
+    const requestedPath = path.resolve(rawRequestedPath);
+    if (activeSelection && requestedPath.startsWith(activeSelection.workspaceRoot + path.sep)) {
+        return { selection: activeSelection, resolvedPath: requestedPath };
+    }
+    if (requestedPath !== repoRoot && !requestedPath.startsWith(repoRoot + path.sep)) {
+        return { selection: activeSelection, resolvedPath: requestedPath };
+    }
+    const selection = ensureSafeRepoWorkspace(options);
+    const relativePath = requestedPath === repoRoot ? "" : path.relative(repoRoot, requestedPath);
+    const resolvedPath = relativePath ? path.join(selection.workspaceRoot, relativePath) : selection.workspaceRoot;
+    return { selection, resolvedPath };
+}
+function resolveSafeShellExecution(command, options = {}) {
+    const trimmed = command.trim();
+    if (!trimmed) {
+        return { selection: activeSelection, command };
+    }
+    if (activeSelection && command.includes(activeSelection.workspaceRoot)) {
+        return { selection: activeSelection, command, cwd: activeSelection.workspaceRoot };
+    }
+    const repoRoot = path.resolve(options.repoRoot ?? (0, identity_1.getRepoRoot)());
+    const mentionsRepoRoot = command.includes(repoRoot);
+    const shouldRoute = mentionsRepoRoot || looksRepoLocalShellCommand(trimmed);
+    if (!shouldRoute) {
+        return { selection: activeSelection, command };
+    }
+    const selection = ensureSafeRepoWorkspace(options);
+    const rewrittenCommand = mentionsRepoRoot
+        ? command.split(repoRoot).join(selection.workspaceRoot)
+        : command;
+    return {
+        selection,
+        command: rewrittenCommand,
+        cwd: selection.workspaceRoot,
+    };
+}

package/dist/heart/session-activity.js

@@ -0,0 +1,173 @@
+"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.listSessionActivity = listSessionActivity;
+exports.findFreshestFriendSession = findFreshestFriendSession;
+const fs = __importStar(require("fs"));
+const path = __importStar(require("path"));
+const runtime_1 = require("../nerves/runtime");
+const config_1 = require("./config");
+const DEFAULT_ACTIVE_THRESHOLD_MS = 24 * 60 * 60 * 1000;
+function activityPriority(source) {
+    return source === "friend-facing" ? 0 : 1;
+}
+function resolveFriendName(friendId, friendsDir, agentName) {
+    if (friendId === "self")
+        return agentName;
+    try {
+        const raw = fs.readFileSync(path.join(friendsDir, `${friendId}.json`), "utf-8");
+        const parsed = JSON.parse(raw);
+        return parsed.name ?? friendId;
+    }
+    catch {
+        return friendId;
+    }
+}
+function parseFriendActivity(sessionPath) {
+    let mtimeMs;
+    try {
+        mtimeMs = fs.statSync(sessionPath).mtimeMs;
+    }
+    catch {
+        return null;
+    }
+    try {
+        const raw = fs.readFileSync(sessionPath, "utf-8");
+        const parsed = JSON.parse(raw);
+        const explicit = parsed?.state?.lastFriendActivityAt;
+        if (typeof explicit === "string") {
+            const parsedMs = Date.parse(explicit);
+            if (Number.isFinite(parsedMs)) {
+                return {
+                    lastActivityMs: parsedMs,
+                    lastActivityAt: new Date(parsedMs).toISOString(),
+                    activitySource: "friend-facing",
+                };
+            }
+        }
+    }
+    catch {
+        // fall back to file mtime below
+    }
+    return {
+        lastActivityMs: mtimeMs,
+        lastActivityAt: new Date(mtimeMs).toISOString(),
+        activitySource: "mtime-fallback",
+    };
+}
+function listSessionActivity(query) {
+    const { sessionsDir, friendsDir, agentName, activeThresholdMs = DEFAULT_ACTIVE_THRESHOLD_MS, currentSession = null, } = query;
+    (0, runtime_1.emitNervesEvent)({
+        component: "daemon",
+        event: "daemon.session_activity_scan",
+        message: "scanning session activity",
+        meta: {
+            sessionsDir,
+            currentSession: currentSession ? `${currentSession.friendId}/${currentSession.channel}/${currentSession.key}` : null,
+        },
+    });
+    if (!fs.existsSync(sessionsDir))
+        return [];
+    const now = Date.now();
+    const results = [];
+    let friendDirs;
+    try {
+        friendDirs = fs.readdirSync(sessionsDir);
+    }
+    catch {
+        return [];
+    }
+    for (const friendId of friendDirs) {
+        const friendPath = path.join(sessionsDir, friendId);
+        let channels;
+        try {
+            channels = fs.readdirSync(friendPath);
+        }
+        catch {
+            continue;
+        }
+        for (const channel of channels) {
+            const channelPath = path.join(friendPath, channel);
+            let keys;
+            try {
+                keys = fs.readdirSync(channelPath);
+            }
+            catch {
+                continue;
+            }
+            for (const keyFile of keys) {
+                if (!keyFile.endsWith(".json"))
+                    continue;
+                const key = keyFile.replace(/\.json$/, "");
+                // Compare with sanitizeKey on both sides — session keys from the filesystem
+                // are already sanitized (colons → underscores), but the canonical key from
+                // the pipeline may still have colons (e.g. "chat:any" vs "chat_any").
+                if (currentSession && friendId === currentSession.friendId && channel === currentSession.channel && (0, config_1.sanitizeKey)(key) === (0, config_1.sanitizeKey)(currentSession.key)) {
+                    continue;
+                }
+                const sessionPath = path.join(channelPath, keyFile);
+                const activity = parseFriendActivity(sessionPath);
+                if (!activity)
+                    continue;
+                if (now - activity.lastActivityMs > activeThresholdMs)
+                    continue;
+                results.push({
+                    friendId,
+                    friendName: resolveFriendName(friendId, friendsDir, agentName),
+                    channel,
+                    key,
+                    sessionPath,
+                    lastActivityAt: activity.lastActivityAt,
+                    lastActivityMs: activity.lastActivityMs,
+                    activitySource: activity.activitySource,
+                });
+            }
+        }
+    }
+    return results.sort((a, b) => {
+        const sourceDiff = activityPriority(a.activitySource) - activityPriority(b.activitySource);
+        if (sourceDiff !== 0)
+            return sourceDiff;
+        return b.lastActivityMs - a.lastActivityMs;
+    });
+}
+function findFreshestFriendSession(query) {
+    const { activeOnly = false, activeThresholdMs = DEFAULT_ACTIVE_THRESHOLD_MS, ...rest } = query;
+    const currentSession = rest.currentSession ?? null;
+    const all = activeOnly
+        ? listSessionActivity({ ...rest, activeThresholdMs, currentSession })
+        : listSessionActivity({ ...rest, activeThresholdMs: Number.MAX_SAFE_INTEGER, currentSession });
+    return all.find((entry) => entry.friendId === query.friendId) ?? null;
+}