magic-agent 2.4.2 → 2.6.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CLIENT-CONTRACT.md +290 -30
- package/README.md +15 -14
- package/client-ui/pc/app.css +32 -0
- package/client-ui/pc/js/04-task-list.js +5 -1
- package/client-ui/pc/js/07-chat-stream-render.js +3 -3
- package/client-ui/pc/js/90-glue.js +37 -2
- package/client-ui/pc/js/92-composer.js +19 -4
- package/client-ui/pc/js/93-rail.js +16 -5
- package/client-ui/shared/conv/02-media-kinds.js +2 -2
- package/client-ui/shared/conv/03-chat-message.js +241 -23
- package/client-ui/shared/conv/06-ask-answer.js +75 -1
- package/client-ui/shared/conv/09-stream-apply.js +63 -7
- package/client-ui/shared/conv/19-attachments.js +157 -6
- package/client-ui/shared/conv/27-conv-ledger.js +5 -2
- package/client-ui/shared/conv/29-msg-variants.js +81 -0
- package/client-ui/shared/conv/conv.css +79 -19
- package/client-ui/shared/conv/dom-map.md +1 -0
- package/client-ui/shared/conversation.css +13 -2
- package/client-ui/shared/conversation.js +336 -50
- package/client-ui/shared/transport-http.js +14 -0
- package/client-ui-mobile/index.html +2932 -333
- package/client-ui-mobile/reqs.css +102 -0
- package/client-ui-mobile/reqs.js +485 -70
- package/client-ui-mobile/reqshot.js +505 -0
- package/client-ui-mobile/scripts.css +21 -0
- package/client-ui-mobile/scripts.js +539 -0
- package/client-ui-mobile/vendor/cose-base.js +3214 -0
- package/client-ui-mobile/vendor/cytoscape-fcose.js +1549 -0
- package/client-ui-mobile/vendor/cytoscape.min.js +32 -0
- package/client-ui-mobile/vendor/layout-base.js +5230 -0
- package/cmd/magic-client/browsectl.go +199 -0
- package/cmd/magic-client/clientctl.go +33 -9
- package/cmd/magic-client/main.go +57 -26
- package/internal/agent/ask.go +45 -0
- package/internal/agent/ask_test.go +39 -0
- package/internal/agent/attachments_test.go +6 -2
- package/internal/agent/capability.go +7 -1
- package/internal/agent/claude.go +20 -15
- package/internal/agent/codebuddy.go +125 -34
- package/internal/agent/codebuddy_account_test.go +54 -0
- package/internal/agent/codebuddy_stream_test.go +103 -0
- package/internal/agent/credits.go +713 -0
- package/internal/agent/credits_minimax_test.go +97 -0
- package/internal/agent/credits_test.go +211 -0
- package/internal/agent/custom_models.go +155 -0
- package/internal/agent/custom_models_test.go +125 -0
- package/internal/agent/dsh.go +123 -49
- package/internal/agent/dsh_resume.go +13 -2
- package/internal/agent/dsh_test.go +108 -6
- package/internal/agent/engine.go +37 -1
- package/internal/agent/engine_base.go +21 -17
- package/internal/agent/engine_base_test.go +2 -2
- package/internal/agent/engine_test.go +47 -86
- package/internal/agent/fallback.go +313 -0
- package/internal/agent/fallback_test.go +340 -0
- package/internal/agent/launch.go +43 -1
- package/internal/agent/llmhttp.go +46 -4
- package/internal/agent/llmhttp_test.go +157 -0
- package/internal/agent/models.go +53 -1
- package/internal/agent/models_test.go +20 -5
- package/internal/agent/pidalive_windows_test.go +40 -0
- package/internal/agent/runcmd.go +26 -0
- package/internal/agent/runcmd_windows.go +36 -5
- package/internal/agent/stream.go +136 -6
- package/internal/agent/stream_test.go +25 -38
- package/internal/agent/stream_timeline_test.go +2 -37
- package/internal/agent/streamjson.go +108 -6
- package/internal/agent/tools_suffix_test.go +6 -3
- package/internal/agent/trae.go +50 -243
- package/internal/agent/trae_exec.go +433 -0
- package/internal/agent/trae_exec_test.go +181 -0
- package/internal/agent/wraplaunch_test.go +113 -0
- package/internal/cli/ask.go +160 -37
- package/internal/cli/ask_test.go +1 -1
- package/internal/cli/checkin.go +77 -0
- package/internal/cli/clientcmd.go +3 -2
- package/internal/cli/control.go +46 -5
- package/internal/cli/control_test.go +65 -0
- package/internal/cli/events.go +4 -0
- package/internal/cli/quotas.go +125 -0
- package/internal/cli/requirements.go +51 -0
- package/internal/cli/root.go +122 -5
- package/internal/cli/session.go +7 -10
- package/internal/cli/suggest.go +7 -5
- package/internal/cli/team.go +37 -9
- package/internal/cli/team_test.go +39 -0
- package/internal/client/ab.go +372 -0
- package/internal/client/ab_test.go +287 -0
- package/internal/client/browse.go +84 -36
- package/internal/client/browse_test.go +107 -9
- package/internal/client/browseinput.go +481 -0
- package/internal/client/browseinput_test.go +216 -0
- package/internal/client/corecmd.go +23 -0
- package/internal/client/corecmd_other.go +8 -0
- package/internal/client/corecmd_windows.go +24 -0
- package/internal/client/daemon.go +90 -17
- package/internal/client/daemon_test.go +33 -0
- package/internal/client/engines_checkin_test.go +57 -0
- package/internal/client/fallback_flags_test.go +64 -0
- package/internal/client/jobs.go +294 -21
- package/internal/client/jobs_test.go +299 -2
- package/internal/client/knowledge.go +854 -0
- package/internal/client/knowledge_test.go +510 -0
- package/internal/client/lan.go +193 -7
- package/internal/client/lan_test.go +110 -0
- package/internal/client/quotas_merge_test.go +107 -0
- package/internal/client/requirements.go +198 -1
- package/internal/client/requirements_shots_test.go +200 -0
- package/internal/client/restart.go +134 -0
- package/internal/client/restart_test.go +151 -0
- package/internal/client/scripts.go +1047 -0
- package/internal/client/scripts_decode_other.go +27 -0
- package/internal/client/scripts_decode_test.go +125 -0
- package/internal/client/scripts_decode_windows.go +206 -0
- package/internal/client/scripts_test.go +726 -0
- package/internal/client/service.go +322 -18
- package/internal/client/service_test.go +51 -0
- package/internal/client/suggest.go +105 -2
- package/internal/client/suggest_test.go +86 -0
- package/internal/client/team_flags.go +25 -11
- package/internal/client/team_flags_test.go +39 -0
- package/internal/requirements/bootstrap.go +16 -0
- package/internal/requirements/consolidate.go +100 -9
- package/internal/requirements/doc.go +154 -3
- package/internal/requirements/graph.go +138 -0
- package/internal/requirements/memory.go +7 -0
- package/internal/requirements/modules.go +312 -0
- package/internal/requirements/modules_test.go +373 -0
- package/internal/requirements/relations.go +155 -0
- package/internal/requirements/relations_test.go +231 -0
- package/internal/requirements/requirements.go +10 -0
- package/internal/requirements/shots.go +418 -0
- package/internal/requirements/shots_test.go +387 -0
- package/internal/session/session.go +92 -0
- package/internal/session/sessionlog.go +23 -0
- package/internal/session/sessionlog_read_test.go +39 -0
- package/internal/suggest/suggest.go +23 -1
- package/internal/team/event.go +3 -1
- package/internal/team/execute.go +21 -6
- package/internal/team/fallback_route_test.go +80 -0
- package/internal/team/planner.go +15 -3
- package/internal/team/route.go +89 -17
- package/internal/team/team.go +18 -4
- package/npm/apk/magic-agent-mobile-release.apk +0 -0
- package/npm/apk/version.json +1 -5
- package/npm/dist/darwin-arm64/magic-agent +0 -0
- package/npm/dist/darwin-arm64/magic-client +0 -0
- package/npm/dist/darwin-x64/magic-agent +0 -0
- package/npm/dist/darwin-x64/magic-client +0 -0
- package/npm/dist/linux-arm64/magic-agent +0 -0
- package/npm/dist/linux-arm64/magic-client +0 -0
- package/npm/dist/linux-x64/magic-agent +0 -0
- package/npm/dist/linux-x64/magic-client +0 -0
- package/npm/dist/win32-x64/magic-agent.exe +0 -0
- package/npm/dist/win32-x64/magic-client.exe +0 -0
- package/package.json +8 -2
|
@@ -20,6 +20,36 @@
|
|
|
20
20
|
后者是「有对话等着归纳」,两种提示不能混成一个数字。 */
|
|
21
21
|
.wsrow__badge--init{color:var(--warning);background:var(--tint-wait)}
|
|
22
22
|
|
|
23
|
+
/* ══════════ 需求页:整理失败的提示卡 ══════════
|
|
24
|
+
服务端给的是引擎原始报错(`HTTP 402: {…JSON…}`,还常被截断),原样铺开会是一屏乱码。
|
|
25
|
+
卡片只露三层信息:**类别 + 一句原因 + 下一步**;原文折叠在「详情」里(排查时再看)。
|
|
26
|
+
配色走 warning(淡底 + 左侧竖条),与「待整理 / 未初始化」同一套语义色,不做大红报错块 ——
|
|
27
|
+
整理失败不损坏数据,它是「这次没跑成」,不是页面出错。 */
|
|
28
|
+
.reqerr{margin:2px 10px 10px;padding:9px 12px;border-radius:var(--r);text-align:left;
|
|
29
|
+
background:color-mix(in srgb,var(--warning) 9%,var(--raised));
|
|
30
|
+
border:1px solid color-mix(in srgb,var(--warning) 26%,transparent);
|
|
31
|
+
border-left:3px solid var(--warning)}
|
|
32
|
+
.reqerr__head{display:flex;align-items:center;gap:6px}
|
|
33
|
+
.reqerr__ico{flex:0 0 auto;display:flex;color:var(--warning)}
|
|
34
|
+
.reqerr__t{flex:1;min-width:0;font-size:13px;font-weight:600;color:var(--ink);
|
|
35
|
+
overflow:hidden;text-overflow:ellipsis;white-space:nowrap}
|
|
36
|
+
/* 类别徽标(额度不足 / 未授权 / 超时…):认不出类别时不出,不硬套标签。
|
|
37
|
+
底色比卡片再浓一档、文字用 --ink —— 黄字压黄底在暗色主题下几乎读不出来(实测)。 */
|
|
38
|
+
.reqerr__badge{flex:0 0 auto;padding:1px 7px;border-radius:var(--r-full);font-size:11px;line-height:16px;
|
|
39
|
+
color:var(--ink);background:color-mix(in srgb,var(--warning) 24%,transparent)}
|
|
40
|
+
.reqerr__msg{margin-top:5px;font-size:13px;line-height:1.55;color:var(--ink-soft);word-break:break-word}
|
|
41
|
+
.reqerr__hint{margin-top:3px;font-size:12px;line-height:1.5;color:var(--muted)}
|
|
42
|
+
.reqerr__more{display:flex;align-items:center;gap:3px;margin-top:5px;padding:0;background:none;border:0;
|
|
43
|
+
font-size:12px;color:var(--muted)}
|
|
44
|
+
.reqerr__more:active{opacity:.7}
|
|
45
|
+
.reqerr__chev{display:flex;transition:transform .15s}
|
|
46
|
+
.reqerr__more.is-open .reqerr__chev{transform:rotate(180deg)}
|
|
47
|
+
/* 原文:等宽 + 可滚动,保留换行;高度封顶 —— 长 JSON 不能把下面的模块列表顶出屏幕。 */
|
|
48
|
+
.reqerr__raw{margin:6px 0 0;padding:8px 10px;max-height:180px;overflow:auto;border-radius:8px;
|
|
49
|
+
background:var(--raised);border:1px solid var(--border);color:var(--muted);
|
|
50
|
+
font-size:11px;line-height:1.5;white-space:pre-wrap;word-break:break-all;
|
|
51
|
+
-webkit-user-select:text;user-select:text}
|
|
52
|
+
|
|
23
53
|
/* ══════════ 需求页:两级(空间→模块 → 需求列表)══════════
|
|
24
54
|
一级是**目录**:空间是行,模块缩进挂在空间下(树形),功能点一律不画在这里 ——
|
|
25
55
|
需求一多,一级就会被功能点撑成长列表,什么结构都看不出来。
|
|
@@ -37,3 +67,75 @@
|
|
|
37
67
|
/* 二级视图的分组小节:只画当前模块,故这一节恒为高亮态 */
|
|
38
68
|
.reqdetail__sec--cur .sechead{color:var(--primary-action)}
|
|
39
69
|
.reqdetail__sec--cur .sechead__t{font-weight:800}
|
|
70
|
+
|
|
71
|
+
/* ══════════ 需求页:页面改造截图(reqshot.js)══════════
|
|
72
|
+
功能点行上的相机徽标 + 标注浮层。
|
|
73
|
+
徽标:功能点**涉及页面改造**时出现(归纳时从对话里提取到了页面地址)。
|
|
74
|
+
「待截图」= 有页面地址但还没截过;「N 图」= 截过了。 */
|
|
75
|
+
.reqshot__badge{flex:0 0 auto;display:inline-flex;align-items:center;gap:3px;
|
|
76
|
+
height:24px;padding:0 8px;border-radius:var(--r-full);border:1px solid var(--border);
|
|
77
|
+
background:var(--subtle);color:var(--muted);font-size:11px;font-weight:500;white-space:nowrap}
|
|
78
|
+
.reqshot__badge:active{opacity:.7}
|
|
79
|
+
.reqshot__badge--todo{color:var(--primary-action);border-color:color-mix(in srgb,var(--primary-action) 40%,transparent)}
|
|
80
|
+
.reqshot__badge--has{color:var(--muted)}
|
|
81
|
+
.reqshot__badge svg{flex:0 0 auto}
|
|
82
|
+
|
|
83
|
+
/* 抽屉里的说明行:解释「打开页面 → 滚到完成状态 → 点截图」这条流程。 */
|
|
84
|
+
.reqshot__hint{margin-top:0;font-size:12px;line-height:18px;color:var(--muted)}
|
|
85
|
+
|
|
86
|
+
/* ── 标注浮层 ──
|
|
87
|
+
z-index 1200:高于共享抽屉(1000),低于扫码(400)?—— 不,扫码是 400,比抽屉低。
|
|
88
|
+
这里取 1200 —— 必须高于抽屉,否则「完成」后抽屉还在底下压着标注。 */
|
|
89
|
+
.reqshot-anno{position:fixed;inset:0;z-index:1200;display:flex;flex-direction:column;
|
|
90
|
+
background:rgba(4,10,8,.92)}
|
|
91
|
+
.reqshot-anno__bar{flex:0 0 auto;display:flex;align-items:center;gap:6px;flex-wrap:wrap;
|
|
92
|
+
padding:calc(8px + env(safe-area-inset-top)) 10px 8px;
|
|
93
|
+
background:var(--raised);border-bottom:1px solid var(--border)}
|
|
94
|
+
.reqshot-anno__tbtn{height:30px;padding:0 10px;border-radius:8px;border:1px solid var(--border);
|
|
95
|
+
background:var(--subtle);color:var(--ink);font-size:13px;font-weight:500}
|
|
96
|
+
.reqshot-anno__tbtn:active{opacity:.7}
|
|
97
|
+
.reqshot-anno__tbtn:disabled{opacity:.45}
|
|
98
|
+
.reqshot-anno__tbtn.is-on{border-color:var(--primary-action);color:var(--primary-action)}
|
|
99
|
+
.reqshot-anno__tbtn--mute{color:var(--muted)}
|
|
100
|
+
.reqshot-anno__tbtn--ok{background:var(--primary-action);color:var(--on-primary-action);border-color:transparent}
|
|
101
|
+
.reqshot-anno__colors{display:flex;align-items:center;gap:5px;margin-left:2px}
|
|
102
|
+
.reqshot-anno__c{width:24px;height:24px;border-radius:50%;border:2px solid transparent;padding:0}
|
|
103
|
+
.reqshot-anno__c.is-on{border-color:var(--ink)}
|
|
104
|
+
.reqshot-anno__acts{display:flex;gap:6px;margin-left:auto}
|
|
105
|
+
/* 舞台:截图按原图分辨率画在里面(显示时缩放),手势坐标按显示尺寸换算回画布。 */
|
|
106
|
+
.reqshot-anno__stage{flex:1;min-height:0;position:relative;display:flex;
|
|
107
|
+
align-items:center;justify-content:center;overflow:auto;padding:8px}
|
|
108
|
+
.reqshot-anno__cv{max-width:100%;height:auto;touch-action:none;background:#fff;
|
|
109
|
+
box-shadow:0 8px 32px rgba(0,0,0,.5)}
|
|
110
|
+
.reqshot-anno__hint{position:absolute;left:0;right:0;top:50%;transform:translateY(-50%);
|
|
111
|
+
text-align:center;color:var(--muted);font-size:14px}
|
|
112
|
+
/* 文字工具的输入条:不用 window.prompt(Android WebView 与 Electron 小窗都没实现它)。 */
|
|
113
|
+
.reqshot-anno__textbox{position:absolute;left:12px;right:12px;bottom:calc(16px + env(safe-area-inset-bottom));
|
|
114
|
+
display:flex;gap:8px;align-items:center;padding:8px;border-radius:12px;
|
|
115
|
+
background:var(--raised);border:1px solid var(--border)}
|
|
116
|
+
.reqshot-anno__textbox input{flex:1;min-width:0;height:36px;padding:0 10px;border-radius:8px;
|
|
117
|
+
border:1px solid var(--border);background:var(--subtle);color:var(--ink);font-size:14px;outline:none}
|
|
118
|
+
.reqshot-anno__textbox .reqshot-anno__tbtn{height:36px}
|
|
119
|
+
|
|
120
|
+
|
|
121
|
+
/* ══════════ 会话↔需求关系图谱(2026-10-25,reqs.js 的 REQ_GRAPH_WS 第三态)══════════ */
|
|
122
|
+
/* 顶栏两枚动作按钮并排(图谱 / 全部整理)。 */
|
|
123
|
+
.history__topacts{display:flex;align-items:center;gap:8px;margin-left:auto}
|
|
124
|
+
.reqs__graphbtn{min-width:0}
|
|
125
|
+
/* 空间切换 chips:多空间时选画哪个(默认需求最多的那个)。 */
|
|
126
|
+
.reqgraph__pick{display:flex;gap:6px;overflow-x:auto;padding:8px 12px 4px;flex:none}
|
|
127
|
+
.reqgraph__chip{flex:none;padding:5px 12px;border-radius:var(--r-full);border:1px solid var(--border);
|
|
128
|
+
background:var(--subtle);color:var(--muted);font-size:13px}
|
|
129
|
+
.reqgraph__chip.is-on{background:var(--primary-action);color:var(--on-primary-action);border-color:transparent}
|
|
130
|
+
/* 舞台:cytoscape 用 canvas 自绘,容器铺满剩余高度即可(缩放/平移由库管,不溢出)。 */
|
|
131
|
+
.reqgraph__stage{flex:1;min-height:0;overflow:hidden;position:relative;display:flex;flex-direction:column}
|
|
132
|
+
.reqgraph__stage canvas{display:block}
|
|
133
|
+
.reqgraph__edge{stroke:var(--border);stroke-width:1.5;opacity:.9}
|
|
134
|
+
.reqgraph__node{cursor:pointer}
|
|
135
|
+
.reqgraph__sess{fill:var(--muted);stroke:var(--raised);stroke-width:2}
|
|
136
|
+
.reqgraph__feat{stroke:var(--raised);stroke-width:2}
|
|
137
|
+
.reqgraph__node text{fill:var(--ink);font-size:11px;pointer-events:none}
|
|
138
|
+
/* 图例:会话 + 模块配色(颜色由 JS 按模块 hash 给,这里只排版)。 */
|
|
139
|
+
.reqgraph__legend{flex:none;display:flex;flex-wrap:wrap;gap:4px 12px;padding:8px 12px calc(10px + env(safe-area-inset-bottom))}
|
|
140
|
+
.reqgraph__lg{font-size:12px;color:var(--muted)}
|
|
141
|
+
.reqgraph__lg--sess{color:var(--muted)}
|