dsh-composer-plus 1.7.0 → 1.8.0

package/cordis.patch.yml

@@ -1,3 +1,15 @@
 - insert:
     - id: composer-plus
       name: dsh-composer-plus
+
+# Content search: dsh's own sidebar search (Cmd+K) also finds chats by the words in their messages. dsh ships the index
+# off (`openAt: never`, `:memory:`); this later layer switches it on with a durable, owner-only file under the dsh home.
+# The index opens at the first search, not at start. Settings → Composer Plus → Content search writes
+# `storages/dsh-composer-plus/content-search.json`; `{ "on": false }` keeps dsh's default (titles only). Read at start only.
+# `journalMode: delete`: a rebuildable index needs no write-ahead log; WAL kept a second file as large as the index
+# (measured: 166 MB next to a 165 MB index) until dsh quit.
+- id: session-query-sqlite
+  config:
+    path: !!js dshHomePath('cache', 'composer-plus', 'session-search.db')
+    openAt: !!js "(() => { try { return JSON.parse(process.getBuiltinModule('node:fs').readFileSync(dshHomePath('storages', 'dsh-composer-plus', 'content-search.json'), 'utf8'))?.on === false ? 'never' : 'first-search' } catch { return 'first-search' } })()"
+    journalMode: delete

package/index.js

@@ -10,13 +10,14 @@
  * - Resume after restart: remembers the chats that were running when dsh quit and continues them at the next start; off by
  *   default (it starts model turns without a click).
  * - Feature ideas: on a click, one model call (the chat's own model) reads a short brief of the chat's project and returns
- *   feature ideas as cards. Read-only: no chat message, nothing written to the project.
+ *   feature ideas as cards. Read-only: no chat message, nothing written to the project. Ideas saved for later are kept
+ *   per project folder under the dsh home.
  */
 import { constants, readFileSync } from 'node:fs';
 import { mkdir, open, readdir, readFile, realpath, rename, stat, writeFile } from 'node:fs/promises';
 import { randomUUID } from 'node:crypto';
 import { homedir } from 'node:os';
-import { dirname, join, sep } from 'node:path';
+import { dirname, isAbsolute, join, sep } from 'node:path';
 import { createGateway } from './tether/gateway/server.mjs';
 
 export const name = 'dsh-composer-plus';
@@ -31,9 +32,11 @@ export const SHOT_PATH = '/api/composer-plus.shot';
 export const MOBILE_PATH = '/api/composer-plus.mobile';
 export const RESUME_PATH = '/api/composer-plus.resume';
 export const IDEAS_PATH = '/api/composer-plus.ideas';
+export const LATER_PATH = '/api/composer-plus.later';
+export const CONTENT_SEARCH_PATH = '/api/composer-plus.content-search';
 /** Feature screenshots shipped in assets/features/<id>.webp; only these ids are served (no path input). */
 export const SHOTS = ['changesPanel', 'featureIdeas', 'projectStatus', 'recentProjects', 'collapseProjects', 'statusOrder', 'notifications', 'allowForChat', 'continueButton', 'resumeAfterRestart', 'inputHistory', 'planToggle', 'keepFocus',
-  'queueReorder', 'mobileConnect', 'copyDeeplink', 'copyProjectPath', 'language', 'autoUpdate'];
+  'queueReorder', 'mobileConnect', 'copyDeeplink', 'copyProjectPath', 'language', 'autoUpdate', 'contentSearch'];
 const PACKAGE = JSON.parse(readFileSync(new URL('./package.json', import.meta.url), 'utf8'));
 const NPM_NAME = 'dsh-composer-plus';
 const RELEASES_URL = 'https://api.github.com/repos/furkancak1r/dsh-composer-plus/releases/latest';
@@ -204,10 +207,11 @@ export async function checkUpdate(fetchImpl = fetch, pkg = PACKAGE, signal) {
   return { ...info, newer: npm.ok };
 }
 
-/** Mobile connect switch: `{ on: true }` in a JSON file, off when the file is missing or unreadable. */
-export function mobileSwitch(file) {
+/** A Host switch (Mobile connect, Content search): `{ on }` in an owner-only JSON file. A missing or unreadable file, or
+ * any value other than the opposite of `fallback`, reads as `fallback`. */
+export function mobileSwitch(file, fallback = false) {
   return {
-    read: async () => { try { return JSON.parse(await readFile(file, 'utf8'))?.on === true; } catch { return false; } },
+    read: async () => { try { const on = JSON.parse(await readFile(file, 'utf8'))?.on; return fallback ? on !== false : on === true; } catch { return fallback; } },
     write: async (on) => {
       await mkdir(dirname(file), { recursive: true });
       const tmp = `${file}.${process.pid}.tmp`;
@@ -435,10 +439,27 @@ Answer with one JSON array only, with no other text. Each element is an object w
 - "title": the feature name, at most 8 words.
 - "summary": what the feature does, 1 or 2 sentences.
 - "why": the benefit for the users, 1 sentence.
-- "effort": one of "small", "medium", "large".
-Write the text values in the language of the project brief.`;
+- "effort": one of "small", "medium", "large". Always write this value in English.`;
+/** A locale id such as "tr" or "pt-BR"; anything else is ignored, so the prompt never takes free text from the browser. */
+const LOCALE_ID = /^[a-z]{2,3}(-[a-z0-9]{2,8}){0,3}$/i;
+/** The language line of the idea prompt: the user's UI language when the client sends one, else the brief's language. */
+export function ideasLanguage(locale) {
+  if (typeof locale !== 'string' || !LOCALE_ID.test(locale)) return 'Write "title", "summary" and "why" in the language of the project brief.';
+  let name;
+  try { name = new Intl.DisplayNames(['en'], { type: 'language' }).of(locale); } catch { name = undefined; }
+  return `Write "title", "summary" and "why" in ${name && name !== locale ? `${name} (${locale})` : locale}, also when the project brief uses another language.`;
+}
 
 const clip = (value, max) => (typeof value === 'string' ? value.replace(/\s+/g, ' ').trim().slice(0, max) : '');
+/** One idea, cleaned and bounded (from the model or the browser), or undefined without a title and a summary. */
+const ideaFrom = (item) => {
+  const title = clip(item?.title, 120);
+  const summary = clip(item?.summary, 600);
+  if (title === '' || summary === '') return undefined;
+  const why = clip(item?.why, 300);
+  const effort = ['small', 'medium', 'large'].includes(item?.effort) ? item.effort : undefined;
+  return { title, summary, ...(why === '' ? {} : { why }), ...(effort === undefined ? {} : { effort }) };
+};
 /** Ideas from the model's answer: the first JSON array in it (a code fence is fine), each idea cleaned and bounded. Throws
  * when the answer holds no usable idea. */
 export function parseIdeas(text) {
@@ -450,11 +471,9 @@ export function parseIdeas(text) {
   if (!Array.isArray(list)) throw new Error('the model did not answer with a list of ideas');
   const ideas = [];
   for (const item of list) {
-    const title = clip(item?.title, 120);
-    const summary = clip(item?.summary, 600);
-    if (title === '' || summary === '') continue;
-    const effort = ['small', 'medium', 'large'].includes(item?.effort) ? item.effort : undefined;
-    ideas.push({ id: randomUUID(), title, summary, ...(clip(item?.why, 300) === '' ? {} : { why: clip(item.why, 300) }), ...(effort === undefined ? {} : { effort }) });
+    const idea = ideaFrom(item);
+    if (idea === undefined) continue;
+    ideas.push({ id: randomUUID(), ...idea });
     if (ideas.length === IDEAS_MAX) break;
   }
   if (ideas.length === 0) throw new Error('the model answered without a usable idea');
@@ -470,8 +489,9 @@ function ideasRoute(events, defaultModel) {
   return undefined;
 }
 
-/** One model call for feature ideas about the chat's project. Read-only: no chat message, nothing written to the project. */
-export async function suggestIdeas({ llm, sessionQuery, subprocess, defaultModel }, sessionId, signal) {
+/** One model call for feature ideas about the chat's project, written in `locale` (the dsh UI language) when given.
+ * Read-only: no chat message, nothing written to the project. */
+export async function suggestIdeas({ llm, sessionQuery, subprocess, defaultModel }, sessionId, signal, locale) {
   const observation = await sessionQuery.observeSession(sessionId, { signal, projectionMode: 'none' });
   let cwd, route;
   try { cwd = observation.header?.cwd; route = ideasRoute(observation.events ?? [], defaultModel); } finally { observation[Symbol.dispose]?.(); }
@@ -489,7 +509,7 @@ export async function suggestIdeas({ llm, sessionQuery, subprocess, defaultModel
   });
   let text = '';
   let finish;
-  for await (const chunk of call.stream({ ...call.config, system: IDEAS_SYSTEM, signal: callSignal,
+  for await (const chunk of call.stream({ ...call.config, system: `${IDEAS_SYSTEM}\n${ideasLanguage(locale)}`, signal: callSignal,
     messages: [{ role: 'user', content: [{ type: 'text', text: `Project folder name: ${cwd.split(/[\\/]/).filter(Boolean).at(-1) ?? ''}\n\n${brief}` }] }] })) {
     if (chunk.type === 'text-delta') text += chunk.text;
     else if (chunk.type === 'finish') finish = chunk.reason;
@@ -505,14 +525,20 @@ export function ideaPrompt(idea) {
     'First read the related code. Then plan the smallest change that delivers this feature, with the checks that prove it works.'].join('\n');
 }
 
+/** The chat's own project folder, from its session header (the browser never sends a path). */
+async function chatFolder(sessionQuery, sessionId, signal) {
+  const observation = await sessionQuery.observeSession(sessionId, { signal, projectionMode: 'none' });
+  let cwd;
+  try { cwd = observation.header?.cwd; } finally { observation[Symbol.dispose]?.(); }
+  if (!isText(cwd, 4096) || !isAbsolute(cwd)) throw Object.assign(new Error('this chat has no project folder'), { status: 409 });
+  return cwd;
+}
+
 /** Start a new chat in the same project (the same sidebar group as the source chat) for one accepted idea, and enter plan
  * mode with the idea as the request. When the profile has no /plan command, or /plan fails, the idea goes as an ordinary
  * message. */
 export async function startIdeaChat({ sessionController, sessionQuery, commands, workspaces }, sessionId, idea, signal = new AbortController().signal) {
-  const observation = await sessionQuery.observeSession(sessionId, { signal, projectionMode: 'none' });
-  let cwd;
-  try { cwd = observation.header?.cwd; } finally { observation[Symbol.dispose]?.(); }
-  if (!isText(cwd, 4096)) throw Object.assign(new Error('this chat has no project folder'), { status: 409 });
+  const cwd = await chatFolder(sessionQuery, sessionId, signal);
   let workspace;
   try { workspace = workspaces?.list?.().find((w) => w.sessionIds.includes(sessionId)); } catch { workspace = undefined; }
   const { sessionId: created } = await sessionController.create(workspace === undefined ? { cwd } : { workspaceId: workspace.id });
@@ -526,6 +552,46 @@ export async function startIdeaChat({ sessionController, sessionQuery, commands,
   return { sessionId: created, plan };
 }
 
+/** Ideas saved for later: at most this many per project. A full list refuses a new idea; it never drops an old one. */
+export const LATER_MAX = 50;
+/** Ideas saved for later, per project folder: `{ [cwd]: [{ id, title, summary, why?, effort?, at }] }` (newest first) in
+ * one owner-only JSON file. A missing file is an empty list. A broken file throws, so no write replaces it (no data loss).
+ * Reads and writes run in order; each write replaces the file atomically. */
+export function laterStore(file) {
+  let queue = Promise.resolve();
+  const run = (fn) => { const done = queue.then(fn); queue = done.catch(() => {}); return done; };
+  const read = async () => {
+    let text;
+    try { text = await readFile(file, 'utf8'); } catch (error) { if (error?.code === 'ENOENT') return {}; throw error; }
+    const data = JSON.parse(text);
+    if (data === null || typeof data !== 'object' || Array.isArray(data)) throw new Error('the saved ideas file is not a JSON object');
+    return data;
+  };
+  const clean = (list) => (Array.isArray(list) ? list.filter((i) => isText(i?.id) && isText(i?.title, 120) && isText(i?.summary, 600)) : []);
+  // Keys are absolute folder paths only, so a key such as `__proto__` never reaches the object.
+  const folder = (cwd) => { if (!isText(cwd, 4096) || !isAbsolute(cwd)) throw Object.assign(new Error('this chat has no project folder'), { status: 409 }); return cwd; };
+  const update = (cwd, fn) => run(async () => {
+    const data = await read();
+    const list = fn(clean(data[folder(cwd)]));
+    if (list.length === 0) delete data[cwd]; else data[cwd] = list;
+    await mkdir(dirname(file), { recursive: true });
+    const tmp = `${file}.${process.pid}.tmp`;
+    await writeFile(tmp, JSON.stringify(data), { mode: 0o600 });
+    await rename(tmp, file);
+    return list;
+  });
+  return {
+    list: (cwd) => run(async () => clean((await read())[folder(cwd)])),
+    /** Add a cleaned idea at the top; the same title (any case) is not added twice. */
+    add: (cwd, idea) => update(cwd, (list) => {
+      if (list.some((i) => i.title.toLowerCase() === idea.title.toLowerCase())) return list;
+      if (list.length >= LATER_MAX) throw Object.assign(new Error(`a project keeps at most ${LATER_MAX} ideas for later`), { status: 409 });
+      return [{ id: randomUUID(), ...idea, at: Date.now() }, ...list];
+    }),
+    remove: (cwd, id) => update(cwd, (list) => list.filter((i) => i.id !== id)),
+  };
+}
+
 const json = (value, status = 200) => Response.json(value, { status, headers: { 'cache-control': 'no-store' } });
 const isText = (v, max = 512) => typeof v === 'string' && v.length > 0 && v.length <= max;
 
@@ -678,14 +744,41 @@ export function apply(ctx) {
     },
   });
   installResume(ctx, home);
-  installIdeas(ctx);
+  installIdeas(ctx, home);
+  installContentSearch(ctx, home);
 }
 
-/** Feature ideas: `POST {sessionId}` asks the chat's model for ideas; `POST {sessionId, idea}` starts a chat for one idea.
- * Both act only on the chat's own project folder; the browser never sends a path. */
-function installIdeas(ctx) {
+/** Content search: dsh's own sidebar search also looks in message text. The work is dsh's (`cordis.patch.yml` opens its
+ * SQLite index when this switch is on); the Host only keeps the switch, on by default. dsh reads it at start, so
+ * `GET/POST {on}` also tells whether the running index is open (`active`; undefined when dsh does not say). */
+function installContentSearch(ctx, home) {
+  const saved = mobileSwitch(join(home, 'storages', 'dsh-composer-plus', 'content-search.json'), true);
+  const active = () => { try { const openAt = ctx.sessionQuery?.config?.openAt; return typeof openAt === 'string' ? openAt !== 'never' : undefined; } catch { return undefined; } };
+  let queue = Promise.resolve(); // one save at a time: they share a temp file name
+  ctx.connection.fetch.register({
+    path: CONTENT_SEARCH_PATH, methods: ['GET', 'POST'], requestBody: 'buffered',
+    fetch: async (request) => {
+      if (request.method === 'POST') {
+        let body;
+        try { body = await request.json(); } catch { return json({ error: 'bad request' }, 400); }
+        if (typeof body?.on !== 'boolean') return json({ error: 'bad request' }, 400);
+        const done = queue.then(() => saved.write(body.on));
+        queue = done.catch(() => {});
+        try { await done; } catch (error) { return json({ error: String(error?.message ?? error) }, 500); }
+      }
+      return json({ on: await saved.read(), active: active() });
+    },
+  });
+}
+
+/** Feature ideas: `POST {sessionId, locale?}` asks the chat's model for ideas; `POST {sessionId, idea}` starts a chat for one idea.
+ * Ideas saved for later: `GET ?sessionId` lists the project's ideas; `POST {sessionId, add | remove | start}` changes the list
+ * (`start` starts a chat for the stored idea and removes it once the chat runs). All act only on the chat's own project
+ * folder; the browser never sends a path. */
+function installIdeas(ctx, home) {
   const get = (name) => { try { return ctx.get?.(name); } catch { return undefined; } };
   const status = (error) => (Number.isInteger(error?.status) ? error.status : 502);
+  const services = () => ({ sessionController: ctx.sessionController, sessionQuery: ctx.sessionQuery, commands: get('commands'), workspaces: get('workspaceRegistry') });
   ctx.connection.fetch.register({
     path: IDEAS_PATH, methods: ['POST'], requestBody: 'buffered',
     fetch: async (request) => {
@@ -693,20 +786,47 @@ function installIdeas(ctx) {
       try { body = await request.json(); } catch { return json({ error: 'bad request' }, 400); }
       if (!isText(body?.sessionId)) return json({ error: 'bad request' }, 400);
       if (body.idea !== undefined) {
-        const idea = { title: clip(body.idea?.title, 120), summary: clip(body.idea?.summary, 600), why: clip(body.idea?.why, 300) || undefined };
-        if (idea.title === '' || idea.summary === '') return json({ error: 'bad request' }, 400);
+        const idea = ideaFrom(body.idea);
+        if (idea === undefined) return json({ error: 'bad request' }, 400);
         try {
-          return json(await startIdeaChat({ sessionController: ctx.sessionController, sessionQuery: ctx.sessionQuery, commands: get('commands'), workspaces: get('workspaceRegistry') },
-            body.sessionId, idea, request.signal));
+          return json(await startIdeaChat(services(), body.sessionId, { title: idea.title, summary: idea.summary, why: idea.why }, request.signal));
         } catch (error) { return json({ error: String(error?.message ?? error) }, status(error)); }
       }
       const llm = get('llm');
       if (llm === undefined) return json({ error: 'this dsh profile cannot call a model' }, 409);
       try {
-        return json(await suggestIdeas({ llm, sessionQuery: ctx.sessionQuery, subprocess: ctx.subprocess, defaultModel: get('agentDefaultModel') }, body.sessionId, request.signal));
+        return json(await suggestIdeas({ llm, sessionQuery: ctx.sessionQuery, subprocess: ctx.subprocess, defaultModel: get('agentDefaultModel') }, body.sessionId, request.signal, body.locale));
       } catch (error) { return json({ error: String(error?.message ?? error) }, status(error)); }
     },
   });
+  const later = laterStore(join(home, 'storages', 'dsh-composer-plus', 'later.json'));
+  const starting = new Set(); // `${cwd}\0${id}` of the stored ideas whose chat is starting now
+  ctx.connection.fetch.register({
+    path: LATER_PATH, methods: ['GET', 'POST'], requestBody: 'buffered',
+    fetch: async (request) => {
+      let body;
+      if (request.method === 'GET') body = { sessionId: new URL(request.url).searchParams.get('sessionId') };
+      else try { body = await request.json(); } catch { return json({ error: 'bad request' }, 400); }
+      if (!isText(body?.sessionId)) return json({ error: 'bad request' }, 400);
+      const add = body.add === undefined ? undefined : ideaFrom(body.add);
+      const action = request.method === 'GET' ? 'list' : body.add !== undefined ? 'add' : isText(body.remove) ? 'remove' : isText(body.start) ? 'start' : undefined;
+      if (action === undefined || (action === 'add' && add === undefined)) return json({ error: 'bad request' }, 400);
+      try {
+        const cwd = await chatFolder(ctx.sessionQuery, body.sessionId, request.signal);
+        if (action === 'list') return json({ ideas: await later.list(cwd) });
+        if (action === 'add') return json({ ideas: await later.add(cwd, add) });
+        if (action === 'remove') return json({ ideas: await later.remove(cwd, body.remove) });
+        const idea = (await later.list(cwd)).find((i) => i.id === body.start);
+        const key = `${cwd}\0${body.start}`;
+        if (idea === undefined || starting.has(key)) return json({ error: 'this idea is no longer in the list' }, 409);
+        starting.add(key);
+        try {
+          const started = await startIdeaChat(services(), body.sessionId, { title: idea.title, summary: idea.summary, why: idea.why }, request.signal);
+          return json({ ...started, ideas: await later.remove(cwd, idea.id) });
+        } finally { starting.delete(key); }
+      } catch (error) { return json({ error: String(error?.message ?? error) }, Number.isInteger(error?.status) ? error.status : 500); }
+    },
+  });
 }
 
 /** Resume after restart: follow the top-level chats, and once dsh is ready, continue the ones its last shutdown stopped.

package/locale/de.json

@@ -1,6 +1,6 @@
 {
   "meta": {
     "title": "Composer Plus",
-    "description": "Änderungsansicht, Karten mit Funktionsideen, Eingabeverlauf, Shift+Tab /plan, Fortsetzen mit einem Klick, Fortsetzen nach Neustart, Warteschlange per Drag-and-drop, Links, Benachrichtigungen, iPhone-Zugriff (Tether), 11 Sprachen und automatische Updates."
+    "description": "Änderungsansicht, Karten mit Funktionsideen, Suche in Nachrichten, Eingabeverlauf, Shift+Tab /plan, Fortsetzen mit einem Klick, Fortsetzen nach Neustart, Warteschlange per Drag-and-drop, Links, Benachrichtigungen, iPhone-Zugriff (Tether), 11 Sprachen und automatische Updates."
   }
 }

package/locale/en.json

@@ -1,6 +1,6 @@
 {
   "meta": {
     "title": "Composer Plus",
-    "description": "Changes panel, feature idea cards, input history, Shift+Tab /plan, one-click Continue, resume after restart, queue drag-and-drop, deeplinks, notifications, iPhone access (Tether), 11 UI languages and automatic updates."
+    "description": "Changes panel, feature idea cards, search in messages, input history, Shift+Tab /plan, one-click Continue, resume after restart, queue drag-and-drop, deeplinks, notifications, iPhone access (Tether), 11 UI languages and automatic updates."
   }
 }

package/locale/es.json

@@ -1,6 +1,6 @@
 {
   "meta": {
     "title": "Composer Plus",
-    "description": "Panel de cambios, tarjetas de ideas de funciones, historial de entrada, Shift+Tab /plan, Continuar con un clic, reanudar tras reiniciar, reordenar la cola arrastrando, enlaces, notificaciones, acceso desde iPhone (Tether), 11 idiomas y actualizaciones automáticas."
+    "description": "Panel de cambios, tarjetas de ideas de funciones, búsqueda en los mensajes, historial de entrada, Shift+Tab /plan, Continuar con un clic, reanudar tras reiniciar, reordenar la cola arrastrando, enlaces, notificaciones, acceso desde iPhone (Tether), 11 idiomas y actualizaciones automáticas."
   }
 }

package/locale/fr.json

@@ -1,6 +1,6 @@
 {
   "meta": {
     "title": "Composer Plus",
-    "description": "Panneau des modifications, cartes d’idées de fonctionnalités, historique de saisie, Shift+Tab /plan, Continuer en un clic, reprise après redémarrage, file réorganisable par glisser-déposer, liens, notifications, accès depuis l’iPhone (Tether), 11 langues et mises à jour automatiques."
+    "description": "Panneau des modifications, cartes d’idées de fonctionnalités, recherche dans les messages, historique de saisie, Shift+Tab /plan, Continuer en un clic, reprise après redémarrage, file réorganisable par glisser-déposer, liens, notifications, accès depuis l’iPhone (Tether), 11 langues et mises à jour automatiques."
   }
 }

package/locale/hi.json

@@ -1,6 +1,6 @@
 {
   "meta": {
     "title": "Composer Plus",
-    "description": "बदलाव पैनल, फ़ीचर आइडिया कार्ड, इनपुट इतिहास, Shift+Tab /plan, एक क्लिक में जारी रखें, रीस्टार्ट के बाद जारी रखें, कतार ड्रैग-एंड-ड्रॉप, लिंक, सूचनाएं, iPhone से एक्सेस (Tether), 11 भाषाएं और अपने-आप अपडेट।"
+    "description": "बदलाव पैनल, फ़ीचर आइडिया कार्ड, संदेशों में खोज, इनपुट इतिहास, Shift+Tab /plan, एक क्लिक में जारी रखें, रीस्टार्ट के बाद जारी रखें, कतार ड्रैग-एंड-ड्रॉप, लिंक, सूचनाएं, iPhone से एक्सेस (Tether), 11 भाषाएं और अपने-आप अपडेट।"
   }
 }

package/locale/id.json

@@ -1,6 +1,6 @@
 {
   "meta": {
     "title": "Composer Plus",
-    "description": "Panel perubahan, kartu ide fitur, riwayat input, Shift+Tab /plan, Lanjutkan sekali klik, lanjutkan setelah mulai ulang, urutkan antrean dengan seret, tautan, notifikasi, akses dari iPhone (Tether), 11 bahasa, dan pembaruan otomatis."
+    "description": "Panel perubahan, kartu ide fitur, pencarian isi pesan, riwayat input, Shift+Tab /plan, Lanjutkan sekali klik, lanjutkan setelah mulai ulang, urutkan antrean dengan seret, tautan, notifikasi, akses dari iPhone (Tether), 11 bahasa, dan pembaruan otomatis."
   }
 }

package/locale/ja.json

@@ -1,6 +1,6 @@
 {
   "meta": {
     "title": "Composer Plus",
-    "description": "変更パネル、機能アイデアのカード、入力履歴、Shift+Tab で /plan、ワンクリック続行、再起動後の再開、キューのドラッグ並べ替え、リンク、通知、iPhone からの操作（Tether）、11 言語、自動アップデート。"
+    "description": "変更パネル、機能アイデアのカード、メッセージ内容の検索、入力履歴、Shift+Tab で /plan、ワンクリック続行、再起動後の再開、キューのドラッグ並べ替え、リンク、通知、iPhone からの操作（Tether）、11 言語、自動アップデート。"
   }
 }

package/locale/ko.json

@@ -1,6 +1,6 @@
 {
   "meta": {
     "title": "Composer Plus",
-    "description": "변경 사항 패널, 기능 아이디어 카드, 입력 기록, Shift+Tab /plan, 원클릭 계속, 재시작 후 이어서 실행, 대기열 끌어서 정렬, 링크, 알림, iPhone 연결(Tether), 11개 언어와 자동 업데이트."
+    "description": "변경 사항 패널, 기능 아이디어 카드, 메시지 내용 검색, 입력 기록, Shift+Tab /plan, 원클릭 계속, 재시작 후 이어서 실행, 대기열 끌어서 정렬, 링크, 알림, iPhone 연결(Tether), 11개 언어와 자동 업데이트."
   }
 }

package/locale/pt-BR.json

@@ -1,6 +1,6 @@
 {
   "meta": {
     "title": "Composer Plus",
-    "description": "Painel de alterações, cartões de ideias de recursos, histórico de entrada, Shift+Tab /plan, Continuar com um clique, retomar após reiniciar, reordenar a fila arrastando, links, notificações, acesso pelo iPhone (Tether), 11 idiomas e atualizações automáticas."
+    "description": "Painel de alterações, cartões de ideias de recursos, pesquisa nas mensagens, histórico de entrada, Shift+Tab /plan, Continuar com um clique, retomar após reiniciar, reordenar a fila arrastando, links, notificações, acesso pelo iPhone (Tether), 11 idiomas e atualizações automáticas."
   }
 }

package/locale/ru.json

@@ -1,6 +1,6 @@
 {
   "meta": {
     "title": "Composer Plus",
-    "description": "Панель изменений, карточки идей функций, история ввода, Shift+Tab /plan, продолжение в один клик, продолжение после перезапуска, перетаскивание очереди, ссылки, уведомления, доступ с iPhone (Tether), 11 языков и автообновления."
+    "description": "Панель изменений, карточки идей функций, поиск по сообщениям, история ввода, Shift+Tab /plan, продолжение в один клик, продолжение после перезапуска, перетаскивание очереди, ссылки, уведомления, доступ с iPhone (Tether), 11 языков и автообновления."
   }
 }

package/locale/tr.json

@@ -1,6 +1,6 @@
 {
   "meta": {
     "title": "Composer Plus",
-    "description": "Değişiklikler paneli, özellik fikri kartları, giriş geçmişi, Shift+Tab /plan, tek tıkla devam, yeniden açılışta sürdürme, sıradaki mesajları sürükle-bırak, bağlantılar, bildirimler, iPhone’dan erişim (Tether), 11 arayüz dili ve otomatik güncellemeler."
+    "description": "Değişiklikler paneli, özellik fikri kartları, mesaj içeriğinde arama, giriş geçmişi, Shift+Tab /plan, tek tıkla devam, yeniden açılışta sürdürme, sıradaki mesajları sürükle-bırak, bağlantılar, bildirimler, iPhone’dan erişim (Tether), 11 arayüz dili ve otomatik güncellemeler."
   }
 }

package/locale/vi.json

@@ -1,6 +1,6 @@
 {
   "meta": {
     "title": "Composer Plus",
-    "description": "Bảng thay đổi, thẻ ý tưởng tính năng, lịch sử nhập, Shift+Tab /plan, Tiếp tục một chạm, tiếp tục sau khi khởi động lại, kéo thả hàng đợi, liên kết, thông báo, truy cập từ iPhone (Tether), 11 ngôn ngữ và tự động cập nhật."
+    "description": "Bảng thay đổi, thẻ ý tưởng tính năng, tìm trong nội dung tin nhắn, lịch sử nhập, Shift+Tab /plan, Tiếp tục một chạm, tiếp tục sau khi khởi động lại, kéo thả hàng đợi, liên kết, thông báo, truy cập từ iPhone (Tether), 11 ngôn ngữ và tự động cập nhật."
   }
 }

package/locale/zh.json

@@ -1,6 +1,6 @@
 {
   "meta": {
     "title": "Composer Plus",
-    "description": "改动面板、功能创意卡片、输入历史、Shift+Tab /plan、一键继续、重启后继续、队列拖拽排序、会话链接、通知、iPhone 远程使用（Tether）、11 种界面语言和自动更新。"
+    "description": "改动面板、功能创意卡片、消息内容搜索、输入历史、Shift+Tab /plan、一键继续、重启后继续、队列拖拽排序、会话链接、通知、iPhone 远程使用（Tether）、11 种界面语言和自动更新。"
   }
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "dsh-composer-plus",
-  "version": "1.7.0",
-  "description": "DeepSeek Harness helpers: 11 extra UI languages (Türkçe, Español, Français, Deutsch, 日本語…), Changes panel, swipe-card feature ideas, input history, Shift+Tab /plan, one-click Continue, resume running chats after a restart, queue drag-and-drop, deeplinks, Auto Review allow-for-chat, notifications, iPhone access with the Tether app, automatic updates",
+  "version": "1.8.0",
+  "description": "DeepSeek Harness helpers: 11 extra UI languages (Türkçe, Español, Français, Deutsch, 日本語…), Changes panel, swipe-card feature ideas, sidebar search in message text, input history, Shift+Tab /plan, one-click Continue, resume running chats after a restart, queue drag-and-drop, deeplinks, Auto Review allow-for-chat, notifications, iPhone access with the Tether app, automatic updates",
   "icon": "./assets/icon.svg",
   "license": "MIT",
   "type": "module",
@@ -25,6 +25,7 @@
     "dsh-plugin",
     "dsh-plugins",
     "feature-ideas",
+    "full-text-search",
     "git",
     "git-diff",
     "i18n",
@@ -41,6 +42,7 @@
     "remote-control",
     "restart",
     "resume",
+    "search",
     "sort-by-status",
     "tailscale",
     "tether",
@@ -67,7 +69,7 @@
     "assets/features/*.webp"
   ],
   "scripts": {
-    "test": "node scripts/build-locales.mjs --check && node test/locale.test.mjs && node test/continue.test.mjs && node test/continue-host.test.mjs && node test/resume-restart.test.mjs && node test/queue-drag.test.mjs && node test/plan-toggle.test.mjs && node test/keep-focus.test.mjs && node test/mobile-connect.test.mjs && node test/tether-gateway.test.mjs && node test/deeplink.test.mjs && node test/chat-grant.test.mjs && node test/notify.test.mjs && node test/changes.test.mjs && node test/feature-ideas.test.mjs && node test/feature-ideas-client.test.mjs && node test/project-status.test.mjs && node test/recent-projects.test.mjs && node test/project-tools.test.mjs && node test/status-order.test.mjs && node test/toggles.test.mjs && node test/update.test.mjs && node test/meta.test.mjs && node test/shots.test.mjs",
+    "test": "node scripts/build-locales.mjs --check && node test/locale.test.mjs && node test/continue.test.mjs && node test/continue-host.test.mjs && node test/resume-restart.test.mjs && node test/content-search.test.mjs && node test/queue-drag.test.mjs && node test/plan-toggle.test.mjs && node test/keep-focus.test.mjs && node test/mobile-connect.test.mjs && node test/tether-gateway.test.mjs && node test/deeplink.test.mjs && node test/chat-grant.test.mjs && node test/notify.test.mjs && node test/changes.test.mjs && node test/feature-ideas.test.mjs && node test/feature-ideas-client.test.mjs && node test/project-status.test.mjs && node test/recent-projects.test.mjs && node test/project-tools.test.mjs && node test/status-order.test.mjs && node test/toggles.test.mjs && node test/update.test.mjs && node test/meta.test.mjs && node test/shots.test.mjs",
     "build:locales": "node scripts/build-locales.mjs",
     "prepublishOnly": "npm test"
   },

package/tether/gateway/server.mjs

@@ -6,7 +6,7 @@ import { createServer as createHttp, request as httpRequest } from 'node:http'
 import { createHash, randomBytes, randomUUID, timingSafeEqual, X509Certificate } from 'node:crypto'
 import { chmodSync, existsSync, mkdirSync, readFileSync, writeFileSync } from 'node:fs'
 import { execFile, execFileSync, spawn } from 'node:child_process'
-import { homedir, networkInterfaces } from 'node:os'
+import { homedir, hostname, networkInterfaces } from 'node:os'
 import { dirname, join } from 'node:path'
 import { fileURLToPath } from 'node:url'
 
@@ -14,6 +14,14 @@ const HERE = dirname(fileURLToPath(import.meta.url))
 const TOKEN_TTL = 30 * 864e5
 const MAX_BODY = 16 << 20
 
+/** The name the phone shows for this Mac in its Mac picker: the Mac's own "Computer Name", else the host name. */
+export function macName(read = () => execFileSync('scutil', ['--get', 'ComputerName'], { encoding: 'utf8', timeout: 2000 })) {
+  let n = ''
+  try { n = String(read()).trim() } catch {}
+  if (!n) n = hostname().replace(/\.local$/i, '')
+  return n.replace(/[\u0000-\u001f]/g, '').slice(0, 64) || 'Mac'
+}
+
 // Allowlisted DSH remote methods. Everything else is 403.
 export const RPC = new Set([
   'session/list', 'session/page', 'session/create', 'session/rename', 'session/prompt', 'session/cancel',
@@ -220,6 +228,7 @@ export function createGateway(opts = {}) {
     const a = (networkInterfaces()[iface] ?? []).find(i => i.family === 'IPv4' && !i.internal)
     return a && { address: a.address, netmask: a.netmask }
   })
+  const mac = opts.macName ?? macName()
   const codeTtl = opts.codeTtlMs ?? 5 * 60e3
   const waterfallTtl = opts.waterfallTimeoutMs ?? 10 * 60e3
   mkdirSync(dir, { recursive: true, mode: 0o700 })
@@ -290,7 +299,7 @@ export function createGateway(opts = {}) {
   function newCode() {
     const net = bound ?? netInfo()
     code = { value: randomBytes(16).toString('base64url'), expires: Date.now() + codeTtl }
-    code.payload = JSON.stringify({ v: 1, host: net?.address, port, fp, code: code.value, ...(ts.online && ts.ip ? { ts: ts.ip } : {}) })
+    code.payload = JSON.stringify({ v: 1, host: net?.address, port, fp, code: code.value, mac, ...(ts.online && ts.ip ? { ts: ts.ip } : {}) })
     qrReady = false
     if (opts.qr !== false) {
       const c = code
@@ -320,7 +329,7 @@ export function createGateway(opts = {}) {
     const token = randomBytes(32).toString('base64url') // 256-bit; only its hash is stored
     const d = { id: randomUUID(), name: p.name, tokenHash: sha(token), createdAt: new Date().toISOString(), expiresAt: new Date(Date.now() + TOKEN_TTL).toISOString() }
     devices.push(d); saveDevices()
-    reply(p.res, 200, { token, deviceId: d.id, name: d.name, expiresAt: d.expiresAt })
+    reply(p.res, 200, { token, deviceId: d.id, name: d.name, expiresAt: d.expiresAt, mac })
     return true
   }
 
@@ -395,7 +404,7 @@ export function createGateway(opts = {}) {
     const dev = auth(req)
     if (!dev) { fail(ip); return reply(res, 401, { error: 'unauthorized' }) }
     track(dev.id, req.socket)
-    if (req.method === 'GET' && path === '/me') return reply(res, 200, { deviceId: dev.id, name: dev.name, expiresAt: dev.expiresAt, upstream: upState, tailscale: ts.online ? ts.ip : null })
+    if (req.method === 'GET' && path === '/me') return reply(res, 200, { deviceId: dev.id, name: dev.name, expiresAt: dev.expiresAt, upstream: upState, tailscale: ts.online ? ts.ip : null, mac })
     if (req.method !== 'POST' || !path.startsWith('/api/')) return reply(res, 404, { error: 'not found' })
     const method = path.slice(5)
     let body
@@ -475,7 +484,8 @@ export function createGateway(opts = {}) {
     await new Promise((ok, bad) => { s.once('error', bad); s.listen(port, net.bind ?? '::', ok) })
     server = s; bound = net; port = s.address().port; running = true
     if (opts.bonjour !== false) {
-      bonjour = spawn('dns-sd', ['-R', 'Tether', '_dshmobile._tcp', 'local', String(port), 'fp=' + fp], { stdio: 'ignore' })
+      // The service name is the Mac's name, so the phone's "Macs on this network" list tells two Macs apart.
+      bonjour = spawn('dns-sd', ['-R', mac, '_dshmobile._tcp', 'local', String(port), 'fp=' + fp], { stdio: 'ignore' })
       bonjour.on('error', () => {})
     }
     connectEvents()
@@ -505,7 +515,7 @@ export function createGateway(opts = {}) {
   watch.unref()
 
   const state = () => ({
-    running, address: bound?.address ?? netInfo()?.address ?? null, port, tls: running ? 'TLS 1.2+, self-signed' : 'off',
+    mac, running, address: bound?.address ?? netInfo()?.address ?? null, port, tls: running ? 'TLS 1.2+, self-signed' : 'off',
     fingerprint: fp ?? null, upstream: upState, tailscale: ts, lastTlsError,
     code: code && Date.now() < code.expires ? { payload: code.payload, expiresAt: new Date(code.expires).toISOString(), qr: qrReady } : null,
     pending: [...pending.values()].map(({ id, name, ip, at }) => ({ id, name, ip, at })),