@ai-ecoverse/slicc-agent 3.48.1 → 3.50.0

package/dist/layout.js

@@ -0,0 +1,62 @@
+import { CONE_PREFIX, homeOf, SCOOP_USER, scoopUser } from "./kernel/accounts.js";
+import { quote } from "./kernel/env.js";
+const SCOOPS_ROOT = "/scoops";
+const SESSIONS = { tmp: "/tmp/agent-sessions", durable: "/home/sessions" };
+const ROOT_USER = "root";
+const AGENT_DIR = "/etc/slicc/agent";
+const ROOT_HOME = "/root";
+const SHARED_DIR = "/var/lib/slicc/agent/shared";
+const LEGACY = {
+  users: false,
+  scoopRoot: (folder) => `${SCOOPS_ROOT}/${folder}`,
+  workspace: (folder) => `${SCOOPS_ROOT}/${folder}/workspace`,
+  reports: (folder) => `${SCOOPS_ROOT}/${folder}/reports`,
+  sessions: (persist) => SESSIONS[persist],
+  homeOf: () => "/home",
+  envFor: async () => void 0,
+  ownDir: async () => void 0
+};
+function agentOfUser(state, user) {
+  if (user.startsWith(SCOOP_USER)) {
+    const folder = user.slice(SCOOP_USER.length);
+    return Object.entries(state.scoops).find(([, record]) => record.folder === folder)?.[0];
+  }
+  return state.cones[user] || Object.values(state.frozen ?? {}).some((f) => f.cone === user) ? `${CONE_PREFIX}${user}` : void 0;
+}
+function usersLayout(state, envOf, root) {
+  const homeOfUser = (user) => user && user !== ROOT_USER ? homeOf(user) : ROOT_HOME;
+  return {
+    users: true,
+    scoopRoot: (folder) => homeOf(scoopUser(folder)),
+    workspace: (folder) => homeOf(scoopUser(folder)),
+    reports: (folder, cone) => `${homeOf(cone)}/.slicc/reports/${folder}`,
+    sessions: (persist, user) => persist === "tmp" ? `${SESSIONS.tmp}/${user ?? ROOT_USER}` : `${homeOfUser(user)}/sessions`,
+    homeOf: homeOfUser,
+    async ownDir(path, user, context) {
+      if (!user || user === ROOT_USER) return;
+      const dir = quote(path);
+      await root.exec(
+        `mkdir -p ${dir} && chown ${quote(user)} ${dir} && chmod 700 ${dir}`,
+        void 0,
+        context
+      );
+    },
+    async envFor(user) {
+      if (!user || user === ROOT_USER) return void 0;
+      const agentId = agentOfUser(state(), user);
+      return agentId ? envOf(agentId, homeOf(user)) : void 0;
+    }
+  };
+}
+export {
+  AGENT_DIR,
+  LEGACY,
+  ROOT_HOME,
+  ROOT_USER,
+  SCOOPS_ROOT,
+  SESSIONS,
+  SHARED_DIR,
+  agentOfUser,
+  usersLayout
+};
+//# sourceMappingURL=layout.js.map

package/dist/layout.js.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../src/layout.ts"],
+  "sourcesContent": ["import type { Context } from '@earendil-works/chord';\nimport type { ExecutionEnv } from '@earendil-works/pi-durable/env';\nimport type { AgentsState } from './agents.ts';\nimport { CONE_PREFIX, homeOf, SCOOP_USER, scoopUser } from './kernel/accounts.ts';\nimport { quote } from './kernel/env.ts';\n\nexport const SCOOPS_ROOT = '/scoops';\nexport const SESSIONS = { tmp: '/tmp/agent-sessions', durable: '/home/sessions' };\nexport const ROOT_USER = 'root';\nexport const AGENT_DIR = '/etc/slicc/agent';\nexport const ROOT_HOME = '/root';\nexport const SHARED_DIR = '/var/lib/slicc/agent/shared';\n\nexport type Persist = 'tmp' | 'durable';\n\nexport interface Layout {\n  readonly users: boolean;\n  scoopRoot(folder: string): string;\n  workspace(folder: string): string;\n  reports(folder: string, cone: string): string;\n  sessions(persist: Persist, user: string | null): string;\n  homeOf(user: string | null): string;\n  envFor(user: string | null, context: Context): Promise<ExecutionEnv | undefined>;\n  ownDir(path: string, user: string | null, context: Context): Promise<void>;\n}\n\nexport const LEGACY: Layout = {\n  users: false,\n  scoopRoot: (folder) => `${SCOOPS_ROOT}/${folder}`,\n  workspace: (folder) => `${SCOOPS_ROOT}/${folder}/workspace`,\n  reports: (folder) => `${SCOOPS_ROOT}/${folder}/reports`,\n  sessions: (persist) => SESSIONS[persist],\n  homeOf: () => '/home',\n  envFor: async () => undefined,\n  ownDir: async () => undefined,\n};\n\nexport function agentOfUser(state: Readonly<AgentsState>, user: string): string | undefined {\n  if (user.startsWith(SCOOP_USER)) {\n    const folder = user.slice(SCOOP_USER.length);\n    return Object.entries(state.scoops).find(([, record]) => record.folder === folder)?.[0];\n  }\n  return state.cones[user] || Object.values(state.frozen ?? {}).some((f) => f.cone === user)\n    ? `${CONE_PREFIX}${user}`\n    : undefined;\n}\n\nexport function usersLayout(\n  state: () => Readonly<AgentsState>,\n  envOf: (agentId: string, home: string) => Promise<ExecutionEnv>,\n  root: Pick<ExecutionEnv, 'exec'>\n): Layout {\n  const homeOfUser = (user: string | null) =>\n    user && user !== ROOT_USER ? homeOf(user) : ROOT_HOME;\n  return {\n    users: true,\n    scoopRoot: (folder) => homeOf(scoopUser(folder)),\n    workspace: (folder) => homeOf(scoopUser(folder)),\n    reports: (folder, cone) => `${homeOf(cone)}/.slicc/reports/${folder}`,\n    sessions: (persist, user) =>\n      persist === 'tmp' ? `${SESSIONS.tmp}/${user ?? ROOT_USER}` : `${homeOfUser(user)}/sessions`,\n    homeOf: homeOfUser,\n    async ownDir(path, user, context) {\n      if (!user || user === ROOT_USER) return;\n      const dir = quote(path);\n      await root.exec(\n        `mkdir -p ${dir} && chown ${quote(user)} ${dir} && chmod 700 ${dir}`,\n        undefined,\n        context\n      );\n    },\n    async envFor(user) {\n      if (!user || user === ROOT_USER) return undefined;\n      const agentId = agentOfUser(state(), user);\n      return agentId ? envOf(agentId, homeOf(user)) : undefined;\n    },\n  };\n}\n"],
+  "mappings": "AAGA,SAAS,aAAa,QAAQ,YAAY,iBAAiB;AAC3D,SAAS,aAAa;AAEf,MAAM,cAAc;AACpB,MAAM,WAAW,EAAE,KAAK,uBAAuB,SAAS,iBAAiB;AACzE,MAAM,YAAY;AAClB,MAAM,YAAY;AAClB,MAAM,YAAY;AAClB,MAAM,aAAa;AAenB,MAAM,SAAiB;AAAA,EAC5B,OAAO;AAAA,EACP,WAAW,CAAC,WAAW,GAAG,WAAW,IAAI,MAAM;AAAA,EAC/C,WAAW,CAAC,WAAW,GAAG,WAAW,IAAI,MAAM;AAAA,EAC/C,SAAS,CAAC,WAAW,GAAG,WAAW,IAAI,MAAM;AAAA,EAC7C,UAAU,CAAC,YAAY,SAAS,OAAO;AAAA,EACvC,QAAQ,MAAM;AAAA,EACd,QAAQ,YAAY;AAAA,EACpB,QAAQ,YAAY;AACtB;AAEO,SAAS,YAAY,OAA8B,MAAkC;AAC1F,MAAI,KAAK,WAAW,UAAU,GAAG;AAC/B,UAAM,SAAS,KAAK,MAAM,WAAW,MAAM;AAC3C,WAAO,OAAO,QAAQ,MAAM,MAAM,EAAE,KAAK,CAAC,CAAC,EAAE,MAAM,MAAM,OAAO,WAAW,MAAM,IAAI,CAAC;AAAA,EACxF;AACA,SAAO,MAAM,MAAM,IAAI,KAAK,OAAO,OAAO,MAAM,UAAU,CAAC,CAAC,EAAE,KAAK,CAAC,MAAM,EAAE,SAAS,IAAI,IACrF,GAAG,WAAW,GAAG,IAAI,KACrB;AACN;AAEO,SAAS,YACd,OACA,OACA,MACQ;AACR,QAAM,aAAa,CAAC,SAClB,QAAQ,SAAS,YAAY,OAAO,IAAI,IAAI;AAC9C,SAAO;AAAA,IACL,OAAO;AAAA,IACP,WAAW,CAAC,WAAW,OAAO,UAAU,MAAM,CAAC;AAAA,IAC/C,WAAW,CAAC,WAAW,OAAO,UAAU,MAAM,CAAC;AAAA,IAC/C,SAAS,CAAC,QAAQ,SAAS,GAAG,OAAO,IAAI,CAAC,mBAAmB,MAAM;AAAA,IACnE,UAAU,CAAC,SAAS,SAClB,YAAY,QAAQ,GAAG,SAAS,GAAG,IAAI,QAAQ,SAAS,KAAK,GAAG,WAAW,IAAI,CAAC;AAAA,IAClF,QAAQ;AAAA,IACR,MAAM,OAAO,MAAM,MAAM,SAAS;AAChC,UAAI,CAAC,QAAQ,SAAS,UAAW;AACjC,YAAM,MAAM,MAAM,IAAI;AACtB,YAAM,KAAK;AAAA,QACT,YAAY,GAAG,aAAa,MAAM,IAAI,CAAC,IAAI,GAAG,iBAAiB,GAAG;AAAA,QAClE;AAAA,QACA;AAAA,MACF;AAAA,IACF;AAAA,IACA,MAAM,OAAO,MAAM;AACjB,UAAI,CAAC,QAAQ,SAAS,UAAW,QAAO;AACxC,YAAM,UAAU,YAAY,MAAM,GAAG,IAAI;AACzC,aAAO,UAAU,MAAM,SAAS,OAAO,IAAI,CAAC,IAAI;AAAA,IAClD;AAAA,EACF;AACF;",
+  "names": []
+}

package/dist/licks/index.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/licks/index.ts"],
-  "sourcesContent": ["import type { Context } from '@earendil-works/chord';\nimport type { Conversation, ConversationId, Harness, Registry } from '@earendil-works/pi-durable';\nimport type { ExecutionEnv } from '@earendil-works/pi-durable/env';\nimport { type Agents, live } from '../agents.ts';\nimport type { Activity } from '../kernel/activity.ts';\nimport { cronTask, licksExtension } from './extension.ts';\nimport type { LickChannel, LickTarget } from './lick.ts';\nimport { createLicks, type Licks, type LicksHost } from './licks.ts';\nimport { createLickSources, type LickSources } from './sources.ts';\n\nexport interface LicksAgent {\n  harness: Harness;\n  root: Conversation;\n  agents: Agents;\n  cone(): Conversation;\n}\n\nconst UNTRUSTED = new Set<LickChannel>(['webhook']);\n\nexport function lickResolver(agent: LicksAgent) {\n  return async (target: LickTarget, channel: LickChannel, context: Context) => {\n    const cone = agent.cone();\n    if (target === 'cone') return cone;\n    if (target.startsWith('cone:'))\n      return (await agent.agents.conversation(target.slice('cone:'.length), context)) ?? cone;\n    if (UNTRUSTED.has(channel)) return cone;\n    const scoop = agent.agents.state().scoops[target];\n    if (!scoop || !live(scoop)) return cone;\n    return (await agent.agents.conversation(target, context)) ?? cone;\n  };\n}\n\nexport interface LicksSetup {\n  licks: Licks;\n  attach(\n    agent: LicksAgent,\n    options: {\n      env: ExecutionEnv;\n      home: string;\n      now?: () => number;\n      flushEvery?: number;\n      activity?: Activity;\n    }\n  ): LickSources;\n}\n\nexport function setupLicks(registry: Registry): LicksSetup {\n  let bind: (host: LicksHost) => void = () => undefined;\n  const host = new Promise<LicksHost>((resolve) => {\n    bind = resolve;\n  });\n  const licks = createLicks(host);\n  const cron = cronTask(licks);\n  const lookup = async (id: ConversationId, context: Context) => {\n    const found = await (await host).harness.conversation(id, context);\n    if (!found) throw new Error(`conversation ${id} is gone`);\n    return found;\n  };\n  registry.install(licksExtension(licks, lookup, cron));\n  return {\n    licks,\n    attach(agent, options) {\n      const { harness, root } = agent;\n      bind({ harness, resolve: lickResolver(agent) });\n      return createLickSources({\n        ...options,\n        harness,\n        root,\n        cone: () => agent.cone(),\n        licks,\n        cron,\n      });\n    },\n  };\n}\n\nexport type { Lick, LickChannel } from './lick.ts';\nexport type { LickEvent, Licks } from './licks.ts';\nexport type { LickSources, WebhookDelivery } from './sources.ts';\n"],
-  "mappings": "AAGA,SAAsB,YAAY;AAElC,SAAS,UAAU,sBAAsB;AAEzC,SAAS,mBAA+C;AACxD,SAAS,yBAA2C;AASpD,MAAM,YAAY,oBAAI,IAAiB,CAAC,SAAS,CAAC;AAE3C,SAAS,aAAa,OAAmB;AAC9C,SAAO,OAAO,QAAoB,SAAsB,YAAqB;AAC3E,UAAM,OAAO,MAAM,KAAK;AACxB,QAAI,WAAW,OAAQ,QAAO;AAC9B,QAAI,OAAO,WAAW,OAAO;AAC3B,aAAQ,MAAM,MAAM,OAAO,aAAa,OAAO,MAAM,QAAQ,MAAM,GAAG,OAAO,KAAM;AACrF,QAAI,UAAU,IAAI,OAAO,EAAG,QAAO;AACnC,UAAM,QAAQ,MAAM,OAAO,MAAM,EAAE,OAAO,MAAM;AAChD,QAAI,CAAC,SAAS,CAAC,KAAK,KAAK,EAAG,QAAO;AACnC,WAAQ,MAAM,MAAM,OAAO,aAAa,QAAQ,OAAO,KAAM;AAAA,EAC/D;AACF;AAgBO,SAAS,WAAW,UAAgC;AACzD,MAAI,OAAkC,MAAM;AAC5C,QAAM,OAAO,IAAI,QAAmB,CAAC,YAAY;AAC/C,WAAO;AAAA,EACT,CAAC;AACD,QAAM,QAAQ,YAAY,IAAI;AAC9B,QAAM,OAAO,SAAS,KAAK;AAC3B,QAAM,SAAS,OAAO,IAAoB,YAAqB;AAC7D,UAAM,QAAQ,OAAO,MAAM,MAAM,QAAQ,aAAa,IAAI,OAAO;AACjE,QAAI,CAAC,MAAO,OAAM,IAAI,MAAM,gBAAgB,EAAE,UAAU;AACxD,WAAO;AAAA,EACT;AACA,WAAS,QAAQ,eAAe,OAAO,QAAQ,IAAI,CAAC;AACpD,SAAO;AAAA,IACL;AAAA,IACA,OAAO,OAAO,SAAS;AACrB,YAAM,EAAE,SAAS,KAAK,IAAI;AAC1B,WAAK,EAAE,SAAS,SAAS,aAAa,KAAK,EAAE,CAAC;AAC9C,aAAO,kBAAkB;AAAA,QACvB,GAAG;AAAA,QACH;AAAA,QACA;AAAA,QACA,MAAM,MAAM,MAAM,KAAK;AAAA,QACvB;AAAA,QACA;AAAA,MACF,CAAC;AAAA,IACH;AAAA,EACF;AACF;",
+  "sourcesContent": ["import type { Context } from '@earendil-works/chord';\nimport type { Conversation, ConversationId, Harness, Registry } from '@earendil-works/pi-durable';\nimport type { ExecutionEnv } from '@earendil-works/pi-durable/env';\nimport { type Agents, live } from '../agents.ts';\nimport type { Activity } from '../kernel/activity.ts';\nimport { cronTask, licksExtension } from './extension.ts';\nimport type { LickChannel, LickTarget } from './lick.ts';\nimport { createLicks, type Licks, type LicksHost } from './licks.ts';\nimport { createLickSources, type LickDir, type LickSources } from './sources.ts';\n\nexport interface LicksAgent {\n  harness: Harness;\n  root: Conversation;\n  agents: Agents;\n  cone(): Conversation;\n}\n\nconst UNTRUSTED = new Set<LickChannel>(['webhook']);\n\nexport function lickResolver(agent: LicksAgent) {\n  return async (target: LickTarget, channel: LickChannel, context: Context) => {\n    const cone = agent.cone();\n    if (target === 'cone') return cone;\n    if (target.startsWith('cone:'))\n      return (await agent.agents.conversation(target.slice('cone:'.length), context)) ?? cone;\n    if (UNTRUSTED.has(channel)) return cone;\n    const scoop = agent.agents.state().scoops[target];\n    if (!scoop || !live(scoop)) return cone;\n    return (await agent.agents.conversation(target, context)) ?? cone;\n  };\n}\n\nexport interface LicksSetup {\n  licks: Licks;\n  attach(\n    agent: LicksAgent,\n    options: {\n      env: ExecutionEnv;\n      home: string;\n      now?: () => number;\n      flushEvery?: number;\n      activity?: Activity;\n      dirs?: () => Promise<readonly LickDir[]>;\n    }\n  ): LickSources;\n}\n\nexport function setupLicks(registry: Registry): LicksSetup {\n  let bind: (host: LicksHost) => void = () => undefined;\n  const host = new Promise<LicksHost>((resolve) => {\n    bind = resolve;\n  });\n  const licks = createLicks(host);\n  const cron = cronTask(licks);\n  const lookup = async (id: ConversationId, context: Context) => {\n    const found = await (await host).harness.conversation(id, context);\n    if (!found) throw new Error(`conversation ${id} is gone`);\n    return found;\n  };\n  registry.install(licksExtension(licks, lookup, cron));\n  return {\n    licks,\n    attach(agent, options) {\n      const { harness, root } = agent;\n      bind({ harness, resolve: lickResolver(agent) });\n      return createLickSources({\n        ...options,\n        harness,\n        root,\n        cone: () => agent.cone(),\n        licks,\n        cron,\n      });\n    },\n  };\n}\n\nexport type { Lick, LickChannel } from './lick.ts';\nexport type { LickEvent, Licks } from './licks.ts';\nexport type { LickSources, WebhookDelivery } from './sources.ts';\n"],
+  "mappings": "AAGA,SAAsB,YAAY;AAElC,SAAS,UAAU,sBAAsB;AAEzC,SAAS,mBAA+C;AACxD,SAAS,yBAAyD;AASlE,MAAM,YAAY,oBAAI,IAAiB,CAAC,SAAS,CAAC;AAE3C,SAAS,aAAa,OAAmB;AAC9C,SAAO,OAAO,QAAoB,SAAsB,YAAqB;AAC3E,UAAM,OAAO,MAAM,KAAK;AACxB,QAAI,WAAW,OAAQ,QAAO;AAC9B,QAAI,OAAO,WAAW,OAAO;AAC3B,aAAQ,MAAM,MAAM,OAAO,aAAa,OAAO,MAAM,QAAQ,MAAM,GAAG,OAAO,KAAM;AACrF,QAAI,UAAU,IAAI,OAAO,EAAG,QAAO;AACnC,UAAM,QAAQ,MAAM,OAAO,MAAM,EAAE,OAAO,MAAM;AAChD,QAAI,CAAC,SAAS,CAAC,KAAK,KAAK,EAAG,QAAO;AACnC,WAAQ,MAAM,MAAM,OAAO,aAAa,QAAQ,OAAO,KAAM;AAAA,EAC/D;AACF;AAiBO,SAAS,WAAW,UAAgC;AACzD,MAAI,OAAkC,MAAM;AAC5C,QAAM,OAAO,IAAI,QAAmB,CAAC,YAAY;AAC/C,WAAO;AAAA,EACT,CAAC;AACD,QAAM,QAAQ,YAAY,IAAI;AAC9B,QAAM,OAAO,SAAS,KAAK;AAC3B,QAAM,SAAS,OAAO,IAAoB,YAAqB;AAC7D,UAAM,QAAQ,OAAO,MAAM,MAAM,QAAQ,aAAa,IAAI,OAAO;AACjE,QAAI,CAAC,MAAO,OAAM,IAAI,MAAM,gBAAgB,EAAE,UAAU;AACxD,WAAO;AAAA,EACT;AACA,WAAS,QAAQ,eAAe,OAAO,QAAQ,IAAI,CAAC;AACpD,SAAO;AAAA,IACL;AAAA,IACA,OAAO,OAAO,SAAS;AACrB,YAAM,EAAE,SAAS,KAAK,IAAI;AAC1B,WAAK,EAAE,SAAS,SAAS,aAAa,KAAK,EAAE,CAAC;AAC9C,aAAO,kBAAkB;AAAA,QACvB,GAAG;AAAA,QACH;AAAA,QACA;AAAA,QACA,MAAM,MAAM,MAAM,KAAK;AAAA,QACvB;AAAA,QACA;AAAA,MACF,CAAC;AAAA,IACH;AAAA,EACF;AACF;",
   "names": []
 }

package/dist/licks/sources.js

@@ -1,8 +1,20 @@
 import { bootLicks } from "./boot.js";
-import { parseCrontab, parseWebhook } from "./config.js";
+import {
+  parseCrontab,
+  parseWebhook
+} from "./config.js";
 import { configFiles, Watches } from "./fswatch.js";
 import { reconcileCron } from "./schedules.js";
 const SLICC_DIR = ".slicc";
+function scopedTarget(target, cone) {
+  return cone && target === "cone" ? `cone:${cone}` : target;
+}
+function scopedName(name, cone) {
+  return cone ? `${cone}:${name}` : name;
+}
+function scoped(entry, cone) {
+  return { ...entry, name: scopedName(entry.name, cone), target: scopedTarget(entry.target, cone) };
+}
 function hash(text) {
   let value = 2166136261;
   for (let at = 0; at < text.length; at++) value = Math.imul(value ^ text.charCodeAt(at), 16777619);
@@ -11,7 +23,7 @@ function hash(text) {
 function shortPath(path, home) {
   return path === home || path.startsWith(`${home}/`) ? `~${path.slice(home.length)}` : path;
 }
-function configLick(error, home) {
+function configLick(error, home, cone = null) {
   const file = shortPath(error.file, home);
   const channel = error.file.includes("/watches/") ? "fswatch" : error.file.includes("/webhooks/") ? "webhook" : "cron";
   const text = `${error.line ? `line ${error.line}: ` : ""}${error.error}`;
@@ -21,7 +33,7 @@ function configLick(error, home) {
     title: `Invalid ${file}`,
     text,
     body: "Ignored until the file is fixed.\nThe formats are in the slicc-agent README.",
-    target: "cone",
+    target: scopedTarget("cone", cone),
     severity: "error",
     eventId: hash(`${file}
 ${text}`)
@@ -60,13 +72,23 @@ async function webhooksIn(files, dir, context) {
 }
 function createLickSources(options) {
   const { harness, env, licks, home } = options;
-  const dir = `${home}/${SLICC_DIR}`;
   const now = options.now ?? Date.now;
   const files = configFiles(env);
   const deliver = (event, context) => licks.deliver(event, context);
-  const watches = new Watches(env, deliver, home, options.activity);
+  const dirsOf = options.dirs ?? (() => [{ dir: `${home}/${SLICC_DIR}`, home, cone: null }]);
+  const watching = /* @__PURE__ */ new Map();
+  const watchesOf = (place) => {
+    let found = watching.get(place.dir);
+    if (!found) {
+      const retarget = (event, context) => deliver({ ...event, target: scopedTarget(event.target, place.cone) }, context);
+      found = new Watches(place.env ?? env, retarget, place.home, options.activity);
+      watching.set(place.dir, found);
+    }
+    return found;
+  };
   let webhooks = /* @__PURE__ */ new Map();
   let control;
+  let controlled = "";
   let reconcileTimer;
   let flushTimer;
   let closed = false;
@@ -78,14 +100,45 @@ function createLickSources(options) {
   };
   async function reconcileNow(context) {
     if (closed) return;
-    const crontabFile = `${dir}/crontab`;
-    const crontab = parseCrontab(crontabFile, await files.read(crontabFile, context) ?? "");
-    await reconcileCron({ ...options, now }, crontab.entries, context);
-    const watchErrors = await watches.reconcile(`${dir}/watches`, context);
-    const found = await webhooksIn(files, `${dir}/webhooks`, context);
-    webhooks = found.entries;
-    const errors = [...crontab.errors, ...watchErrors, ...found.errors];
-    for (const error of errors) await deliver(configLick(error, home), context);
+    const places = await dirsOf();
+    const entries = [];
+    const errors = [];
+    const hooks = /* @__PURE__ */ new Map();
+    for (const place of places) {
+      const crontabFile = `${place.dir}/crontab`;
+      const crontab = parseCrontab(crontabFile, await files.read(crontabFile, context) ?? "");
+      entries.push(...crontab.entries.map((entry) => scoped(entry, place.cone)));
+      const watchErrors = await watchesOf(place).reconcile(`${place.dir}/watches`, context);
+      const found = await webhooksIn(files, `${place.dir}/webhooks`, context);
+      for (const entry of found.entries.values()) {
+        const named = scoped(entry, place.cone);
+        hooks.set(named.name, named);
+      }
+      for (const error of [...crontab.errors, ...watchErrors, ...found.errors])
+        errors.push({ error, place });
+    }
+    for (const [dir, watches] of [...watching])
+      if (!places.some((place) => place.dir === dir)) {
+        watching.delete(dir);
+        await watches.close(context);
+      }
+    await reconcileCron({ ...options, now }, entries, context);
+    webhooks = hooks;
+    for (const { error, place } of errors)
+      await deliver(configLick(error, place.home, place.cone), context);
+    await watchControl(places, context);
+  }
+  async function watchControl(places, context) {
+    const key = places.map((place) => place.dir).join("\n");
+    if (key === controlled || closed) return;
+    controlled = key;
+    await control?.close(context);
+    const result = await env.watch(
+      places.map((place) => ({ path: place.dir, recursive: true })),
+      () => scheduleReconcile(context),
+      context
+    );
+    control = result.ok ? result.value : void 0;
   }
   const reconcile = (context) => serial(() => reconcileNow(context));
   function scheduleReconcile(context) {
@@ -101,12 +154,6 @@ function createLickSources(options) {
     async start(context) {
       await licks.flush(context);
       await reconcile(context);
-      const result = await env.watch(
-        [{ path: dir, recursive: true }],
-        () => scheduleReconcile(context),
-        context
-      );
-      if (result.ok) control = result.value;
       flushTimer = setInterval(() => {
         void flushIfWaiting(context).catch(() => void 0);
       }, options.flushEvery ?? 2e3);
@@ -124,7 +171,7 @@ function createLickSources(options) {
       clearTimeout(reconcileTimer);
       clearInterval(flushTimer);
       await control?.close(context);
-      await watches.close(context);
+      for (const watches of watching.values()) await watches.close(context);
     }
   };
 }
@@ -133,6 +180,8 @@ export {
   configLick,
   createLickSources,
   hash,
+  scopedName,
+  scopedTarget,
   shortPath,
   webhookLick
 };

package/dist/licks/sources.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/licks/sources.ts"],
-  "sourcesContent": ["import type { Context } from '@earendil-works/chord';\nimport type { Conversation, Harness } from '@earendil-works/pi-durable';\nimport type { ExecutionEnv, FileWatcher } from '@earendil-works/pi-durable/env';\nimport type { Activity } from '../kernel/activity.ts';\nimport { type BootFacts, bootLicks } from './boot.ts';\nimport { type ConfigError, parseCrontab, parseWebhook, type WebhookEntry } from './config.ts';\nimport type { cronTask } from './extension.ts';\nimport { type ConfigFiles, configFiles, Watches } from './fswatch.ts';\nimport type { LickChannel } from './lick.ts';\nimport type { LickEvent, Licks } from './licks.ts';\nimport { reconcileCron } from './schedules.ts';\n\nexport const SLICC_DIR = '.slicc';\n\nexport interface LickSourcesOptions {\n  harness: Harness;\n  root: Conversation;\n  cone: () => Conversation;\n  env: ExecutionEnv;\n  home: string;\n  licks: Licks;\n  cron: ReturnType<typeof cronTask>;\n  now?: () => number;\n  flushEvery?: number;\n  activity?: Activity;\n}\n\nexport interface WebhookDelivery {\n  id?: string;\n  headers?: Record<string, string>;\n  body: unknown;\n}\n\nexport interface LickSources {\n  start(context: Context): Promise<void>;\n  reconcile(context: Context): Promise<void>;\n  boot(facts: BootFacts, context: Context): Promise<void>;\n  webhook(name: string, delivery: WebhookDelivery, context: Context): Promise<boolean>;\n  close(context: Context): Promise<void>;\n}\n\nexport function hash(text: string): string {\n  let value = 2166136261;\n  for (let at = 0; at < text.length; at++) value = Math.imul(value ^ text.charCodeAt(at), 16777619);\n  return (value >>> 0).toString(36);\n}\n\nexport function shortPath(path: string, home: string): string {\n  return path === home || path.startsWith(`${home}/`) ? `~${path.slice(home.length)}` : path;\n}\n\nexport function configLick(error: ConfigError, home: string): LickEvent {\n  const file = shortPath(error.file, home);\n  const channel: LickChannel = error.file.includes('/watches/')\n    ? 'fswatch'\n    : error.file.includes('/webhooks/')\n      ? 'webhook'\n      : 'cron';\n  const text = `${error.line ? `line ${error.line}: ` : ''}${error.error}`;\n  return {\n    channel,\n    source: `config:${file}`,\n    title: `Invalid ${file}`,\n    text,\n    body: 'Ignored until the file is fixed.\\nThe formats are in the slicc-agent README.',\n    target: 'cone',\n    severity: 'error',\n    eventId: hash(`${file}\\n${text}`),\n  };\n}\n\nexport function webhookLick(\n  name: string,\n  entry: WebhookEntry,\n  delivery: WebhookDelivery\n): LickEvent {\n  const payload =\n    typeof delivery.body === 'string' ? delivery.body : JSON.stringify(delivery.body, null, 2);\n  const headers = Object.entries(delivery.headers ?? {})\n    .map(([key, value]) => `${key}: ${value}`)\n    .join('\\n');\n  return {\n    channel: 'webhook',\n    source: name,\n    title: name,\n    text: entry.message || `Webhook ${name} received a request`,\n    body: [headers, payload].filter(Boolean).join('\\n\\n'),\n    target: entry.target,\n    coalesce: false,\n    ...(delivery.id ? { eventId: delivery.id } : {}),\n    ...(entry.triage ? { triage: entry.triage } : {}),\n  };\n}\n\nasync function webhooksIn(\n  files: ConfigFiles,\n  dir: string,\n  context: Context\n): Promise<{ entries: Map<string, WebhookEntry>; errors: ConfigError[] }> {\n  const errors: ConfigError[] = [];\n  const into = new Map<string, WebhookEntry>();\n  for (const name of await files.list(dir, context)) {\n    const file = `${dir}/${name}`;\n    const json = await files.read(file, context);\n    if (json === undefined) continue;\n    try {\n      const entry = parseWebhook(file, json);\n      into.set(entry.name, entry);\n    } catch (error) {\n      errors.push({ file, error: (error as Error).message });\n    }\n  }\n  return { entries: into, errors };\n}\n\nexport function createLickSources(options: LickSourcesOptions): LickSources {\n  const { harness, env, licks, home } = options;\n  const dir = `${home}/${SLICC_DIR}`;\n  const now = options.now ?? Date.now;\n  const files = configFiles(env);\n  const deliver = (event: LickEvent, context: Context) => licks.deliver(event, context);\n  const watches = new Watches(env, deliver, home, options.activity);\n  let webhooks = new Map<string, WebhookEntry>();\n  let control: FileWatcher | undefined;\n  let reconcileTimer: ReturnType<typeof setTimeout> | undefined;\n  let flushTimer: ReturnType<typeof setInterval> | undefined;\n  let closed = false;\n  let lock: Promise<unknown> = Promise.resolve();\n  const serial = <T>(operation: () => Promise<T>): Promise<T> => {\n    const run = lock.then(operation, operation);\n    lock = run.catch(() => undefined);\n    return run;\n  };\n\n  async function reconcileNow(context: Context): Promise<void> {\n    if (closed) return;\n    const crontabFile = `${dir}/crontab`;\n    const crontab = parseCrontab(crontabFile, (await files.read(crontabFile, context)) ?? '');\n    await reconcileCron({ ...options, now }, crontab.entries, context);\n    const watchErrors = await watches.reconcile(`${dir}/watches`, context);\n    const found = await webhooksIn(files, `${dir}/webhooks`, context);\n    webhooks = found.entries;\n    const errors = [...crontab.errors, ...watchErrors, ...found.errors];\n    for (const error of errors) await deliver(configLick(error, home), context);\n  }\n\n  const reconcile = (context: Context) => serial(() => reconcileNow(context));\n\n  function scheduleReconcile(context: Context): void {\n    clearTimeout(reconcileTimer);\n    reconcileTimer = setTimeout(() => {\n      void reconcile(context).catch(() => undefined);\n    }, 300);\n  }\n\n  async function flushIfWaiting(context: Context): Promise<void> {\n    if (await licks.pending(context)) await licks.flush(context);\n  }\n\n  return {\n    async start(context) {\n      await licks.flush(context);\n      await reconcile(context);\n      const result = await env.watch(\n        [{ path: dir, recursive: true }],\n        () => scheduleReconcile(context),\n        context\n      );\n      if (result.ok) control = result.value;\n      flushTimer = setInterval(() => {\n        void flushIfWaiting(context).catch(() => undefined);\n      }, options.flushEvery ?? 2000);\n    },\n    reconcile,\n    boot: (facts, context) => bootLicks(harness, options.cone(), deliver, facts, context),\n    async webhook(name, delivery, context) {\n      const entry = webhooks.get(name);\n      if (!entry) return false;\n      await deliver(webhookLick(name, entry, delivery), context);\n      return true;\n    },\n    async close(context) {\n      closed = true;\n      clearTimeout(reconcileTimer);\n      clearInterval(flushTimer);\n      await control?.close(context);\n      await watches.close(context);\n    },\n  };\n}\n"],
-  "mappings": "AAIA,SAAyB,iBAAiB;AAC1C,SAA2B,cAAc,oBAAuC;AAEhF,SAA2B,aAAa,eAAe;AAGvD,SAAS,qBAAqB;AAEvB,MAAM,YAAY;AA6BlB,SAAS,KAAK,MAAsB;AACzC,MAAI,QAAQ;AACZ,WAAS,KAAK,GAAG,KAAK,KAAK,QAAQ,KAAM,SAAQ,KAAK,KAAK,QAAQ,KAAK,WAAW,EAAE,GAAG,QAAQ;AAChG,UAAQ,UAAU,GAAG,SAAS,EAAE;AAClC;AAEO,SAAS,UAAU,MAAc,MAAsB;AAC5D,SAAO,SAAS,QAAQ,KAAK,WAAW,GAAG,IAAI,GAAG,IAAI,IAAI,KAAK,MAAM,KAAK,MAAM,CAAC,KAAK;AACxF;AAEO,SAAS,WAAW,OAAoB,MAAyB;AACtE,QAAM,OAAO,UAAU,MAAM,MAAM,IAAI;AACvC,QAAM,UAAuB,MAAM,KAAK,SAAS,WAAW,IACxD,YACA,MAAM,KAAK,SAAS,YAAY,IAC9B,YACA;AACN,QAAM,OAAO,GAAG,MAAM,OAAO,QAAQ,MAAM,IAAI,OAAO,EAAE,GAAG,MAAM,KAAK;AACtE,SAAO;AAAA,IACL;AAAA,IACA,QAAQ,UAAU,IAAI;AAAA,IACtB,OAAO,WAAW,IAAI;AAAA,IACtB;AAAA,IACA,MAAM;AAAA,IACN,QAAQ;AAAA,IACR,UAAU;AAAA,IACV,SAAS,KAAK,GAAG,IAAI;AAAA,EAAK,IAAI,EAAE;AAAA,EAClC;AACF;AAEO,SAAS,YACd,MACA,OACA,UACW;AACX,QAAM,UACJ,OAAO,SAAS,SAAS,WAAW,SAAS,OAAO,KAAK,UAAU,SAAS,MAAM,MAAM,CAAC;AAC3F,QAAM,UAAU,OAAO,QAAQ,SAAS,WAAW,CAAC,CAAC,EAClD,IAAI,CAAC,CAAC,KAAK,KAAK,MAAM,GAAG,GAAG,KAAK,KAAK,EAAE,EACxC,KAAK,IAAI;AACZ,SAAO;AAAA,IACL,SAAS;AAAA,IACT,QAAQ;AAAA,IACR,OAAO;AAAA,IACP,MAAM,MAAM,WAAW,WAAW,IAAI;AAAA,IACtC,MAAM,CAAC,SAAS,OAAO,EAAE,OAAO,OAAO,EAAE,KAAK,MAAM;AAAA,IACpD,QAAQ,MAAM;AAAA,IACd,UAAU;AAAA,IACV,GAAI,SAAS,KAAK,EAAE,SAAS,SAAS,GAAG,IAAI,CAAC;AAAA,IAC9C,GAAI,MAAM,SAAS,EAAE,QAAQ,MAAM,OAAO,IAAI,CAAC;AAAA,EACjD;AACF;AAEA,eAAe,WACb,OACA,KACA,SACwE;AACxE,QAAM,SAAwB,CAAC;AAC/B,QAAM,OAAO,oBAAI,IAA0B;AAC3C,aAAW,QAAQ,MAAM,MAAM,KAAK,KAAK,OAAO,GAAG;AACjD,UAAM,OAAO,GAAG,GAAG,IAAI,IAAI;AAC3B,UAAM,OAAO,MAAM,MAAM,KAAK,MAAM,OAAO;AAC3C,QAAI,SAAS,OAAW;AACxB,QAAI;AACF,YAAM,QAAQ,aAAa,MAAM,IAAI;AACrC,WAAK,IAAI,MAAM,MAAM,KAAK;AAAA,IAC5B,SAAS,OAAO;AACd,aAAO,KAAK,EAAE,MAAM,OAAQ,MAAgB,QAAQ,CAAC;AAAA,IACvD;AAAA,EACF;AACA,SAAO,EAAE,SAAS,MAAM,OAAO;AACjC;AAEO,SAAS,kBAAkB,SAA0C;AAC1E,QAAM,EAAE,SAAS,KAAK,OAAO,KAAK,IAAI;AACtC,QAAM,MAAM,GAAG,IAAI,IAAI,SAAS;AAChC,QAAM,MAAM,QAAQ,OAAO,KAAK;AAChC,QAAM,QAAQ,YAAY,GAAG;AAC7B,QAAM,UAAU,CAAC,OAAkB,YAAqB,MAAM,QAAQ,OAAO,OAAO;AACpF,QAAM,UAAU,IAAI,QAAQ,KAAK,SAAS,MAAM,QAAQ,QAAQ;AAChE,MAAI,WAAW,oBAAI,IAA0B;AAC7C,MAAI;AACJ,MAAI;AACJ,MAAI;AACJ,MAAI,SAAS;AACb,MAAI,OAAyB,QAAQ,QAAQ;AAC7C,QAAM,SAAS,CAAI,cAA4C;AAC7D,UAAM,MAAM,KAAK,KAAK,WAAW,SAAS;AAC1C,WAAO,IAAI,MAAM,MAAM,MAAS;AAChC,WAAO;AAAA,EACT;AAEA,iBAAe,aAAa,SAAiC;AAC3D,QAAI,OAAQ;AACZ,UAAM,cAAc,GAAG,GAAG;AAC1B,UAAM,UAAU,aAAa,aAAc,MAAM,MAAM,KAAK,aAAa,OAAO,KAAM,EAAE;AACxF,UAAM,cAAc,EAAE,GAAG,SAAS,IAAI,GAAG,QAAQ,SAAS,OAAO;AACjE,UAAM,cAAc,MAAM,QAAQ,UAAU,GAAG,GAAG,YAAY,OAAO;AACrE,UAAM,QAAQ,MAAM,WAAW,OAAO,GAAG,GAAG,aAAa,OAAO;AAChE,eAAW,MAAM;AACjB,UAAM,SAAS,CAAC,GAAG,QAAQ,QAAQ,GAAG,aAAa,GAAG,MAAM,MAAM;AAClE,eAAW,SAAS,OAAQ,OAAM,QAAQ,WAAW,OAAO,IAAI,GAAG,OAAO;AAAA,EAC5E;AAEA,QAAM,YAAY,CAAC,YAAqB,OAAO,MAAM,aAAa,OAAO,CAAC;AAE1E,WAAS,kBAAkB,SAAwB;AACjD,iBAAa,cAAc;AAC3B,qBAAiB,WAAW,MAAM;AAChC,WAAK,UAAU,OAAO,EAAE,MAAM,MAAM,MAAS;AAAA,IAC/C,GAAG,GAAG;AAAA,EACR;AAEA,iBAAe,eAAe,SAAiC;AAC7D,QAAI,MAAM,MAAM,QAAQ,OAAO,EAAG,OAAM,MAAM,MAAM,OAAO;AAAA,EAC7D;AAEA,SAAO;AAAA,IACL,MAAM,MAAM,SAAS;AACnB,YAAM,MAAM,MAAM,OAAO;AACzB,YAAM,UAAU,OAAO;AACvB,YAAM,SAAS,MAAM,IAAI;AAAA,QACvB,CAAC,EAAE,MAAM,KAAK,WAAW,KAAK,CAAC;AAAA,QAC/B,MAAM,kBAAkB,OAAO;AAAA,QAC/B;AAAA,MACF;AACA,UAAI,OAAO,GAAI,WAAU,OAAO;AAChC,mBAAa,YAAY,MAAM;AAC7B,aAAK,eAAe,OAAO,EAAE,MAAM,MAAM,MAAS;AAAA,MACpD,GAAG,QAAQ,cAAc,GAAI;AAAA,IAC/B;AAAA,IACA;AAAA,IACA,MAAM,CAAC,OAAO,YAAY,UAAU,SAAS,QAAQ,KAAK,GAAG,SAAS,OAAO,OAAO;AAAA,IACpF,MAAM,QAAQ,MAAM,UAAU,SAAS;AACrC,YAAM,QAAQ,SAAS,IAAI,IAAI;AAC/B,UAAI,CAAC,MAAO,QAAO;AACnB,YAAM,QAAQ,YAAY,MAAM,OAAO,QAAQ,GAAG,OAAO;AACzD,aAAO;AAAA,IACT;AAAA,IACA,MAAM,MAAM,SAAS;AACnB,eAAS;AACT,mBAAa,cAAc;AAC3B,oBAAc,UAAU;AACxB,YAAM,SAAS,MAAM,OAAO;AAC5B,YAAM,QAAQ,MAAM,OAAO;AAAA,IAC7B;AAAA,EACF;AACF;",
+  "sourcesContent": ["import type { Context } from '@earendil-works/chord';\nimport type { Conversation, Harness } from '@earendil-works/pi-durable';\nimport type { ExecutionEnv, FileWatcher } from '@earendil-works/pi-durable/env';\nimport type { Activity } from '../kernel/activity.ts';\nimport { type BootFacts, bootLicks } from './boot.ts';\nimport {\n  type ConfigError,\n  type CronEntry,\n  parseCrontab,\n  parseWebhook,\n  type WebhookEntry,\n} from './config.ts';\nimport type { cronTask } from './extension.ts';\nimport { type ConfigFiles, configFiles, Watches } from './fswatch.ts';\nimport type { LickChannel, LickTarget } from './lick.ts';\nimport type { LickEvent, Licks } from './licks.ts';\nimport { reconcileCron } from './schedules.ts';\n\nexport const SLICC_DIR = '.slicc';\n\nexport interface LickSourcesOptions {\n  harness: Harness;\n  root: Conversation;\n  cone: () => Conversation;\n  env: ExecutionEnv;\n  home: string;\n  licks: Licks;\n  cron: ReturnType<typeof cronTask>;\n  now?: () => number;\n  flushEvery?: number;\n  activity?: Activity;\n  dirs?: () => readonly LickDir[] | Promise<readonly LickDir[]>;\n}\n\nexport interface LickDir {\n  dir: string;\n  home: string;\n  cone: string | null;\n  env?: ExecutionEnv;\n}\n\nexport function scopedTarget(target: LickTarget, cone: string | null): LickTarget {\n  return cone && target === 'cone' ? (`cone:${cone}` as LickTarget) : target;\n}\n\nexport function scopedName(name: string, cone: string | null): string {\n  return cone ? `${cone}:${name}` : name;\n}\n\nfunction scoped<T extends { name: string; target: LickTarget }>(entry: T, cone: string | null): T {\n  return { ...entry, name: scopedName(entry.name, cone), target: scopedTarget(entry.target, cone) };\n}\n\nexport interface WebhookDelivery {\n  id?: string;\n  headers?: Record<string, string>;\n  body: unknown;\n}\n\nexport interface LickSources {\n  start(context: Context): Promise<void>;\n  reconcile(context: Context): Promise<void>;\n  boot(facts: BootFacts, context: Context): Promise<void>;\n  webhook(name: string, delivery: WebhookDelivery, context: Context): Promise<boolean>;\n  close(context: Context): Promise<void>;\n}\n\nexport function hash(text: string): string {\n  let value = 2166136261;\n  for (let at = 0; at < text.length; at++) value = Math.imul(value ^ text.charCodeAt(at), 16777619);\n  return (value >>> 0).toString(36);\n}\n\nexport function shortPath(path: string, home: string): string {\n  return path === home || path.startsWith(`${home}/`) ? `~${path.slice(home.length)}` : path;\n}\n\nexport function configLick(\n  error: ConfigError,\n  home: string,\n  cone: string | null = null\n): LickEvent {\n  const file = shortPath(error.file, home);\n  const channel: LickChannel = error.file.includes('/watches/')\n    ? 'fswatch'\n    : error.file.includes('/webhooks/')\n      ? 'webhook'\n      : 'cron';\n  const text = `${error.line ? `line ${error.line}: ` : ''}${error.error}`;\n  return {\n    channel,\n    source: `config:${file}`,\n    title: `Invalid ${file}`,\n    text,\n    body: 'Ignored until the file is fixed.\\nThe formats are in the slicc-agent README.',\n    target: scopedTarget('cone', cone),\n    severity: 'error',\n    eventId: hash(`${file}\\n${text}`),\n  };\n}\n\nexport function webhookLick(\n  name: string,\n  entry: WebhookEntry,\n  delivery: WebhookDelivery\n): LickEvent {\n  const payload =\n    typeof delivery.body === 'string' ? delivery.body : JSON.stringify(delivery.body, null, 2);\n  const headers = Object.entries(delivery.headers ?? {})\n    .map(([key, value]) => `${key}: ${value}`)\n    .join('\\n');\n  return {\n    channel: 'webhook',\n    source: name,\n    title: name,\n    text: entry.message || `Webhook ${name} received a request`,\n    body: [headers, payload].filter(Boolean).join('\\n\\n'),\n    target: entry.target,\n    coalesce: false,\n    ...(delivery.id ? { eventId: delivery.id } : {}),\n    ...(entry.triage ? { triage: entry.triage } : {}),\n  };\n}\n\nasync function webhooksIn(\n  files: ConfigFiles,\n  dir: string,\n  context: Context\n): Promise<{ entries: Map<string, WebhookEntry>; errors: ConfigError[] }> {\n  const errors: ConfigError[] = [];\n  const into = new Map<string, WebhookEntry>();\n  for (const name of await files.list(dir, context)) {\n    const file = `${dir}/${name}`;\n    const json = await files.read(file, context);\n    if (json === undefined) continue;\n    try {\n      const entry = parseWebhook(file, json);\n      into.set(entry.name, entry);\n    } catch (error) {\n      errors.push({ file, error: (error as Error).message });\n    }\n  }\n  return { entries: into, errors };\n}\n\nexport function createLickSources(options: LickSourcesOptions): LickSources {\n  const { harness, env, licks, home } = options;\n  const now = options.now ?? Date.now;\n  const files = configFiles(env);\n  const deliver = (event: LickEvent, context: Context) => licks.deliver(event, context);\n  const dirsOf = options.dirs ?? (() => [{ dir: `${home}/${SLICC_DIR}`, home, cone: null }]);\n  const watching = new Map<string, Watches>();\n  const watchesOf = (place: LickDir) => {\n    let found = watching.get(place.dir);\n    if (!found) {\n      const retarget = (event: LickEvent, context: Context) =>\n        deliver({ ...event, target: scopedTarget(event.target, place.cone) }, context);\n      found = new Watches(place.env ?? env, retarget, place.home, options.activity);\n      watching.set(place.dir, found);\n    }\n    return found;\n  };\n  let webhooks = new Map<string, WebhookEntry>();\n  let control: FileWatcher | undefined;\n  let controlled = '';\n  let reconcileTimer: ReturnType<typeof setTimeout> | undefined;\n  let flushTimer: ReturnType<typeof setInterval> | undefined;\n  let closed = false;\n  let lock: Promise<unknown> = Promise.resolve();\n  const serial = <T>(operation: () => Promise<T>): Promise<T> => {\n    const run = lock.then(operation, operation);\n    lock = run.catch(() => undefined);\n    return run;\n  };\n\n  async function reconcileNow(context: Context): Promise<void> {\n    if (closed) return;\n    const places = await dirsOf();\n    const entries: CronEntry[] = [];\n    const errors: { error: ConfigError; place: LickDir }[] = [];\n    const hooks = new Map<string, WebhookEntry>();\n    for (const place of places) {\n      const crontabFile = `${place.dir}/crontab`;\n      const crontab = parseCrontab(crontabFile, (await files.read(crontabFile, context)) ?? '');\n      entries.push(...crontab.entries.map((entry) => scoped(entry, place.cone)));\n      const watchErrors = await watchesOf(place).reconcile(`${place.dir}/watches`, context);\n      const found = await webhooksIn(files, `${place.dir}/webhooks`, context);\n      for (const entry of found.entries.values()) {\n        const named = scoped(entry, place.cone);\n        hooks.set(named.name, named);\n      }\n      for (const error of [...crontab.errors, ...watchErrors, ...found.errors])\n        errors.push({ error, place });\n    }\n    for (const [dir, watches] of [...watching])\n      if (!places.some((place) => place.dir === dir)) {\n        watching.delete(dir);\n        await watches.close(context);\n      }\n    await reconcileCron({ ...options, now }, entries, context);\n    webhooks = hooks;\n    for (const { error, place } of errors)\n      await deliver(configLick(error, place.home, place.cone), context);\n    await watchControl(places, context);\n  }\n\n  async function watchControl(places: readonly LickDir[], context: Context): Promise<void> {\n    const key = places.map((place) => place.dir).join('\\n');\n    if (key === controlled || closed) return;\n    controlled = key;\n    await control?.close(context);\n    const result = await env.watch(\n      places.map((place) => ({ path: place.dir, recursive: true })),\n      () => scheduleReconcile(context),\n      context\n    );\n    control = result.ok ? result.value : undefined;\n  }\n\n  const reconcile = (context: Context) => serial(() => reconcileNow(context));\n\n  function scheduleReconcile(context: Context): void {\n    clearTimeout(reconcileTimer);\n    reconcileTimer = setTimeout(() => {\n      void reconcile(context).catch(() => undefined);\n    }, 300);\n  }\n\n  async function flushIfWaiting(context: Context): Promise<void> {\n    if (await licks.pending(context)) await licks.flush(context);\n  }\n\n  return {\n    async start(context) {\n      await licks.flush(context);\n      await reconcile(context);\n      flushTimer = setInterval(() => {\n        void flushIfWaiting(context).catch(() => undefined);\n      }, options.flushEvery ?? 2000);\n    },\n    reconcile,\n    boot: (facts, context) => bootLicks(harness, options.cone(), deliver, facts, context),\n    async webhook(name, delivery, context) {\n      const entry = webhooks.get(name);\n      if (!entry) return false;\n      await deliver(webhookLick(name, entry, delivery), context);\n      return true;\n    },\n    async close(context) {\n      closed = true;\n      clearTimeout(reconcileTimer);\n      clearInterval(flushTimer);\n      await control?.close(context);\n      for (const watches of watching.values()) await watches.close(context);\n    },\n  };\n}\n"],
+  "mappings": "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",
   "names": []
 }

package/dist/main.js

@@ -21,9 +21,11 @@ import { lateGelatiere } from "./gelatiere/index.js";
 import { hostAgent } from "./host.js";
 import { imageReads } from "./images/index.js";
 import { createActivity } from "./kernel/activity.js";
+import { agentUsers, warnSupport } from "./kernel/agent-users.js";
 import { HOME, kernelEnvironment, SliccKernelEnv } from "./kernel/env.js";
 import { processGroups } from "./kernel/groups.js";
 import { adminOver, userClients } from "./kernel/users.js";
+import { AGENT_DIR, ROOT_HOME } from "./layout.js";
 import { setupLicks } from "./licks/index.js";
 import { lickTriage } from "./licks/triage.js";
 import { setupMcp } from "./mcp/index.js";
@@ -68,13 +70,17 @@ async function attached(ports, options) {
   const attach = options.attach ?? attachKernel;
   const { kernel, admin } = await ports;
   const client = await attach(kernel);
-  return { client, users: usersOf(admin, options.users, attach) };
+  const users = usersOf(admin, options.users, attach);
+  await warnSupport(users, client, options.users);
+  const home = new SliccKernelEnv(client, { cwd: HOME });
+  await privateStore(home);
+  return { client, users, home, at: { home: HOME, ...users ? { agentDir: AGENT_DIR } : {} } };
 }
 function privateStore(env) {
   return env.exec(`mkdir -p ${STORE_DIR} && chmod 700 ${STORE_DIR}`, void 0, BACKGROUND_CONTEXT);
 }
-async function codemodeTools(client, options, native, extra) {
-  const settings = await client.fs.readFile(`${HOME}/.pi/agent/settings.json`).catch(() => void 0);
+async function codemodeTools(client, options, native, extra, dir = `${HOME}/.pi/agent`) {
+  const settings = await client.fs.readFile(`${dir}/settings.json`).catch(() => void 0);
   if (disabledBySettings(settings === void 0 ? void 0 : new TextDecoder().decode(settings)))
     return [];
   const sandbox = sandboxFactory(
@@ -104,42 +110,50 @@ async function secretsFor(home, vault) {
   await names.refresh(BACKGROUND_CONTEXT);
   return names;
 }
+async function modelsOf(options) {
+  const credentials = await (options.credentials ?? (() => EncryptedCredentialStore.open()))();
+  const providers = options.providers ?? sliccProviders();
+  return { credentials, providers, models: createSliccModels(credentials, providers) };
+}
+function baseRegistry(facts) {
+  const registry = createRegistry();
+  registry.install(CodingTools);
+  registry.install(sliccPrompt(facts));
+  const read = CodingTools.tools.find(
+    (tool) => tool.name === "read"
+  );
+  registry.install(imageReads(read));
+  return registry;
+}
+async function factsOf(client, native) {
+  return {
+    version: await agentVersion((url) => native(url)),
+    commands: await commandsOnPath(client),
+    transport: transportName(client.transport),
+    browser: await browserConnected(client)
+  };
+}
 function routeFetch(scope, client) {
   const native = scope.fetch.bind(scope);
   const loopback = client.loopbackFetch?.bind(client);
   scope.fetch = transportFetch(client.transport, scope.location.origin, native, loopback);
   return native;
 }
+async function prepare(scope, kernel, options) {
+  const names = await secretsFor(kernel.home, kernel.vault);
+  const native = routeFetch(scope, kernel.client);
+  const facts = await factsOf(kernel.client, native);
+  return { names, native, facts, ...await modelsOf(options), registry: baseRegistry(facts) };
+}
 async function start(scope, ports, options, vault) {
-  const { client, users } = await attached(ports, options);
-  const home = new SliccKernelEnv(client, { cwd: HOME });
-  await privateStore(home);
-  const names = await secretsFor(home, vault);
-  const native = routeFetch(scope, client);
-  const facts = {
-    version: await agentVersion((url) => native(url)),
-    commands: await commandsOnPath(client),
-    transport: transportName(client.transport),
-    browser: await browserConnected(client)
-  };
-  const credentials = await (options.credentials ?? (() => EncryptedCredentialStore.open()))();
-  const providers = options.providers ?? sliccProviders();
-  const models = createSliccModels(credentials, providers);
-  const registry = createRegistry();
-  registry.install(CodingTools);
-  registry.install(sliccPrompt(facts));
-  registry.install(
-    imageReads(
-      CodingTools.tools.find(
-        (tool) => tool.name === "read"
-      )
-    )
-  );
+  const { client, users, home, at } = await attached(ports, options);
+  const ready = await prepare(scope, { client, home, vault }, options);
+  const { names, native, facts, credentials, providers, models, registry } = ready;
   const memory = setupMemory(registry);
   const coding = CodingTools.tools;
   registry.install(browserGuard([scope.location.origin], coding));
   const mcp = setupMcp(registry);
-  const codemode = await codemodeTools(client, options, native, mcp.codemode);
+  const codemode = await codemodeTools(client, options, native, mcp.codemode, at.agentDir);
   registry.install(codemodeExtension(codemode));
   const licks = setupLicks(registry);
   licks.licks.triage(lickTriage(models));
@@ -150,29 +164,43 @@ async function start(scope, ports, options, vault) {
   const groups = processGroups(client);
   const model = options.model ?? DEFAULT_MODEL;
   let opened;
+  const people = users ? agentUsers(users, client, home, () => opened?.agents) : void 0;
   const environment = kernelEnvironment(client, {
     activity,
     groups,
     identify: identity(() => opened?.agents, model),
     scrub: vault,
-    spawn: shellGrants(names)
+    spawn: shellGrants(names),
+    ...people ? { route: people.route } : {}
   });
   const agent = await openRepinned(options, { models, model, registry, env: environment });
   opened = agent;
-  const sources = licks.attach(agent, { env: home, home: HOME, activity });
+  await people?.start(agent.agents);
+  const sources = licks.attach(agent, {
+    env: home,
+    home: HOME,
+    activity,
+    ...people ? { dirs: () => people.lickDirs() } : {}
+  });
   await sources.start(BACKGROUND_CONTEXT);
   await sources.boot(
     { version: facts.version, boot: await kernelBoot(client) },
     BACKGROUND_CONTEXT
   );
   const skillsRuntime = await skills.attach(
-    { env: home, home: HOME, assets: options.assets ?? packageAssets(), reloadMs: RELOAD_MS },
+    {
+      env: home,
+      ...at,
+      assets: options.assets ?? packageAssets(),
+      reloadMs: RELOAD_MS,
+      ...people ? { people: people.people } : {}
+    },
     BACKGROUND_CONTEXT
   );
   const mcpRuntime = await mcp.attach(
     {
       env: home,
-      home: HOME,
+      ...at,
       credentials,
       licks: licks.licks,
       fetch: scope.fetch,
@@ -193,17 +221,20 @@ async function start(scope, ports, options, vault) {
       licks: licks.licks,
       env: home,
       assets: options.assets ?? packageAssets(),
-      reloadMs: RELOAD_MS
+      reloadMs: RELOAD_MS,
+      ...people?.sprinkles() ?? {}
     },
     BACKGROUND_CONTEXT
   );
+  people?.follow([sources, skillsRuntime, sprinkles]);
   let roles;
   const memoryRuntime = await memory.attach(
     {
       harness: agent.harness,
       agents: agent.agents,
       env: home,
-      home: HOME,
+      ...at,
+      ...people ? { home: ROOT_HOME } : {},
       reloadMs: RELOAD_MS,
       roles: async (using) => roles?.roles(using)
     },
@@ -214,7 +245,8 @@ async function start(scope, ports, options, vault) {
     agents: agent.agents,
     env: home,
     extract: memory.extract,
-    title: titler(models, settingsText(home, HOME))
+    title: titler(models, settingsText(home, HOME, at.agentDir)),
+    ...people ? { layout: people.layout } : {}
   });
   licks.licks.guard(freezer.frozenTarget);
   const settings = await createAgentSettings(models, credentials, providers, { mcp: mcpRuntime });
@@ -225,7 +257,8 @@ async function start(scope, ports, options, vault) {
       agents: agent.agents,
       groups,
       env: home,
-      home: HOME,
+      ...at,
+      ...people ? { layout: people.layout, spools: people.spools, enforced: people.enforced } : {},
       alive: alive(client),
       reads: skillsRuntime.dirs,
       memory: memoryRuntime.command,
@@ -244,6 +277,7 @@ async function start(scope, ports, options, vault) {
     licks: licks.licks,
     env: home,
     home: HOME,
+    ...await people?.gelatiere(home),
     scoops: scoops.scoops,
     roles: runtime.roles,
     assets: options.assets ?? packageAssets(),