dsh-multi-folder 0.3.1 → 0.3.3

package/lib/client.js

@@ -27,17 +27,25 @@
  * (`ctx.connection.rpc.call('/api', endpoint, { args })`), keyed by workspace
  * path instead of sessionId.
  *
- * "Add directory" never asks the host for a picker: the plugin draws its own
- * browser (an editable path field, one level of child directories, an optional
- * "new folder") on the `multiFolder/browse` + `multiFolder/makeDir` endpoints
- * over the shared RPC channel. One interaction serves every deployment, which
- * the host's own picker cannot: `uiWorkspace.pickDirectory()` is native-only
- * (it answers `directory-picker/unavailable` whenever the host composed the
- * browse backend — a LAN bind, a remote client, a desktop shell), while its
- * `listDirectory`/`createDirectory` twins are refused under the native
- * composition. Listing this way also stays clear of the DSH Windows native
- * chooser worker, whose crash surfaces as `directory picker failed: … worker
- * exited …`.
+ * "Add directory" calls `multiFolder/pick`. A `native` host picker may fall back
+ * to an OS dialog; a `browse` capability opens this plugin's browser through
+ * `multiFolder/browse` and `multiFolder/makeDir`. Closing the panel cancels a
+ * pending pick. Dismissing a system dialog adds nothing.
+ *
+ * Every configured row also carries "open in the host file manager"
+ * (`multiFolder/reveal`), which puts the directory in Explorer/Finder where the
+ * user's own shell integrations live.
+ *
+ * `@` discovery for the configured directories. The shipped `@` menu is
+ * SINGLE-ROOT: `ui-reference` feeds it from `remote.fileReferences.list`, whose
+ * provider walks the addressed session's cwd and refuses every candidate
+ * outside that root, so a secondary directory can never appear there. This
+ * bundle therefore registers a COMPANION source on the same trigger (see "@
+ * discovery for secondaries" in `apply`) and answers it from
+ * `multiFolder/listFiles`. Sources are keyed by `(trigger, name)` and rendered
+ * one group each, so the shipped files/sessions group is untouched. The
+ * registration rides `ctx.inject` — a shell composing no input-trigger service
+ * keeps every panel surface and simply gains no `@` group.
  *
  * Layout shape: an entry in the session header action row, one chip row above
  * the composer card on the session-creation page, and a frame-wide overlay
@@ -96,6 +104,10 @@ window.__ModuleLoader__.load({
       browseDraft: '',
       /** "new folder" name draft. */
       newDirName: '',
+      /** A system pick is in flight. */
+      pickBusy: false,
+      /** Muted reason shown when the system picker FAILED and the browser took over. */
+      notice: null,
       /** Bumped on every workspaceCache write so chips re-read their count. */
       cacheRev: 0,
     };
@@ -221,6 +233,10 @@ window.__ModuleLoader__.load({
       'browse.newDirPlaceholder': '新建文件夹名称',
       'browse.newDirCreate': '创建',
       'browse.hint': '浏览宿主机文件系统；选中的目录将作为副工作目录添加。',
+      'panel.addBusy': '等待系统对话框…',
+      'panel.addBrowse': '改用内置浏览器选择…',
+      'panel.reveal': '在资源管理器中打开（宿主机）',
+      'panel.pickFailed': '系统目录选择器调用失败，已改用内置浏览器：{message}',
     };
     /** English dictionary — checked complete against the zh key set. */
     var enDict = {
@@ -258,6 +274,10 @@ window.__ModuleLoader__.load({
       'browse.newDirPlaceholder': 'New folder name',
       'browse.newDirCreate': 'Create',
       'browse.hint': 'Browses the host filesystem; the chosen directory is added as a secondary working directory.',
+      'panel.addBusy': 'Waiting for the system dialog…',
+      'panel.addBrowse': 'Use the built-in browser instead…',
+      'panel.reveal': 'Open in the host file manager',
+      'panel.pickFailed': 'The system picker failed; using the built-in browser: {message}',
     };
 
     // ------------------------------------------------------------- plugin
@@ -286,16 +306,37 @@ window.__ModuleLoader__.load({
        *  the `t` seat the renderer synthesizes from the declared
        *  `locale:` namespace (which also re-renders them on locale switch). */
       var t = locale.bind(NS);
+      var activePick = null;
+
+      function cancelPick() {
+        if (!activePick) return;
+        activePick.abort();
+        activePick = null;
+        patch({ pickBusy: false });
+      }
+
+      function closePanel() {
+        cancelPick();
+        patch({ open: false });
+      }
+
+      ctx.effect(function () {
+        return function () {
+          var controller = activePick;
+          activePick = null;
+          if (controller) controller.abort();
+        };
+      }, 'dsh-multi-folder: cancel picker on unload');
 
       // -------------------------------------------------- sessionless RPC
       /** Call one `multiFolder/*` endpoint over the shared /api channel.
        *  The Host gateway answers with the same `{ ok, value }` envelope as
        *  the command remote; business errors surface as thrown Errors. */
-      function remoteCall(endpoint, args) {
+      function remoteCall(endpoint, args, signal) {
         if (!connection || !connection.rpc || typeof connection.rpc.call !== 'function') {
           return Promise.reject(new Error('multi-folder: the shared RPC channel (connection service) is unavailable'));
         }
-        return connection.rpc.call('/api', endpoint, { args: args }).then(function (envelope) {
+        return connection.rpc.call('/api', endpoint, { args: args }, signal).then(function (envelope) {
           if (!envelope || envelope.ok !== true) {
             var message = envelope && envelope.error !== undefined
               ? String(envelope.error.message !== undefined ? envelope.error.message : envelope.error)
@@ -371,6 +412,7 @@ window.__ModuleLoader__.load({
        *  renders it as its own popover, everything else uses the overlay. */
       function openForWorkspace(workspacePath, anchor) {
         var seat = anchor || 'overlay';
+        cancelPick();
         patch(browserReset());
         if (!workspacePath) {
           patch({ open: true, mode: 'workspace', sessionId: null, workspace: null, dirs: [], error: null, anchor: seat });
@@ -447,11 +489,8 @@ window.__ModuleLoader__.load({
       }
 
       // -------------------------------------------- owned directory browser
-      // "Add directory" is served entirely by this plugin (host item 8): the
-      // browser reads levels over `multiFolder/browse` and may create one child
-      // through `multiFolder/makeDir`, so the interaction never depends on the
-      // host's composed directory picker — the native chooser, the browse
-      // backend and a shell with no picker at all all behave the same here.
+      // The owned browser reads levels over `multiFolder/browse` and creates
+      // directories through `multiFolder/makeDir`.
 
       /** Read one level into the store. A blank path asks the host for its
        *  home directory, so the browser always has somewhere to start. */
@@ -475,9 +514,11 @@ window.__ModuleLoader__.load({
         });
       }
 
-      /** Open the browser at the panel's workspace (or the host home when the
-       *  panel has no workspace path yet) and read its first level. */
-      function addDirectory() {
+      /** Open the OWNED browser at the panel's workspace (or the host home when
+       *  the panel has no workspace path yet) and read its first level. Reachable
+       *  from the panel at all times, and the automatic destination whenever the
+       *  system picker cannot answer. */
+      function openOwnedBrowser() {
         var snapshot = getSnapshot();
         patch({
           browseOpen: true,
@@ -490,6 +531,35 @@ window.__ModuleLoader__.load({
         browseTo(snapshot.workspace || '');
       }
 
+      /** Pick a directory, or open the owned browser when no system picker answers. */
+      function addDirectory() {
+        var snapshot = getSnapshot();
+        if (snapshot.pickBusy) return Promise.resolve();
+        var controller = new AbortController();
+        activePick = controller;
+        patch({ pickBusy: true, error: null, notice: null });
+        return remoteCall('multiFolder/pick', { cwd: snapshot.workspace || '' }, controller.signal).then(
+          function (value) {
+            if (activePick !== controller) return undefined;
+            activePick = null;
+            patch({ pickBusy: false });
+            var picked = value && typeof value.path === 'string' && value.path !== '' ? value.path : null;
+            if (picked) return commitBrowsePath(picked);
+            if (value && (value.via === 'host-native' || value.via === 'os-dialog')) return undefined;
+            return openOwnedBrowser();
+          },
+          function (error) {
+            if (activePick !== controller) return undefined;
+            activePick = null;
+            patch({
+              pickBusy: false,
+              notice: t('panel.pickFailed', { message: String(error && error.message ? error.message : error) }),
+            });
+            return openOwnedBrowser();
+          },
+        );
+      }
+
       /** Leave the browser without adding anything. */
       function closeBrowser() {
         patch(browserReset());
@@ -499,7 +569,7 @@ window.__ModuleLoader__.load({
        *  fresh open of the panel (header button, chip, launcher) starts there,
        *  so a browser left open by a dismissed panel never comes back stale. */
       function browserReset() {
-        return { browseOpen: false, browse: null, browseBusy: false, browseError: null, newDirName: '' };
+        return { browseOpen: false, browse: null, browseBusy: false, browseError: null, newDirName: '', notice: null };
       }
 
       /** Adopt one path as a secondary working directory through the channel
@@ -542,6 +612,7 @@ window.__ModuleLoader__.load({
       function openFor(sessionId) {
         if (!sessionId) return;
         var cached = sessionCache[sessionId];
+        cancelPick();
         patch(browserReset());
         patch({
           open: true,
@@ -583,7 +654,7 @@ window.__ModuleLoader__.load({
               var current = getSnapshot();
               var isOpen = current.open && current.sessionId === sessionId;
               if (isOpen) {
-                patch({ open: false });
+                closePanel();
               } else {
                 openFor(sessionId);
               }
@@ -677,7 +748,7 @@ window.__ModuleLoader__.load({
               {
                 type: 'button',
                 title: t('title.close'),
-                onClick: function () { closeBrowser(); patch({ open: false }); },
+                onClick: function () { closePanel(); },
                 style: { padding: '2px 8px', borderRadius: 6, border: '1px solid transparent', background: 'transparent', color: TOKEN.inkMuted, cursor: 'pointer' },
               },
               '✕',
@@ -742,6 +813,9 @@ window.__ModuleLoader__.load({
           store.browseError
             ? React.createElement('div', { style: { marginBottom: 8, color: TOKEN.danger, whiteSpace: 'pre-wrap', fontSize: 12 } }, String(store.browseError))
             : null,
+          store.notice
+            ? React.createElement('div', { style: { marginBottom: 8, color: TOKEN.inkMuted, whiteSpace: 'pre-wrap', fontSize: 11 } }, String(store.notice))
+            : null,
           React.createElement(
             'div',
             { style: { maxHeight: 200, overflowY: 'auto', marginBottom: 6 } },
@@ -824,6 +898,22 @@ window.__ModuleLoader__.load({
               },
               dir,
             ),
+            React.createElement(
+              'button',
+              {
+                type: 'button',
+                title: t('panel.reveal'),
+                disabled: !usable,
+                onClick: function () {
+                  patch({ error: null });
+                  remoteCall('multiFolder/reveal', { path: dir }).catch(function (e) {
+                    patch({ error: String(e && e.message ? e.message : e) });
+                  });
+                },
+                style: { padding: '2px 6px', borderRadius: 6, border: '1px solid transparent', background: 'transparent', color: TOKEN.inkMuted, cursor: 'pointer' },
+              },
+              '📂',
+            ),
             React.createElement(
               'button',
               {
@@ -853,7 +943,7 @@ window.__ModuleLoader__.load({
               {
                 type: 'button',
                 title: t('title.close'),
-                onClick: function () { patch({ open: false }); },
+                onClick: function () { closePanel(); },
                 style: { padding: '2px 8px', borderRadius: 6, border: '1px solid transparent', background: 'transparent', color: TOKEN.inkMuted, cursor: 'pointer' },
               },
               '✕',
@@ -885,7 +975,7 @@ window.__ModuleLoader__.load({
               'button',
               {
                 type: 'button',
-                disabled: !!store.busy || !usable,
+                disabled: !!store.busy || !!store.pickBusy || !usable,
                 onClick: function () { addDirectory(); },
                 style: {
                   flex: 1,
@@ -894,11 +984,11 @@ window.__ModuleLoader__.load({
                   border: '1px solid ' + TOKEN.border,
                   background: TOKEN.fill,
                   color: TOKEN.ink,
-                  cursor: store.busy || !usable ? 'default' : 'pointer',
-                  opacity: store.busy || !usable ? 0.6 : 1,
+                  cursor: store.busy || store.pickBusy || !usable ? 'default' : 'pointer',
+                  opacity: store.busy || store.pickBusy || !usable ? 0.6 : 1,
                 },
               },
-              store.busy ? t('panel.adding') : t('panel.add'),
+              store.busy ? t('panel.adding') : (store.pickBusy ? t('panel.addBusy') : t('panel.add')),
             ),
             React.createElement(
               'button',
@@ -925,6 +1015,26 @@ window.__ModuleLoader__.load({
               t('panel.refresh'),
             ),
           ),
+          React.createElement(
+            'button',
+            {
+              type: 'button',
+              disabled: !!store.busy || !!store.pickBusy || !usable,
+              onClick: function () { openOwnedBrowser(); },
+              style: {
+                marginBottom: 6,
+                padding: 0,
+                border: '1px solid transparent',
+                background: 'transparent',
+                color: TOKEN.inkMuted,
+                fontSize: 11,
+                textAlign: 'left',
+                cursor: store.busy || store.pickBusy || !usable ? 'default' : 'pointer',
+                opacity: store.busy || store.pickBusy || !usable ? 0.5 : 1,
+              },
+            },
+            t('panel.addBrowse'),
+          ),
           React.createElement(
             'div',
             {
@@ -1019,7 +1129,7 @@ window.__ModuleLoader__.load({
       /** Click-outside catcher for an open popover. */
       function Backdrop() {
         return React.createElement('div', {
-          onClick: function () { patch({ open: false }); },
+          onClick: function () { closePanel(); },
           style: { position: 'fixed', inset: 0, zIndex: 30 },
         });
       }
@@ -1190,7 +1300,7 @@ window.__ModuleLoader__.load({
               label: count !== null && count > 0 ? t('label.withCount', { count: count }) : t('label'),
               onClick: function () {
                 if (open) {
-                  patch({ open: false });
+                  closePanel();
                 } else {
                   openForWorkspace(workspacePath, 'dock');
                 }
@@ -1304,7 +1414,7 @@ window.__ModuleLoader__.load({
             label: count !== null && count > 0 ? t('label.withCount', { count: count }) : t('label'),
             onClick: function () {
               if (open) {
-                patch({ open: false });
+                closePanel();
               } else {
                 openForWorkspace(workspacePath, 'extras');
               }
@@ -1361,6 +1471,154 @@ window.__ModuleLoader__.load({
           release();
         };
       });
+
+      // ------------------------------------- @ discovery for secondaries
+      // The shipped `@` menu is SINGLE-ROOT: `ui-reference` feeds it from
+      // `remote.fileReferences.list`, whose provider walks the addressed
+      // session's cwd and refuses any candidate outside that root. A configured
+      // secondary directory is by definition outside it, so this plugin
+      // registers a COMPANION source on the same trigger and answers it from
+      // `multiFolder/listFiles`.
+      //
+      // The trigger registry keys sources by `(trigger, name)` and renders one
+      // group per source, so the shipped files/sessions group is untouched and
+      // this group appears beside it (order 10 = below the shipped group, which
+      // defaults to 0). `showGroupTitle: false` is deliberate: the menu derives
+      // a group's title by looking its SOURCE NAME up in its own dictionary, so
+      // a visible title would read "multi-folder", and a group whose query found
+      // nothing would otherwise render that heading over an empty list. Every
+      // row instead carries a `section`, which heads the rows by directory.
+      //
+      // `ctx.inject` rather than a hard `inject` entry: a shell that composes
+      // no input-trigger service must keep its panel, and on such a shell this
+      // contribution simply never activates.
+
+      /** Last path segment, tolerant of either separator. */
+      function lastSegment(path) {
+        var parts = String(path).replace(/[\\/]+$/, '').split(/[\\/]/);
+        return parts.length === 0 ? '' : parts[parts.length - 1];
+      }
+
+      /** Drop the host home prefix from a heading when the path sits under it. */
+      function abbreviate(path) {
+        var home = remote && remote.$host ? remote.$host.home : undefined;
+        if (!home) return path;
+        var flat = String(path).replace(/\\/g, '/');
+        var prefix = String(home).replace(/\\/g, '/');
+        if (flat.toLowerCase().indexOf(prefix.toLowerCase()) !== 0) return path;
+        return '~' + flat.slice(prefix.length);
+      }
+
+      /** Mention text for one discovered path. Mirrors the shipped
+       *  `formatFileMention` grammar — whitespace quotes the path, a quoted
+       *  directory keeps its quote open so completion can descend, and a path
+       *  with control characters or an embedded quote is unrepresentable.
+       *  Reimplemented here because this bundle is standalone (no build step)
+       *  and cannot import that package's module. */
+      function formatMention(path, kind, preserveQuote) {
+        var text = kind === 'directory' ? path + '/' : path;
+        if (/[\u0000-\u001f\u007f-\u009f"]/.test(text)) return undefined;
+        if (!preserveQuote && !/\s/.test(text)) return '@' + text;
+        return kind === 'directory' ? '@"' + text : '@"' + text + '"';
+      }
+
+      /** The source-owned payload one menu row carries. */
+      function rowValue(value) {
+        if (typeof value !== 'string') return undefined;
+        try {
+          var parsed = JSON.parse(value);
+          return parsed && typeof parsed.mention === 'string' ? parsed : undefined;
+        } catch (e) {
+          return undefined;
+        }
+      }
+
+      /** Project one host candidate onto a menu row (or nothing when the path
+       *  cannot be written back as mention text). */
+      function fileRow(candidate, preserveQuote, heading) {
+        var path = String(candidate.path || '').replace(/\\/g, '/');
+        var kind = candidate.kind === 'directory' ? 'directory' : 'file';
+        var mention = formatMention(path, kind, preserveQuote);
+        if (mention === undefined) return [];
+        var rel = String(candidate.rel || '');
+        var name = rel === '' ? lastSegment(path) : lastSegment(rel);
+        var slash = rel.lastIndexOf('/');
+        var parent = slash < 0 ? '' : rel.slice(0, slash);
+        return [{
+          name: kind === 'directory' ? name + '/' : name,
+          // The in-directory location only: the heading above the row already
+          // names the directory, so repeating it there says nothing.
+          ...(parent === '' ? {} : { description: parent }),
+          icon: kind === 'directory' ? 'folder' : 'file',
+          section: heading,
+          value: JSON.stringify({ kind: kind, path: path, mention: mention }),
+          ...(kind === 'directory' ? { drill: true } : {}),
+        }];
+      }
+
+      ctx.inject(['inputTriggers'], function (scope) {
+        var registry = scope.inputTriggers;
+        if (!registry || typeof registry.registerSource !== 'function') return;
+        scope.effect(function () {
+          return registry.registerSource({
+            trigger: '@',
+            name: NS,
+            order: 10,
+            // The menu titles a group from its source name via its OWN
+            // dictionary (an unknown key renders verbatim), so the title row is
+            // switched off: rows are headed by their directory section instead,
+            // and an empty result renders nothing at all.
+            showGroupTitle: false,
+            candidates: function (session, request) {
+              var summary = sessions.list.getSnapshot().byId[session.sessionId];
+              var workspace = summary && summary.cwd;
+              if (!workspace) return Promise.resolve([]);
+              var preserveQuote = request.quoted === true;
+              return remoteCall('multiFolder/listFiles', { workspace: workspace, query: request.query }).then(
+                function (value) {
+                  var items = value && Array.isArray(value.candidates) ? value.candidates : [];
+                  var rows = [];
+                  for (var i = 0; i < items.length; i += 1) {
+                    var item = items[i];
+                    rows = rows.concat(fileRow(item, preserveQuote, abbreviate(String(item.dir || ''))));
+                  }
+                  return rows;
+                },
+                // Autocomplete is advisory: a discovery failure is an empty
+                // group, never a broken composer and never a failed send.
+                function () { return []; },
+              );
+            },
+            onPick: function (pick) {
+              var chosen = rowValue(pick.candidate.value);
+              if (chosen === undefined) return undefined;
+              var name = lastSegment(chosen.path);
+              // Tab / the row chevron refines the query in place instead of
+              // settling the pick, so a directory descends one level: the
+              // mention text becomes the live query, and the host resolves the
+              // absolute spelling it just produced.
+              if (chosen.kind === 'directory' && pick.action === 'drill') {
+                return { text: chosen.mention, continue: true };
+              }
+              return {
+                insert: {
+                  source: NS,
+                  ref: chosen.mention,
+                  label: chosen.kind === 'directory' ? name + '/' : name,
+                  appearance: chosen.kind === 'directory' ? 'folder' : 'file',
+                  clipboardText: chosen.mention,
+                },
+              };
+            },
+            // The mention IS the model form (an `@path` token the prompt
+            // grammar already defines), so serialization is the identity.
+            codec: {
+              clipboardText: function (ref) { return ref; },
+              serialize: function (ref) { return Promise.resolve(ref); },
+            },
+          });
+        }, 'dsh-multi-folder: @ discovery source');
+      });
     }
 
     exports.name = name;