minecraft-dev-starter 0.1.4 → 0.1.5

package/README.md

@@ -60,6 +60,7 @@ dsh plugin --profile desktop remove minecraft-dev-starter
   name: minecraft-dev-starter
   config:
     autoOpenLogTab: true
+    logDock: right          # right：DSH 原生右侧栏；bottom：dsh-better-sidebar 的底部工作台
     readyTimeoutMs: 90000
     logRingLines: 2000
 ```
@@ -67,9 +68,12 @@ dsh plugin --profile desktop remove minecraft-dev-starter
 | 配置项 | 类型 | 默认值 | 说明 |
 |---|---|---|---|
 | `autoOpenLogTab` | boolean | `true` | 启动后自动打开运行日志标签页 |
+| `logDock` | `right` \| `bottom` | `right` | 日志打开位置。`bottom` 需要安装 dsh-better-sidebar；未安装时自动回退到右侧栏 |
 | `readyTimeoutMs` | number | `90000` | 等待进入运行状态的超时时间；超时不计为失败 |
 | `logRingLines` | number | `2000` | 内存中保留的日志行数；磁盘上的日志始终完整 |
 
+`logDock` 只影响「自动打开」与面板里的「打开日志」按钮；无论配置为何，两个标签页都同时存在于原生右侧栏与 better-sidebar 的页签列表中，可随时手动打开。
+
 ## 兼容范围
 
 | 平台 | 版本范围 | 说明 |

package/lib/client.js

@@ -238,9 +238,19 @@ async function call(method, payload) {
   return body.result;
 }
 
+// src/client/dock.js
+var LOG_DOCK_RIGHT = "right";
+var LOG_DOCK_BOTTOM = "bottom";
+function chooseLogDock(config, hasBetterSidebar) {
+  if (hasBetterSidebar !== true) return LOG_DOCK_RIGHT;
+  return config?.logDock === LOG_DOCK_BOTTOM ? LOG_DOCK_BOTTOM : LOG_DOCK_RIGHT;
+}
+
 // src/client/runtime.js
 var DETAIL_KIND = "mcdev.detail";
 var LOG_KIND = "mcdev.logs";
+var BETTER_DETAIL_ID = "minecraft-dev-starter:project";
+var BETTER_LOG_ID = "minecraft-dev-starter:logs";
 var runtime = {};
 function open(kind) {
   const sidebar = runtime.ctx?.sidebarRight;
@@ -252,10 +262,25 @@ function open(kind) {
     return false;
   }
 }
+function betterSidebar() {
+  try {
+    return runtime.ctx?.get?.("betterSidebar", false);
+  } catch {
+    return void 0;
+  }
+}
 function openDetailTab() {
   return open(DETAIL_KIND);
 }
-function openLogTab() {
+function openLogTab(config) {
+  const service = betterSidebar();
+  if (chooseLogDock(config, service !== void 0) === LOG_DOCK_BOTTOM) {
+    try {
+      service.openTab({ type: BETTER_LOG_ID, title: "\u8FD0\u884C\u65E5\u5FD7", target: "bottom" });
+      return true;
+    } catch {
+    }
+  }
   return open(LOG_KIND);
 }
 
@@ -296,15 +321,15 @@ var store = createStore({
   flyoutOpen: false,
   /** @type {Record<string, string>} 每个工程记住的目标 key */
   selection: readSelection(),
-  /** @type {{ autoOpenLogTab?: boolean }} 宿主下发的部署配置 */
-  config: { autoOpenLogTab: true },
+  /** @type {{ autoOpenLogTab?: boolean, logDock?: 'right' | 'bottom' }} 宿主下发的部署配置 */
+  config: { autoOpenLogTab: true, logDock: "right" },
   /** @type {string | undefined} 当前会话的工作区（由胶囊从会话上下文注入） */
   workspaceRoot: void 0
 });
 async function loadStateInfo() {
   try {
     const info = await call("state.info", {});
-    store.set({ config: { autoOpenLogTab: true, ...info?.config ?? {} } });
+    store.set({ config: { autoOpenLogTab: true, logDock: "right", ...info?.config ?? {} } });
   } catch {
   }
 }
@@ -396,7 +421,7 @@ async function startTarget(project, target) {
       kind: target.kind,
       module: target.module
     });
-    if (store.get().config.autoOpenLogTab !== false) openLogTab();
+    if (store.get().config.autoOpenLogTab !== false) openLogTab(store.get().config);
   } catch (error) {
     launchStore.set({ error: error instanceof Error ? error.message : String(error) });
   } finally {
@@ -837,7 +862,7 @@ function DetailTab() {
           ),
           h(
             "button",
-            { type: "button", className: "mcdev-run", onClick: () => openLogTab() },
+            { type: "button", className: "mcdev-run", onClick: () => openLogTab(store.get().config) },
             "\u6253\u5F00\u65E5\u5FD7"
           )
         )
@@ -1509,7 +1534,7 @@ function registerBetterSidebarTabs(ctx) {
     try {
       disposers.push(
         sidebar.registerTab({
-          id: "minecraft-dev-starter:project",
+          id: BETTER_DETAIL_ID,
           title: PANEL_TITLE,
           icon: (size) => h(IconCube, { size }),
           component: () => h(DetailTab)
@@ -1517,7 +1542,7 @@ function registerBetterSidebarTabs(ctx) {
       );
       disposers.push(
         sidebar.registerTab({
-          id: "minecraft-dev-starter:logs",
+          id: BETTER_LOG_ID,
           title: "\u8FD0\u884C\u65E5\u5FD7",
           icon: (size) => h(IconTerminal, { size }),
           component: () => h(LogTab)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "minecraft-dev-starter",
-  "version": "0.1.4",
+  "version": "0.1.5",
   "private": false,
   "description": "DSH plugin that detects Minecraft mod projects and launches the client from the session header, with live logs in the sidebar",
   "type": "module",

package/src/client/DetailTab.js

@@ -17,6 +17,7 @@ import {
   selectedProject,
   startTarget,
   stopLaunch,
+  store,
   useLaunches,
   useStoreState,
 } from './state.js'
@@ -122,7 +123,7 @@ export function DetailTab() {
               ),
               h(
                 'button',
-                { type: 'button', className: 'mcdev-run', onClick: () => openLogTab() },
+                { type: 'button', className: 'mcdev-run', onClick: () => openLogTab(store.get().config) },
                 '打开日志',
               ),
             ),

package/src/client/dock.js

@@ -0,0 +1,20 @@
+/**
+ * 日志标签的落点选择。
+ *
+ * 右列属于 DSH 原生右侧栏；底部工作台是 dsh-better-sidebar 提供的。
+ * 未安装 better-sidebar 时只能落在右侧栏，配置值在这种情况下被忽略。
+ * @module minecraft-dev-starter/client/dock
+ */
+
+export const LOG_DOCK_RIGHT = 'right'
+export const LOG_DOCK_BOTTOM = 'bottom'
+
+/**
+ * @param {{ logDock?: string } | undefined} config
+ * @param {boolean} hasBetterSidebar
+ * @returns {'right' | 'bottom'}
+ */
+export function chooseLogDock(config, hasBetterSidebar) {
+  if (hasBetterSidebar !== true) return LOG_DOCK_RIGHT
+  return config?.logDock === LOG_DOCK_BOTTOM ? LOG_DOCK_BOTTOM : LOG_DOCK_RIGHT
+}

package/src/client/index.js

@@ -17,7 +17,7 @@ import { LogTab } from './LogTab.js'
 import { report } from './debug.js'
 import { h } from './h.js'
 import { IconCube, IconTerminal } from './icons.js'
-import { DETAIL_KIND, LOG_KIND, runtime } from './runtime.js'
+import { BETTER_DETAIL_ID, BETTER_LOG_ID, DETAIL_KIND, LOG_KIND, runtime } from './runtime.js'
 import { ensureStyles } from './styles.js'
 
 export const name = 'mcdev-client'
@@ -99,7 +99,7 @@ function registerBetterSidebarTabs(ctx) {
     try {
       disposers.push(
         sidebar.registerTab({
-          id: 'minecraft-dev-starter:project',
+          id: BETTER_DETAIL_ID,
           title: PANEL_TITLE,
           icon: (size) => h(IconCube, { size }),
           component: () => h(DetailTab),
@@ -107,7 +107,7 @@ function registerBetterSidebarTabs(ctx) {
       )
       disposers.push(
         sidebar.registerTab({
-          id: 'minecraft-dev-starter:logs',
+          id: BETTER_LOG_ID,
           title: '运行日志',
           icon: (size) => h(IconTerminal, { size }),
           component: () => h(LogTab),

package/src/client/runtime.js

@@ -6,12 +6,18 @@
  * @module minecraft-dev-starter/client/runtime
  */
 
-/** 右侧栏「MC 工程」详情标签的 kind。 */
+import { chooseLogDock, LOG_DOCK_BOTTOM } from './dock.js'
+
+/** 右侧栏「Mod Dev」详情标签的 kind。 */
 export const DETAIL_KIND = 'mcdev.detail'
 
 /** 右侧栏「运行日志」标签的 kind。 */
 export const LOG_KIND = 'mcdev.logs'
 
+/** 向 dsh-better-sidebar 注册时用的 tab id；打开底部工作台需要同一个 id。 */
+export const BETTER_DETAIL_ID = 'minecraft-dev-starter:project'
+export const BETTER_LOG_ID = 'minecraft-dev-starter:logs'
+
 /** @type {{ ctx?: any }} */
 export const runtime = {}
 
@@ -30,12 +36,39 @@ function open(kind) {
   }
 }
 
+/**
+ * 取可选的 better-sidebar 服务；未安装时返回 undefined（不抛错）。
+ * @returns {any}
+ */
+export function betterSidebar() {
+  try {
+    return runtime.ctx?.get?.('betterSidebar', false)
+  } catch {
+    return undefined
+  }
+}
+
 /** 打开工程详情标签（openTab 会顺带展开面板）。 */
 export function openDetailTab() {
   return open(DETAIL_KIND)
 }
 
-/** 打开运行日志标签。 */
-export function openLogTab() {
+/**
+ * 打开运行日志标签。
+ *
+ * 落点由配置 `logDock` 决定：`bottom` 且装了 better-sidebar 时落到底部工作台，
+ * 其余情况一律落原生右侧栏。配置由调用方传入，避免 runtime ←→ state 循环依赖。
+ * @param {{ logDock?: string } | undefined} [config]
+ */
+export function openLogTab(config) {
+  const service = betterSidebar()
+  if (chooseLogDock(config, service !== undefined) === LOG_DOCK_BOTTOM) {
+    try {
+      service.openTab({ type: BETTER_LOG_ID, title: '运行日志', target: 'bottom' })
+      return true
+    } catch {
+      /* 落底部失败就退回右侧栏，不吞掉日志入口 */
+    }
+  }
   return open(LOG_KIND)
 }

package/src/client/state.js

@@ -25,8 +25,8 @@ export const store = createStore({
   flyoutOpen: false,
   /** @type {Record<string, string>} 每个工程记住的目标 key */
   selection: readSelection(),
-  /** @type {{ autoOpenLogTab?: boolean }} 宿主下发的部署配置 */
-  config: { autoOpenLogTab: true },
+  /** @type {{ autoOpenLogTab?: boolean, logDock?: 'right' | 'bottom' }} 宿主下发的部署配置 */
+  config: { autoOpenLogTab: true, logDock: 'right' },
   /** @type {string | undefined} 当前会话的工作区（由胶囊从会话上下文注入） */
   workspaceRoot: undefined,
 })
@@ -37,7 +37,7 @@ export const store = createStore({
 export async function loadStateInfo() {
   try {
     const info = await call('state.info', {})
-    store.set({ config: { autoOpenLogTab: true, ...(info?.config ?? {}) } })
+    store.set({ config: { autoOpenLogTab: true, logDock: 'right', ...(info?.config ?? {}) } })
   } catch {
     /* 拉不到就用默认值 */
   }
@@ -172,7 +172,7 @@ export async function startTarget(project, target) {
       module: target.module,
     })
     // 启动成功就把日志摆到人眼前（部署配置可关）
-    if (store.get().config.autoOpenLogTab !== false) openLogTab()
+    if (store.get().config.autoOpenLogTab !== false) openLogTab(store.get().config)
   } catch (error) {
     launchStore.set({ error: error instanceof Error ? error.message : String(error) })
   } finally {

package/src/index.js

@@ -117,6 +117,7 @@ function resolveWorkspaceRoot(ctx) {
 /** 部署配置默认值；patch 行的 `config` 会覆盖同名项。 */
 const DEFAULTS = {
   autoOpenLogTab: true,
+  logDock: 'right',
   readyTimeoutMs: 90_000,
   logRingLines: 2_000,
 }
@@ -131,7 +132,10 @@ export function apply(ctx, config = {}) {
     version: VERSION,
     resolveRoot: () => resolveWorkspaceRoot(ctx),
     resolveRoots: () => sessionCwds(ctx),
-    config: { autoOpenLogTab: settings.autoOpenLogTab !== false },
+    config: {
+      autoOpenLogTab: settings.autoOpenLogTab !== false,
+      logDock: settings.logDock === 'bottom' ? 'bottom' : 'right',
+    },
     launchService: createLaunchService({
       readyTimeoutMs: Number(settings.readyTimeoutMs) || DEFAULTS.readyTimeoutMs,
       maxLogLines: Number(settings.logRingLines) || DEFAULTS.logRingLines,