@tobq/boardclip 2.1.113 → 2.1.114

package/mcp/boardclip-mcp.js

@@ -45,7 +45,7 @@ function readSettings() {
   }
 }
 
-function readHistory() {
+function readHistoryFile() {
   try {
     const loaded = JSON.parse(fs.readFileSync(HISTORY_PATH, 'utf8'));
     const items = Array.isArray(loaded) ? loaded : [];
@@ -56,6 +56,20 @@ function readHistory() {
   }
 }
 
+// Both files through the app's flat-tags plan (model.planTagState), together or not at
+// all: tags split for the clips but not for the share list (or the reverse) could show
+// an AI a clip the app would not. The settings always carry the boundary key
+// (mcpCore.withBoundaryKey) so a search worker keys ids and revs as this thread does.
+function readState() {
+  const settings = mcpCore.withBoundaryKey(readSettings());
+  const history = readHistoryFile();
+  try {
+    const plan = model.planTagState(history, settings, { aiGroupName: mcpCore.AI_GROUP_NAME });
+    if (plan.changed) return { settings: { ...settings, ...plan.settings }, history: plan.history };
+  } catch {}
+  return { settings, history };
+}
+
 // --- Result helpers ----------------------------------------------------------
 function jsonResult(value) {
   return { content: [{ type: 'text', text: JSON.stringify(value, null, 2) }] };
@@ -66,8 +80,16 @@ function errorResult(message) {
 }
 
 // Every clip mutation carries the rev it read; the app refuses a stale one.
-const REV_NOTE = ' Requires expected_rev: the clip\'s `rev` from list_clips/search_clips/get_clip (or from your previous change\'s result). If the clip changed since you read it the change is refused - re-read it and retry. Returns the clip\'s new rev.';
+const REV_NOTE = ' Requires expected_rev: the clip\'s `rev` from list_clips/search_clips/get_clip (or from your previous change\'s result). If the clip changed since you read it the change is refused - re-read it and retry.';
+// What a clip change returns, for the next change.
+const RETURNS_NOTE = ' Returns the clip\'s id and new rev.';
 const expectedRevSchema = () => z.string().min(1).describe('The clip\'s `rev` as you last read it; the change is refused if the clip changed since.');
+// Every id param: a clip you can read goes by its real id, any other by the opaque one you were given.
+const idSchema = () => z.string().min(1).describe('The clip\'s `id` as a BoardClip tool returned it (a clip not shared with you has an opaque id starting "private:").');
+// Every group param (named group/name, like the tools) reads groups the same way.
+const GROUPS_PARAM = 'One group, or several separated by commas (\'todo, forge\'). Groups are flat and case-insensitive; an old nested name like todo/forge means its parts, todo and forge.';
+// What every group tool says back about a group not shared with you.
+const NOT_SHARED_NOTE = ' A group you name that is not shared with you is listed in notShared exactly as you typed it, and what happened with it is not reported.';
 
 function revisionConflictMessage(err) {
   if (!err || !/revision_conflict:/.test(String(err.message || ''))) return null;
@@ -109,19 +131,20 @@ const server = new McpServer({ name: 'boardclip', version: '1.0.0' });
 
 // ---- Read tools (served locally from the data files) ----
 server.registerTool('list_context', {
-  description: 'Summary of the user\'s clipboard organisation: groups (with which are shared with AI), pinned and numpad-slot clips, and totals. The starting point for understanding what is available.',
+  description: 'Summary of the user\'s clipboard organisation: the groups shared with AI with their clip counts (groups not shared with you are not listed), pinned and numpad-slot clips (a clip not shared with you by its opaque id), and totals. The starting point for understanding what is available.',
   inputSchema: {},
-}, async () => jsonResult(mcpCore.buildContext(readHistory(), readSettings())));
+}, async () => { const st = readState(); return jsonResult(mcpCore.buildContext(st.history, st.settings)); });
 
 server.registerTool('list_clips', {
-  description: 'List clipboard clips the user shared with AI (most recent first, with text previews). Non-shared clips are excluded unless include_unshared_metadata is set, in which case they appear as metadata only (no text).',
+  description: 'List clipboard clips the user shared with AI (most recent first, with text previews). Non-shared clips are excluded unless include_unshared_metadata is set, in which case they appear as metadata only (no text), each under an opaque id starting "private:" that every tool taking an id accepts.',
   inputSchema: {
     limit: z.number().int().min(1).max(200).optional(),
-    group: z.string().optional().describe('Only clips in this group.'),
+    group: z.string().optional().describe(`Only clips in all of these groups. ${GROUPS_PARAM}`),
     include_unshared_metadata: z.boolean().optional(),
   },
 }, async ({ limit, group, include_unshared_metadata }) => {
-  const res = mcpCore.listClips(readHistory(), readSettings(), {
+  const st = readState();
+  const res = mcpCore.listClips(st.history, st.settings, {
     limit: limit || mcpCore.DEFAULT_LIST_LIMIT,
     group: group || null,
     includeNonShared: !!include_unshared_metadata,
@@ -130,7 +153,7 @@ server.registerTool('list_clips', {
 });
 
 server.registerTool('search_clips', {
-  description: 'Search shared clips with the BoardClip search language (the same text the app\'s search field takes). Plain words are literal, case-insensitive substrings, and every term must match (AND); "a quoted phrase" matches exactly; /pattern/ is a regular expression term (case-insensitive, . never crosses a line break; title:/re/ and text:/re/ too); a OR b matches either (OR binds tighter than AND, so x a OR b = x AND (a OR b)); ( ) groups at any depth; -term or -( ... ) excludes. Field scopes title:/text:/group: (short: t:/b:/g:), facets is:pinned|is:image|is:text|is:numpad|is:url|is:multiline|is:rich, num:1-9 (n:), since:/before: e.g. since:7d (s:/bf:), len:>100 or len:50-200 (l:), lines:>3 (ln:), words:<20 (wd:), sort:new|best (o:), id:. Every prefix has a short + long alias. Example: group:Work OR group:Ideas /inv(oice)?/ -draft. Returns matching shared clips with previews plus a count of how many NON-shared clips also matched. Set include_unshared to run the full search over everything - that requires the app and pops an approval prompt.',
+  description: 'Search shared clips with the BoardClip search language (the same text the app\'s search field takes). Plain words are literal, case-insensitive substrings, and every term must match (AND); "a quoted phrase" matches exactly; /pattern/ is a regular expression term (case-insensitive, . never crosses a line break; title:/re/ and text:/re/ too); a OR b matches either (OR binds tighter than AND, so x a OR b = x AND (a OR b)); ( ) groups at any depth; -term or -( ... ) excludes. Field scopes title:/text:/group: (short: t:/b:/g:); group:a group:b = clips in both groups (any case), and a retired nested name of shared groups (group:todo/forge) is searched as its parts, shown in the result\'s rewrittenQuery. Facets is:pinned|is:image|is:text|is:numpad|is:url|is:multiline|is:rich, num:1-9 (n:), since:/before: e.g. since:7d (s:/bf:), len:>100 or len:50-200 (l:), lines:>3 (ln:), words:<20 (wd:), sort:new|best (o:), id:. Every prefix has a short + long alias. Example: group:Work OR group:Ideas /inv(oice)?/ -draft. Returns matching shared clips with previews. Clips not shared with AI are not searched at all: nonSharedTotal says how many there are (the same number whatever the query, so a miss says nothing about them) and a hint says how to include them. Set include_unshared to search everything - that requires the app and pops an approval prompt.',
   inputSchema: {
     query: z.string().min(1),
     regex: z.boolean().optional().describe('Legacy: read the query\'s free text as ONE regular expression. Prefer /pattern/ terms in the query.'),
@@ -142,7 +165,8 @@ server.registerTool('search_clips', {
     return runForward('search_all', { query, regex: !!regex, limit: limit || mcpCore.DEFAULT_LIST_LIMIT });
   }
   try {
-    const res = await searchClipsOffThread(readHistory(), readSettings(), {
+    const st = readState();
+    const res = await searchClipsOffThread(st.history, st.settings, {
       query, regex: !!regex, limit: limit || mcpCore.DEFAULT_LIST_LIMIT,
     }, { signal: extra && extra.signal });
     return jsonResult(res);
@@ -151,47 +175,52 @@ server.registerTool('search_clips', {
   }
 });
 
+// A missing id: say where an edited clip went, as the app's conflicts do.
+function notFoundResult(id, resolved) {
+  if (resolved && resolved.movedTo) return errorResult(`Clip ${id} was edited and is now clip ${resolved.movedTo}. Read that one instead.`);
+  return errorResult(`No clip with id "${id}".`);
+}
+
 server.registerTool('get_clip', {
-  description: 'Get the full text of a clip by id. Shared clips return immediately. A non-shared clip requires the app and pops an approval prompt before the text is returned.',
-  inputSchema: { id: z.string() },
+  description: 'Get the full text of a clip by id. Shared clips return immediately. A non-shared clip (an opaque "private:" id) requires the app and pops an approval prompt before the text is returned.',
+  inputSchema: { id: idSchema() },
 }, async ({ id }) => {
-  const settings = readSettings();
-  const resolved = mcpCore.resolveForRead(readHistory(), settings, id);
-  if (resolved.reason === 'not_found') return errorResult(`No clip with id "${id}".`);
+  const { settings, history } = readState();
+  const resolved = mcpCore.resolveForRead(history, settings, id);
+  if (resolved.reason === 'not_found') return notFoundResult(id, resolved);
   if (resolved.reason === 'ok') {
     const item = resolved.item;
-    const sharedSet = mcpCore.sharedGroupSet(settings);
-    if (item.type === 'image') return jsonResult(mcpCore.clipView(item, { sharedSet }));
+    if (item.type === 'image') return jsonResult(mcpCore.clipView(item, { settings }));
     textBlobStore.hydrateTextItem(item, TEXT_DIR);
-    return jsonResult(mcpCore.fullTextResult(item, sharedSet));
+    return jsonResult(mcpCore.fullTextResult(item, { settings }));
   }
   // not_shared -> approval-gated read through the app.
   return runForward('read_clip', { id, reason: resolved.reason });
 });
 
 server.registerTool('get_image', {
-  description: 'Get metadata for an image clip (type, dimensions, group, timestamp). Set include_path to also get the local file path, which requires the app and pops an approval prompt.',
-  inputSchema: { id: z.string(), include_path: z.boolean().optional() },
+  description: 'Get metadata for an image clip (type, dimensions, groups, timestamp). Set include_path to also get the local file path, which requires the app and pops an approval prompt.',
+  inputSchema: { id: idSchema(), include_path: z.boolean().optional() },
 }, async ({ id, include_path }) => {
   if (include_path) return runForward('image_path', { id });
-  const settings = readSettings();
-  const resolved = mcpCore.resolveForRead(readHistory(), settings, id);
-  if (resolved.reason === 'not_found') return errorResult(`No clip with id "${id}".`);
+  const { settings, history } = readState();
+  const resolved = mcpCore.resolveForRead(history, settings, id);
+  if (resolved.reason === 'not_found') return notFoundResult(id, resolved);
   if (resolved.item.type !== 'image') return errorResult(`Clip "${id}" is not an image.`);
   // clipView returns metadata-only for a non-shared image; full meta for a shared one.
-  return jsonResult(mcpCore.clipView(resolved.item, { sharedSet: mcpCore.sharedGroupSet(settings) }));
+  return jsonResult(mcpCore.clipView(resolved.item, { settings }));
 });
 
 // ---- Management tools (forwarded to the app; gated there) ----
 server.registerTool('add_clip', {
-  description: 'Add a new text clip to history, optionally into a group. Pops an approval prompt unless you have allowed this action.',
-  inputSchema: { text: z.string().min(1), group: z.string().optional() },
+  description: 'Add a text clip to history, optionally in groups. If the text is already a clip, that clip moves to the top and goes into the groups instead. The user is asked first when that clip is one you cannot read, or when a group you name exists but is not shared with you.',
+  inputSchema: { text: z.string().min(1), group: z.string().optional().describe(`Groups for the clip. ${GROUPS_PARAM}`) },
 }, async ({ text, group }) => runForward('add_clip', { text, group: group || null }));
 
 server.registerTool('edit_clip', {
-  description: 'Replace (or append to) the text of an existing TEXT clip in place, keeping its pin, groups, and numpad slot. Text clips are content-addressed, so editing changes the clip id - the new id is returned in the result. Images cannot be edited. Pops an approval prompt.' + REV_NOTE,
+  description: 'Replace (or append to) the text of an existing TEXT clip in place, keeping its pin, groups, and numpad slot. Text clips are content-addressed, so editing changes the clip id - the new id is returned in the result. Images cannot be edited. Pops an approval prompt.' + REV_NOTE + RETURNS_NOTE,
   inputSchema: {
-    id: z.string(),
+    id: idSchema(),
     expected_rev: expectedRevSchema(),
     text: z.string().min(1),
     title: z.string().optional().describe('Optional new title/name for the clip.'),
@@ -200,38 +229,38 @@ server.registerTool('edit_clip', {
 }, async ({ id, expected_rev, text, title, append }) => runForward('edit_clip', { id, expected_rev, text, title: title != null ? title : null, append: !!append }));
 
 server.registerTool('pin_clip', {
-  description: 'Toggle the pin (star) on a clip by id.' + REV_NOTE,
-  inputSchema: { id: z.string(), expected_rev: expectedRevSchema() },
+  description: 'Toggle the pin (star) on a clip by id.' + REV_NOTE + RETURNS_NOTE,
+  inputSchema: { id: idSchema(), expected_rev: expectedRevSchema() },
 }, async ({ id, expected_rev }) => runForward('pin_clip', { id, expected_rev }));
 
 server.registerTool('set_numpad', {
-  description: 'Assign a clip to a numpad quick-paste slot (1-9).' + REV_NOTE,
-  inputSchema: { id: z.string(), expected_rev: expectedRevSchema(), slot: z.number().int().min(1).max(9) },
+  description: 'Assign a clip to a numpad quick-paste slot (1-9).' + REV_NOTE + RETURNS_NOTE,
+  inputSchema: { id: idSchema(), expected_rev: expectedRevSchema(), slot: z.number().int().min(1).max(9) },
 }, async ({ id, expected_rev, slot }) => runForward('set_numpad', { id, expected_rev, slot }));
 
 server.registerTool('assign_group', {
-  description: 'Toggle a clip\'s membership in a group (adds if absent, removes if present).' + REV_NOTE,
-  inputSchema: { id: z.string(), expected_rev: expectedRevSchema(), group: z.string().min(1) },
+  description: 'Put a clip into groups or take it out: the groups it is not in are added, and if it is already in every one it is taken out of them all. Free on a clip you can read; asks the user first for a clip you cannot read or a group that exists but is not shared with you. Returns added and removed (groups shared with you only) and groups: the clip\'s shared groups after the change. The clip\'s id changes form when the change makes it readable to you or not.' + NOT_SHARED_NOTE + REV_NOTE + RETURNS_NOTE,
+  inputSchema: { id: idSchema(), expected_rev: expectedRevSchema(), group: z.string().min(1).describe(GROUPS_PARAM) },
 }, async ({ id, expected_rev, group }) => runForward('assign_group', { id, expected_rev, group }));
 
 server.registerTool('create_group', {
-  description: 'Create a new group.',
-  inputSchema: { name: z.string().min(1) },
+  description: 'Create groups (an existing group, in any case, is reused). New groups are not shared with AI. Asks the user first when a group you name exists but is not shared with you. Returns groups: the named groups shared with you, as stored.' + NOT_SHARED_NOTE,
+  inputSchema: { name: z.string().min(1).describe(GROUPS_PARAM) },
 }, async ({ name }) => runForward('create_group', { name }));
 
 server.registerTool('delete_group', {
-  description: 'Delete a group (clips stay in history, just lose this group label).',
+  description: 'Delete ONE group by its full name, in any case (a comma or / in it is part of the name). Clips stay in history and leave only this group. Deleting a group not shared with AI asks the user first. The "AI" group cannot be deleted.',
   inputSchema: { name: z.string().min(1) },
 }, async ({ name }) => runForward('delete_group', { name }));
 
 server.registerTool('delete_clip', {
   description: 'Delete a clip from history. Always pops an approval prompt.' + REV_NOTE,
-  inputSchema: { id: z.string(), expected_rev: expectedRevSchema() },
+  inputSchema: { id: idSchema(), expected_rev: expectedRevSchema() },
 }, async ({ id, expected_rev }) => runForward('delete_clip', { id, expected_rev }));
 
 server.registerTool('copy_to_clipboard', {
   description: 'Put a clip (by id) or literal text onto the user\'s system clipboard. Always pops an approval prompt.',
-  inputSchema: { id: z.string().optional(), text: z.string().optional() },
+  inputSchema: { id: idSchema().optional(), text: z.string().optional() },
 }, async ({ id, text }) => {
   if (!id && !text) return errorResult('Provide either id or text.');
   return runForward('copy_to_clipboard', { id: id || null, text: text != null ? text : null });
@@ -239,7 +268,7 @@ server.registerTool('copy_to_clipboard', {
 
 server.registerTool('paste_clip', {
   description: 'Put a clip on the clipboard and paste it into the foreground app. Always pops an approval prompt.',
-  inputSchema: { id: z.string() },
+  inputSchema: { id: idSchema() },
 }, async ({ id }) => runForward('paste_clip', { id }));
 
 // --- Connect -----------------------------------------------------------------

package/mcp-approval.html

@@ -95,10 +95,12 @@
     create_group:'new_label', delete_group:'label_off', read_clip:'visibility',
     search_all:'search', image_path:'image',
   };
+  // What "Always allow" / "Allow for this session" grant: ONE tool each (main keeps
+  // grants per tool), so each label names its own action.
   const KIND = {
     delete_clip:'deleting clips', edit_clip:'editing clip text', copy_to_clipboard:'writing your clipboard', paste_clip:'pasting into apps',
-    add_clip:'adding clips', pin_clip:'pinning', set_numpad:'numpad slots', assign_group:'group changes',
-    create_group:'group changes', delete_group:'group changes', read_clip:'reading private clips',
+    add_clip:'adding clips', pin_clip:'pinning', set_numpad:'numpad slots', assign_group:"changing clips' groups",
+    create_group:'creating groups', delete_group:'deleting groups', read_clip:'reading private clips',
     search_all:'searching private clips', image_path:'revealing image paths',
   };
   // The prompt never takes focus (main shows it inactive) and never allows by

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tobq/boardclip",
   "productName": "BoardClip",
-  "version": "2.1.113",
+  "version": "2.1.114",
   "description": "Cross-platform clipboard history tray app with numpad quick-paste and native cloud sync",
   "keywords": [
     "clipboard",

package/preload.js

@@ -31,11 +31,13 @@ contextBridge.exposeInMainWorld('api', {
   saveSettings: (settings) => ipcRenderer.invoke('save-settings', settings),
   setShowShortcut: (shortcut) => ipcRenderer.invoke('set-show-shortcut', shortcut),
   setQuickPasteShortcut: (shortcut) => ipcRenderer.invoke('set-quick-paste-shortcut', shortcut),
+  setNewNoteShortcut: (shortcut) => ipcRenderer.invoke('set-new-note-shortcut', shortcut),
   suspendShortcuts: () => ipcRenderer.invoke('suspend-shortcuts'),
   resumeShortcuts: () => ipcRenderer.invoke('resume-shortcuts'),
   resolveShowShortcut: (shortcut) => ipcRenderer.invoke('resolve-show-shortcut', shortcut),
-  groupCreate: (name) => ipcRenderer.invoke('group-create', name),
-  groupDelete: (name) => ipcRenderer.invoke('group-delete', name),
+  groupCreate: (text) => ipcRenderer.invoke('group-create', text), // -> the tag names ("a, b" = two), or false
+  groupDelete: (name) => ipcRenderer.invoke('group-delete', name), // -> { ok, name, ids, shared }, or false
+  groupRestore: (payload) => ipcRenderer.invoke('group-restore', payload), // the delete's Undo
   groupAssign: (id, group, rev) => ipcRenderer.invoke('group-assign', id, group, rev),
   copyImagePath: (id) => ipcRenderer.invoke('copy-image-path', id),
   openEditor: (id, options) => ipcRenderer.invoke('open-editor', id, options || {}),

package/site/index.html

@@ -76,6 +76,10 @@
             <dt><kbd>Numpad 1-9</kbd></dt>
             <dd>Paste a numpad slot without opening the popup. <span class="dim">On a Mac: <kbd>Cmd</kbd><kbd>Option</kbd><kbd>1-9</kbd></span></dd>
           </div>
+          <div>
+            <dt><kbd>Win</kbd><kbd>N</kbd></dt>
+            <dd>A new note, from any app. <span class="dim">On a Mac: record a shortcut in Settings</span></dd>
+          </div>
         </dl>
 
         <div class="get" id="download">
@@ -164,7 +168,7 @@
         </div>
         <div>
           <dt><span class="mi spec-icon" aria-hidden="true">star</span>Pins, groups and titles</dt>
-          <dd>Pinned clips never expire. Groups nest with a slash, like work/api, and any clip can carry a title, so a snippet you keep reads as a note rather than a fragment.</dd>
+          <dd>Pinned clips never expire. A clip can sit in several groups (type <code>work, api</code> to add both), and any clip can carry a title, so a snippet you keep reads as a note rather than a fragment.</dd>
         </div>
         <div>
           <dt><span class="mi spec-icon" aria-hidden="true">image</span>Images</dt>
@@ -344,7 +348,11 @@
       }
     };
     const DEMO_SHOTS = ["assets/demo-shot-waveform.svg", "assets/demo-shot-dashboard.svg", "assets/demo-shot-architecture.svg"];
-    let labels = ["work", "work/api", "work/release", "code", "code/review", "support", "ideas", "legal", "sales", "design", "finance", "ops", "personal", "release", "meeting", "writing", "bug", "social"];
+    // The tags each seed slot's clips carry, typed as in the app ("work, api"
+    // is two tags); labels is every tag once, first use first.
+    const DEMO_TAG_SLOTS = ["work", "work, api", "work, release", "code", "code, review", "support", "ideas", "legal", "sales", "design", "finance", "ops", "personal", "release", "meeting", "writing", "bug", "social"];
+    let labels = Core.search.splitTagInput(DEMO_TAG_SLOTS.join(", "));
+    const slotTags = (slot) => Core.search.splitTagInput(DEMO_TAG_SLOTS[slot % DEMO_TAG_SLOTS.length]);
     const numpadSlots = new Map([
       [0, 1],
       [5, 4],
@@ -390,8 +398,8 @@
       const isImage = Boolean(example.image) || /screenshot|image|diagram|png/i.test(text) || index % 17 === 0;
       const pin = {};
       if (numpadSlots.has(index)) pin.number = numpadSlots.get(index);
-      if (index % 11 === 0 || index < 4) pin.groups = [labels[index % labels.length]];
-      if (index % 23 === 0) pin.groups = [...new Set([...(pin.groups || []), labels[(index * 3 + 4) % labels.length]])];
+      if (index % 11 === 0 || index < 4) pin.groups = slotTags(index);
+      if (index % 23 === 0) pin.groups = [...new Set([...(pin.groups || []), ...slotTags(index * 3 + 4)])];
       if (DEMO_EXTRA_GROUPS.has(index)) pin.groups = [...new Set([...(pin.groups || []), DEMO_EXTRA_GROUPS.get(index)])];
       const hasPin = index % 19 === 0 || index < 2 || Object.keys(pin).length > 0;
       return {
@@ -411,7 +419,7 @@
     // The search box TEXT is the single source of truth (same model as the app): facets live
     // as group:/is:/num:/since: tokens inside `query`; chip state is DERIVED from it.
     const state = { query: "", sortMode: null };
-    const facetState = () => Core.search.facetState(Core.search.parseQuery(state.query));
+    const facetState = () => Core.search.facetState(Core.search.parseQuery(state.query), labels);
     const installState = { mode: "installer", downloadOS: "win" };
     const clipList = document.getElementById("clip-list");
     const clipCount = document.getElementById("clip-count");
@@ -579,6 +587,9 @@
       demoZoom.bindInput(document.getElementById("imagePreviewHeight"), document.getElementById("imagePreviewHeightReset"));
       document.getElementById("shortcutRecord").textContent = `${mod} + Shift + V`;
       document.getElementById("quickPasteRecord").textContent = `${mod} + Shift + B`;
+      const newNoteRecord = document.getElementById("newNoteShortcutRecord");
+      newNoteRecord.textContent = isMac ? "Not set" : "Win + N";
+      newNoteRecord.classList.toggle("unset", isMac);
       const providers = [
         { name: "Google Drive", path: isMac ? "~/Library/CloudStorage/GoogleDrive/BoardClip" : "G:\\My Drive\\BoardClip" },
         { name: "OneDrive", path: isMac ? "~/Library/CloudStorage/OneDrive/BoardClip" : "C:\\Users\\you\\OneDrive\\BoardClip" },
@@ -824,14 +835,24 @@
     // uses, via an adapter backed by the in-memory clips + browser APIs. Click
     // routing, confirm/prompt dialogs, numpad-replace, add-group and keyboard nav
     // therefore behave identically to the app and cannot drift.
-    function stripGroupFromClips(group) {
-      clips = clips.map((clip) => {
-        if (!clip.pin || !Array.isArray(clip.pin.groups)) return clip;
-        const groups = clip.pin.groups.filter((label) => label !== group);
-        const nextPin = { ...clip.pin };
-        if (groups.length) nextPin.groups = groups; else delete nextPin.groups;
-        return { ...clip, pin: Object.keys(nextPin).length ? nextPin : null };
-      });
+    // The demo's tags follow the app's rules through the same shared functions
+    // (Core.search.inputTagNames / tagTogglePlan, the app's tagInputNames and
+    // applyGroup* read input the same way): flat, ONE stored spelling per tag
+    // whatever the case it is typed in, and "a, b" typed in one go is two tags.
+    const storedTag = (name) => labels.find((label) => Core.search.sameTag(label, name)) || null;
+    const demoTagNames = (input) => Core.search.inputTagNames(input, labels, null, Core.search.tagSpellings([labels]));
+    // Tags that come with data (a new note's filter tags, unions) in their stored spelling.
+    const demoTagList = (names) => Core.search.expandTagNames(names, null, Core.search.tagSpellings([labels]));
+    function registerDemoTags(names) {
+      for (const name of names) if (!storedTag(name)) labels.push(name);
+    }
+    // One clip in or out of one tag (any case). True when it changed.
+    function setDemoTag(id, name, shouldHave) {
+      const clip = clips.find((item) => Core.itemId(item) === id);
+      const own = clip && Core.groupsOf(clip).find((group) => Core.search.sameTag(group, name));
+      if (!clip || !!own === !!shouldHave) return false;
+      clips = Core.toggleGroup(clips, id, own || name);
+      return true;
     }
     function closeDemoSettings() {
       settingsPanel.classList.remove("show");
@@ -851,6 +872,10 @@
       deletedToast: "Deleted",
       itemById: (id) => clips.find((item) => Core.itemId(item) === id),
       numpadMap: () => Core.numpadMap(clips),
+      // The popup's quick keys (controller.armQuickKeys): a digit does what its
+      // slot's click does here (copies it), N opens a new note.
+      quickPaste: (slot) => demoAdapter.activateClip(Core.numpadMap(clips)[slot]),
+      newNote: () => openDemoEditor(null),
       protectedGroups: () => new Set(),
       getQuery: () => state.query,
       applyFacet: (token, intent) => demoSearchBox.applyFacet(token, intent),
@@ -874,17 +899,50 @@
           return { ...clip, pin: Object.keys(pin).length ? pin : null };
         });
       },
-      toggleGroup: (id, group) => { if (!labels.includes(group)) labels.push(group); clips = Core.toggleGroup(clips, id, group); }, // matches the app's applyGroupAssign (toggles)
-      createGroup: (name) => { if (!labels.includes(name)) labels.push(name); },
-      deleteGroup: (group) => {
-        labels = labels.filter((l) => l !== group);
-        state.query = Core.search.stripFacet(state.query, { kind: "group", value: group });
+      // The app's applyGroupAssign: several tags at once are one decision (the
+      // missing ones are added; a clip that has them all loses them all).
+      toggleGroup: (id, text) => {
+        const clip = demoAdapter.itemById(id);
+        const names = clip ? demoTagNames(text) : [];
+        if (!names.length) return false;
+        const { add: added, remove: removed } = Core.search.tagTogglePlan(Core.groupsOf(clip), names);
+        registerDemoTags(added);
+        for (const name of added) setDemoTag(id, name, true);
+        for (const name of removed) setDemoTag(id, name, false);
+        return { ok: true, added, removed };
+      },
+      // The tags made (or reused, in their stored spelling), or false.
+      createGroup: (text) => {
+        const names = demoTagNames(text);
+        if (!names.length) return false;
+        registerDemoTags(names);
+        return names;
+      },
+      // ONE tag by its name (any case, never split), off every clip that had
+      // it; returns what restoreGroup (the Undo) puts back.
+      deleteGroup: (name) => {
+        const stored = storedTag(name);
+        if (!stored) return false;
+        labels = labels.filter((label) => label !== stored);
+        state.query = Core.search.stripFacet(state.query, { kind: "group", value: stored });
         if (typeof demoSearchBox !== "undefined" && demoSearchBox) demoSearchBox.setQuery(state.query);
-        stripGroupFromClips(group);
+        const ids = clips.map((clip) => Core.itemId(clip)).filter((id) => setDemoTag(id, stored, false));
+        // A deleted tag is shared with no one (made again, it starts private).
+        const shared = demoSharedGroups.delete(stored);
+        return { ok: true, name: stored, ids, shared };
+      },
+      restoreGroup: (result) => {
+        const name = Core.search.cleanTagName(result && result.name);
+        if (!name) return false;
+        registerDemoTags([name]);
+        const stored = storedTag(name);
+        for (const id of (result.ids || [])) setDemoTag(id, stored, true);
+        if (result.shared) demoSharedGroups.add(stored);
+        return true;
       },
       deleteClip: (id) => { clips = Core.deleteItem(clips, id); },
       clearUnpinned: () => { clips = clips.filter((clip) => Core.isPinned(clip)); },
-      setGroupSharedAi: (group) => { if (demoSharedGroups.has(group)) demoSharedGroups.delete(group); else demoSharedGroups.add(group); },
+      setGroupSharedAi: (group, shared) => { if (shared) demoSharedGroups.add(group); else demoSharedGroups.delete(group); }, // shared: the switch's new state
       // Copy without pasting (the controller says "Copied"). A page cannot paste
       // into another app, so the demo's click (activateClip) copies too.
       copyClip: async (id) => {
@@ -959,12 +1017,13 @@
         const present = new Set(clips.map((clip) => Core.itemId(clip)));
         clips = Core.sortItems([...clips, ...snaps.filter((snap) => !present.has(Core.itemId(snap)))]);
       },
-      groupAssignMany: (ids, group, shouldHave) => {
-        if (!labels.includes(group)) labels.push(group);
-        for (const id of ids) {
-          const clip = clips.find((item) => Core.itemId(item) === id);
-          if (clip && Core.isInGroup(clip, group) !== shouldHave) clips = Core.toggleGroup(clips, id, group);
-        }
+      // "a, b" adds (or removes) both, on every clip given.
+      groupAssignMany: (ids, text, shouldHave) => {
+        const names = demoTagNames(text);
+        if (shouldHave) registerDemoTags(names);
+        let changed = false;
+        for (const id of ids) for (const name of names) if (setDemoTag(id, name, shouldHave)) changed = true;
+        return changed;
       },
       pasteMany: async (ids) => {
         // Text-only join, matching the app's pasteMany (images can't concatenate).
@@ -976,11 +1035,7 @@
         showToast(`Pasted ${texts.length}`);
       },
       startUnify: (ids) => runDemoUnify(ids),
-      offerUndo: ({ count, undo }) => Core.showActionToast(activeToast(), {
-        message: `Deleted ${count} clip${count === 1 ? "" : "s"}`,
-        actionLabel: "Undo",
-        onAction: undo,
-      }),
+      offerUndo: ({ message, undo }) => Core.showActionToast(activeToast(), { message, actionLabel: "Undo", onAction: undo }),
       toast: (msg) => showToast(msg),
       // Commit-on-add for the demo editor's tag strip on a NEW note: commit the
       // draft through the shared editor commit (which records the created id).
@@ -1036,7 +1091,7 @@
     // kept per visitor in localStorage (the app keeps them per device).
     const DEMO_OPTIONS_HEIGHT_KEY = "boardclip-demo-options-height";
     const DEMO_REGEX_KEY = "boardclip-demo-regex";
-    const DEMO_JOINS_KEY = "boardclip-demo-joins";
+    const DEMO_JOINS_KEY = "boardclip-demo-joins-2";
     const DEMO_FIND_PREFS_KEY = "boardclip-demo-find";
     let demoOptionsHeight = 0;
     let demoRegex = false;
@@ -1050,6 +1105,15 @@
         localStorage.removeItem("boardclip-demo-search-mode");
       }
       demoRegex = localStorage.getItem(DEMO_REGEX_KEY) === "1";
+      // Several tags now join with AND by default: a remembered tag join goes,
+      // once (the old key is folded in, then removed); the kinds' join stays.
+      const oldJoins = localStorage.getItem("boardclip-demo-joins");
+      if (oldJoins !== null) {
+        localStorage.removeItem("boardclip-demo-joins");
+        const kept = { ...(JSON.parse(oldJoins) || {}) };
+        delete kept.group;
+        if (localStorage.getItem(DEMO_JOINS_KEY) === null) localStorage.setItem(DEMO_JOINS_KEY, JSON.stringify(kept));
+      }
       demoJoins = JSON.parse(localStorage.getItem(DEMO_JOINS_KEY) || "null");
     } catch {}
     const demoSearchBox = Core.attachSearchBox(search, {
@@ -1095,6 +1159,7 @@
       popupWin.close();
     }
     function openPopup() {
+      controller.armQuickKeys(); // 1-9 and N act until the first press or other key
       popupShown = true;
       updateDock();
       if (popupWin.isOpen()) popupWin.focus(); else popupWin.open();
@@ -1134,6 +1199,11 @@
     // Keyboard nav (arrows/Enter/Escape + multi-select) when focus is inside the
     // demo window, so the demo honors its own "type, press Enter, and paste" pitch.
     demoWindowEl.addEventListener("keydown", (event) => controller.onKeydown(event));
+    // Any press in the popup, the search field included, ends the quick keys.
+    // They arm when the popup opens (openPopup, which focuses its search), as
+    // the app's do; not at page load: the popup starts open but unfocused, and
+    // the click that would focus it ends them.
+    demoWindowEl.addEventListener("pointerdown", (event) => controller.onPointerdown(event), true);
 
     // ONE clip window (the editor, the image viewer, Unify), a window on the
     // page like the app's own windows: the shared Core.attachWebWindow moves,
@@ -1276,8 +1346,8 @@
       let currentId = id;
       let currentText = clip ? (clip.text || "") : "";
       let currentTitle = clip ? Core.titleOf(clip) : "";
-      const sourceGroups = id == null ? Core.sourceGroupsFromFilters(facetState().active) : [];
-      sourceGroups.forEach((group) => { if (!labels.includes(group)) labels.push(group); });
+      const sourceGroups = id == null ? demoTagList(Core.sourceGroupsFromFilters(facetState().active)) : [];
+      registerDemoTags(sourceGroups);
       retireClipView();
       demoEditorClipId = id;
       demoEditor = Core.createEditor({
@@ -1304,7 +1374,7 @@
             if (created) {
               created.title = nextTitle || undefined;
               created.titleUpdatedAt = Date.now();
-              sourceGroups.forEach((group) => { if (!Core.groupsOf(created).includes(group)) clips = Core.toggleGroup(clips, Core.itemId(created), group); });
+              sourceGroups.forEach((group) => setDemoTag(Core.itemId(created), group, true));
             }
             if (created) currentId = Core.itemId(created);
           }
@@ -1339,7 +1409,7 @@
         .sort((a, b) => (a.ts || 0) - (b.ts || 0));
       if (sources.length < 2) return;
       const total = sources.length - 1;
-      const unionGroups = new Set(sources.flatMap(Core.groupsOf));
+      const unionGroups = demoTagList(sources.flatMap(Core.groupsOf));
       let acc = clipSnapshot(sources[0]);
       let step = 0;
       retireClipView();
@@ -1352,7 +1422,8 @@
         if (created) {
           created.title = acc.title || undefined;
           created.titleUpdatedAt = Date.now();
-          for (const g of unionGroups) { if (!labels.includes(g)) labels.push(g); if (!Core.groupsOf(created).includes(g)) clips = Core.toggleGroup(clips, Core.itemId(created), g); }
+          registerDemoTags(unionGroups);
+          for (const g of unionGroups) setDemoTag(Core.itemId(created), g, true);
         }
         abort();
         renderClips();