@rynx-ai/daemon 0.1.0 → 0.1.9

package/dist/session-launch-operations.js

@@ -0,0 +1,124 @@
+import { newSessionId } from "@rynx-ai/core";
+import { db } from "./db.js";
+import { createSessionMeta } from "./session-meta-store.js";
+const MAX_ID_LENGTH = 512;
+const SHA256_PATTERN = /^[a-fA-F0-9]{64}$/;
+export class SessionLaunchOperationConflictError extends Error {
+    pluginId;
+    scopeId;
+    operationId;
+    code = "SESSION_LAUNCH_OPERATION_CONFLICT";
+    constructor(pluginId, scopeId, operationId) {
+        super(`session launch operation was reused with a different request: ${pluginId}/${scopeId}/${operationId}`);
+        this.pluginId = pluginId;
+        this.scopeId = scopeId;
+        this.operationId = operationId;
+        this.name = "SessionLaunchOperationConflictError";
+    }
+}
+export class SessionLaunchOperationTargetDeletedError extends Error {
+    pluginId;
+    scopeId;
+    operationId;
+    sessionId;
+    code = "SESSION_LAUNCH_OPERATION_TARGET_DELETED";
+    constructor(pluginId, scopeId, operationId, sessionId) {
+        super(`session launch operation target was deleted: ${pluginId}/${scopeId}/${operationId}`);
+        this.pluginId = pluginId;
+        this.scopeId = scopeId;
+        this.operationId = operationId;
+        this.sessionId = sessionId;
+        this.name = "SessionLaunchOperationTargetDeletedError";
+    }
+}
+/**
+ * Atomically allocate a persisted machine session for one plugin operation.
+ *
+ * The durable operation row is the idempotency boundary across runner crashes,
+ * daemon restarts, and remote lease re-delivery. It deliberately excludes any
+ * Workspace concept: `scopeId` and `operationId` are opaque to the daemon.
+ */
+export function ensurePluginSessionLaunch(input) {
+    const pluginId = requiredId(input.pluginId, "pluginId");
+    const scopeId = requiredId(input.scopeId, "scopeId");
+    const operationId = requiredId(input.operationId, "operationId");
+    const requestHash = requiredRequestHash(input.requestHash);
+    const ensure = db().transaction(() => {
+        const existing = readOperation(pluginId, scopeId, operationId);
+        if (existing) {
+            if (existing.request_hash !== requestHash) {
+                throw new SessionLaunchOperationConflictError(pluginId, scopeId, operationId);
+            }
+            if (existing.state === "deleted") {
+                return { disposition: "deleted", sessionId: existing.session_id };
+            }
+            if (!sessionExists(existing.session_id)) {
+                // Preserve the operation key even when an older deletion path removed
+                // the session without first marking its launch operation. Throwing from
+                // inside this transaction would roll the repair back, so return a
+                // sentinel and raise the typed error after the commit.
+                tombstoneOperations(existing.session_id, new Date().toISOString());
+                return { disposition: "deleted", sessionId: existing.session_id };
+            }
+            return { disposition: "replayed", sessionId: existing.session_id };
+        }
+        const now = new Date().toISOString();
+        let sessionId = newSessionId();
+        while (sessionExists(sessionId))
+            sessionId = newSessionId();
+        createSessionMeta({
+            ...input.session,
+            id: sessionId,
+            source: `plugin:${pluginId}`,
+            createdAt: now,
+            updatedAt: now,
+        });
+        if (!sessionExists(sessionId)) {
+            throw new Error(`plugin session launch failed to persist session metadata: ${sessionId}`);
+        }
+        db()
+            .prepare(`INSERT INTO plugin_session_launch_operations
+           (plugin_id, scope_id, operation_id, request_hash, session_id, state,
+            created_at, updated_at, deleted_at)
+         VALUES (?, ?, ?, ?, ?, 'active', ?, ?, NULL)`)
+            .run(pluginId, scopeId, operationId, requestHash, sessionId, now, now);
+        return { disposition: "created", sessionId };
+    });
+    const result = ensure.immediate();
+    if (result.disposition === "deleted") {
+        throw new SessionLaunchOperationTargetDeletedError(pluginId, scopeId, operationId, result.sessionId);
+    }
+    return result;
+}
+function readOperation(pluginId, scopeId, operationId) {
+    return db()
+        .prepare(`SELECT request_hash, session_id, state
+       FROM plugin_session_launch_operations
+       WHERE plugin_id = ? AND scope_id = ? AND operation_id = ?`)
+        .get(pluginId, scopeId, operationId);
+}
+function sessionExists(sessionId) {
+    return Boolean(db().prepare("SELECT 1 FROM sessions WHERE id = ?").pluck().get(sessionId));
+}
+function tombstoneOperations(sessionId, now) {
+    return db()
+        .prepare(`UPDATE plugin_session_launch_operations
+       SET state = 'deleted', updated_at = ?, deleted_at = ?
+       WHERE session_id = ? AND state = 'active'`)
+        .run(now, now, sessionId).changes;
+}
+function requiredId(value, label) {
+    const normalized = value?.trim();
+    if (!normalized)
+        throw new Error(`${label} is required`);
+    if (normalized.length > MAX_ID_LENGTH)
+        throw new Error(`${label} is too long`);
+    return normalized;
+}
+function requiredRequestHash(value) {
+    const normalized = value?.trim();
+    if (!SHA256_PATTERN.test(normalized)) {
+        throw new Error("requestHash must be a SHA-256 hex digest");
+    }
+    return normalized.toLowerCase();
+}

package/dist/session-meta-store.d.ts

@@ -1,7 +1,7 @@
 /**
  * The unified machine-session record (SQLite) — one row per session regardless
  * of origin (the web console AND every channel). Holds identity/meta (source /
- * agent / inline config / model / title / …) so the **session list survives a
+ * provider / agent / inline config / model / title / …) so the **session list survives a
  * daemon restart**; the transcript lives in `session_items` (see
  * {@link import("./session-log-store.js")}). Runtime `status` is intentionally
  * not stored — it is reconstructed as `idle` after a restart.
@@ -11,12 +11,13 @@
  * via the `ChannelContext`, so a channel registers its sessions the same way the
  * console does.
  */
-import type { MachineSessionRecord, SessionRegistry } from "@rynx-ai/core";
+import { type MachineSessionRecord, type SessionRegistry } from "@rynx-ai/core";
 /** Back-compat alias for the unified record. */
 export type StoredSessionMeta = MachineSessionRecord;
 export declare function listSessionMetas(): StoredSessionMeta[];
 export declare function getSessionMeta(id: string): StoredSessionMeta | undefined;
 export declare function createSessionMeta(meta: StoredSessionMeta): void;
+export declare function updateSessionMeta(meta: StoredSessionMeta): void;
 export declare function setSessionTitle(id: string, title: string): void;
 export declare function removeSessionMeta(id: string): void;
 /** {@link SessionRegistry} over the same `sessions` table — the form channels

package/dist/session-meta-store.js

@@ -1,5 +1,19 @@
+/**
+ * The unified machine-session record (SQLite) — one row per session regardless
+ * of origin (the web console AND every channel). Holds identity/meta (source /
+ * provider / agent / inline config / model / title / …) so the **session list survives a
+ * daemon restart**; the transcript lives in `session_items` (see
+ * {@link import("./session-log-store.js")}). Runtime `status` is intentionally
+ * not stored — it is reconstructed as `idle` after a restart.
+ *
+ * Exposes both the standalone functions the control-plane deps wire in and a
+ * {@link SessionRegistry} adapter ({@link sessionRegistry}) injected into channels
+ * via the `ChannelContext`, so a channel registers its sessions the same way the
+ * console does.
+ */
+import { normalizeSessionTitle, } from "@rynx-ai/core";
 import { db } from "./db.js";
-const COLS = "id, agent, config, model, reasoning_effort, title, source, created_at, updated_at";
+const COLS = "id, provider, agent, config, model, reasoning_effort, title, source, created_at, updated_at";
 export function listSessionMetas() {
     return db()
         .prepare(`SELECT ${COLS} FROM sessions ORDER BY created_at`)
@@ -13,27 +27,60 @@ export function getSessionMeta(id) {
 export function createSessionMeta(meta) {
     db()
         .prepare(`INSERT OR IGNORE INTO sessions
-         (id, agent, config, model, reasoning_effort, title, source, created_at, updated_at)
-       VALUES (@id, @agent, @config, @model, @reasoning_effort, @title, @source, @created_at, @updated_at)`)
+         (id, provider, agent, config, model, reasoning_effort, title, source, created_at, updated_at)
+       VALUES (@id, @provider, @agent, @config, @model, @reasoning_effort, @title, @source, @created_at, @updated_at)`)
         .run({
         id: meta.id,
+        provider: meta.provider ?? null,
         agent: meta.agent ?? null,
         config: meta.config ? JSON.stringify(meta.config) : null,
         model: meta.model ?? null,
         reasoning_effort: meta.reasoningEffort ?? null,
-        title: meta.title ?? null,
+        title: normalizeSessionTitle(meta.title) ?? null,
         source: meta.source,
         created_at: meta.createdAt,
         updated_at: meta.updatedAt ?? meta.createdAt,
     });
 }
+export function updateSessionMeta(meta) {
+    db()
+        .prepare(`UPDATE sessions
+       SET provider = @provider,
+           agent = @agent,
+           config = @config,
+           model = @model,
+           reasoning_effort = @reasoning_effort,
+           title = @title,
+           source = @source,
+           updated_at = @updated_at
+       WHERE id = @id`)
+        .run({
+        id: meta.id,
+        provider: meta.provider ?? null,
+        agent: meta.agent ?? null,
+        config: meta.config ? JSON.stringify(meta.config) : null,
+        model: meta.model ?? null,
+        reasoning_effort: meta.reasoningEffort ?? null,
+        title: normalizeSessionTitle(meta.title) ?? null,
+        source: meta.source,
+        updated_at: meta.updatedAt ?? new Date().toISOString(),
+    });
+}
 export function setSessionTitle(id, title) {
     db()
         .prepare("UPDATE sessions SET title = ?, updated_at = ? WHERE id = ?")
-        .run(title, new Date().toISOString(), id);
+        .run(normalizeSessionTitle(title), new Date().toISOString(), id);
 }
 export function removeSessionMeta(id) {
-    db().prepare("DELETE FROM sessions WHERE id = ?").run(id);
+    db().transaction(() => {
+        const now = new Date().toISOString();
+        db()
+            .prepare(`UPDATE plugin_session_launch_operations
+         SET state = 'deleted', updated_at = ?, deleted_at = ?
+         WHERE session_id = ? AND state = 'active'`)
+            .run(now, now, id);
+        db().prepare("DELETE FROM sessions WHERE id = ?").run(id);
+    }).immediate();
 }
 /** {@link SessionRegistry} over the same `sessions` table — the form channels
  *  receive through their `ChannelContext`. */
@@ -47,11 +94,14 @@ export const sessionRegistry = {
 function rowToMeta(row) {
     return {
         id: row.id,
+        provider: row.provider === "codex" || row.provider === "claude" ? row.provider : undefined,
         agent: row.agent ?? undefined,
         config: row.config ? JSON.parse(row.config) : undefined,
         model: row.model ?? undefined,
         reasoningEffort: (row.reasoning_effort ?? undefined),
-        title: row.title ?? undefined,
+        // Normalize on read as well so pre-boundary database rows cannot poison an
+        // entire Remote Session list page after upgrading the daemon.
+        title: normalizeSessionTitle(row.title ?? undefined),
         source: row.source ?? "console",
         createdAt: row.created_at,
         updatedAt: row.updated_at ?? row.created_at,

package/dist/setup.js

@@ -17,7 +17,7 @@ import { AGENT_RUNTIME_IDS, getRuntimeProfile, listAgentSpecs, loadConfig, resol
 import { listChannels } from "./channel-store.js";
 import { dbPath } from "./db.js";
 import { listInstances } from "./instance-store.js";
-import { listPlugins } from "./plugin-store.js";
+import { isRunnablePluginRecord, listPlugins } from "./plugin-store.js";
 import { formatControlUrl } from "./pm2.js";
 const MIN_NODE_MAJOR = 20;
 // ── rynx setup — interactive wizard ─────────────────────────────────────────
@@ -26,7 +26,7 @@ export async function runSetup() {
     if (!process.stdin.isTTY || !process.stdout.isTTY) {
         // Non-interactive (CI / piped): never block on a prompt — just ensure defaults.
         if (!existsSync(rynxConfigFile()))
-            writeConfig({ HOST: "0.0.0.0", PORT: 3000, LOG_LEVEL: "info" });
+            writeConfig({ HOST: "127.0.0.1", PORT: 3000, LOG_LEVEL: "info" });
         console.log(`非交互环境:已确保 ${rynxConfigFile()} 存在(默认值)。` +
             "在终端(TTY)下重跑 `rynx setup` 可分步配置,或直接编辑该文件。");
         return 0;
@@ -81,12 +81,12 @@ export async function runSetup() {
     if (p.isCancel(port))
         return bail();
     cfg.PORT = Number(port);
-    cfg.HOST = cfg.HOST ?? "0.0.0.0";
+    cfg.HOST = cfg.HOST ?? "127.0.0.1";
     cfg.LOG_LEVEL = cfg.LOG_LEVEL ?? "info";
     writeConfig(cfg);
     p.log.success(`已写入 ${rynxConfigFile()}(chmod 600)`);
     p.log.message(`HOST=${cfg.HOST}  PORT=${cfg.PORT}  AGENT_RUNTIME=${cfg.AGENT_RUNTIME ?? "(默认)"}`);
-    const url = formatControlUrl(String(cfg.HOST ?? "0.0.0.0"), Number(cfg.PORT ?? 3000));
+    const url = formatControlUrl(String(cfg.HOST ?? "127.0.0.1"), Number(cfg.PORT ?? 3000));
     p.note([
         `启动常驻服务   rynx start`,
         `打开控制台     ${url}`,
@@ -146,6 +146,11 @@ export async function runDoctor() {
     else {
         const plugins = listPlugins();
         p.log.info(`插件:${plugins.length} 个${plugins.length ? `(${plugins.map((pl) => pl.name).join(", ")})` : ""}`);
+        const legacyPlugins = plugins.filter((plugin) => !isRunnablePluginRecord(plugin));
+        if (legacyPlugins.length > 0) {
+            p.log.warn(`需重新安装的旧插件:${legacyPlugins.map((plugin) => plugin.name).join(", ")}`);
+            warn++;
+        }
         const channels = listChannels();
         const configured = channels.filter((c) => c.options && Object.keys(c.options).length > 0).length;
         p.log.info(`channel:${channels.length} 个(${configured} 已配置凭据)  ·  instance:${listInstances().length} 个`);

package/dist/skills-catalog.js

@@ -12,7 +12,7 @@ const SKILL_NAME_PATTERN = /^[a-z0-9][a-z0-9-]{0,63}$/;
 /** A single file's contents are capped to keep responses small. */
 const MAX_SKILL_FILE_BYTES = 256 * 1024;
 export function listCatalogSkills() {
-    return scanSkillsDir(rynxSkillsDir());
+    return listMergedSkills();
 }
 /** Install a skill (or a repo's skills) into the catalog per a full install
  *  recipe; delegates to the core catalog layer (which also writes each skill's
@@ -20,7 +20,7 @@ export function listCatalogSkills() {
  *  the refreshed catalog. */
 export async function installCatalogSkill(recipe) {
     await installIntoCatalog(recipe, rynxSkillsDir());
-    return scanSkillsDir(rynxSkillsDir());
+    return listMergedSkills();
 }
 /** Detail for one catalog skill: its metadata + the file tree under its dir. */
 export async function getCatalogSkill(name) {
@@ -30,6 +30,7 @@ export async function getCatalogSkill(name) {
     const meta = await readSkillMeta(dir);
     if (!meta)
         return null;
+    const ref = meta.ref;
     const files = await walkSkillFiles(dir, dir);
     let frontmatter;
     try {
@@ -41,7 +42,7 @@ export async function getCatalogSkill(name) {
     return {
         name: meta.name,
         description: meta.description,
-        ...(meta.ref ? { ref: meta.ref } : {}),
+        ...(ref ? { ref } : {}),
         frontmatter,
         totalSize: files.reduce((sum, f) => sum + f.size, 0),
         files,
@@ -63,7 +64,7 @@ async function walkSkillFiles(root, dir) {
 export async function readCatalogSkillFile(name, relPath) {
     if (!SKILL_NAME_PATTERN.test(name))
         throw new Error(`invalid skill name: ${name}`);
-    const dir = path.resolve(rynxSkillsDir(), name);
+    const dir = path.resolve(path.join(rynxSkillsDir(), name));
     const target = path.resolve(dir, relPath);
     if (target !== dir && !target.startsWith(dir + path.sep)) {
         throw new Error("path escapes the skill directory");
@@ -78,6 +79,9 @@ export async function readCatalogSkillFile(name, relPath) {
         throw new Error("binary file — not viewable");
     return { path: relPath, content: buf.toString("utf8") };
 }
+async function listMergedSkills() {
+    return (await scanSkillsDir(rynxSkillsDir())).sort((a, b) => a.name.localeCompare(b.name));
+}
 /** Remove a catalog skill by name. Returns false if it wasn't present. */
 export async function removeCatalogSkill(name) {
     if (!SKILL_NAME_PATTERN.test(name))

package/dist/update.d.ts

@@ -1,11 +1,20 @@
-import { type UpdateCheck } from "@rynx-ai/core";
 export interface UpdateOptions {
     check?: boolean;
     /** With `check`, emit a typed {@link UpdateCheck} as JSON instead of a human line. */
     json?: boolean;
     version?: string;
-    resultFile?: string;
 }
+export type UpdateCheck = {
+    status: "up_to_date";
+    current: string;
+} | {
+    status: "behind";
+    current: string;
+    latest: string;
+} | {
+    status: "error";
+    detail: string;
+};
 /** Is `latest` a newer release than `current`? Numeric major.minor.patch (prerelease ignored). */
 export declare function isNewer(latest: string, current: string): boolean;
 /** Typed `--check` result a channel consumes via `--check --json`. */

package/dist/update.js

@@ -7,12 +7,8 @@
  *   rynx update [version]                 upgrade (to a version, or latest) + restart
  *   rynx update --check                   report status only (human one-liner)
  *   rynx update --check --json            report status only (typed UpdateCheck JSON)
- *   rynx update --result-file <path>      after finishing, write the outcome JSON to
- *                                         <path> (channel-agnostic UpdateOutcome; a
- *                                         plugin reads it post-restart to notify a chat)
  */
 import { spawnSync } from "node:child_process";
-import { mkdirSync, writeFileSync } from "node:fs";
 import { createRequire } from "node:module";
 import { dirname, sep } from "node:path";
 import { loadConfig } from "@rynx-ai/core";
@@ -98,19 +94,6 @@ async function verifyHealthy() {
     }
     return false;
 }
-/** Write the post-restart outcome to `--result-file` (best-effort; stamps `at`). */
-function writeOutcome(file, outcome) {
-    if (!file)
-        return;
-    try {
-        mkdirSync(dirname(file), { recursive: true });
-        const full = { ...outcome, at: new Date().toISOString() };
-        writeFileSync(file, `${JSON.stringify(full, null, 2)}\n`);
-    }
-    catch {
-        /* best-effort */
-    }
-}
 /** Run `rynx update`. Returns a process exit code. */
 export async function runUpdate(opts) {
     const { name, version: current } = selfPackage();
@@ -122,13 +105,11 @@ export async function runUpdate(opts) {
     // Never `npm install -g` over a working checkout / linked dev build.
     if (isLocalDevInstall()) {
         console.error(`update: ${name} is a local dev install — update your checkout (e.g. pnpm build), not npm`);
-        writeOutcome(opts.resultFile, { status: "fail", from: current, to: current, error: "local dev install" });
         return 1;
     }
     const target = opts.version ?? latest;
     if (!target) {
         console.error(`update: could not resolve a target version for ${name} (registry unreachable?)`);
-        writeOutcome(opts.resultFile, { status: "fail", from: current, to: current, error: "could not resolve target version" });
         return 1;
     }
     if (!opts.version && latest && !isNewer(latest, current)) {
@@ -138,12 +119,6 @@ export async function runUpdate(opts) {
     console.log(`Updating ${name}: ${current} → ${target} …`);
     if (!npmInstallGlobal(name, target)) {
         console.error("update: npm install failed");
-        writeOutcome(opts.resultFile, { status: "fail", from: current, to: target, error: "npm install failed" });
-        // The install failed before any restart, so the channel that spawned us never
-        // reboots to drain the outcome. Bounce the daemon (still on the old, healthy
-        // version) so its boot-time drain delivers the failure to chat.
-        if (opts.resultFile)
-            startDaemon({ force: true });
         return 1;
     }
     startDaemon({ force: true });
@@ -151,10 +126,8 @@ export async function runUpdate(opts) {
         console.error(`update: ${name}@${target} did not come back up — rolling back to ${current}`);
         npmInstallGlobal(name, current);
         startDaemon({ force: true });
-        writeOutcome(opts.resultFile, { status: "fail", from: current, to: target, error: "did not come up; rolled back" });
         return 1;
     }
     console.log(`Updated ${name} → ${target} and restarted.`);
-    writeOutcome(opts.resultFile, { status: "ok", from: current, to: target });
     return 0;
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@rynx-ai/daemon",
-  "version": "0.1.0",
-  "description": "rynx daemon CLI: supervises the resident @rynx-ai/server via pm2 and loads channel plugins recorded in ~/.rynx/rynx.db.",
+  "version": "0.1.9",
+  "description": "Rynx daemon CLI: supervises the local agent control plane and isolated optional plugin runtimes.",
   "type": "module",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/",
@@ -15,20 +15,28 @@
   },
   "main": "./dist/index-daemon.js",
   "exports": {
-    "./server": {
-      "types": "./dist/daemon-server.d.ts",
-      "default": "./dist/daemon-server.js"
+    "./client": {
+      "types": "./dist/control-client.d.ts",
+      "default": "./dist/control-client.js"
     }
   },
   "dependencies": {
     "@clack/prompts": "^1.6.0",
+    "@electron-internal/extract-zip": "^1.0.4",
     "better-sqlite3": "^12.11.1",
     "pm2": "^6.0.0",
-    "zod": "^4.3.6",
-    "@rynx-ai/core": "0.1.0",
-    "@rynx-ai/protocol": "0.1.0",
-    "@rynx-ai/server": "0.1.0",
-    "@rynx-ai/emulator": "0.1.7"
+    "tar": "^7.5.19",
+    "ws": "^8.21.0",
+    "@rynx-ai/emulator": "0.1.9",
+    "@rynx-ai/core": "0.1.9",
+    "@rynx-ai/plugin-runner": "0.1.9",
+    "@rynx-ai/protocol": "0.1.9",
+    "@rynx-ai/plugin-sdk": "0.1.9",
+    "@rynx-ai/remote-runtime-client": "0.1.9",
+    "@rynx-ai/server": "0.1.9"
+  },
+  "devDependencies": {
+    "@types/ws": "^8.18.1"
   },
   "scripts": {
     "build": "rm -rf dist && tsc -p tsconfig.json && chmod +x dist/cli.js dist/index-daemon.js",