@getfamiliar/shared 0.1.11 → 0.1.13

package/build/Schema.js

@@ -50,16 +50,18 @@ export const CHATMESSAGES_NEW_CHANNEL = "chatmessages_new";
  */
 export const SCHEDULED_SUBAGENTS_CHANNEL = "scheduled_subagents_changed";
 /**
- * Topic regex used by the events check constraint and by the container
- * runtime when resolving handler files. One word, optionally followed
- * by any number of `:`-prefixed sub-topic words. Examples:
- * `mail`, `chat:cli`, `chat:telegram:group:reaction`.
+ * Topic regex used by the topic check constraints and by the container
+ * runtime when resolving handler files. One word (word characters and
+ * dashes), optionally followed by any number of `:`-prefixed sub-topic
+ * words. Examples: `mail`, `chat:cli`, `mail:extract-style`,
+ * `chat:telegram:group:reaction`.
  *
- * The container resolves a handler for topic `a:b:c` by walking the
- * chain `a/b/c/<basename>.md → a/b/<basename>.md → a/<basename>.md`
- * deepest-first and merging every existing layer (see HandlerFile.load).
+ * The topic is a handler's whole address: `a:b:c` names the single file
+ * `a/b/c.md` (or its folder form `a/b/c/index.md`). Events fall back up
+ * the chain (`a:b`, `a`) when that file is missing; everything else must
+ * match exactly (see `HandlerResolution.ts`).
  */
-export const TOPIC_PATTERN = "^\\w+(:\\w+)*$";
+export const TOPIC_PATTERN = "^[\\w-]+(:[\\w-]+)*$";
 export const SCHEMA_SQL = `
 -- Drop legacy single-table artifacts from before the events/agentruns
 -- split. Safe no-ops on fresh databases. The current schema reuses the
@@ -105,10 +107,13 @@ ALTER TABLE events ADD COLUMN IF NOT EXISTS preferred_chat_channel_id text;
 -- emitter's framing without the EventWatcher having to reach into the
 -- payload schema.
 ALTER TABLE events ADD COLUMN IF NOT EXISTS prompt text;
--- Optional override for the root agentrun's handler. When NULL the
--- input-event watcher falls back to 'index' — same behaviour as
--- before this column existed. Set by the emitter on NewEvent.
-ALTER TABLE events ADD COLUMN IF NOT EXISTS start_handler text;
+-- The topic is the handler's whole address now; the separate start
+-- handler basename is gone.
+ALTER TABLE events DROP COLUMN IF EXISTS start_handler;
+-- When true the topic must name an existing handler file exactly; when
+-- false (world events) handler resolution falls back up the topic chain.
+-- Copied onto the root agentrun by the input-event watcher.
+ALTER TABLE events ADD COLUMN IF NOT EXISTS is_exact_topic boolean NOT NULL DEFAULT false;
 -- Privileged events originate from a trusted user-input source (operator
 -- at the local terminal via cli-chat, operator on Telegram). The flag
 -- propagates verbatim to the root agentrun and to every child agentrun
@@ -133,7 +138,6 @@ CREATE TABLE IF NOT EXISTS agentruns (
   event_id           bigint NOT NULL REFERENCES events(id) ON DELETE CASCADE,
   parent_agentrun_id bigint REFERENCES agentruns(id) ON DELETE CASCADE,
   topic              text NOT NULL,
-  handler            text NOT NULL,
   priority           smallint NOT NULL DEFAULT 50,
   state              text NOT NULL DEFAULT 'pending',
   prompt             text,
@@ -150,6 +154,11 @@ CREATE TABLE IF NOT EXISTS agentruns (
 -- Forward-compat ALTER for databases created before result_text landed.
 -- Safe no-op on fresh databases where the column already exists.
 ALTER TABLE agentruns ADD COLUMN IF NOT EXISTS result_text text;
+-- The topic is the handler's whole address; the basename column is gone.
+ALTER TABLE agentruns DROP COLUMN IF EXISTS handler;
+-- Whether handler resolution must match the topic exactly. Root
+-- agentruns copy the event's flag; spawned children are always exact.
+ALTER TABLE agentruns ADD COLUMN IF NOT EXISTS is_exact_topic boolean NOT NULL DEFAULT true;
 -- Inherited from the originating event (root agentrun) or parent
 -- agentrun (children spawned via schedule_subagent / start_subagent). See
 -- the matching ALTER on the events table for the trust-model rationale.
@@ -452,7 +461,6 @@ CREATE TABLE IF NOT EXISTS scheduled_subagents (
   key         text PRIMARY KEY,
   fire_at     timestamptz NOT NULL,
   topic       text NOT NULL,
-  handler     text NOT NULL,
   prompt      text,
   payload     jsonb NOT NULL DEFAULT '{}'::jsonb,
   priority    smallint NOT NULL DEFAULT 50,
@@ -461,6 +469,12 @@ CREATE TABLE IF NOT EXISTS scheduled_subagents (
   CONSTRAINT scheduled_subagents_topic_format CHECK (topic ~ '${TOPIC_PATTERN}')
 );
 
+-- The topic is the handler's whole address; the basename column is gone.
+ALTER TABLE scheduled_subagents DROP COLUMN IF EXISTS handler;
+-- Re-add the topic CHECK so a widened TOPIC_PATTERN reaches existing tables.
+ALTER TABLE scheduled_subagents DROP CONSTRAINT IF EXISTS scheduled_subagents_topic_format;
+ALTER TABLE scheduled_subagents ADD CONSTRAINT scheduled_subagents_topic_format CHECK (topic ~ '${TOPIC_PATTERN}');
+
 CREATE INDEX IF NOT EXISTS scheduled_subagents_fire_at_idx
   ON scheduled_subagents (fire_at);
 

package/build/index.d.ts

@@ -4,14 +4,15 @@ export { BASTION_TOKEN_HEADER } from "./BastionAuth.js";
 export { buildCalendarEventId, type CalendarApi, type CalendarAttachmentMeta, type CalendarAttendee, type CalendarChangePayload, type CalendarEventRow, type CalendarEventType, type CalendarImportance, type CalendarProvider, type CalendarResponseStatus, type CalendarRow, type CalendarSensitivity, type CalendarShowAs, type CalendarType, type CreateEventInput, type FindEventsQuery, type NewCalendarEvent, parseCalendarEventId, type UpdateEventInput, type UpsertCalendarInput, } from "./Calendar.js";
 export type { ChatFilter, ChatMessage, ChatRole, NewChatMessage } from "./ChatMessage.js";
 export { type ChatHandler, ChatMessageBus, type ChatUnsubscribe } from "./ChatMessageBus.js";
-export type { ConfigService } from "./Config.js";
+export { type ConfigService, DEFAULT_WRITABLE_PATHS } from "./Config.js";
 export type { ContainerToolInfo } from "./ContainerTool.js";
 export { type ParsedCron, parseCron } from "./CronExpression.js";
 export type { EventFile, EventFilter, EventPatch, EventRow, EventState, NewEvent, } from "./Event.js";
 export { EVENT_PRIORITY } from "./Event.js";
 export { DuplicateIdempotencyKeyError, EventBus } from "./EventBus.js";
 export { estimateTokens } from "./estimateTokens.js";
-export { HandlerCatalog, type HandlerPath, isUnderSkillsFolder } from "./HandlerCatalog.js";
+export { HandlerCatalog, type HandlerPath, type ResolvedHandler } from "./HandlerCatalog.js";
+export { type HandlerResolution, type HandlerResolutionOptions, handlerCandidateLevels, resolveHandlerPath, topicFromHandlerPath, twinHandlerPath, } from "./HandlerResolution.js";
 export type { InferenceEventRow, InferenceOutcome, NewInferenceEvent, } from "./InferenceEvent.js";
 export { InferenceEventBus } from "./InferenceEventBus.js";
 export { type CreateLoggerOptions, createLogger, jsonStdoutStream, type Logger, type LogLevel, type LogStream, prettyStdoutStream, } from "./logging/Logger.js";
@@ -22,7 +23,7 @@ export { renderMarkdownToHtml } from "./markdownHtml.js";
 export { escapeTableCell, markdownTable, writeMarkdown } from "./markdownOutput.js";
 export { renderMarkdown } from "./markdownTerminal.js";
 export { matchesAnyGlob, matchesGlob } from "./PathGlob.js";
-export type { AnyCommandDef, EmitHandle, EmitOptions, HostContext, McpClient, McpInfo, PluginHostManifest, PluginManifest, PluginTool, PluginToolCallContext, PromptAppender, PromptPlaceholderRegistration, } from "./Plugin.js";
+export type { AnyCommandDef, EmitHandle, EmitOptions, EmittedEventDescriptor, HostContext, McpClient, McpInfo, PluginHostManifest, PluginManifest, PluginTool, PluginToolCallContext, PromptAppender, PromptPlaceholderRegistration, } from "./Plugin.js";
 export { DaemonStoppedError, definePlugin } from "./Plugin.js";
 export { type NotificationHandler, POSTGRES_DB, POSTGRES_HOST, POSTGRES_PORT, POSTGRES_USER, PostgresConnection, type PostgresConnectionConfig, } from "./PostgresConnection.js";
 export { CACHE_MARKER_PLACEHOLDER, CORE_PROMPT_PLACEHOLDERS, isCorePromptPlaceholder, PROMPT_PLACEHOLDER_NAME_PATTERN, PROMPT_TEMPLATE_FILE, PromptPlaceholderConflictError, type PromptPlaceholderDefinition, type PromptPlaceholderKind, } from "./PromptPlaceholders.js";

package/build/index.js

@@ -2,11 +2,13 @@ export { AgentRunBus } from "./AgentRunBus.js";
 export { BASTION_TOKEN_HEADER } from "./BastionAuth.js";
 export { buildCalendarEventId, parseCalendarEventId, } from "./Calendar.js";
 export { ChatMessageBus } from "./ChatMessageBus.js";
+export { DEFAULT_WRITABLE_PATHS } from "./Config.js";
 export { parseCron } from "./CronExpression.js";
 export { EVENT_PRIORITY } from "./Event.js";
 export { DuplicateIdempotencyKeyError, EventBus } from "./EventBus.js";
 export { estimateTokens } from "./estimateTokens.js";
-export { HandlerCatalog, isUnderSkillsFolder } from "./HandlerCatalog.js";
+export { HandlerCatalog } from "./HandlerCatalog.js";
+export { handlerCandidateLevels, resolveHandlerPath, topicFromHandlerPath, twinHandlerPath, } from "./HandlerResolution.js";
 export { InferenceEventBus } from "./InferenceEventBus.js";
 export { createLogger, jsonStdoutStream, prettyStdoutStream, } from "./logging/Logger.js";
 export { buildMailId, parseMailId, } from "./Mail.js";

package/build/testing/MockAgentRunBus.js

@@ -33,7 +33,7 @@ export class MockAgentRunBus {
             eventId: run.eventId,
             parentAgentrunId: run.parentAgentrunId ?? null,
             topic: run.topic,
-            handler: run.handler,
+            isExactTopic: run.isExactTopic ?? true,
             priority: run.priority ?? 50,
             state: run.state ?? "pending",
             prompt: run.prompt ?? null,

package/build/testing/MockEventBus.js

@@ -29,7 +29,7 @@ export class MockEventBus {
             isChat: event.isChat === true,
             preferredChatChannelId: event.preferredChatChannelId ?? null,
             prompt: event.prompt ?? null,
-            startHandler: event.startHandler ?? null,
+            isExactTopic: event.isExactTopic ?? false,
             privileged: event.privileged === true,
             outputChatOnFailure: event.outputChatOnFailure === true,
             createdAt: now,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@getfamiliar/shared",
   "type": "module",
-  "version": "0.1.11",
+  "version": "0.1.13",
   "description": "Familiar — shared types and bus-state client between host and container.",
   "publishConfig": {
     "access": "public"