@dxos/functions 0.9.1-main.c7dcc2e112 → 0.9.1-staging.ee54ba693a

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/functions",
-  "version": "0.9.1-main.c7dcc2e112",
+  "version": "0.9.1-staging.ee54ba693a",
   "description": "Functions API.",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -28,22 +28,22 @@
   "dependencies": {
     "@effect-atom/atom": "^0.5.3",
     "@effect/ai-anthropic": "0.26.0",
-    "@effect/platform": "0.96.1",
-    "effect": "3.21.3",
-    "@dxos/ai": "0.9.1-main.c7dcc2e112",
-    "@dxos/compute": "0.9.1-main.c7dcc2e112",
-    "@dxos/echo": "0.9.1-main.c7dcc2e112",
-    "@dxos/echo-client": "0.9.1-main.c7dcc2e112",
-    "@dxos/effect": "0.9.1-main.c7dcc2e112",
-    "@dxos/errors": "0.9.1-main.c7dcc2e112",
-    "@dxos/invariant": "0.9.1-main.c7dcc2e112",
-    "@dxos/keys": "0.9.1-main.c7dcc2e112",
-    "@dxos/context": "0.9.1-main.c7dcc2e112",
-    "@dxos/log": "0.9.1-main.c7dcc2e112",
-    "@dxos/node-std": "0.9.1-main.c7dcc2e112",
-    "@dxos/protocols": "0.9.1-main.c7dcc2e112",
-    "@dxos/schema": "0.9.1-main.c7dcc2e112",
-    "@dxos/types": "0.9.1-main.c7dcc2e112"
+    "@effect/platform": "0.96.2",
+    "effect": "3.21.4",
+    "@dxos/ai": "0.9.1-staging.ee54ba693a",
+    "@dxos/context": "0.9.1-staging.ee54ba693a",
+    "@dxos/compute": "0.9.1-staging.ee54ba693a",
+    "@dxos/echo": "0.9.1-staging.ee54ba693a",
+    "@dxos/echo-client": "0.9.1-staging.ee54ba693a",
+    "@dxos/effect": "0.9.1-staging.ee54ba693a",
+    "@dxos/errors": "0.9.1-staging.ee54ba693a",
+    "@dxos/keys": "0.9.1-staging.ee54ba693a",
+    "@dxos/node-std": "0.9.1-staging.ee54ba693a",
+    "@dxos/log": "0.9.1-staging.ee54ba693a",
+    "@dxos/protocols": "0.9.1-staging.ee54ba693a",
+    "@dxos/schema": "0.9.1-staging.ee54ba693a",
+    "@dxos/types": "0.9.1-staging.ee54ba693a",
+    "@dxos/invariant": "0.9.1-staging.ee54ba693a"
   },
   "publishConfig": {
     "access": "public"

package/src/protocol/protocol.ts

@@ -19,8 +19,8 @@ import {
   Trace,
 } from '@dxos/compute';
 import { LifecycleState, Resource } from '@dxos/context';
-import { Database, Feed, JsonSchema, Ref, Registry, type Type } from '@dxos/echo';
-import { createFeedServiceLayer, EchoClient, type DatabaseImpl, makeRegistry } from '@dxos/echo-client';
+import { Database, JsonSchema, Ref, Registry, type Type } from '@dxos/echo';
+import { type DatabaseImpl, EchoClient, makeRegistry } from '@dxos/echo-client';
 import { refFromEncodedReference } from '@dxos/echo/internal';
 import { EffectEx } from '@dxos/effect';
 import { assertState, failedInvariant, invariant } from '@dxos/invariant';
@@ -29,7 +29,7 @@ import { log } from '@dxos/log';
 import { EdgeFunctionEnv, ErrorCodec, type FunctionProtocol, type TraceProtocol } from '@dxos/protocols';
 
 import { type FunctionServices } from '../sdk';
-import { configuredCredentialsLayer, credentialsLayerFromDatabase, FunctionInvocationService } from '../services';
+import { FunctionInvocationService, configuredCredentialsLayer, credentialsLayerFromDatabase } from '../services';
 import { FunctionsAiHttpClient } from './functions-ai-http-client';
 
 export interface FunctionWrappingOptions {
@@ -68,7 +68,7 @@ export const wrapFunctionHandler = (
     },
     handler: async ({ data, context }) => {
       if (
-        (serviceTags.includes(Database.Service.key) || serviceTags.includes(Feed.FeedService.key)) &&
+        serviceTags.includes(Database.Service.key) &&
         (!context.services.dataService || !context.services.queryService)
       ) {
         throw new FunctionError({
@@ -192,7 +192,6 @@ class FunctionContext extends Resource {
     assertState(this._lifecycleState === LifecycleState.OPEN, 'FunctionContext is not open');
 
     const dbLayer = this.db ? Database.layer(this.db) : Database.notAvailable;
-    const feedLayer = this.db ? createFeedServiceLayer(this.db) : Feed.notAvailable;
     const credentials = dbLayer
       ? credentialsLayerFromDatabase({ caching: true }).pipe(Layer.provide(dbLayer))
       : configuredCredentialsLayer([]);
@@ -225,7 +224,6 @@ class FunctionContext extends Resource {
 
     return Layer.mergeAll(
       dbLayer,
-      feedLayer,
       credentials,
       operationServiceLayer,
       aiLayer,
@@ -291,7 +289,7 @@ const makeOperationServiceLayer = (
     const result = await functionsService.invoke(op.meta.deployedId, input, {
       spaceId: options?.spaceId,
       // Forward the conversation DXN so the remote runtime can rebuild conversation-scoped
-      // services (e.g. `AiContext.Service`) needed by operations like `GetContext`.
+      // services (e.g. `HarnessService`) needed by operations like `GetContext`.
       conversation: options?.conversation,
     });
     if (result._kind === 'success') {

package/src/sdk.ts

@@ -4,7 +4,7 @@
 
 import { type AiService } from '@dxos/ai';
 import { type Credential, type Operation, type Trace } from '@dxos/compute';
-import { type Database, type Feed } from '@dxos/echo';
+import { type Database } from '@dxos/echo';
 
 import { type FunctionInvocationService } from './services';
 
@@ -21,7 +21,6 @@ export type FunctionServices =
   | AiService.AiService
   | Credential.CredentialsService
   | Database.Service
-  | Feed.FeedService
   | Trace.TraceService
   // TODO(dmaretskyi): `FunctionInvocationService` is being phased out in favour of `Operation.Service`;
   // it's kept in the union until `functions-runtime/local-function-execution.ts` migrates.

package/src/services/credentials.ts

@@ -89,6 +89,7 @@ export const credentialsLayerFromDatabase = ({ caching = false }: { caching?: bo
           .map((accessToken) => ({
             service: accessToken.source,
             apiKey: accessToken.token,
+            account: accessToken.account,
           }));
 
         if (caching) {