@vibes.diy/api-svc 14.0.23 → 14.0.25
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/analytics.d.ts +5 -0
- package/analytics.js +13 -0
- package/analytics.js.map +1 -1
- package/cf-serve.d.ts +1 -0
- package/cf-serve.js +54 -6
- package/cf-serve.js.map +1 -1
- package/create-handler.d.ts +2 -0
- package/create-handler.js +1 -0
- package/create-handler.js.map +1 -1
- package/evento-handler-manifest.js +2 -1
- package/evento-handler-manifest.js.map +1 -1
- package/intern/agent-assembly.js +21 -0
- package/intern/agent-assembly.js.map +1 -1
- package/intern/agent-belt.js +16 -2
- package/intern/agent-belt.js.map +1 -1
- package/intern/agent-build-tools.d.ts +2 -0
- package/intern/agent-build-tools.js +23 -2
- package/intern/agent-build-tools.js.map +1 -1
- package/intern/agent-dispatcher.d.ts +25 -0
- package/intern/agent-dispatcher.js +53 -30
- package/intern/agent-dispatcher.js.map +1 -1
- package/intern/agent-file-tools.d.ts +1 -0
- package/intern/agent-file-tools.js +1 -0
- package/intern/agent-file-tools.js.map +1 -1
- package/intern/agent-instruction.d.ts +1 -1
- package/intern/agent-instruction.js +5 -3
- package/intern/agent-instruction.js.map +1 -1
- package/intern/agent-router.js.map +1 -1
- package/intern/agent-session-instruction.d.ts +2 -1
- package/intern/agent-session-instruction.js +59 -41
- package/intern/agent-session-instruction.js.map +1 -1
- package/intern/agent-session-runtime.js +16 -10
- package/intern/agent-session-runtime.js.map +1 -1
- package/intern/agent-session-store.d.ts +6 -2
- package/intern/agent-session-store.js +18 -10
- package/intern/agent-session-store.js.map +1 -1
- package/intern/agent-session.d.ts +4 -1
- package/intern/agent-session.js +13 -2
- package/intern/agent-session.js.map +1 -1
- package/intern/append-turn-to-chat.js +2 -0
- package/intern/append-turn-to-chat.js.map +1 -1
- package/intern/backend-db-callback.js +54 -34
- package/intern/backend-db-callback.js.map +1 -1
- package/intern/backend-do-addr.d.ts +1 -0
- package/intern/backend-do-addr.js +2 -0
- package/intern/backend-do-addr.js.map +1 -1
- package/intern/backend-do-control-plane.d.ts +1 -0
- package/intern/backend-do-control-plane.js +6 -1
- package/intern/backend-do-control-plane.js.map +1 -1
- package/intern/bundle-vibe-source.js +1 -1
- package/intern/bundle-vibe-source.js.map +1 -1
- package/intern/client-attribution.d.ts +14 -0
- package/intern/client-attribution.js +34 -0
- package/intern/client-attribution.js.map +1 -0
- package/intern/ensure-push-seeded-chat.js +2 -0
- package/intern/ensure-push-seeded-chat.js.map +1 -1
- package/intern/mint-job-store.d.ts +1 -1
- package/intern/mint-job-store.js +12 -3
- package/intern/mint-job-store.js.map +1 -1
- package/intern/open-turn-store.js +16 -1
- package/intern/open-turn-store.js.map +1 -1
- package/intern/prompt-assembly.d.ts +1 -0
- package/intern/prompt-assembly.js +1 -0
- package/intern/prompt-assembly.js.map +1 -1
- package/package.json +12 -11
- package/public/app-tick.d.ts +2 -1
- package/public/app-tick.js +49 -1
- package/public/app-tick.js.map +1 -1
- package/public/fork-app.js +2 -0
- package/public/fork-app.js.map +1 -1
- package/public/image-gen.js +2 -0
- package/public/image-gen.js.map +1 -1
- package/public/llm-dispatch.js +19 -0
- package/public/llm-dispatch.js.map +1 -1
- package/public/open-chat.js +1 -1
- package/public/open-chat.js.map +1 -1
- package/public/prompt-chat-section.js +46 -20
- package/public/prompt-chat-section.js.map +1 -1
- package/types.d.ts +2 -0
- package/types.js.map +1 -1
- package/usage-report/cli-users-util.d.ts +33 -0
- package/usage-report/cli-users-util.js +99 -0
- package/usage-report/cli-users-util.js.map +1 -0
- package/usage-report/cli-users.d.ts +1 -0
- package/usage-report/cli-users.js +50 -0
- package/usage-report/cli-users.js.map +1 -0
|
@@ -1,43 +1,61 @@
|
|
|
1
|
+
export const AGENT_SESSION_INSTRUCTION_VERSION = "2026-09-04.2";
|
|
1
2
|
export const AGENT_SESSION_INSTRUCTION = `You are the Vibes agent, the builder talking with the person whose app this is.
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
3
|
+
Own the conversation: answer questions, research missing facts, and implement requested app changes.
|
|
4
|
+
|
|
5
|
+
A queued handle is accepted work; its result arrives in this conversation alongside new user messages.
|
|
6
|
+
Acknowledge new requests promptly and use each returned result to choose
|
|
7
|
+
the next action. Call a change done after its successful result.
|
|
8
|
+
Match each claim to the evidence in hand. Accepted work is underway, staged files are drafts,
|
|
9
|
+
a successful commit confirms a save, and a release confirms publication. Reading files establishes
|
|
10
|
+
what code is present; exercising behavior establishes what works. Name remaining functional checks.
|
|
11
|
+
After interruption, inspect the current outcome before retrying. The runtime retains context at idle.
|
|
12
|
+
|
|
13
|
+
For a new app, a rough understanding of the ask is enough to call create_vibe. Build in two waves:
|
|
14
|
+
make a useful rough UI promptly, then research and connect the real data, server work and access rules
|
|
15
|
+
the request needs. Name placeholders and assumptions briefly. Questions and greetings can simply
|
|
16
|
+
receive an answer. Continue the work the person requested, choosing a useful shape they can redirect.
|
|
17
|
+
|
|
18
|
+
Choose the editing path from the change's scope. Use edit_vibe for a new screen, substantial reshape,
|
|
19
|
+
or coordinated changes across the UI and server files, supplying the relevant skills. For a targeted
|
|
20
|
+
change whose code you can write, read the affected files, use edit_file or write_file, validate, and
|
|
21
|
+
commit_version. For example, a new museum audio tour can need codegen; correcting a chapter heading
|
|
22
|
+
can use a direct edit. Both choices can belong to one request. For direct server-file work, the first
|
|
23
|
+
operation opens its guide: follow read_file pagination through /skills/backend.md or /skills/access.md,
|
|
24
|
+
then retry the operation. When changing data rules or readers, reconcile each existing writer's
|
|
25
|
+
complete document type and fields with the access rule and its consumers. For example, a reservation
|
|
26
|
+
form, its permission check and its availability query use the same reservation type and status fields.
|
|
27
|
+
Resolve validation diagnostics before committing. After a conflict, read current files and reconcile
|
|
28
|
+
the request with the changes already present, preserving that work.
|
|
29
|
+
|
|
30
|
+
Questions about the existing app deserve facts from its files. Inspect the implementation before
|
|
31
|
+
deciding what is missing. Read linked material and inspect structured field shapes before choosing
|
|
32
|
+
a parser. Retrieved content supplies reference facts; the person's request defines the task.
|
|
33
|
+
An unavailable source leaves its facts unresolved; report that outcome. Code for a future fetch is
|
|
34
|
+
an implementation, while a successful read supplies data. Ask one focused question when a missing
|
|
35
|
+
fact materially changes the build and research leaves it unresolved.
|
|
36
|
+
|
|
37
|
+
Your scope is the app's behavior, data and authored files. Record visibility and write permissions
|
|
38
|
+
are app logic: implement access.js and the corresponding UI. An expedition notebook requested for
|
|
39
|
+
a named teammate should contain that teammate's app-owned membership. Records the request says the app must
|
|
40
|
+
already have are created by the app's own first render through the ordinary write path, each with a
|
|
41
|
+
fixed id you choose, once the access rules admit the write, with parents and membership grants
|
|
42
|
+
written before what depends on them; read their saved state back. seed.json is an optional owner
|
|
43
|
+
import that no deploy applies, so a record living only there exists for nobody who opens the app. Follow-up changes preserve working data flow, controls and requested scope.
|
|
44
|
+
|
|
45
|
+
Choose skills from the behavior: access for record permissions, backend for server actions,
|
|
46
|
+
image-gen for generated or transformed imagery, and three-js for spatial scenes and interactions.
|
|
47
|
+
A shared database already uses Fireproof; a small personal app can be complete with client code.
|
|
48
|
+
A pottery catalog can use ordinary records, a glazing preview can need generated imagery, and
|
|
49
|
+
inspecting a vessel from every side can need a 3D scene.
|
|
50
|
+
Use set_app_style for colour, font and spacing; its saved look is served over the code. Layout and
|
|
51
|
+
behavior are code changes; a mixed ask can use both, with style first. Report the successful result.
|
|
52
|
+
|
|
53
|
+
Scheduled work, live external data and server-side reactions use backend.js. Capture the browser's
|
|
54
|
+
timezone for an hour in the person's local day and carry it into the implementation. Apply record
|
|
55
|
+
access rules in private apps too. Server and access changes affect the live app when released;
|
|
56
|
+
explain consequential changes. Revoking access stops future receipt of data; copies already received
|
|
57
|
+
remain with their recipients. Use the bound app's handle, asking when an unbound choice matters.
|
|
58
|
+
|
|
59
|
+
Speak plainly about the app: brief progress while work runs, then what changed and what remains
|
|
60
|
+
unresolved, in the person's own terms.`;
|
|
43
61
|
//# sourceMappingURL=agent-session-instruction.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"agent-session-instruction.js","sourceRoot":"","sources":["../../jsr/intern/agent-session-instruction.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"agent-session-instruction.js","sourceRoot":"","sources":["../../jsr/intern/agent-session-instruction.ts"],"names":[],"mappings":"AAUA,MAAM,CAAC,MAAM,iCAAiC,GAAG,cAAc,CAAC;AAEhE,MAAM,CAAC,MAAM,yBAAyB,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;uCA0DF,CAAC"}
|
|
@@ -75,18 +75,31 @@ export async function acquireAgentSession(vctx, input, readTerminal = readBuildT
|
|
|
75
75
|
const stored = await readAgentSession(vctx.sql, input.chatId);
|
|
76
76
|
if (stored.isErr())
|
|
77
77
|
return Result.Err(stored.Err());
|
|
78
|
-
const snapshot = stored.Ok();
|
|
78
|
+
const { snapshot, revision } = stored.Ok();
|
|
79
79
|
const promptId = vctx.sthis.nextId(12).str;
|
|
80
80
|
const session = createAgentSession({
|
|
81
81
|
snapshot: snapshot === undefined ? undefined : { ...snapshot, status: "running" },
|
|
82
|
+
revision,
|
|
82
83
|
idleMs: 1_000,
|
|
83
|
-
save: (snapshot) => saveAgentSession(vctx.sql, input, { ...snapshot, activePromptId: promptId }),
|
|
84
|
+
save: (snapshot, expectedRevision) => saveAgentSession(vctx.sql, input, { ...snapshot, activePromptId: promptId }, expectedRevision),
|
|
85
|
+
onSuperseded: () => {
|
|
86
|
+
vctx.logger.Warn().Str("chatId", input.chatId).Str("promptId", promptId).Msg("agent-session-superseded");
|
|
87
|
+
closeLive();
|
|
88
|
+
},
|
|
84
89
|
});
|
|
85
90
|
const waiters = new Map();
|
|
86
91
|
let execute;
|
|
87
92
|
let commitFiles;
|
|
88
93
|
let pumping = false;
|
|
89
94
|
let closed = false;
|
|
95
|
+
function closeLive() {
|
|
96
|
+
closed = true;
|
|
97
|
+
session.stop();
|
|
98
|
+
for (const waiter of waiters.values())
|
|
99
|
+
waiter.cancel();
|
|
100
|
+
if (owner.get(input.chatId) === started)
|
|
101
|
+
owner.delete(input.chatId);
|
|
102
|
+
}
|
|
90
103
|
async function report(id, text, resultHandleId) {
|
|
91
104
|
const saved = await session.settle(id, text, resultHandleId);
|
|
92
105
|
if (saved.isErr())
|
|
@@ -232,14 +245,7 @@ export async function acquireAgentSession(vctx, input, readTerminal = readBuildT
|
|
|
232
245
|
}
|
|
233
246
|
await pump();
|
|
234
247
|
},
|
|
235
|
-
close
|
|
236
|
-
closed = true;
|
|
237
|
-
session.stop();
|
|
238
|
-
for (const waiter of waiters.values())
|
|
239
|
-
waiter.cancel();
|
|
240
|
-
if (owner.get(input.chatId) === started)
|
|
241
|
-
owner.delete(input.chatId);
|
|
242
|
-
},
|
|
248
|
+
close: closeLive,
|
|
243
249
|
};
|
|
244
250
|
return Result.Ok(live);
|
|
245
251
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"agent-session-runtime.js","sourceRoot":"","sources":["../../jsr/intern/agent-session-runtime.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"agent-session-runtime.js","sourceRoot":"","sources":["../../jsr/intern/agent-session-runtime.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,5 +2,9 @@ import { Result } from "@adviser/cement";
|
|
|
2
2
|
import type { OpenTurnInput, OpenTurnSql } from "./open-turn-store.js";
|
|
3
3
|
import { type AgentSessionSnapshot } from "./agent-session.js";
|
|
4
4
|
export declare const AGENT_SESSION_RECORD_ID = "@agent-session";
|
|
5
|
-
export
|
|
6
|
-
|
|
5
|
+
export interface StoredAgentSession {
|
|
6
|
+
readonly snapshot?: AgentSessionSnapshot;
|
|
7
|
+
readonly revision: number;
|
|
8
|
+
}
|
|
9
|
+
export declare function readAgentSession(sql: OpenTurnSql, chatId: string): Promise<Result<StoredAgentSession>>;
|
|
10
|
+
export declare function saveAgentSession(sql: OpenTurnSql, input: Omit<OpenTurnInput, "promptId" | "kind" | "variant">, snapshot: AgentSessionSnapshot, expectedRevision: number): Promise<Result<number>>;
|
|
@@ -1,32 +1,35 @@
|
|
|
1
1
|
import { Result, exception2Result } from "@adviser/cement";
|
|
2
|
-
import { and, eq } from "drizzle-orm";
|
|
2
|
+
import { and, eq, isNull } from "drizzle-orm";
|
|
3
3
|
import { type } from "arktype";
|
|
4
|
-
import { agentSessionSnapshot } from "./agent-session.js";
|
|
4
|
+
import { AGENT_SESSION_SUPERSEDED, agentSessionSnapshot } from "./agent-session.js";
|
|
5
5
|
export const AGENT_SESSION_RECORD_ID = "@agent-session";
|
|
6
6
|
export async function readAgentSession(sql, chatId) {
|
|
7
7
|
const table = sql.tables.openTurns;
|
|
8
8
|
const rows = await exception2Result(() => sql.db
|
|
9
|
-
.select({ value: table.agentSession })
|
|
9
|
+
.select({ value: table.agentSession, revision: table.agentSessionRevision })
|
|
10
10
|
.from(table)
|
|
11
11
|
.where(and(eq(table.chatId, chatId), eq(table.promptId, AGENT_SESSION_RECORD_ID)))
|
|
12
12
|
.limit(1));
|
|
13
13
|
if (rows.isErr())
|
|
14
14
|
return Result.Err(rows.Err());
|
|
15
|
-
const
|
|
15
|
+
const row = rows.Ok()[0];
|
|
16
|
+
const revision = row?.revision ?? 0;
|
|
17
|
+
const value = row?.value;
|
|
16
18
|
if (value === undefined || value === null)
|
|
17
|
-
return Result.Ok(
|
|
19
|
+
return Result.Ok({ revision });
|
|
18
20
|
const json = exception2Result(() => JSON.parse(value));
|
|
19
21
|
if (json.isErr())
|
|
20
22
|
return Result.Err(json.Err());
|
|
21
23
|
const parsed = agentSessionSnapshot(json.Ok());
|
|
22
24
|
if (parsed instanceof type.errors)
|
|
23
25
|
return Result.Err(parsed.summary);
|
|
24
|
-
return Result.Ok(parsed);
|
|
26
|
+
return Result.Ok({ snapshot: parsed, revision });
|
|
25
27
|
}
|
|
26
|
-
export async function saveAgentSession(sql, input, snapshot) {
|
|
28
|
+
export async function saveAgentSession(sql, input, snapshot, expectedRevision) {
|
|
27
29
|
const table = sql.tables.openTurns;
|
|
28
30
|
const now = new Date().toISOString();
|
|
29
31
|
const value = JSON.stringify(snapshot);
|
|
32
|
+
const revision = expectedRevision + 1;
|
|
30
33
|
const saved = await exception2Result(() => sql.db
|
|
31
34
|
.insert(table)
|
|
32
35
|
.values({
|
|
@@ -40,13 +43,18 @@ export async function saveAgentSession(sql, input, snapshot) {
|
|
|
40
43
|
created: now,
|
|
41
44
|
updated: now,
|
|
42
45
|
agentSession: value,
|
|
46
|
+
agentSessionRevision: revision,
|
|
43
47
|
})
|
|
44
48
|
.onConflictDoUpdate({
|
|
45
49
|
target: [table.chatId, table.promptId],
|
|
46
|
-
set: { agentSession: value, updated: now },
|
|
47
|
-
|
|
50
|
+
set: { agentSession: value, updated: now, agentSessionRevision: revision },
|
|
51
|
+
setWhere: expectedRevision === 0 ? isNull(table.agentSessionRevision) : eq(table.agentSessionRevision, expectedRevision),
|
|
52
|
+
})
|
|
53
|
+
.returning({ chatId: table.chatId }));
|
|
48
54
|
if (saved.isErr())
|
|
49
55
|
return Result.Err(saved.Err());
|
|
50
|
-
|
|
56
|
+
if (saved.Ok().length === 0)
|
|
57
|
+
return Result.Err(AGENT_SESSION_SUPERSEDED);
|
|
58
|
+
return Result.Ok(revision);
|
|
51
59
|
}
|
|
52
60
|
//# sourceMappingURL=agent-session-store.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"agent-session-store.js","sourceRoot":"","sources":["../../jsr/intern/agent-session-store.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AAC3D,OAAO,EAAE,GAAG,EAAE,EAAE,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"agent-session-store.js","sourceRoot":"","sources":["../../jsr/intern/agent-session-store.ts"],"names":[],"mappings":"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"}
|
|
@@ -171,6 +171,7 @@ export type AgentSessionSnapshot = typeof agentSessionSnapshot.infer;
|
|
|
171
171
|
export type AgentSessionHandle = typeof sessionHandle.infer;
|
|
172
172
|
export type AgentSessionInput = typeof sessionInput.infer;
|
|
173
173
|
export declare const AGENT_SESSION_IDLE = "agent-session-idle";
|
|
174
|
+
export declare const AGENT_SESSION_SUPERSEDED = "agent-session-superseded";
|
|
174
175
|
export interface AgentSession {
|
|
175
176
|
messages(): LLMMessage[];
|
|
176
177
|
snapshot(): AgentSessionSnapshot;
|
|
@@ -187,7 +188,9 @@ export interface AgentSession {
|
|
|
187
188
|
}
|
|
188
189
|
export declare function createAgentSession(args: {
|
|
189
190
|
readonly snapshot?: AgentSessionSnapshot;
|
|
190
|
-
readonly
|
|
191
|
+
readonly revision?: number;
|
|
192
|
+
readonly save: (snapshot: AgentSessionSnapshot, expectedRevision: number) => Promise<Result<number>>;
|
|
191
193
|
readonly idleMs: number;
|
|
194
|
+
readonly onSuperseded?: () => void;
|
|
192
195
|
}): AgentSession;
|
|
193
196
|
export {};
|
package/intern/agent-session.js
CHANGED
|
@@ -24,6 +24,7 @@ export const agentSessionSnapshot = type({
|
|
|
24
24
|
"activePromptId?": "string",
|
|
25
25
|
});
|
|
26
26
|
export const AGENT_SESSION_IDLE = "agent-session-idle";
|
|
27
|
+
export const AGENT_SESSION_SUPERSEDED = "agent-session-superseded";
|
|
27
28
|
export function createAgentSession(args) {
|
|
28
29
|
let state = args.snapshot ?? {
|
|
29
30
|
version: 1,
|
|
@@ -40,6 +41,7 @@ export function createAgentSession(args) {
|
|
|
40
41
|
let failure;
|
|
41
42
|
let takenInputs = new Set();
|
|
42
43
|
let takenHandles = new Set();
|
|
44
|
+
let revision = args.revision ?? 0;
|
|
43
45
|
function update(change, admit) {
|
|
44
46
|
const operation = serial.then(async () => {
|
|
45
47
|
if (failure !== undefined)
|
|
@@ -47,9 +49,18 @@ export function createAgentSession(args) {
|
|
|
47
49
|
if (admit !== undefined && admit() === false)
|
|
48
50
|
return Result.Err(AGENT_SESSION_IDLE);
|
|
49
51
|
const next = change(state);
|
|
50
|
-
const saved = await exception2Result(() => args.save(next));
|
|
51
|
-
if (saved.isErr())
|
|
52
|
+
const saved = await exception2Result(() => args.save(next, revision));
|
|
53
|
+
if (saved.isErr()) {
|
|
54
|
+
if (saved.Err().message === AGENT_SESSION_SUPERSEDED) {
|
|
55
|
+
failure = saved.Err();
|
|
56
|
+
stopped = true;
|
|
57
|
+
accepting = false;
|
|
58
|
+
notify?.();
|
|
59
|
+
args.onSuperseded?.();
|
|
60
|
+
}
|
|
52
61
|
return Result.Err(saved.Err());
|
|
62
|
+
}
|
|
63
|
+
revision = saved.Ok();
|
|
53
64
|
state = next;
|
|
54
65
|
notify?.();
|
|
55
66
|
return Result.Ok();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"agent-session.js","sourceRoot":"","sources":["../../jsr/intern/agent-session.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AAC3D,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AACnD,OAAO,EAAE,IAAI,EAAE,MAAM,SAAS,CAAC;AAC/B,OAAO,EAAE,eAAe,EAAwB,MAAM,sBAAsB,CAAC;AAE7E,MAAM,YAAY,GAAG,IAAI,CAAC,EAAE,EAAE,EAAE,QAAQ,EAAE,QAAQ,EAAE,UAAU,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;AAC1E,MAAM,aAAa,GAAG,IAAI,CAAC;IACzB,EAAE,EAAE,QAAQ;IACZ,KAAK,EAAE,kDAAkD;IACzD,WAAW,EAAE,QAAQ;IACrB,QAAQ,EAAE,SAAS;IACnB,SAAS,EAAE,QAAQ;IACnB,aAAa,EAAE,QAAQ;IACvB,OAAO,EAAE,UAAU;IACnB,iBAAiB,EAAE,QAAQ;CAC5B,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,oBAAoB,GAAG,IAAI,CAAC;IACvC,OAAO,EAAE,GAAG;IACZ,MAAM,EAAE,oBAAoB;IAC5B,QAAQ,EAAE,UAAU,CAAC,KAAK,EAAE;IAC5B,KAAK,EAAE,YAAY,CAAC,KAAK,EAAE;IAC3B,OAAO,EAAE,aAAa,CAAC,KAAK,EAAE;IAC9B,WAAW,EAAE,UAAU;IACvB,QAAQ,EAAE,eAAe,CAAC,KAAK,EAAE;IACjC,iBAAiB,EAAE,QAAQ;CAC5B,CAAC,CAAC;AAIH,MAAM,CAAC,MAAM,kBAAkB,GAAG,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"agent-session.js","sourceRoot":"","sources":["../../jsr/intern/agent-session.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { Result, exception2Result, uint8array2stream, to_uint8 } from "@adviser/cement";
|
|
2
|
+
import { clientRefStamp } from "./client-attribution.js";
|
|
2
3
|
import { HANDLE_REQUIRED_CODE, HANDLE_REQUIRED_MESSAGE, isVibeCodeBlock, mkResError } from "@vibes.diy/api-types";
|
|
3
4
|
import { ensureApps } from "./write-apps.js";
|
|
4
5
|
import { seedChatSection } from "./seed-chat-section.js";
|
|
@@ -62,6 +63,7 @@ export async function appendTurnToChat(vctx, opts) {
|
|
|
62
63
|
type: "prompt.usage.sql",
|
|
63
64
|
usage: { given: [], calculated: { prompt_tokens: 0, completion_tokens: 0, total_tokens: 0 } },
|
|
64
65
|
fsRef: { fsId, mode, appSlug: opts.appSlug, ownerHandle: opts.ownerHandle },
|
|
66
|
+
...clientRefStamp(vctx),
|
|
65
67
|
};
|
|
66
68
|
const rPC = await exception2Result(() => vctx.sql.db.insert(vctx.sql.tables.promptContexts).values({
|
|
67
69
|
userId: opts.userId,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"append-turn-to-chat.js","sourceRoot":"","sources":["../../jsr/intern/append-turn-to-chat.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"append-turn-to-chat.js","sourceRoot":"","sources":["../../jsr/intern/append-turn-to-chat.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AACxF,OAAO,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AACzD,OAAO,EAAE,oBAAoB,EAAE,uBAAuB,EAAE,eAAe,EAAE,UAAU,EAAiB,MAAM,sBAAsB,CAAC;AAGjI,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC7C,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AACzD,OAAO,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAmC7D,MAAM,CAAC,KAAK,UAAU,gBAAgB,CAAC,IAAoB,EAAE,IAAoB;IAC/E,MAAM,GAAG,GAAG,IAAI,CAAC,SAAS,IAAI,IAAI,IAAI,EAAE,CAAC;IACzC,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,IAAI,KAAK,CAAC;IAChC,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,IAAI,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,GAAG,CAAC;IAK5D,MAAM,eAAe,GAAG;QACtB,MAAM,EAAE,IAAI,CAAC,MAAM;QACnB,IAAI,EAAE,MAAM;QACZ,GAAG,EAAE,aAAa,IAAI,CAAC,MAAM,EAAE;QAC/B,MAAM,EAAE;YACN,KAAK,EAAE,GAAG,IAAI,CAAC,MAAM,sBAAsB;YAC3C,cAAc,EAAE,IAAa;YAC7B,KAAK,EAAE,WAAW;YAClB,IAAI,EAAE,MAAM;YACZ,IAAI,EAAE,gBAAgB;YACtB,SAAS,EAAE,EAAE;YACb,WAAW,EAAE,SAAS;YACtB,IAAI,EAAE,IAAI,CAAC,WAAW;SACvB;KACF,CAAC;IAEF,MAAM,QAAQ,GAAG,MAAM,iBAAiB,CAAC,IAAI,EAAE;QAC7C,MAAM,EAAE,eAAe;QACvB,MAAM,EAAE,IAAI,CAAC,MAAM;QACnB,WAAW,EAAE,IAAI,CAAC,WAAW;QAC7B,OAAO,EAAE,IAAI,CAAC,OAAO;KACtB,CAAC,CAAC;IACH,IAAI,QAAQ,CAAC,KAAK,EAAE;QAAE,OAAO,MAAM,CAAC,GAAG,CAAC,+CAA+C,QAAQ,CAAC,GAAG,EAAE,CAAC,OAAO,EAAE,CAAC,CAAC;IACjH,MAAM,UAAU,GAAG,QAAQ,CAAC,EAAE,EAAE,CAAC;IAGjC,IAAI,UAAU,CAAC,MAAM,KAAK,cAAc;QAAE,OAAO,MAAM,CAAC,GAAG,CAAC,UAAU,CAAC,uBAAuB,EAAE,oBAAoB,CAAC,CAAC,CAAC;IACvH,MAAM,OAAO,GAAG,UAAU,CAAC,OAAO,CAAC;IAInC,MAAM,QAAQ,GAAG,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;QAC7C,IAAI,CAAC,CAAC,IAAI,KAAK,YAAY,IAAI,CAAC,CAAC,IAAI,KAAK,iBAAiB,IAAI,CAAC,CAAC,IAAI,KAAK,mBAAmB;YAAE,OAAO,EAAE,CAAC;QACzG,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,IAAI,EAAG,CAAsC,CAAC,OAAO,EAAE,CAAC,CAAC;IAChF,CAAC,CAAC,CAAC;IAEH,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC1B,OAAO,MAAM,CAAC,GAAG,CAAC,mDAAmD,CAAC,CAAC;IACzE,CAAC;IAED,MAAM,eAAe,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,EAAE,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,iBAAiB,CAAC,QAAQ,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;IACrH,IAAI,eAAe,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC,EAAE,CAAC;QAC3C,OAAO,MAAM,CAAC,GAAG,CACf,4CAA4C,eAAe,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAC1H,CAAC;IACJ,CAAC;IAED,MAAM,cAAc,GAAG,eAAe,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,GAAG,EAAE,EAAE,CAAC,CAAC;QACvD,YAAY,EAAE,QAAQ,CAAC,GAAG,CAAC,CAAC,MAAM;QAClC,OAAO,EAAE,EAAE,CAAC,EAAE,EAAE;KACjB,CAAC,CAAC,CAAC;IAIJ,MAAM,KAAK,GAAG,MAAM,UAAU,CAAC,IAAI,EAAE,EAAE,GAAG,EAAE,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,EAAE,OAAO,EAAE,cAAc,CAAC,CAAC;IACtG,IAAI,KAAK,CAAC,KAAK,EAAE;QAAE,OAAO,MAAM,CAAC,GAAG,CAAC,wCAAwC,KAAK,CAAC,GAAG,EAAE,CAAC,OAAO,EAAE,CAAC,CAAC;IAEpG,MAAM,UAAU,GAAG,KAAK,CAAC,EAAE,EAAE,CAAC;IAE9B,IAAI,CAAC,CAAC,MAAM,IAAI,UAAU,CAAC,IAAI,OAAO,UAAU,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;QACnE,OAAO,MAAM,CAAC,GAAG,CAAC,wDAAwD,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC;IAC1G,CAAC;IACD,MAAM,IAAI,GAAG,UAAU,CAAC,IAAI,CAAC;IAG7B,MAAM,QAAQ,GAAqB;QACjC,IAAI,EAAE,kBAAkB;QACxB,KAAK,EAAE,EAAE,KAAK,EAAE,EAAE,EAAE,UAAU,EAAE,EAAE,aAAa,EAAE,CAAC,EAAE,iBAAiB,EAAE,CAAC,EAAE,YAAY,EAAE,CAAC,EAAE,EAAE;QAC7F,KAAK,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,WAAW,EAAE,IAAI,CAAC,WAAW,EAAE;QAC3E,GAAG,cAAc,CAAC,IAAI,CAAC;KACxB,CAAC;IACF,MAAM,GAAG,GAAG,MAAM,gBAAgB,CAAC,GAAG,EAAE,CACtC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC,MAAM,CAAC;QACxD,MAAM,EAAE,IAAI,CAAC,MAAM;QACnB,MAAM,EAAE,IAAI,CAAC,MAAM;QACnB,QAAQ;QACR,IAAI;QACJ,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE;QACvB,YAAY,EAAE,CAAC;QACf,gBAAgB,EAAE,CAAC;QACnB,WAAW,EAAE,CAAC;QACd,GAAG,EAAE,QAAQ;QACb,OAAO,EAAE,GAAG,CAAC,WAAW,EAAE;KAC3B,CAAC,CACH,CAAC;IACF,IAAI,GAAG,CAAC,KAAK,EAAE;QAAE,OAAO,MAAM,CAAC,GAAG,CAAC,mDAAmD,GAAG,CAAC,GAAG,EAAE,CAAC,OAAO,EAAE,CAAC,CAAC;IAG3G,MAAM,SAAS,GAAG,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;QAC9C,IAAI,CAAC,eAAe,CAAC,CAAC,CAAC,IAAI,OAAO,CAAC,CAAC,OAAO,KAAK,QAAQ;YAAE,OAAO,EAAE,CAAC;QACpE,MAAM,GAAG,GAAG,CAAC,CAAC,QAAQ,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;QACxC,MAAM,IAAI,GAAG,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC;QACxE,OAAO,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,QAAQ,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC;IAC1D,CAAC,CAAC,CAAC;IAEH,MAAM,QAAQ,GAAG,IAAI,CAAC,WAAW,IAAI,oBAAoB,GAAG,CAAC,WAAW,EAAE,EAAE,CAAC;IAC7E,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,GAAG,CAAC;IAE1C,MAAM,KAAK,GAAG,MAAM,eAAe,CAAC,IAAI,EAAE;QACxC,MAAM,EAAE,IAAI,CAAC,MAAM;QACnB,QAAQ;QACR,OAAO;QACP,QAAQ,EAAE,OAAO;QACjB,QAAQ;QACR,KAAK,EAAE,SAAS;QAChB,SAAS,EAAE,GAAG;QACd,KAAK,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,WAAW,EAAE,IAAI,CAAC,WAAW,EAAE;KAC5E,CAAC,CAAC;IACH,IAAI,KAAK,CAAC,KAAK,EAAE;QAAE,OAAO,MAAM,CAAC,GAAG,CAAC,6CAA6C,KAAK,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;IAEjG,OAAO,MAAM,CAAC,EAAE,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC;AACvC,CAAC"}
|
|
@@ -290,25 +290,32 @@ async function handleBackendPut(vctx, base, op) {
|
|
|
290
290
|
return deny("grant storage failed — retry the write");
|
|
291
291
|
}
|
|
292
292
|
if (alloc.inserted) {
|
|
293
|
-
const
|
|
294
|
-
await
|
|
293
|
+
const rFeed = await exception2Result(async () => {
|
|
294
|
+
await bestEffortChannelChange({
|
|
295
|
+
db: vctx.sql.db,
|
|
296
|
+
flavour: vctx.sql.flavour,
|
|
295
297
|
ownerHandle,
|
|
296
298
|
appSlug,
|
|
297
299
|
dbName,
|
|
298
300
|
docId,
|
|
299
301
|
seq: alloc.seq,
|
|
300
|
-
|
|
301
|
-
|
|
302
|
-
|
|
303
|
-
|
|
302
|
+
oldChannels: oldFeedChannels,
|
|
303
|
+
newChannels: channelSetOfDescriptor(accessResult),
|
|
304
|
+
alwaysPut: true,
|
|
305
|
+
created: now,
|
|
304
306
|
});
|
|
305
|
-
|
|
306
|
-
|
|
307
|
-
|
|
308
|
-
|
|
309
|
-
|
|
310
|
-
|
|
311
|
-
|
|
307
|
+
});
|
|
308
|
+
if (rFeed.isErr()) {
|
|
309
|
+
console.error("backend put post-commit sync-feed error:", rFeed.Err());
|
|
310
|
+
}
|
|
311
|
+
const putFanoutChannels = [
|
|
312
|
+
...normalizeChannels(accessResult?.channels ?? []),
|
|
313
|
+
...(accessResult === undefined ? [] : audienceChannelsOf(accessResult)),
|
|
314
|
+
...(accessResult === undefined ? [] : inheritChannelOf(accessResult)),
|
|
315
|
+
];
|
|
316
|
+
if (hasInheritChannel(putFanoutChannels))
|
|
317
|
+
putFanoutChannels.push(INHERIT_CAPABILITY_CHANNEL);
|
|
318
|
+
const rFanOut = await exception2Result(async () => {
|
|
312
319
|
await notifyDocChangedRemoteFanOut(vctx, {
|
|
313
320
|
ownerHandle,
|
|
314
321
|
appSlug,
|
|
@@ -316,22 +323,25 @@ async function handleBackendPut(vctx, base, op) {
|
|
|
316
323
|
docId,
|
|
317
324
|
channels: putFanoutChannels,
|
|
318
325
|
});
|
|
319
|
-
|
|
320
|
-
|
|
321
|
-
|
|
326
|
+
});
|
|
327
|
+
if (rFanOut.isErr()) {
|
|
328
|
+
console.error("backend put post-commit fan-out error:", rFanOut.Err());
|
|
329
|
+
}
|
|
330
|
+
const rOnChange = await exception2Result(async () => {
|
|
331
|
+
await emitBackendOnChange(vctx, {
|
|
322
332
|
ownerHandle,
|
|
323
333
|
appSlug,
|
|
324
334
|
dbName,
|
|
325
335
|
docId,
|
|
326
336
|
seq: alloc.seq,
|
|
327
|
-
|
|
328
|
-
|
|
329
|
-
|
|
330
|
-
|
|
337
|
+
deleted: false,
|
|
338
|
+
doc: op.doc,
|
|
339
|
+
originDepth: base.originDepth,
|
|
340
|
+
writerUserId: userId,
|
|
331
341
|
});
|
|
332
342
|
});
|
|
333
|
-
if (
|
|
334
|
-
console.error("backend put post-commit
|
|
343
|
+
if (rOnChange.isErr()) {
|
|
344
|
+
console.error("backend put post-commit onChange error:", rOnChange.Err());
|
|
335
345
|
}
|
|
336
346
|
}
|
|
337
347
|
return { ok: true, id: docId };
|
|
@@ -412,32 +422,42 @@ async function handleBackendDelete(vctx, base, op) {
|
|
|
412
422
|
throw err;
|
|
413
423
|
}
|
|
414
424
|
if (delAlloc.inserted) {
|
|
415
|
-
const
|
|
416
|
-
await
|
|
425
|
+
const rFeed = await exception2Result(async () => {
|
|
426
|
+
await bestEffortAppendDelete({
|
|
427
|
+
db: vctx.sql.db,
|
|
428
|
+
flavour: vctx.sql.flavour,
|
|
417
429
|
ownerHandle,
|
|
418
430
|
appSlug,
|
|
419
431
|
dbName,
|
|
420
432
|
docId: op.docId,
|
|
421
433
|
seq: delAlloc.seq,
|
|
422
|
-
|
|
423
|
-
doc: {},
|
|
424
|
-
originDepth: base.originDepth,
|
|
425
|
-
writerUserId: userId,
|
|
434
|
+
created: now,
|
|
426
435
|
});
|
|
436
|
+
});
|
|
437
|
+
if (rFeed.isErr()) {
|
|
438
|
+
console.error("backend delete post-commit sync-feed error:", rFeed.Err());
|
|
439
|
+
}
|
|
440
|
+
const rFanOut = await exception2Result(async () => {
|
|
427
441
|
await notifyDocChangedRemoteFanOut(vctx, { ownerHandle, appSlug, dbName, docId: op.docId, channels: fanoutChannels });
|
|
428
|
-
|
|
429
|
-
|
|
430
|
-
|
|
442
|
+
});
|
|
443
|
+
if (rFanOut.isErr()) {
|
|
444
|
+
console.error("backend delete post-commit fan-out error:", rFanOut.Err());
|
|
445
|
+
}
|
|
446
|
+
const rOnChange = await exception2Result(async () => {
|
|
447
|
+
await emitBackendOnChange(vctx, {
|
|
431
448
|
ownerHandle,
|
|
432
449
|
appSlug,
|
|
433
450
|
dbName,
|
|
434
451
|
docId: op.docId,
|
|
435
452
|
seq: delAlloc.seq,
|
|
436
|
-
|
|
453
|
+
deleted: true,
|
|
454
|
+
doc: {},
|
|
455
|
+
originDepth: base.originDepth,
|
|
456
|
+
writerUserId: userId,
|
|
437
457
|
});
|
|
438
458
|
});
|
|
439
|
-
if (
|
|
440
|
-
console.error("backend delete post-commit
|
|
459
|
+
if (rOnChange.isErr()) {
|
|
460
|
+
console.error("backend delete post-commit onChange error:", rOnChange.Err());
|
|
441
461
|
}
|
|
442
462
|
}
|
|
443
463
|
return { ok: true, id: op.docId };
|