Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
c0904e6aaa | ||
|
|
1d9492aff5 | ||
|
|
9416fa6518 | ||
|
|
360e2f3af0 | ||
|
|
0119c7cb0e | ||
|
|
daf2990b15 | ||
|
|
96fe5ecb8f | ||
|
|
f103e9e065 | ||
|
|
6a1052d437 | ||
|
|
7e028b09d4 | ||
|
|
f6e801defc | ||
|
|
90f2088265 | ||
|
|
0d0f218d52 | ||
|
|
01f2c66f48 | ||
|
|
8fda3fa2da | ||
|
|
69f40e7d36 | ||
|
|
bc918e7664 | ||
|
|
aba3930417 |
@@ -16,13 +16,31 @@ jobs:
|
||||
run: |
|
||||
set -eu
|
||||
|
||||
install_packages() {
|
||||
if command -v apt-get >/dev/null 2>&1; then
|
||||
apt-get update
|
||||
apt-get install -y "$@"
|
||||
elif command -v apk >/dev/null 2>&1; then
|
||||
apk add --no-cache "$@"
|
||||
elif command -v dnf >/dev/null 2>&1; then
|
||||
dnf install -y "$@"
|
||||
else
|
||||
echo "No supported package manager found." >&2
|
||||
exit 1
|
||||
fi
|
||||
}
|
||||
|
||||
if ! command -v git >/dev/null 2>&1 || ! command -v curl >/dev/null 2>&1 || ! command -v unzip >/dev/null 2>&1; then
|
||||
apt-get update
|
||||
apt-get install -y git curl unzip
|
||||
install_packages git curl unzip
|
||||
fi
|
||||
if ! command -v java >/dev/null 2>&1; then
|
||||
apt-get update
|
||||
apt-get install -y openjdk-17-jdk-headless
|
||||
if command -v apk >/dev/null 2>&1; then
|
||||
install_packages openjdk17-jdk
|
||||
elif command -v dnf >/dev/null 2>&1; then
|
||||
install_packages java-17-openjdk-devel
|
||||
else
|
||||
install_packages openjdk-17-jdk-headless
|
||||
fi
|
||||
fi
|
||||
java -version
|
||||
|
||||
|
||||
@@ -97,7 +97,8 @@ final class AppEventSocketClient {
|
||||
raw.connect(new InetSocketAddress(uri.getHost(), port), SOCKET_CONNECT_TIMEOUT_MS);
|
||||
Socket connected;
|
||||
if ("wss".equalsIgnoreCase(uri.getScheme())) {
|
||||
connected = SSLSocketFactory.getDefault().createSocket(raw, uri.getHost(), port, true);
|
||||
connected = ((SSLSocketFactory) SSLSocketFactory.getDefault())
|
||||
.createSocket(raw, uri.getHost(), port, true);
|
||||
} else {
|
||||
connected = raw;
|
||||
}
|
||||
|
||||
@@ -0,0 +1,85 @@
|
||||
package com.neatstudio.tmuxandroid;
|
||||
|
||||
import org.json.JSONObject;
|
||||
|
||||
final class ConversationMessage {
|
||||
final String messageId;
|
||||
final String sessionName;
|
||||
final String role;
|
||||
final String contentType;
|
||||
final String content;
|
||||
final String status;
|
||||
final String toolName;
|
||||
final String parentMessageId;
|
||||
final String createdAt;
|
||||
final boolean local;
|
||||
|
||||
ConversationMessage(
|
||||
String messageId,
|
||||
String sessionName,
|
||||
String role,
|
||||
String contentType,
|
||||
String content,
|
||||
String status,
|
||||
String toolName,
|
||||
String parentMessageId,
|
||||
String createdAt,
|
||||
boolean local
|
||||
) {
|
||||
this.messageId = messageId;
|
||||
this.sessionName = sessionName;
|
||||
this.role = role;
|
||||
this.contentType = contentType;
|
||||
this.content = content;
|
||||
this.status = status;
|
||||
this.toolName = toolName;
|
||||
this.parentMessageId = parentMessageId;
|
||||
this.createdAt = createdAt;
|
||||
this.local = local;
|
||||
}
|
||||
|
||||
static ConversationMessage fromJson(JSONObject object) {
|
||||
return new ConversationMessage(
|
||||
value(object, "messageId", object.optString("id", "")),
|
||||
object.optString("sessionName", ""),
|
||||
object.optString("role", "assistant"),
|
||||
object.optString("contentType", "text"),
|
||||
object.optString("content", ""),
|
||||
object.optString("status", "complete"),
|
||||
object.optString("toolName", ""),
|
||||
value(object, "parentMessageId", ""),
|
||||
object.optString("createdAt", ""),
|
||||
false
|
||||
);
|
||||
}
|
||||
|
||||
static ConversationMessage localUser(String sessionName, String content) {
|
||||
long now = System.currentTimeMillis();
|
||||
return new ConversationMessage(
|
||||
"local-" + now,
|
||||
sessionName,
|
||||
"user",
|
||||
"text",
|
||||
content,
|
||||
"sending",
|
||||
"",
|
||||
"",
|
||||
"~" + now,
|
||||
true
|
||||
);
|
||||
}
|
||||
|
||||
boolean isTool() {
|
||||
return "tool".equals(role)
|
||||
|| "tool".equals(contentType)
|
||||
|| "command".equals(contentType)
|
||||
|| "code".equals(contentType);
|
||||
}
|
||||
|
||||
private static String value(JSONObject object, String key, String fallback) {
|
||||
if (!object.has(key) || object.isNull(key)) {
|
||||
return fallback;
|
||||
}
|
||||
return object.optString(key, fallback);
|
||||
}
|
||||
}
|
||||
File diff suppressed because it is too large
Load Diff
@@ -4,16 +4,22 @@ import android.graphics.Color;
|
||||
import android.graphics.Typeface;
|
||||
import android.text.SpannableStringBuilder;
|
||||
import android.text.Spanned;
|
||||
import android.text.TextPaint;
|
||||
import android.text.style.BackgroundColorSpan;
|
||||
import android.text.style.ClickableSpan;
|
||||
import android.text.style.ForegroundColorSpan;
|
||||
import android.text.style.StyleSpan;
|
||||
import android.view.View;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.Locale;
|
||||
import java.util.Set;
|
||||
|
||||
final class TerminalScreenBuffer {
|
||||
private static final int DEFAULT_FG = 0xffe6ebf2;
|
||||
private static final int DEFAULT_BG = Color.TRANSPARENT;
|
||||
private static final int TERMINAL_BG = 0xff0b0e13;
|
||||
|
||||
private int cols;
|
||||
private int rows;
|
||||
@@ -27,6 +33,11 @@ final class TerminalScreenBuffer {
|
||||
private int fg = DEFAULT_FG;
|
||||
private int bg = DEFAULT_BG;
|
||||
private boolean bold;
|
||||
private boolean dim;
|
||||
|
||||
interface FocusToggle {
|
||||
void toggle(String key);
|
||||
}
|
||||
|
||||
TerminalScreenBuffer(int cols, int rows) {
|
||||
resize(cols, rows);
|
||||
@@ -35,9 +46,6 @@ final class TerminalScreenBuffer {
|
||||
void resize(int nextCols, int nextRows) {
|
||||
nextCols = Math.max(1, nextCols);
|
||||
nextRows = Math.max(1, nextRows);
|
||||
Cell[][] previous = cells;
|
||||
int previousRows = rows;
|
||||
int previousCols = cols;
|
||||
cols = nextCols;
|
||||
rows = nextRows;
|
||||
cells = new Cell[rows][cols];
|
||||
@@ -46,21 +54,11 @@ final class TerminalScreenBuffer {
|
||||
cells[row][col] = new Cell();
|
||||
}
|
||||
}
|
||||
if (previous != null) {
|
||||
int copyRows = Math.min(previousRows, rows);
|
||||
int copyCols = Math.min(previousCols, cols);
|
||||
int previousStart = Math.max(0, previousRows - copyRows);
|
||||
int nextStart = Math.max(0, rows - copyRows);
|
||||
for (int row = 0; row < copyRows; row++) {
|
||||
for (int col = 0; col < copyCols; col++) {
|
||||
cells[nextStart + row][col].copyFrom(previous[previousStart + row][col]);
|
||||
}
|
||||
}
|
||||
}
|
||||
cursorRow = clamp(cursorRow, 0, rows - 1);
|
||||
cursorCol = clamp(cursorCol, 0, cols - 1);
|
||||
savedRow = clamp(savedRow, 0, rows - 1);
|
||||
savedCol = clamp(savedCol, 0, cols - 1);
|
||||
cursorRow = 0;
|
||||
cursorCol = 0;
|
||||
savedRow = 0;
|
||||
savedCol = 0;
|
||||
wrapPending = false;
|
||||
}
|
||||
|
||||
void clear() {
|
||||
@@ -74,6 +72,7 @@ final class TerminalScreenBuffer {
|
||||
fg = DEFAULT_FG;
|
||||
bg = DEFAULT_BG;
|
||||
bold = false;
|
||||
dim = false;
|
||||
}
|
||||
|
||||
void write(String text) {
|
||||
@@ -131,6 +130,120 @@ final class TerminalScreenBuffer {
|
||||
return output;
|
||||
}
|
||||
|
||||
String renderTail(int maxRows) {
|
||||
List<String> visible = new ArrayList<>();
|
||||
for (int row = rows - 1; row >= 0 && visible.size() < maxRows; row--) {
|
||||
String text = rowText(row).trim();
|
||||
if (!text.isEmpty()) {
|
||||
visible.add(0, text);
|
||||
}
|
||||
}
|
||||
if (visible.isEmpty()) {
|
||||
return "Waiting for terminal output";
|
||||
}
|
||||
return String.join("\n", visible);
|
||||
}
|
||||
|
||||
CharSequence renderFocused(Set<String> expandedBlocks, FocusToggle toggle) {
|
||||
SpannableStringBuilder output = new SpannableStringBuilder();
|
||||
List<String> hiddenRows = new ArrayList<>();
|
||||
int hiddenStart = -1;
|
||||
for (int row = 0; row < rows; row++) {
|
||||
String text = rowText(row).trim();
|
||||
if (containsHan(text)) {
|
||||
if (!hiddenRows.isEmpty()) {
|
||||
appendFocusBlock(output, hiddenRows, hiddenStart, row - 1, expandedBlocks, toggle);
|
||||
hiddenRows.clear();
|
||||
hiddenStart = -1;
|
||||
}
|
||||
appendLine(output, text);
|
||||
} else if (!text.isEmpty()) {
|
||||
if (hiddenStart < 0) {
|
||||
hiddenStart = row;
|
||||
}
|
||||
hiddenRows.add(text);
|
||||
}
|
||||
}
|
||||
if (!hiddenRows.isEmpty()) {
|
||||
appendFocusBlock(output, hiddenRows, hiddenStart, rows - 1, expandedBlocks, toggle);
|
||||
}
|
||||
if (output.length() == 0) {
|
||||
output.append("暂无可读内容");
|
||||
}
|
||||
return output;
|
||||
}
|
||||
|
||||
private void appendFocusBlock(
|
||||
SpannableStringBuilder output,
|
||||
List<String> lines,
|
||||
int startRow,
|
||||
int endRow,
|
||||
Set<String> expandedBlocks,
|
||||
FocusToggle toggle
|
||||
) {
|
||||
String key = startRow + ":" + endRow;
|
||||
boolean expanded = expandedBlocks.contains(key);
|
||||
String summary = focusSummary(lines);
|
||||
int actionStart = output.length();
|
||||
appendLine(output, (expanded ? "▼ " : "▶ ") + summary);
|
||||
int actionEnd = output.length();
|
||||
output.setSpan(new ClickableSpan() {
|
||||
@Override
|
||||
public void onClick(View widget) {
|
||||
toggle.toggle(key);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void updateDrawState(TextPaint paint) {
|
||||
paint.setColor(0xff67da91);
|
||||
paint.setUnderlineText(false);
|
||||
paint.setFakeBoldText(true);
|
||||
}
|
||||
}, actionStart, actionEnd, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
|
||||
if (expanded) {
|
||||
for (String line : lines) {
|
||||
appendLine(output, " " + line);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private String focusSummary(List<String> lines) {
|
||||
String joined = String.join(" ", lines).toLowerCase(Locale.ROOT);
|
||||
String type;
|
||||
if (joined.contains("error") || joined.contains("failed") || joined.contains("exception")) {
|
||||
type = "错误输出";
|
||||
} else if (joined.contains("working") || joined.contains("running")
|
||||
|| joined.contains("waiting") || joined.contains("interrupt")) {
|
||||
type = "运行状态";
|
||||
} else if (joined.contains("test") || joined.contains("build") || joined.contains("compile")
|
||||
|| joined.contains("gradle") || joined.contains("webpack") || joined.contains("npm")) {
|
||||
type = "构建/测试";
|
||||
} else if (joined.contains("git ") || joined.contains("commit") || joined.contains("push")) {
|
||||
type = "Git 操作";
|
||||
} else if (lines.get(0).startsWith(">") || lines.get(0).startsWith("$")
|
||||
|| lines.get(0).startsWith("!")) {
|
||||
type = "命令与输出";
|
||||
} else {
|
||||
type = "终端细节";
|
||||
}
|
||||
return type + " · " + lines.size() + " 行 · " + compactSummary(lines.get(0), 42);
|
||||
}
|
||||
|
||||
private String compactSummary(String text, int maxChars) {
|
||||
String compact = text.replaceAll("\\s+", " ").trim();
|
||||
if (compact.length() <= maxChars) {
|
||||
return compact;
|
||||
}
|
||||
return compact.substring(0, maxChars - 1) + "…";
|
||||
}
|
||||
|
||||
private void appendLine(SpannableStringBuilder output, String text) {
|
||||
if (output.length() > 0) {
|
||||
output.append('\n');
|
||||
}
|
||||
output.append(text);
|
||||
}
|
||||
|
||||
private int handleEscape(String text, int index) {
|
||||
if (index + 1 >= text.length()) {
|
||||
return -1;
|
||||
@@ -257,10 +370,14 @@ final class TerminalScreenBuffer {
|
||||
fg = DEFAULT_FG;
|
||||
bg = DEFAULT_BG;
|
||||
bold = false;
|
||||
dim = false;
|
||||
} else if (value == 1) {
|
||||
bold = true;
|
||||
} else if (value == 2) {
|
||||
dim = true;
|
||||
} else if (value == 22) {
|
||||
bold = false;
|
||||
dim = false;
|
||||
} else if (value == 39) {
|
||||
fg = DEFAULT_FG;
|
||||
} else if (value == 49) {
|
||||
@@ -302,14 +419,34 @@ final class TerminalScreenBuffer {
|
||||
wrapPending = false;
|
||||
newLine();
|
||||
}
|
||||
cells[cursorRow][cursorCol].set(value, fg, bg, bold);
|
||||
if (cursorCol == cols - 1) {
|
||||
int width = isWideCharacter(value) ? 2 : 1;
|
||||
if (width == 2 && cursorCol == cols - 1) {
|
||||
newLine();
|
||||
}
|
||||
cells[cursorRow][cursorCol].set(value, fg, bg, bold, dim);
|
||||
if (width == 2) {
|
||||
cells[cursorRow][cursorCol + 1].setContinuation(fg, bg, bold, dim);
|
||||
}
|
||||
if (cursorCol + width >= cols) {
|
||||
cursorCol = cols - 1;
|
||||
wrapPending = true;
|
||||
} else {
|
||||
cursorCol++;
|
||||
cursorCol += width;
|
||||
}
|
||||
}
|
||||
|
||||
private boolean isWideCharacter(char value) {
|
||||
return value >= '\u1100' && (value <= '\u115f'
|
||||
|| value == '\u2329' || value == '\u232a'
|
||||
|| (value >= '\u2e80' && value <= '\ua4cf' && value != '\u303f')
|
||||
|| (value >= '\uac00' && value <= '\ud7a3')
|
||||
|| (value >= '\uf900' && value <= '\ufaff')
|
||||
|| (value >= '\ufe10' && value <= '\ufe19')
|
||||
|| (value >= '\ufe30' && value <= '\ufe6f')
|
||||
|| (value >= '\uff00' && value <= '\uff60')
|
||||
|| (value >= '\uffe0' && value <= '\uffe6'));
|
||||
}
|
||||
|
||||
private void newLine() {
|
||||
wrapPending = false;
|
||||
cursorRow++;
|
||||
@@ -453,15 +590,21 @@ final class TerminalScreenBuffer {
|
||||
int fgColor = first.fg;
|
||||
int bgColor = first.bg;
|
||||
boolean isBold = first.bold;
|
||||
boolean isDim = first.dim;
|
||||
while (col < cols) {
|
||||
Cell cell = cells[row][col];
|
||||
if (cell.fg != fgColor || cell.bg != bgColor || cell.bold != isBold) {
|
||||
if (cell.fg != fgColor || cell.bg != bgColor || cell.bold != isBold || cell.dim != isDim) {
|
||||
break;
|
||||
}
|
||||
output.append(cell.value);
|
||||
if (!cell.continuation) {
|
||||
output.append(cell.value);
|
||||
}
|
||||
col++;
|
||||
}
|
||||
int end = output.length();
|
||||
if (isDim) {
|
||||
fgColor = blendColor(fgColor, bgColor == DEFAULT_BG ? TERMINAL_BG : bgColor, 0.55f);
|
||||
}
|
||||
output.setSpan(new ForegroundColorSpan(fgColor), start, end, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
|
||||
if (bgColor != DEFAULT_BG) {
|
||||
output.setSpan(new BackgroundColorSpan(bgColor), start, end, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
|
||||
@@ -472,6 +615,29 @@ final class TerminalScreenBuffer {
|
||||
}
|
||||
}
|
||||
|
||||
private String rowText(int row) {
|
||||
StringBuilder text = new StringBuilder(cols);
|
||||
for (int col = 0; col < cols; col++) {
|
||||
Cell cell = cells[row][col];
|
||||
if (!cell.continuation) {
|
||||
text.append(cell.value);
|
||||
}
|
||||
}
|
||||
return text.toString();
|
||||
}
|
||||
|
||||
private boolean containsHan(String text) {
|
||||
for (int index = 0; index < text.length(); index++) {
|
||||
Character.UnicodeBlock block = Character.UnicodeBlock.of(text.charAt(index));
|
||||
if (block == Character.UnicodeBlock.CJK_UNIFIED_IDEOGRAPHS
|
||||
|| block == Character.UnicodeBlock.CJK_UNIFIED_IDEOGRAPHS_EXTENSION_A
|
||||
|| block == Character.UnicodeBlock.CJK_COMPATIBILITY_IDEOGRAPHS) {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
private void saveCursor() {
|
||||
savedRow = cursorRow;
|
||||
savedCol = cursorCol;
|
||||
@@ -613,6 +779,15 @@ final class TerminalScreenBuffer {
|
||||
return value == 0 ? 0 : 55 + value * 40;
|
||||
}
|
||||
|
||||
private static int blendColor(int foreground, int background, float foregroundRatio) {
|
||||
float backgroundRatio = 1f - foregroundRatio;
|
||||
return Color.rgb(
|
||||
Math.round(Color.red(foreground) * foregroundRatio + Color.red(background) * backgroundRatio),
|
||||
Math.round(Color.green(foreground) * foregroundRatio + Color.green(background) * backgroundRatio),
|
||||
Math.round(Color.blue(foreground) * foregroundRatio + Color.blue(background) * backgroundRatio)
|
||||
);
|
||||
}
|
||||
|
||||
private static int clamp(int value, int min, int max) {
|
||||
return Math.max(min, Math.min(max, value));
|
||||
}
|
||||
@@ -622,19 +797,34 @@ final class TerminalScreenBuffer {
|
||||
int fg = DEFAULT_FG;
|
||||
int bg = DEFAULT_BG;
|
||||
boolean bold;
|
||||
boolean dim;
|
||||
boolean continuation;
|
||||
|
||||
void clear() {
|
||||
value = ' ';
|
||||
fg = DEFAULT_FG;
|
||||
bg = DEFAULT_BG;
|
||||
bold = false;
|
||||
dim = false;
|
||||
continuation = false;
|
||||
}
|
||||
|
||||
void set(char nextValue, int nextFg, int nextBg, boolean nextBold) {
|
||||
void set(char nextValue, int nextFg, int nextBg, boolean nextBold, boolean nextDim) {
|
||||
value = nextValue;
|
||||
fg = nextFg;
|
||||
bg = nextBg;
|
||||
bold = nextBold;
|
||||
dim = nextDim;
|
||||
continuation = false;
|
||||
}
|
||||
|
||||
void setContinuation(int nextFg, int nextBg, boolean nextBold, boolean nextDim) {
|
||||
value = ' ';
|
||||
fg = nextFg;
|
||||
bg = nextBg;
|
||||
bold = nextBold;
|
||||
dim = nextDim;
|
||||
continuation = true;
|
||||
}
|
||||
|
||||
void copyFrom(Cell other) {
|
||||
@@ -642,6 +832,8 @@ final class TerminalScreenBuffer {
|
||||
fg = other.fg;
|
||||
bg = other.bg;
|
||||
bold = other.bold;
|
||||
dim = other.dim;
|
||||
continuation = other.continuation;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -134,7 +134,8 @@ final class TerminalSocketClient {
|
||||
raw.connect(new InetSocketAddress(uri.getHost(), port), SOCKET_CONNECT_TIMEOUT_MS);
|
||||
Socket connected;
|
||||
if ("wss".equalsIgnoreCase(uri.getScheme())) {
|
||||
connected = SSLSocketFactory.getDefault().createSocket(raw, uri.getHost(), port, true);
|
||||
connected = ((SSLSocketFactory) SSLSocketFactory.getDefault())
|
||||
.createSocket(raw, uri.getHost(), port, true);
|
||||
} else {
|
||||
connected = raw;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user