@banana-peeljj12/dsh-trellis 0.3.1 → 0.3.3

package/README.md

@@ -67,7 +67,8 @@ dsh plugin --profile web add @banana-peeljj12/dsh-trellis@latest
 为避免非预期介入，插件默认不会拦截未授权的目录。请在 Web 端或配置文件中添加生效路径：
 
 1. 打开 DSH Web 客户端，进入左下角 **设置 → 插件 → Trellis 工作流**；
-2. 在 **白名单项目 (allowlist)** 中添加需要启用该工作流的项目根目录绝对路径，保存后即时生效。
+2. 在 **白名单项目 (allowlist)** 中添加需要启用该工作流的项目根目录绝对路径——既可手动输入，
+   也可点击 **浏览…** 按钮弹出系统文件夹选择器直接选取，保存后即时生效。
 
 > **提示**：若希望在方案定稿前限制模型修改源码，可在该设置页同时开启 **规划期只读保护 (enforceReadonlyPlanning)** 开关。
 

package/README_EN.md

@@ -67,7 +67,7 @@ After installation, **restart the DSH service**.
 By default, the plugin will not intercept any unconfigured workspaces. Add your target workspace directory to the allowlist:
 
 1. Open the DSH Web UI and navigate to bottom-left **Settings → Plugins → Trellis Workflow**;
-2. Under **Allowed Projects (allowlist)**, add the absolute path of your workspace root directory and click Save (hot-reloaded).
+2. Under **Allowed Projects (allowlist)**, add the absolute path of your workspace root directory — either type it manually or click **Browse…** to pick a folder via the system folder picker, then click Save (hot-reloaded).
 
 > **Note**: To prevent the model from editing source code prior to plan approval, enable **Enforce Read-Only Planning (`enforceReadonlyPlanning`)** in the same settings panel.
 

package/lib/client.js

@@ -27,6 +27,14 @@ window.__ModuleLoader__.load({
 
     let react = require('react');
 
+    /**
+     * Module-level client root context, captured in apply(ctx). Components (slot
+     * registrations) do not receive ctx directly, but need host services such as
+     * `sidebarRight` (native document preview) at click time — this is the
+     * bridge. Null until apply runs, which happens before any component mounts.
+     */
+    let clientCtx = null;
+
     // #region lib/types/client/trellis-settings-tab.js
 
     /** Settings namespace registered by the Host half (see lib/meta.js). */
@@ -36,7 +44,7 @@ window.__ModuleLoader__.load({
     const LOCALE_NS = 'settings.trellisWorkflow';
 
     /** Services required by this client half. */
-    const inject = ['slots', 'locale', 'settingsScope'];
+    const inject = ['slots', 'locale', 'settingsScope', 'sidebarRight', 'workspaces'];
 
     const zh = {
       tab: 'Trellis 工作流',
@@ -57,6 +65,9 @@ window.__ModuleLoader__.load({
         '开启后，命中白名单的项目里：新对话（未建任务）只裁剪 write/edit 与任务写工具（trellis_task_update / trellis_artifact_update / trellis_task_archive / trellis_ui_update），其余工具（含其他插件的工具）保留；规划中的任务只裁剪 write/edit 与创建/跳过/归档类 trellis 工具，其余工具保留；经 trellis_task_skip 跳过任务的会话恢复完整工具。',
       saved: '已保存',
       writeFailed: '保存失败',
+      browse: '浏览…',
+      browseBusy: '选择中…',
+      browseFailed: '调用文件夹选择器失败，请手动输入路径',
       chipTitle: 'Trellis Task',
       chipNoTask: '无活动任务',
       chipNoSummary: '尚无状态，点击刷新',
@@ -94,6 +105,7 @@ window.__ModuleLoader__.load({
       sendToChat: '推进任务',
       sendToChatSuccess: '已填入输入框，回车即可发送',
       sendToChatFailed: '自动填入失败，已复制到剪贴板',
+      openFailed: '打开失败，文件引用已复制到剪贴板',
       pendingVerification: '待验证',
       blocked: '阻塞',
       open: '打开',
@@ -124,6 +136,9 @@ window.__ModuleLoader__.load({
       allowlistHint: 'Sessions whose cwd matches these project roots receive the workflow breadcrumb.',
       addPlaceholder: 'Project root path, e.g. F:/Projects/FordProject',
       add: 'Add',
+      browse: 'Browse…',
+      browseBusy: 'Picking…',
+      browseFailed: 'Could not open the directory picker — enter the path manually',
       remove: 'Remove',
       empty: '(empty)',
       injectStep: 'Inject step (injectStep)',
@@ -171,6 +186,7 @@ window.__ModuleLoader__.load({
       sendToChat: 'Push to chat',
       sendToChatSuccess: 'Filled into the input — press Enter to send',
       sendToChatFailed: 'Auto-fill failed, copied to clipboard',
+      openFailed: 'Failed to open — file reference copied to clipboard',
       pendingVerification: 'Verifying',
       blocked: 'Blocked',
       open: 'Open',
@@ -235,6 +251,50 @@ window.__ModuleLoader__.load({
         setDraftPath('');
       };
 
+      /**
+       * Folder picker browse button: open the Host's native directory picker
+       * (`ctx.workspaces.pickDirectory()`), normalize the picked path
+       * (backslashes → forward slashes) and append it to the allowlist
+       * directly (deduped). Cancel (`null`) is a no-op; failures surface the
+       * `browseFailed` copy and keep the manual input path untouched.
+       */
+      const [picking, setPicking] = react.useState(false);
+      const [pickError, setPickError] = react.useState(false);
+      react.useEffect(() => {
+        if (!pickError) return undefined;
+        const timer = setTimeout(() => setPickError(false), 2600);
+        return () => clearTimeout(timer);
+      }, [pickError]);
+
+      const browsePath = () => {
+        if (picking) return;
+        const workspaces = clientCtx && clientCtx.workspaces;
+        if (!workspaces || typeof workspaces.pickDirectory !== 'function') {
+          setPickError(true);
+          return;
+        }
+        setPicking(true);
+        // Reuse the saved-flag effect's timer slot: browse errors auto-clear
+        // via pickError's own effect above; picking ends on any outcome.
+        workspaces
+          .pickDirectory()
+          .then((picked) => {
+            setPicking(false);
+            if (picked === null || picked === undefined) return; // user cancelled
+            const normalized = String(picked).trim().replace(/\\/g, '/');
+            if (!normalized) {
+              setPickError(true);
+              return;
+            }
+            if (!allowlist.includes(normalized)) write('allowlist', allowlist.concat(normalized));
+            else setSaved(true); // already present — still confirm the click landed
+          })
+          .catch(() => {
+            setPicking(false);
+            setPickError(true);
+          });
+      };
+
       const rowStyle = { display: 'flex', gap: 8, alignItems: 'center', marginBottom: 6 };
       const inputStyle = {
         flex: 1,
@@ -293,8 +353,28 @@ window.__ModuleLoader__.load({
             onChange: (e) => setDraftPath(e.target.value),
             onKeyDown: (e) => { if (e.key === 'Enter') addPath(); },
           }),
+          react.createElement(
+            'button',
+            {
+              type: 'button',
+              style: { ...btnStyle, opacity: picking ? 0.6 : 1, cursor: picking ? 'wait' : 'pointer' },
+              disabled: picking,
+              onClick: browsePath,
+            },
+            picking ? t('browseBusy') : t('browse'),
+          ),
           react.createElement('button', { type: 'button', style: btnStyle, onClick: addPath }, t('add')),
         ),
+        pickError
+          ? react.createElement(
+              'p',
+              {
+                style: { margin: 0, color: 'var(--dsw-alias-state-error-primary)', fontSize: 12 },
+                role: 'alert',
+              },
+              t('browseFailed'),
+            )
+          : null,
         react.createElement('label', { style: labelStyle }, t('injectStep')),
         react.createElement('input', {
           type: 'number',
@@ -942,8 +1022,72 @@ window.__ModuleLoader__.load({
       return '@.trellis/tasks/' + task.slug + '/' + name;
     }
 
+    /**
+     * DSH-native file address for an artifact token. Mirrors the official
+     * `fileAddressFor` / `sessionFileAddress` contract
+     * (@deepseek-ai/dsh-client-ui-sidebar-files): the token's path (minus the
+     * leading `@`) is a workspace-relative path, so it maps to a session-scoped
+     * `dsh-resource://file/session/<sessionId>/<path>` address the right-sidebar
+     * document preview resolves against the session's workspace. Path segments
+     * are component-encoded, keeping `:` literal for drive letters.
+     * @param {string} sessionId the session whose workspace resolves the path.
+     * @param {string} token artifact token from {@link artifactToken}.
+     * @returns {string} `dsh-resource://file/session/...` address.
+     */
+    function artifactResourceUrl(sessionId, token) {
+      const path = (token || '').replace(/^@/, '');
+      const encodeSegment = (segment) => encodeURIComponent(segment).replace(/%3A/gi, ':');
+      const encodedPath = path
+        .replace(/\\/g, '/')
+        .split('/')
+        .map(encodeSegment)
+        .join('/');
+      return 'dsh-resource://file/session/' + encodeSegment(sessionId) + '/' + encodedPath;
+    }
+
+    /**
+     * Open an artifact file in the DSH-native document preview (right sidebar),
+     * mirroring how the official chat client opens `@file` references
+     * (`ctx.sidebarRight.openResource(...)`). Never touches the composer input.
+     * Falls back to copying the token to the clipboard when the right-sidebar
+     * service is unavailable or the open fails, so the click still yields
+     * something useful without polluting the input box.
+     * @param {object} ctx client root context (with `sidebarRight` injected).
+     * @param {string} sessionId the session owning the artifact's workspace.
+     * @param {string} token artifact token from {@link artifactToken}.
+     * @returns {boolean} true when opened natively; false when only copied.
+     */
+    function openArtifactFile(ctx, sessionId, token) {
+      try {
+        const sidebar = ctx && ctx.sidebarRight;
+        if (sidebar && typeof sidebar.openResource === 'function') {
+          sidebar.openResource(artifactResourceUrl(sessionId, token));
+          return true;
+        }
+      } catch {
+        /* fall through to clipboard copy */
+      }
+      try {
+        if (navigator.clipboard && navigator.clipboard.writeText) {
+          navigator.clipboard.writeText(token);
+        } else {
+          const ta = document.createElement('textarea');
+          ta.value = token;
+          ta.style.position = 'fixed';
+          ta.style.opacity = '0';
+          document.body.appendChild(ta);
+          ta.select();
+          document.execCommand('copy');
+          document.body.removeChild(ta);
+        }
+      } catch {
+        /* nothing more we can do */
+      }
+      return false;
+    }
+
     function KanbanDetails(props) {
-      const { task, t, active, busy, onActivate, onDeactivate, tracks } = props;
+      const { task, t, active, busy, onActivate, onDeactivate, tracks, onOpenArtifact } = props;
       // One-shot injection notice: 'ok' | 'fail' | null, auto-clears.
       const [notice, setNotice] = react.useState(null);
       react.useEffect(() => {
@@ -1276,7 +1420,11 @@ window.__ModuleLoader__.load({
                     textAlign: 'center',
                   },
                 },
-                notice === 'ok' ? t('sendToChatSuccess') : t('sendToChatFailed'),
+                notice === 'ok'
+                  ? t('sendToChatSuccess')
+                  : notice === 'open-fail'
+                    ? t('openFailed')
+                    : t('sendToChatFailed'),
               )
             : null,
         ),
@@ -1336,7 +1484,13 @@ window.__ModuleLoader__.load({
                       'button',
                       {
                         type: 'button',
-                        onClick: () => push(artifactToken(task, name)),
+                        onClick: () => {
+                          const token = artifactToken(task, name);
+                          const opened = onOpenArtifact ? onOpenArtifact(token) : false;
+                          // Notice only on failure: a successful native open is
+                          // visible in the right sidebar already, so no toast.
+                          setNotice(opened ? null : 'open-fail');
+                        },
                         title: t('open') + ' ' + artifactToken(task, name),
                         style: {
                           display: 'inline-flex',
@@ -1814,6 +1968,7 @@ window.__ModuleLoader__.load({
       const {
         board,
         t,
+        sessionId,
         selected,
         onSelect,
         busy,
@@ -1823,6 +1978,7 @@ window.__ModuleLoader__.load({
         onFilterChange,
         onClose,
         initialViewMode,
+        onOpenArtifact,
       } = props;
       const [query, setQuery] = react.useState('');
       const [viewMode, setViewMode] = react.useState(initialViewMode === 'list' ? 'list' : 'lanes'); // 'lanes' | 'list'
@@ -2424,6 +2580,7 @@ window.__ModuleLoader__.load({
               onActivate: () => onActivate(selectedTask.slug),
               onDeactivate,
               tracks,
+              onOpenArtifact: (token) => openArtifactFile(clientCtx, sessionId, token),
             }),
           ),
         ),
@@ -2812,6 +2969,7 @@ window.__ModuleLoader__.load({
         ? react.createElement(KanbanExpandedModal, {
             board,
             t,
+            sessionId,
             selected,
             onSelect: setSelected,
             busy,
@@ -2820,6 +2978,7 @@ window.__ModuleLoader__.load({
             filter,
             onFilterChange: setFilter,
             onClose: closeExpanded,
+            onOpenArtifact: (token) => openArtifactFile(clientCtx, sessionId, token),
           })
         : null;
 
@@ -2877,6 +3036,7 @@ window.__ModuleLoader__.load({
     // #endregion
 
     function apply(ctx) {
+      clientCtx = ctx;
       ctx.effect(() => ctx.locale.register(LOCALE_NS, { zh, en }), 'trellis-workflow: dictionaries');
       const t = ctx.locale.bind(LOCALE_NS);
       // Bound once on this plugin's fiber: the scope's disposer follows the fiber.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@banana-peeljj12/dsh-trellis",
-  "version": "0.3.1",
+  "version": "0.3.3",
   "description": "Self-contained Trellis workflow trigger for DeepSeek Harness: per-turn breadcrumb injection via agent/pre-step, a bundled skill provider, and DSH-native task/phase state resolution. No Trellis AGPL code is vendored; workflow semantics are rewritten and licensed MIT.",
   "type": "module",
   "main": "lib/index.js",