@positronic/cloudflare 0.0.17 → 0.0.19

package/dist/src/api.js

@@ -397,6 +397,81 @@ app.get('/brains/runs/:runId/watch', function(context) {
         });
     })();
 });
+app.delete('/brains/runs/:runId', function(context) {
+    return _async_to_generator(function() {
+        var runId, monitorId, monitorStub, existingRun, namespace, doId, stub, result, error;
+        return _ts_generator(this, function(_state) {
+            switch(_state.label){
+                case 0:
+                    runId = context.req.param('runId');
+                    // First check if the run exists in the monitor
+                    monitorId = context.env.MONITOR_DO.idFromName('singleton');
+                    monitorStub = context.env.MONITOR_DO.get(monitorId);
+                    return [
+                        4,
+                        monitorStub.getLastEvent(runId)
+                    ];
+                case 1:
+                    existingRun = _state.sent();
+                    if (!existingRun) {
+                        return [
+                            2,
+                            context.json({
+                                error: "Brain run '".concat(runId, "' not found")
+                            }, 404)
+                        ];
+                    }
+                    // Now try to kill it
+                    namespace = context.env.BRAIN_RUNNER_DO;
+                    doId = namespace.idFromName(runId);
+                    stub = namespace.get(doId);
+                    _state.label = 2;
+                case 2:
+                    _state.trys.push([
+                        2,
+                        4,
+                        ,
+                        5
+                    ]);
+                    return [
+                        4,
+                        stub.kill()
+                    ];
+                case 3:
+                    result = _state.sent();
+                    if (!result.success) {
+                        // Brain run is not active or already completed
+                        return [
+                            2,
+                            context.json({
+                                error: result.message
+                            }, 409)
+                        ];
+                    }
+                    // Return 204 No Content on success
+                    return [
+                        2,
+                        new Response(null, {
+                            status: 204
+                        })
+                    ];
+                case 4:
+                    error = _state.sent();
+                    console.error("Error killing brain run ".concat(runId, ":"), error);
+                    return [
+                        2,
+                        context.json({
+                            error: 'Failed to kill brain run'
+                        }, 500)
+                    ];
+                case 5:
+                    return [
+                        2
+                    ];
+            }
+        });
+    })();
+});
 app.get('/brains/:identifier/history', function(context) {
     return _async_to_generator(function() {
         var identifier, limit, manifest, resolution, brain, brainTitle, monitorId, monitorStub, runs;

package/dist/src/brain-runner-do.js

@@ -103,6 +103,30 @@ function _object_spread(target) {
     }
     return target;
 }
+function ownKeys(object, enumerableOnly) {
+    var keys = Object.keys(object);
+    if (Object.getOwnPropertySymbols) {
+        var symbols = Object.getOwnPropertySymbols(object);
+        if (enumerableOnly) {
+            symbols = symbols.filter(function(sym) {
+                return Object.getOwnPropertyDescriptor(object, sym).enumerable;
+            });
+        }
+        keys.push.apply(keys, symbols);
+    }
+    return keys;
+}
+function _object_spread_props(target, source) {
+    source = source != null ? source : {};
+    if (Object.getOwnPropertyDescriptors) {
+        Object.defineProperties(target, Object.getOwnPropertyDescriptors(source));
+    } else {
+        ownKeys(Object(source)).forEach(function(key) {
+            Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key));
+        });
+    }
+    return target;
+}
 function _possible_constructor_return(self, call) {
     if (call && (_type_of(call) === "object" || typeof call === "function")) {
         return call;
@@ -364,7 +388,7 @@ export var BrainRunnerDO = /*#__PURE__*/ function(DurableObject) {
         _this = _call_super(this, BrainRunnerDO, [
             state,
             env
-        ]), _define_property(_this, "sql", void 0), _define_property(_this, "brainRunId", void 0), _define_property(_this, "eventStreamAdapter", new EventStreamAdapter());
+        ]), _define_property(_this, "sql", void 0), _define_property(_this, "brainRunId", void 0), _define_property(_this, "eventStreamAdapter", new EventStreamAdapter()), _define_property(_this, "abortController", null);
         _this.sql = state.storage.sql;
         _this.brainRunId = state.id.toString();
         _this.env = env;
@@ -502,29 +526,64 @@ export var BrainRunnerDO = /*#__PURE__*/ function(DurableObject) {
                 }).call(this);
             }
         },
+        {
+            key: "kill",
+            value: function kill() {
+                return _async_to_generator(function() {
+                    return _ts_generator(this, function(_state) {
+                        if (this.abortController && !this.abortController.signal.aborted) {
+                            this.abortController.abort();
+                            return [
+                                2,
+                                {
+                                    success: true,
+                                    message: 'Brain run kill signal sent'
+                                }
+                            ];
+                        } else {
+                            return [
+                                2,
+                                {
+                                    success: false,
+                                    message: 'Brain run is not active or already completed'
+                                }
+                            ];
+                        }
+                        return [
+                            2
+                        ];
+                    });
+                }).call(this);
+            }
+        },
         {
             key: "start",
             value: function start(brainTitle, brainRunId, initialData) {
                 return _async_to_generator(function() {
-                    var sql, brainToRun, sqliteAdapter, eventStreamAdapter, monitorAdapter, scheduleAdapter, r2Resources, runnerWithResources, options, initialState;
+                    var _this, sql, resolution, brainToRun, sqliteAdapter, eventStreamAdapter, monitorAdapter, scheduleAdapter, r2Resources, runnerWithResources, options, initialState;
                     return _ts_generator(this, function(_state) {
                         switch(_state.label){
                             case 0:
+                                _this = this;
                                 sql = this.sql;
                                 if (!manifest) {
                                     throw new Error('Runtime manifest not initialized');
                                 }
-                                return [
-                                    4,
-                                    manifest.import(brainTitle)
-                                ];
-                            case 1:
-                                brainToRun = _state.sent();
-                                if (!brainToRun) {
+                                // Resolve the brain using the title/identifier
+                                resolution = manifest.resolve(brainTitle);
+                                if (resolution.matchType === 'none') {
                                     console.error("[DO ".concat(brainRunId, "] Brain ").concat(brainTitle, " not found in manifest."));
                                     console.error(JSON.stringify(manifest, null, 2));
                                     throw new Error("Brain ".concat(brainTitle, " not found"));
                                 }
+                                if (resolution.matchType === 'multiple') {
+                                    console.error("[DO ".concat(brainRunId, "] Multiple brains match identifier ").concat(brainTitle), resolution.candidates);
+                                    throw new Error("Multiple brains match identifier ".concat(brainTitle));
+                                }
+                                brainToRun = resolution.brain;
+                                if (!brainToRun) {
+                                    throw new Error("Brain ".concat(brainTitle, " resolved but brain object is missing"));
+                                }
                                 sqliteAdapter = new BrainRunSQLiteAdapter(sql);
                                 eventStreamAdapter = this.eventStreamAdapter;
                                 monitorAdapter = new MonitorAdapter(this.env.MONITOR_DO.get(this.env.MONITOR_DO.idFromName('singleton')));
@@ -536,7 +595,7 @@ export var BrainRunnerDO = /*#__PURE__*/ function(DurableObject) {
                                     4,
                                     this.loadResourcesFromR2()
                                 ];
-                            case 2:
+                            case 1:
                                 r2Resources = _state.sent();
                                 // Create an enhanced runner with resources if available
                                 runnerWithResources = brainRunner;
@@ -547,18 +606,25 @@ export var BrainRunnerDO = /*#__PURE__*/ function(DurableObject) {
                                 // Extract options from initialData if present
                                 options = initialData === null || initialData === void 0 ? void 0 : initialData.options;
                                 initialState = initialData && !initialData.options ? initialData : {};
+                                // Create abort controller for this run
+                                this.abortController = new AbortController();
                                 runnerWithResources.withAdapters([
                                     sqliteAdapter,
                                     eventStreamAdapter,
                                     monitorAdapter,
                                     scheduleAdapter
-                                ]).run(brainToRun, _object_spread({
+                                ]).run(brainToRun, _object_spread_props(_object_spread({
                                     initialState: initialState,
                                     brainRunId: brainRunId
                                 }, options && {
                                     options: options
+                                }), {
+                                    signal: this.abortController.signal
                                 })).catch(function(err) {
                                     console.error("[DO ".concat(brainRunId, "] BrainRunner run failed:"), err);
+                                }).finally(function() {
+                                    // Clean up abort controller when run completes
+                                    _this.abortController = null;
                                 });
                                 return [
                                     2

package/dist/src/monitor-do.js

@@ -225,10 +225,10 @@ export var MonitorDO = /*#__PURE__*/ function(DurableObject) {
         {
             key: "handleBrainEvent",
             value: function handleBrainEvent(event) {
-                if (event.type === BRAIN_EVENTS.START || event.type === BRAIN_EVENTS.RESTART || event.type === BRAIN_EVENTS.COMPLETE || event.type === BRAIN_EVENTS.ERROR) {
+                if (event.type === BRAIN_EVENTS.START || event.type === BRAIN_EVENTS.RESTART || event.type === BRAIN_EVENTS.COMPLETE || event.type === BRAIN_EVENTS.ERROR || event.type === BRAIN_EVENTS.CANCELLED) {
                     var currentTime = Date.now();
                     var startTime = event.type === BRAIN_EVENTS.START || event.type === BRAIN_EVENTS.RESTART ? currentTime : null;
-                    var completeTime = event.type === BRAIN_EVENTS.COMPLETE || event.type === BRAIN_EVENTS.ERROR ? currentTime : null;
+                    var completeTime = event.type === BRAIN_EVENTS.COMPLETE || event.type === BRAIN_EVENTS.ERROR || event.type === BRAIN_EVENTS.CANCELLED ? currentTime : null;
                     var error = event.type === BRAIN_EVENTS.ERROR ? JSON.stringify(event.error) : null;
                     // Update SQL insert/update with new column names, read from existing event fields
                     this.storage.exec("\n        INSERT INTO brain_runs (\n          run_id, brain_title, brain_description, type, status,\n          options, error, created_at, started_at, completed_at\n        ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)\n        ON CONFLICT(run_id) DO UPDATE SET\n          type = excluded.type,\n          status = excluded.status,\n          error = excluded.error,\n          completed_at = excluded.completed_at\n      ", event.brainRunId, event.brainTitle, event.brainDescription || null, event.type, event.status, JSON.stringify(event.options || {}), error, currentTime, startTime, completeTime);
@@ -344,7 +344,8 @@ export var MonitorDO = /*#__PURE__*/ function(DurableObject) {
             // No changes needed for getLastEvent, uses run_id
             key: "getLastEvent",
             value: function getLastEvent(brainRunId) {
-                return this.storage.exec("\n      SELECT * FROM brain_runs WHERE run_id = ?\n    ", brainRunId).one();
+                var results = this.storage.exec("\n      SELECT * FROM brain_runs WHERE run_id = ?\n    ", brainRunId).toArray();
+                return results.length > 0 ? results[0] : null;
             }
         },
         {

package/dist/types/api.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"api.d.ts","sourceRoot":"","sources":["../../src/api.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAgB,MAAM,MAAM,CAAC;AAI1C,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAE1D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AACjD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AACnD,OAAO,KAAK,EAAE,QAAQ,EAAY,MAAM,2BAA2B,CAAC;AAGpE,KAAK,QAAQ,GAAG;IACd,eAAe,EAAE,sBAAsB,CAAC,aAAa,CAAC,CAAC;IACvD,UAAU,EAAE,sBAAsB,CAAC,SAAS,CAAC,CAAC;IAC9C,WAAW,EAAE,sBAAsB,CAAC,UAAU,CAAC,CAAC;IAChD,gBAAgB,EAAE,QAAQ,CAAC;IAC3B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB,CAAC;AAmBF,QAAA,MAAM,GAAG;cAAwB,QAAQ;yCAAK,CAAC;AAupB/C,eAAe,GAAG,CAAC"}
+{"version":3,"file":"api.d.ts","sourceRoot":"","sources":["../../src/api.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAgB,MAAM,MAAM,CAAC;AAI1C,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAE1D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AACjD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AACnD,OAAO,KAAK,EAAE,QAAQ,EAAY,MAAM,2BAA2B,CAAC;AAGpE,KAAK,QAAQ,GAAG;IACd,eAAe,EAAE,sBAAsB,CAAC,aAAa,CAAC,CAAC;IACvD,UAAU,EAAE,sBAAsB,CAAC,SAAS,CAAC,CAAC;IAC9C,WAAW,EAAE,sBAAsB,CAAC,UAAU,CAAC,CAAC;IAChD,gBAAgB,EAAE,QAAQ,CAAC;IAC3B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB,CAAC;AAmBF,QAAA,MAAM,GAAG;cAAwB,QAAQ;yCAAK,CAAC;AAyrB/C,eAAe,GAAG,CAAC"}

package/dist/types/brain-runner-do.d.ts

@@ -17,8 +17,13 @@ export declare class BrainRunnerDO extends DurableObject<Env> {
     private sql;
     private brainRunId;
     private eventStreamAdapter;
+    private abortController;
     constructor(state: DurableObjectState, env: Env);
     private loadResourcesFromR2;
+    kill(): Promise<{
+        success: boolean;
+        message: string;
+    }>;
     start(brainTitle: string, brainRunId: string, initialData?: Record<string, any>): Promise<void>;
     fetch(request: Request): Promise<Response>;
 }

package/dist/types/brain-runner-do.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"brain-runner-do.d.ts","sourceRoot":"","sources":["../../src/brain-runner-do.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAkB,MAAM,kBAAkB,CAAC;AAC/D,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAInD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AACjD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AACnD,OAAO,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAC;AAGnD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,2BAA2B,CAAC;AAG1D,wBAAgB,WAAW,CAAC,iBAAiB,EAAE,kBAAkB,QAEhE;AAED,wBAAgB,WAAW,IAAI,kBAAkB,GAAG,IAAI,CAEvD;AAGD,wBAAgB,cAAc,CAAC,MAAM,EAAE,WAAW,QAEjD;AAED,MAAM,WAAW,GAAG;IAClB,eAAe,EAAE,sBAAsB,CAAC;IACxC,UAAU,EAAE,sBAAsB,CAAC,SAAS,CAAC,CAAC;IAC9C,WAAW,EAAE,sBAAsB,CAAC,UAAU,CAAC,CAAC;IAChD,gBAAgB,EAAE,QAAQ,CAAC;CAC5B;AAwDD,qBAAa,aAAc,SAAQ,aAAa,CAAC,GAAG,CAAC;IACnD,OAAO,CAAC,GAAG,CAAa;IACxB,OAAO,CAAC,UAAU,CAAS;IAC3B,OAAO,CAAC,kBAAkB,CAA4B;gBAE1C,KAAK,EAAE,kBAAkB,EAAE,GAAG,EAAE,GAAG;YAOjC,mBAAmB;IA0E3B,KAAK,CACT,UAAU,EAAE,MAAM,EAClB,UAAU,EAAE,MAAM,EAClB,WAAW,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC;IAgE7B,KAAK,CAAC,OAAO,EAAE,OAAO;CA4E7B"}
+{"version":3,"file":"brain-runner-do.d.ts","sourceRoot":"","sources":["../../src/brain-runner-do.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAkB,MAAM,kBAAkB,CAAC;AAC/D,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAInD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AACjD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AACnD,OAAO,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAC;AAGnD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,2BAA2B,CAAC;AAG1D,wBAAgB,WAAW,CAAC,iBAAiB,EAAE,kBAAkB,QAEhE;AAED,wBAAgB,WAAW,IAAI,kBAAkB,GAAG,IAAI,CAEvD;AAGD,wBAAgB,cAAc,CAAC,MAAM,EAAE,WAAW,QAEjD;AAED,MAAM,WAAW,GAAG;IAClB,eAAe,EAAE,sBAAsB,CAAC;IACxC,UAAU,EAAE,sBAAsB,CAAC,SAAS,CAAC,CAAC;IAC9C,WAAW,EAAE,sBAAsB,CAAC,UAAU,CAAC,CAAC;IAChD,gBAAgB,EAAE,QAAQ,CAAC;CAC5B;AAwDD,qBAAa,aAAc,SAAQ,aAAa,CAAC,GAAG,CAAC;IACnD,OAAO,CAAC,GAAG,CAAa;IACxB,OAAO,CAAC,UAAU,CAAS;IAC3B,OAAO,CAAC,kBAAkB,CAA4B;IACtD,OAAO,CAAC,eAAe,CAAgC;gBAE3C,KAAK,EAAE,kBAAkB,EAAE,GAAG,EAAE,GAAG;YAOjC,mBAAmB;IA0E3B,IAAI,IAAI,OAAO,CAAC;QAAE,OAAO,EAAE,OAAO,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE,CAAC;IAStD,KAAK,CACT,UAAU,EAAE,MAAM,EAClB,UAAU,EAAE,MAAM,EAClB,WAAW,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC;IAmF7B,KAAK,CAAC,OAAO,EAAE,OAAO;CA4E7B"}

package/dist/types/monitor-do.d.ts

@@ -9,7 +9,7 @@ export declare class MonitorDO extends DurableObject<Env> {
     handleBrainEvent(event: BrainEvent<any>): void;
     private broadcastRunningBrains;
     fetch(request: Request): Promise<Response>;
-    getLastEvent(brainRunId: string): Record<string, SqlStorageValue>;
+    getLastEvent(brainRunId: string): Record<string, SqlStorageValue> | null;
     history(brainTitle: string, limit?: number): Record<string, SqlStorageValue>[];
     activeRuns(brainTitle: string): Record<string, SqlStorageValue>[];
 }

package/dist/types/monitor-do.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"monitor-do.d.ts","sourceRoot":"","sources":["../../src/monitor-do.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAEnD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAEnD,MAAM,WAAW,GAAG;CAEnB;AAED,qBAAa,SAAU,SAAQ,aAAa,CAAC,GAAG,CAAC;IAC/C,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAa;IACrC,OAAO,CAAC,kBAAkB,CAA4B;gBAE1C,KAAK,EAAE,kBAAkB,EAAE,GAAG,EAAE,GAAG;IA2B/C,gBAAgB,CAAC,KAAK,EAAE,UAAU,CAAC,GAAG,CAAC;YAiDzB,sBAAsB;IA0B9B,KAAK,CAAC,OAAO,EAAE,OAAO;IA2D5B,YAAY,CAAC,UAAU,EAAE,MAAM;IAY/B,OAAO,CAAC,UAAU,EAAE,MAAM,EAAE,KAAK,GAAE,MAAW;IA6B9C,UAAU,CAAC,UAAU,EAAE,MAAM;CAwB9B"}
+{"version":3,"file":"monitor-do.d.ts","sourceRoot":"","sources":["../../src/monitor-do.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAEnD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAEnD,MAAM,WAAW,GAAG;CAEnB;AAED,qBAAa,SAAU,SAAQ,aAAa,CAAC,GAAG,CAAC;IAC/C,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAa;IACrC,OAAO,CAAC,kBAAkB,CAA4B;gBAE1C,KAAK,EAAE,kBAAkB,EAAE,GAAG,EAAE,GAAG;IA2B/C,gBAAgB,CAAC,KAAK,EAAE,UAAU,CAAC,GAAG,CAAC;YAmDzB,sBAAsB;IA0B9B,KAAK,CAAC,OAAO,EAAE,OAAO;IA2D5B,YAAY,CAAC,UAAU,EAAE,MAAM;IAc/B,OAAO,CAAC,UAAU,EAAE,MAAM,EAAE,KAAK,GAAE,MAAW;IA6B9C,UAAU,CAAC,UAAU,EAAE,MAAM;CAwB9B"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@positronic/cloudflare",
-  "version": "0.0.17",
+  "version": "0.0.19",
   "publishConfig": {
     "access": "public"
   },
@@ -31,9 +31,9 @@
     "clean": "rm -rf tsconfig.tsbuildinfo dist"
   },
   "dependencies": {
-    "@positronic/core": "^0.0.17",
-    "@positronic/spec": "^0.0.17",
-    "@positronic/template-new-project": "^0.0.17",
+    "@positronic/core": "^0.0.19",
+    "@positronic/spec": "^0.0.19",
+    "@positronic/template-new-project": "^0.0.19",
     "aws4fetch": "^1.0.18",
     "caz": "^2.0.0",
     "cron-schedule": "^5.0.4",