@pugi/cli 0.1.0-beta.10 → 0.1.0-beta.100

package/dist/runtime/commands/rewind.js

@@ -0,0 +1,333 @@
+/**
+ * `/rewind` runtime — .
+ *
+ * Three invocation modes, sharing one runner:
+ *
+ *  - `/rewind N`             drop the last N operator turns + every
+ *                             tool call that landed between.
+ *  - `/rewind --to <id>`     rewind to a specific event index from the
+ *                             visible (post-mask) transcript.
+ *  - `/rewind`               interactive picker — surfaces the last 10
+ *                             user-turn boundaries (newest-first) and
+ *                             returns a payload the caller can use to
+ *                             mount a select prompt.
+ *
+ * The rewind is APPEND-ONLY: we never delete events. `applyRewindMask`
+ * elides the masked range on read; `pugi sessions undo-rewind` appends
+ * an inverse marker that nullifies the latest rewind so operators have
+ * a reliable escape hatch.
+ *
+ * Surface contract (same shape as `runCompactCommand`):
+ *
+ *  - Returns a structured result for the JSON path.
+ *  - Calls `ctx.writeOutput(payload, text)` once per invocation.
+ *  - Throws ONLY on programmer-error. Store failures, missing
+ *    sessions, etc. are surfaced as `failed_*` statuses.
+ *
+ * Exit codes (mapped by the dispatcher in cli.ts):
+ *
+ *  0 — marker appended OR picker surfaced
+ *  1 — store unavailable / session not found
+ *  2 — noop (asked to drop 0 turns, nothing to rewind, etc.)
+ */
+import { homedir } from 'node:os';
+import { slugForCwd } from '../../core/repl/history.js';
+import { appendRewindMarker, buildRewindPickerRows, pickRewindTargetForTurns, resolveEventIdToIndex, } from '../../core/checkpoint/rewinder.js';
+import { loadFromStore } from '../../core/checkpoint/resumer.js';
+import { SqliteSessionStore, resolveProjectStoreDir, } from '../../core/repl/store/session-store.js';
+/**
+ * Entry point reused by the slash command + the top-level dispatcher.
+ *
+ * `args` accepts:
+ *  - `[]`             picker mode
+ *  - `["N"]`          drop last N turns
+ *  - `["--to", "<id>"]` rewind to event id
+ *
+ * Both `-N` and `--turns N` are accepted for parity with the upstream tool's
+ * `--turns` flag.
+ */
+export async function runRewindCommand(args, ctx) {
+    const parsed = parseRewindArgs(args);
+    if (parsed.kind === 'error') {
+        return emit(ctx, {
+            command: 'rewind',
+            status: 'failed_parse',
+            reason: parsed.message,
+        }, parsed.message);
+    }
+    // Resolve session + store.
+    const slug = slugForCwd(ctx.workspaceRoot);
+    let store = ctx.store ?? null;
+    let sessionId = ctx.sessionId ?? null;
+    let storeOpenedHere = false;
+    if (store === null) {
+        sessionId = sessionId ?? (await pickMostRecentSessionIdReadOnly(slug));
+        if (!sessionId) {
+            return emit(ctx, {
+                command: 'rewind',
+                status: 'failed_no_session',
+                reason: 'No active session to rewind. Start a REPL with `pugi`.',
+            });
+        }
+        const opened = await openLiveStore(slug, sessionId);
+        if (!opened) {
+            return emit(ctx, {
+                command: 'rewind',
+                status: 'failed_store',
+                sessionId,
+                reason: 'Could not open local session store (lock held by another REPL?).',
+            });
+        }
+        store = opened;
+        storeOpenedHere = true;
+    }
+    else if (sessionId === null) {
+        const rows = await store.listSessions({ project: slug, limit: 1, status: 'active' });
+        if (rows.length === 0) {
+            return emit(ctx, {
+                command: 'rewind',
+                status: 'failed_no_session',
+                reason: 'No active session to rewind.',
+            });
+        }
+        sessionId = rows[0].id;
+    }
+    try {
+        const loaded = await loadFromStore(store, sessionId);
+        if (!loaded) {
+            return emit(ctx, {
+                command: 'rewind',
+                status: 'failed_no_session',
+                sessionId,
+                reason: `Session '${sessionId}' not found.`,
+            });
+        }
+        // Picker mode: surface the last 10 user-turn boundaries.
+        if (parsed.kind === 'picker') {
+            const rows = buildRewindPickerRows(loaded.rawEvents, 10);
+            if (rows.length === 0) {
+                return emit(ctx, {
+                    command: 'rewind',
+                    status: 'noop_empty',
+                    sessionId,
+                    reason: 'No operator turns to rewind to.',
+                }, 'Nothing to rewind — no operator turns yet.');
+            }
+            const pickerRows = rows.map((r) => ({
+                visibleIndex: r.visibleIndex,
+                turnsAgo: r.turnsAgo,
+                preview: r.preview,
+                timestampEpochMs: r.timestampEpochMs,
+            }));
+            const text = renderPicker(pickerRows);
+            return emit(ctx, {
+                command: 'rewind',
+                status: 'picker',
+                sessionId,
+                pickerRows,
+            }, text);
+        }
+        // Resolve target index.
+        let toEventIndex;
+        let turnsRewound;
+        if (parsed.kind === 'turns') {
+            if (parsed.n <= 0) {
+                return emit(ctx, {
+                    command: 'rewind',
+                    status: 'noop_zero',
+                    sessionId,
+                    reason: 'Asked to drop 0 turns — nothing to do.',
+                }, 'Asked to drop 0 turns — nothing to do.');
+            }
+            const target = pickRewindTargetForTurns(loaded.rawEvents, parsed.n);
+            if (target.turnsRewound === 0) {
+                return emit(ctx, {
+                    command: 'rewind',
+                    status: 'noop_empty',
+                    sessionId,
+                    reason: 'No operator turns to rewind.',
+                }, 'No operator turns to rewind.');
+            }
+            toEventIndex = target.toEventIndex;
+            turnsRewound = target.turnsRewound;
+        }
+        else {
+            // mode === 'to-event'
+            const resolvedIdx = resolveEventIdToIndex(loaded.rawEvents, parsed.eventId);
+            if (resolvedIdx === null) {
+                return emit(ctx, {
+                    command: 'rewind',
+                    status: 'failed_parse',
+                    sessionId,
+                    reason: `Could not resolve event id '${parsed.eventId}'. Try \`/rewind\` for the picker.`,
+                });
+            }
+            toEventIndex = resolvedIdx;
+            // Count user turns in the masked range to report turnsRewound.
+            turnsRewound = countUserTurnsAfter(loaded.rawEvents, toEventIndex);
+        }
+        const fromEventIndex = loaded.rawEvents.length;
+        await appendRewindMarker({
+            store,
+            toEventIndex,
+            fromEventIndex,
+            turnsRewound,
+            reason: parsed.kind === 'turns' ? 'manual' : 'to-event',
+            ...(ctx.now !== undefined ? { now: ctx.now } : {}),
+        });
+        // Reload + recompute visible count for the operator banner.
+        const after = await loadFromStore(store, sessionId);
+        const visibleAfter = after?.visibleEvents.length ?? 0;
+        const banner = `Rewound ${turnsRewound} turn${turnsRewound === 1 ? '' : 's'} ` +
+            `(to event ${toEventIndex < 0 ? 'start' : `#${toEventIndex + 1}`}). ` +
+            `${visibleAfter} event${visibleAfter === 1 ? '' : 's'} now visible. ` +
+            `Undo with \`pugi sessions undo-rewind\`.`;
+        return emit(ctx, {
+            command: 'rewind',
+            status: 'rewound',
+            sessionId,
+            turnsRewound,
+            toEventIndex,
+            fromEventIndex,
+            visibleAfter,
+        }, banner);
+    }
+    finally {
+        if (storeOpenedHere && store) {
+            try {
+                await store.close();
+            }
+            catch {
+                /* idempotent */
+            }
+        }
+    }
+}
+/**
+ * Accepts:
+ *  pugi rewind           -> picker
+ *  pugi rewind 3         -> drop 3 turns
+ *  pugi rewind --turns 3 -> same
+ *  pugi rewind --to 12   -> rewind to event index 12 (1-based visible)
+ *  pugi rewind --to #12  -> rewind to event index 12 (0-based hidden)
+ */
+function parseRewindArgs(args) {
+    if (args.length === 0)
+        return { kind: 'picker' };
+    const head = args[0];
+    // --to <id>
+    if (head === '--to' || head === '-t') {
+        const eventId = args[1];
+        if (!eventId) {
+            return {
+                kind: 'error',
+                message: 'Usage: pugi rewind --to <event-id>',
+            };
+        }
+        return { kind: 'to-event', eventId };
+    }
+    if (head.startsWith('--to=')) {
+        const eventId = head.slice('--to='.length);
+        if (eventId.length === 0) {
+            return {
+                kind: 'error',
+                message: 'Usage: pugi rewind --to <event-id>',
+            };
+        }
+        return { kind: 'to-event', eventId };
+    }
+    // --turns N OR -N OR positional N
+    if (head === '--turns' || head === '-n') {
+        const n = Number.parseInt(args[1] ?? '', 10);
+        if (!Number.isFinite(n) || n < 0) {
+            return {
+                kind: 'error',
+                message: 'Usage: pugi rewind --turns <N>',
+            };
+        }
+        return { kind: 'turns', n };
+    }
+    if (head.startsWith('--turns=')) {
+        const n = Number.parseInt(head.slice('--turns='.length), 10);
+        if (!Number.isFinite(n) || n < 0) {
+            return {
+                kind: 'error',
+                message: 'Usage: pugi rewind --turns <N>',
+            };
+        }
+        return { kind: 'turns', n };
+    }
+    // Bare integer: positional turns count.
+    const positional = Number.parseInt(head, 10);
+    if (Number.isFinite(positional) && positional >= 0) {
+        return { kind: 'turns', n: positional };
+    }
+    return {
+        kind: 'error',
+        message: `Unknown argument '${head}'. Try \`pugi rewind\`, \`pugi rewind <N>\`, or \`pugi rewind --to <id>\`.`,
+    };
+}
+function emit(ctx, payload, text) {
+    const human = text ?? payload.reason ?? `rewind: ${payload.status}`;
+    ctx.writeOutput(payload, human);
+    return payload;
+}
+function renderPicker(rows) {
+    const lines = ['Rewind picker — pick a turn boundary:', ''];
+    for (const r of rows) {
+        const tag = `[#${r.visibleIndex.toString().padStart(3)}]`;
+        const ago = `${r.turnsAgo}t ago`.padStart(8);
+        lines.push(` ${tag} ${ago} ${r.preview}`);
+    }
+    lines.push('', 'Rewind with: pugi rewind --to <#N> (or `pugi rewind <turnsToDrop>`).');
+    return lines.join('\n');
+}
+function countUserTurnsAfter(events, toEventIndex) {
+    let count = 0;
+    for (let i = toEventIndex + 1; i < events.length; i += 1) {
+        if (events[i].kind === 'user')
+            count += 1;
+    }
+    return count;
+}
+/**
+ * Open the SqliteSessionStore for the workspace's project slug, bound
+ * to `sessionId`. Returns null when the lock is held by another REPL.
+ */
+async function openLiveStore(projectSlug, sessionId) {
+    try {
+        const store = new SqliteSessionStore({ projectSlug, home: homedir() });
+        await store.open({
+            id: sessionId,
+            workspaceRoot: process.cwd(),
+            projectSlug,
+        });
+        return store;
+    }
+    catch {
+        return null;
+    }
+}
+/**
+ * Discover the most recent active session id for a project slug,
+ * without taking the writer lockfile. Used by the standalone CLI path
+ * (no `--session` flag) so a live REPL holding the lock does not block
+ * the lookup.
+ */
+async function pickMostRecentSessionIdReadOnly(projectSlug) {
+    try {
+        const dir = resolveProjectStoreDir(projectSlug, homedir());
+        const view = await SqliteSessionStore.openReadOnly(dir);
+        try {
+            const rows = await view.list({ project: projectSlug, limit: 1, status: 'active' });
+            return rows.length > 0 ? rows[0].id : null;
+        }
+        finally {
+            await view.close();
+        }
+    }
+    catch {
+        return null;
+    }
+}
+//# sourceMappingURL=rewind.js.map

package/dist/runtime/commands/roster.js

@@ -1,26 +1,26 @@
 /**
- * `pugi roster` command - α7.5 Tier 1 instantiation Phase 1.
+ * `pugi roster` command - Tier 1 instantiation Phase 1.
  *
  * Lists the live Tier 1 personas with display name, role, and routing
  * tag. The CLI walks two sources in order:
  *
- *   1. The local @pugi/personas roster (THE_TEN). Always succeeds; the
- *      ten brand-canonical personas are baked into the SDK.
- *   2. The remote `GET /api/pugi/sessions/roster` endpoint when the
- *      operator has a valid credential. The remote response carries the
- *      server-side dispatch role + dispatchTag for each slug so the
- *      operator sees the actual routing decision the dispatcher will
- *      apply on a `pugi delegate <slug>` call.
+ *  1. The local @pugi/personas roster (THE_TEN). Always succeeds; the
+ *     ten brand-canonical personas are baked into the SDK.
+ *  2. The remote `GET /api/pugi/sessions/roster` endpoint when the
+ *     operator has a valid credential. The remote response carries the
+ *     server-side dispatch role + dispatchTag for each slug so the
+ *     operator sees the actual routing decision the dispatcher will
+ *     apply on a `pugi delegate <slug>` call.
  *
  * The command never fails if the network is unreachable - it falls back
  * to local-only output with a one-line warning. This matches the
- * local-first contract (ADR-0037): the operator can still see who is on
+ * local-first contract : the operator can still see who is on
  * the team without an API key.
  *
  * Output:
- *   - text default: a 3-column table (slug | name | role).
- *   - --json:        a structured array of { slug, name, role, totem,
- *                    dispatchTag } records, used by scripted callers.
+ *  - text default: a 3-column table (slug | name | role).
+ *  - --json:       a structured array of { slug, name, role, totem,
+ *                   dispatchTag } records, used by scripted callers.
  */
 import { THE_TEN } from '@pugi/personas';
 import { fetchPersonaRoster, } from '@pugi/sdk';
@@ -85,7 +85,7 @@ export function renderRosterTable(rows) {
         dispatchTag: Math.max(head.dispatchTag.length, ...rows.map((r) => r.dispatchTag.length)),
     };
     const pad = (s, width) => s + ' '.repeat(Math.max(0, width - s.length));
-    const line = (r) => [pad(r.slug, widths.slug), pad(r.name, widths.name), pad(r.totem, widths.totem), pad(r.role, widths.role), pad(r.dispatchTag, widths.dispatchTag)].join('  ');
+    const line = (r) => [pad(r.slug, widths.slug), pad(r.name, widths.name), pad(r.totem, widths.totem), pad(r.role, widths.role), pad(r.dispatchTag, widths.dispatchTag)].join(' ');
     const header = line(head);
     const sep = '-'.repeat(header.length);
     return [header, sep, ...rows.map((r) => line(r))].join('\n');
@@ -107,7 +107,7 @@ export async function resolveRoster(config) {
         return { rows: mergeRoster(THE_TEN, result.response.personas), warning: null };
     }
     const reason = result.status === 'endpoint_missing'
-        ? 'runtime does not expose /api/pugi/sessions/roster (upgrade admin-api to α7.5+)'
+        ? 'runtime does not expose /api/pugi/sessions/roster (upgrade admin-api to +)'
         : result.message;
     return {
         rows: mergeRoster(THE_TEN, null),

package/dist/runtime/commands/servers.js

@@ -0,0 +1,236 @@
+/**
+ * PR H (2026-06-05): `/servers` slash command — list + stop server-
+ * started processes the operator can't otherwise kill from inside
+ * the REPL.
+ *
+ * Customer pain (CEO 2026-06-05): Hiroshi launched a Vite dev server
+ * via `server_start` tool (PID 45800 on :5173), persona answered
+ * "use `pugi stop`" — but `/stop <persona>` halts a persona agent,
+ * not a server process. Server kept running until manual
+ * `kill 45800`.
+ *
+ * Fix: surface the existing `server_start` meta files (which already
+ * persist `.pugi/runs/srv-<uuid>/server.json` per the
+ * server-tools.ts spec) as a first-class operator-facing list +
+ * kill command. The `server_stop` TOOL already exists for LLM
+ * dispatch (SIGTERM → grace → SIGKILL ladder via
+ * `dispatchServerStop`); we wire it through to a slash command so
+ * the operator no longer needs to copy PIDs out of agent text.
+ *
+ * Surface:
+ *
+ *   /servers                        → table of tracked servers
+ *   /servers stop <runId>           → kill one by run id (srv-...)
+ *   /servers stop <pid>             → kill one by pid (numeric)
+ *   /servers stop all               → kill every alive tracked srv
+ *
+ * Everything is best-effort. A missing `.pugi/runs/` dir = empty
+ * list, not an error. A stale `server.json` for a process that
+ * already exited stays listed as `dead` so the operator can see it
+ * happened.
+ */
+import { existsSync, readFileSync, readdirSync } from 'node:fs';
+import { join } from 'node:path';
+function runsDir(workspaceRoot) {
+    return join(workspaceRoot, '.pugi', 'runs');
+}
+function isAlive(pid, killImpl) {
+    try {
+        killImpl(pid, 0);
+        return true;
+    }
+    catch {
+        return false;
+    }
+}
+/**
+ * Read every `<runs>/srv-<uuid>/server.json` and project к `ServerEntry`.
+ * Pure: takes the workspace + kill impl (для liveness check), returns
+ * a stable-sorted (oldest-first) list. Failure modes:
+ *   - missing runs dir → []
+ *   - unreadable / malformed JSON → entry omitted (no throw)
+ *   - meta carries no pid → entry kept but `alive=false`
+ */
+export function listServers(workspaceRoot, killImpl = (pid, signal) => {
+    process.kill(pid, signal);
+}) {
+    const dir = runsDir(workspaceRoot);
+    if (!existsSync(dir))
+        return [];
+    let names = [];
+    try {
+        names = readdirSync(dir, { withFileTypes: true })
+            .filter((e) => e.isDirectory() && e.name.startsWith('srv-'))
+            .map((e) => e.name)
+            .sort();
+    }
+    catch {
+        return [];
+    }
+    const out = [];
+    for (const runId of names) {
+        const metaPath = join(dir, runId, 'server.json');
+        if (!existsSync(metaPath))
+            continue;
+        let meta;
+        try {
+            meta = JSON.parse(readFileSync(metaPath, 'utf8'));
+        }
+        catch {
+            continue;
+        }
+        const pid = typeof meta['pid'] === 'number' ? meta['pid'] : null;
+        out.push({
+            runId,
+            pid,
+            port: typeof meta['port'] === 'number' ? meta['port'] : null,
+            command: typeof meta['command'] === 'string' ? meta['command'] : null,
+            startedAt: typeof meta['startedAt'] === 'string' ? meta['startedAt'] : null,
+            healthStatus: typeof meta['healthStatus'] === 'number' ? meta['healthStatus'] : null,
+            alive: pid !== null ? isAlive(pid, killImpl) : false,
+        });
+    }
+    return out;
+}
+/**
+ * Kill one or more servers. Strategy:
+ *   - `target === 'all'`  — kill every alive entry
+ *   - target matches `srv-...` — match by runId (exact)
+ *   - target is numeric    — match by pid
+ *
+ * Uses the same SIGTERM → 5s grace → SIGKILL ladder as the
+ * `server_stop` tool. Failures silent (entry stays listed as alive
+ * on next `/servers` if SIGKILL also fails — operator escalates
+ * manually).
+ */
+export async function stopServers(workspaceRoot, target, options) {
+    const killImpl = options.killImpl ??
+        ((pid, signal) => {
+            process.kill(pid, signal);
+        });
+    const entries = listServers(workspaceRoot, killImpl);
+    if (entries.length === 0)
+        return { kind: 'empty' };
+    const targets = [];
+    if (target === 'all') {
+        targets.push(...entries.filter((e) => e.alive));
+    }
+    else if (/^srv-/.test(target)) {
+        const hit = entries.find((e) => e.runId === target);
+        if (!hit)
+            return { kind: 'not-found', query: target };
+        targets.push(hit);
+    }
+    else if (/^\d+$/.test(target)) {
+        const wanted = Number(target);
+        const hit = entries.find((e) => e.pid === wanted);
+        if (!hit)
+            return { kind: 'not-found', query: target };
+        targets.push(hit);
+    }
+    else {
+        return { kind: 'not-found', query: target };
+    }
+    if (targets.length === 0)
+        return { kind: 'empty' };
+    const killed = [];
+    let notFound = 0;
+    for (const entry of targets) {
+        if (entry.pid === null) {
+            notFound += 1;
+            continue;
+        }
+        if (!isAlive(entry.pid, killImpl)) {
+            // already dead — treat as success (operator's intent matched)
+            killed.push(entry);
+            continue;
+        }
+        try {
+            killImpl(entry.pid, 'SIGTERM');
+        }
+        catch {
+            // SIGTERM refused → escalate
+        }
+        // Grace window: poll for exit up to 5s.
+        const deadline = Date.now() + 5_000;
+        while (Date.now() < deadline) {
+            if (!isAlive(entry.pid, killImpl))
+                break;
+            await new Promise((r) => setTimeout(r, 50));
+        }
+        if (isAlive(entry.pid, killImpl)) {
+            try {
+                killImpl(entry.pid, 'SIGKILL');
+            }
+            catch {
+                notFound += 1;
+                continue;
+            }
+        }
+        killed.push(entry);
+    }
+    return { kind: 'stopped', killed, notFound };
+}
+/**
+ * Slash entry. The session dispatcher calls this с the parsed verdict
+ * and an IO sink that pipes lines к the REPL system pane.
+ */
+export async function runServersCommand(mode, io, options) {
+    if (mode.kind === 'list') {
+        const entries = listServers(options.workspaceRoot, options.killImpl);
+        renderList(entries, io);
+        return { kind: 'listed', entries };
+    }
+    const result = await stopServers(options.workspaceRoot, mode.target, options);
+    renderStopResult(result, io);
+    return result;
+}
+function renderList(entries, io) {
+    if (entries.length === 0) {
+        io.write('No tracked servers (.pugi/runs/srv-* empty).');
+        return;
+    }
+    io.write(`Tracked servers (${entries.length}):`);
+    for (const e of entries) {
+        const status = e.alive ? 'alive' : 'dead';
+        const port = e.port !== null ? `:${e.port}` : '';
+        const pid = e.pid !== null ? `pid=${e.pid}` : 'pid=?';
+        const cmd = e.command ? truncate(e.command, 60) : '<unknown>';
+        io.write(`  ${e.runId}  [${status}]  ${pid}  ${port}  ${cmd}`);
+    }
+    io.write('Use `/servers stop <runId|pid|all>` to terminate.');
+}
+function renderStopResult(result, io) {
+    switch (result.kind) {
+        case 'empty':
+            io.write('No alive servers to stop.');
+            return;
+        case 'not-found':
+            io.write(`No server matches '${result.query}'. Run \`/servers\` to list.`);
+            return;
+        case 'stopped': {
+            if (result.killed.length === 0) {
+                io.write(`Stop dispatched but 0 servers terminated (${result.notFound} miss).`);
+                return;
+            }
+            io.write(`Stopped ${result.killed.length} server(s):`);
+            for (const e of result.killed) {
+                io.write(`  ${e.runId}  pid=${e.pid ?? '?'}${e.port !== null ? ` :${e.port}` : ''}`);
+            }
+            if (result.notFound > 0) {
+                io.write(`(${result.notFound} entry skipped — no pid or kill failed)`);
+            }
+            return;
+        }
+        case 'error':
+            io.write(`Error: ${result.message}`);
+            return;
+        case 'listed':
+            // not used in stop path
+            return;
+    }
+}
+function truncate(s, max) {
+    return s.length > max ? `${s.slice(0, max - 1)}…` : s;
+}
+//# sourceMappingURL=servers.js.map