@lay111/dsh-plugin-google 1.0.2 → 1.0.4

package/bin/setup.js

@@ -7,27 +7,24 @@ import { startGoogleOAuthLogin, getActiveAccount } from '../src/auth.js';
 
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
 const PLUGIN_ROOT = path.resolve(__dirname, '..');
+const PLUGIN_ENTRY = path.join(PLUGIN_ROOT, 'src', 'index.js');
 
 const HOME = os.homedir();
 const DSH_HOME = path.join(HOME, '.dsh');
-const DSH_TUI_HOME = path.join(HOME, '.dsh-tui');
 const LOCAL_BIN = path.join(HOME, '.local', 'bin');
 
 console.log(`
 ╭──────────────────────────────────────────────────────────╮
 │   DeepSeek Harness · Google Antigravity One-Click Setup  │
-│   全自动配置 TUI / Web / 全局 Google Pro 满血模型矩阵     │
+│   为 DSH 全局注入 Google Antigravity Pro & 满血模型矩阵   │
 ╰──────────────────────────────────────────────────────────╯
 `);
 
 // 1. Ensure required directories
 fs.mkdirSync(DSH_HOME, { recursive: true });
-fs.mkdirSync(DSH_TUI_HOME, { recursive: true });
 fs.mkdirSync(LOCAL_BIN, { recursive: true });
-fs.mkdirSync(path.join(DSH_HOME, 'profiles', 'dsh-tui'), { recursive: true });
-fs.mkdirSync(path.join(DSH_HOME, 'profiles', 'web'), { recursive: true });
 
-console.log('📦 [1/4] 配置全局 DSH 默认设置...');
+console.log('📦 [1/3] 配置全局 DSH 默认模型 (Gemini 3.7 Flash High)...');
 // 2. Configure ~/.dsh/settings.yaml
 const settingsPath = path.join(DSH_HOME, 'settings.yaml');
 const settingsContent = `agent-default-model:
@@ -36,89 +33,16 @@ const settingsContent = `agent-default-model:
 `;
 fs.writeFileSync(settingsPath, settingsContent, 'utf-8');
 
-console.log('🎨 [2/4] 挂载插件至 TUI & Web 运行时 Profile...');
-// 3. Configure TUI Profile
-const tuiPatchPath = path.join(DSH_HOME, 'profiles', 'dsh-tui', 'cordis.patch.yml');
-const tuiPatchContent = `- insert:
+console.log('🧩 [2/3] 全局挂载 Google 原生插件至所有 DSH Profile (Web/CLI/TUI/Headless)...');
+// 3. Configure Global ~/.dsh/cordis.patch.yml (Applied to ALL DSH profiles automatically)
+const globalPatchPath = path.join(DSH_HOME, 'cordis.patch.yml');
+const globalPatchContent = `- insert:
     - id: dsh-antigravity
-      name: ${PLUGIN_ROOT}
-
-- id: dsh-tui
-  config:
-    provider: antigravity
-    model: gemini-3.7-flash
-    fullscreen: true
-`;
-fs.writeFileSync(tuiPatchPath, tuiPatchContent, 'utf-8');
-
-const tuiPkgPath = path.join(DSH_HOME, 'profiles', 'dsh-tui', 'package.json');
-if (!fs.existsSync(tuiPkgPath)) {
-  fs.writeFileSync(
-    tuiPkgPath,
-    JSON.stringify(
-      {
-        name: 'dsh-profile-dsh-tui',
-        private: true,
-        dependencies: { '@deepseek-harness-tui/dsh-tui': '^0.9.3' },
-        dsh: { profile: { bundles: ['@deepseek-ai/dsh-base', '@deepseek-harness-tui/dsh-tui'] } },
-      },
-      null,
-      2,
-    ),
-    'utf-8',
-  );
-}
-
-// 4. Configure Web Profile
-const webPatchPath = path.join(DSH_HOME, 'profiles', 'web', 'cordis.patch.yml');
-const webPatchContent = `- insert:
-    - id: dsh-antigravity
-      name: ${PLUGIN_ROOT}
+      name: ${PLUGIN_ENTRY}
 `;
-fs.writeFileSync(webPatchPath, webPatchContent, 'utf-8');
-
-const webPkgPath = path.join(DSH_HOME, 'profiles', 'web', 'package.json');
-if (!fs.existsSync(webPkgPath)) {
-  fs.writeFileSync(
-    webPkgPath,
-    JSON.stringify(
-      {
-        name: 'dsh-profile-web',
-        private: true,
-        dsh: { profile: { bundles: ['@deepseek-ai/dsh-base', '@deepseek-ai/dsh-web-app'] } },
-      },
-      null,
-      2,
-    ),
-    'utf-8',
-  );
-}
-
-// 5. Configure ~/.dsh-tui preferences
-fs.writeFileSync(
-  path.join(DSH_TUI_HOME, 'model.json'),
-  JSON.stringify({ provider: 'antigravity', model: 'gemini-3.7-flash' }, null, 2),
-  'utf-8',
-);
-fs.writeFileSync(
-  path.join(DSH_TUI_HOME, 'model-recents.json'),
-  JSON.stringify({ models: [{ provider: 'antigravity', id: 'gemini-3.7-flash' }] }, null, 2),
-  'utf-8',
-);
-
-console.log('🔗 [3/4] 注册全局快捷命令 (dst / dsh-google-auth)...');
-const tuiBin = path.join(DSH_HOME, 'profiles', 'dsh-tui', 'node_modules', '@deepseek-harness-tui', 'dsh-tui', 'bin', 'dsh-tui.js');
-if (fs.existsSync(tuiBin)) {
-  try {
-    fs.unlinkSync(path.join(LOCAL_BIN, 'dst'));
-    fs.unlinkSync(path.join(LOCAL_BIN, 'dsh-tui'));
-  } catch {}
-  try {
-    fs.symlinkSync(tuiBin, path.join(LOCAL_BIN, 'dst'));
-    fs.symlinkSync(tuiBin, path.join(LOCAL_BIN, 'dsh-tui'));
-  } catch {}
-}
+fs.writeFileSync(globalPatchPath, globalPatchContent, 'utf-8');
 
+// Link dsh-google-auth to PATH
 try {
   fs.unlinkSync(path.join(LOCAL_BIN, 'dsh-google-auth'));
 } catch {}
@@ -126,23 +50,25 @@ try {
   fs.symlinkSync(path.join(PLUGIN_ROOT, 'bin', 'auth-cli.js'), path.join(LOCAL_BIN, 'dsh-google-auth'));
 } catch {}
 
-console.log('🔑 [4/4] 检查 Google 账号登录状态...');
+console.log('🔑 [3/3] 检查 Google 账号登录状态...');
 const active = getActiveAccount();
 
 async function runLogin() {
   if (active) {
     console.log(`\n✓ 当前已登录账号: ${active.email} (项目: ${active.projectId})`);
-    console.log(`\n🎉 安装完成！你可以直接输入以下命令启动：`);
-    console.log(`  👉 终端全屏 TUI 模式: dst`);
-    console.log(`  👉 本地 Web 浏览器模式: dsh web\n`);
+    console.log(`\n🎉 安装完成！DSH 任意形态现已全局支持 Google 满血模型：`);
+    console.log(`  👉 命令行一问一答 (Headless): dsh --profile headless "你的任务"`);
+    console.log(`  👉 本地 Web 浏览器模式:      dsh web`);
+    console.log(`  👉 终端交互模式 (TUI):       dst / dsh --profile dsh-tui\n`);
   } else {
     console.log(`\n未检测到已登录的 Google 账号，正在为你唤起浏览器授权登录...`);
     try {
       const account = await startGoogleOAuthLogin();
       console.log(`\n🎉 登录成功: ${account.email}！`);
-      console.log(`\n🎉 所有配置已就绪！你可以直接输入：`);
-      console.log(`  👉 终端全屏 TUI 模式: dst`);
-      console.log(`  👉 本地 Web 浏览器模式: dsh web\n`);
+      console.log(`\n🎉 全局配置已就绪！你可以使用任意 DSH 模式：`);
+      console.log(`  👉 命令行一问一答 (Headless): dsh --profile headless "你的任务"`);
+      console.log(`  👉 本地 Web 浏览器模式:      dsh web`);
+      console.log(`  👉 终端交互模式 (TUI):       dst / dsh --profile dsh-tui\n`);
     } catch (err) {
       console.log(`\n若浏览器未自动完成，可随时在终端运行 dsh-google-auth login 手动完成登录。`);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lay111/dsh-plugin-google",
-  "version": "1.0.2",
+  "version": "1.0.4",
   "description": "Native DeepSeek Harness Plugin for Google Antigravity Pro & Gemini/Claude Models",
   "type": "module",
   "main": "src/index.js",
@@ -24,13 +24,7 @@
   ],
   "peerDependencies": {
     "@deepseek-ai/cordis": "^4.0.1",
-    "@deepseek-ai/dsh-llm": "^0.1.0-rc.6 || ^0.1.1-rc.2",
-    "@deepseek-ai/dsh-commands": "^0.1.0-rc.6 || ^0.1.1-rc.2"
-  },
-  "peerDependenciesMeta": {
-    "@deepseek-ai/dsh-commands": {
-      "optional": true
-    }
+    "@deepseek-ai/dsh-llm": "^0.1.0-rc.6 || ^0.1.1-rc.2"
   },
   "keywords": [
     "deepseek-harness",

package/src/index.js

@@ -1,5 +1,4 @@
 import { AntigravityLlmAdapter } from './adapter.js';
-import { startGoogleOAuthLogin, getActiveAccount } from './auth.js';
 
 export const name = 'dsh-antigravity';
 export const inject = ['llm'];
@@ -10,24 +9,6 @@ export function apply(ctx) {
   // 1. Register the native LLM adapter with DeepSeek Harness
   ctx.llm.registerAdapter(['antigravity'], adapter);
 
-  // 2. Register slash command if commands service is present
-  if (ctx.commands) {
-    ctx.commands.command('auth/google', 'Log in to Google Antigravity Pro').action(async () => {
-      console.log('Initiating Google OAuth login flow...');
-      const account = await startGoogleOAuthLogin();
-      console.log(`Successfully logged in as: ${account.email}`);
-    });
-
-    ctx.commands.command('auth/status', 'Check Google Antigravity account status').action(() => {
-      const active = getActiveAccount();
-      if (active) {
-        console.log(`Active Account: ${active.email} (Project: ${active.projectId})`);
-      } else {
-        console.log('No Google Antigravity account currently logged in.');
-      }
-    });
-  }
-
   ctx.logger?.info('Google Antigravity plugin mounted successfully.');
 }