dsh-code-server-app 0.1.2 → 0.1.19

package/lib/index.js

@@ -63,6 +63,9 @@ export const Config = z.object({
   /** reserveComposer=true(默认)窗口不盖输入框(初始/缩放/最大化止于输入栏上方);
    *  false 时允许盖住输入框(最大化到视口底)。 */
   reserveComposer: z.boolean().default(true),
+  /** windowedOpen=false(默认)点击悬浮球打开内部浮动窗口;
+   *  true 时改为在浏览器新标签页打开 code-server(自动启动并跟随工作区)。 */
+  windowedOpen: z.boolean().default(false),
 });
 
 const DEFAULT_CONFIG = {
@@ -105,11 +108,10 @@ function win32() {
   return process.platform === 'win32';
 }
 
-/** 插件自带 code-server 入口探测,兼容三种依赖布局:
+/** 插件自带 code-server 入口探测,兼容两种依赖布局:
  *   1. profile 专用目录:profileRoot/.code-server-app/node_modules/code-server/...
  *      (方案 D 默认安装位,独立项目、避开 profile 依赖树冲突);
- *   2. npm/flat:插件目录/node_modules/code-server/...(工作区/独立 npm install);
- *   3. pnpm hoisted:profile node_modules/code-server/...(历史布局)。
+ *   2. 包内:插件目录/node_modules/code-server/...(开发期 link:/独立 npm install 布局)。
  *  不存在 → 回退配置/PATH。 */
 function bundledRuntimeEntry() {
   try {
@@ -117,8 +119,8 @@ function bundledRuntimeEntry() {
     const candidates = [
       // profile 专用目录:here=.../dsh-code-server/lib → ../..=node_modules → ../../..=profile根
       path.join(here, '..', '..', '..', '.code-server-app', 'node_modules', 'code-server', 'out', 'node', 'entry.js'),
+      // 包内(dev link / 独立目录):here=.../lib → ../node_modules
       path.join(here, '..', 'node_modules', 'code-server', 'out', 'node', 'entry.js'),
-      path.join(here, '..', '..', 'code-server', 'out', 'node', 'entry.js'),
     ];
     for (const entry of candidates) {
       if (fs.existsSync(entry)) return entry;
@@ -229,6 +231,7 @@ export async function apply(ctx, config) {
   // ---- 设置:行配置为种子;settings 命名空间持久化(设置卡片写入) ----
   const settingsSvc = ctx.get('settings');
   let reserveComposer = true;
+  let windowedOpen = false;
   if (settingsSvc !== undefined && typeof settingsSvc.register === 'function') {
     try {
       const scope = settingsSvc.register(SETTINGS_NS, Config);
@@ -236,15 +239,20 @@ export async function apply(ctx, config) {
       if (rawDoc !== undefined && rawDoc !== null) {
         const resolved = scope.get();
         reserveComposer = resolved && typeof resolved.reserveComposer === 'boolean' ? resolved.reserveComposer : true;
+        windowedOpen = resolved && typeof resolved.windowedOpen === 'boolean' ? resolved.windowedOpen : false;
       }
       scope.watch((next) => {
         if (next != null && typeof next.reserveComposer === 'boolean') {
           reserveComposer = next.reserveComposer;
           console.log(`[code-server] reserveComposer updated: ${reserveComposer}`);
         }
+        if (next != null && typeof next.windowedOpen === 'boolean') {
+          windowedOpen = next.windowedOpen;
+          console.log(`[code-server] windowedOpen updated: ${windowedOpen}`);
+        }
       });
     } catch (error) {
-      console.error(`[code-server] settings unavailable; using default reserveComposer=true: ${error.message}`);
+      console.error(`[code-server] settings unavailable; using defaults (reserveComposer=true, windowedOpen=false): ${error.message}`);
     }
   }
 
@@ -282,6 +290,7 @@ export async function apply(ctx, config) {
       logTail: state.logTail.slice(-LOG_TAIL_MAX),
       adopted: state.adopted,
       reserveComposer,
+      windowedOpen,
       env: state.env,
       setup: {
         running: state.setup.running,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "dsh-code-server-app",
-  "version": "0.1.2",
-  "description": "Integrate code-server (VS Code in the browser) into DSH Web: sidebar action + fullscreen overlay, host-side process lifecycle over a /code-server JSON API.",
+  "version": "0.1.19",
+  "description": "Integrate code-server (VS Code in the browser) into DSH Web: floating ball entry + fullscreen overlay, host-side process lifecycle over a /code-server JSON API (motion-based spring window animations).",
   "homepage": "https://github.com/jinsiyu/dsh-code-server-app",
   "repository": {
     "type": "git",
@@ -36,7 +36,12 @@
   ],
   "scripts": {
     "postinstall": "node scripts/setup-code-server.mjs",
-    "setup:code-server": "node scripts/setup-code-server.mjs"
+    "setup:code-server": "node scripts/setup-code-server.mjs",
+    "build:client": "node scripts/build-client.mjs"
+  },
+  "devDependencies": {
+    "esbuild": "^0.25.0",
+    "motion": "^12.0.0"
   },
   "license": "MIT",
   "allowScripts": {

package/scripts/setup-code-server.mjs

@@ -52,13 +52,11 @@ function profileRootOf() {
 function findCodeServer() {
   // 布局候选(与安装目标同顺序):
   //   1. profile 专用目录:profileRoot\code-server-app\node_modules\code-server
-  //   2. 与主包平级:profileRoot\node_modules\code-server(pnpm hoisted,历史布局)
-  //   3. 包内:pkgRoot/node_modules/code-server(回退/独立目录)
+  //   2. 包内:pkgRoot/node_modules/code-server(开发期 link:/独立目录)
   const profileRoot = profileRootOf();
   const cands = [];
   if (profileRoot !== null) {
     cands.push(join(profileRoot, APP_DIR_NAME, 'node_modules', 'code-server'));
-    cands.push(join(profileRoot, 'node_modules', 'code-server'));
   }
   cands.push(join(pkgRoot, 'node_modules', 'code-server'));
   for (const cand of cands) {