magic-agent 1.0.0 → 1.0.2

package/client-ui/shared/transport-http.js

@@ -0,0 +1,123 @@
+/* 传输层的一个**现成实现**：HTTP（打 magic-client 插件的 /desk/* 接口）。
+ *
+ *  ⚠️ 这是给「手上已经有一个 HTTP 端点」的对接方用的**可选件**，不是组件的一部分。
+ *    组件本身与传输无关（见 conversation.js 头部的 transport 契约）。
+ *    按定稿口径 magic-agent 自己不跑服务 —— 掌天瓶那种宿主应当自己实现一个走
+ *    IPC → CLI 的 transport（引擎清单/MAGIC 的 ask 与 control/会话历史都由 CLI 承担），
+ *    而不是让组件去连某个服务。
+ *
+ *  ── 这一份覆盖的接口（与 CLIENT-CONTRACT.md 第二章一致）──
+ *    GET  /desk/engines?models=1                      引擎 + 模型 + 每引擎能力
+ *    POST /desk/ask                                   SSE：open / 事件 / end
+ *    POST /desk/ask/{id}/control                      打断 / 收工 / 回答案
+ *    GET  /desk/session/{id}/messages                 全量历史
+ *    GET  /desk/session/{id}/events?after=<seq>       增量续读
+ *
+ *  ── 用法 ──
+ *    const transport = MagicTransportHttp({ base: '', token: '…' });   // 同源时 base 传空串
+ *    MagicConversation.create({ el, transport, … });
+ */
+(function () {
+  'use strict';
+
+  function MagicTransportHttp(opts) {
+    opts = opts || {};
+    var BASE = String(opts.base || '').replace(/\/+$/, '');
+    var TOKEN = opts.token || '';
+
+    function hdr(extra) {
+      var h = extra || {};
+      if (TOKEN) h['X-Magic-Token'] = TOKEN;
+      return h;
+    }
+    function api(path, o) {
+      o = o || {};
+      o.headers = hdr(o.headers);
+      if (o.json !== undefined) {
+        o.method = o.method || 'POST';
+        o.headers['Content-Type'] = 'application/json';
+        o.body = JSON.stringify(o.json);
+      }
+      return fetch(BASE + path, o).then(function (r) {
+        if (!r.ok) throw new Error(r.status + ' ' + r.statusText);
+        return r;
+      });
+    }
+
+    return {
+      /* 引擎清单：带模型（选择器要用），所以固定 ?models=1。 */
+      listEngines: function () {
+        return api('/desk/engines?models=1').then(function (r) { return r.json(); });
+      },
+
+      /* 一轮：把 SSE 拆成三个回调交给组件，组件不关心里面是 SSE 还是别的。 */
+      ask: function (payload, h) {
+        var aborted = false;
+        var ctl = typeof AbortController !== 'undefined' ? new AbortController() : null;
+        var ended = false;
+        var finish = function (code) {
+          if (ended) return;
+          ended = true;
+          if (h && h.onEnd) h.onEnd(code);
+        };
+        api('/desk/ask', { json: payload, signal: ctl ? ctl.signal : undefined })
+          .then(function (resp) {
+            var reader = resp.body.getReader(), dec = new TextDecoder(), buf = '';
+            return (function pump() {
+              return reader.read().then(function (chunk) {
+                if (chunk.done) return finish(0);
+                buf += dec.decode(chunk.value, { stream: true });
+                var blocks = buf.split('\n\n');
+                buf = blocks.pop();
+                blocks.forEach(function (b) {
+                  var name = '', data = '';
+                  b.split('\n').forEach(function (ln) {
+                    if (ln.indexOf('event: ') === 0) name = ln.slice(7).trim();
+                    else if (ln.indexOf('data: ') === 0) data += ln.slice(6);
+                  });
+                  if (!data) return;
+                  var ev; try { ev = JSON.parse(data); } catch (e) { return; }
+                  if (name === 'open') {
+                    if (h && h.onOpen) h.onOpen(ev && (ev.id || ev.ask || ev.run));
+                    return;
+                  }
+                  if (name === 'end') { finish(ev && ev.code); return; }
+                  if (h && h.onEvent) h.onEvent(ev);
+                });
+                if (ended) return;
+                return pump();
+              });
+            })();
+          })
+          .catch(function (e) {
+            /* 被中止不算错（用户点了打断），别把它报成发送失败。 */
+            if (aborted) return finish(null);
+            if (h && h.onError) h.onError(e);
+            finish(null);
+          });
+        return { cancel: function () { aborted = true; if (ctl) ctl.abort(); } };
+      },
+
+      control: function (p) {
+        var body = { op: p.op };
+        if (p.text != null) body.text = p.text;
+        return api('/desk/ask/' + encodeURIComponent(p.id) + '/control', { json: body })
+          .then(function () { return true; });
+      },
+
+      readSession: function (id, o) {
+        o = o || {};
+        /* 有游标就走增量接口：长会话下差一个数量级。
+           形状与全量接口不同（多 lastSeq / snapshotRequired），一并原样交给组件。 */
+        if (o.after != null) {
+          return api('/desk/session/' + encodeURIComponent(id) + '/events?after=' + o.after)
+            .then(function (r) { return r.json(); });
+        }
+        return api('/desk/session/' + encodeURIComponent(id) + '/messages')
+          .then(function (r) { return r.json(); });
+      }
+    };
+  }
+
+  window.MagicTransportHttp = MagicTransportHttp;
+})();

package/client-ui-mobile/assets/OFL-Caveat.txt

@@ -0,0 +1,93 @@
+Copyright 2014 The Caveat Project Authors (https://github.com/googlefonts/caveat)
+
+This Font Software is licensed under the SIL Open Font License, Version 1.1.
+This license is copied below, and is also available with a FAQ at:
+http://scripts.sil.org/OFL
+
+
+-----------------------------------------------------------
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+-----------------------------------------------------------
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font creation
+efforts of academic and linguistic communities, and to provide a free and
+open framework in which fonts may be shared and improved in partnership
+with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded,
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+requirement for fonts to remain under this license does not apply
+to any document created using the fonts or their derivatives.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the
+copyright statement(s).
+
+"Original Version" refers to the collection of Font Software components as
+distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to, deleting,
+or substituting -- in part or in whole -- any of the components of the
+Original Version, by changing formats or by porting the Font Software to a
+new environment.
+
+"Author" refers to any designer, engineer, programmer, technical
+writer or other person who contributed to the Font Software.
+
+PERMISSION & CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed, modify,
+redistribute, and sell modified and unmodified copies of the Font
+Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components,
+in Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled,
+redistributed and/or sold with any software, provided that each copy
+contains the above copyright notice and this license. These can be
+included either as stand-alone text files, human-readable headers or
+in the appropriate machine-readable metadata fields within text or
+binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font
+Name(s) unless explicit written permission is granted by the corresponding
+Copyright Holder. This restriction only applies to the primary font name as
+presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+Software shall not be used to promote, endorse or advertise any
+Modified Version, except to acknowledge the contribution(s) of the
+Copyright Holder(s) and the Author(s) or with their explicit written
+permission.
+
+5) The Font Software, modified or unmodified, in part or in whole,
+must be distributed entirely under this license, and must not be
+distributed under any other license. The requirement for fonts to
+remain under this license does not apply to any document created
+using the Font Software.
+
+TERMINATION
+This license becomes null and void if any of the above conditions are
+not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+OTHER DEALINGS IN THE FONT SOFTWARE.

package/client-ui-mobile/index.html

@@ -0,0 +1,173 @@
+<!DOCTYPE html>
+<html lang="zh-CN">
+<head>
+<meta charset="utf-8">
+<meta name="viewport" content="width=device-width,initial-scale=1,viewport-fit=cover">
+<title>掌天瓶 · 对话</title>
+<!--
+  移动端宿主：把**同一个**公共对话组件（shared/conversation.js）挂到页面上。
+  与 PC 那份是同一份实现 —— 差别只有两个：这个文件里的颜色令牌用的是
+  agents-anywhere 安卓端（Jetpack Compose）那套十六进制值，以及多了一条
+  移动端形态的顶栏。
+
+  ── 顶栏为什么还在宿主里 ──
+    组件只负责对话区（消息流 + 输入框 + 三项选择器）。标题栏、返回、主题这些
+    属于宿主形态，PC 与移动端的形态本来就不一样，塞进组件反而会让两边互相牵制。
+
+  ── 视觉基准（逐值抄自 AA 安卓端的 Compose 源码，不是目测）──
+    designsystem/Theme.kt        → 全部色令牌（暗色 canvas #09090B / 亮色 #FDFCFB 等）
+    SessionDetailScreen.kt       → 顶栏 BackIconButton / TitlePill 的尺寸
+    对话区本身（气泡 / markdown / 工具卡 / 思考块 / 审批卡）在共享组件里，
+    那里同样标了对应的 Compose 行号。
+
+  ── 公共组件在哪 ──
+    对话区在 ../client-ui/shared/ 下（PC 与移动端同一份实现）。这一页**按同级
+    路径 shared/ 引用**：打包时由 magic-test 的 tools/build-mobile-www.cjs 把
+    client-ui/shared 一起复制进 www/shared —— 所以产物里是这个相对关系。
+    直接拿浏览器开这个文件时，请让静态服务器同时暴露 client-ui-mobile/ 与
+    client-ui/shared（或在临时目录里拼出同样的同级关系），否则共享模块会 404。
+-->
+<link rel="stylesheet" href="shared/conversation.css">
+<style>
+/* ===== 令牌：AA 安卓端那一套，映射到共享组件的颜色契约 =====
+   ⚠️ 默认 = 暗色：跟 anywhere 的 DarkAgentsAnywhereColors 逐字段对齐。
+   用户在系统里选了亮色才切亮色（没设主题时不会莫名跑出白底）。 */
+:root{
+  color-scheme:dark;
+  --canvas:#09090B;
+  --ink:#FAFAFA; --ink-soft:#E5E5E5; --muted:#A3A3A3; --faint:#737373;
+  --border:rgba(255,255,255,.09); --subtle:#292929; --raised:#1F1F1F;
+  --primary-action:#FAFAFA; --on-primary-action:#09090B;
+  --app-shadow:rgba(0,0,0,.32);
+
+  --bubble:#2A2A2A; --bubble-text:#F4F4F5;
+  --code:#111113; --status-neutral:#2D2D2D; --status-neutral-text:#D4D4D8;
+  --activity:rgba(24,24,27,.063);
+
+  --md-body:#EDEDEF; --md-muted:#A1A1AA; --md-border:#27272A; --md-code-bg:#292929;
+  --link:#EBB353; --prompt:#E8798F; --shimmer:#FFFFFF;
+  --panel:#1F1F1F; --panel-border:#27272A;
+
+  --accent:#39A887; --warning:#F59E0B; --success:#22C55E;
+  --error-surface:#2A1214; --error-border:#5F2429; --error-text:#FCA5A5; --error-icon:#F97066;
+  --running:#10B981; --transitioning:#3B82F6; --active:#F59E0B;
+
+  /* 移动端沿用 AA 的三档圆角（18 / 12 / full），与 Compose 规格一致 */
+  --r-card:18px; --r:12px; --r-full:999px;
+  --font:-apple-system,BlinkMacSystemFont,"PingFang SC","Noto Sans CJK SC",system-ui,sans-serif;
+  --mono:ui-monospace,SFMono-Regular,Menlo,"SF Mono",monospace;
+}
+@media (prefers-color-scheme:light){
+  :root{
+    color-scheme:light;
+    --canvas:#FDFCFB;
+    --ink:#0A0A0B; --ink-soft:#2B2B2B; --muted:#777777; --faint:#AAA8A2;
+    --border:#E7E5E0; --subtle:#F1F0ED; --raised:#FFFFFF;
+    --primary-action:#0A0A0B; --on-primary-action:#FFFFFF;
+    --app-shadow:rgba(0,0,0,.13);
+    --bubble:#F1F0ED; --bubble-text:#242522;
+    --code:rgba(255,255,255,.72); --status-neutral:#E4E2DD; --status-neutral-text:#6F6E69;
+    --activity:rgba(241,240,237,.08);
+    --md-body:#242522; --md-muted:#7C7B76; --md-border:#E4E1DB; --md-code-bg:#F1F0ED;
+    --link:#EBB353; --prompt:#C45D74; --shimmer:#000000;
+    --panel:#ECECEA; --panel-border:transparent;
+    --accent:#18866A; --warning:#D97706; --success:#16A34A;
+    --error-surface:#FFF4F4; --error-border:#F4C7C7; --error-text:#B42318; --error-icon:#B42318;
+  }
+}
+
+*{box-sizing:border-box;-webkit-tap-highlight-color:transparent}
+/* ⚠️ 锁死视口高度而不是 min-height：用 min-height 时 body 会被内容撑高，
+   滚动条落到 document 上，.conv__thread 的 overflow-y:auto 就永远不触发 ——
+   后果是打开会话看不到顶部，也做不了「回到底部」。 */
+html,body{margin:0;height:100%;overflow:hidden}
+body{background:var(--canvas);color:var(--ink);font:15px/1.45 var(--font);
+     overscroll-behavior:none;display:flex;flex-direction:column}
+button{font:inherit;color:inherit;background:none;border:0;padding:0;cursor:pointer}
+svg{display:block}
+
+/* ── 顶栏 SessionDetailScreen：BackIconButton 40dp 圆 · TitlePill 34dp 胶囊 ── */
+.detailbar{display:grid;grid-template-columns:40px 1fr 40px;align-items:center;gap:8px;
+  padding:calc(env(safe-area-inset-top) + 10px) 16px 8px;flex:0 0 auto}
+.iconbtn{width:40px;height:40px;border-radius:var(--r-full);display:flex;align-items:center;
+  justify-content:center;background:var(--raised);color:var(--ink);border:1px solid var(--border)}
+.titlepill{justify-self:center;max-width:100%;height:34px;display:flex;align-items:center;
+  padding:0 14px;border:1px solid var(--border);border-radius:var(--r-full);background:var(--raised);
+  font-size:14px;font-weight:600;white-space:nowrap;overflow:hidden;text-overflow:ellipsis}
+
+/* 组件挂载点：占满剩余高度 */
+#conv{flex:1;min-height:0;display:flex}
+
+/* 挂载失败时说明原因，而不是留一片空白 */
+.boot-err{margin:16px;padding:14px;border-radius:14px;background:var(--error-surface);
+  border:1.2px solid var(--error-border);color:var(--error-text);font-size:13.5px;line-height:1.55}
+
+/* 底部安全区：iPhone 的 home indicator 会压住输入框 */
+.composer{padding-bottom:calc(16px + env(safe-area-inset-bottom))}
+
+@media (prefers-reduced-motion:reduce){*{animation:none!important;transition:none!important}}
+</style>
+</head>
+<body>
+
+<svg width="0" height="0" style="position:absolute" aria-hidden="true">
+  <symbol id="i-back" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M15 5 8 12l7 7"/></symbol>
+  <symbol id="i-plus" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round"><path d="M12 5.5v13M5.5 12h13"/></symbol>
+</svg>
+
+<div class="detailbar">
+  <button class="iconbtn" id="btnNew" aria-label="新会话"><svg width="20" height="20"><use href="#i-plus"/></svg></button>
+  <span class="titlepill" id="title">新会话</span>
+  <span></span>
+</div>
+<div id="conv"></div>
+
+<script src="shared/conversation.js"></script>
+<script src="shared/transport-http.js"></script>
+<script>
+(function () {
+  'use strict';
+
+  /* 基址与令牌：两种宿主。
+     · 打包进 App（Capacitor）：页面是本地文件，地址与令牌由 boot.js 从配对信息注入 ——
+       那时 window.MAGIC_BASE 非空，所有 /desk/* 请求要前缀到桌面地址上；
+     · 浏览器同源打开（调试）：不带 MAGIC_BASE，token 在 ?token= 上。 */
+  var TOKEN = window.MAGIC_TOKEN || new URLSearchParams(location.search).get('token') || '';
+  var BASE = (window.MAGIC_BASE || '').replace(/\/+$/, '');
+
+  var titleEl = document.getElementById('title');
+
+  function showBootError(msg) {
+    var d = document.createElement('div');
+    d.className = 'boot-err';
+    d.textContent = msg;
+    document.getElementById('conv').appendChild(d);
+  }
+
+  /* 打包进 App 时页面在本地（capacitor://localhost 或 file://），
+     不能直接 fetch 本地相对路径 —— 下面这层把 <img src> 之类的相对资源
+     前缀成桌面地址。与 boot.js 的垫片同一思路，只是这里组件不产生 img，
+     所以只需要保证 fetch 走 BASE（组件已按 opts.base 处理）。 */
+
+  var conv = null;
+  (async function boot() {
+    try {
+      /* 传输层由宿主注入 —— 组件本身不连后端。
+         打包进 App 时这里会换成「走自己后端」的实现；当前先用 HTTP 参考件。 */
+      var transport = window.MagicTransportHttp({ base: BASE, token: TOKEN });
+      conv = window.MagicConversation.create({
+        el: document.getElementById('conv'),
+        transport: transport,
+        titleEl: titleEl,
+      });
+      document.getElementById('btnNew').onclick = function () { conv.newSession(); };
+      /* 供对接方/调试取用：window.magicConv.setSession(sid) 换会话 */
+      window.magicConv = conv;
+    } catch (e) {
+      showBootError('对话组件挂载失败：' + (e && e.message ? e.message : e));
+    }
+  })();
+})();
+</script>
+</body>
+</html>

package/npm/bin/magic-agent.js

@@ -0,0 +1,43 @@
+#!/usr/bin/env node
+"use strict";
+
+// magic-agent 的 npm bin 转发层：
+// 按当前平台挑出预编译的 Go 二进制，原样转发 argv / stdio / 退出码。
+//
+// 之所以用 spawnSync + stdio:inherit 而不是直接 exec：
+//   - 保持真实 fd 0/1/2，Go 侧 process.stdin.isTTY 判定不受影响（管道读 prompt 依赖它）
+//   - 退出码、Ctrl-C 信号行为与直接运行二进制一致
+
+const { spawnSync } = require("child_process");
+const fs = require("fs");
+const path = require("path");
+
+const { binaryPath, distDir, currentTarget, exeName } = require("../lib/platform");
+
+const target = currentTarget();
+const bin = binaryPath(target);
+
+if (!fs.existsSync(bin)) {
+  const found = fs.existsSync(distDir)
+    ? fs.readdirSync(distDir).filter((d) => fs.existsSync(path.join(distDir, d, exeName(d.startsWith("win32") ? "windows" : "linux"))))
+    : [];
+  process.stderr.write(
+    `magic-agent: 当前平台 ${target.dir} 没有可用二进制（期望 ${bin}）\n` +
+      `已打包的平台：${found.length ? found.join(", ") : "（无）"}\n` +
+      `解决办法：在有 Go 的环境执行 \`npm run build\`，或用 \`go build -o bin/magic-agent ./cmd/magic-agent\` 自行编译后直接调用。\n`
+  );
+  process.exit(1);
+}
+
+const res = spawnSync(bin, process.argv.slice(2), { stdio: "inherit" });
+
+if (res.error) {
+  process.stderr.write(`magic-agent: 启动失败: ${res.error.message}\n`);
+  process.exit(1);
+}
+if (res.signal) {
+  // 让父进程以相同信号退出，保持 shell 语义（如超时/中断）
+  process.kill(process.pid, res.signal);
+  process.exit(1);
+}
+process.exit(res.status === null ? 1 : res.status);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "magic-agent",
-  "version": "1.0.0",
+  "version": "1.0.2",
   "description": "专业的 agent CLI 代理工具 - 统一 claude / codebuddy / trae / llm / codex / openclaw 引擎",
   "license": "MIT",
   "bin": {
@@ -22,6 +22,9 @@
     "internal/",
     "go.mod",
     "go.sum",
+    "client-ui/",
+    "client-ui-mobile/",
+    "CLIENT-CONTRACT.md",
     "README.md",
     "LICENSE"
   ],