Merge remote-tracking branch 'origin/main' into factory/onboarding-app-shell

# Conflicts:
#	factory/CLAUDE.md
#	factory/packages/backend/package.json
#	factory/packages/client/package.json
#	pnpm-lock.yaml
#	research/acp/friction.md
This commit is contained in:
Nathan Flurry 2026-03-10 21:59:12 -07:00
commit 0a8fda040b
57 changed files with 1465 additions and 503 deletions

View file

@ -22,7 +22,7 @@
"drizzle-orm": "^0.44.5",
"hono": "^4.11.9",
"pino": "^10.3.1",
"rivetkit": "^2.1.6",
"rivetkit": "2.1.6",
"sandbox-agent": "workspace:*",
"uuid": "^13.0.0",
"zod": "^4.1.5"

View file

@ -172,7 +172,7 @@ export class SandboxAgentClient {
// and waiting here can stall session creation long enough to trip task init
// step timeouts even though the session itself was created.
if (modeId) {
void session.send("session/set_mode", { modeId }).catch(() => {
void session.rawSend("session/set_mode", { modeId }).catch(() => {
// ignore
});
}
@ -243,7 +243,7 @@ export class SandboxAgentClient {
const modeId = modeIdForAgent(this.agent);
// Keep mode update best-effort and non-blocking for the same reason as createSession.
if (modeId) {
void session.send("session/set_mode", { modeId }).catch(() => {
void session.rawSend("session/set_mode", { modeId }).catch(() => {
// ignore
});
}
@ -290,7 +290,7 @@ export class SandboxAgentClient {
}
const session = await sdk.resumeSession(sessionId);
await session.send("session/cancel", {});
await session.rawSend("session/cancel", {});
this.setStatus(sessionId, "idle");
}

View file

@ -46,7 +46,7 @@
},
"dependencies": {
"@sandbox-agent/factory-shared": "workspace:*",
"rivetkit": "^2.1.6"
"rivetkit": "2.1.6"
},
"devDependencies": {
"tsup": "^8.5.0"