ente-cli 0.4.91 → 0.4.92

package/README.md

@@ -545,3 +545,20 @@ Gmail applies native word/operator matching; arbitrary mid-name/address substrin
 and alias expansion are not guaranteed. IMAP applies native address-header
 substring matching with UIDVALIDITY-bound continuation. Neither source proves
 complete historical coverage; retain alternatives and ask on unresolved matches.
+
+### Typed entity fields
+
+Entity contact and business values are typed field values. Use, for example:
+
+```sh
+ente entity create "Jane Doe" --type person --space Personal --field '{"label":"E-Mail","type":"email","value":"jane@example.com"}'
+ente entity update "Jane Doe" --field '{"label":"Job title","type":"job-title","value":"Architect"}'
+ente entity field add "Jane Doe" --label "Mobilnummer" --type phone --value "+49 1512 3456789"
+ente entity field update <valueId> --value "replacement"
+ente entity field remove <valueId>
+```
+
+`--field` repeats JSON objects. Omitted labels stay unchanged; a supplied label
+replaces that field's values; `"value":null` removes them. Entity `--attr` is
+retained only to report the moved-to-fields error. Activity/task/list attributes
+are unchanged. Entity reads expose field/value IDs, labels, types and text.

package/dist/SKILL.md

@@ -161,11 +161,14 @@ ente query "QM system export" [--space <name>] [--entity <name>] [--since <epoch
 
 # Entities
 ente entity list [--query <text>] [--type person|org|project|topic|place|object] [--space <name>] [--limit <count>] [--projection compact|full] [--archived] [--json]
-ente entity create "Jane Doe" --type person [--pin "Acme Corp"] [--share-parents --parent-space-grant-fingerprint <token>] [--alias "JD"] [--attr email=jane@acme.com] [--tag vip] [--description "CTO at Acme"] [--json]
+ente entity create "Jane Doe" --type person [--pin "Acme Corp"] [--share-parents --parent-space-grant-fingerprint <token>] [--alias "JD"] [--field '{"label":"E-Mail","type":"email","value":"jane@acme.com"}'] [--tag vip] [--description "CTO at Acme"] [--json]
 ente entity create "Leistungsphase 1" --type topic --space "Studio" --parent "Building A" --exclusive-parent [--json]
 ente entity duplicate <name-or-id> --space <space> [--name "New project"] [--include-exclusive-children] [--json]
 ente entity get "Jane Doe" [--limit 20] [--hours-back <hours>] [--min-count 5] [--projection compact|full] [--json]
-ente entity update "Jane Doe" [--name "Jane A. Doe"] [--alias-add "Jane"] [--alias-remove "JD"] [--attr role=CEO] [--tag vip] [--description "…"] [--json]
+ente entity update "Jane Doe" [--name "Jane A. Doe"] [--alias-add "Jane"] [--alias-remove "JD"] [--field '{"label":"Job title","type":"job-title","value":"CEO"}'] [--tag vip] [--description "…"] [--json]
+ente entity field add "Jane Doe" --label "Mobilnummer" --type phone --value "+49 1512 3456789" [--json]
+ente entity field update <valueId> --value "new text" [--json]
+ente entity field remove <valueId> [--json]
 ente entity rename "Lorey Georg" "Georg Lorey"        # change display name
 ente entity pin "Jane Doe" "Acme Corp" [--role "student"] [--share-parents --parent-space-grant-fingerprint <token>] [--json]
 ente entity unpin "Jane Doe" "Acme Corp" [--json]
@@ -744,3 +747,9 @@ Gmail uses native word/operator matching, without guaranteed arbitrary substring
 or alias expansion. IMAP uses native address-header substring search and checks
 UIDVALIDITY on continuation. Never claim complete historical coverage or send
 from a recipient lookup; disclose choices and ask on unresolved alternatives.
+
+Entity values use typed `fields`; entity `--attr` and attribute payloads are legacy errors.
+`entity update --field` merges only supplied labels. Repeat JSON objects to store
+several values under one label; use `"value":null` to remove that label's values.
+A field ID selects an existing definition; a new label is owned by the acting
+space. Activity, task and list `--attr` options keep their existing behavior.

package/dist/cli.mjs

@@ -3800,7 +3800,7 @@ async function runCli(cli2, argv, context) {
 }
 
 // ente/version.ts
-var VERSION = "0.4.91";
+var VERSION = "0.4.92";
 
 // ente/branding.ts
 var NPM_REGISTRY = "https://registry.npmjs.org";
@@ -29755,16 +29755,45 @@ function isSourceCreatedAtInput(value) {
   return true;
 }
 
+// ../packages/shared/src/attribute-names.ts
+var STORABLE_ATTRIBUTE_KEY = /^[\x20-\x23\x25-\x7E][\x20-\x7E]{0,1023}$/;
+var ENCODED_PREFIX = "~";
+var MAX_STORAGE_KEY_LENGTH = 1024;
+var CONTROL_CHARACTER = /[\u0000-\u001F\u007F-\u009F]/;
+function isStorableAttributeKey(key) {
+  return STORABLE_ATTRIBUTE_KEY.test(key);
+}
+function needsEncoding(name3) {
+  return !isStorableAttributeKey(name3) || name3.startsWith(ENCODED_PREFIX);
+}
+function escapeCharacter(character) {
+  if (character === "%") return "%25";
+  if (character === "~") return "%7e";
+  const code3 = character.codePointAt(0);
+  if (code3 >= 32 && code3 <= 126) return character;
+  return encodeURIComponent(character).toLowerCase();
+}
+function attributeStorageKey(name3) {
+  if (name3.length === 0 || CONTROL_CHARACTER.test(name3)) return void 0;
+  if (!needsEncoding(name3)) return name3;
+  let key = ENCODED_PREFIX;
+  try {
+    for (const character of name3) key += escapeCharacter(character);
+  } catch {
+    return void 0;
+  }
+  return key.length <= MAX_STORAGE_KEY_LENGTH ? key : void 0;
+}
+
 // ../packages/shared/src/attribute-keys.ts
-var ATTRIBUTE_KEY_PATTERN = /^[\x20-\x23\x25-\x7E][\x20-\x7E]{0,1023}$/;
+var ATTRIBUTE_KEY_PATTERN = STORABLE_ATTRIBUTE_KEY;
 var ATTRIBUTE_KEY_RULE = "Attribute keys must use 1-1024 printable ASCII characters and must not start with $";
 var SHOWN_KEY_CHARACTERS = 64;
-function isStorableAttributeKey(key) {
-  return ATTRIBUTE_KEY_PATTERN.test(key);
+function shownKey(key) {
+  return key.length > SHOWN_KEY_CHARACTERS ? `${key.slice(0, SHOWN_KEY_CHARACTERS)}\u2026` : key;
 }
 function attributeKeyError(key) {
-  const shown = key.length > SHOWN_KEY_CHARACTERS ? `${key.slice(0, SHOWN_KEY_CHARACTERS)}\u2026` : key;
-  return `${ATTRIBUTE_KEY_RULE}: ${JSON.stringify(shown)}`;
+  return `${ATTRIBUTE_KEY_RULE}: ${JSON.stringify(shownKey(key))}`;
 }
 function addedAttributeKeys(patch) {
   return Object.entries(patch).filter(([, value]) => value !== null).map(([key]) => key);
@@ -29776,6 +29805,11 @@ var ATTRIBUTE_STRING_PATCH_JSON_SCHEMA = {
   patternProperties: { [ATTRIBUTE_KEY_PATTERN.source]: NULLABLE_STRING_JSON_SCHEMA },
   additionalProperties: { type: "null" }
 };
+var ENTITY_ATTRIBUTE_NAME_RULE = "Entity attribute names must be nonempty, contain no control characters and encode to at most 1024 characters";
+var ENTITY_ATTRIBUTE_NAME_JSON_SCHEMA = { type: "string", minLength: 1, maxLength: 1024, pattern: "^[^\\u0000-\\u001F\\u007F-\\u009F]+$" };
+var entityAttributeName = external_exports.string().refine((name3) => attributeStorageKey(name3) !== void 0, {
+  error: (issue2) => `${ENTITY_ATTRIBUTE_NAME_RULE}: ${JSON.stringify(shownKey(String(issue2.input)))}`
+}).meta(ENTITY_ATTRIBUTE_NAME_JSON_SCHEMA);
 var attributeKey = external_exports.string().regex(ATTRIBUTE_KEY_PATTERN, { error: (issue2) => attributeKeyError(String(issue2.input)) });
 var attributeStringPatch = external_exports.record(external_exports.string(), external_exports.string().nullable()).superRefine((patch, ctx) => {
   for (const key of addedAttributeKeys(patch))
@@ -31180,7 +31214,7 @@ function parseOperationInput(operation, schema, raw) {
   return parsed.data;
 }
 function attributeKeyDetail(issues) {
-  return issues.flatMap((issue2) => issue2.code === "invalid_key" ? issue2.issues : [issue2]).find((issue2) => issue2.message.startsWith(ATTRIBUTE_KEY_RULE))?.message;
+  return issues.flatMap((issue2) => issue2.code === "invalid_key" ? issue2.issues : [issue2]).find((issue2) => issue2.message.startsWith(ATTRIBUTE_KEY_RULE) || issue2.message.startsWith(ENTITY_ATTRIBUTE_NAME_RULE))?.message;
 }
 function parseOperationNumberParameter(operation, field, raw) {
   if (!/^-?(0|[1-9]\d*)(\.\d+)?([eE][+-]?\d+)?$/.test(raw) || !Number.isFinite(Number(raw)))
@@ -32843,6 +32877,34 @@ function parseAgentIconInput(raw) {
   return { icon: input2.icon };
 }
 
+// ../packages/shared/src/entity-emails.ts
+var EMAIL_LABELS = "work|private|personal|home|business|office";
+var ENTITY_EMAIL_KEY_RE = new RegExp(
+  `^(?:e[-_ ]?mails?(?:[-_ ]?address(?:es)?)?(?:[-_ ]?\\d{1,2})?|(?:${EMAIL_LABELS})[-_ ]e[-_ ]?mail|e[-_ ]?mail[-_ ](?:${EMAIL_LABELS}))$`,
+  "i"
+);
+
+// ../packages/shared/src/unicode-case-fold.ts
+var exceptions = { "\xB5": "\u03BC", "\xDF": "ss", "\u0149": "\u02BCn", "\u017F": "s", "\u01F0": "j\u030C", "\u0345": "\u03B9", "\u0390": "\u03B9\u0308\u0301", "\u03B0": "\u03C5\u0308\u0301", "\u03C2": "\u03C3", "\u03D0": "\u03B2", "\u03D1": "\u03B8", "\u03D5": "\u03C6", "\u03D6": "\u03C0", "\u03F0": "\u03BA", "\u03F1": "\u03C1", "\u03F5": "\u03B5", "\u0587": "\u0565\u0582", "\u13F8": "\u13F0", "\u13F9": "\u13F1", "\u13FA": "\u13F2", "\u13FB": "\u13F3", "\u13FC": "\u13F4", "\u13FD": "\u13F5", "\u1C80": "\u0432", "\u1C81": "\u0434", "\u1C82": "\u043E", "\u1C83": "\u0441", "\u1C84": "\u0442", "\u1C85": "\u0442", "\u1C86": "\u044A", "\u1C87": "\u0463", "\u1C88": "\uA64B", "\u1E96": "h\u0331", "\u1E97": "t\u0308", "\u1E98": "w\u030A", "\u1E99": "y\u030A", "\u1E9A": "a\u02BE", "\u1E9B": "\u1E61", "\u1F50": "\u03C5\u0313", "\u1F52": "\u03C5\u0313\u0300", "\u1F54": "\u03C5\u0313\u0301", "\u1F56": "\u03C5\u0313\u0342", "\u1F80": "\u1F00\u03B9", "\u1F81": "\u1F01\u03B9", "\u1F82": "\u1F02\u03B9", "\u1F83": "\u1F03\u03B9", "\u1F84": "\u1F04\u03B9", "\u1F85": "\u1F05\u03B9", "\u1F86": "\u1F06\u03B9", "\u1F87": "\u1F07\u03B9", "\u1F90": "\u1F20\u03B9", "\u1F91": "\u1F21\u03B9", "\u1F92": "\u1F22\u03B9", "\u1F93": "\u1F23\u03B9", "\u1F94": "\u1F24\u03B9", "\u1F95": "\u1F25\u03B9", "\u1F96": "\u1F26\u03B9", "\u1F97": "\u1F27\u03B9", "\u1FA0": "\u1F60\u03B9", "\u1FA1": "\u1F61\u03B9", "\u1FA2": "\u1F62\u03B9", "\u1FA3": "\u1F63\u03B9", "\u1FA4": "\u1F64\u03B9", "\u1FA5": "\u1F65\u03B9", "\u1FA6": "\u1F66\u03B9", "\u1FA7": "\u1F67\u03B9", "\u1FB2": "\u1F70\u03B9", "\u1FB3": "\u03B1\u03B9", "\u1FB4": "\u03AC\u03B9", "\u1FB6": "\u03B1\u0342", "\u1FB7": "\u03B1\u0342\u03B9", "\u1FBE": "\u03B9", "\u1FC2": "\u1F74\u03B9", "\u1FC3": "\u03B7\u03B9", "\u1FC4": "\u03AE\u03B9", "\u1FC6": "\u03B7\u0342", "\u1FC7": "\u03B7\u0342\u03B9", "\u1FD2": "\u03B9\u0308\u0300", "\u1FD3": "\u03B9\u0308\u0301", "\u1FD6": "\u03B9\u0342", "\u1FD7": "\u03B9\u0308\u0342", "\u1FE2": "\u03C5\u0308\u0300", "\u1FE3": "\u03C5\u0308\u0301", "\u1FE4": "\u03C1\u0313", "\u1FE6": "\u03C5\u0342", "\u1FE7": "\u03C5\u0308\u0342", "\u1FF2": "\u1F7C\u03B9", "\u1FF3": "\u03C9\u03B9", "\u1FF4": "\u03CE\u03B9", "\u1FF6": "\u03C9\u0342", "\u1FF7": "\u03C9\u0342\u03B9", "\uAB70": "\u13A0", "\uAB71": "\u13A1", "\uAB72": "\u13A2", "\uAB73": "\u13A3", "\uAB74": "\u13A4", "\uAB75": "\u13A5", "\uAB76": "\u13A6", "\uAB77": "\u13A7", "\uAB78": "\u13A8", "\uAB79": "\u13A9", "\uAB7A": "\u13AA", "\uAB7B": "\u13AB", "\uAB7C": "\u13AC", "\uAB7D": "\u13AD", "\uAB7E": "\u13AE", "\uAB7F": "\u13AF", "\uAB80": "\u13B0", "\uAB81": "\u13B1", "\uAB82": "\u13B2", "\uAB83": "\u13B3", "\uAB84": "\u13B4", "\uAB85": "\u13B5", "\uAB86": "\u13B6", "\uAB87": "\u13B7", "\uAB88": "\u13B8", "\uAB89": "\u13B9", "\uAB8A": "\u13BA", "\uAB8B": "\u13BB", "\uAB8C": "\u13BC", "\uAB8D": "\u13BD", "\uAB8E": "\u13BE", "\uAB8F": "\u13BF", "\uAB90": "\u13C0", "\uAB91": "\u13C1", "\uAB92": "\u13C2", "\uAB93": "\u13C3", "\uAB94": "\u13C4", "\uAB95": "\u13C5", "\uAB96": "\u13C6", "\uAB97": "\u13C7", "\uAB98": "\u13C8", "\uAB99": "\u13C9", "\uAB9A": "\u13CA", "\uAB9B": "\u13CB", "\uAB9C": "\u13CC", "\uAB9D": "\u13CD", "\uAB9E": "\u13CE", "\uAB9F": "\u13CF", "\uABA0": "\u13D0", "\uABA1": "\u13D1", "\uABA2": "\u13D2", "\uABA3": "\u13D3", "\uABA4": "\u13D4", "\uABA5": "\u13D5", "\uABA6": "\u13D6", "\uABA7": "\u13D7", "\uABA8": "\u13D8", "\uABA9": "\u13D9", "\uABAA": "\u13DA", "\uABAB": "\u13DB", "\uABAC": "\u13DC", "\uABAD": "\u13DD", "\uABAE": "\u13DE", "\uABAF": "\u13DF", "\uABB0": "\u13E0", "\uABB1": "\u13E1", "\uABB2": "\u13E2", "\uABB3": "\u13E3", "\uABB4": "\u13E4", "\uABB5": "\u13E5", "\uABB6": "\u13E6", "\uABB7": "\u13E7", "\uABB8": "\u13E8", "\uABB9": "\u13E9", "\uABBA": "\u13EA", "\uABBB": "\u13EB", "\uABBC": "\u13EC", "\uABBD": "\u13ED", "\uABBE": "\u13EE", "\uABBF": "\u13EF", "\uFB00": "ff", "\uFB01": "fi", "\uFB02": "fl", "\uFB03": "ffi", "\uFB04": "ffl", "\uFB05": "st", "\uFB06": "st", "\uFB13": "\u0574\u0576", "\uFB14": "\u0574\u0565", "\uFB15": "\u0574\u056B", "\uFB16": "\u057E\u0576", "\uFB17": "\u0574\u056D" };
+function unicodeCaseFold(value) {
+  return Array.from(value.toLowerCase(), (char) => exceptions[char] ?? char).join("");
+}
+
+// ../packages/shared/src/entity-fields.ts
+var FIELD_TYPE_VALUES = ["text", "email", "phone", "url", "postal-address", "date", "salutation", "job-title", "json"];
+var fieldTypeValidator = v2.union(...FIELD_TYPE_VALUES.map((type) => v2.literal(type)));
+var fieldTypeSchema = external_exports.enum(FIELD_TYPE_VALUES);
+var MAX_ENTITY_FIELD_VALUES = 1e3;
+var MAX_FIELD_VALUE_BYTES = 16 * 1024;
+var MAX_FIELD_LABEL_CHARACTERS = 100;
+var LEGACY_ENTITY_ATTRIBUTES_ERROR = "Legacy entity attributes moved to fields. Update your client: use addFieldValue, updateFieldValue, removeFieldValue, or createEntity/updateEntity with fields.";
+function fieldLabelKey(label) {
+  return unicodeCaseFold(label.normalize("NFKC")).replace(/[\s\p{Pd}_.]+/gu, "");
+}
+var fieldLabelSchema = external_exports.string().trim().refine((value) => [...value].length >= 1 && [...value].length <= MAX_FIELD_LABEL_CHARACTERS && !!fieldLabelKey(value), "Field labels must contain 1\u2013100 characters and more than separators");
+var fieldInputSchema = external_exports.strictObject({ label: fieldLabelSchema, type: fieldTypeSchema.optional(), value: external_exports.string().nullable() });
+var externalFieldValueSchema = external_exports.strictObject({ valueId: external_exports.string(), fieldId: external_exports.string(), label: external_exports.string(), type: fieldTypeSchema, value: external_exports.string() });
+
 // ../packages/shared/src/read-result-dtos.ts
 var id7 = external_exports.string().min(1);
 var icon = external_exports.enum([.../* @__PURE__ */ new Set([...entityCustomIconIds, ...activityCustomIconIds, ...legacyCustomIconIds])]);
@@ -32858,7 +32920,11 @@ var entityReadFields = {
   customIconColor: external_exports.enum(customIconColorIds).optional(),
   exclusiveParent: external_exports.boolean().optional(),
   descriptionPlainText: external_exports.string().optional(),
+  fields: external_exports.array(externalFieldValueSchema).optional(),
   attributes: external_exports.record(external_exports.string(), external_exports.json()).optional(),
+  attributeEncodedKeys: external_exports.array(external_exports.string()).optional(),
+  attributeLabels: external_exports.record(external_exports.string(), external_exports.string()).optional(),
+  entityFieldsPhase: external_exports.enum(["legacy", "planning", "bridge"]).optional(),
   tags: external_exports.array(external_exports.string()).optional(),
   aliases: external_exports.array(external_exports.string()).optional(),
   createdBy: id7,
@@ -32867,7 +32933,18 @@ var entityReadFields = {
   archived: external_exports.boolean(),
   deletedAt: external_exports.number().optional()
 };
-var publicEntityReadDto = external_exports.strictObject(entityReadFields);
+function withEntityReadPhase(schema) {
+  return schema.superRefine((raw, ctx) => {
+    const value = raw;
+    const transitional = value.entityFieldsPhase !== void 0;
+    if (transitional ? value.attributes === void 0 || value.fields !== void 0 : value.fields === void 0 || value.attributes !== void 0)
+      ctx.addIssue({ code: "custom", message: "Entity read shape does not match its migration phase" });
+  }).meta({ anyOf: [
+    { type: "object", required: ["fields"], properties: { fields: { type: "array" }, attributes: { not: {} }, entityFieldsPhase: { not: {} } }, additionalProperties: true },
+    { type: "object", required: ["attributes", "entityFieldsPhase"], properties: { attributes: { type: "object" }, entityFieldsPhase: { type: "string", enum: ["legacy", "planning", "bridge"] }, fields: { not: {} } }, additionalProperties: true }
+  ] });
+}
+var publicEntityReadDto = withEntityReadPhase(external_exports.strictObject(entityReadFields));
 var activityReadFields = {
   _id: id7,
   title: external_exports.string().optional(),
@@ -32890,13 +32967,13 @@ var activityReadFields = {
   attachments: external_exports.array(external_exports.strictObject({ storageId: id7, name: external_exports.string(), mimeType: external_exports.string(), sizeBytes: external_exports.number().optional() })).optional()
 };
 var publicActivityReadDto = external_exports.strictObject(activityReadFields);
-var selectPublicEntityRead = external_exports.object(entityReadFields);
+var selectPublicEntityRead = withEntityReadPhase(external_exports.object(entityReadFields));
 var selectPublicActivityRead = external_exports.object(activityReadFields);
 
 // ../packages/shared/src/entity-read-operation-results.ts
 var id8 = external_exports.string().min(1);
 var entityReadDocument = publicEntityReadDto;
-var entityReadRichDocument = publicEntityReadDto.extend({ displayName: external_exports.string(), parentNames: external_exports.array(external_exports.string()), parentDetails: external_exports.array(readParentDetail) });
+var entityReadRichDocument = withEntityReadPhase(external_exports.strictObject({ ...publicEntityReadDto.shape, displayName: external_exports.string(), parentNames: external_exports.array(external_exports.string()), parentDetails: external_exports.array(readParentDetail) }));
 var entityReadActivity = publicActivityReadDto;
 var parentDetail = readParentDetail;
 var space = external_exports.strictObject({ spaceId: id8, spaceName: external_exports.string(), memberEmails: external_exports.array(external_exports.string()), scope: external_exports.string().optional() });
@@ -32910,10 +32987,10 @@ var entityReadFullSearch = external_exports.strictObject({ entities: external_ex
 var entityReadFullDetail = external_exports.strictObject({ entity: entityReadRichDocument, pins: external_exports.array(pin), children: external_exports.array(child), childrenTruncated: external_exports.boolean(), aggregationMode: external_exports.enum(["includeDirectChildren", "directOnly"]), activities: external_exports.array(entityReadActivity), openTasks: external_exports.array(task), spaces: external_exports.array(space), descriptionPlainText: external_exports.string().optional() }).nullable();
 var selectSpace = external_exports.object(space.shape);
 var selectList = external_exports.object({ ...entityReadFullList.shape, entities: external_exports.array(external_exports.object({ entity: selectPublicEntityRead, ...matchFields })), spaces: external_exports.record(external_exports.string(), selectSpace) });
-var selectRichEntity = selectPublicEntityRead.extend({ displayName: external_exports.string(), parentNames: external_exports.array(external_exports.string()), parentDetails: external_exports.array(readParentDetail) });
+var selectRichEntity = withEntityReadPhase(external_exports.object({ ...selectPublicEntityRead.shape, displayName: external_exports.string(), parentNames: external_exports.array(external_exports.string()), parentDetails: external_exports.array(readParentDetail) }));
 var selectSearch = external_exports.object({ ...entityReadFullSearch.shape, entities: external_exports.array(external_exports.object({ entity: selectRichEntity, ...matchFields, pins: external_exports.array(pin), matchedViaParent: external_exports.strictObject({ entityId: id8, name: external_exports.string() }).optional() })), spaces: external_exports.record(external_exports.string(), selectSpace) });
 var selectDetail = external_exports.object({ ...entityReadFullDetail.unwrap().shape, entity: selectRichEntity, activities: external_exports.array(selectPublicActivityRead), spaces: external_exports.array(selectSpace) }).nullable();
-var compactEntity = entityReadRichDocument.pick({ _id: true, name: true, displayName: true, parentNames: true, parentDetails: true, type: true, descriptionPlainText: true, tags: true, aliases: true, lastActivityAt: true }).partial({ displayName: true, parentNames: true, parentDetails: true });
+var compactEntity = withEntityReadPhase(external_exports.strictObject(entityReadRichDocument.shape).pick({ _id: true, name: true, displayName: true, parentNames: true, parentDetails: true, type: true, descriptionPlainText: true, tags: true, aliases: true, lastActivityAt: true, fields: true, attributes: true, entityFieldsPhase: true }).partial({ displayName: true, parentNames: true, parentDetails: true }));
 var compactActivity = entityReadActivity.pick({ _id: true, shortId: true, title: true, type: true, contentPlainText: true, deadline: true, completed: true, tags: true, createdAt: true, updatedAt: true, spaceId: true });
 var compactList = entityReadFullList.extend({ entities: external_exports.array(external_exports.strictObject({ entity: compactEntity, ...matchFields })), spaces: external_exports.record(external_exports.string(), compactSpace) });
 var compactSearch = entityReadFullSearch.extend({ entities: external_exports.array(external_exports.strictObject({ entity: compactEntity, ...matchFields, pins: external_exports.array(pin), matchedViaParent: external_exports.strictObject({ entityId: id8, name: external_exports.string() }).optional() })), spaces: external_exports.record(external_exports.string(), compactSpace) });
@@ -32960,7 +33037,8 @@ var ENTITY_CREATE_INPUT_SCHEMA = {
     spaceId: { type: "string", minLength: 1 },
     description: { type: "string" },
     tags: { type: "array", items: { type: "string" } },
-    attributes: { type: "object", propertyNames: ATTRIBUTE_KEY_JSON_SCHEMA },
+    fields: { type: "array", maxItems: MAX_ENTITY_FIELD_VALUES, items: { type: "object", properties: { label: { type: "string" }, type: { type: "string", enum: FIELD_TYPE_VALUES }, value: { anyOf: [{ type: "string" }, { type: "null" }] } }, required: ["label", "value"], additionalProperties: false } },
+    attributes: { description: LEGACY_ENTITY_ATTRIBUTES_ERROR },
     aliases: { type: "array", items: { type: "string" } },
     ...ENTITY_PARENT_INPUT_PROPERTIES
   },
@@ -32972,6 +33050,7 @@ function isEntityType(value) {
 }
 var invalid = (message2) => ({ ok: false, message: message2 });
 function parseEntityCreateInput(args, name3 = "entities_create") {
+  if (Object.hasOwn(args, "attributes")) return invalid(LEGACY_ENTITY_ATTRIBUTES_ERROR);
   if (args.parentEntityId !== void 0 && (typeof args.parentEntityId !== "string" || !args.parentEntityId.trim()))
     return invalid("parentEntityId must be a non-empty string");
   if (args.exclusiveParent !== void 0 && typeof args.exclusiveParent !== "boolean") return invalid("exclusiveParent must be a boolean");
@@ -32980,7 +33059,9 @@ function parseEntityCreateInput(args, name3 = "entities_create") {
   if (args.type !== void 0 && !isEntityType(args.type)) return invalid(`${name3} type must be one of: ${ENTITY_TYPE_VALUES.join(", ")}`);
   const tags = optionalStringArray(args.tags), aliases = optionalStringArray(args.aliases);
   const description = typeof args.description === "string" ? args.description : void 0;
-  const attributes2 = isInputRecord(args.attributes) ? args.attributes : void 0;
+  const fieldResult = fieldInputSchema.array().safeParse(args.fields);
+  if (args.fields !== void 0 && !fieldResult.success) return invalid("fields must contain label, optional type, and value");
+  const fields3 = fieldResult.success ? fieldResult.data : void 0;
   const spaceIds = optionalStringArray(args.spaceIds);
   return { ok: true, value: {
     name: args.name.trim(),
@@ -32989,21 +33070,24 @@ function parseEntityCreateInput(args, name3 = "entities_create") {
     ...isEntityType(args.type) ? { type: args.type } : {},
     ...description !== void 0 ? { description } : {},
     ...tags ? { tags } : {},
-    ...attributes2 ? { attributes: attributes2 } : {},
+    ...fields3 ? { fields: fields3 } : {},
     ...aliases ? { aliases } : {},
     ...typeof args.spaceId === "string" && args.spaceId ? { spaceId: args.spaceId } : {},
     ...spaceIds?.length ? { spaceIds } : {}
   } };
 }
 function parseEntityUpdateInput(args, name3 = "entities_update") {
+  if (Object.hasOwn(args, "attributes")) return invalid(LEGACY_ENTITY_ATTRIBUTES_ERROR);
   if (typeof args.entityId !== "string") return invalid(`${name3} requires string entityId`);
   const tags = optionalStringArray(args.tags), aliases = optionalStringArray(args.aliases);
-  const attributes2 = isInputRecord(args.attributes) ? args.attributes : void 0;
+  const fieldResult = fieldInputSchema.array().safeParse(args.fields);
+  if (args.fields !== void 0 && !fieldResult.success) return invalid("fields must contain label, optional type, and value");
+  const fields3 = fieldResult.success ? fieldResult.data : void 0;
   return { ok: true, value: {
     entityId: args.entityId,
     ...typeof args.name === "string" ? { name: args.name } : {},
     ...tags ? { tags } : {},
-    ...attributes2 ? { attributes: attributes2 } : {},
+    ...fields3 ? { fields: fields3 } : {},
     ...typeof args.description === "string" ? { description: args.description } : {},
     ...aliases ? { aliases } : {}
   } };
@@ -33012,13 +33096,16 @@ function parseEntityUpdateInput(args, name3 = "entities_update") {
 // ../packages/shared/src/entity-write-operations.ts
 var id9 = external_exports.string().min(1).max(128).refine((value) => value.trim() === value, "Copy IDs unchanged");
 var name2 = external_exports.string().trim().min(1);
-var fields = { name: name2.optional(), description: external_exports.string().optional(), tags: external_exports.array(external_exports.string()).optional(), attributes: external_exports.record(attributeKey, external_exports.json()).optional(), aliases: external_exports.array(external_exports.string()).optional() };
+var fields = { name: name2.optional(), description: external_exports.string().optional(), tags: external_exports.array(external_exports.string()).optional(), fields: external_exports.array(fieldInputSchema).max(MAX_ENTITY_FIELD_VALUES).optional(), attributes: external_exports.unknown().optional(), aliases: external_exports.array(external_exports.string()).optional() };
 var create = external_exports.strictObject({ ...fields, name: name2, type: external_exports.enum(ENTITY_TYPE_VALUES).default("person"), spaceId: id9.optional(), spaceIds: external_exports.array(id9).min(1).optional(), parentEntityId: id9.optional(), exclusiveParent: external_exports.boolean().optional() }).refine((value) => value.spaceId !== void 0 || value.spaceIds !== void 0, { path: ["spaceId"], message: "Select spaceId or nonempty spaceIds" }).refine((value) => !value.exclusiveParent || value.parentEntityId !== void 0, { path: ["parentEntityId"], message: "exclusiveParent requires parentEntityId" });
 var entityWriteInputs = {
   createEntity: create,
   updateEntity: external_exports.strictObject({ entityId: id9, spaceId: id9.optional(), ...fields }),
   updateEntityName: external_exports.strictObject({ entityId: id9, spaceId: id9.optional(), name: name2 }),
   duplicateEntity: external_exports.strictObject({ entityId: id9, spaceId: id9, name: name2.optional(), includeExclusiveChildren: external_exports.boolean().default(false) }),
+  addFieldValue: external_exports.strictObject({ entityId: id9, fieldId: id9.optional(), label: fieldLabelSchema.optional(), type: fieldTypeSchema.optional(), value: external_exports.string() }).refine((value) => !!value.fieldId !== !!value.label && (!value.fieldId || value.type === void 0), { message: "Select fieldId, or label with optional type" }),
+  updateFieldValue: external_exports.strictObject({ valueId: id9, value: external_exports.string() }),
+  removeFieldValue: external_exports.strictObject({ valueId: id9 }),
   archiveEntity: external_exports.strictObject({ entityId: id9 }),
   restoreEntity: external_exports.strictObject({ entityId: id9, grantMissingParentAccess: external_exports.boolean().optional(), parentSpaceGrantFingerprint: external_exports.string().trim().min(1).optional() })
 };
@@ -33026,6 +33113,7 @@ function parserMismatch(operation) {
   throw new OperationInputError(operation, [{ path: [], reason: "custom" }]);
 }
 function parseEntityWriteRequest(operation, raw) {
+  rejectLegacyEntityAttributes(operation, raw);
   switch (operation) {
     case "createEntity": {
       const input2 = parseOperationInput(operation, entityWriteInputs.createEntity, raw);
@@ -33043,6 +33131,12 @@ function parseEntityWriteRequest(operation, raw) {
       if (!parseEntityUpdateInput(input2, operation).ok) return parserMismatch(operation);
       return { operation, input: input2 };
     }
+    case "addFieldValue":
+      return { operation, input: parseOperationInput(operation, entityWriteInputs.addFieldValue, raw) };
+    case "updateFieldValue":
+      return { operation, input: parseOperationInput(operation, entityWriteInputs.updateFieldValue, raw) };
+    case "removeFieldValue":
+      return { operation, input: parseOperationInput(operation, entityWriteInputs.removeFieldValue, raw) };
     case "duplicateEntity":
       return { operation, input: parseOperationInput(operation, entityWriteInputs.duplicateEntity, raw) };
     case "archiveEntity":
@@ -33051,6 +33145,13 @@ function parseEntityWriteRequest(operation, raw) {
       return { operation, input: parseOperationInput(operation, entityWriteInputs.restoreEntity, raw) };
   }
 }
+function rejectLegacyEntityAttributes(operation, raw) {
+  if (raw && typeof raw === "object" && Object.hasOwn(raw, "attributes")) {
+    const error62 = new OperationInputError(operation, [{ path: ["attributes"], reason: "custom" }]);
+    error62.message = LEGACY_ENTITY_ATTRIBUTES_ERROR;
+    throw error62;
+  }
+}
 
 // ../packages/shared/src/entity-duplication.ts
 var MAX_DUPLICATED_ENTITIES = 100;
@@ -33065,7 +33166,10 @@ var entityWriteResults = {
   updateEntityName: success2,
   duplicateEntity: external_exports.strictObject({ entityId, duplicatedCount: external_exports.number().int().min(1).max(MAX_DUPLICATED_ENTITIES) }),
   archiveEntity: success2,
-  restoreEntity: success2
+  restoreEntity: success2,
+  addFieldValue: external_exports.strictObject({ valueId: entityId, added: external_exports.boolean() }),
+  updateFieldValue: success2,
+  removeFieldValue: success2
 };
 var nativeEntityWriteResults = {
   ...entityWriteResults,
@@ -33074,6 +33178,9 @@ var nativeEntityWriteResults = {
   updateEntityName: entityWriteResults.updateEntityName.extend({ message: external_exports.string() })
 };
 var publicCliEntityWriteResults = {
+  addFieldValue: entityWriteResults.addFieldValue,
+  updateFieldValue: success2,
+  removeFieldValue: success2,
   createEntity: entityWriteResults.createEntity.extend({ pinFailures: external_exports.array(external_exports.strictObject({ target: external_exports.string(), error: external_exports.string(), outcome: external_exports.enum(["rejected", "unknown", "committed-unvalidated"]).optional() })).optional(), pinSucceeded: external_exports.array(external_exports.string()).optional() }),
   duplicateEntity: entityWriteResults.duplicateEntity,
   updateEntity: success2.extend({ entityId }),
@@ -33098,6 +33205,8 @@ function projectEntityWriteResult(operation, raw) {
       return checked2(entityWriteResults.createEntity, { entityId: checked2(entityId, raw) });
     case "duplicateEntity":
       return checked2(entityWriteResults.duplicateEntity, raw);
+    case "addFieldValue":
+      return checked2(entityWriteResults.addFieldValue, raw);
     default:
       if (raw !== null) throw new OperationResultError(operation, "Invalid entity write result");
       return checked2(success2, { success: true });
@@ -33137,7 +33246,7 @@ var selectDetail2 = external_exports.object({
 }).nullable();
 var compactActivity2 = publicActivityRecordDto.pick({ _id: true, shortId: true, title: true, type: true, contentPlainText: true, deadline: true, completed: true, tags: true, createdAt: true, updatedAt: true, spaceId: true, createdBy: true, deletedAt: true });
 var compactDetail2 = publicActivityDetailDto.omit({ attributes: true, attachments: true }).extend({
-  entityDetails: external_exports.array(publicEntityReadDto.pick({ _id: true, name: true, type: true, displayName: true, parentNames: true, parentDetails: true }).nullable())
+  entityDetails: external_exports.array(external_exports.strictObject(publicEntityReadDto.shape).pick({ _id: true, name: true, type: true, displayName: true, parentNames: true, parentDetails: true }).nullable())
 });
 var pageFields = { hasMore: external_exports.boolean(), nextCursor: external_exports.string().optional() };
 var activityReadFullPage = external_exports.strictObject({ activities: external_exports.array(publicActivityRecordDto), ...pageFields });
@@ -33883,7 +33992,8 @@ var EnteClient = class _EnteClient {
     return this.rest.post("/api/external/entities", body);
   }
   updateEntity(id17, body) {
-    return this.rest.patch("/api/external/entities", body, { id: id17 });
+    const input2 = parseEntityWriteRequest("updateEntity", body !== null && typeof body === "object" && !Array.isArray(body) ? { ...body, entityId: id17 } : body).input;
+    return this.rest.patch("/api/external/entities", input2);
   }
   archiveEntity(id17) {
     return this.rest.delete("/api/external/entities", { id: id17 });
@@ -34240,9 +34350,8 @@ function formatEntityDetail(data) {
   if (e.hiddenFromGraph) lines.push("Graph: hidden");
   if (e.aliases && e.aliases.length) lines.push(`Aliases: ${e.aliases.join(", ")}`);
   if (e.tags && e.tags.length) lines.push(`Tags: ${e.tags.join(", ")}`);
-  if (e.attributes && Object.keys(e.attributes).length) {
-    for (const [k, v3] of Object.entries(e.attributes)) lines.push(`  ${k}: ${String(v3)}`);
-  }
+  if (e.entityFieldsPhase) for (const [label, value] of Object.entries(e.attributes ?? {})) lines.push(`  ${label}: ${typeof value === "string" ? value : JSON.stringify(value)}`);
+  for (const field of e.fields ?? []) lines.push(`  ${field.label} (${field.type}): ${field.value} [${field.valueId}]`);
   if (data.descriptionPlainText) {
     lines.push("");
     lines.push(truncate(data.descriptionPlainText, 200));
@@ -36355,7 +36464,6 @@ var entitiesAddAlias = makeFunctionReference(
 var entitiesRemoveAlias = makeFunctionReference(
   "entities:removeAlias"
 );
-var entitiesSetAttribute = makeFunctionReference("entities:setAttribute");
 var entitiesSetDescriptionFromMarkdown = makeFunctionReference("entities:setDescriptionFromMarkdown");
 var entitiesDeleteEntity = makeFunctionReference(
   "entities:deleteEntity"
@@ -36409,7 +36517,7 @@ var EntityList = class extends ClientCommand {
     });
   }
 };
-var EntityCreate = class extends ProfileCommand {
+var EntityCreate = class extends ClientCommand {
   static paths = [["entity", "create"]];
   static usage = Command.Usage({ category: "Entity", description: "Create a new entity" });
   name = options_exports.String();
@@ -36425,15 +36533,17 @@ var EntityCreate = class extends ProfileCommand {
     description: "Exact grantFingerprint returned by the confirmation-required error"
   });
   alias = options_exports.Array("--alias", { description: "Alternative names" });
-  attr = options_exports.Array("--attr", { description: "Attributes as key=value pairs" });
+  attr = options_exports.Array("--attr", { description: "Legacy; use --field instead" });
+  field = options_exports.Array("--field", { description: 'Repeat JSON {"label":"E-Mail","type":"email","value":"a@example.com"}' });
   tag = options_exports.Array("--tag", { description: "Tags (repeatable)" });
   description = options_exports.String("--description", { description: "Description text" });
   async run() {
+    if (this.attr !== void 0) rejectLegacyEntityAttributes("createEntity", { attributes: this.attr });
     requireEntitySelector("createEntity", this.space, "spaceId");
     if (this.parent !== void 0) requireEntitySelector("createEntity", this.parent, "parentEntityId");
     const core = parseEntityWriteRequest("createEntity", { name: this.name, type: this.type, spaceId: "pending-space-resolution", parentEntityId: this.parent === void 0 ? void 0 : "pending-parent-resolution", exclusiveParent: this.exclusiveParent }).input;
     if (this.parent && this.pin?.length) throw new OperationInputError("createEntity", [{ path: ["parentEntityId"], reason: "custom" }]);
-    const attributes2 = parseOperationAttrs("createEntity", this.attr);
+    const fields3 = parseCliFields("createEntity", this.field);
     const type = core.type;
     const caller = await resolveCaller();
     const spaceId = await resolveSpaceByNameC(caller, this.space);
@@ -36442,13 +36552,11 @@ var EntityCreate = class extends ProfileCommand {
       spaceId,
       name: core.name,
       type,
+      fields: fields3,
       ...parentEntityId ? { parentEntityId, exclusiveParent: this.exclusiveParent } : {}
     }));
     if (this.alias) for (const a of this.alias) await caller.mutation(entitiesAddAlias, { id: entityId2, alias: a });
     if (this.tag) for (const t of this.tag) await caller.mutation(entitiesAddTag, { id: entityId2, tag: t });
-    for (const [key, value] of Object.entries(attributes2)) {
-      await caller.mutation(entitiesSetAttribute, { id: entityId2, key, value });
-    }
     if (this.description) {
       await caller.mutation(entitiesSetDescriptionFromMarkdown, { entityId: entityId2, markdown: this.description });
     }
@@ -36517,22 +36625,24 @@ var EntityGet = class extends ClientCommand {
     this.emitText(jsonWithSpaces({ data }, spaces), () => withFooter(formatEntityDetail({ ...data, activities: textActivities }), spaces));
   }
 };
-var EntityUpdate = class extends ProfileCommand {
+var EntityUpdate = class extends ClientCommand {
   static paths = [["entity", "update"]];
   static usage = Command.Usage({ category: "Entity", description: "Update an entity" });
   nameOrId = options_exports.String();
   name = options_exports.String("--name", { description: "Rename the entity" });
   aliasAdd = options_exports.String("--alias-add", { description: "Add an alias" });
   aliasRemove = options_exports.String("--alias-remove", { description: "Remove an alias" });
-  attr = options_exports.Array("--attr", { description: "Set attributes as key=value pairs" });
+  attr = options_exports.Array("--attr", { description: "Legacy; use --field instead" });
+  field = options_exports.Array("--field", { description: 'Repeat JSON {"label":"E-Mail","type":"email","value":"a@example.com"}; null removes the label' });
   tag = options_exports.Array("--tag", { description: "Replace the tag set (repeatable)" });
   description = options_exports.String("--description", { description: "Update description" });
   async run() {
+    if (this.attr !== void 0) rejectLegacyEntityAttributes("updateEntity", { attributes: this.attr });
     requireEntitySelector("updateEntity", this.nameOrId, "entityId");
-    const validated = parseEntityWriteRequest("updateEntity", { entityId: "pending-entity-resolution", name: this.name, description: this.description, tags: this.tag, attributes: parseOperationAttrs("updateEntity", this.attr) }).input;
+    const validated = parseEntityWriteRequest("updateEntity", { entityId: "pending-entity-resolution", name: this.name, description: this.description, tags: this.tag, fields: parseCliFields("updateEntity", this.field) }).input;
     const caller = await resolveCaller();
     const entityId2 = await resolveEntityC(caller, this.nameOrId);
-    const newAttrs = validated.attributes ?? {};
+    const fields3 = validated.fields;
     const needsCurrent = !!this.aliasAdd || !!this.aliasRemove || this.tag && this.tag.length > 0;
     const current = needsCurrent ? await caller.query(entitiesFindById, { id: entityId2 }) : void 0;
     if (needsCurrent && !current) throw new Error(`Entity not found: ${entityId2}`);
@@ -36549,10 +36659,8 @@ var EntityUpdate = class extends ProfileCommand {
       await caller.mutation(entitiesRemoveAlias, { id: entityId2, alias: this.aliasRemove });
       didSomething = true;
     }
-    if (Object.keys(newAttrs).length) {
-      for (const [key, value] of Object.entries(newAttrs)) {
-        await caller.mutation(entitiesSetAttribute, { id: entityId2, key, value });
-      }
+    if (fields3?.length) {
+      await this.client().entityWrite("updateEntity", { entityId: entityId2, fields: fields3 });
       didSomething = true;
     }
     if (this.tag && this.tag.length) {
@@ -36568,7 +36676,7 @@ var EntityUpdate = class extends ProfileCommand {
     }
     if (!didSomething) {
       throw new Error(
-        "Nothing to update. Specify --name, --alias-add, --alias-remove, --attr, --tag, or --description."
+        "Nothing to update. Specify --name, --alias-add, --alias-remove, --field, --tag, or --description."
       );
     }
     const spaces = await spacesFooterFromMemberships(caller);
@@ -36853,10 +36961,63 @@ var EntityHtmlUpdate = class extends ProfileCommand {
     ));
   }
 };
+function parseCliFields(operation, values) {
+  if (values === void 0) return void 0;
+  return values.map((value, index) => {
+    let raw;
+    try {
+      raw = JSON.parse(value);
+    } catch {
+      throw new OperationInputError(operation, [{ path: ["fields", String(index)], reason: "custom" }]);
+    }
+    const parsed = fieldInputSchema.safeParse(raw);
+    if (!parsed.success) throw new OperationInputError(operation, [{ path: ["fields", String(index)], reason: "custom" }]);
+    return parsed.data;
+  });
+}
+var EntityFieldAdd = class extends ClientCommand {
+  static paths = [["entity", "field", "add"]];
+  static usage = Command.Usage({ category: "Entity", description: "Add a typed entity field value" });
+  nameOrId = options_exports.String();
+  fieldId = options_exports.String("--field-id", { description: "Existing field ID; alternative to --label" });
+  label = options_exports.String("--label", { description: "Field label in the acting space" });
+  type = options_exports.String("--type", { description: "Field type; inferred for a new label when omitted" });
+  value = options_exports.String("--value", { required: true, description: "Value text" });
+  async run() {
+    requireEntitySelector("addFieldValue", this.nameOrId, "entityId");
+    const request = parseEntityWriteRequest("addFieldValue", { entityId: "pending-entity-resolution", fieldId: this.fieldId, label: this.label, type: this.type, value: this.value });
+    const client = this.client();
+    const entityId2 = await resolveEntity(client, this.nameOrId);
+    const result = await client.entityWrite("addFieldValue", { ...request.input, entityId: entityId2 });
+    this.emitText(result, () => `Value ${result.data.valueId} ${result.data.added ? "added" : "already exists"}`);
+  }
+};
+var EntityFieldUpdate = class extends ClientCommand {
+  static paths = [["entity", "field", "update"]];
+  static usage = Command.Usage({ category: "Entity", description: "Edit a typed entity field value" });
+  valueId = options_exports.String();
+  value = options_exports.String("--value", { required: true, description: "Replacement value text" });
+  async run() {
+    const result = await this.client().entityWrite("updateFieldValue", { valueId: this.valueId, value: this.value });
+    this.emitText(result, () => "Field value updated");
+  }
+};
+var EntityFieldRemove = class extends ClientCommand {
+  static paths = [["entity", "field", "remove"]];
+  static usage = Command.Usage({ category: "Entity", description: "Remove a typed entity field value" });
+  valueId = options_exports.String();
+  async run() {
+    const result = await this.client().entityWrite("removeFieldValue", { valueId: this.valueId });
+    this.emitText(result, () => "Field value removed");
+  }
+};
 var ENTITY_COMMANDS = [
   EntityShowCorrection,
   EntityList,
   EntityCreate,
+  EntityFieldAdd,
+  EntityFieldUpdate,
+  EntityFieldRemove,
   EntityDuplicate,
   EntityGet,
   EntityUpdate,