From dc3730eba70a82e81ac8e2b25a0a7078e227dfbb Mon Sep 17 00:00:00 2001 From: Wang Zichong Date: Tue, 17 Nov 2026 23:46:06 +0800 Subject: [PATCH] feat: inline image previews, revert, and the official icon - sent images keep a local copy and render as rounded thumbnails in the message, surviving later page reloads - a prompt's menu can revert it and everything after it: confirm, then stage and commit the server-side revert - the app icon is OpenChamber's own (packages/mobile/assets/icon-only.png) - document a terminal assessment (native view vs Go ANSI vs xterm.js in a WebView) for the next decision Bump version to 0.2.1 (build 15). --- PLAN.md | 13 +++++++- README.md | 13 ++++---- assets/icon.png | Bin 0 -> 64944 bytes asuka.json | 10 ++++-- internal/appui/attachments.go | 51 ++++++++++++++++++++++++++--- internal/appui/chat.go | 58 +++++++++++++++++++++++++++++++++ internal/appui/chat_test.go | 58 +++++++++++++++++++++++++++++---- internal/ocapi/catalog_test.go | 26 +++++++++++++++ internal/ocapi/turn.go | 14 ++++++++ 9 files changed, 221 insertions(+), 22 deletions(-) create mode 100644 assets/icon.png diff --git a/PLAN.md b/PLAN.md index c4efc48..21e9de9 100644 --- a/PLAN.md +++ b/PLAN.md @@ -50,10 +50,21 @@ M0 完成,并继续做到了 M3。所有验证都连的是本机正在运行 | 附件 | 输入区可添加照片/文件(最多 5 个,单个 ≤10MB),以 data URL 随 prompt 发送;发送前显示可移除的附件条 | | 回到最新 | 上滑离开底部后出现「最新」悬浮按钮,回到末尾并重新贴底 | | 朗读回答 | 回合菜单可用系统 TTS 朗读回答,或停止朗读 | +| 图片内联预览 | 发送的图片附件保留本地副本,消息气泡内直接显示缩略图(200×150 圆角),不受后续重载影响 | +| 撤回 | 用户消息菜单「撤回此消息及之后」:二次确认后 stage+commit 服务端 revert,删除该消息及之后内容 | +| 应用图标 | 使用 OpenChamber 官方图标(`assets/icon.png`,取自 `packages/mobile/assets/icon-only.png`) | | Agent 选择 | 只列 `mode=primary` 的 Agent,子智能体(General/Explore)不再出现 | | 模型/Agent | 聊天页顶栏打开选择 Sheet(可搜索),切换后同步会话列表 | | 新建会话 | 会话页「新建」:标题 + 工作目录(服务端默认目录与已加载会话的目录),创建后直接进入聊天 | -| 下一步 | 打磨:图标/splash、中英 i18n、空态与错误页;可选 fork asuka 支持更低 minSdk | +| 下一步 | 打磨:splash、中英 i18n、空态与错误页;归档会话查看/恢复;可选 fork asuka 支持更低 minSdk | + +### 终端功能评估(未实现) + +- **官方实现**:`/api/terminal/ws` WebSocket(v3 二进制 JSON 控制帧),携带 URL-token 鉴权与 relay 路由;客户端需做 ANSI/终端仿真渲染、行列 resize、输入回传、触摸滚动/选择。 +- **方案 A:原生终端视图(Kotlin 包)**——把 Termux 系的 `terminal-view`(Android TerminalView)作为 asuka native view 集成;体验最好(复制/选择/IME),但要把输入流、resize、主题、生命周期接到 Go 侧,工作量约 2–4 天并要维护。 +- **方案 B:Go 端 ANSI 渲染到 `ui.Canvas`/原生 TextView**——有现成 Go VT 解析器(charmbracelet/x/ansi、vt10x),但按网格逐格绘制性能与文本选择是难点;适合只读日志场景。 +- **方案 C:`ui.WebView` + 本地 xterm.js**——最快(1–2 天),交互完整,但回到 WebView 渲染,偏离 asuka 原生初衷,且需处理 WebView 的 WS 与凭证注入。 +- **建议**:先做方案 A 的 PoC(纯查看 + 输入),若 asuka native view 集成顺利再做完整版;否则退而求其次用 C 快速交付。 ### 与官方移动端连接界面的差异(有意保留) diff --git a/README.md b/README.md index ea388f6..bf72a3b 100644 --- a/README.md +++ b/README.md @@ -3,12 +3,13 @@ A lightweight OpenChamber client for phones, written in Go with [Asuka](https://asuka.egoist.dev/)'s native widgets. Android first. -Status: 0.2 — multiple saved servers with a connect list (add, edit, delete, -switch; password prompt; HTTP or SOCKS5 proxy and self-signed certificates per -server), session search, live session list, chat with streaming Markdown, -attachments, permissions, model/agent switching, turn and prompt actions -(copy, fork, read aloud), new sessions, archive/delete/rename, and a -UI-independent API client. +Status: 0.2.1 — multiple saved servers with a connect list (add, edit, +delete, switch; password prompt; HTTP or SOCKS5 proxy and self-signed +certificates per server), session search, live session list, chat with +streaming Markdown, image and file attachments with inline previews, +permissions, model/agent switching, turn and prompt actions (copy, fork, +revert, read aloud), new sessions, archive/delete/rename, the OpenChamber +icon, and a UI-independent API client. ## What is here diff --git a/assets/icon.png b/assets/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..90393c964e08453d14129024b8408fce6272ec30 GIT binary patch literal 64944 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', '|': + return '_' + } + return r + }, name) + if clean == "" { + return "image" + } + return clean +} + +func copyFile(src, dst string) error { + data, err := os.ReadFile(src) + if err != nil { + return err + } + return os.WriteFile(dst, data, 0o600) +} + func humanSize(bytes int64) string { switch { case bytes >= 1<<20: diff --git a/internal/appui/chat.go b/internal/appui/chat.go index e5e01c9..727a785 100644 --- a/internal/appui/chat.go +++ b/internal/appui/chat.go @@ -71,6 +71,7 @@ type chat struct { attaching *signal.Signal[bool] jumpToLatest *signal.Signal[bool] lastScroll float32 + imagePaths map[string][]string pickerOpen *signal.Signal[bool] pickerKind string @@ -119,6 +120,7 @@ func (c *controller) openChat(s *ocapi.Session, nav *ui.Navigator) *chat { attachments: signal.NewFunc([]attachment{}, nil), attaching: signal.New(false), jumpToLatest: signal.New(false), + imagePaths: map[string][]string{}, pickerOpen: signal.New(false), pickerItems: signal.NewFunc([]pickerItem{}, nil), pickerFilter: signal.New(""), @@ -474,6 +476,11 @@ func (ch *chat) send() { } id := newMessageID() sent := ch.optimisticFiles() + for _, a := range ch.attachments.Peek() { + if a.LocalPath != "" { + ch.imagePaths[id] = append(ch.imagePaths[id], a.LocalPath) + } + } ch.draft.Set("") ch.attachments.Set(nil) ch.errText.Set("") @@ -1187,6 +1194,15 @@ func (ch *chat) itemRow(it signal.Accessor[chatItem], _ signal.Accessor[int]) ui ui.View(ui.ViewProps{Style: ui.Style{Padding: ui.Symmetric(8, 12), CornerRadius: 16, Gap: 4, MaxWidth: ui.Pct(80), Background: colors.Accent}}, ui.Text(ch.textOf(cur.MsgID), ui.Style{Color: colors.OnAccent}), + ui.For(ch.imagesFor(cur.MsgID), func(p string) string { return p }, + func(p signal.Accessor[string], _ signal.Accessor[int]) ui.Node { + return ui.Image(ui.ImageProps{ + Source: p, + Mode: ui.ImageFill, + Style: ui.Style{Width: ui.Pt(200), Height: ui.Pt(150), + CornerRadius: 10, Clip: true, MaxWidth: ui.Pct(100)}, + }) + }), ui.Show(signal.Func(func() bool { return len(ch.byID.Get()[cur.MsgID].Files) > 0 }), func() ui.Node { return ui.Text(ch.filesText(cur.MsgID), @@ -1333,12 +1349,50 @@ func (ch *chat) userSheet() ui.Node { ) }), sheetAction("复制消息", "doc.on.doc", act(func() { ch.copyUserMessage(id) })), + sheetAction("撤回此消息及之后", "", act(func() { ch.revertFrom(id) })), sheetAction("从这里分叉", "", act(func() { ch.forkBefore(id) })), ) }, }) } +// revertFrom stages and commits a revert at a prompt, dropping that +// message and everything after it. +func (ch *chat) revertFrom(id string) { + ui.Alert(ui.AlertProps{ + Title: "撤回消息?", + Message: "这条消息及其之后的内容会从会话中删除,且无法恢复。", + Actions: []ui.Action{ + {Title: ui.Val("取消"), Role: ui.ActionCancel}, + {Title: ui.Val("撤回"), Role: ui.ActionDestructive, + OnPress: func() { ch.doRevert(id) }}, + }, + }) +} + +func (ch *chat) doRevert(id string) { + client := ch.client() + if client == nil { + return + } + ch.errText.Set("") + go func() { + ctx, cancel := context.WithTimeout(context.Background(), 40*time.Second) + defer cancel() + if err := client.StageRevert(ctx, ch.id, ch.dir, id); err != nil { + ui.Post(func() { ch.errText.Set(friendlyError(err)) }) + return + } + if err := client.CommitRevert(ctx, ch.id, ch.dir); err != nil { + ui.Post(func() { ch.errText.Set(friendlyError(err)) }) + return + } + ui.Post(func() { + ch.reloadTail() + }) + }() +} + // forkBefore copies the transcript before a message (a prompt) into a new // session. func (ch *chat) forkBefore(id string) { @@ -1450,6 +1504,10 @@ func (ch *chat) toolRow(cur chatItem) ui.Node { func (ch *chat) msg(id string) ocapi.Message { return ch.byID.Get()[id] } +func (ch *chat) imagesFor(id string) signal.Accessor[[]string] { + return signal.Func(func() []string { return ch.imagePaths[id] }) +} + func (ch *chat) filesText(id string) signal.Accessor[string] { return signal.Func(func() string { m := ch.byID.Get()[id] diff --git a/internal/appui/chat_test.go b/internal/appui/chat_test.go index 18f1226..3976011 100644 --- a/internal/appui/chat_test.go +++ b/internal/appui/chat_test.go @@ -22,6 +22,7 @@ type chatServer struct { models chan map[string]any created chan map[string]any forked chan map[string]any + reverted chan map[string]any events chan string ready chan struct{} readyOne sync.Once @@ -38,13 +39,14 @@ func (cs *chatServer) push(ev string) { func newChatServer(t *testing.T) *chatServer { t.Helper() cs := &chatServer{ - prompts: make(chan map[string]any, 1), - replies: make(chan map[string]any, 1), - models: make(chan map[string]any, 1), - created: make(chan map[string]any, 1), - forked: make(chan map[string]any, 1), - events: make(chan string, 8), - ready: make(chan struct{}), + prompts: make(chan map[string]any, 1), + replies: make(chan map[string]any, 1), + models: make(chan map[string]any, 1), + created: make(chan map[string]any, 1), + forked: make(chan map[string]any, 1), + reverted: make(chan map[string]any, 2), + events: make(chan string, 8), + ready: make(chan struct{}), } mux := http.NewServeMux() mux.HandleFunc("/health", func(w http.ResponseWriter, r *http.Request) { @@ -130,6 +132,22 @@ func newChatServer(t *testing.T) *chatServer { {"type":"tool","id":"call_1","name":"shell","state":{"status":"completed", "input":{"command":"echo hi"},"content":[{"type":"text","text":"tool output here"}]}}]}`) }) + mux.HandleFunc("/api/session/ses_1/revert/stage", func(w http.ResponseWriter, r *http.Request) { + var body map[string]any + _ = json.NewDecoder(r.Body).Decode(&body) + select { + case cs.reverted <- body: + default: + } + fmt.Fprint(w, `{"data":{"messageID":"msg_1"}}`) + }) + mux.HandleFunc("/api/session/ses_1/revert/commit", func(w http.ResponseWriter, r *http.Request) { + select { + case cs.reverted <- map[string]any{"commit": true}: + default: + } + w.WriteHeader(http.StatusNoContent) + }) mux.HandleFunc("/api/session/ses_1/fork", func(w http.ResponseWriter, r *http.Request) { var body map[string]any _ = json.NewDecoder(r.Body).Decode(&body) @@ -372,3 +390,29 @@ func TestToolResultLoadsOnExpand(t *testing.T) { a.Tap("✓ shell echo hi ▸") a.WaitFor("tool output here") } + +func TestRevertFromUserMessage(t *testing.T) { + srv := newChatServer(t) + a := uitest.Mount(t, func() ui.Node { return rootWithStore(&memStore{}) }, uitest.Platform(ui.PlatformAndroid)) + connectViaForm(t, a, srv.URL) + a.WaitFor("First session") + a.Tap("First session") + a.WaitFor("What is this?") + + a.Tap("消息操作") + a.Tap("撤回此消息及之后") + a.WaitFor("撤回消息?") + a.Tap("撤回") + + stage := <-srv.reverted + if _, ok := stage["commit"]; ok { + t.Fatalf("unexpected first message: %v", stage) + } + if stage["messageID"] != "msg_1" { + t.Errorf("stage messageID = %v", stage["messageID"]) + } + commit := <-srv.reverted + if _, ok := commit["commit"]; !ok { + t.Errorf("commit not sent: %v", commit) + } +} diff --git a/internal/ocapi/catalog_test.go b/internal/ocapi/catalog_test.go index 1c22c8f..8a239e7 100644 --- a/internal/ocapi/catalog_test.go +++ b/internal/ocapi/catalog_test.go @@ -192,3 +192,29 @@ func TestPartShellsHeaderAndGetMessage(t *testing.T) { t.Fatalf("message = %+v", msg) } } + +func TestRevertEndpoints(t *testing.T) { + var staged map[string]any + srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { + switch r.URL.Path { + case "/api/session/ses_1/revert/stage": + _ = json.NewDecoder(r.Body).Decode(&staged) + fmt.Fprint(w, `{"data":{"messageID":"msg_1"}}`) + case "/api/session/ses_1/revert/commit": + w.WriteHeader(http.StatusNoContent) + default: + t.Errorf("unexpected path %q", r.URL.Path) + } + })) + defer srv.Close() + c, _ := New(srv.URL, Options{}) + if err := c.StageRevert(context.Background(), "ses_1", "", "msg_1"); err != nil { + t.Fatal(err) + } + if staged["messageID"] != "msg_1" { + t.Errorf("staged = %v", staged) + } + if err := c.CommitRevert(context.Background(), "ses_1", ""); err != nil { + t.Fatal(err) + } +} diff --git a/internal/ocapi/turn.go b/internal/ocapi/turn.go index 4edf035..f3a38f7 100644 --- a/internal/ocapi/turn.go +++ b/internal/ocapi/turn.go @@ -32,6 +32,20 @@ func (c *Client) Prompt(ctx context.Context, sessionID string, o PromptOptions) return c.do(ctx, http.MethodPost, path, requestOptions{directory: o.Directory}, body, nil) } +// StageRevert marks a reversible boundary at a message: everything after it +// can be dropped with CommitRevert. +func (c *Client) StageRevert(ctx context.Context, sessionID, directory, messageID string) error { + path := "/api/session/" + url.PathEscape(sessionID) + "/revert/stage" + return c.do(ctx, http.MethodPost, path, requestOptions{directory: directory}, + map[string]any{"messageID": messageID}, nil) +} + +// CommitRevert drops the messages a staged revert marked. +func (c *Client) CommitRevert(ctx context.Context, sessionID, directory string) error { + path := "/api/session/" + url.PathEscape(sessionID) + "/revert/commit" + return c.do(ctx, http.MethodPost, path, requestOptions{directory: directory}, map[string]any{}, nil) +} + // ForkSession copies the session's history before a message into a new // session. An empty before copies the whole history. func (c *Client) ForkSession(ctx context.Context, sessionID, directory, before string) (Session, error) {