@holon-run/agentinbox 0.1.3 → 0.2.0

package/README.md

@@ -136,6 +136,7 @@ Create a local source and publish an event:
 agentinbox source add local_event local-demo
 agentinbox subscription add <source_id>
 agentinbox subscription add <source_id> --agent-id <agent_id>
+agentinbox subscription add <source_id> --tracked-resource-ref pr:373 --cleanup-policy-json '{"mode":"manual"}'
 agentinbox subscription add <source_id> --filter-file ./filter.json
 cat filter.json | agentinbox subscription add <source_id> --filter-stdin
 agentinbox source event <source_id> --native-id demo-1 --event local.demo

package/dist/src/adapters.js

@@ -1,9 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AdapterRegistry = void 0;
+const paths_1 = require("./paths");
 const feishu_1 = require("./sources/feishu");
 const github_1 = require("./sources/github");
 const remote_1 = require("./sources/remote");
+const remote_profiles_1 = require("./sources/remote_profiles");
+const source_resolution_1 = require("./source_resolution");
 class NoopSourceAdapter {
     sourceType;
     constructor(sourceType) {
@@ -37,11 +40,15 @@ class AdapterRegistry {
     defaultDelivery = new NoopDeliveryAdapter();
     feishuDelivery = new feishu_1.FeishuDeliveryAdapter();
     githubDelivery = new github_1.GithubDeliveryAdapter();
+    homeDir;
+    remoteProfileRegistry;
     constructor(store, appendSourceEvent, options) {
+        this.homeDir = options?.homeDir ?? (0, paths_1.resolveAgentInboxHome)(process.env);
+        this.remoteProfileRegistry = options?.remoteProfileRegistry ?? new remote_profiles_1.RemoteSourceProfileRegistry();
         this.remoteSource = new remote_1.RemoteSourceRuntime(store, appendSourceEvent, {
-            homeDir: options?.homeDir,
+            homeDir: this.homeDir,
             client: options?.remoteSourceClient,
-            profileRegistry: options?.remoteProfileRegistry,
+            profileRegistry: this.remoteProfileRegistry,
         });
     }
     sourceAdapterFor(type) {
@@ -109,6 +116,30 @@ class AdapterRegistry {
         const adapter = this.sourceAdapterFor(source.sourceType);
         await adapter.removeSource?.(source.sourceId);
     }
+    async resolveSourceIdentity(source) {
+        return (0, source_resolution_1.resolveSourceIdentity)(source, {
+            homeDir: this.homeDir,
+            profileRegistry: this.remoteProfileRegistry,
+        });
+    }
+    async resolveSourceSchema(source) {
+        return (0, source_resolution_1.resolveSourceSchema)(source, {
+            homeDir: this.homeDir,
+            profileRegistry: this.remoteProfileRegistry,
+        });
+    }
+    async projectLifecycleSignal(source, rawPayload) {
+        if (source.sourceType === "local_event") {
+            return null;
+        }
+        return this.remoteSource.projectLifecycleSignal(source, rawPayload);
+    }
+    async expandSubscriptionShortcut(source, input) {
+        if (source.sourceType === "local_event") {
+            return null;
+        }
+        return this.remoteSource.expandSubscriptionShortcut(source, input);
+    }
     status() {
         return {
             remote: this.remoteSource.status?.() ?? {},

package/dist/src/cli.js

@@ -76,11 +76,16 @@ async function main() {
         return;
     }
     if (command === "source" && normalized[1] === "remove") {
-        const sourceId = normalized[2];
-        if (!sourceId) {
-            throw new Error("usage: agentinbox source remove <sourceId>");
+        const removeArgs = normalized.slice(2);
+        const positionals = positionalArgs(removeArgs, ["--with-subscriptions"]);
+        const sourceId = positionals[0];
+        if (!sourceId || positionals[1]) {
+            throw new Error("usage: agentinbox source remove <sourceId> [--with-subscriptions]");
         }
-        await printRemote(client, `/sources/${encodeURIComponent(sourceId)}`, undefined, "DELETE");
+        const query = buildQuery({
+            with_subscriptions: hasFlag(normalized, "--with-subscriptions") ? "true" : undefined,
+        });
+        await printRemote(client, `/sources/${encodeURIComponent(sourceId)}${query}`, undefined, "DELETE");
         return;
     }
     if (command === "source" && normalized[1] === "update") {
@@ -120,11 +125,27 @@ async function main() {
         return;
     }
     if (command === "source" && normalized[1] === "schema") {
-        const sourceType = normalized[2];
-        if (!sourceType) {
-            throw new Error("usage: agentinbox source schema <sourceType>");
+        if (normalized[2] === "preview") {
+            const sourceRef = normalized[3];
+            if (!sourceRef) {
+                throw new Error("usage: agentinbox source schema preview <sourceKind|sourceType> [--config-json JSON] [--config-ref REF]");
+            }
+            await printRemote(client, "/sources/schema-preview", {
+                sourceRef,
+                configRef: takeFlagValue(normalized, "--config-ref") ?? undefined,
+                config: (0, util_1.parseJsonArg)(takeFlagValue(normalized, "--config-json")),
+            });
+            return;
+        }
+        const sourceRef = normalized[2];
+        if (!sourceRef) {
+            throw new Error("usage: agentinbox source schema <sourceId|sourceType>");
         }
-        await printRemote(client, `/source-types/${encodeURIComponent(sourceType)}/schema`, undefined, "GET");
+        if (sourceRef.startsWith("src_")) {
+            await printRemote(client, `/sources/${encodeURIComponent(sourceRef)}/schema`, undefined, "GET");
+            return;
+        }
+        await printRemote(client, `/source-types/${encodeURIComponent(sourceRef)}/schema`, undefined, "GET");
         return;
     }
     if (command === "source" && normalized[1] === "poll") {
@@ -223,19 +244,46 @@ async function main() {
     }
     if (command === "subscription" && normalized[1] === "add") {
         const args = normalized.slice(2);
-        const positionals = positionalArgs(args, ["--agent-id", "--filter-json", "--filter-file", "--start-policy", "--start-offset", "--start-time"]);
+        const positionals = positionalArgs(args, [
+            "--agent-id",
+            "--shortcut",
+            "--shortcut-args-json",
+            "--filter-json",
+            "--filter-file",
+            "--tracked-resource-ref",
+            "--cleanup-policy-json",
+            "--start-policy",
+            "--start-offset",
+            "--start-time",
+        ]);
         const sourceId = positionals[0];
         if (!sourceId || positionals[1]) {
-            throw new Error("usage: agentinbox subscription add <sourceId> [--agent-id ID] [--filter-json JSON | --filter-file PATH | --filter-stdin] [--start-policy POLICY] [--start-offset N] [--start-time ISO8601]");
+            throw new Error("usage: agentinbox subscription add <sourceId> [--agent-id ID] [--shortcut NAME --shortcut-args-json JSON] [--filter-json JSON | --filter-file PATH | --filter-stdin] [--tracked-resource-ref REF] [--cleanup-policy-json JSON] [--start-policy POLICY] [--start-offset N] [--start-time ISO8601]");
         }
         const selection = await selectAgentForCommand(client, {
             explicitAgentId: takeFlagValue(normalized, "--agent-id"),
             autoRegister: true,
         });
+        const shortcutName = takeFlagValue(normalized, "--shortcut");
+        const shortcutArgsJson = takeFlagValue(normalized, "--shortcut-args-json");
+        if (shortcutName && (hasFlag(normalized, "--filter-stdin") || takeFlagValue(normalized, "--filter-json") != null || takeFlagValue(normalized, "--filter-file") != null || takeFlagValue(normalized, "--tracked-resource-ref") != null || takeFlagValue(normalized, "--cleanup-policy-json") != null)) {
+            throw new Error("subscription add shortcut does not allow filter, trackedResourceRef, or cleanupPolicy flags");
+        }
+        const cleanupPolicyJson = takeFlagValue(normalized, "--cleanup-policy-json");
         const response = await requestRemote(client, "/subscriptions", {
             agentId: selection.agentId,
             sourceId,
-            filter: readSubscriptionFilter(normalized),
+            shortcut: shortcutName
+                ? {
+                    name: shortcutName,
+                    args: shortcutArgsJson != null ? (0, util_1.parseJsonArg)(shortcutArgsJson, "--shortcut-args-json") : {},
+                }
+                : undefined,
+            filter: shortcutName ? undefined : readSubscriptionFilter(normalized),
+            trackedResourceRef: takeFlagValue(normalized, "--tracked-resource-ref") ?? undefined,
+            cleanupPolicy: cleanupPolicyJson != null
+                ? (0, util_1.parseJsonArg)(cleanupPolicyJson, "--cleanup-policy-json")
+                : undefined,
             startPolicy: takeFlagValue(normalized, "--start-policy") ?? undefined,
             startOffset: parseOptionalNumber(takeFlagValue(normalized, "--start-offset")),
             startTime: takeFlagValue(normalized, "--start-time") ?? undefined,
@@ -741,10 +789,11 @@ Usage:
   agentinbox source list
   agentinbox source show <sourceId>
   agentinbox source update <sourceId> [--config-json JSON] [--config-ref REF | --clear-config-ref]
-  agentinbox source remove <sourceId>
+  agentinbox source remove <sourceId> [--with-subscriptions]
   agentinbox source pause <remoteSourceId>
   agentinbox source resume <remoteSourceId>
-  agentinbox source schema <sourceType>
+  agentinbox source schema <sourceId|sourceType>
+  agentinbox source schema preview <sourceKind|sourceType> [--config-json JSON] [--config-ref REF]
   agentinbox source poll <sourceId>
   agentinbox source event <sourceId> --native-id ID --event EVENT [--occurred-at ISO8601] [--metadata-json JSON] [--payload-json JSON]
 `,
@@ -763,7 +812,7 @@ Usage:
         subscription: `agentinbox subscription
 
 Usage:
-  agentinbox subscription add <sourceId> [--agent-id ID] [--filter-json JSON | --filter-file PATH | --filter-stdin] [--start-policy POLICY] [--start-offset N] [--start-time ISO8601]
+  agentinbox subscription add <sourceId> [--agent-id ID] [--shortcut NAME --shortcut-args-json JSON] [--filter-json JSON | --filter-file PATH | --filter-stdin] [--tracked-resource-ref REF] [--cleanup-policy-json JSON] [--start-policy POLICY] [--start-offset N] [--start-time ISO8601]
   agentinbox subscription list [--source-id ID] [--agent-id ID]
   agentinbox subscription show <subscriptionId>
   agentinbox subscription remove <subscriptionId>

package/dist/src/http.js

@@ -149,6 +149,26 @@ function buildFastifyServer(service) {
         const params = request.params;
         return service.getSourceDetails(decodeURIComponent(params.sourceId));
     });
+    app.get("/sources/:sourceId/schema", {
+        schema: {
+            tags: ["sources"],
+            params: {
+                type: "object",
+                required: ["sourceId"],
+                properties: {
+                    sourceId: { type: "string", minLength: 1 },
+                },
+            },
+            response: {
+                200: jsonObjectSchema,
+                400: errorResponseSchema,
+                404: errorResponseSchema,
+            },
+        },
+    }, async (request) => {
+        const params = request.params;
+        return service.getResolvedSourceSchema(decodeURIComponent(params.sourceId));
+    });
     app.delete("/sources/:sourceId", {
         schema: {
             tags: ["sources"],
@@ -159,6 +179,18 @@ function buildFastifyServer(service) {
                     sourceId: { type: "string", minLength: 1 },
                 },
             },
+            querystring: {
+                type: "object",
+                additionalProperties: false,
+                properties: {
+                    with_subscriptions: {
+                        anyOf: [
+                            { type: "boolean" },
+                            { type: "string", enum: ["true", "false", "1", "0"] },
+                        ],
+                    },
+                },
+            },
             response: {
                 200: jsonObjectSchema,
                 400: errorResponseSchema,
@@ -166,7 +198,10 @@ function buildFastifyServer(service) {
         },
     }, async (request) => {
         const params = request.params;
-        return service.removeSource(decodeURIComponent(params.sourceId));
+        const query = request.query;
+        return service.removeSource(decodeURIComponent(params.sourceId), {
+            withSubscriptions: query.with_subscriptions === true || query.with_subscriptions === "true" || query.with_subscriptions === "1",
+        });
     });
     app.patch("/sources/:sourceId", {
         schema: {
@@ -250,6 +285,25 @@ function buildFastifyServer(service) {
         const params = request.params;
         return service.getSourceSchema(decodeURIComponent(params.sourceType));
     });
+    app.post("/sources/schema-preview", {
+        schema: {
+            tags: ["sources"],
+            body: {
+                type: "object",
+                additionalProperties: false,
+                required: ["sourceRef"],
+                properties: {
+                    sourceRef: { type: "string", minLength: 1 },
+                    configRef: { anyOf: [{ type: "string" }, { type: "null" }] },
+                    config: jsonObjectSchema,
+                },
+            },
+            response: {
+                200: jsonObjectSchema,
+                400: errorResponseSchema,
+            },
+        },
+    }, async (request) => service.previewSourceSchema(request.body));
     app.post("/sources/:sourceId/poll", {
         schema: {
             tags: ["sources"],
@@ -549,9 +603,18 @@ function buildFastifyServer(service) {
                 properties: {
                     agentId: { type: "string", minLength: 1 },
                     sourceId: { type: "string", minLength: 1 },
+                    shortcut: {
+                        type: "object",
+                        additionalProperties: false,
+                        required: ["name"],
+                        properties: {
+                            name: { type: "string", minLength: 1 },
+                            args: jsonObjectSchema,
+                        },
+                    },
                     filter: jsonObjectSchema,
-                    lifecycleMode: { type: "string" },
-                    expiresAt: { type: "string" },
+                    trackedResourceRef: { type: "string" },
+                    cleanupPolicy: jsonObjectSchema,
                     startPolicy: { type: "string" },
                     startOffset: { type: "integer" },
                     startTime: { type: "string" },
@@ -567,9 +630,17 @@ function buildFastifyServer(service) {
         return service.registerSubscription({
             agentId: String(body.agentId),
             sourceId: String(body.sourceId),
-            filter: body.filter ?? {},
-            lifecycleMode: optionalString(body.lifecycleMode),
-            expiresAt: optionalString(body.expiresAt) ?? null,
+            shortcut: body.shortcut && typeof body.shortcut === "object"
+                ? {
+                    name: String(body.shortcut.name),
+                    args: body.shortcut.args ?? undefined,
+                }
+                : undefined,
+            filter: body.filter && typeof body.filter === "object"
+                ? body.filter
+                : undefined,
+            trackedResourceRef: optionalString(body.trackedResourceRef) ?? null,
+            cleanupPolicy: body.cleanupPolicy,
             startPolicy: optionalString(body.startPolicy),
             startOffset: typeof body.startOffset === "number" ? body.startOffset : undefined,
             startTime: optionalString(body.startTime) ?? undefined,
@@ -999,9 +1070,16 @@ function isBadRequestError(message) {
         message.startsWith("subscriptions requires") ||
         message.startsWith("agent register conflict") ||
         message.startsWith("unsupported activation target kind") ||
-        message.startsWith("unsupported lifecycle mode") ||
+        message.startsWith("unsupported cleanup policy mode") ||
         message.startsWith("unsupported start policy") ||
         message.startsWith("unsupported terminal") ||
+        message.startsWith("cleanupPolicy ") ||
+        message.startsWith("trackedResourceRef ") ||
+        message.startsWith("preview failed: ") ||
+        message.startsWith("unknown source kind or type for preview") ||
+        message.startsWith("preview source kind ") ||
+        message.startsWith("subscription add shortcut") ||
+        message.startsWith("unknown subscription shortcut ") ||
         message.startsWith("expected boolean") ||
         message.startsWith("expected integer") ||
         message.startsWith("expected positive integer") ||