crewly 1.20.193 → 1.20.195

package/dist/cli/backend/src/services/people/acting-for.service.js

@@ -4,9 +4,12 @@
  *
  * Every human message delivered to an agent records its sender as the person
  * that agent acts for until the next human message: a Slack message records
- * the sender's Slack user id, a dashboard message records the owner. A
- * message one agent sends another passes the sender's person on, so work
- * delegated for Info stays Info's. Scheduled and system turns change nothing.
+ * the sender's Slack user id (`owner` for any Slack id of the owner), a
+ * dashboard message records the owner. A message one agent sends another
+ * passes the sender's person on, so work delegated for Info stays Info's — and
+ * a message an agent wrote is never recorded as a person, even when it came
+ * through Slack under a bot's user id. Scheduled, autonomous and system turns
+ * act for the owner.
  *
  * The record is set only by the backend from what it delivered — never from
  * anything an agent sends — and connector credential requests carry it to
@@ -25,6 +28,8 @@ import { AsyncLocalStorage } from 'async_hooks';
 import { PEOPLE_CONSTANTS } from '../../constants.js';
 import { getCrewlyHomePath } from '../core/crewly-home.utils.js';
 import { getPeopleDirectory } from './people-directory.service.js';
+/** Valid sources (for reading the store). */
+const SOURCES = ['slack', 'dashboard', 'agent', 'system'];
 /** The acting-for record. */
 export class ActingForService {
     filePathOverride;
@@ -49,6 +54,7 @@ export class ActingForService {
     record(session, personId, source) {
         if (!session || !personId)
             return;
+        personId = this.canonical(personId);
         const all = this.load();
         const current = all[session];
         if (current && current.personId === personId && current.source === source)
@@ -65,6 +71,10 @@ export class ActingForService {
      */
     recordHumanMessage(session, slackUserId) {
         if (slackUserId && PEOPLE_CONSTANTS.SLACK_USER_ID_PATTERN.test(slackUserId)) {
+            // A bot's user id is never a person: a post an agent made through
+            // Slack that was not recognised as the agent's leaves the record as it was.
+            if (this.isBot(slackUserId))
+                return;
             this.record(session, slackUserId, 'slack');
             try {
                 this.people().noteSeen(slackUserId);
@@ -76,6 +86,31 @@ export class ActingForService {
         }
         this.record(session, PEOPLE_CONSTANTS.OWNER_ID, 'dashboard');
     }
+    /**
+     * A turn nobody asked for just now — a scheduled check, a scheduled
+     * message, an autonomous run, a system event: it acts for the owner, not
+     * for whoever spoke last.
+     *
+     * @param session - Agent session
+     */
+    recordSystemTurn(session) {
+        this.record(session, PEOPLE_CONSTANTS.OWNER_ID, 'system');
+    }
+    /**
+     * A message an agent wrote (in Slack, or a chat row an agent authored):
+     * the target acts for whoever that agent acts for. When the author has no
+     * record here (an agent on another machine) the target is left as it was.
+     *
+     * @param target - Receiving session
+     * @param authorSession - The agent that wrote it
+     */
+    inheritFromAgent(target, authorSession) {
+        if (!target || !authorSession || target === authorSession)
+            return;
+        const from = this.load()[authorSession];
+        if (from)
+            this.record(target, from.personId, 'agent');
+    }
     /**
      * A message from one agent to another: the target acts for whoever the
      * sender acts for (the owner when the sender has no record).
@@ -110,9 +145,35 @@ export class ActingForService {
     actorFor(session) {
         const people = this.people();
         const raw = session ? this.load()[session]?.personId : undefined;
-        const id = !raw || people.isOwner(raw) ? people.ownerId() : raw;
+        // No record, the owner by any spelling, or a bot left by an earlier
+        // version: the owner.
+        const id = !raw || people.isOwner(raw) || this.isBot(raw) ? PEOPLE_CONSTANTS.OWNER_ID : raw;
         return { id, role: people.roleOf(id), name: people.displayName(id) };
     }
+    /**
+     * @param personId - Person id
+     * @returns `owner` for the owner by any spelling, else the id
+     */
+    canonical(personId) {
+        try {
+            return this.people().canonicalId(personId);
+        }
+        catch {
+            return personId;
+        }
+    }
+    /**
+     * @param id - Slack user id
+     * @returns True for a known bot (false when the directory cannot tell)
+     */
+    isBot(id) {
+        try {
+            return this.people().isBot(id);
+        }
+        catch {
+            return false;
+        }
+    }
     /** Forget everything (tests). */
     clear() {
         this.save({});
@@ -132,7 +193,7 @@ export class ActingForService {
             if (sessions && typeof sessions === 'object') {
                 for (const [name, e] of Object.entries(sessions)) {
                     if (e && typeof e.personId === 'string' && typeof e.at === 'string') {
-                        out[name] = { personId: e.personId, at: e.at, source: e.source === 'slack' || e.source === 'agent' ? e.source : 'dashboard' };
+                        out[name] = { personId: e.personId, at: e.at, source: SOURCES.includes(e.source) ? e.source : 'dashboard' };
                     }
                 }
             }
@@ -180,6 +241,20 @@ export function getActingFor() {
 export function setActingForForTesting(service) {
     instance = service;
 }
+/**
+ * Before a scheduled, autonomous or system turn is delivered: the session
+ * acts for the owner (best effort, never throws).
+ *
+ * @param session - Agent session the turn goes to
+ */
+export function noteSystemTurn(session) {
+    try {
+        getActingFor().recordSystemTurn(session);
+    }
+    catch {
+        // no record means the owner anyway
+    }
+}
 const actorStore = new AsyncLocalStorage();
 /**
  * Run work as a person: connector token requests made inside carry that

package/dist/cli/backend/src/services/people/acting-for.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"acting-for.service.js","sourceRoot":"","sources":["../../../../../../backend/src/services/people/acting-for.service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"acting-for.service.js","sourceRoot":"","sources":["../../../../../../backend/src/services/people/acting-for.service.ts"],"names":[],"mappings":"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"}

package/dist/cli/backend/src/services/people/people-directory.service.d.ts

@@ -2,14 +2,20 @@
  * People directory — the humans who use this Crewly instance, keyed by their
  * Slack user id, with a role (issue #968).
  *
- * - **owner**: the instance owner (the Slack user who installed Crewly's
- *   Slack app). Always shown, always `owner`, never removable. When their
- *   Slack id is not known the owner is the id `owner` (dashboard, terminal).
+ * - **owner**: the instance owner. Their person id is always `owner` —
+ *   what this backend stores and sends Cloud. Any Slack id known to be the
+ *   owner maps to it: the Slack installer (Cloud's workspace config, i.e. the
+ *   Cloud account's Slack identity), `SLACK_OWNER_USER_ID` (installs whose
+ *   Slack credentials come from env), and Slack ids the owner marked as their
+ *   own in Settings › People. Always shown, never removable.
  * - **member**: a person in the workspace. A Slack user who messages an agent
  *   is added as a member automatically.
  * - **guest**: someone the owner marked as a guest. Guests are not included
  *   when a connector is shared with "all members".
  *
+ * Bots (the master bot, agent bots) are never people: they are not added,
+ * and rows a bot left in `people.json` are removed when the file is loaded.
+ *
  * Stored in `<CREWLY_HOME>/people.json`. Writes are atomic.
  *
  * specs/per-person-access.md
@@ -20,8 +26,10 @@
 export type PersonRole = 'owner' | 'member' | 'guest';
 /** One person. */
 export interface Person {
-    /** Slack user id (`U0123…`), or `owner` for an owner whose Slack id is unknown */
+    /** Slack user id (`U0123…`), or `owner` for the instance owner */
     id: string;
+    /** The owner's known Slack user ids (owner row only, for display) */
+    slackUserIds?: string[];
     /** Display name */
     name?: string;
     role: PersonRole;
@@ -37,8 +45,12 @@ export declare class PeopleDirectoryError extends Error {
 export interface PeopleDirectoryDeps {
     /** Store file (default `<CREWLY_HOME>/people.json`) */
     filePath?: string;
-    /** The instance owner's Slack user id, when known */
+    /** The instance owner's Slack user id, when known (the Slack installer) */
     getOwnerSlackUserId?: () => string | null | undefined;
+    /** Whether a Slack user id is a bot (the master bot or an agent's bot) */
+    isBot?: (slackUserId: string) => boolean;
+    /** Environment (default `process.env`), for `SLACK_OWNER_USER_ID` */
+    env?: NodeJS.ProcessEnv;
     now?: () => number;
 }
 /**
@@ -59,27 +71,51 @@ export declare function isPersonId(value: unknown): value is string;
 /** The people directory. */
 export declare class PeopleDirectoryService {
     private readonly filePathOverride?;
-    private readonly ownerSlackUserId;
+    private readonly installerSlackUserId;
+    private readonly botCheck;
+    private readonly env;
     private readonly now;
     /**
-     * @param deps - Store path, owner lookup, clock
+     * @param deps - Store path, owner and bot lookups, environment, clock
      */
     constructor(deps?: PeopleDirectoryDeps);
     /** @returns Store path (resolved per call so CREWLY_HOME changes apply) */
     private filePath;
     /**
-     * The owner's person id: their Slack user id when known, else `owner`.
+     * The owner's person id. Always `owner` — what is stored and sent Cloud.
      *
-     * @returns Person id
+     * @returns `owner`
      */
     ownerId(): string;
+    /**
+     * Every Slack id known to be the owner: the Slack installer,
+     * `SLACK_OWNER_USER_ID`, and ids the owner marked as their own.
+     *
+     * @returns Slack user ids (deduplicated, maybe empty)
+     */
+    ownerSlackUserIds(): string[];
     /**
      * Whether a person id is the instance owner.
      *
      * @param id - Person id
-     * @returns True for the owner's Slack id or the `owner` placeholder
+     * @returns True for `owner` or any Slack id known to be the owner
      */
     isOwner(id: string | null | undefined): boolean;
+    /**
+     * The id to store and send for a person: `owner` for the owner (by either
+     * spelling), else the id as given.
+     *
+     * @param id - Person id
+     * @returns Canonical person id
+     */
+    canonicalId(id: string): string;
+    /**
+     * Whether a Slack user id is a bot (never a person).
+     *
+     * @param id - Slack user id
+     * @returns True for the master bot or an agent's bot
+     */
+    isBot(id: string | null | undefined): boolean;
     /**
      * Everyone, owner first, then by name.
      *
@@ -117,12 +153,14 @@ export declare class PeopleDirectoryService {
      */
     noteSeen(id: string, name?: string): void;
     /**
-     * Add or edit a person (owner action).
+     * Add or edit a person (owner action). Giving a Slack id the `owner` role
+     * marks it as the owner's own Slack account (for installs that cannot
+     * tell, e.g. Slack credentials from env): it then maps to `owner`.
      *
      * @param id - Slack user id
      * @param patch - Name and/or role
      * @returns The person
-     * @throws PeopleDirectoryError on an invalid id or role, or when changing the owner's role
+     * @throws PeopleDirectoryError on an invalid id or role, a bot, or when changing the owner's role
      */
     upsert(id: string, patch: {
         name?: unknown;
@@ -136,8 +174,22 @@ export declare class PeopleDirectoryService {
      * @throws PeopleDirectoryError for the owner
      */
     remove(id: string): boolean;
-    /** @returns The stored file (empty when missing or unreadable) */
+    /**
+     * Record a Slack id as the owner's own and drop any member row it had.
+     *
+     * @param id - Slack user id
+     */
+    private markOwnerSlackId;
+    /**
+     * The stored file, without bots. Bot rows found on disk (written by an
+     * earlier version that recorded agent posts as people) are removed from
+     * the file here (best effort).
+     *
+     * @returns The stored file (empty when missing or unreadable)
+     */
     private read;
+    /** @returns The stored file as on disk (valid rows only; empty when missing or unreadable) */
+    private readRaw;
     /**
      * Write atomically.
      *
@@ -166,6 +218,12 @@ export declare function notePerson(slackUserId: string, name?: string | null): v
  * @param lookup - Lookup, or null
  */
 export declare function setPeopleOwnerLookup(lookup: (() => string | null | undefined) | null): void;
+/**
+ * Tell the directory how to recognise Crewly's bots (wired once Slack is up).
+ *
+ * @param lookup - Whether a Slack user id is a bot, or null
+ */
+export declare function setPeopleBotLookup(lookup: ((slackUserId: string) => boolean) | null): void;
 /**
  * The backend's people directory.
  *

package/dist/cli/backend/src/services/people/people-directory.service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"people-directory.service.d.ts","sourceRoot":"","sources":["../../../../../../backend/src/services/people/people-directory.service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"people-directory.service.d.ts","sourceRoot":"","sources":["../../../../../../backend/src/services/people/people-directory.service.ts"],"names":[],"mappings":"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"}