@capybara-hq/kernel 0.1.0-rc.3 → 0.1.0-rc.5

package/dist/conversations/queue.js

@@ -129,7 +129,18 @@ export async function appendQueuedIn(t, eventLog, conversationId, r) {
             .where("id", "=", conversationId)
             .execute();
     }
-    return { event: written.at(-1), switched: next !== null };
+    // As a direct send: the message brings an archived conversation back into the default lists
+    const unarchived = await t
+        .updateTable("conversations")
+        .set({ archived_at: null })
+        .where("id", "=", conversationId)
+        .where("archived_at", "is not", null)
+        .executeTakeFirst();
+    return {
+        event: written.at(-1),
+        switched: next !== null,
+        unarchived: Number(unarchived.numUpdatedRows) > 0,
+    };
 }
 /** The model of the conversation agent's current version (inside `t`). */
 async function agentModel(t, conversationId) {
@@ -206,7 +217,7 @@ export const queueFull = () => new ApiError("conversation.queue_full", `A conver
  * when the queue is empty. An item whose message is already in the log (a retried enqueue after it
  * was sent) is dropped and the next one is taken. A head item whose skill can no longer be invoked
  * stays queued and the queue pauses (`skill_not_invocable`): `{ paused }`. The caller notifies
- * after commit.
+ * after commit (and publishes `archived` when the send unarchived the conversation).
  */
 export async function dispatchQueuedIn(t, eventLog, conversationId) {
     for (;;) {

package/dist/conversations/queue.service.d.ts

@@ -17,7 +17,7 @@ export declare class ConversationQueue {
     readonly txHost: TransactionHost;
     constructor(db: KernelDb, eventLog: Pick<EventLog, "appendIn" | "notify" | "publishChanged" | "findByIdem">, conversations: Pick<ConversationsService, "get" | "writable" | "resolveExtra" | "bindIn" | "checkPick" | "prepareQueuedSkill">, 
     /** Starts the conversation's next run (`ensureRun`). */
-    runs: Pick<RunControl, "ensureRun">, txHost: TransactionHost);
+    runs: Pick<RunControl, "ensureRun" | "wakeHeldTree">, txHost: TransactionHost);
     list(orgId: string, conversationId: string, accountId: string): Promise<{
         items: QueueItem[];
         paused: boolean;

package/dist/conversations/queue.service.js

@@ -218,6 +218,8 @@ let ConversationQueue = class ConversationQueue {
         await this.conversations.writable(orgId, conversationId, accountId);
         await this.removeIn(conversationId, itemId);
         await this.eventLog.publishChanged(conversationId, "queue");
+        // removing the last item unpauses the queue: the wakes it held for the tree go out
+        await this.runs.wakeHeldTree(conversationId);
     }
     // its own transaction: the caller notifies and publishes after the commit
     async removeIn(conversationId, itemId) {
@@ -240,13 +242,16 @@ let ConversationQueue = class ConversationQueue {
      */
     async sendNow(orgId, conversationId, accountId, itemId) {
         await this.conversations.writable(orgId, conversationId, accountId);
-        const { event, fresh, switched } = await this.sendNowIn(conversationId, itemId);
+        const { event, fresh, switched, unarchived } = await this.sendNowIn(conversationId, itemId);
         if (fresh)
             await this.eventLog.notify(conversationId, event.seq);
         if (switched)
             await this.eventLog.publishChanged(conversationId, "selection");
+        if (unarchived)
+            await this.eventLog.publishChanged(conversationId, "archived");
         await this.eventLog.publishChanged(conversationId, "queue");
         await this.runs.ensureRun(conversationId);
+        await this.runs.wakeHeldTree(conversationId);
         return event;
     }
     // its own transaction: the caller notifies and publishes after the commit
@@ -291,6 +296,8 @@ let ConversationQueue = class ConversationQueue {
             .execute();
         await this.eventLog.publishChanged(conversationId, "queue");
         await this.runs.ensureRun(conversationId);
+        // a paused root holds the wakes of its whole tree (agent map spec §5.3)
+        await this.runs.wakeHeldTree(conversationId);
     }
     /** A queued item or a sent message for this client id (outside any transaction). */
     async prior(conversationId, clientMessageId) {

package/dist/conversations/titles.d.ts

@@ -29,10 +29,19 @@ export declare const titleJobId: (conversationId: string, attempt: number) => st
 export declare const TITLE_MAX_ATTEMPTS = 3;
 /** Output cap of the title call. */
 export declare const TITLE_MAX_OUTPUT_TOKENS = 32;
-/** The longest generated title (characters); a rename has the same limit. */
+/** The longest title a person can give by renaming (characters). */
 export declare const TITLE_MAX_CHARS = 120;
+/** The longest generated title by display width (CJK and emoji count 2: ~24 CJK / 48 Latin). */
+export declare const TITLE_MAX_WIDTH = 48;
 /** Each side of the excerpt is cut to this many characters. */
 export declare const TITLE_EXCERPT_CHARS = 1000;
+/**
+ * Parameters of the title call where the target model declares them and the `title` purpose does
+ * not set them: no thinking, so the {@link TITLE_MAX_OUTPUT_TOKENS} budget goes to the title.
+ */
+export declare const TITLE_PARAM_DEFAULTS: {
+    readonly thinking: "off";
+};
 /** Time limit of one title call. */
 export declare const TITLE_TIMEOUT_MS = 60000;
 /** The system prompt of the title call (model-facing, English). */
@@ -41,8 +50,8 @@ export declare const TITLE_PROMPT: string;
 export declare function titleExcerpt(firstUser: string, firstReply: string): string;
 /**
  * The title from a model reply: the first non-empty line, without control or format characters,
- * wrapping quotes or trailing punctuation, at most {@link TITLE_MAX_CHARS} characters; null when
- * nothing is left.
+ * wrapping quotes or trailing punctuation, at most {@link TITLE_MAX_WIDTH} display width (cut on a
+ * character boundary, no ellipsis); null when nothing is left.
  */
 export declare function cleanTitle(reply: string): string | null;
 export interface TitleDeps {

package/dist/conversations/titles.js

@@ -47,10 +47,17 @@ export const titleJobId = (conversationId, attempt) => `title-${conversationId}-
 export const TITLE_MAX_ATTEMPTS = 3;
 /** Output cap of the title call. */
 export const TITLE_MAX_OUTPUT_TOKENS = 32;
-/** The longest generated title (characters); a rename has the same limit. */
+/** The longest title a person can give by renaming (characters). */
 export const TITLE_MAX_CHARS = 120;
+/** The longest generated title by display width (CJK and emoji count 2: ~24 CJK / 48 Latin). */
+export const TITLE_MAX_WIDTH = 48;
 /** Each side of the excerpt is cut to this many characters. */
 export const TITLE_EXCERPT_CHARS = 1000;
+/**
+ * Parameters of the title call where the target model declares them and the `title` purpose does
+ * not set them: no thinking, so the {@link TITLE_MAX_OUTPUT_TOKENS} budget goes to the title.
+ */
+export const TITLE_PARAM_DEFAULTS = { thinking: "off" };
 /** Time limit of one title call. */
 export const TITLE_TIMEOUT_MS = 60_000;
 /** How far into the log the excerpt is looked for (events). */
@@ -58,8 +65,13 @@ const EXCERPT_SCAN_EVENTS = 2000;
 const PAGE = 500;
 const JOB = "title";
 /** The system prompt of the title call (model-facing, English). */
-export const TITLE_PROMPT = "Write a title of at most 8 words for this conversation, in the language the user writes in. " +
+export const TITLE_PROMPT = "Write a short topic of what the user asked, not the reply, as a title for this conversation, " +
+    "in the language the user writes in. Use a noun phrase of at most 6 words or about 16 CJK " +
+    "characters: no sentence, no list. " +
     "Reply with the title only, no quotes or punctuation at the end.";
+const WIDE_RE = /[\u1100-\u115F\u2E80-\u303E\u3041-\u33FF\u3400-\u4DBF\u4E00-\u9FFF\uA000-\uA4CF\uAC00-\uD7A3\uF900-\uFAFF\uFE30-\uFE6F\uFF00-\uFF60\uFFE0-\uFFE6]|\p{Extended_Pictographic}|[\u{20000}-\u{3FFFD}]/u;
+/** Display width of a character: 2 for CJK, fullwidth forms and emoji, else 1. */
+const widthOf = (ch) => (WIDE_RE.test(ch) ? 2 : 1);
 const cut = (s) => {
     const cps = Array.from(s);
     return cps.length <= TITLE_EXCERPT_CHARS ? s : `${cps.slice(0, TITLE_EXCERPT_CHARS).join("")}…`;
@@ -70,8 +82,8 @@ export function titleExcerpt(firstUser, firstReply) {
 }
 /**
  * The title from a model reply: the first non-empty line, without control or format characters,
- * wrapping quotes or trailing punctuation, at most {@link TITLE_MAX_CHARS} characters; null when
- * nothing is left.
+ * wrapping quotes or trailing punctuation, at most {@link TITLE_MAX_WIDTH} display width (cut on a
+ * character boundary, no ellipsis); null when nothing is left.
  */
 export function cleanTitle(reply) {
     const line = reply
@@ -86,10 +98,16 @@ export function cleanTitle(reply) {
         .replace(/^["'“”‘’「」《》`*]+|["'“”‘’「」《》`*]+$/gu, "")
         .replace(/[.。!！?？,，;；:：]+$/u, "")
         .trim();
-    // counted in code points, so a cut never splits a surrogate pair
-    const cps = Array.from(t);
-    if (cps.length > TITLE_MAX_CHARS)
-        t = cps.slice(0, TITLE_MAX_CHARS).join("").trimEnd();
+    // cut by display width over code points, so a cut never splits a surrogate pair
+    let width = 0;
+    let out = "";
+    for (const ch of t) {
+        width += widthOf(ch);
+        if (width > TITLE_MAX_WIDTH)
+            break;
+        out += ch;
+    }
+    t = out.trimEnd();
     return t === "" ? null : t;
 }
 const textOf = (content) => content.flatMap((b) => (b.type === "text" ? [b.text] : [])).join("");
@@ -204,6 +222,8 @@ export async function runTitleJob(d, conversationId, attempt) {
             maxOutputTokens: TITLE_MAX_OUTPUT_TOKENS,
         }, signal, {
             ...(fallback && { fallback: { model: fallback, params: {} } }),
+            // a thinking model spends the small output budget on thinking and returns no text
+            paramDefaults: TITLE_PARAM_DEFAULTS,
             beforeSend: async (target, request) => {
                 await checkTitleHooks(d, scope, target, request, signal);
                 sent = { ...target, at: Date.now() };
@@ -246,6 +266,14 @@ export async function runTitleJob(d, conversationId, attempt) {
     if (sent && d.hooks)
         observeTitle(d, scope, sent, out, null, signal);
     const title = cleanTitle(textOf(out.content));
+    if (title === null) {
+        d.log.warn("conversation title call returned no title", {
+            conversationId,
+            attempt,
+            stopReason: out.stopReason,
+            outputTokens: out.usage.outputTokens,
+        });
+    }
     const { written, usage } = await d.writes.writeResult(conversationId, attempt, out, title);
     if (usage) {
         await d.eventLog.notify(conversationId, usage.seq);

package/dist/conversations/tree.d.ts

@@ -0,0 +1,17 @@
+import type { KernelSchemaDb } from "../db/kernel-schema.js";
+/**
+ * A conversation and every sub-agent conversation below it (agent map spec §6: its children,
+ * grandchildren and so on, through `conversations.parent_conversation_id`), each with its level
+ * below `conversationId` (0 for the conversation itself), shallowest first. Deleted conversations
+ * are included (a deleted root's tree is still stopped); an unknown id yields nothing.
+ */
+export declare function conversationTree(db: KernelSchemaDb, conversationId: string): Promise<{
+    id: string;
+    level: number;
+}[]>;
+/**
+ * The ancestors of a conversation (agent map spec §8: live progress reaches every level above a
+ * sub-agent), nearest first: its parent, the parent's parent and so on up to the root, through
+ * `conversations.parent_conversation_id`. Empty for a root or an unknown id.
+ */
+export declare function conversationAncestors(db: KernelSchemaDb, conversationId: string): Promise<string[]>;

package/dist/conversations/tree.js

@@ -0,0 +1,42 @@
+import { sql } from "kysely";
+/**
+ * How many levels below a conversation the tree reads walk at most: far above
+ * `subagents.maxDepth`'s bound of 5, so a corrupt parent chain cannot loop forever.
+ */
+const TREE_MAX_LEVELS = 16;
+/**
+ * A conversation and every sub-agent conversation below it (agent map spec §6: its children,
+ * grandchildren and so on, through `conversations.parent_conversation_id`), each with its level
+ * below `conversationId` (0 for the conversation itself), shallowest first. Deleted conversations
+ * are included (a deleted root's tree is still stopped); an unknown id yields nothing.
+ */
+export async function conversationTree(db, conversationId) {
+    const r = await sql `
+    WITH RECURSIVE tree(id, level) AS (
+      SELECT c.id, 0 FROM capybara.conversations c WHERE c.id = ${conversationId}
+      UNION ALL
+      SELECT c.id, t.level + 1
+      FROM capybara.conversations c JOIN tree t ON c.parent_conversation_id = t.id
+      WHERE c.kind = 'subagent' AND t.level < ${TREE_MAX_LEVELS}
+    )
+    SELECT id, level FROM tree ORDER BY level, id`.execute(db);
+    return r.rows;
+}
+/**
+ * The ancestors of a conversation (agent map spec §8: live progress reaches every level above a
+ * sub-agent), nearest first: its parent, the parent's parent and so on up to the root, through
+ * `conversations.parent_conversation_id`. Empty for a root or an unknown id.
+ */
+export async function conversationAncestors(db, conversationId) {
+    const r = await sql `
+    WITH RECURSIVE up(id, parent, level) AS (
+      SELECT c.id, c.parent_conversation_id, 0 FROM capybara.conversations c
+      WHERE c.id = ${conversationId}
+      UNION ALL
+      SELECT c.id, c.parent_conversation_id, up.level + 1
+      FROM capybara.conversations c JOIN up ON c.id = up.parent
+      WHERE up.level < ${TREE_MAX_LEVELS}
+    )
+    SELECT id FROM up WHERE level > 0 ORDER BY level`.execute(db);
+    return r.rows.map((row) => row.id);
+}

package/dist/ctx/create-ctx.d.ts

@@ -48,6 +48,11 @@ export interface ExtensionPointAccess {
     }[];
     /** Names of the extensions enabled in the organization (`extension_org_configs.enabled` plus required bootstrap plugins, `enabled.ts`); queried every time, not cached. */
     enabledPlugins(orgId: string): Promise<Set<string>>;
+    /**
+     * Whether the extension's effective config is valid in the organization (layering spec A §6):
+     * a provider that is not is excluded from point resolution for that org.
+     */
+    configOk(orgId: string, plugin: string): Promise<boolean>;
 }
 /**
  * Queries the names of the extensions enabled in the organization (org config rows plus the

package/dist/ctx/create-ctx.js

@@ -146,6 +146,7 @@ function guardBuilder(builder, plugin) {
 const noProviders = (deps) => ({
     providers: () => [],
     enabledPlugins: (orgId) => queryEnabledPlugins(deps.db, orgId),
+    configOk: async () => true,
 });
 /**
  * 插件实例的部署配置（已校验）：`ctx.config` 是读它的 getter。hot 字段改动时宿主替换 `value`（C10），
@@ -260,12 +261,21 @@ export function createExtensionContext(deps, manifest, deploymentConfig, extensi
             throw new ExtensionPointUnavailableError(`extension point ${ref} has no provider`);
         return { info, chosen };
     };
-    /** 组织视角过滤提供方：orgScoped 能力只留该组织已启用的（每次查询，不缓存）。 */
+    /**
+     * The org's view of the providers: an orgScoped point keeps only those the org enabled (queried
+     * every time, not cached), and every point drops those whose effective config is not valid in
+     * the org (layering spec A §6: a call on behalf of an org never reaches such a provider).
+     */
     const forOrg = async (orgScoped, orgId, entries) => {
-        if (!orgScoped || entries.length === 0)
+        if (entries.length === 0)
             return entries;
-        const enabled = await extensionPointAccess.enabledPlugins(orgId);
-        return entries.filter((e) => enabled.has(e.plugin));
+        let out = entries;
+        if (orgScoped) {
+            const enabled = await extensionPointAccess.enabledPlugins(orgId);
+            out = out.filter((e) => enabled.has(e.plugin));
+        }
+        const ok = await Promise.all(out.map((e) => extensionPointAccess.configOk(orgId, e.plugin)));
+        return out.filter((_, i) => ok[i]);
     };
     const listAll = (ref) => {
         const info = checkExtensionPoint(ref);
@@ -280,7 +290,7 @@ export function createExtensionContext(deps, manifest, deploymentConfig, extensi
             return (async () => {
                 const { info, chosen } = pick(ref, provider);
                 if ((await forOrg(info.orgScoped, orgId, [chosen])).length === 0) {
-                    throw new ExtensionPointUnavailableError(`extension point ${ref} provider ${chosen.plugin} is not enabled in organization ${orgId}`);
+                    throw new ExtensionPointUnavailableError(`extension point ${ref} provider ${chosen.plugin} is not available in organization ${orgId} (not enabled there, or its configuration is not valid there)`);
                 }
                 return chosen.impl;
             })();