Merge branch 'main' of git.arirex.me:iris/ai-app

Browse Source

# Conflicts:
#	AGENTS.md
#	PLAN.md
#	app/androidApp/src/main/kotlin/com/example/aiapp/SessionUsageBar.kt
#	app/androidApp/src/main/kotlin/com/example/aiapp/SpawnScreen.kt
#	server/src/config.rs
#	server/src/main.rs
#	server/src/routes.rs
#	server/src/session/echo.rs
#	server/src/session/llama.rs
#	server/src/session/transport.rs
#	server/src/ssh.rs
#	server/src/usage.rs

...

This commit is contained in:

iris committed 2026-09-04 17:56:50 -04:00

2 parents 127b25e60a 1fcaa2d72d

commit 3c0214ece8

94 files changed

+8299 -9454

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

server/src/session/mod.rs

+522 -857

File diff suppressed because it is too large. Load diff