cozy-client 60.30.1 → 60.30.6

package/dist/CozyClient.js

@@ -2025,7 +2025,7 @@ var CozyClient = /*#__PURE__*/function () {
      * Resolves relationships on a document.
      *
      * The original document is kept in the target attribute of
-     * the relationship
+     * the relationship.
      *
      * @param  {import("./types").CozyClientDocument} document - for which relationships must be resolved
      * @param  {Schema} [schemaArg] - The schema describing the relationships
@@ -3126,7 +3126,7 @@ var CozyClient = /*#__PURE__*/function () {
 CozyClient.hooks = CozyClient.hooks || {};
 CozyClient.fetchPolicies = _policies.default; //COZY_CLIENT_VERSION_PACKAGE in replaced by babel. See babel config
 
-CozyClient.version = "60.30.1";
+CozyClient.version = "60.30.6";
 
 _microee.default.mixin(CozyClient);
 

package/dist/models/assistant.js

@@ -7,12 +7,14 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.editAssistant = exports.deleteAssistant = exports.createAssistant = void 0;
 
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+
+var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
+
 var _CozyClient = _interopRequireDefault(require("../CozyClient"));
 
 var _dsl = require("../queries/dsl");
@@ -34,8 +36,53 @@ var ACCOUNT_DOCTYPE = 'io.cozy.accounts';
  * @property {string} baseUrl - Provider's base URL
  * @property {string} [apiKey] - API key for authentication
  * @property {string} providerId - ID of the provider
+ * @property {string} [providerName] - Display name of the provider, used to
+ * name the account. Defaults to the provider id.
+ */
+
+/**
+ * Builds the io.cozy.accounts document backing an assistant.
+ *
+ * `auth` is the only part the stack encrypts, so it holds the API key alone.
+ * The model and base URL are configuration and live in `data`, where they map
+ * onto the stack's `llm_override`. `identifier` points at `accountName` so the
+ * account is labelled after its provider rather than after `auth.login`.
+ *
+ * @param {Assistant} assistantData - Data for the assistant
+ * @param {object} [provider] - Existing provider account to update
+ * @returns {object} The io.cozy.accounts document to save
  */
 
+var buildProviderAccount = function buildProviderAccount(assistantData, provider) {
+  // `login` used to hold the model: dropped so it stops being encrypted with
+  // the API key, and stops outranking `accountName` as the label.
+  var _ref = (provider === null || provider === void 0 ? void 0 : provider.auth) || {},
+      login = _ref.login,
+      password = _ref.password,
+      auth = (0, _objectWithoutProperties2.default)(_ref, ["login", "password"]);
+
+  var _ref2 = (provider === null || provider === void 0 ? void 0 : provider.data) || {},
+      baseUrl = _ref2.baseUrl,
+      data = (0, _objectWithoutProperties2.default)(_ref2, ["baseUrl"]); // No new key means keeping the one the stack holds in `credentials_encrypted`.
+
+
+  var apiKey = assistantData.apiKey || (assistantData.baseUrl ? password : undefined);
+  return _objectSpread(_objectSpread({}, provider), {}, {
+    _type: ACCOUNT_DOCTYPE,
+    account_type: assistantData.providerId,
+    identifier: 'accountName',
+    auth: _objectSpread(_objectSpread({}, auth), {}, {
+      accountName: assistantData.providerName || assistantData.providerId
+    }, apiKey ? {
+      password: apiKey
+    } : {}),
+    data: _objectSpread(_objectSpread({}, data), {}, {
+      model: assistantData.model
+    }, assistantData.baseUrl ? {
+      baseUrl: assistantData.baseUrl
+    } : {})
+  });
+};
 /**
  * Creates a new assistant with the provided data.
  *
@@ -45,8 +92,9 @@ var ACCOUNT_DOCTYPE = 'io.cozy.accounts';
  * @throws {Error} - Throws an error if the creation fails
  */
 
+
 var createAssistant = /*#__PURE__*/function () {
-  var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(client, assistantData) {
+  var _ref3 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(client, assistantData) {
     var createdAccountId, account, response, assistant, _yield$client$save, savedAssistant;
 
     return _regenerator.default.wrap(function _callee$(_context) {
@@ -55,38 +103,21 @@ var createAssistant = /*#__PURE__*/function () {
           case 0:
             createdAccountId = null;
             _context.prev = 1;
-            account = {
-              _type: ACCOUNT_DOCTYPE,
-              auth: {
-                login: assistantData.model
-              },
-              account_type: assistantData.providerId
-            };
-
-            if (assistantData.baseUrl) {
-              account.data = {
-                baseUrl: assistantData.baseUrl
-              };
-            }
-
-            if (assistantData.apiKey) {
-              account.auth.password = assistantData.apiKey;
-            }
-
-            _context.next = 7;
+            account = buildProviderAccount(assistantData);
+            _context.next = 5;
             return client.save(account);
 
-          case 7:
+          case 5:
             response = _context.sent;
 
             if (!(!response.data || !response.data._id)) {
-              _context.next = 10;
+              _context.next = 8;
               break;
             }
 
             throw new Error('Failed to create account for assistant');
 
-          case 10:
+          case 8:
             createdAccountId = response.data._id;
             assistant = {
               _type: ASSISTANT_DOCTYPE,
@@ -105,52 +136,52 @@ var createAssistant = /*#__PURE__*/function () {
                 }
               }
             };
-            _context.next = 14;
+            _context.next = 12;
             return client.save(assistant);
 
-          case 14:
+          case 12:
             _yield$client$save = _context.sent;
             savedAssistant = _yield$client$save.data;
             return _context.abrupt("return", savedAssistant);
 
-          case 19:
-            _context.prev = 19;
+          case 17:
+            _context.prev = 17;
             _context.t0 = _context["catch"](1);
 
             if (!createdAccountId) {
-              _context.next = 30;
+              _context.next = 28;
               break;
             }
 
-            _context.prev = 22;
-            _context.next = 25;
+            _context.prev = 20;
+            _context.next = 23;
             return client.stackClient.collection('io.cozy.accounts').destroy({
               _id: createdAccountId
             });
 
-          case 25:
-            _context.next = 30;
+          case 23:
+            _context.next = 28;
             break;
 
-          case 27:
-            _context.prev = 27;
-            _context.t1 = _context["catch"](22);
+          case 25:
+            _context.prev = 25;
+            _context.t1 = _context["catch"](20);
 
             _logger.default.warn('Failed to cleanup orphaned account:', _context.t1);
 
-          case 30:
+          case 28:
             throw new Error("Failed to create assistant: ".concat(_context.t0.message));
 
-          case 31:
+          case 29:
           case "end":
             return _context.stop();
         }
       }
-    }, _callee, null, [[1, 19], [22, 27]]);
+    }, _callee, null, [[1, 17], [20, 25]]);
   }));
 
   return function createAssistant(_x, _x2) {
-    return _ref.apply(this, arguments);
+    return _ref3.apply(this, arguments);
   };
 }();
 /**
@@ -166,7 +197,7 @@ var createAssistant = /*#__PURE__*/function () {
 exports.createAssistant = createAssistant;
 
 var deleteAssistant = /*#__PURE__*/function () {
-  var _ref2 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2(client, assistantId) {
+  var _ref4 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2(client, assistantId) {
     var _yield$client$query, assistantDoc, included, provider;
 
     return _regenerator.default.wrap(function _callee2$(_context2) {
@@ -213,7 +244,7 @@ var deleteAssistant = /*#__PURE__*/function () {
   }));
 
   return function deleteAssistant(_x3, _x4) {
-    return _ref2.apply(this, arguments);
+    return _ref4.apply(this, arguments);
   };
 }();
 /**
@@ -230,8 +261,8 @@ var deleteAssistant = /*#__PURE__*/function () {
 exports.deleteAssistant = deleteAssistant;
 
 var editAssistant = /*#__PURE__*/function () {
-  var _ref3 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee3(client, assistantId, assistantData) {
-    var _existedAssistant$inc, _existedAssistantData, _existedAssistantData2, _existedAssistantData3, _existedAssistantData4, _existedAssistantData5, existedAssistant, existedAssistantData, provider, account, _account$data, _account$auth, response, assistant;
+  var _ref5 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee3(client, assistantId, assistantData) {
+    var _existedAssistant$inc, _existedAssistantData, _existedAssistantData2, _existedAssistantData3, _existedAssistantData4, _existedAssistantData5, existedAssistant, existedAssistantData, provider, account, response, assistant;
 
     return _regenerator.default.wrap(function _callee3$(_context3) {
       while (1) {
@@ -263,41 +294,21 @@ var editAssistant = /*#__PURE__*/function () {
             throw new Error('Provider account not found for assistant');
 
           case 10:
-            account = _objectSpread(_objectSpread({}, provider), {}, {
-              auth: _objectSpread(_objectSpread({}, provider.auth || {}), {}, {
-                login: assistantData.model
-              }),
-              account_type: assistantData.providerId,
-              data: _objectSpread({}, provider.data || {})
-            });
-
-            if (assistantData.baseUrl) {
-              account.data.baseUrl = assistantData.baseUrl;
-            } else {
-              (_account$data = account.data) === null || _account$data === void 0 ? true : delete _account$data.baseUrl;
-            } // Only update the password if a new API key is explicitly provided
-
-
-            if (assistantData.apiKey) {
-              account.auth.password = assistantData.apiKey;
-            } else if (!assistantData.baseUrl) {
-              (_account$auth = account.auth) === null || _account$auth === void 0 ? true : delete _account$auth.password;
-            }
-
-            _context3.next = 15;
+            account = buildProviderAccount(assistantData, provider);
+            _context3.next = 13;
             return client.save(account);
 
-          case 15:
+          case 13:
             response = _context3.sent;
 
             if (!(!response.data || !response.data._id)) {
-              _context3.next = 18;
+              _context3.next = 16;
               break;
             }
 
             throw new Error('Failed to edit account for assistant');
 
-          case 18:
+          case 16:
             assistant = _objectSpread(_objectSpread({}, existedAssistantData), {}, {
               name: assistantData.name,
               prompt: assistantData.prompt,
@@ -312,28 +323,28 @@ var editAssistant = /*#__PURE__*/function () {
                 }
               }
             });
-            _context3.next = 21;
+            _context3.next = 19;
             return client.save(assistant);
 
-          case 21:
-            _context3.next = 26;
+          case 19:
+            _context3.next = 24;
             break;
 
-          case 23:
-            _context3.prev = 23;
+          case 21:
+            _context3.prev = 21;
             _context3.t0 = _context3["catch"](0);
             throw new Error("Failed to edit assistant: ".concat(_context3.t0.message));
 
-          case 26:
+          case 24:
           case "end":
             return _context3.stop();
         }
       }
-    }, _callee3, null, [[0, 23]]);
+    }, _callee3, null, [[0, 21]]);
   }));
 
   return function editAssistant(_x5, _x6, _x7) {
-    return _ref3.apply(this, arguments);
+    return _ref5.apply(this, arguments);
   };
 }();
 

package/dist/models/assistant.spec.js

@@ -0,0 +1,187 @@
+import { createAssistant, editAssistant } from './assistant'
+
+describe('assistant provider account', () => {
+  const assistantData = {
+    name: 'My agent',
+    prompt: 'Be helpful',
+    model: 'gemini-3-pro',
+    baseUrl: 'https://generativelanguage.googleapis.com/v1beta/openai/v1',
+    providerId: 'google',
+    providerName: 'Google'
+  }
+
+  describe('createAssistant', () => {
+    const buildClient = () => ({
+      save: jest
+        .fn()
+        .mockResolvedValue({ data: { _id: 'account-id', _type: 'whatever' } })
+    })
+
+    it('stores the model as configuration, not as a credential', async () => {
+      const client = buildClient()
+
+      await createAssistant(client, assistantData)
+
+      const account = client.save.mock.calls[0][0]
+      expect(account.data.model).toBe('gemini-3-pro')
+      // A model in `auth` would be duplicated into `credentials_encrypted`.
+      expect(account.auth.login).toBeUndefined()
+    })
+
+    it('keeps the model next to the other llm_override fields', async () => {
+      const client = buildClient()
+
+      await createAssistant(client, { ...assistantData, apiKey: 'sk-1234' })
+
+      const account = client.save.mock.calls[0][0]
+      expect(account.data).toEqual({
+        model: 'gemini-3-pro',
+        baseUrl: 'https://generativelanguage.googleapis.com/v1beta/openai/v1'
+      })
+      expect(account.auth.password).toBe('sk-1234')
+    })
+
+    it('labels the account after the provider', async () => {
+      const client = buildClient()
+
+      await createAssistant(client, assistantData)
+
+      const account = client.save.mock.calls[0][0]
+      expect(account.identifier).toBe('accountName')
+      expect(account.auth.accountName).toBe('Google')
+      // `name` is computed by the stack from `auth[identifier]` on creation
+      expect(account.name).toBeUndefined()
+    })
+
+    it('falls back to the provider id when no display name is given', async () => {
+      const client = buildClient()
+
+      await createAssistant(client, {
+        ...assistantData,
+        providerName: undefined
+      })
+
+      const account = client.save.mock.calls[0][0]
+      expect(account.auth.accountName).toBe('google')
+    })
+  })
+
+  describe('editAssistant', () => {
+    const buildClient = provider => ({
+      query: jest.fn().mockResolvedValue({
+        data: { _id: 'assistant-id', relationships: {} },
+        included: [provider]
+      }),
+      save: jest.fn().mockResolvedValue({ data: { _id: 'account-id' } })
+    })
+
+    it('migrates an account that still holds the model in auth.login', async () => {
+      const client = buildClient({
+        _id: 'account-id',
+        auth: {
+          login: 'gemini-2.5-flash',
+          credentials_encrypted: 'encrypted-blob'
+        }
+      })
+
+      await editAssistant(client, 'assistant-id', assistantData)
+
+      const account = client.save.mock.calls[0][0]
+      expect(account.data.model).toBe('gemini-3-pro')
+      expect(account.auth.login).toBeUndefined()
+      // Left alone: the stack reads the API key from it, never the model.
+      expect(account.auth.credentials_encrypted).toBe('encrypted-blob')
+    })
+
+    it('relabels an account created before the naming fix', async () => {
+      const client = buildClient({
+        _id: 'account-id',
+        auth: { login: 'gemini-2.5-flash' }
+      })
+
+      await editAssistant(client, 'assistant-id', assistantData)
+
+      const account = client.save.mock.calls[0][0]
+      expect(account.identifier).toBe('accountName')
+      expect(account.auth.accountName).toBe('Google')
+    })
+
+    // Pre-existing coupling, pinned because the builder now expresses it once.
+    it('replaces the stored API key when a new one is given', async () => {
+      const client = buildClient({
+        _id: 'account-id',
+        auth: { accountName: 'Google', password: 'sk-old' }
+      })
+
+      await editAssistant(client, 'assistant-id', {
+        ...assistantData,
+        apiKey: 'sk-new'
+      })
+
+      expect(client.save.mock.calls[0][0].auth.password).toBe('sk-new')
+    })
+
+    it('keeps the stored API key when only a baseUrl is given', async () => {
+      const client = buildClient({
+        _id: 'account-id',
+        auth: { accountName: 'Google', password: 'sk-old' }
+      })
+
+      await editAssistant(client, 'assistant-id', {
+        ...assistantData,
+        apiKey: undefined
+      })
+
+      expect(client.save.mock.calls[0][0].auth.password).toBe('sk-old')
+    })
+
+    it('drops the stored API key when neither key nor baseUrl is given', async () => {
+      const client = buildClient({
+        _id: 'account-id',
+        auth: { accountName: 'Google', password: 'sk-old' }
+      })
+
+      await editAssistant(client, 'assistant-id', {
+        ...assistantData,
+        apiKey: undefined,
+        baseUrl: undefined
+      })
+
+      const account = client.save.mock.calls[0][0]
+      expect(account.auth.password).toBeUndefined()
+      expect(account.data.baseUrl).toBeUndefined()
+    })
+
+    it('preserves the fields it does not own', async () => {
+      const client = buildClient({
+        _id: 'account-id',
+        _rev: '3-abc',
+        name: 'Google',
+        cozyMetadata: { createdAt: 'yesterday' },
+        auth: { accountName: 'Google', credentials_encrypted: 'blob' }
+      })
+
+      await editAssistant(client, 'assistant-id', assistantData)
+
+      const account = client.save.mock.calls[0][0]
+      expect(account._rev).toBe('3-abc')
+      expect(account.cozyMetadata).toEqual({ createdAt: 'yesterday' })
+      expect(account.auth.credentials_encrypted).toBe('blob')
+    })
+
+    it('updates the model of an already migrated account', async () => {
+      const client = buildClient({
+        _id: 'account-id',
+        identifier: 'accountName',
+        auth: { accountName: 'Google' },
+        data: { model: 'gemini-2.5-flash', baseUrl: 'https://example.org' }
+      })
+
+      await editAssistant(client, 'assistant-id', assistantData)
+
+      const account = client.save.mock.calls[0][0]
+      expect(account.data.model).toBe('gemini-3-pro')
+      expect(account.data.baseUrl).toBe(assistantData.baseUrl)
+    })
+  })
+})

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cozy-client",
-  "version": "60.30.1",
+  "version": "60.30.6",
   "license": "MIT",
   "main": "dist/index.node.js",
   "browser": "dist/index.js",
@@ -74,5 +74,5 @@
     "react-native-ios11-devicecheck": "^0.0.3"
   },
   "sideEffects": false,
-  "gitHead": "f209689b3951ddbedc83db50a2dcd976082777b3"
+  "gitHead": "88101a3d13943828cd1cfcf39c40535c0a259afa"
 }

package/types/CozyClient.d.ts

@@ -595,7 +595,7 @@ declare class CozyClient {
      * Resolves relationships on a document.
      *
      * The original document is kept in the target attribute of
-     * the relationship
+     * the relationship.
      *
      * @param  {import("./types").CozyClientDocument} document - for which relationships must be resolved
      * @param  {Schema} [schemaArg] - The schema describing the relationships

package/types/models/assistant.d.ts

@@ -30,5 +30,10 @@ export type Assistant = {
      * - ID of the provider
      */
     providerId: string;
+    /**
+     * - Display name of the provider, used to
+     * name the account. Defaults to the provider id.
+     */
+    providerName?: string;
 };
 import CozyClient from "../CozyClient";