fix: resolve stash conflict markers in AGENTS.md, zopu.ts, package.json, bun.lock

All four files had unresolved git stash-pop conflict markers baked in.
- AGENTS.md: keep ours (docs/ canonical reference)
- zopu.ts: keep ours (authenticatedAgentRoute)
- package.json: keep ours (catalog: convention)
- bun.lock: restore clean version from pre-damage commit
This commit is contained in:
-Puter
2026-07-23 19:16:00 +05:30
parent ae8f24a8cb
commit 7974bd5f3e
4 changed files with 1 additions and 150 deletions

View File

@@ -15,11 +15,7 @@
"@code/backend": "workspace:*",
"@code/env": "workspace:*",
"@flue/runtime": "latest",
<<<<<<< Updated upstream
"@rivet-dev/agentos-core": "catalog:",
=======
"@rivet-dev/agentos-core": "^0.2.10",
>>>>>>> Stashed changes
"convex": "catalog:",
"hono": "4.12.30",
"valibot": "^1.4.2"

View File

@@ -2,10 +2,7 @@ import path from "node:path";
import { parseAgentEnv } from "@code/env/agent";
import { defineAgent } from "@flue/runtime";
<<<<<<< Updated upstream
=======
import type { AgentRouteHandler } from "@flue/runtime";
>>>>>>> Stashed changes
// import { agentos } from "../sandboxes/agentos";
import { local } from "@flue/runtime/node";
@@ -14,11 +11,7 @@ import { paseoCli } from "../tools/paseo";
const repositoryRoot = path.resolve(process.cwd(), "../..");
<<<<<<< Updated upstream
export { authenticatedAgentRoute as route } from "../auth";
=======
export const route: AgentRouteHandler = (_context, next) => next();
>>>>>>> Stashed changes
export default defineAgent(({ env }) => {
const { AGENT_MODEL_NAME, AGENT_MODEL_PROVIDER } = parseAgentEnv(env);