ente-cli 0.4.83 → 0.4.85

package/dist/SKILL.md

@@ -188,7 +188,7 @@ ente activity delete <activityId> [--json]
 ente activity restore <activityId> [--json]
 
 # Database lists (entity + typed columns; each row is a note/task activity; no date column type)
-ente list create "<name>" --space "<space>" [--column "key[=Label]:text|number|boolean|single-select|multi-select[:opt,opt]"] [--pin "<parent>" [--share-parents --parent-space-grant-fingerprint <token>]] [--json]
+ente list create "<name>" --space "<space>" [--icon <topic-icon>] [--column "key[=Label]:text|number|boolean|single-select|multi-select[:opt,opt]"] [--pin "<parent>" [--share-parents --parent-space-grant-fingerprint <token>]] [--json]
 ente list add "<list>" --title "…" [--attr k=v ...] [--key <textColumn>] [--content-file ./row.md] [--json]   # --key = upsert by that cell
 ente list update "<list>" <rowId> [--attr k=v ...] [--title "…"] [--json]      # empty value clears a cell
 ente list import "<list>" --file rows.jsonl --key <textColumn> [--dry-run] [--concurrency 4] [--json]   # {"title","attrs","content"} per line → created/updated/unchanged
@@ -443,7 +443,7 @@ ente recording backups join <backupId> [--now]     # retry a failed join; --now
 ### Feedback board
 
 ```bash
-ente feedback send "<summary>" [--category missing|confusing|wrong_data|workflow|bug|other] \
+ente feedback send "<summary>" \
   [--situation "…"] [--goal "…"] [--need-to-see "…"] [--need-to-do "…"] [--reason "…"] [--workaround "…"]
 ente feedback list [--status offen|todo|bearbeitung|klaerung|abgeschlossen|spaeter] [--text "…"] [--limit 50] [--json]
 ente feedback view <feedbackId> [--json]                 # full item + comment thread
@@ -452,7 +452,7 @@ ente feedback status <feedbackId> <status>               # move to a board colum
 ```
 
 - Same in-app feedback board as the web composer (`convex/feedback.ts` public functions) — no GitHub issue.
-- Every authenticated user may submit and manage the shared board. Screenshots/attachments are web-composer only.
+- Human sign-in only: the board refuses agent-bound CLI keys (every CLI key since 2026-10-11) and the CLI says so; use the web board then. Categories became tags (set them in the web). Screenshots/attachments are web-composer only.
 
 ### Deadline formats
 

package/dist/cli.mjs

@@ -3800,7 +3800,7 @@ async function runCli(cli2, argv, context) {
 }
 
 // ente/version.ts
-var VERSION = "0.4.83";
+var VERSION = "0.4.85";
 
 // ente/branding.ts
 var NPM_REGISTRY = "https://registry.npmjs.org";
@@ -3907,17 +3907,20 @@ function keyToFile(cacheDir, key) {
   const safe = key.replace(/[^a-zA-Z0-9._-]/g, "_");
   return path4.join(cacheDir, `jwt-${safe}.json`);
 }
-function loadJwt(cacheDir, key) {
+function loadJwtEntry(cacheDir, key) {
   try {
     const file = keyToFile(cacheDir, key);
     if (!existsSync4(file)) return null;
     const entry = JSON.parse(readFileSync4(file, "utf8"));
     if (typeof entry.jwt !== "string" || typeof entry.expiresAt !== "number") return null;
-    return entry.expiresAt - SKEW_MS > Date.now() ? entry.jwt : null;
+    return isJwtFresh(entry.expiresAt) ? { jwt: entry.jwt, expiresAt: entry.expiresAt } : null;
   } catch {
     return null;
   }
 }
+function isJwtFresh(expiresAt, now = Date.now()) {
+  return expiresAt - SKEW_MS > now;
+}
 function storeJwt(cacheDir, key, jwt, expiresAt) {
   const file = keyToFile(cacheDir, key);
   mkdirSync4(path4.dirname(file), { recursive: true, mode: 448 });
@@ -10827,7 +10830,7 @@ async function exchangeToken(siteUrl, apiKey) {
   if (!body.token) throw new Error("/cli/token returned no token.");
   return { jwt: body.token, expiresAt: body.expiresAt ?? Date.now() + DEFAULT_TTL_MS };
 }
-function isAuthError(err) {
+function isAuthError(err, structuredOnly = false) {
   if (err && typeof err === "object" && "data" in err) {
     const data = err.data;
     if (data && typeof data === "object" && "code" in data) {
@@ -10836,33 +10839,74 @@ function isAuthError(err) {
     }
   }
   const msg = err instanceof Error ? err.message : String(err);
+  if (convexHttpErrorCode(msg) === "InvalidAuthHeader") return true;
+  if (structuredOnly) return false;
   return /\b(401|403|unauthenticated|unauthorized|not authenticated)\b/i.test(msg);
 }
+function convexHttpErrorCode(message) {
+  try {
+    const body = JSON.parse(message);
+    return body && typeof body === "object" && "code" in body && typeof body.code === "string" ? body.code : null;
+  } catch {
+    return null;
+  }
+}
+function isWriteConflict(err) {
+  const msg = err instanceof Error ? err.message : String(err);
+  return /OptimisticConcurrencyControlFailure/u.test(msg);
+}
+var MAX_CONFLICT_ATTEMPTS = 6;
+var DEFAULT_CONFLICT_BACKOFF_MS = 250;
 async function mintAndCache(opts) {
   const { jwt, expiresAt } = await exchangeToken(opts.siteUrl, opts.apiKey);
   storeJwt(opts.cacheDir, opts.cacheKey, jwt, expiresAt);
-  return jwt;
+  return { jwt, expiresAt };
 }
 async function makeCaller(opts) {
   const client = new ConvexHttpClient(opts.convexUrl);
-  const cached = loadJwt(opts.cacheDir, opts.cacheKey);
-  const jwt = cached ?? await mintAndCache(opts);
-  client.setAuth(jwt);
-  async function withRetry(fn) {
+  const backoffMs = opts.conflictBackoffMs ?? DEFAULT_CONFLICT_BACKOFF_MS;
+  let current = loadJwtEntry(opts.cacheDir, opts.cacheKey) ?? await mintAndCache(opts);
+  client.setAuth(current.jwt);
+  let renewal = null;
+  function renew() {
+    renewal ??= mintAndCache(opts).then((entry) => {
+      current = entry;
+      client.setAuth(entry.jwt);
+    }).finally(() => {
+      renewal = null;
+    });
+    return renewal;
+  }
+  async function withAuth(fn, structuredOnly = false) {
+    if (renewal) await renewal;
+    else if (!isJwtFresh(current.expiresAt)) await renew();
+    const used = current;
     try {
       return await fn();
     } catch (err) {
-      if (!isAuthError(err)) throw err;
-      client.setAuth(await mintAndCache(opts));
+      if (!isAuthError(err, structuredOnly)) throw err;
+      if (current === used) await renew();
+      else if (renewal) await renewal;
       return fn();
     }
   }
+  async function withConflictRetry(fn) {
+    for (let attempt = 1; ; attempt++) {
+      try {
+        return await withAuth(fn);
+      } catch (err) {
+        if (!isWriteConflict(err) || attempt >= MAX_CONFLICT_ATTEMPTS) throw err;
+        const delay = backoffMs * 2 ** (attempt - 1);
+        await new Promise((resolve2) => setTimeout(resolve2, delay / 2 + Math.random() * delay));
+      }
+    }
+  }
   return {
     convexUrl: opts.convexUrl,
-    query: (ref, ...args) => withRetry(() => client.query(ref, ...args)),
-    mutation: (ref, ...args) => withRetry(() => client.mutation(ref, ...args)),
-    mutationUnqueued: (ref, ...args) => withRetry(() => client.mutation(ref, args[0] ?? {}, { skipQueue: true })),
-    action: (ref, ...args) => withRetry(() => client.action(ref, ...args))
+    query: (ref, ...args) => withAuth(() => client.query(ref, ...args)),
+    mutation: (ref, ...args) => withConflictRetry(() => client.mutation(ref, ...args)),
+    mutationUnqueued: (ref, ...args) => withConflictRetry(() => client.mutation(ref, args[0] ?? {}, { skipQueue: true })),
+    action: (ref, ...args) => withAuth(() => client.action(ref, ...args), true)
   };
 }
 
@@ -13729,6 +13773,72 @@ var TASK_COMMANDS = [
 // ente/commands/list.ts
 import { readFileSync as readFileSync10 } from "node:fs";
 
+// ../packages/shared/src/agent-icon.ts
+var entityCustomIconIds = [
+  "lightbulb",
+  "star",
+  "bookmark",
+  "target",
+  "flag",
+  "brain",
+  "book-open",
+  "puzzle",
+  "zap",
+  "compass",
+  "map",
+  "wrench",
+  "shield",
+  "heart-handshake",
+  "trophy",
+  "globe-2",
+  "network",
+  "landmark",
+  "leaf",
+  "route",
+  "binoculars",
+  "gem",
+  "crown",
+  "key",
+  "satellite",
+  "sun"
+];
+var activityCustomIconIds = [
+  "fish",
+  "bird",
+  "rabbit",
+  "turtle",
+  "squirrel",
+  "snail",
+  "bug",
+  "wand-sparkles",
+  "drama",
+  "music",
+  "dice-5",
+  "gift",
+  "flame",
+  "coffee",
+  "party-popper",
+  "rainbow",
+  "umbrella",
+  "anchor",
+  "sailboat",
+  "gamepad-2",
+  "ghost",
+  "bot",
+  "cloud",
+  "moon",
+  "smile"
+];
+var AGENT_ICON_IDS = [...entityCustomIconIds, ...activityCustomIconIds];
+function parseAgentIconInput(raw) {
+  if (!raw || typeof raw !== "object" || Array.isArray(raw)) throw new Error("Expected { icon: curated icon ID or null }");
+  const input = raw;
+  if (Object.keys(input).length !== 1 || !("icon" in input) || input.icon !== null && !AGENT_ICON_IDS.some((icon) => icon === input.icon)) {
+    throw new Error("Expected only icon: a curated icon ID or null; no agent ID is accepted");
+  }
+  return { icon: input.icon };
+}
+
 // ente/databaseList.ts
 var COLUMN_TYPES = ["text", "number", "boolean", "single-select", "multi-select"];
 var SELECT_TYPES = /* @__PURE__ */ new Set(["single-select", "multi-select"]);
@@ -13950,6 +14060,12 @@ ${failures.map((e) => `  - ${e instanceof Error ? e.message : String(e)}`).join(
 
 // ente/commands/list.ts
 var DATABASE_LIST_TABS = ["database", "activities"];
+function assertListIcon(icon, type) {
+  if (type !== "topic")
+    throw new Error(`--icon works only for topic lists; drop it or use --type topic (got '${type}').`);
+  if (!entityCustomIconIds.includes(icon))
+    throw new Error(`'${icon}' is not a list icon. Choose one of: ${entityCustomIconIds.join(", ")}.`);
+}
 var ROW_PAGE_SIZE = 100;
 var entitiesCreate2 = makeFunctionReference("entities:create");
 var updateDatabaseView = makeFunctionReference("entities:updateDatabaseView");
@@ -14105,7 +14221,7 @@ var ListCreate = class extends ProfileCommand {
   });
   description = options_exports.String("--description", { description: "Searchable description for the list" });
   icon = options_exports.String("--icon", {
-    description: "Entity icon as named in the web icon picker (e.g. book-open, leaf, star)"
+    description: `Topic icon from the web icon picker: ${entityCustomIconIds.join(", ")}`
   });
   pin = options_exports.Array("--pin", { description: "Pin the list under parent entities (resolved by name)" });
   shareParents = options_exports.Boolean("--share-parents", false, {
@@ -14119,6 +14235,7 @@ var ListCreate = class extends ProfileCommand {
       throw new Error(`--type must be 'topic' or 'project' (got '${this.type}').`);
     }
     const columns = (this.column ?? []).map(parseColumn);
+    if (this.icon !== void 0) assertListIcon(this.icon, this.type);
     const caller = await resolveCaller();
     const spaceId = await resolveSpaceByNameC(caller, this.space);
     const entityId = await caller.mutation(entitiesCreate2, {
@@ -15699,72 +15816,6 @@ var RECORDINGS_COMMANDS = [
   RecordingBackupJoinCommand
 ];
 
-// ../packages/shared/src/agent-icon.ts
-var entityCustomIconIds = [
-  "lightbulb",
-  "star",
-  "bookmark",
-  "target",
-  "flag",
-  "brain",
-  "book-open",
-  "puzzle",
-  "zap",
-  "compass",
-  "map",
-  "wrench",
-  "shield",
-  "heart-handshake",
-  "trophy",
-  "globe-2",
-  "network",
-  "landmark",
-  "leaf",
-  "route",
-  "binoculars",
-  "gem",
-  "crown",
-  "key",
-  "satellite",
-  "sun"
-];
-var activityCustomIconIds = [
-  "fish",
-  "bird",
-  "rabbit",
-  "turtle",
-  "squirrel",
-  "snail",
-  "bug",
-  "wand-sparkles",
-  "drama",
-  "music",
-  "dice-5",
-  "gift",
-  "flame",
-  "coffee",
-  "party-popper",
-  "rainbow",
-  "umbrella",
-  "anchor",
-  "sailboat",
-  "gamepad-2",
-  "ghost",
-  "bot",
-  "cloud",
-  "moon",
-  "smile"
-];
-var AGENT_ICON_IDS = [...entityCustomIconIds, ...activityCustomIconIds];
-function parseAgentIconInput(raw) {
-  if (!raw || typeof raw !== "object" || Array.isArray(raw)) throw new Error("Expected { icon: curated icon ID or null }");
-  const input = raw;
-  if (Object.keys(input).length !== 1 || !("icon" in input) || input.icon !== null && !AGENT_ICON_IDS.some((icon) => icon === input.icon)) {
-    throw new Error("Expected only icon: a curated icon ID or null; no agent ID is accepted");
-  }
-  return { icon: input.icon };
-}
-
 // ente/commands/agent.ts
 import { readFileSync as readFileSync12 } from "node:fs";
 import { randomUUID } from "node:crypto";
@@ -16336,7 +16387,6 @@ var AGENDA_COMMANDS = [
 ];
 
 // ente/commands/feedback.ts
-var CATEGORIES = ["missing", "confusing", "wrong_data", "workflow", "bug", "other"];
 var STATUSES = ["offen", "todo", "bearbeitung", "klaerung", "abgeschlossen", "spaeter"];
 var createFeedback = makeFunctionReference(
   "feedback:create"
@@ -16381,9 +16431,23 @@ async function collectColumn(caller, status, text, limit, scope) {
   }
   return items.slice(0, limit);
 }
-function parseCategory(value) {
-  if (CATEGORIES.includes(value)) return value;
-  throw new Error(`Invalid category '${value}'. Use one of: ${CATEGORIES.join(" | ")}.`);
+function isAgentRefusal(err) {
+  const data = err && typeof err === "object" && "data" in err ? err.data : null;
+  return !!data && typeof data === "object" && "code" in data && data.code === "FORBIDDEN" && "message" in data && data.message === "Use the agent-scoped operation interface";
+}
+async function humanOnlyBoard(fn) {
+  const caller = await resolveCaller();
+  try {
+    return await fn(caller);
+  } catch (err) {
+    if (!isAgentRefusal(err)) throw err;
+    throw new Error(
+      `The feedback board accepts only people signed in to the web app. This CLI key is bound to an Ente agent, and agents may not act as you there (${errorMessage(err)}). File, comment on or move feedback in the web app's feedback board.`
+    );
+  }
+}
+function tagNames(item) {
+  return item.tags.map((t) => t.name).join(", ");
 }
 function parseStatus(value) {
   if (STATUSES.includes(value)) return value;
@@ -16396,10 +16460,9 @@ var FeedbackSendCommand = class extends ProfileCommand {
   static paths = [["feedback", "send"]];
   static usage = Command.Usage({
     category: "Feedback",
-    description: "File feedback on the in-app board (category + summary + optional detail fields)"
+    description: "File feedback on the in-app board (summary + optional detail fields; human sign-in only)"
   });
   summary = options_exports.String({ required: true, name: "summary" });
-  category = options_exports.String("--category", { description: `Category: ${CATEGORIES.join("|")} (default other)` });
   situation = options_exports.String("--situation", { description: "What happened / where you were" });
   goal = options_exports.String("--goal", { description: "What you were trying to do" });
   needToSee = options_exports.String("--need-to-see", { description: "What you expected to see" });
@@ -16409,10 +16472,7 @@ var FeedbackSendCommand = class extends ProfileCommand {
   async run() {
     const summary = this.summary.trim();
     if (summary.length === 0) throw new Error("feedback send: summary must not be empty.");
-    const category = parseCategory(this.category ?? "other");
-    const caller = await resolveCaller();
-    const res = await caller.mutation(createFeedback, {
-      category,
+    const res = await humanOnlyBoard((caller) => caller.mutation(createFeedback, {
       summary,
       ...this.situation !== void 0 ? { situation: this.situation } : {},
       ...this.goal !== void 0 ? { goal: this.goal } : {},
@@ -16421,10 +16481,10 @@ var FeedbackSendCommand = class extends ProfileCommand {
       ...this.reason !== void 0 ? { reason: this.reason } : {},
       ...this.workaround !== void 0 ? { currentWorkaround: this.workaround } : {},
       context: CLI_CONTEXT
-    });
+    }));
     this.emitText(
-      { data: { feedbackId: res.feedbackId, category, summary } },
-      () => `Filed feedback ${res.feedbackId} [${category}] "${summary}".`
+      { data: { feedbackId: res.feedbackId, summary } },
+      () => `Filed feedback ${res.feedbackId} "${summary}".`
     );
   }
 };
@@ -16445,12 +16505,13 @@ var FeedbackListCommand = class extends ProfileCommand {
     }
     const statuses = this.status ? [parseStatus(this.status)] : [...STATUSES];
     const scope = this.all ? "all" : "mine";
-    const caller = await resolveCaller();
     const collected = [];
-    for (const status of statuses) {
-      if (collected.length >= limit) break;
-      collected.push(...await collectColumn(caller, status, this.text, limit - collected.length, scope));
-    }
+    await humanOnlyBoard(async (caller) => {
+      for (const status of statuses) {
+        if (collected.length >= limit) break;
+        collected.push(...await collectColumn(caller, status, this.text, limit - collected.length, scope));
+      }
+    });
     collected.sort((a, b) => b.createdAt - a.createdAt);
     const items = collected.slice(0, limit);
     this.print(
@@ -16458,12 +16519,12 @@ var FeedbackListCommand = class extends ProfileCommand {
       () => items.map((it) => ({
         id: it.id,
         status: it.status,
-        category: it.category,
+        tags: tagNames(it),
         summary: it.summary.length > 60 ? `${it.summary.slice(0, 57)}\u2026` : it.summary,
         by: submitter(it),
         created: formatDatetime(it.createdAt)
       })),
-      ["id", "status", "category", "summary", "by", "created"]
+      ["id", "status", "tags", "summary", "by", "created"]
     );
   }
 };
@@ -16475,13 +16536,14 @@ var FeedbackViewCommand = class extends ProfileCommand {
   });
   feedbackId = options_exports.String({ required: true, name: "feedbackId" });
   async run() {
-    const caller = await resolveCaller();
-    const item = await caller.query(getFeedback, { id: this.feedbackId });
+    const { item, comments } = await humanOnlyBoard(async (caller) => ({
+      item: await caller.query(getFeedback, { id: this.feedbackId }),
+      comments: await caller.query(listComments, { id: this.feedbackId })
+    }));
     if (item === null) throw new Error(`No feedback item with id ${this.feedbackId}.`);
-    const comments = await caller.query(listComments, { id: this.feedbackId });
     this.emitText({ data: { item, comments } }, () => {
       const lines = [
-        `${item.id}  [${item.category}]  ${item.status}`,
+        `${item.id}  ${item.status}`,
         item.summary,
         "",
         `Submitted by: ${submitter(item)}   ${formatDatetime(item.createdAt)}`
@@ -16525,8 +16587,7 @@ var FeedbackCommentCommand = class extends ProfileCommand {
   body = options_exports.String({ required: true, name: "body" });
   async run() {
     if (this.body.trim().length === 0) throw new Error("feedback comment: body must not be empty.");
-    const caller = await resolveCaller();
-    const comment = await caller.mutation(addComment, { id: this.feedbackId, body: this.body });
+    const comment = await humanOnlyBoard((caller) => caller.mutation(addComment, { id: this.feedbackId, body: this.body }));
     this.emitText(
       { data: comment },
       () => `Added comment ${comment.id} by ${comment.authorName || "(unknown)"}.`
@@ -16543,8 +16604,7 @@ var FeedbackStatusCommand = class extends ProfileCommand {
   status = options_exports.String({ required: true, name: "status" });
   async run() {
     const status = parseStatus(this.status);
-    const caller = await resolveCaller();
-    await caller.mutation(updateStatus, { id: this.feedbackId, status });
+    await humanOnlyBoard((caller) => caller.mutation(updateStatus, { id: this.feedbackId, status }));
     this.emitText(
       { data: { feedbackId: this.feedbackId, status } },
       () => `Moved feedback ${this.feedbackId} to '${status}'.`