agent-relay-server 0.104.5 → 0.105.1

package/src/db/prompt-templates.ts

@@ -0,0 +1,86 @@
+import type { PromptTemplate } from "../types";
+import { ValidationError, getDb } from "./connection.ts";
+
+// SeedTemplate is owned by the SDK (alongside RUNNER_PROMPT_TEMPLATE_DEFAULTS) so the
+// published runner can consume the seed data without crossing a package boundary (#802).
+import type { SeedTemplate } from "agent-relay-sdk/prompt-template-defaults";
+export type { SeedTemplate };
+
+interface PromptTemplateRow {
+  slug: string;
+  category: string;
+  title: string;
+  description: string | null;
+  template: string;
+  default_template: string;
+  variables: string;
+  updated_at: number;
+  created_at: number;
+}
+
+export type PromptTemplateRecord = PromptTemplate;
+
+function rowToPromptTemplate(row: PromptTemplateRow): PromptTemplateRecord {
+  return {
+    slug: row.slug,
+    category: row.category,
+    title: row.title,
+    description: row.description ?? undefined,
+    template: row.template,
+    defaultTemplate: row.default_template,
+    variables: JSON.parse(row.variables) as string[],
+    updatedAt: row.updated_at,
+    createdAt: row.created_at,
+  };
+}
+
+export function getTemplate(slug: string): PromptTemplateRecord | null {
+  const row = getDb().query("SELECT * FROM prompt_templates WHERE slug = ?").get(slug) as PromptTemplateRow | null;
+  return row ? rowToPromptTemplate(row) : null;
+}
+
+export function listTemplates(category?: string): PromptTemplateRecord[] {
+  const rows = (
+    category
+      ? getDb().query("SELECT * FROM prompt_templates WHERE category = ? ORDER BY category ASC, title ASC, slug ASC").all(category)
+      : getDb().query("SELECT * FROM prompt_templates ORDER BY category ASC, title ASC, slug ASC").all()
+  ) as PromptTemplateRow[];
+  return rows.map(rowToPromptTemplate);
+}
+
+export function upsertTemplate(slug: string, template: string): void {
+  const now = Date.now();
+  const result = getDb().query("UPDATE prompt_templates SET template = ?, updated_at = ? WHERE slug = ?").run(template, now, slug);
+  if ((result.changes ?? 0) === 0) throw new ValidationError(`prompt template ${slug} not found`);
+}
+
+export function resetTemplate(slug: string): void {
+  const now = Date.now();
+  const result = getDb().query("UPDATE prompt_templates SET template = default_template, updated_at = ? WHERE slug = ?").run(now, slug);
+  if ((result.changes ?? 0) === 0) throw new ValidationError(`prompt template ${slug} not found`);
+}
+
+export function seedTemplates(templates: SeedTemplate[]): void {
+  const now = Date.now();
+  const insert = getDb().query(`
+    INSERT OR IGNORE INTO prompt_templates (
+      slug, category, title, description, template, default_template, variables, updated_at, created_at
+    ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)
+  `);
+  const tx = getDb().transaction((items: SeedTemplate[]) => {
+    for (const item of items) {
+      insert.run(
+        item.slug,
+        item.category,
+        item.title,
+        item.description ?? null,
+        item.template,
+        item.defaultTemplate,
+        JSON.stringify(item.variables),
+        now,
+        now,
+      );
+    }
+  });
+  tx(templates);
+}

package/src/db/schema.ts

@@ -17,6 +17,7 @@ import { matchAgents } from "../agent-ref";
 import { applyConnectionPragmas, getDb, setDb } from "./connection.ts";
 import { ensureContinuationArchiveSearchSchema } from "./continuation-archives.ts";
 import { applyMigrations } from "./migrations.ts";
+import { PROMPT_TEMPLATES_SCHEMA_SQL, seedPromptTemplatesIfNeeded } from "./prompt-templates-schema";
 import type {
   AgentCard,
   ActivityEvent,
@@ -506,6 +507,8 @@ export function initDb(path: string = "agent-relay.db"): Database {
     );
     CREATE INDEX IF NOT EXISTS idx_config_history_key ON config_history(namespace, key, version);
 
+    ${PROMPT_TEMPLATES_SCHEMA_SQL}
+
     -- Per-user settings (#391, epic #388). The user dimension the global \`config\` table lacks:
     -- the same \`(namespace, key)\` descriptor address resolves to a per-user value, keyed by the
     -- resolved \`users.id\` (#393). \`config\` semantics are untouched — \`tier:"user"\` descriptors
@@ -1009,8 +1012,7 @@ export function initDb(path: string = "agent-relay.db"): Database {
     );
   `);
 
-  ensureContinuationArchiveSearchSchema();
-  applyMigrations();
+  ensureContinuationArchiveSearchSchema(); applyMigrations(); seedPromptTemplatesIfNeeded();
 
   // Bootstrap planner statistics on first run (sqlite_stat1 absent means ANALYZE
   // has never run — the planner would otherwise rely on heuristics only), then
@@ -1018,8 +1020,7 @@ export function initDb(path: string = "agent-relay.db"): Database {
   const hasStats = getDb()
     .query("SELECT 1 FROM sqlite_master WHERE type = 'table' AND name = 'sqlite_stat1'")
     .get();
-  if (!hasStats) getDb().run("ANALYZE");
-  getDb().run("PRAGMA optimize");
+  if (!hasStats) getDb().run("ANALYZE"); getDb().run("PRAGMA optimize");
 
   return conn;
 }

package/src/db/tasks.ts

@@ -21,6 +21,7 @@ import { rowToTask, rowToTaskEvent } from "./mappers.ts";
 import { claimMessageRow } from "./message-claims.ts";
 import { TASK_SELECT, insertTaskEvent } from "./task-core.ts";
 import { settleSingleTargetOnDemandTasks } from "./task-maintenance.ts";
+import { renderTemplate } from "../prompt-resolver";
 import type {
   AgentCard,
   ActivityEvent,
@@ -101,7 +102,7 @@ export function taskMessageBody(task: Pick<Task, "id" | "source" | "severity" |
   ];
   if (task.externalUrl) lines.push("", `External: ${task.externalUrl}`);
   if (task.dedupeKey) lines.push(`Dedupe: ${task.dedupeKey}`);
-  lines.push("", "Claim this task before working it, then update task status when finished.");
+  lines.push("", renderTemplate("task.claim.instruction"));
   return lines.join("\n");
 }
 

package/src/db/workspaces.ts

@@ -15,6 +15,7 @@ import {
 import { STALE_TTL_MS, DAY_MS, CLAIM_LEASE_MS, POOL_CLAIM_LEASE_MS, WORKSPACE_MERGE_LEASE_MS } from "../config";
 import { matchAgents } from "../agent-ref";
 import { getDb } from "./connection.ts";
+import { resolveProjectsForCwds } from "./projects.ts";
 import type {
   AgentCard,
   ActivityEvent,
@@ -161,7 +162,7 @@ export function upsertWorkspaceFromManagedAgent(agent: ManagedAgent): WorkspaceR
     // overwrite the true base, and the next land advances a local-only branch that never
     // reaches origin/main (#285). Trust the existing row's branch/base over registration;
     // only a brand-new row takes the runner's values.
-    return upsertWorkspace({
+    const result = upsertWorkspace({
       id: workspace.id,
       repoRoot: workspace.repoRoot,
       sourceCwd: workspace.sourceCwd ?? agent.cwd,
@@ -185,6 +186,8 @@ export function upsertWorkspaceFromManagedAgent(agent: ManagedAgent): WorkspaceR
         tmuxSession: agent.tmuxSession,
       },
     });
+    if (!existing) emitWorkspaceCreate(result);
+    return result;
   }
   // Shared-mode occupancy: one row per agent sharing a git repo, with no
   // worktree. Records true repo occupancy in the Workspaces view (informational
@@ -271,6 +274,25 @@ export function listWorkspaces(filter: { repoRoot?: string; ownerAgentId?: strin
   return (getDb().query(sql).all(...params) as any[]).map(rowToWorkspace);
 }
 
+export function withResolvedWorkspaceProjects(
+  workspaces: WorkspaceRecord[],
+  filter: { projectId?: string } = {},
+): WorkspaceRecord[] {
+  const projectsByRepoRoot = resolveProjectsForCwds(workspaces.map((workspace) => workspace.repoRoot));
+  return workspaces.flatMap((workspace) => {
+    const project = projectsByRepoRoot.get(workspace.repoRoot);
+    if (filter.projectId && project?.id !== filter.projectId) return [];
+    return [{
+      ...workspace,
+      ...(project ? {
+        projectId: project.id,
+        projectSlug: project.slug,
+        ...(project.title ? { projectTitle: project.title } : {}),
+      } : {}),
+    }];
+  });
+}
+
 export function deleteWorkspace(id: string): boolean {
   return getDb().query("DELETE FROM workspaces WHERE id = ?").run(id).changes > 0;
 }
@@ -325,6 +347,24 @@ export function emitWorkspaceChange(workspace: WorkspaceRecord | null | undefine
   }
 }
 
+// Late-bound listeners for a newly created isolated workspace. Fired once per workspace
+// (on the INSERT path), allowing upper layers to record issue activity without a
+// db→service import cycle. index.ts registers the spawn-issue-activity handler.
+type WorkspaceCreateListener = (workspace: WorkspaceRecord) => void;
+const workspaceCreateListeners = new Set<WorkspaceCreateListener>();
+export function onWorkspaceCreate(listener: WorkspaceCreateListener): void {
+  workspaceCreateListeners.add(listener);
+}
+function emitWorkspaceCreate(workspace: WorkspaceRecord): void {
+  for (const listener of workspaceCreateListeners) {
+    try {
+      listener(workspace);
+    } catch {
+      // A create listener must never break a workspace write.
+    }
+  }
+}
+
 export function updateWorkspaceStatus(id: string, status: WorkspaceStatus, metadata: Record<string, unknown> = {}): WorkspaceRecord | null {
   const existing = getWorkspace(id);
   if (!existing) return null;

package/src/index.ts

@@ -14,6 +14,8 @@ import { installNotificationSubscriptionRule } from "./notification-subscription
 import { installQuotaAdvisoryHandler } from "./quota-advisory";
 import { startPlanLiveBindings } from "./services/plan-live-bindings";
 import { startRelayScheduler } from "./services/scheduler";
+import { recordWorkspaceIssueActivity } from "./services/spawn-issue-activity";
+import { onWorkspaceCreate } from "./db";
 import { resolve, sep } from "path";
 import { gzipSync, brotliCompressSync, constants as zlibConstants } from "node:zlib";
 import {
@@ -78,6 +80,7 @@ function startServer(): void {
 
   assertSafeNetworkConfig(HOST);
   initDb(DB_PATH);
+  onWorkspaceCreate(recordWorkspaceIssueActivity);
   installQuotaAdvisoryHandler();
   installNotificationSubscriptionRule();
   startPlanLiveBindings();

package/src/project-instructions.ts

@@ -11,6 +11,7 @@
 // is that lever: the included-source set is a policy PARAMETER, and the `vanilla`
 // policy includes `manual`+`promoted` while excluding `ingested`.
 import { resolveProjectEntries } from "./db";
+import { renderTemplate } from "./prompt-resolver";
 import { PROJECT_ENTRY_SOURCES, type AgentProfile, type Project, type ProjectEntryKind, type ProjectEntrySource, type RelayInjectionCategory, type ResolvedProjectEntry } from "./types";
 
 /** Named source policies — THE additive-from-empty lever (#403 decision 4).
@@ -64,16 +65,6 @@ interface ComposedSpawnInstructions {
 const DEFAULT_KINDS: readonly ProjectEntryKind[] = ["rule", "fact"];
 const DEFAULT_MAX_BYTES = 8192;
 const TRUNCATION_NOTICE = "_(… additional project entries omitted to fit the instruction budget.)_";
-const SPAWNED_CHILD_REPORTUP_INSTRUCTION = [
-  "Agent Relay report-up:",
-  "You are a spawned child agent. Just respond normally when your turn is complete; Relay automatically delivers your final response to your coordinator. Do not call a messaging tool only to report completion.",
-  "You have no interactive human at your terminal, so do not use blocking prompts: AskUserQuestion and plan mode/ExitPlanMode will hang with no one to answer. If you need a decision, approval, or clarification, ask your coordinator via Relay and continue once they respond.",
-].join("\n");
-const COORDINATOR_CHILD_REPORTUP_INSTRUCTION = [
-  "Agent Relay child responses:",
-  "When you spawn child agents, their turn-final responses arrive automatically as Relay messages. Do not put report-up instructions or your own agent id in child briefs.",
-].join("\n");
-
 const KIND_HEADINGS: Record<ProjectEntryKind, string> = {
   rule: "Rules",
   fact: "Facts",
@@ -257,19 +248,21 @@ export function composeSpawnInstructionsWithEvents(input: {
     });
   }
   if (input.spawnedBy) {
-    appendBlocks.push(SPAWNED_CHILD_REPORTUP_INSTRUCTION);
+    const instruction = renderTemplate("spawn.reportup.child");
+    appendBlocks.push(instruction);
     relayInjectionEvents.push({
       category: "instructions",
       summary: "injected spawned-child report-up instructions",
-      detail: { source: "spawned-child-report-up", spawnedBy: input.spawnedBy, content: SPAWNED_CHILD_REPORTUP_INSTRUCTION },
+      detail: { source: "spawned-child-report-up", spawnedBy: input.spawnedBy, content: instruction },
     });
   }
   if ((input.profile?.maxSpawnedAgents ?? 0) > 0) {
-    appendBlocks.push(COORDINATOR_CHILD_REPORTUP_INSTRUCTION);
+    const instruction = renderTemplate("spawn.reportup.coordinator");
+    appendBlocks.push(instruction);
     relayInjectionEvents.push({
       category: "instructions",
       summary: "injected coordinator child-response instructions",
-      detail: { source: "coordinator-child-report-up", content: COORDINATOR_CHILD_REPORTUP_INSTRUCTION },
+      detail: { source: "coordinator-child-report-up", content: instruction },
     });
   }
   const profileSystem = input.profile?.instructions.system?.trim();