Merge remote-tracking branch 'origin/master' into session-fork

# Conflicts:
#	docs/architecture.md
#	packages/README.md
#	tsconfig.build.json
#	tsconfig.json

tsconfig.json

@@ -39,6 +39,7 @@
     { "path": "./packages/bash/tool-bash" },
     { "path": "./packages/compact/compact" },
     { "path": "./packages/session-fork/session-fork" },
+    { "path": "./packages/compact/compact-basic" },
     { "path": "./packages/support/invariants" },
     { "path": "./packages/ui/acp" },
     { "path": "./packages/ui/acp-agent" },