@antelopejs/dms-ai 0.9.0 → 0.9.2

package/README.md

@@ -1,42 +1,42 @@
 <div align="center">
 
-# @antelopejs/dms-ai
+# `@antelopejs/dms-ai`
 
-<a href="https://www.npmjs.com/package/@antelopejs/dms-ai"><img alt="npm" src="https://img.shields.io/npm/v/@antelopejs/dms-ai?style=for-the-badge&labelColor=000000&color=000000"></a>
-<a href="./LICENSE"><img alt="License" src="https://img.shields.io/npm/l/@antelopejs/dms-ai?style=for-the-badge&labelColor=000000&color=000000"></a>
-<a href="https://discord.gg/g4pFt6eXqu"><img alt="Discord" src="https://img.shields.io/badge/Discord-18181B?logo=discord&style=for-the-badge&color=000000"></a>
-<a href="https://dms.antelopejs.com/docs/modules/ai"><img alt="Documentation" src="https://img.shields.io/badge/Docs-18181B?style=for-the-badge&color=000000"></a>
+<a href="https://www.npmjs.com/package/@antelopejs/dms-ai"><img alt="npm" src="https://img.shields.io/npm/v/@antelopejs/dms-ai?style=for-the-badge&labelColor=000000&color=000000" data-illustration></a>
+<a href="./LICENSE"><img alt="License" src="https://img.shields.io/npm/l/@antelopejs/dms-ai?style=for-the-badge&labelColor=000000&color=000000" data-illustration></a>
+<a href="https://discord.gg/g4pFt6eXqu"><img alt="Discord" src="https://img.shields.io/badge/Discord-18181B?logo=discord&style=for-the-badge&color=000000" data-illustration></a>
+<a href="https://dms.antelopejs.com/docs/modules/ai"><img alt="Documentation" src="https://img.shields.io/badge/Docs-18181B?style=for-the-badge&color=000000" data-illustration></a>
 
-An AI development assistant inside the [AntelopeJS DMS](https://github.com/AntelopeJS/dms) dashboard.
+**An AI development assistant inside the [AntelopeJS DMS](https://github.com/AntelopeJS/dms) dashboard.**
 
 </div>
 
-![A conversation in the chat panel: two applied checkpoints with their files, an auto-fix turn and the assistant's summary](./docs/images/chat-conversation.webp)
+<img data-illustration alt="Screen recording from the AntelopeJS DMS film. The assistant panel opens next to a dashboard with Claude Code as the coding agent, and the request Add a card with the sites that stopped reporting is typed under the caption Or describe it. The assistant then reports Added the card Delayed sites with Typecheck passed, the changed files dashboard/page.ts and dashboard/stats.ts, and the buttons Review diff and Undo, under the caption A change set. Review it. Undo it." src="./docs/images/assistant.gif">
 
 ## What it does
 
-- Docks a chat panel next to any page (`Ctrl` `Shift` `K`), with the page as context.
-- Runs a coding agent (Claude Code by default, or OpenAI's Codex) in a local sidecar that reads the project, its loaded modules and their skills.
-- Edits pages through the [Builder](https://github.com/AntelopeJS/dms-builder) in Safe mode, or writes code, then typechecks and shows the result live.
+- Docks a chat panel next to any page, with the page as context. `Ctrl` `Shift` `K` opens it.
+- Runs a coding agent in a local sidecar. The agent is Claude Code by default, or OpenAI's Codex, and it reads the project, its loaded modules and their skills.
+- Edits pages through the [Builder](https://github.com/AntelopeJS/dms-builder) in Safe mode, or writes code in Code mode. It then typechecks and shows the result live.
 - Saves every turn that touches the project as a change set you can review, undo and redo.
-- Adds an owner-only **Assistant** module: Overview, Changes, Activity, Skills and Settings.
+- Adds an **Assistant** module for owners, with the **Overview**, **Changes**, **Activity**, **Skills** and **Settings** pages.
 
-The assistant is a development tool: the backend and the sidecar refuse to run with `NODE_ENV=production`.
+The assistant is a development tool. With `NODE_ENV=production`, the backend starts no sidecar and the dashboard shows no assistant. The sidecar exits if you start it yourself in production.
 
 ## Install
 
-Run the AntelopeJS CLI from the root of a project that already loads `@antelopejs/dms`:
+From the root of a project that already loads `@antelopejs/dms`, add the module with the AntelopeJS CLI:
 
 ```bash
 ajs project modules add @antelopejs/dms-ai
-ajs project modules add @antelopejs/dms-builder   # recommended: enables Safe mode
+ajs project modules add @antelopejs/dms-builder   # optional, turns on Safe mode
 ```
 
 ## Quick start
 
-Point the sidecar at the origin the `api` module reserved:
+Point the sidecar at the origin that the `api` module reserved:
 
-```ts
+```ts fragment
 // antelope.config.ts
 "dms-ai": {
   source: { type: "package", package: "@antelopejs/dms-ai" },
@@ -46,7 +46,9 @@ Point the sidecar at the origin the `api` module reserved:
 },
 ```
 
-Claude Code runs with its own credentials (its login, or `ANTHROPIC_API_KEY` in the backend's environment). Codex runs on your ChatGPT plan: install `@openai/codex` at the pinned version, then press **Sign in with ChatGPT** in Assistant › Settings (on a remote DMS, paste the address OpenAI sends you back to with **Paste the return address**). No OpenAI API key is used. Restart the backend, then the frontend, sign in as an owner and press `Ctrl` `Shift` `K` (`⌘` `⇧` `K` on macOS). Set `DMS_AI=0` to start the backend without the sidecar.
+Claude Code runs with its own credentials, either its login or `ANTHROPIC_API_KEY` in the backend's environment. Codex runs on your ChatGPT plan and uses no OpenAI API key. To use Codex, install `@openai/codex` at the version that `peerDependencies` pins, then press **Sign in with ChatGPT** in **Assistant** › **Settings**. On a DMS that runs on another machine, finish the sign-in with **Paste the return address**.
+
+Restart the backend, then the frontend. Sign in as an owner and press `Ctrl` `Shift` `K` (`⌘` `⇧` `K` on macOS). To start the backend without the sidecar, set `DMS_AI=0`.
 
 ## Requirements
 
@@ -54,37 +56,33 @@ Claude Code runs with its own credentials (its login, or `ANTHROPIC_API_KEY` in
 
 | Package                                  | Supported         | Tested with |
 | ---------------------------------------- | ----------------- | ----------- |
-| `@antelopejs/interface-api`              | `>=0.0.15 <1.0.0` | `0.0.15`    |
-| `@antelopejs/interface-core`             | `>=0.2.4 <1.0.0`  | `0.2.4`     |
+| `@antelopejs/agent-skills`               | `^0.1.0`          | `0.1.0`     |
+| `@antelopejs/interface-api`              | `>=0.3.0 <1.0.0`  | `0.3.0`     |
+| `@antelopejs/interface-core`             | `>=0.4.0 <1.0.0`  | `0.4.0`     |
 | `@antelopejs/interface-database-catalog` | `>=0.0.1 <1.0.0`  | `0.0.2`     |
-| `@antelopejs/interface-dms`              | `>=0.9.0 <1.0.0`  | `0.9.0`     |
-| `@antelopejs/interface-dms-builder`      | `>=0.3.0 <1.0.0`  | `0.3.0`     |
+| `@antelopejs/interface-dms`              | `>=0.12.0 <1.0.0` | `0.12.0`    |
+| `@antelopejs/interface-dms-builder`      | `>=0.4.0 <1.0.0`  | `0.4.0`     |
 
 <!-- antelopejs-docs-compat:end -->
 
-| Package | Version |
-| --- | --- |
-| `@antelopejs/dms` | `>=0.13.1 <1.0.0` |
-| `@antelopejs/interface-dms` | `>=0.9.0 <1.0.0` |
-| `@antelopejs/dms-frontend` (renderer) | `>=0.9.1 <0.10.0` |
-| `@antelopejs/dms-builder` (optional, Safe mode) | `>=0.4.0` |
+The module needs a DMS backend in a release that implements the `@antelopejs/interface-dms` range in the table. The dashboard needs an `@antelopejs/dms-frontend` renderer in the range that `engines["@antelopejs/dms-frontend"]` of `frontend-vue/package.json` declares. The `ajs dms` CLI refuses to build the module with a renderer outside that range. `@antelopejs/dms-builder` is optional and turns on Safe mode.
 
 ## Documentation
 
 - [Introduction](https://dms.antelopejs.com/docs/modules/ai/introduction)
 - [Installation](https://dms.antelopejs.com/docs/modules/ai/installation)
-- [Configuration](https://dms.antelopejs.com/docs/modules/ai/configuration): agent providers, Codex, Safe mode, remote access
+- [Configuration](https://dms.antelopejs.com/docs/modules/ai/configuration), with the agent providers, Codex, Safe mode and remote access
 - [Usage](https://dms.antelopejs.com/docs/modules/ai/usage/chat)
 - [Extending](https://dms.antelopejs.com/docs/modules/ai/extending)
 - [FAQ](https://dms.antelopejs.com/docs/modules/ai/faq)
 
-The guide's sources live in [`docs/`](./docs). The package ships the `dms-ai`, `dms-builder-safe` and `dms-ai-code-mode` Claude Code skills in [`skills/`](./skills), declared under `antelopeJs.skills` and loaded into the assistant's agent.
+The guide's sources live in [`docs/`](./docs). The package ships four agent skills in [`skills/`](./skills): `dms-ai`, `dms-ai-code-mode`, `dms-builder-safe` and `dms-external-database`. `antelopeJs.skills` declares them, and the assistant loads them into its agent.
 
 ## Contributing
 
-Read [CONTRIBUTING.md](./CONTRIBUTING.md) before opening a pull request.
+Read [CONTRIBUTING.md](./CONTRIBUTING.md) before you open a pull request.
 
-One install from the repository root includes the backend, shipped Vue frontend and sidecar. Each keeps its own lockfile. The playground remains independent and needs its own install for local development. Builds use the installed dependencies and do not install them again.
+One install from the repository root installs the backend, the shipped Vue frontend and the sidecar. Each of the three keeps its own lockfile. The playground is separate and needs its own install for local development. The builds use the installed dependencies and do not install them again.
 
 ```bash
 pnpm install --frozen-lockfile
@@ -101,9 +99,9 @@ pnpm test:node      # every backend suite, after a single build
 <details>
 <summary>Repository notes</summary>
 
-- The module registers `frontend-vue` through `AddFrontendModule` with the Vue 3 renderer. The chat panel, `DmsAiChatPanel`, is a docked side panel (`registerSidePanel`): the DMS renders it once for the whole app, so it lives through Inertia navigations and keeps its open state and width in a cookie. The command palette's assistant mode answers with `DmsAiPaletteAnswer` (`registerCommandPaletteAssistant`). The chat's code is under `frontend-vue/app/chat`. The renderer bundles the icons it finds in `.vue` files, so an icon name belongs in the component that shows it.
-- To build and typecheck the Vue source, set `DMS_FRONTEND_WORKSPACE` to the absolute path of a generated Inertia workspace that includes this module, then run `pnpm --dir frontend-vue build` and `pnpm --dir frontend-vue typecheck`.
-- `pnpm test:node` runs every backend suite after one build (`DMS_PREBUILT=1` skips the build when `dist/` is fresh, as in CI): `test:frontend-registration` (backend registration, sidecar inputs, `$dms_ai` keys in both locales), `test:routes` (the `/ai/*` routes against a stand-in sidecar) and `test:sidecar-lifecycle` (hot reload, restart, stale sidecar, Ctrl+C). The opt-in Codex acceptance suite runs with `CODEX_ACCEPTANCE=1 pnpm --dir sidecar test:acceptance`.
+- The module registers `frontend-vue` through `AddFrontendModule` with the Vue renderer. The chat panel, `DmsAiChatPanel`, is a docked side panel (`registerSidePanel`). The DMS renders it once for the whole app, so the panel stays mounted across Inertia navigations and keeps its open state and width in a cookie. The command palette's assistant mode answers with `DmsAiPaletteAnswer` (`registerCommandPaletteAssistant`). The chat's code is under `frontend-vue/app/chat`. The renderer bundles the icons it finds in `.vue` files, so an icon name belongs in the component that shows it.
+- To build and typecheck the Vue source, set `DMS_FRONTEND_WORKSPACE` to the absolute path of a generated Inertia workspace that includes this module. Then run `pnpm --dir frontend-vue build` and `pnpm --dir frontend-vue typecheck`.
+- `pnpm test:node` builds once, then runs every suite in `tests/` except the sidecar build smoke test (`pnpm test:sidecar-smoke`). `DMS_PREBUILT=1` skips the build when `dist/` is fresh, as in CI. Each suite also has its own script, for example `test:frontend-registration` (backend registration, sidecar inputs, `$dms_ai` keys in both locales), `test:routes` (the `/ai/*` routes against a stand-in sidecar) and `test:sidecar-lifecycle` (hot reload, restart, stale sidecar, `Ctrl` `C`). The opt-in Codex acceptance suite runs with `CODEX_ACCEPTANCE=1 pnpm --dir sidecar test:acceptance`.
 
 </details>
 

package/dist/constants/http.d.ts

@@ -2,6 +2,7 @@ export declare const HTTP_STATUS: {
     readonly OK: 200;
     readonly NO_CONTENT: 204;
     readonly BAD_REQUEST: 400;
+    readonly BAD_GATEWAY: 502;
     readonly UNAVAILABLE: 503;
 };
 export declare const ASSISTANT_UNAVAILABLE_MESSAGE = "The assistant isn't running.";

package/dist/constants/http.js

@@ -6,6 +6,7 @@ exports.HTTP_STATUS = {
     OK: 200,
     NO_CONTENT: 204,
     BAD_REQUEST: 400,
+    BAD_GATEWAY: 502,
     UNAVAILABLE: sidecar_1.SIDECAR_UNAVAILABLE_STATUS,
 };
 exports.ASSISTANT_UNAVAILABLE_MESSAGE = "The assistant isn't running.";

package/dist/constants/http.js.map

@@ -1 +1 @@
-{"version":3,"file":"http.js","sourceRoot":"","sources":["../../src/constants/http.ts"],"names":[],"mappings":";;;AAAA,uCAAuD;AAE1C,QAAA,WAAW,GAAG;IACzB,EAAE,EAAE,GAAG;IACP,UAAU,EAAE,GAAG;IACf,WAAW,EAAE,GAAG;IAChB,WAAW,EAAE,oCAA0B;CAC/B,CAAC;AAGE,QAAA,6BAA6B,GAAG,8BAA8B,CAAC;AAE/D,QAAA,yBAAyB,GAAG,oCAAoC,CAAC;AAEjE,QAAA,gBAAgB,GAAG,yBAAyB,CAAC"}
+{"version":3,"file":"http.js","sourceRoot":"","sources":["../../src/constants/http.ts"],"names":[],"mappings":";;;AAAA,uCAAuD;AAE1C,QAAA,WAAW,GAAG;IACzB,EAAE,EAAE,GAAG;IACP,UAAU,EAAE,GAAG;IACf,WAAW,EAAE,GAAG;IAChB,WAAW,EAAE,GAAG;IAChB,WAAW,EAAE,oCAA0B;CAC/B,CAAC;AAGE,QAAA,6BAA6B,GAAG,8BAA8B,CAAC;AAE/D,QAAA,yBAAyB,GAAG,oCAAoC,CAAC;AAEjE,QAAA,gBAAgB,GAAG,yBAAyB,CAAC"}

package/dist/database/catalog.js

@@ -11,6 +11,20 @@ function catalogConnections() {
         ? lookup()
         : (0, interface_core_1.RunWithResponsibleModule)(OWN_MODULE, lookup);
 }
+function isCatalogConnection(loaded) {
+    return (typeof loaded === "object" &&
+        loaded !== null &&
+        "Info" in loaded &&
+        typeof loaded.Info === "function" &&
+        "ListRelations" in loaded &&
+        typeof loaded.ListRelations === "function" &&
+        "DescribeRelations" in loaded &&
+        typeof loaded.DescribeRelations === "function" &&
+        "Profile" in loaded &&
+        typeof loaded.Profile === "function" &&
+        "CheckReference" in loaded &&
+        typeof loaded.CheckReference === "function");
+}
 function listConnections() {
     return catalogConnections()
         .map((connection) => connection.id)
@@ -18,8 +32,12 @@ function listConnections() {
 }
 function catalogOf(id) {
     const connection = catalogConnections().find((candidate) => candidate.id === id);
-    return connection
-        ? require(connection.path)
-        : undefined;
+    if (!connection)
+        return undefined;
+    const loaded = require(connection.path);
+    if (!isCatalogConnection(loaded)) {
+        throw new TypeError(`Catalog connection ${id} does not answer the interface-database-catalog functions`);
+    }
+    return loaded;
 }
 //# sourceMappingURL=catalog.js.map

package/dist/database/catalog.js.map

@@ -1 +1 @@
-{"version":3,"file":"catalog.js","sourceRoot":"","sources":["../../src/database/catalog.ts"],"names":[],"mappings":";;AA+BA,0CAIC;AAGD,8BAOC;AA7CD,+DAKoC;AAEpC,oDAA0D;AAO1D,MAAM,UAAU,GAAG,IAAA,qCAAoB,GAAE,CAAC;AAE1C,SAAS,kBAAkB;IACzB,MAAM,MAAM,GAAG,GAAG,EAAE,CAAC,IAAA,sCAAqB,EAAC,4BAAiB,CAAC,CAAC;IAC9D,OAAO,UAAU,KAAK,SAAS;QAC7B,CAAC,CAAC,MAAM,EAAE;QACV,CAAC,CAAC,IAAA,yCAAwB,EAAC,UAAU,EAAE,MAAM,CAAC,CAAC;AACnD,CAAC;AAUD,SAAgB,eAAe;IAC7B,OAAO,kBAAkB,EAAE;SACxB,GAAG,CAAC,CAAC,UAAU,EAAE,EAAE,CAAC,UAAU,CAAC,EAAE,CAAC;SAClC,MAAM,CAAC,CAAC,EAAE,EAAgB,EAAE,CAAC,OAAO,EAAE,KAAK,QAAQ,IAAI,EAAE,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;AAC3E,CAAC;AAGD,SAAgB,SAAS,CAAC,EAAU;IAClC,MAAM,UAAU,GAAG,kBAAkB,EAAE,CAAC,IAAI,CAC1C,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,CAAC,EAAE,KAAK,EAAE,CACnC,CAAC;IACF,OAAO,UAAU;QACf,CAAC,CAAE,OAAO,CAAC,UAAU,CAAC,IAAI,CAAuB;QACjD,CAAC,CAAC,SAAS,CAAC;AAChB,CAAC"}
+{"version":3,"file":"catalog.js","sourceRoot":"","sources":["../../src/database/catalog.ts"],"names":[],"mappings":";;AAqDA,0CAIC;AAOD,8BAYC;AA5ED,+DAKoC;AAEpC,oDAA0D;AAO1D,MAAM,UAAU,GAAG,IAAA,qCAAoB,GAAE,CAAC;AAE1C,SAAS,kBAAkB;IACzB,MAAM,MAAM,GAAG,GAAG,EAAE,CAAC,IAAA,sCAAqB,EAAC,4BAAiB,CAAC,CAAC;IAC9D,OAAO,UAAU,KAAK,SAAS;QAC7B,CAAC,CAAC,MAAM,EAAE;QACV,CAAC,CAAC,IAAA,yCAAwB,EAAC,UAAU,EAAE,MAAM,CAAC,CAAC;AACnD,CAAC;AAUD,SAAS,mBAAmB,CAAC,MAAe;IAC1C,OAAO,CACL,OAAO,MAAM,KAAK,QAAQ;QAC1B,MAAM,KAAK,IAAI;QACf,MAAM,IAAI,MAAM;QAChB,OAAO,MAAM,CAAC,IAAI,KAAK,UAAU;QACjC,eAAe,IAAI,MAAM;QACzB,OAAO,MAAM,CAAC,aAAa,KAAK,UAAU;QAC1C,mBAAmB,IAAI,MAAM;QAC7B,OAAO,MAAM,CAAC,iBAAiB,KAAK,UAAU;QAC9C,SAAS,IAAI,MAAM;QACnB,OAAO,MAAM,CAAC,OAAO,KAAK,UAAU;QACpC,gBAAgB,IAAI,MAAM;QAC1B,OAAO,MAAM,CAAC,cAAc,KAAK,UAAU,CAC5C,CAAC;AACJ,CAAC;AAOD,SAAgB,eAAe;IAC7B,OAAO,kBAAkB,EAAE;SACxB,GAAG,CAAC,CAAC,UAAU,EAAE,EAAE,CAAC,UAAU,CAAC,EAAE,CAAC;SAClC,MAAM,CAAC,CAAC,EAAE,EAAgB,EAAE,CAAC,OAAO,EAAE,KAAK,QAAQ,IAAI,EAAE,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;AAC3E,CAAC;AAOD,SAAgB,SAAS,CAAC,EAAU;IAClC,MAAM,UAAU,GAAG,kBAAkB,EAAE,CAAC,IAAI,CAC1C,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,CAAC,EAAE,KAAK,EAAE,CACnC,CAAC;IACF,IAAI,CAAC,UAAU;QAAE,OAAO,SAAS,CAAC;IAClC,MAAM,MAAM,GAAY,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;IACjD,IAAI,CAAC,mBAAmB,CAAC,MAAM,CAAC,EAAE,CAAC;QACjC,MAAM,IAAI,SAAS,CACjB,sBAAsB,EAAE,2DAA2D,CACpF,CAAC;IACJ,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC"}

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;AAcA,8BAEC;AAOD,sBAkBC;AAOD,0BAEC;AAlDD,gEAA6D;AAC7D,yDAAmE;AACnE,iDAAwD;AACxD,kDAAsD;AACtD,qCAA8D;AAC9D,iDAAyD;AACzD,2DAA8D;AAC9D,6DAAgE;AAChE,6DAAyD;AACzD,qDAAuD;AACvD,mBAAiB;AACjB,oBAAkB;AAClB,uDAAmD;AAEnD,SAAgB,SAAS,CAAC,MAAe;IACvC,IAAA,kBAAS,EAAC,qBAAY,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC;AACvD,CAAC;AAOM,KAAK,UAAU,KAAK;IACzB,IAAA,4BAAe,GAAE,CAAC;IAClB,MAAM,IAAA,wBAAiB,EAAC,IAAA,gCAAc,GAAE,CAAC,CAAC;IAC1C,MAAM,eAAe,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;IACtC,MAAM,CAAC,WAAW,EAAE,SAAS,EAAE,cAAc,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;QACjE,IAAA,iCAAkB,GAAE;QACpB,IAAA,mCAAmB,EAAC,eAAe,CAAC;QACpC,IAAA,6BAAkB,GAAE;KACrB,CAAC,CAAC;IACH,KAAK,IAAA,4BAAY,EAAC;QAChB,eAAe;QACf,GAAG,IAAA,kBAAS,GAAE;QACd,WAAW;QACX,SAAS;QACT,cAAc;KACf,CAAC,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;QACf,iBAAO,CAAC,KAAK,CAAC,GAAG,4BAAkB,gBAAgB,EAAE,GAAG,CAAC,CAAC;IAC5D,CAAC,CAAC,CAAC;AACL,CAAC;AAOD,SAAgB,OAAO;IACrB,IAAA,0BAAe,GAAE,CAAC;AACpB,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;AAeA,8BAEC;AAOD,sBAkBC;AAOD,0BAEC;AAnDD,gEAA6D;AAC7D,yDAAmE;AACnE,iDAAwD;AACxD,kDAAsD;AACtD,qCAA8D;AAC9D,iDAAyD;AACzD,2DAA8D;AAC9D,6DAAgE;AAChE,6DAAyD;AACzD,qDAAuD;AACvD,mBAAiB;AACjB,oBAAkB;AAClB,uDAAmD;AAGnD,SAAgB,SAAS,CAAC,MAAe;IACvC,IAAA,kBAAS,EAAC,qBAAY,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC;AACvD,CAAC;AAOM,KAAK,UAAU,KAAK;IACzB,IAAA,4BAAe,GAAE,CAAC;IAClB,MAAM,IAAA,wBAAiB,EAAC,IAAA,gCAAc,GAAE,CAAC,CAAC;IAC1C,MAAM,eAAe,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;IACtC,MAAM,CAAC,WAAW,EAAE,SAAS,EAAE,cAAc,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;QACjE,IAAA,iCAAkB,GAAE;QACpB,IAAA,mCAAmB,EAAC,eAAe,CAAC;QACpC,IAAA,6BAAkB,GAAE;KACrB,CAAC,CAAC;IACH,KAAK,IAAA,4BAAY,EAAC;QAChB,eAAe;QACf,GAAG,IAAA,kBAAS,GAAE;QACd,WAAW;QACX,SAAS;QACT,cAAc;KACf,CAAC,CAAC,KAAK,CAAC,CAAC,GAAY,EAAE,EAAE;QACxB,iBAAO,CAAC,KAAK,CAAC,GAAG,4BAAkB,gBAAgB,EAAE,GAAG,CAAC,CAAC;IAC5D,CAAC,CAAC,CAAC;AACL,CAAC;AAOD,SAAgB,OAAO;IACrB,IAAA,0BAAe,GAAE,CAAC;AACpB,CAAC"}

package/dist/lifecycle/sidecar-owner.js.map

@@ -1 +1 @@
-{"version":3,"file":"sidecar-owner.js","sourceRoot":"","sources":["../../src/lifecycle/sidecar-owner.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"sidecar-owner.js","sourceRoot":"","sources":["../../src/lifecycle/sidecar-owner.ts"],"names":[],"mappings":"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"}

package/dist/lifecycle/skill-sources.js

@@ -1,47 +1,13 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.collectSkillSources = collectSkillSources;
-const promises_1 = require("node:fs/promises");
-const node_module_1 = require("node:module");
-const node_path_1 = __importDefault(require("node:path"));
 const zod_1 = require("zod");
+const agent_skills_1 = require("@antelopejs/agent-skills");
 const logging_1 = require("@antelopejs/interface-core/logging");
 const modules_1 = require("@antelopejs/interface-core/modules");
 const sidecar_1 = require("../constants/sidecar");
-const SkillDirSchema = zod_1.z.string().min(1);
 const LocalPathSchema = zod_1.z.string().min(1);
-const PackageManifestSchema = zod_1.z
-    .object({
-    name: zod_1.z.string().optional().catch(undefined),
-    antelopeJs: zod_1.z
-        .object({ skills: zod_1.z.array(zod_1.z.unknown()).optional().catch(undefined) })
-        .optional()
-        .catch(undefined),
-    dependencies: zod_1.z.record(zod_1.z.string(), zod_1.z.unknown()).optional().catch(undefined),
-    devDependencies: zod_1.z
-        .record(zod_1.z.string(), zod_1.z.unknown())
-        .optional()
-        .catch(undefined),
-    optionalDependencies: zod_1.z
-        .record(zod_1.z.string(), zod_1.z.unknown())
-        .optional()
-        .catch(undefined),
-})
-    .catch({});
-const PACKAGE_JSON_FILE = "package.json";
-const NODE_MODULES_DIR = "node_modules";
 const FALLBACK_PLUGIN_NAME = "skills";
-const MODULE_DEPENDENCY_FIELDS = [
-    "dependencies",
-    "optionalDependencies",
-];
-const PROJECT_DEPENDENCY_FIELDS = [
-    ...MODULE_DEPENDENCY_FIELDS,
-    "devDependencies",
-];
 function sanitizePluginName(name) {
     const cleaned = name.toLowerCase().replace(/[^a-z0-9-]+/g, "-");
     const trimmed = cleaned.replace(/^-+|-+$/g, "");
@@ -54,105 +20,16 @@ function toPluginName(name) {
 function toDependencyPluginName(name) {
     return sanitizePluginName(name);
 }
-function readDeclaredSkillDirs(pkg) {
-    return (pkg.antelopeJs?.skills ?? []).flatMap((entry) => {
-        const dir = SkillDirSchema.safeParse(entry);
-        return dir.success ? [dir.data] : [];
-    });
-}
-async function readPackageJson(dir) {
-    try {
-        const raw = await (0, promises_1.readFile)(node_path_1.default.join(dir, PACKAGE_JSON_FILE), "utf8");
-        return PackageManifestSchema.parse(JSON.parse(raw));
-    }
-    catch {
-        return null;
-    }
-}
-function skillSourcesFromPackage(pkg, baseDir, pluginName) {
-    return readDeclaredSkillDirs(pkg).map((rel) => ({
-        module: pluginName,
-        dir: node_path_1.default.resolve(baseDir, rel),
-    }));
-}
-function listDependencyNames(pkg, fields) {
-    return fields.flatMap((field) => Object.keys(pkg[field] ?? {}));
-}
-async function toRealDir(dir) {
-    try {
-        return await (0, promises_1.realpath)(dir);
-    }
-    catch {
-        return dir;
-    }
-}
-function resolveDependencyDirViaRequire(dep, fromDir) {
-    try {
-        const requireFrom = (0, node_module_1.createRequire)(node_path_1.default.join(fromDir, PACKAGE_JSON_FILE));
-        const manifestPath = requireFrom.resolve(`${dep}/${PACKAGE_JSON_FILE}`);
-        return node_path_1.default.dirname(manifestPath);
-    }
-    catch {
-        return null;
-    }
+function pluginNameOf(skillPackage) {
+    return skillPackage.kind === "module"
+        ? toPluginName(skillPackage.name)
+        : toDependencyPluginName(skillPackage.name);
 }
-async function isReadable(filePath) {
-    try {
-        await (0, promises_1.access)(filePath);
-        return true;
-    }
-    catch {
-        return false;
-    }
-}
-async function resolveDependencyDirViaWalk(dep, fromDir) {
-    let current = node_path_1.default.resolve(fromDir);
-    for (;;) {
-        const candidate = node_path_1.default.join(current, NODE_MODULES_DIR, ...dep.split("/"));
-        if (await isReadable(node_path_1.default.join(candidate, PACKAGE_JSON_FILE))) {
-            return candidate;
-        }
-        const parent = node_path_1.default.dirname(current);
-        if (parent === current)
-            return null;
-        current = parent;
-    }
-}
-async function readDependencySkillSources(dep, fromDir) {
-    const realFromDir = await toRealDir(fromDir);
-    const depDir = resolveDependencyDirViaRequire(dep, realFromDir) ??
-        (await resolveDependencyDirViaWalk(dep, realFromDir));
-    if (depDir === null)
-        return null;
-    const pkg = await readPackageJson(depDir);
-    return skillSourcesFromPackage(pkg ?? {}, depDir, toDependencyPluginName(pkg?.name ?? dep));
-}
-function scanDependencyOnce(dep, fromDir, scans) {
-    const inFlight = scans.get(dep);
-    if (inFlight !== undefined)
-        return inFlight;
-    const scan = readDependencySkillSources(dep, fromDir).then((sources) => sources ?? []);
-    scans.set(dep, scan);
-    return scan;
-}
-async function readAllDependencySkillSources(localPath, dependencies, scans) {
-    const nested = await Promise.all(dependencies.map((dep) => scanDependencyOnce(dep, localPath, scans)));
-    return nested.flat();
-}
-async function readLoadedModule(id, localPath) {
-    const pkg = await readPackageJson(localPath);
-    return pkg === null ? null : { localPath, name: pkg.name ?? id, pkg };
-}
-async function readModuleSkillSources(loaded, scans) {
-    const own = skillSourcesFromPackage(loaded.pkg, loaded.localPath, toPluginName(loaded.name));
-    const fromDependencies = await readAllDependencySkillSources(loaded.localPath, listDependencyNames(loaded.pkg, MODULE_DEPENDENCY_FIELDS), scans);
-    return [...own, ...fromDependencies];
-}
-async function readProjectSkillSources(projectRoot, scans) {
-    const pkg = await readPackageJson(projectRoot);
-    if (pkg === null)
-        return [];
-    return readAllDependencySkillSources(projectRoot, listDependencyNames(pkg, PROJECT_DEPENDENCY_FIELDS), scans);
+function toSkillSources(skillPackages) {
+    return skillPackages.flatMap((skillPackage) => skillPackage.skillDirs.map((dir) => ({
+        module: pluginNameOf(skillPackage),
+        dir,
+    })));
 }
 function dedupeBy(sources, key, onDrop) {
     const seen = new Set();
@@ -166,27 +43,23 @@ function dedupeBy(sources, key, onDrop) {
         return true;
     });
 }
-async function readLoadedModulesSkillSources(scans) {
+async function listLoadedModules() {
     const ids = await (0, modules_1.ListModules)();
     const read = await Promise.all(ids.map((id) => (0, modules_1.GetModuleInfo)(id)
         .then((info) => {
         const localPath = LocalPathSchema.safeParse(info.localPath);
-        return localPath.success
-            ? readLoadedModule(id, localPath.data)
-            : null;
+        return localPath.success ? { dir: localPath.data, id } : null;
     })
         .catch(() => null)));
-    const loaded = read.filter((entry) => entry !== null);
-    for (const entry of loaded)
-        scans.set(entry.name, Promise.resolve([]));
-    const nested = await Promise.all(loaded.map((entry) => readModuleSkillSources(entry, scans)));
-    return nested.flat();
+    return read.filter((ref) => ref !== null);
 }
 async function gather(projectRoot) {
-    const scans = new Map();
-    const fromModules = await readLoadedModulesSkillSources(scans);
-    const fromProject = await readProjectSkillSources(projectRoot, scans);
-    const byDir = dedupeBy([...fromModules, ...fromProject], (source) => source.dir);
+    const skillPackages = (0, agent_skills_1.collectSkillPackages)({
+        modules: await listLoadedModules(),
+        project: projectRoot,
+        onWarning: (message) => logging_1.Logging.Warn(`${sidecar_1.SIDECAR_LOG_PREFIX} ${message}`),
+    });
+    const byDir = dedupeBy(toSkillSources(skillPackages), (source) => source.dir);
     return dedupeBy(byDir, (source) => source.module, (dropped) => logging_1.Logging.Warn(`${sidecar_1.SIDECAR_LOG_PREFIX} skill dir ${dropped.dir} ignored: plugin name "${dropped.module}" already has a skill dir`));
 }
 async function collectSkillSources(projectRoot) {

package/dist/lifecycle/skill-sources.js.map

@@ -1 +1 @@
-{"version":3,"file":"skill-sources.js","sourceRoot":"","sources":["../../src/lifecycle/skill-sources.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"skill-sources.js","sourceRoot":"","sources":["../../src/lifecycle/skill-sources.ts"],"names":[],"mappings":"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"}

package/dist/lifecycle/spawn-sidecar.js

@@ -176,8 +176,8 @@ function trySpawnChild(args, logPath) {
     }
 }
 async function learnPortFromLock(root, childPid) {
-    const deadline = Date.now() + sidecar_1.SIDECAR_SPAWN_TIMEOUT_MS;
-    while (Date.now() < deadline) {
+    const polls = Math.ceil(sidecar_1.SIDECAR_SPAWN_TIMEOUT_MS / sidecar_1.SIDECAR_LOCK_POLL_INTERVAL_MS);
+    for (let poll = 0; poll < polls && (0, terminate_process_1.isProcessAlive)(childPid); poll += 1) {
         const lock = readLock(root);
         if (lock !== null && lock.pid === childPid) {
             logging_1.Logging.Info(`${sidecar_1.SIDECAR_LOG_PREFIX} sidecar listening on port ${lock.port}`);

package/dist/lifecycle/spawn-sidecar.js.map

@@ -1 +1 @@
-{"version":3,"file":"spawn-sidecar.js","sourceRoot":"","sources":["../../src/lifecycle/spawn-sidecar.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"spawn-sidecar.js","sourceRoot":"","sources":["../../src/lifecycle/spawn-sidecar.ts"],"names":[],"mappings":";;;;;AAmFA,wCAEC;AAED,0CAGC;AAGD,sDAGC;AAED,4CAEC;AAMD,8CAEC;AAOD,8CAGC;AAOD,oCAIC;AAUD,oDAGC;AAMD,wCAGC;AAvJD,2DAA8D;AAC9D,qCAA+E;AAC/E,0DAA6B;AAC7B,0DAA6B;AAC7B,6BAAwB;AACxB,gEAA6D;AAC7D,gDAA0D;AAC1D,kDAoB8B;AAC9B,yCAA4C;AAC5C,mDAAsE;AAEtE,2DAAuE;AAiCvE,MAAM,iBAAiB,GAAG,OAAC,CAAC,MAAM,CAAC;IACjC,IAAI,EAAE,OAAC,CAAC,MAAM,EAAE;IAChB,GAAG,EAAE,OAAC,CAAC,MAAM,EAAE;IACf,KAAK,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE,CAAC,KAAK,CAAC,SAAS,CAAC;IAC7C,WAAW,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE,CAAC,KAAK,CAAC,SAAS,CAAC;CACpD,CAAC,CAAC;AAIH,MAAM,oBAAoB,GAAG,OAAC,CAAC,MAAM,CAAC,EAAE,EAAE,EAAE,OAAC,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;AAM/D,MAAM,KAAK,GAAkB;IAC3B,OAAO,EAAE,IAAI;CACd,CAAC;AAEF,SAAgB,cAAc;IAC5B,OAAO,IAAA,+BAAe,GAAE,CAAC,OAAO,EAAE,CAAC;AACrC,CAAC;AAED,SAAgB,eAAe;IAC7B,MAAM,IAAI,GAAG,KAAK,CAAC,OAAO,EAAE,eAAe,IAAI,OAAO,CAAC,GAAG,EAAE,CAAC;IAC7D,OAAO,QAAQ,CAAC,IAAI,CAAC,EAAE,KAAK,IAAI,IAAI,CAAC;AACvC,CAAC;AAGD,SAAgB,qBAAqB;IACnC,MAAM,IAAI,GAAG,KAAK,CAAC,OAAO,EAAE,eAAe,IAAI,OAAO,CAAC,GAAG,EAAE,CAAC;IAC7D,OAAO,QAAQ,CAAC,IAAI,CAAC,EAAE,WAAW,IAAI,IAAI,CAAC;AAC7C,CAAC;AAED,SAAgB,gBAAgB;IAC9B,OAAO,cAAc,EAAE,KAAK,IAAI,CAAC;AACnC,CAAC;AAMD,SAAgB,iBAAiB;IAC/B,OAAO,IAAA,+BAAe,GAAE,CAAC,UAAU,EAAE,CAAC;AACxC,CAAC;AAOD,SAAgB,iBAAiB;IAC/B,IAAI,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,4BAAmB;QAAE,OAAO,IAAI,CAAC;IAC9D,OAAO,OAAO,CAAC,GAAG,CAAC,iCAAuB,CAAC,KAAK,+BAAqB,CAAC;AACxE,CAAC;AAOM,KAAK,UAAU,YAAY,CAAC,IAAkB;IACnD,KAAK,CAAC,OAAO,GAAG,IAAI,CAAC;IACrB,IAAI,iBAAiB,EAAE;QAAE,OAAO;IAChC,MAAM,IAAA,+BAAe,GAAE,CAAC,MAAM,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,CAAC;AACrD,CAAC;AAUM,KAAK,UAAU,oBAAoB;IACxC,IAAI,iBAAiB,EAAE;QAAE,OAAO;IAChC,MAAM,IAAA,+BAAe,GAAE,CAAC,MAAM,EAAE,CAAC;AACnC,CAAC;AAMM,KAAK,UAAU,cAAc;IAClC,IAAI,iBAAiB,EAAE;QAAE,OAAO;IAChC,MAAM,IAAA,+BAAe,GAAE,CAAC,OAAO,EAAE,CAAC;AACpC,CAAC;AAED,SAAS,iBAAiB;IACxB,IAAI,CAAC;QACH,OAAO,OAAO,CAAC,OAAO,CAAC,eAAe,0BAAgB,gBAAgB,CAAC,CAAC;IAC1E,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,mBAAI,CAAC,OAAO,CAAC,SAAS,EAAE,0BAAgB,CAAC,CAAC;IACnD,CAAC;AACH,CAAC;AAED,SAAS,cAAc,CAAC,IAAY,EAAE,QAAgB;IACpD,OAAO,mBAAI,CAAC,IAAI,CAAC,IAAI,EAAE,GAAG,oCAA0B,EAAE,QAAQ,CAAC,CAAC;AAClE,CAAC;AAED,SAAS,QAAQ,CAAC,IAAY;IAC5B,IAAI,CAAC;QACH,MAAM,GAAG,GAAG,IAAA,sBAAY,EACtB,cAAc,CAAC,IAAI,EAAE,gCAAsB,CAAC,EAC5C,MAAM,CACP,CAAC;QACF,MAAM,IAAI,GAAG,iBAAiB,CAAC,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC;QAC1D,OAAO,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC;IACzC,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,IAAI,CAAC;IACd,CAAC;AACH,CAAC;AAED,SAAS,YAAY,CAAC,IAAY,EAAE,GAAW;IAC7C,IAAI,QAAQ,CAAC,IAAI,CAAC,EAAE,GAAG,KAAK,GAAG;QAAE,OAAO;IACxC,IAAA,gBAAM,EAAC,cAAc,CAAC,IAAI,EAAE,gCAAsB,CAAC,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;AACxE,CAAC;AAED,SAAS,aAAa,CAAC,IAAY;IACjC,IAAI,CAAC;QACH,OAAO,oBAAoB,CAAC,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC;IAClE,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,KAAK,CAAC;IACf,CAAC;AACH,CAAC;AAED,SAAS,WAAW,CAAC,IAAY;IAC/B,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;QAC7B,MAAM,GAAG,GAAG,mBAAI,CAAC,GAAG,CAClB;YACE,IAAI,EAAE,+BAAqB;YAC3B,IAAI;YACJ,IAAI,EAAE,6BAAmB;YACzB,OAAO,EAAE,mCAAyB;SACnC,EACD,CAAC,GAAG,EAAE,EAAE;YACN,IAAI,IAAI,GAAG,EAAE,CAAC;YACd,GAAG,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;YACxB,GAAG,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,KAAK,EAAE,EAAE;gBACvB,IAAI,IAAI,KAAK,CAAC;YAChB,CAAC,CAAC,CAAC;YACH,GAAG,CAAC,EAAE,CAAC,KAAK,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QACpD,CAAC,CACF,CAAC;QACF,GAAG,CAAC,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC;QACtC,GAAG,CAAC,EAAE,CAAC,SAAS,EAAE,GAAG,EAAE;YACrB,GAAG,CAAC,OAAO,EAAE,CAAC;YACd,OAAO,CAAC,KAAK,CAAC,CAAC;QACjB,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC;AAED,SAAS,KAAK,CAAC,EAAU;IACvB,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,CAAC;AAC3D,CAAC;AAOD,KAAK,UAAU,qBAAqB,CAAC,IAAY;IAC/C,MAAM,IAAI,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC;IAC5B,IAAI,IAAI,KAAK,IAAI;QAAE,OAAO;IAC1B,IAAI,CAAC,CAAC,MAAM,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAAE,OAAO;IAC5C,iBAAO,CAAC,IAAI,CACV,GAAG,4BAAkB,8CAA8C,IAAI,CAAC,IAAI,EAAE,CAC/E,CAAC;IACF,MAAM,IAAA,oCAAgB,EAAC,IAAI,CAAC,GAAG,EAAE,iCAAuB,CAAC,CAAC;IAC1D,YAAY,CAAC,IAAI,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC;AAC/B,CAAC;AAED,SAAS,cAAc,CACrB,IAAkB,EAClB,OAAe,EACf,OAAe;IAEf,MAAM,IAAI,GAAG,CAAC,OAAO,EAAE,+BAAqB,EAAE,OAAO,CAAC,CAAC;IACvD,MAAM,WAAW,GAAG,IAAI,CAAC,WAAW,IAAI,EAAE,CAAC;IAC3C,IAAI,WAAW,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC3B,IAAI,CAAC,IAAI,CAAC,mCAAyB,EAAE,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC,CAAC;IACpE,CAAC;IACD,MAAM,SAAS,GAAG,IAAI,CAAC,SAAS,IAAI,EAAE,CAAC;IACvC,IAAI,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACzB,IAAI,CAAC,IAAI,CAAC,iCAAuB,EAAE,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC,CAAC;IAChE,CAAC;IACD,IAAI,IAAI,CAAC,cAAc,EAAE,CAAC;QACxB,IAAI,CAAC,IAAI,CAAC,8BAAoB,EAAE,GAAG,CAAC,CAAC;IACvC,CAAC;IACD,IAAI,IAAI,CAAC,UAAU,KAAK,SAAS,EAAE,CAAC;QAClC,IAAI,CAAC,IAAI,CAAC,kCAAwB,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC;IACvD,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAED,SAAS,aAAa,CAAC,IAAc,EAAE,OAAe;IACpD,IAAI,CAAC;QACH,IAAA,mBAAS,EAAC,mBAAI,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QACtD,MAAM,EAAE,GAAG,IAAA,kBAAQ,EAAC,OAAO,EAAE,GAAG,CAAC,CAAC;QAClC,MAAM,KAAK,GAAG,IAAA,0BAAK,EAAC,OAAO,CAAC,QAAQ,EAAE,IAAI,EAAE;YAC1C,KAAK,EAAE,CAAC,QAAQ,EAAE,EAAE,EAAE,EAAE,CAAC;YACzB,GAAG,EAAE,EAAE,GAAG,OAAO,CAAC,GAAG,EAAE;SACxB,CAAC,CAAC;QACH,IAAA,mBAAS,EAAC,EAAE,CAAC,CAAC;QACd,KAAK,CAAC,KAAK,EAAE,CAAC;QACd,OAAO,KAAK,CAAC;IACf,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,iBAAO,CAAC,KAAK,CAAC,GAAG,4BAAkB,2BAA2B,EAAE,GAAG,CAAC,CAAC;QACrE,OAAO,IAAI,CAAC;IACd,CAAC;AACH,CAAC;AAQD,KAAK,UAAU,iBAAiB,CAC9B,IAAY,EACZ,QAAgB;IAEhB,MAAM,KAAK,GAAG,IAAI,CAAC,IAAI,CACrB,kCAAwB,GAAG,uCAA6B,CACzD,CAAC;IACF,KAAK,IAAI,IAAI,GAAG,CAAC,EAAE,IAAI,GAAG,KAAK,IAAI,IAAA,kCAAc,EAAC,QAAQ,CAAC,EAAE,IAAI,IAAI,CAAC,EAAE,CAAC;QACvE,MAAM,IAAI,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC;QAC5B,IAAI,IAAI,KAAK,IAAI,IAAI,IAAI,CAAC,GAAG,KAAK,QAAQ,EAAE,CAAC;YAC3C,iBAAO,CAAC,IAAI,CACV,GAAG,4BAAkB,8BAA8B,IAAI,CAAC,IAAI,EAAE,CAC/D,CAAC;YACF,OAAO,IAAI,CAAC,IAAI,CAAC;QACnB,CAAC;QACD,MAAM,KAAK,CAAC,uCAA6B,CAAC,CAAC;IAC7C,CAAC;IACD,iBAAO,CAAC,KAAK,CAAC,GAAG,4BAAkB,wCAAwC,CAAC,CAAC;IAC7E,OAAO,IAAI,CAAC;AACd,CAAC;AAED,SAAS,YAAY,CAAC,IAAkB;IACtC,MAAM,IAAI,GAAG,IAAI,CAAC,eAAe,CAAC;IAClC,MAAM,OAAO,GAAG,iBAAiB,EAAE,CAAC;IACpC,MAAM,OAAO,GAAG,IAAA,yBAAc,EAAC,mBAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC;IACtD,MAAM,IAAI,GAAG,cAAc,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;IACpD,OAAO;QACL,OAAO;QACP,KAAK,EAAE,KAAK,IAAI,EAAE;YAChB,MAAM,qBAAqB,CAAC,IAAI,CAAC,CAAC;YAClC,OAAO,aAAa,CAAC,IAAI,EAAE,cAAc,CAAC,IAAI,EAAE,+BAAqB,CAAC,CAAC,CAAC;QAC1E,CAAC;QACD,WAAW,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,iBAAiB,CAAC,IAAI,EAAE,GAAG,CAAC;KACnD,CAAC;AACJ,CAAC"}

package/dist/lifecycle/terminate-process.d.ts

@@ -1 +1,2 @@
+export declare function isProcessAlive(pid: number): boolean;
 export declare function terminateProcess(pid: number | undefined, timeoutMs: number): Promise<void>;

package/dist/lifecycle/terminate-process.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.isProcessAlive = isProcessAlive;
 exports.terminateProcess = terminateProcess;
 const sidecar_1 = require("../constants/sidecar");
 const LIVENESS_SIGNAL = 0;
@@ -12,17 +13,20 @@ function signalProcess(pid, signal) {
         return false;
     }
 }
+function isProcessAlive(pid) {
+    return signalProcess(pid, LIVENESS_SIGNAL);
+}
 function delay(ms) {
     return new Promise((resolve) => setTimeout(resolve, ms));
 }
 async function waitForExit(pid, timeoutMs) {
-    const deadline = Date.now() + timeoutMs;
-    while (Date.now() < deadline) {
-        if (!signalProcess(pid, LIVENESS_SIGNAL))
+    const polls = Math.ceil(timeoutMs / sidecar_1.SIDECAR_EXIT_POLL_INTERVAL_MS);
+    for (let poll = 0; poll < polls; poll += 1) {
+        if (!isProcessAlive(pid))
             return true;
         await delay(sidecar_1.SIDECAR_EXIT_POLL_INTERVAL_MS);
     }
-    return !signalProcess(pid, LIVENESS_SIGNAL);
+    return !isProcessAlive(pid);
 }
 async function terminateProcess(pid, timeoutMs) {
     if (pid === undefined || !signalProcess(pid, "SIGTERM"))

package/dist/lifecycle/terminate-process.js.map

@@ -1 +1 @@
-{"version":3,"file":"terminate-process.js","sourceRoot":"","sources":["../../src/lifecycle/terminate-process.ts"],"names":[],"mappings":";;AA8BA,4CAOC;AArCD,kDAAqE;AAErE,MAAM,eAAe,GAAG,CAAC,CAAC;AAE1B,SAAS,aAAa,CAAC,GAAW,EAAE,MAA+B;IACjE,IAAI,CAAC;QACH,OAAO,CAAC,IAAI,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;QAC1B,OAAO,IAAI,CAAC;IACd,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,KAAK,CAAC;IACf,CAAC;AACH,CAAC;AAED,SAAS,KAAK,CAAC,EAAU;IACvB,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,CAAC;AAC3D,CAAC;AAED,KAAK,UAAU,WAAW,CAAC,GAAW,EAAE,SAAiB;IACvD,MAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,SAAS,CAAC;IACxC,OAAO,IAAI,CAAC,GAAG,EAAE,GAAG,QAAQ,EAAE,CAAC;QAC7B,IAAI,CAAC,aAAa,CAAC,GAAG,EAAE,eAAe,CAAC;YAAE,OAAO,IAAI,CAAC;QACtD,MAAM,KAAK,CAAC,uCAA6B,CAAC,CAAC;IAC7C,CAAC;IACD,OAAO,CAAC,aAAa,CAAC,GAAG,EAAE,eAAe,CAAC,CAAC;AAC9C,CAAC;AAMM,KAAK,UAAU,gBAAgB,CACpC,GAAuB,EACvB,SAAiB;IAEjB,IAAI,GAAG,KAAK,SAAS,IAAI,CAAC,aAAa,CAAC,GAAG,EAAE,SAAS,CAAC;QAAE,OAAO;IAChE,IAAI,MAAM,WAAW,CAAC,GAAG,EAAE,SAAS,CAAC;QAAE,OAAO;IAC9C,aAAa,CAAC,GAAG,EAAE,SAAS,CAAC,CAAC;AAChC,CAAC"}
+{"version":3,"file":"terminate-process.js","sourceRoot":"","sources":["../../src/lifecycle/terminate-process.ts"],"names":[],"mappings":";;AAcA,wCAEC;AAuBD,4CAOC;AA9CD,kDAAqE;AAErE,MAAM,eAAe,GAAG,CAAC,CAAC;AAE1B,SAAS,aAAa,CAAC,GAAW,EAAE,MAA+B;IACjE,IAAI,CAAC;QACH,OAAO,CAAC,IAAI,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;QAC1B,OAAO,IAAI,CAAC;IACd,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,KAAK,CAAC;IACf,CAAC;AACH,CAAC;AAGD,SAAgB,cAAc,CAAC,GAAW;IACxC,OAAO,aAAa,CAAC,GAAG,EAAE,eAAe,CAAC,CAAC;AAC7C,CAAC;AAED,SAAS,KAAK,CAAC,EAAU;IACvB,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,CAAC;AAC3D,CAAC;AAMD,KAAK,UAAU,WAAW,CAAC,GAAW,EAAE,SAAiB;IACvD,MAAM,KAAK,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,GAAG,uCAA6B,CAAC,CAAC;IACnE,KAAK,IAAI,IAAI,GAAG,CAAC,EAAE,IAAI,GAAG,KAAK,EAAE,IAAI,IAAI,CAAC,EAAE,CAAC;QAC3C,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC;YAAE,OAAO,IAAI,CAAC;QACtC,MAAM,KAAK,CAAC,uCAA6B,CAAC,CAAC;IAC7C,CAAC;IACD,OAAO,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC;AAC9B,CAAC;AAMM,KAAK,UAAU,gBAAgB,CACpC,GAAuB,EACvB,SAAiB;IAEjB,IAAI,GAAG,KAAK,SAAS,IAAI,CAAC,aAAa,CAAC,GAAG,EAAE,SAAS,CAAC;QAAE,OAAO;IAChE,IAAI,MAAM,WAAW,CAAC,GAAG,EAAE,SAAS,CAAC;QAAE,OAAO;IAC9C,aAAa,CAAC,GAAG,EAAE,SAAS,CAAC,CAAC;AAChC,CAAC"}

package/dist/logging/log-buffer.js

@@ -10,28 +10,36 @@ const logs_1 = require("../constants/logs");
 function isObject(value) {
     return typeof value === "object" && value !== null;
 }
-function sanitizeArg(arg) {
-    if (arg instanceof Error) {
-        return { name: arg.name, message: arg.message, stack: arg.stack };
+function summarizeError(error) {
+    return { name: error.name, message: error.message, stack: error.stack };
+}
+function sanitizeObject(value) {
+    try {
+        JSON.stringify(value);
+        return value;
+    }
+    catch {
+        return value.toString();
     }
-    if (isObject(arg)) {
-        try {
-            JSON.stringify(arg);
-            return arg;
-        }
-        catch {
-            const printable = arg;
-            return printable.toString();
-        }
+}
+function sanitizeArgs(args) {
+    const sanitized = [];
+    for (const arg of args) {
+        if (arg instanceof Error)
+            sanitized.push(summarizeError(arg));
+        else if (isObject(arg))
+            sanitized.push(sanitizeObject(arg));
+        else
+            sanitized.push(arg);
     }
-    return arg;
+    return sanitized;
 }
 function toBuffered(log) {
     return {
         time: log.time,
         channel: log.channel,
         levelId: log.levelId,
-        args: Array.isArray(log.args) ? log.args.map(sanitizeArg) : [],
+        args: Array.isArray(log.args) ? sanitizeArgs(log.args) : [],
     };
 }
 function clampLimit(limit) {