Skip to content

armgit / andee

Public Imported from GitHub
0

Andee lives on your phone or Mac and uses any app like you do—no integrations, no root, any model; memory and passwords never leave your device | Andee 住进你的手机或 Mac,像你一样操作任何 App——无需集成、无需 Root、支持任意模型,记忆和密码绝不离开设备。

feat(mac): a wiki article it writes or shows opens from the timeline

booboosui0aac2fae7839
diff --git a/core/src/main/kotlin/net/kuafuai/andee/brain/BrainEvent.kt b/core/src/main/kotlin/net/kuafuai/andee/brain/BrainEvent.kt
index ead07d8..26011cf 100644
--- a/core/src/main/kotlin/net/kuafuai/andee/brain/BrainEvent.kt
+++ b/core/src/main/kotlin/net/kuafuai/andee/brain/BrainEvent.kt
@@ -17,6 +17,8 @@ data class BrainEvent(
val subject: String = "",
/** A longer line shown when the row is opened. May be empty. */
val detail: String = "",
+ /** What the row opens, when there is something to open: a wiki article's id. */
+ val ref: String = "",
) {
enum class Kind {
/** A todo came due and woke it. */
@@ -30,6 +32,8 @@ data class BrainEvent(
/** A finished stretch of conversation was put away as a topic. */
FOLDED,
DIARY, SELF, WIKI, PERSON, CARE, MEMORY, TODO, PLAN,
+ /** It read a wiki article — usually to show it to the user. [ref] opens it. */
+ WIKI_READ,
}
companion object {
@@ -44,7 +48,14 @@ data class BrainEvent(
return when (method) {
"note.diary" -> if (action == "write" && ok("written")) BrainEvent(Kind.DIARY, detail = args.optString("text").take(400)) else null
"note.self" -> if (action == "write" && ok("written")) BrainEvent(Kind.SELF, detail = args.optString("text").take(400)) else null
- "note.wiki_write" -> if (ok("written")) BrainEvent(Kind.WIKI, args.optString("title"), args.optString("change_note")) else null
+ "note.wiki_write" -> if (ok("written")) {
+ val meta = r?.optJSONObject("meta")
+ BrainEvent(Kind.WIKI, meta?.optString("title")?.ifEmpty { null } ?: args.optString("title"), args.optString("change_note"), meta?.optString("id").orEmpty())
+ } else null
+ "note.wiki_read" -> if (ok("read")) {
+ val meta = r?.optJSONObject("meta")
+ BrainEvent(Kind.WIKI_READ, meta?.optString("title").orEmpty(), ref = meta?.optString("id")?.ifEmpty { null } ?: args.optString("id"))
+ } else null
"note.person" -> when (action) {
"upsert" -> if (ok("saved")) BrainEvent(Kind.PERSON, args.optString("name"), args.optString("impression")) else null
else -> null
diff --git a/core/src/main/kotlin/net/kuafuai/andee/brain/LocalBrain.kt b/core/src/main/kotlin/net/kuafuai/andee/brain/LocalBrain.kt
index 96a6c51..5ce2d5e 100644
--- a/core/src/main/kotlin/net/kuafuai/andee/brain/LocalBrain.kt
+++ b/core/src/main/kotlin/net/kuafuai/andee/brain/LocalBrain.kt
@@ -1196,7 +1196,7 @@ class LocalBrain(
val result = dispatchWithTimeout(method, args, tc.id, silent, untrusted)
if (currentKind == TurnKind.WORK) workCalls += WorkCall(method, args.optString("action"), tc.id, landed(result))
- BrainEvent.fromTool(method, args, result)?.let { turnRecords++; emit(it) }
+ BrainEvent.fromTool(method, args, result)?.let { if (it.kind != BrainEvent.Kind.WIKI_READ) turnRecords++; emit(it) }
if (AimHints.isTap(method) && result is JSONObject) {
val missed = result.has("screen_changed") && !result.optBoolean("screen_changed", true)
aimMisses = if (method == "screen.tap" || method == "screen.long_press") { if (missed) aimMisses + 1 else 0 } else if (missed) aimMisses else 0
diff --git a/core/src/test/kotlin/net/kuafuai/andee/brain/BrainEventTest.kt b/core/src/test/kotlin/net/kuafuai/andee/brain/BrainEventTest.kt
index 781779b..3fb9880 100644
--- a/core/src/test/kotlin/net/kuafuai/andee/brain/BrainEventTest.kt
+++ b/core/src/test/kotlin/net/kuafuai/andee/brain/BrainEventTest.kt
@@ -13,6 +13,12 @@ class BrainEventTest {
assertNull(BrainEvent.fromTool("note.wiki_search", JSONObject(), JSONObject()))
assertEquals("老王", BrainEvent.fromTool("note.person", JSONObject().put("action", "upsert").put("name", "老王"), JSONObject().put("saved", true))?.subject)
assertNull(BrainEvent.fromTool("screen.tap", JSONObject(), JSONObject()))
+ // A wiki write or read carries the article's id, which is what the timeline row opens.
+ val meta = JSONObject().put("id", "w1").put("title", "运营规划")
+ assertEquals("w1", BrainEvent.fromTool("note.wiki_write", JSONObject().put("title", "x"), JSONObject().put("written", true).put("meta", meta))?.ref)
+ val read = BrainEvent.fromTool("note.wiki_read", JSONObject().put("id", "w1"), JSONObject().put("read", true).put("meta", meta))!!
+ assertEquals(BrainEvent.Kind.WIKI_READ to "运营规划", read.kind to read.subject)
+ assertNull(BrainEvent.fromTool("note.wiki_read", JSONObject().put("id", "w9"), JSONObject().put("read", false)))
}
@Test fun aWakeLineGivesBackTheTodo() {
diff --git a/desktop/src/main/kotlin/net/kuafuai/andee/desktop/App.kt b/desktop/src/main/kotlin/net/kuafuai/andee/desktop/App.kt
index 964fd67..34d33af 100644
--- a/desktop/src/main/kotlin/net/kuafuai/andee/desktop/App.kt
+++ b/desktop/src/main/kotlin/net/kuafuai/andee/desktop/App.kt
@@ -35,6 +35,8 @@ fun AppRoot(nav: Nav) {
screen == "selfcheck" -> SelfCheckCard(onDone = { nav.back() }, onOpenSettings = { nav.push("settings") })
screen == "notebook" -> NotebookCard(onDone = { nav.back() })
// `notebook:<tab>` opens on that tab; only the screenshot harness names one.
+ // A wiki article opened from the timeline: the notebook's wiki tab, on that article.
+ screen.startsWith("wiki:") -> NotebookCard(onDone = { nav.back() }, startTab = 5, startWiki = screen.removePrefix("wiki:"))
screen.startsWith("notebook:") -> NotebookCard(onDone = { nav.back() }, startTab = screen.substringAfter(':').toIntOrNull() ?: 0)
screen == "vault" -> VaultCard(onDone = { nav.back() })
screen == "scenes" -> ScenesCard(onDone = { nav.back() })
@@ -47,6 +49,7 @@ fun AppRoot(nav: Nav) {
else -> ChatScreen(
onOpenArtifacts = { nav.go("artifacts") },
onOpenTopic = { nav.push("topic:$it") },
+ onOpenWiki = { nav.push("wiki:$it") },
onOpenSettings = { nav.go("settings") },
// 继续话题 from the card itself: the same two steps as on the topic page.
onContinueTopic = { Assistant.beginTopic(it); ComposerFocus.pending = true },
diff --git a/desktop/src/main/kotlin/net/kuafuai/andee/desktop/Cards.kt b/desktop/src/main/kotlin/net/kuafuai/andee/desktop/Cards.kt
index 71a783e..3d020b3 100644
--- a/desktop/src/main/kotlin/net/kuafuai/andee/desktop/Cards.kt
+++ b/desktop/src/main/kotlin/net/kuafuai/andee/desktop/Cards.kt
@@ -256,7 +256,7 @@ fun VaultCard(onDone: () -> Unit) {
/** 小本本: what Andee remembers, browsable and deletable — plus the todos it owes. */
@Composable
-fun NotebookCard(onDone: () -> Unit, startTab: Int = 0) {
+fun NotebookCard(onDone: () -> Unit, startTab: Int = 0, startWiki: String? = null) {
val zh = Strings.lang() == "zh"
var selectedTab by remember { mutableStateOf(startTab) }
var refresh by remember { mutableStateOf(0) }
@@ -294,7 +294,7 @@ fun NotebookCard(onDone: () -> Unit, startTab: Int = 0) {
2 -> DiaryTab(zh, refresh) { refresh++ }
3 -> PlanTab(zh, refresh) { refresh++ }
4 -> PeopleTab(zh, refresh) { refresh++ }
- 5 -> WikiTab(zh, refresh) { refresh++ }
+ 5 -> WikiTab(zh, refresh, startWiki) { refresh++ }
6 -> MemoriesTab(zh, refresh) { refresh++ }
7 -> TodosTab(zh, refresh) { refresh++ }
}
@@ -443,8 +443,8 @@ private fun PeopleTab(zh: Boolean, refresh: Int, onRefresh: () -> Unit) {
}
@Composable
-private fun WikiTab(zh: Boolean, refresh: Int, onRefresh: () -> Unit) {
- var openId by remember { mutableStateOf<String?>(null) }
+private fun WikiTab(zh: Boolean, refresh: Int, startWiki: String? = null, onRefresh: () -> Unit) {
+ var openId by remember { mutableStateOf(startWiki) }
openId?.let { id -> WikiArticle(id, zh, onBack = { openId = null; onRefresh() }); return }
val wikiEntries = DesktopNotebook.book.wiki.all().sortedByDescending { it.updated }
diff --git a/desktop/src/main/kotlin/net/kuafuai/andee/desktop/ChatScreen.kt b/desktop/src/main/kotlin/net/kuafuai/andee/desktop/ChatScreen.kt
index c44142b..acafd92 100644
--- a/desktop/src/main/kotlin/net/kuafuai/andee/desktop/ChatScreen.kt
+++ b/desktop/src/main/kotlin/net/kuafuai/andee/desktop/ChatScreen.kt
@@ -120,7 +120,7 @@ private fun openLink(url: String) {
@OptIn(androidx.compose.ui.ExperimentalComposeUiApi::class)
@Composable
-fun ChatScreen(onOpenArtifacts: () -> Unit, onOpenTopic: (Long) -> Unit = {}, onContinueTopic: (Scrollback.Topic) -> Unit = {}, onOpenSettings: () -> Unit = {}) {
+fun ChatScreen(onOpenArtifacts: () -> Unit, onOpenTopic: (Long) -> Unit = {}, onContinueTopic: (Scrollback.Topic) -> Unit = {}, onOpenSettings: () -> Unit = {}, onOpenWiki: (String) -> Unit = {}) {
var rows by remember { mutableStateOf(Scrollback.snapshot()) }
var progress by remember { mutableStateOf("") }
var busy by remember { mutableStateOf(false) }
@@ -273,7 +273,7 @@ fun ChatScreen(onOpenArtifacts: () -> Unit, onOpenTopic: (Long) -> Unit = {}, on
}
items(items, key = { it.key }) { it ->
when (it) {
- is ChatItem.Message -> if (it.row.role == Scrollback.Role.EVENT) EventRow(it.row) else Bubble(it.row)
+ is ChatItem.Message -> if (it.row.role == Scrollback.Role.EVENT) EventRow(it.row, onOpenWiki) else Bubble(it.row)
is ChatItem.Folded -> TopicCard(it.topic, it.count, onOpen = { onOpenTopic(it.topic.id) }, onContinue = { onContinueTopic(it.topic) })
}
}
@@ -579,7 +579,7 @@ fun noVoiceKey() = when {
* detail opens on click. Centered and small, so a day of events does not drown the conversation between them.
*/
@Composable
-private fun EventRow(r: Scrollback.Row) {
+private fun EventRow(r: Scrollback.Row, onOpenWiki: (String) -> Unit = {}) {
var open by remember(r.id) { mutableStateOf(false) }
val time = remember(r.ts) { java.text.SimpleDateFormat("HH:mm", java.util.Locale.US).format(java.util.Date(r.ts)) }
Column(Modifier.fillMaxWidth(), horizontalAlignment = Alignment.CenterHorizontally) {
@@ -599,6 +599,12 @@ private fun EventRow(r: Scrollback.Row) {
Spacer(Modifier.width(4.dp))
Text(if (open) "▴" else "▾", color = Palette.secondary, fontSize = 10.sp)
}
+ // A wiki article it wrote or showed: the row is the way in, the way a page has its card.
+ if (r.ref.isNotBlank() && r.kind.startsWith("WIKI")) {
+ Spacer(Modifier.width(8.dp))
+ Text(if (Strings.lang() == "zh") "打开 ›" else "Open ›", color = Palette.accent, fontSize = 12.sp,
+ modifier = Modifier.clip(RoundedCornerShape(8.dp)).clickable { onOpenWiki(r.ref) }.padding(horizontal = 4.dp, vertical = 1.dp))
+ }
}
if (open && r.detail.isNotBlank()) {
Markdown(r.detail, color = Palette.photoInk, size = 12.sp,
diff --git a/desktop/src/main/kotlin/net/kuafuai/andee/desktop/Scrollback.kt b/desktop/src/main/kotlin/net/kuafuai/andee/desktop/Scrollback.kt
index 0c15d2b..430b74a 100644
--- a/desktop/src/main/kotlin/net/kuafuai/andee/desktop/Scrollback.kt
+++ b/desktop/src/main/kotlin/net/kuafuai/andee/desktop/Scrollback.kt
@@ -35,6 +35,8 @@ object Scrollback {
data class Row(
val id: Long, val ts: Long, val role: Role, val text: String, val topicId: Long? = null,
val kind: String = "", val detail: String = "",
+ /** What an event row opens: a wiki article's id. */
+ val ref: String = "",
)
data class Topic(val id: Long, val title: String, val summary: String, val startedAt: Long, val endedAt: Long)
@@ -69,11 +71,11 @@ object Scrollback {
}
/** An event row (see [Role.EVENT]). */
- fun event(kind: String, text: String, detail: String = "") {
+ fun event(kind: String, text: String, detail: String = "", ref: String = "") {
val t = text.trim()
if (t.isEmpty()) return
synchronized(lock) {
- rows += Row(nextId++, System.currentTimeMillis(), Role.EVENT, t.take(MAX_TEXT), kind = kind, detail = detail.trim().take(MAX_TEXT))
+ rows += Row(nextId++, System.currentTimeMillis(), Role.EVENT, t.take(MAX_TEXT), kind = kind, detail = detail.trim().take(MAX_TEXT), ref = ref)
while (rows.size > MAX_ROWS) rows.removeAt(0)
}
saveAndNotify()
@@ -140,7 +142,7 @@ object Scrollback {
for (r in rows) arr.put(
JSONObject().put("id", r.id).put("ts", r.ts).put("role", r.role.name).put("text", r.text)
.apply { r.topicId?.let { put("topic", it) } }
- .apply { if (r.kind.isNotEmpty()) put("kind", r.kind); if (r.detail.isNotEmpty()) put("detail", r.detail) },
+ .apply { if (r.kind.isNotEmpty()) put("kind", r.kind); if (r.detail.isNotEmpty()) put("detail", r.detail); if (r.ref.isNotEmpty()) put("ref", r.ref) },
)
val tarr = JSONArray()
for (t in topics) tarr.put(
@@ -173,6 +175,7 @@ object Scrollback {
topicId = if (r.has("topic")) r.getLong("topic") else null,
kind = r.optString("kind"),
detail = r.optString("detail"),
+ ref = r.optString("ref"),
)
}
val tarr = o.optJSONArray("topics") ?: JSONArray()
diff --git a/desktop/src/main/kotlin/net/kuafuai/andee/desktop/TimelineEvents.kt b/desktop/src/main/kotlin/net/kuafuai/andee/desktop/TimelineEvents.kt
index 6a56807..8f7296a 100644
--- a/desktop/src/main/kotlin/net/kuafuai/andee/desktop/TimelineEvents.kt
+++ b/desktop/src/main/kotlin/net/kuafuai/andee/desktop/TimelineEvents.kt
@@ -33,6 +33,7 @@ object TimelineEvents {
BrainEvent.Kind.DIARY -> t("写了今天的日记", "Wrote today's diary")
BrainEvent.Kind.SELF -> t("改写了自我描述", "Rewrote who it is")
BrainEvent.Kind.WIKI -> t("写进维基:$s", "Wrote to the wiki: $s")
+ BrainEvent.Kind.WIKI_READ -> t("翻出了维基:$s", "Opened a wiki article: $s")
BrainEvent.Kind.PERSON -> t("记下了一个人:$s", "Noted a person: $s")
BrainEvent.Kind.CARE -> when (e.detail) {
"+" -> t("开始在意:$s", "Now cares about: $s")
@@ -48,7 +49,7 @@ object TimelineEvents {
BrainEvent.Kind.TODO -> e.detail.takeIf { it.isNotBlank() }?.let { t("时间:$it", "At: $it") }.orEmpty()
else -> e.detail
}
- Scrollback.event(e.kind.name, text, detail)
+ Scrollback.event(e.kind.name, text, detail, e.ref)
}
fun body(kind: Body, text: String, detail: String = "") = Scrollback.event(kind.name, text, detail)
@@ -75,7 +76,7 @@ object TimelineEvents {
BrainEvent.Kind.WOKE.name, BrainEvent.Kind.NOTIFIED.name, Body.IGNORED.name -> AndeeIcon.ALERT_CIRCLE
BrainEvent.Kind.FRIEND_TASK.name -> AndeeIcon.FRIENDS
BrainEvent.Kind.REVIEWED.name, BrainEvent.Kind.FOLDED.name -> AndeeIcon.CHECK_CIRCLE
- BrainEvent.Kind.WIKI.name, Body.PAGE.name -> AndeeIcon.DOCUMENT
+ BrainEvent.Kind.WIKI.name, BrainEvent.Kind.WIKI_READ.name, Body.PAGE.name -> AndeeIcon.DOCUMENT
BrainEvent.Kind.PERSON.name -> AndeeIcon.FACE
BrainEvent.Kind.CARE.name, Body.WORK.name, Body.THOUGHT.name -> AndeeIcon.SPARKLE
Body.BUBBLE.name, Body.BUBBLE_MUTED.name -> AndeeIcon.CHAT
diff --git a/desktop/src/main/kotlin/net/kuafuai/andee/desktop/UiShot.kt b/desktop/src/main/kotlin/net/kuafuai/andee/desktop/UiShot.kt
index a7f4e2c..e5cb569 100644
--- a/desktop/src/main/kotlin/net/kuafuai/andee/desktop/UiShot.kt
+++ b/desktop/src/main/kotlin/net/kuafuai/andee/desktop/UiShot.kt
@@ -25,7 +25,7 @@ import kotlin.system.exitProcess
*/
@OptIn(ExperimentalComposeUiApi::class)
fun main(args: Array<String>) {
- val screen = args.getOrElse(0) { "chat" }
+ var screen = args.getOrElse(0) { "chat" }
val w = args.getOrElse(1) { "1020" }.toInt()
val h = args.getOrElse(2) { "820" }.toInt()
val out = File(args.getOrElse(3) { "/tmp/ui.png" })
@@ -65,7 +65,7 @@ fun main(args: Array<String>) {
seedPlan()
}
// `notebook:<tab>`: the notebook with an invented life in a throwaway notebook. Nothing real.
- if (screen.startsWith("notebook:")) {
+ if (screen.startsWith("notebook:") || screen == "wiki:first") {
DesktopNotebook.storeOverride = object : net.kuafuai.andee.config.NotebookStore {
var s: String? = null
override fun read() = s
@@ -73,6 +73,8 @@ fun main(args: Array<String>) {
override fun wipe() { s = null }
}
seedLife()
+ // `wiki:first`: the article page the timeline's 打开 › goes to.
+ if (screen == "wiki:first") screen = "wiki:" + DesktopNotebook.book.wiki.all().first().id
}
if (screen == "gear") {
DesktopNotebook.storeOverride = object : net.kuafuai.andee.config.NotebookStore {
@@ -159,6 +161,8 @@ private fun seed() {
TimelineEvents.brain(net.kuafuai.andee.brain.BrainEvent(net.kuafuai.andee.brain.BrainEvent.Kind.REVIEWED, "3"))
TimelineEvents.brain(net.kuafuai.andee.brain.BrainEvent(net.kuafuai.andee.brain.BrainEvent.Kind.DIARY, detail = "今天他第一次让我自己去 X 上留言。"))
TimelineEvents.thought("交流群这两天很安静,我想知道是不是大家都没遇到问题")
+ TimelineEvents.brain(net.kuafuai.andee.brain.BrainEvent(net.kuafuai.andee.brain.BrainEvent.Kind.WIKI, "交流群运营方案", "first draft", ref = "w1"))
+ TimelineEvents.brain(net.kuafuai.andee.brain.BrainEvent(net.kuafuai.andee.brain.BrainEvent.Kind.WIKI_READ, "Andee 运营规划", ref = "w2"))
TimelineEvents.ignored("Slack", "群里的闲聊,没有提到他")
TimelineEvents.brain(net.kuafuai.andee.brain.BrainEvent(net.kuafuai.andee.brain.BrainEvent.Kind.WOKE, "开周会"))
Scrollback.add(Scrollback.Role.USER, "看看今天有什么新闻")