@aiwuk/autocomplete 1.0.2 → 1.0.4

package/README.md

@@ -6,7 +6,7 @@ Part of [AIWUK Team for DSH](https://github.com/walke2019/dsh-capability-team) (
 dsh plugin add @aiwuk/autocomplete
 ```
 
-Requires DSH >= 0.2.2-rc.1 (below 0.3.0) and Node.js >= 22.
+Requires DSH >= 0.2.2-rc.1 (below 0.3.0) and Node.js >= 24.9.
 
 Composer autocomplete for DSH Web (`@aiwuk/autocomplete`, patch id `autocomplete`). The plugin name, description, settings and on-screen text follow the DSH language (Chinese / English).
 
@@ -86,4 +86,4 @@ Change them from **Settings → General** or the plugin's page under **Plugins**
 
 ## Development
 
-`client.js` is generated from `client/*.js`; edit the fragments and run `npm run build:autocomplete` from the repository root. Tests live in `tests/autocomplete/`.
+`client.js` is generated from `client/*.js` and is not tracked in git. It is built by `pretest`, by `prepack` (so `npm pack` and `npm publish` build it automatically) and by the CI "Build generated files" step. Edit the fragments, then run `npm run build:autocomplete` from the repository root. Tests live in `tests/autocomplete/`.

package/client.js

@@ -85,7 +85,11 @@ window.__ModuleLoader__.load({
       let rect = range.getBoundingClientRect();
       if (!rect.width && !rect.height) rect = range.getClientRects()[0] ?? rect;
       if ((!rect.width && !rect.height) || (!rect.top && !rect.left)) {
-        const node = range.startContainer, offset = range.startOffset;
+        let node = range.startContainer, offset = range.startOffset;
+        if (node?.nodeType === Node.ELEMENT_NODE && offset > 0) {
+          node = node.childNodes[offset - 1] || node;
+          offset = node.nodeType === Node.TEXT_NODE ? node.textContent?.length ?? 0 : node.childNodes?.length ?? 0;
+        }
         if (node?.nodeType === Node.TEXT_NODE && offset > 0) {
           const probe = document.createRange();
           probe.setStart(node, offset - 1); probe.setEnd(node, offset);
@@ -96,17 +100,17 @@ window.__ModuleLoader__.load({
       return !rect.width && !rect.height ? null : { left: rect.left, top: rect.top, height: rect.height };
     }
     /** The caret position, only when it sits at the end of the draft (continuations append, never splice). */
-    function caretAtEnd(editor, draft) {
+    function caretAtEnd(editor, _draft) {
       const selection = window.getSelection();
       if (!selection?.rangeCount) return null;
       const range = selection.getRangeAt(0);
       if (!range.collapsed || !editor.contains(range.startContainer)) return null;
-      const prefixRange = document.createRange();
-      prefixRange.selectNodeContents(editor);
-      prefixRange.setEnd(range.startContainer, range.startOffset);
-      const prefix = collapse(prefixRange.toString().trimEnd());
-      const rect = caretRect(range);
-      return rect && prefix && prefix === collapse(draft.trimEnd()) ? rect : null;
+      const suffix = document.createRange();
+      suffix.selectNodeContents(editor);
+      suffix.setStart(range.startContainer, range.startOffset);
+      if (suffix.toString().trim() !== '') return null;
+      if (!editor.textContent?.trim()) return null;
+      return caretRect(range);
     }
 
     const zh = {
@@ -198,7 +202,11 @@ window.__ModuleLoader__.load({
     function candidateOf(ghost, draft) {
       const raw = ghost.items.length ? ghost.items[Math.min(ghost.index, ghost.items.length - 1)] ?? ''
         : ghost.stream.trim().split(/\r?\n/)[0]?.replace(/^[-*0-9.)\s]+/, '') ?? '';
-      return ghost.mode === 'continue' && raw.startsWith(draft) ? raw.slice(draft.length) : raw;
+      if (ghost.mode !== 'continue') return raw;
+      if (raw.startsWith(draft)) return raw.slice(draft.length);
+      const lowerRaw = raw.toLowerCase(), lowerDraft = draft.toLowerCase();
+      if (lowerRaw.startsWith(lowerDraft)) return raw.slice(draft.length);
+      return raw;
     }
 
     /** Insert into the shell-owned draft; never submits. Falls back to the editor's own insert on older hosts. */
@@ -266,8 +274,38 @@ window.__ModuleLoader__.load({
         };
         measure();
         window.addEventListener('resize', measure);
-        return () => window.removeEventListener('resize', measure);
+        const scrollEl = anchorRef.current?.closest('[data-composer-card]')?.querySelector('[data-input-scroll]');
+        scrollEl?.addEventListener('scroll', measure, { passive: true });
+        return () => {
+          window.removeEventListener('resize', measure);
+          scrollEl?.removeEventListener('scroll', measure);
+        };
       }, [ghost.mode, draft, sessionId, current]);
+      React.useLayoutEffect(() => {
+        if (typeof document === 'undefined') return undefined;
+        const ID = 'aiwuk-autocomplete-ghost-style';
+        if (!document.getElementById(ID)) {
+          const tag = document.createElement('style');
+          tag.id = ID;
+          tag.textContent = '[data-aiwuk-ghost-next] [data-composer-placeholder]{visibility:hidden !important;}';
+          (document.head || document.documentElement).appendChild(tag);
+        }
+        const card = anchorRef.current?.closest('[data-composer-card]') || anchorRef.current?.parentElement;
+        if (!card) return undefined;
+        if (visible && ghost.mode === 'next') card.setAttribute('data-aiwuk-ghost-next', '');
+        else card.removeAttribute('data-aiwuk-ghost-next');
+        return () => { card.removeAttribute('data-aiwuk-ghost-next'); };
+      }, [visible, ghost.mode]);
+      React.useEffect(() => {
+        if (!visible) return undefined;
+        const onSelectionChange = () => {
+          const found = composerNear(anchorRef.current);
+          if (!found) return;
+          if (ghost.mode === 'continue' && !caretAtEnd(found.editor, draft)) setBox(null);
+        };
+        document.addEventListener('selectionchange', onSelectionChange);
+        return () => document.removeEventListener('selectionchange', onSelectionChange);
+      }, [visible, ghost.mode, draft]);
       React.useEffect(() => {
         if (!visible) return undefined;
         const onKeyDown = event => {
@@ -298,8 +336,8 @@ window.__ModuleLoader__.load({
       return h(React.Fragment, null, anchor,
         h('div', { key: 'ghost', 'data-composer-prediction': ghost.mode, style: { position: 'absolute', top: `${box.top}px`, left: `${box.left}px`,
           maxWidth: box.maxWidth ? `${box.maxWidth}px` : undefined, height: `${box.height}px`, display: 'flex', alignItems: 'center', gap: '6px',
-          color: 'var(--dsw-alias-label-tertiary, #888)', pointerEvents: 'none', userSelect: 'none', whiteSpace: 'nowrap', overflow: 'hidden', zIndex: 10 } },
-          h('span', { style: { overflow: 'hidden', textOverflow: 'ellipsis', opacity: 0.85 } }, current),
+          color: 'var(--dsw-alias-label-tertiary, #888)', pointerEvents: 'none', userSelect: 'none', whiteSpace: 'pre', overflow: 'hidden', zIndex: 10 } },
+          h('span', { style: { overflow: 'hidden', textOverflow: 'ellipsis', opacity: 0.85, whiteSpace: 'pre' } }, current),
           ghost.items.length > 1 ? h('span', { style: tag }, `${ghost.index + 1}/${ghost.items.length}`) : null,
           ghost.active ? null : h('kbd', { style: tag }, 'Tab')));
     }
@@ -1125,7 +1163,7 @@ window.__ModuleLoader__.load({
       },
     };
     // Test-only seam: harnesses may define window.__acTestHook; browsers never do.
-    if (typeof window.__acTestHook === 'function') window.__acTestHook({ ComposerOverlay, GhostOverlay, TouchSuggestionBar, TouchDock, TouchAskButton, touchStore, measureCardInset, AutocompleteSettings, parseSse, isTriggerToken, configOf, candidateOf, ENDPOINT, zh, en });
+    if (typeof window.__acTestHook === 'function') window.__acTestHook({ ComposerOverlay, GhostOverlay, TouchSuggestionBar, TouchDock, TouchAskButton, touchStore, measureCardInset, AutocompleteSettings, parseSse, isTriggerToken, configOf, candidateOf, caretAtEnd, caretRect, ENDPOINT, zh, en });
 
     return plugin;
   },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aiwuk/autocomplete",
-  "version": "1.0.2",
+  "version": "1.0.4",
   "type": "module",
   "description": "AIWUK Autocomplete, composer autocomplete for DeepSeek Harness (DSH) with inline continuation and next-message suggestions accepted with Tab, never sent automatically",
   "license": "MIT",
@@ -9,7 +9,7 @@
   "repository": { "type": "git", "url": "git+https://github.com/walke2019/dsh-capability-team.git", "directory": "packages/autocomplete" },
   "bugs": { "url": "https://github.com/walke2019/dsh-capability-team/issues" },
   "keywords": ["aiwuk", "dsh", "dsh-plugin", "deepseek-harness", "cordis", "autocomplete", "composer", "prediction", "llm"],
-  "engines": { "node": ">=22", "dsh": ">=0.2.2-rc.1 <0.3.0" },
+  "engines": { "node": ">=24.9", "dsh": ">=0.2.2-rc.1 <0.3.0" },
   "dependencies": { "@deepseek-ai/schemastery": "~3.18.5" },
   "peerDependencies": {
     "@deepseek-ai/cordis": ">=4.0.1",
@@ -23,7 +23,7 @@
   },
   "exports": { ".": "./index.js", "./client": "./client.js", "./locale/*.json": "./locale/*.json", "./i18n/*.json": "./i18n/*.json", "./icon": "./icon.svg" },
   "files": ["index.js", "predictor.js", "schema.js", "fleet-defaults.js", "managed-route.js", "client.js", "cordis.patch.yml", "locale/*.json", "i18n/*.json", "icon.svg", "README.md", "LICENSE"],
-  "scripts": { "build": "node scripts/build-client.mjs", "test": "node --test ../../tests/autocomplete/*.test.mjs" },
+  "scripts": { "build": "node scripts/build-client.mjs", "prepack": "node ../../shared-ui/build.mjs && node scripts/build-client.mjs", "test": "node --test ../../tests/autocomplete/*.test.mjs" },
   "dsh": {
     "bundle": { "patch": "./cordis.patch.yml" },
     "client": {