@vibes.diy/api-svc 14.3.65 → 14.3.67
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/cf-serve.js +1 -0
- package/cf-serve.js.map +1 -1
- package/check-auth.js +6 -1
- package/check-auth.js.map +1 -1
- package/create-handler.d.ts +2 -1
- package/create-handler.js +28 -17
- package/create-handler.js.map +1 -1
- package/evento-handler-manifest.js +2 -3
- package/evento-handler-manifest.js.map +1 -1
- package/guest-principal-token.d.ts +17 -0
- package/guest-principal-token.js +52 -0
- package/guest-principal-token.js.map +1 -0
- package/intern/admin-allowlist.d.ts +8 -0
- package/intern/admin-allowlist.js +10 -0
- package/intern/admin-allowlist.js.map +1 -0
- package/intern/agent-assembly.d.ts +7 -1
- package/intern/agent-assembly.js +15 -10
- package/intern/agent-assembly.js.map +1 -1
- package/intern/agent-belt.d.ts +1 -1
- package/intern/agent-belt.js +37 -8
- package/intern/agent-belt.js.map +1 -1
- package/intern/agent-build-tools.d.ts +3 -0
- package/intern/agent-build-tools.js +2 -2
- package/intern/agent-build-tools.js.map +1 -1
- package/intern/agent-image-survey-start.js +1 -1
- package/intern/agent-image-survey-start.js.map +1 -1
- package/intern/agent-session.d.ts +25 -24
- package/intern/agent-session.js +6 -2
- package/intern/agent-session.js.map +1 -1
- package/intern/automatic-draft-attachment.js +1 -8
- package/intern/automatic-draft-attachment.js.map +1 -1
- package/intern/client-message-dedupe.d.ts +27 -0
- package/intern/client-message-dedupe.js +89 -0
- package/intern/client-message-dedupe.js.map +1 -0
- package/intern/draft-runtime-store.d.ts +0 -2
- package/intern/draft-runtime-store.js +0 -15
- package/intern/draft-runtime-store.js.map +1 -1
- package/intern/ensure-chat-id.js +2 -2
- package/intern/ensure-chat-id.js.map +1 -1
- package/intern/guest-credit-meter.d.ts +13 -0
- package/intern/guest-credit-meter.js +82 -0
- package/intern/guest-credit-meter.js.map +1 -0
- package/intern/guest-mask.d.ts +8 -0
- package/intern/guest-mask.js +18 -0
- package/intern/guest-mask.js.map +1 -0
- package/intern/guest-principal-claim.d.ts +24 -0
- package/intern/guest-principal-claim.js +208 -0
- package/intern/guest-principal-claim.js.map +1 -0
- package/intern/guest-principal-store.d.ts +31 -0
- package/intern/guest-principal-store.js +159 -0
- package/intern/guest-principal-store.js.map +1 -0
- package/intern/inflate-file-attachments.d.ts +4 -1
- package/intern/inflate-file-attachments.js +86 -13
- package/intern/inflate-file-attachments.js.map +1 -1
- package/intern/instruction-variant.d.ts +1 -1
- package/intern/instruction-variant.js +2 -2
- package/intern/instruction-variant.js.map +1 -1
- package/intern/llm-tool-loop.d.ts +1 -0
- package/intern/llm-tool-loop.js +16 -6
- package/intern/llm-tool-loop.js.map +1 -1
- package/intern/load-selected-backend.js +3 -0
- package/intern/load-selected-backend.js.map +1 -1
- package/intern/mint-job-store.d.ts +4 -0
- package/intern/mint-job-store.js +19 -0
- package/intern/mint-job-store.js.map +1 -1
- package/intern/mint-style.d.ts +2 -2
- package/intern/mint-style.js +5 -5
- package/intern/mint-style.js.map +1 -1
- package/intern/open-turn-store.d.ts +17 -0
- package/intern/open-turn-store.js +8 -8
- package/intern/open-turn-store.js.map +1 -1
- package/intern/pouf-look-flag.d.ts +1 -0
- package/intern/pouf-look-flag.js +6 -0
- package/intern/pouf-look-flag.js.map +1 -1
- package/intern/prompt-assembly.d.ts +3 -2
- package/intern/prompt-assembly.js +7 -3
- package/intern/prompt-assembly.js.map +1 -1
- package/intern/unlimited-account.js +1 -1
- package/intern/unlimited-account.js.map +1 -1
- package/intern/webp-rendition.d.ts +14 -0
- package/intern/webp-rendition.js +46 -0
- package/intern/webp-rendition.js.map +1 -0
- package/package.json +13 -13
- package/public/agent-turn-action.js +24 -5
- package/public/agent-turn-action.js.map +1 -1
- package/public/agent-turn-assembly.js +1 -0
- package/public/agent-turn-assembly.js.map +1 -1
- package/public/app-settings-snapshot.js +13 -2
- package/public/app-settings-snapshot.js.map +1 -1
- package/public/app-settings-suggestion-bless.d.ts +1 -1
- package/public/app-settings-suggestion-bless.js +1 -9
- package/public/app-settings-suggestion-bless.js.map +1 -1
- package/public/append-block-event.d.ts +3 -3
- package/public/append-block-event.js +5 -2
- package/public/append-block-event.js.map +1 -1
- package/public/attach-draft-handle.js +0 -4
- package/public/attach-draft-handle.js.map +1 -1
- package/public/claim-guest-principal.d.ts +3 -0
- package/public/claim-guest-principal.js +40 -0
- package/public/claim-guest-principal.js.map +1 -0
- package/public/codegen-turn-route.js +15 -2
- package/public/codegen-turn-route.js.map +1 -1
- package/public/developer-grants-flow.js +3 -0
- package/public/developer-grants-flow.js.map +1 -1
- package/public/dm-read-eventos.d.ts +5 -5
- package/public/dm-sync-eventos.d.ts +1 -1
- package/public/dm-write-eventos.d.ts +3 -3
- package/public/draft-runtime.d.ts +2 -2
- package/public/draft-runtime.js +8 -19
- package/public/draft-runtime.js.map +1 -1
- package/public/ensure-app-slug-item.js +4 -0
- package/public/ensure-app-slug-item.js.map +1 -1
- package/public/get-app-by-fsid.js +4 -5
- package/public/get-app-by-fsid.js.map +1 -1
- package/public/get-chat-details.js +4 -11
- package/public/get-chat-details.js.map +1 -1
- package/public/get-chat-response.js +3 -9
- package/public/get-chat-response.js.map +1 -1
- package/public/handle-prompt-context.d.ts +2 -2
- package/public/handle-prompt-context.js +5 -14
- package/public/handle-prompt-context.js.map +1 -1
- package/public/handler-llm-request.js +17 -11
- package/public/handler-llm-request.js.map +1 -1
- package/public/invite-flow.js +3 -0
- package/public/invite-flow.js.map +1 -1
- package/public/open-chat.d.ts +11 -4
- package/public/open-chat.js +13 -13
- package/public/open-chat.js.map +1 -1
- package/public/prompt-chat-section.d.ts +1 -2
- package/public/prompt-chat-section.js +252 -232
- package/public/prompt-chat-section.js.map +1 -1
- package/public/publish-app.js +6 -0
- package/public/publish-app.js.map +1 -1
- package/public/request-flow.js +3 -0
- package/public/request-flow.js.map +1 -1
- package/public/set-mode-fsid.js +4 -0
- package/public/set-mode-fsid.js.map +1 -1
- package/public/set-version-lock.js +3 -0
- package/public/set-version-lock.js.map +1 -1
- package/public/social-invite-flow.js +4 -1
- package/public/social-invite-flow.js.map +1 -1
- package/public/stream-assembly.d.ts +5 -5
- package/public/stream-assembly.js +1 -4
- package/public/stream-assembly.js.map +1 -1
- package/shard-gate.js +11 -1
- package/shard-gate.js.map +1 -1
- package/types.d.ts +4 -3
- package/types.js.map +1 -1
- package/usage-report/draft-output-alert.js +3 -4
- package/usage-report/draft-output-alert.js.map +1 -1
- package/usage-report/gold-drip-sweep-util.js +2 -1
- package/usage-report/gold-drip-sweep-util.js.map +1 -1
- package/usage-report/new-user-alert-util.js +1 -1
- package/usage-report/new-user-alert-util.js.map +1 -1
- package/check-build-auth.d.ts +0 -18
- package/check-build-auth.js +0 -73
- package/check-build-auth.js.map +0 -1
- package/guest-build-token.d.ts +0 -16
- package/guest-build-token.js +0 -44
- package/guest-build-token.js.map +0 -1
- package/intern/draft-continuation.d.ts +0 -6
- package/intern/draft-continuation.js +0 -86
- package/intern/draft-continuation.js.map +0 -1
- package/intern/guest-build-issuance.d.ts +0 -9
- package/intern/guest-build-issuance.js +0 -83
- package/intern/guest-build-issuance.js.map +0 -1
- package/intern/guest-build-start.d.ts +0 -8
- package/intern/guest-build-start.js +0 -66
- package/intern/guest-build-start.js.map +0 -1
- package/intern/guest-build-store.d.ts +0 -50
- package/intern/guest-build-store.js +0 -232
- package/intern/guest-build-store.js.map +0 -1
- package/intern/guest-build-usage.d.ts +0 -7
- package/intern/guest-build-usage.js +0 -18
- package/intern/guest-build-usage.js.map +0 -1
- package/public/guest-build-generation.d.ts +0 -8
- package/public/guest-build-generation.js +0 -221
- package/public/guest-build-generation.js.map +0 -1
- package/public/guest-build.d.ts +0 -7
- package/public/guest-build.js +0 -127
- package/public/guest-build.js.map +0 -1
|
@@ -0,0 +1,208 @@
|
|
|
1
|
+
import { exception2Result, Result } from "@adviser/cement";
|
|
2
|
+
import { and, eq, gt, inArray, isNull, max, ne, or, sql } from "drizzle-orm";
|
|
3
|
+
import { isGuestPrincipal } from "@vibes.diy/api-types";
|
|
4
|
+
import { AGENT_SESSION_RECORD_ID } from "./agent-session-store.js";
|
|
5
|
+
import { readGuestPrincipal } from "./guest-principal-store.js";
|
|
6
|
+
import { openTurnValues } from "./open-turn-store.js";
|
|
7
|
+
export async function countPrincipalRows(db, t, userId) {
|
|
8
|
+
const n = async (q) => (await q).length;
|
|
9
|
+
return {
|
|
10
|
+
"UserSlugBindings.userId": await n(db.select({ v: t.handleBinding.userId }).from(t.handleBinding).where(eq(t.handleBinding.userId, userId))),
|
|
11
|
+
"Apps.userId": await n(db.select({ v: t.apps.userId }).from(t.apps).where(eq(t.apps.userId, userId))),
|
|
12
|
+
"Apps.deployerUserId": await n(db.select({ v: t.apps.userId }).from(t.apps).where(eq(t.apps.deployerUserId, userId))),
|
|
13
|
+
"ChatContexts.userId": await n(db.select({ v: t.chatContexts.chatId }).from(t.chatContexts).where(eq(t.chatContexts.userId, userId))),
|
|
14
|
+
"MintJobs.userId": await n(db.select({ v: t.mintJobs.chatId }).from(t.mintJobs).where(eq(t.mintJobs.userId, userId))),
|
|
15
|
+
"OpenTurns.userId": await n(db.select({ v: t.openTurns.chatId }).from(t.openTurns).where(eq(t.openTurns.userId, userId))),
|
|
16
|
+
"PromptContexts.userId": await n(db.select({ v: t.promptContexts.promptId }).from(t.promptContexts).where(eq(t.promptContexts.userId, userId))),
|
|
17
|
+
"ApplicationChats.userId": await n(db.select({ v: t.applicationChats.chatId }).from(t.applicationChats).where(eq(t.applicationChats.userId, userId))),
|
|
18
|
+
"UserSettings.userId": await n(db.select({ v: t.userSettings.userId }).from(t.userSettings).where(eq(t.userSettings.userId, userId))),
|
|
19
|
+
"AppSettings.userId": await n(db.select({ v: t.appSettings.appSlug }).from(t.appSettings).where(eq(t.appSettings.userId, userId))),
|
|
20
|
+
"AppSettingItems.userId": await n(db.select({ v: t.appSettingItems.appSlug }).from(t.appSettingItems).where(eq(t.appSettingItems.userId, userId))),
|
|
21
|
+
"HandleSettings.userId": await n(db.select({ v: t.handleSettings.handle }).from(t.handleSettings).where(eq(t.handleSettings.userId, userId))),
|
|
22
|
+
"RequestGrants.userId": await n(db.select({ v: t.requestGrants.appSlug }).from(t.requestGrants).where(eq(t.requestGrants.userId, userId))),
|
|
23
|
+
"RequestGrants.foreignUserId": await n(db.select({ v: t.requestGrants.appSlug }).from(t.requestGrants).where(eq(t.requestGrants.foreignUserId, userId))),
|
|
24
|
+
"DeveloperGrants.userId": await n(db.select({ v: t.developerGrants.appSlug }).from(t.developerGrants).where(eq(t.developerGrants.userId, userId))),
|
|
25
|
+
"DeveloperGrants.devUserId": await n(db.select({ v: t.developerGrants.appSlug }).from(t.developerGrants).where(eq(t.developerGrants.devUserId, userId))),
|
|
26
|
+
"AppDocuments.userId": await n(db.select({ v: t.appDocuments.docId }).from(t.appDocuments).where(eq(t.appDocuments.userId, userId))),
|
|
27
|
+
"SocialInvites.redeemedByUserId": await n(db.select({ v: t.socialInvites.redeemedByUserId }).from(t.socialInvites).where(eq(t.socialInvites.redeemedByUserId, userId))),
|
|
28
|
+
"InviteGrants.userId": await n(db.select({ v: t.inviteGrants.appSlug }).from(t.inviteGrants).where(eq(t.inviteGrants.userId, userId))),
|
|
29
|
+
"InviteGrants.tokenOrGrantUserId": await n(db.select({ v: t.inviteGrants.appSlug }).from(t.inviteGrants).where(eq(t.inviteGrants.tokenOrGrantUserId, userId))),
|
|
30
|
+
"AssetUploads.userId": await n(db.select({ v: t.assetUploads.userId }).from(t.assetUploads).where(eq(t.assetUploads.userId, userId))),
|
|
31
|
+
"Notifications.userId": await n(db.select({ v: t.notifications.userId }).from(t.notifications).where(eq(t.notifications.userId, userId))),
|
|
32
|
+
"Notifications.actorUserId": await n(db.select({ v: t.notifications.userId }).from(t.notifications).where(eq(t.notifications.actorUserId, userId))),
|
|
33
|
+
"NotificationDigests.userId": await n(db.select({ v: t.notificationDigests.userId }).from(t.notificationDigests).where(eq(t.notificationDigests.userId, userId))),
|
|
34
|
+
"GithubRepoRoutes.installedByUserId": await n(db.select({ v: t.githubRepoRoutes.appSlug }).from(t.githubRepoRoutes).where(eq(t.githubRepoRoutes.installedByUserId, userId))),
|
|
35
|
+
"SignupAttributions.userId": await n(db.select({ v: t.signupAttributions.userId }).from(t.signupAttributions).where(eq(t.signupAttributions.userId, userId))),
|
|
36
|
+
"ThirdPartyGrants.userId": await n(db.select({ v: t.thirdPartyGrants.userId }).from(t.thirdPartyGrants).where(eq(t.thirdPartyGrants.userId, userId))),
|
|
37
|
+
"ThirdPartyConsents.userId": await n(db.select({ v: t.thirdPartyConsents.userId }).from(t.thirdPartyConsents).where(eq(t.thirdPartyConsents.userId, userId))),
|
|
38
|
+
"ConnectionApprovals.userId": await n(db.select({ v: t.connectionApprovals.userId }).from(t.connectionApprovals).where(eq(t.connectionApprovals.userId, userId))),
|
|
39
|
+
"AppContentOrdinals.userId": await n(db.select({ v: t.appContentOrdinals.userId }).from(t.appContentOrdinals).where(eq(t.appContentOrdinals.userId, userId))),
|
|
40
|
+
"AppPublicNames.ownerUserId": await n(db.select({ v: t.appPublicNames.ownerUserId }).from(t.appPublicNames).where(eq(t.appPublicNames.ownerUserId, userId))),
|
|
41
|
+
};
|
|
42
|
+
}
|
|
43
|
+
export async function rekeyGuestPrincipal(db, t, guest, account) {
|
|
44
|
+
const guestSlugs = await db.selectDistinct({ appSlug: t.apps.appSlug }).from(t.apps).where(eq(t.apps.userId, guest));
|
|
45
|
+
for (const { appSlug } of guestSlugs) {
|
|
46
|
+
const [top] = await db
|
|
47
|
+
.select({ seq: max(t.apps.releaseSeq) })
|
|
48
|
+
.from(t.apps)
|
|
49
|
+
.where(and(eq(t.apps.userId, account), eq(t.apps.appSlug, appSlug)));
|
|
50
|
+
const offset = top?.seq ?? 0;
|
|
51
|
+
await db
|
|
52
|
+
.update(t.apps)
|
|
53
|
+
.set({ userId: account, releaseSeq: sql `${t.apps.releaseSeq} + ${offset}` })
|
|
54
|
+
.where(and(eq(t.apps.userId, guest), eq(t.apps.appSlug, appSlug)));
|
|
55
|
+
}
|
|
56
|
+
await db.update(t.apps).set({ deployerUserId: account }).where(eq(t.apps.deployerUserId, guest));
|
|
57
|
+
const rg = t.requestGrants;
|
|
58
|
+
const asked = await db
|
|
59
|
+
.select({ userId: rg.userId, appSlug: rg.appSlug, ownerHandle: rg.ownerHandle })
|
|
60
|
+
.from(rg)
|
|
61
|
+
.where(eq(rg.foreignUserId, guest));
|
|
62
|
+
for (const row of asked) {
|
|
63
|
+
const key = and(eq(rg.userId, row.userId), eq(rg.appSlug, row.appSlug), eq(rg.ownerHandle, row.ownerHandle));
|
|
64
|
+
const existing = await db
|
|
65
|
+
.select({ v: rg.foreignUserId })
|
|
66
|
+
.from(rg)
|
|
67
|
+
.where(and(key, eq(rg.foreignUserId, account)));
|
|
68
|
+
if (existing.length > 0)
|
|
69
|
+
await db.delete(rg).where(and(key, eq(rg.foreignUserId, guest)));
|
|
70
|
+
}
|
|
71
|
+
await db.update(rg).set({ foreignUserId: account }).where(eq(rg.foreignUserId, guest));
|
|
72
|
+
await db.update(rg).set({ userId: account }).where(eq(rg.userId, guest));
|
|
73
|
+
const nt = t.notifications;
|
|
74
|
+
const taken = (await db.select({ dedupeKey: nt.dedupeKey }).from(nt).where(eq(nt.userId, account)))
|
|
75
|
+
.map((r) => r.dedupeKey)
|
|
76
|
+
.filter((k) => typeof k === "string");
|
|
77
|
+
if (taken.length > 0)
|
|
78
|
+
await db.delete(nt).where(and(eq(nt.userId, guest), inArray(nt.dedupeKey, taken)));
|
|
79
|
+
await db.update(nt).set({ userId: account }).where(eq(nt.userId, guest));
|
|
80
|
+
await db.update(nt).set({ actorUserId: account }).where(eq(nt.actorUserId, guest));
|
|
81
|
+
const tg = t.thirdPartyGrants;
|
|
82
|
+
const providers = (await db.select({ provider: tg.provider }).from(tg).where(eq(tg.userId, account))).map((r) => r.provider);
|
|
83
|
+
if (providers.length > 0)
|
|
84
|
+
await db.delete(tg).where(and(eq(tg.userId, guest), inArray(tg.provider, providers)));
|
|
85
|
+
await db.update(tg).set({ userId: account }).where(eq(tg.userId, guest));
|
|
86
|
+
const us = t.userSettings;
|
|
87
|
+
if ((await db.select({ v: us.userId }).from(us).where(eq(us.userId, account))).length > 0)
|
|
88
|
+
await db.delete(us).where(eq(us.userId, guest));
|
|
89
|
+
else
|
|
90
|
+
await db.update(us).set({ userId: account }).where(eq(us.userId, guest));
|
|
91
|
+
const nd = t.notificationDigests;
|
|
92
|
+
if ((await db.select({ v: nd.userId }).from(nd).where(eq(nd.userId, account))).length > 0)
|
|
93
|
+
await db.delete(nd).where(eq(nd.userId, guest));
|
|
94
|
+
else
|
|
95
|
+
await db.update(nd).set({ userId: account }).where(eq(nd.userId, guest));
|
|
96
|
+
const sa = t.signupAttributions;
|
|
97
|
+
if ((await db.select({ v: sa.userId }).from(sa).where(eq(sa.userId, account))).length > 0)
|
|
98
|
+
await db.delete(sa).where(eq(sa.userId, guest));
|
|
99
|
+
else
|
|
100
|
+
await db.update(sa).set({ userId: account }).where(eq(sa.userId, guest));
|
|
101
|
+
await db.update(t.handleBinding).set({ userId: account }).where(eq(t.handleBinding.userId, guest));
|
|
102
|
+
await db.update(t.chatContexts).set({ userId: account }).where(eq(t.chatContexts.userId, guest));
|
|
103
|
+
await db.update(t.mintJobs).set({ userId: account }).where(eq(t.mintJobs.userId, guest));
|
|
104
|
+
await db.update(t.openTurns).set({ userId: account }).where(eq(t.openTurns.userId, guest));
|
|
105
|
+
await db.update(t.promptContexts).set({ userId: account }).where(eq(t.promptContexts.userId, guest));
|
|
106
|
+
await db.update(t.applicationChats).set({ userId: account }).where(eq(t.applicationChats.userId, guest));
|
|
107
|
+
await db.update(t.appSettings).set({ userId: account }).where(eq(t.appSettings.userId, guest));
|
|
108
|
+
await db.update(t.appSettingItems).set({ userId: account }).where(eq(t.appSettingItems.userId, guest));
|
|
109
|
+
await db.update(t.handleSettings).set({ userId: account }).where(eq(t.handleSettings.userId, guest));
|
|
110
|
+
await db.update(t.developerGrants).set({ userId: account }).where(eq(t.developerGrants.userId, guest));
|
|
111
|
+
await db.update(t.developerGrants).set({ devUserId: account }).where(eq(t.developerGrants.devUserId, guest));
|
|
112
|
+
await db.update(t.appDocuments).set({ userId: account }).where(eq(t.appDocuments.userId, guest));
|
|
113
|
+
await db.update(t.socialInvites).set({ redeemedByUserId: account }).where(eq(t.socialInvites.redeemedByUserId, guest));
|
|
114
|
+
await db.update(t.inviteGrants).set({ userId: account }).where(eq(t.inviteGrants.userId, guest));
|
|
115
|
+
await db.update(t.inviteGrants).set({ tokenOrGrantUserId: account }).where(eq(t.inviteGrants.tokenOrGrantUserId, guest));
|
|
116
|
+
await db.update(t.assetUploads).set({ userId: account }).where(eq(t.assetUploads.userId, guest));
|
|
117
|
+
await db.update(t.githubRepoRoutes).set({ installedByUserId: account }).where(eq(t.githubRepoRoutes.installedByUserId, guest));
|
|
118
|
+
await db.update(t.thirdPartyConsents).set({ userId: account }).where(eq(t.thirdPartyConsents.userId, guest));
|
|
119
|
+
await db.update(t.connectionApprovals).set({ userId: account }).where(eq(t.connectionApprovals.userId, guest));
|
|
120
|
+
await db.update(t.appContentOrdinals).set({ userId: account }).where(eq(t.appContentOrdinals.userId, guest));
|
|
121
|
+
await db.update(t.appPublicNames).set({ ownerUserId: account }).where(eq(t.appPublicNames.ownerUserId, guest));
|
|
122
|
+
}
|
|
123
|
+
async function guestHasOpenTurn(db, t, guest, now) {
|
|
124
|
+
const ot = t.openTurns;
|
|
125
|
+
const rows = await db
|
|
126
|
+
.select({ chatId: ot.chatId })
|
|
127
|
+
.from(ot)
|
|
128
|
+
.where(and(eq(ot.userId, guest), eq(ot.status, "open"), ne(ot.promptId, AGENT_SESSION_RECORD_ID), gt(ot.deadlineAt, now.toISOString())))
|
|
129
|
+
.limit(1);
|
|
130
|
+
return rows.length > 0;
|
|
131
|
+
}
|
|
132
|
+
export const GUEST_PRINCIPAL_CLAIMED = "guest-principal-claimed: sign in again to keep building";
|
|
133
|
+
class Refused extends Error {
|
|
134
|
+
}
|
|
135
|
+
export async function admitGuestTurn(vctx, input) {
|
|
136
|
+
const loaded = await readGuestPrincipal(vctx, input.userId);
|
|
137
|
+
if (loaded.isErr())
|
|
138
|
+
return Result.Err(loaded.Err());
|
|
139
|
+
const row = loaded.Ok();
|
|
140
|
+
if (row === undefined)
|
|
141
|
+
return Result.Err(GUEST_PRINCIPAL_CLAIMED);
|
|
142
|
+
const gb = vctx.sql.tables.guestBuilds;
|
|
143
|
+
const admitted = await exception2Result(() => vctx.sql.db.transaction(async (tx) => {
|
|
144
|
+
const held = await tx
|
|
145
|
+
.update(gb)
|
|
146
|
+
.set({ updated: new Date().toISOString() })
|
|
147
|
+
.where(and(eq(gb.chatId, row.id), isNull(gb.claimedUserId), eq(gb.status, "issued")))
|
|
148
|
+
.returning({ id: gb.chatId });
|
|
149
|
+
if (held.length !== 1)
|
|
150
|
+
throw new Refused();
|
|
151
|
+
await tx.insert(vctx.sql.tables.openTurns).values(openTurnValues(input)).onConflictDoNothing();
|
|
152
|
+
}));
|
|
153
|
+
if (admitted.isErr()) {
|
|
154
|
+
return admitted.Err() instanceof Refused ? Result.Err(GUEST_PRINCIPAL_CLAIMED) : Result.Err(admitted.Err());
|
|
155
|
+
}
|
|
156
|
+
return Result.Ok(undefined);
|
|
157
|
+
}
|
|
158
|
+
async function handlesOf(vctx, userId) {
|
|
159
|
+
const hb = vctx.sql.tables.handleBinding;
|
|
160
|
+
const rows = await exception2Result(() => vctx.sql.db.select({ handle: hb.handle }).from(hb).where(eq(hb.userId, userId)));
|
|
161
|
+
if (rows.isErr())
|
|
162
|
+
return Result.Err(rows.Err());
|
|
163
|
+
return Result.Ok(rows.Ok().map((r) => r.handle));
|
|
164
|
+
}
|
|
165
|
+
export async function claimGuestPrincipal(vctx, input, now = new Date()) {
|
|
166
|
+
if (isGuestPrincipal(input.accountUserId))
|
|
167
|
+
return Result.Err("guest-claim-requires-account");
|
|
168
|
+
const loaded = await readGuestPrincipal(vctx, input.guestUserId);
|
|
169
|
+
if (loaded.isErr())
|
|
170
|
+
return Result.Err(loaded.Err());
|
|
171
|
+
const row = loaded.Ok();
|
|
172
|
+
if (row === undefined || row.jti !== input.jti)
|
|
173
|
+
return Result.Err("guest-principal-unavailable");
|
|
174
|
+
if (row.claimedUserId !== null && row.claimedUserId !== input.accountUserId) {
|
|
175
|
+
return Result.Err("guest-principal-claimed-by-another-account");
|
|
176
|
+
}
|
|
177
|
+
const handles = await handlesOf(vctx, input.guestUserId);
|
|
178
|
+
if (handles.isErr())
|
|
179
|
+
return Result.Err(handles.Err());
|
|
180
|
+
const busyOutside = await exception2Result(() => guestHasOpenTurn(vctx.sql.db, vctx.sql.tables, input.guestUserId, now));
|
|
181
|
+
if (busyOutside.isErr())
|
|
182
|
+
return Result.Err(busyOutside.Err());
|
|
183
|
+
if (busyOutside.Ok())
|
|
184
|
+
return Result.Ok({ status: "busy", handles: handles.Ok() });
|
|
185
|
+
const gb = vctx.sql.tables.guestBuilds;
|
|
186
|
+
const merged = await exception2Result(() => vctx.sql.db.transaction(async (tx) => {
|
|
187
|
+
const marked = await tx
|
|
188
|
+
.update(gb)
|
|
189
|
+
.set({ claimedUserId: input.accountUserId, status: "claimed", updated: now.toISOString() })
|
|
190
|
+
.where(and(eq(gb.chatId, row.id), or(isNull(gb.claimedUserId), eq(gb.claimedUserId, input.accountUserId))))
|
|
191
|
+
.returning({ id: gb.chatId });
|
|
192
|
+
if (marked.length !== 1)
|
|
193
|
+
return "taken";
|
|
194
|
+
if (await guestHasOpenTurn(tx, vctx.sql.tables, input.guestUserId, now))
|
|
195
|
+
throw new Refused();
|
|
196
|
+
await rekeyGuestPrincipal(tx, vctx.sql.tables, input.guestUserId, input.accountUserId);
|
|
197
|
+
return "claimed";
|
|
198
|
+
}));
|
|
199
|
+
if (merged.isErr()) {
|
|
200
|
+
if (merged.Err() instanceof Refused)
|
|
201
|
+
return Result.Ok({ status: "busy", handles: handles.Ok() });
|
|
202
|
+
return Result.Err(merged.Err());
|
|
203
|
+
}
|
|
204
|
+
if (merged.Ok() === "taken")
|
|
205
|
+
return Result.Err("guest-principal-claimed-by-another-account");
|
|
206
|
+
return Result.Ok({ status: "claimed", handles: handles.Ok() });
|
|
207
|
+
}
|
|
208
|
+
//# sourceMappingURL=guest-principal-claim.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"guest-principal-claim.js","sourceRoot":"","sources":["../../jsr/intern/guest-principal-claim.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,31 @@
|
|
|
1
|
+
import { Result } from "@adviser/cement";
|
|
2
|
+
import type { FPApiToken } from "@vibes.diy/identity";
|
|
3
|
+
import { type GuestPrincipalSession } from "@vibes.diy/api-types";
|
|
4
|
+
import type { GuestPrincipalSigner } from "../guest-principal-token.js";
|
|
5
|
+
import type { VibesApiSQLCtx } from "../types.js";
|
|
6
|
+
export declare const GUEST_PRINCIPAL_LIFETIME_MS: number;
|
|
7
|
+
export interface GuestPrincipalRow {
|
|
8
|
+
readonly id: string;
|
|
9
|
+
readonly userId: string;
|
|
10
|
+
readonly jti: string;
|
|
11
|
+
readonly status: string;
|
|
12
|
+
readonly claimedUserId: string | null;
|
|
13
|
+
readonly expiresAt: string;
|
|
14
|
+
readonly plane: string;
|
|
15
|
+
readonly issuanceRequestId: string;
|
|
16
|
+
readonly created: string;
|
|
17
|
+
}
|
|
18
|
+
export declare function guestUserIdFor(id: string): string;
|
|
19
|
+
export declare function guestIdOf(userId: string): string | undefined;
|
|
20
|
+
export declare function readGuestPrincipal(vctx: Pick<VibesApiSQLCtx, "sql">, userId: string): Promise<Result<GuestPrincipalRow | undefined>>;
|
|
21
|
+
export declare function guestPrincipalIsLive(row: GuestPrincipalRow, jti: string, now?: Date): boolean;
|
|
22
|
+
export declare function guestPrincipalTokenApi(args: {
|
|
23
|
+
readonly signer: GuestPrincipalSigner;
|
|
24
|
+
readonly sql: () => Pick<VibesApiSQLCtx, "sql">;
|
|
25
|
+
}): FPApiToken;
|
|
26
|
+
export interface IssueGuestPrincipalInput {
|
|
27
|
+
readonly plane: string;
|
|
28
|
+
readonly issuanceRequestId: string;
|
|
29
|
+
readonly draw?: () => string;
|
|
30
|
+
}
|
|
31
|
+
export declare function issueGuestPrincipal(vctx: VibesApiSQLCtx, input: IssueGuestPrincipalInput, now?: Date): Promise<Result<GuestPrincipalSession>>;
|
|
@@ -0,0 +1,159 @@
|
|
|
1
|
+
import { exception2Result, Result } from "@adviser/cement";
|
|
2
|
+
import { and, eq } from "drizzle-orm";
|
|
3
|
+
import { GUEST_PRINCIPAL_PREFIX, guestAccountClaims } from "@vibes.diy/api-types";
|
|
4
|
+
import { dealUnboundWordSlug } from "./onboarding-handle.js";
|
|
5
|
+
import { persistDefaultUserSlug, writeProvisionalHandleBinding } from "./ensure-slug-binding.js";
|
|
6
|
+
export const GUEST_PRINCIPAL_LIFETIME_MS = 7 * 24 * 60 * 60 * 1000;
|
|
7
|
+
export function guestUserIdFor(id) {
|
|
8
|
+
return `${GUEST_PRINCIPAL_PREFIX}${id}`;
|
|
9
|
+
}
|
|
10
|
+
export function guestIdOf(userId) {
|
|
11
|
+
return userId.startsWith(GUEST_PRINCIPAL_PREFIX) ? userId.slice(GUEST_PRINCIPAL_PREFIX.length) : undefined;
|
|
12
|
+
}
|
|
13
|
+
function toRow(row) {
|
|
14
|
+
return {
|
|
15
|
+
id: row.chatId,
|
|
16
|
+
userId: guestUserIdFor(row.chatId),
|
|
17
|
+
jti: row.jti,
|
|
18
|
+
status: row.status,
|
|
19
|
+
claimedUserId: row.claimedUserId ?? null,
|
|
20
|
+
expiresAt: row.expiresAt,
|
|
21
|
+
plane: row.plane,
|
|
22
|
+
issuanceRequestId: row.issuanceRequestId,
|
|
23
|
+
created: row.created,
|
|
24
|
+
};
|
|
25
|
+
}
|
|
26
|
+
export async function readGuestPrincipal(vctx, userId) {
|
|
27
|
+
const id = guestIdOf(userId);
|
|
28
|
+
if (id === undefined)
|
|
29
|
+
return Result.Ok(undefined);
|
|
30
|
+
const t = vctx.sql.tables.guestBuilds;
|
|
31
|
+
const read = await exception2Result(() => vctx.sql.db.select().from(t).where(eq(t.chatId, id)).limit(1));
|
|
32
|
+
if (read.isErr())
|
|
33
|
+
return Result.Err(read.Err());
|
|
34
|
+
const row = read.Ok()[0];
|
|
35
|
+
return Result.Ok(row === undefined ? undefined : toRow(row));
|
|
36
|
+
}
|
|
37
|
+
export function guestPrincipalIsLive(row, jti, now = new Date()) {
|
|
38
|
+
return row.jti === jti && row.claimedUserId === null && row.status === "issued" && row.expiresAt > now.toISOString();
|
|
39
|
+
}
|
|
40
|
+
export function guestPrincipalTokenApi(args) {
|
|
41
|
+
const verify = async (token) => {
|
|
42
|
+
const verified = await args.signer.verify(token);
|
|
43
|
+
if (verified.isErr())
|
|
44
|
+
return Result.Err(verified.Err());
|
|
45
|
+
const claims = verified.Ok();
|
|
46
|
+
const loaded = await readGuestPrincipal(args.sql(), claims.userId);
|
|
47
|
+
if (loaded.isErr())
|
|
48
|
+
return Result.Err(loaded.Err());
|
|
49
|
+
const row = loaded.Ok();
|
|
50
|
+
if (row === undefined || row.plane !== claims.plane || guestPrincipalIsLive(row, claims.jti) === false) {
|
|
51
|
+
return Result.Err("guest-principal-unavailable");
|
|
52
|
+
}
|
|
53
|
+
return Result.Ok({ type: "guest", token, claims: guestAccountClaims(claims) });
|
|
54
|
+
};
|
|
55
|
+
return { verify, decode: verify };
|
|
56
|
+
}
|
|
57
|
+
async function rowForRequest(vctx, input) {
|
|
58
|
+
const t = vctx.sql.tables.guestBuilds;
|
|
59
|
+
const found = await exception2Result(() => vctx.sql.db
|
|
60
|
+
.select()
|
|
61
|
+
.from(t)
|
|
62
|
+
.where(and(eq(t.plane, input.plane), eq(t.issuanceRequestId, input.issuanceRequestId)))
|
|
63
|
+
.limit(1));
|
|
64
|
+
if (found.isErr())
|
|
65
|
+
return Result.Err(found.Err());
|
|
66
|
+
const row = found.Ok()[0];
|
|
67
|
+
return Result.Ok(row === undefined ? undefined : toRow(row));
|
|
68
|
+
}
|
|
69
|
+
async function handleOf(vctx, userId) {
|
|
70
|
+
const hb = vctx.sql.tables.handleBinding;
|
|
71
|
+
const rows = await exception2Result(() => vctx.sql.db.select({ handle: hb.handle, created: hb.created }).from(hb).where(eq(hb.userId, userId)));
|
|
72
|
+
if (rows.isErr())
|
|
73
|
+
return Result.Err(rows.Err());
|
|
74
|
+
const earliest = [...rows.Ok()].sort((a, b) => a.created.localeCompare(b.created) || a.handle.localeCompare(b.handle))[0];
|
|
75
|
+
return Result.Ok(earliest?.handle);
|
|
76
|
+
}
|
|
77
|
+
async function ensureGuestHandle(vctx, userId, draw) {
|
|
78
|
+
const held = await handleOf(vctx, userId);
|
|
79
|
+
if (held.isErr())
|
|
80
|
+
return Result.Err(held.Err());
|
|
81
|
+
if (held.Ok() !== undefined)
|
|
82
|
+
return Result.Ok(held.Ok());
|
|
83
|
+
for (let attempt = 0; attempt < 3; attempt++) {
|
|
84
|
+
const dealt = await dealUnboundWordSlug(vctx, { draw });
|
|
85
|
+
if (dealt.isErr())
|
|
86
|
+
return Result.Err(dealt.Err());
|
|
87
|
+
const bound = await writeProvisionalHandleBinding(vctx, userId, dealt.Ok());
|
|
88
|
+
if (bound.isErr())
|
|
89
|
+
continue;
|
|
90
|
+
const persisted = await exception2Result(() => persistDefaultUserSlug(vctx, userId, bound.Ok().ownerHandle));
|
|
91
|
+
if (persisted.isErr())
|
|
92
|
+
return Result.Err(persisted.Err());
|
|
93
|
+
return Result.Ok(bound.Ok().ownerHandle);
|
|
94
|
+
}
|
|
95
|
+
return Result.Err("guest-handle-unavailable");
|
|
96
|
+
}
|
|
97
|
+
async function sessionFor(vctx, row, ownerHandle) {
|
|
98
|
+
const signer = vctx.guestPrincipalSigner;
|
|
99
|
+
if (signer === undefined)
|
|
100
|
+
return Result.Err("guest-principal-unavailable");
|
|
101
|
+
const signed = await signer.sign({
|
|
102
|
+
kind: "guest-principal",
|
|
103
|
+
plane: row.plane,
|
|
104
|
+
userId: row.userId,
|
|
105
|
+
jti: row.jti,
|
|
106
|
+
iat: Math.floor(Date.parse(row.created) / 1000),
|
|
107
|
+
exp: Math.floor(Date.parse(row.expiresAt) / 1000),
|
|
108
|
+
});
|
|
109
|
+
if (signed.isErr())
|
|
110
|
+
return Result.Err(signed.Err());
|
|
111
|
+
return Result.Ok({ token: signed.Ok().token, userId: row.userId, ownerHandle, expiresAt: row.expiresAt });
|
|
112
|
+
}
|
|
113
|
+
export async function issueGuestPrincipal(vctx, input, now = new Date()) {
|
|
114
|
+
const signer = vctx.guestPrincipalSigner;
|
|
115
|
+
if (signer === undefined)
|
|
116
|
+
return Result.Err("guest-principal-unavailable");
|
|
117
|
+
if (signer.plane !== input.plane)
|
|
118
|
+
return Result.Err("guest-principal-plane-mismatch");
|
|
119
|
+
const prior = await rowForRequest(vctx, input);
|
|
120
|
+
if (prior.isErr())
|
|
121
|
+
return Result.Err(prior.Err());
|
|
122
|
+
let row = prior.Ok();
|
|
123
|
+
if (row === undefined) {
|
|
124
|
+
const id = vctx.sthis.nextId(16).str;
|
|
125
|
+
const created = now.toISOString();
|
|
126
|
+
const inserted = await exception2Result(() => vctx.sql.db
|
|
127
|
+
.insert(vctx.sql.tables.guestBuilds)
|
|
128
|
+
.values({
|
|
129
|
+
chatId: id,
|
|
130
|
+
jti: vctx.sthis.nextId(32).str,
|
|
131
|
+
expiresAt: new Date(now.getTime() + GUEST_PRINCIPAL_LIFETIME_MS).toISOString(),
|
|
132
|
+
status: "issued",
|
|
133
|
+
revision: 0,
|
|
134
|
+
plane: input.plane,
|
|
135
|
+
issuanceRequestId: input.issuanceRequestId,
|
|
136
|
+
originalPrompt: "",
|
|
137
|
+
created,
|
|
138
|
+
updated: created,
|
|
139
|
+
})
|
|
140
|
+
.onConflictDoNothing());
|
|
141
|
+
if (inserted.isErr())
|
|
142
|
+
return Result.Err(inserted.Err());
|
|
143
|
+
const won = await rowForRequest(vctx, input);
|
|
144
|
+
if (won.isErr())
|
|
145
|
+
return Result.Err(won.Err());
|
|
146
|
+
row = won.Ok();
|
|
147
|
+
}
|
|
148
|
+
if (row === undefined)
|
|
149
|
+
return Result.Err("guest-principal-unavailable");
|
|
150
|
+
if (row.claimedUserId !== null)
|
|
151
|
+
return Result.Err("guest-principal-already-claimed");
|
|
152
|
+
if (row.expiresAt <= now.toISOString())
|
|
153
|
+
return Result.Err("guest-principal-expired");
|
|
154
|
+
const handle = await ensureGuestHandle(vctx, row.userId, input.draw);
|
|
155
|
+
if (handle.isErr())
|
|
156
|
+
return Result.Err(handle.Err());
|
|
157
|
+
return sessionFor(vctx, row, handle.Ok());
|
|
158
|
+
}
|
|
159
|
+
//# sourceMappingURL=guest-principal-store.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"guest-principal-store.js","sourceRoot":"","sources":["../../jsr/intern/guest-principal-store.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,9 @@
|
|
|
1
|
-
import type { ChatMessage } from "@vibes.diy/call-ai-v2";
|
|
1
|
+
import type { ChatMessage, LLMMessage } from "@vibes.diy/call-ai-v2";
|
|
2
2
|
import type { VibesApiSQLCtx } from "../types.js";
|
|
3
|
+
export declare function dehydrateFileAttachments(messages: readonly LLMMessage[]): LLMMessage[];
|
|
3
4
|
export declare function stripVibesFileBlocks(messages: readonly ChatMessage[]): ChatMessage[];
|
|
5
|
+
export declare const MODEL_IMAGE_EDGE = 768;
|
|
6
|
+
export declare const MODEL_IMAGE_MIME = "image/webp";
|
|
4
7
|
export declare function inflateFileAttachments(vctx: VibesApiSQLCtx, args: {
|
|
5
8
|
readonly messages: ChatMessage[];
|
|
6
9
|
readonly scope?: {
|
|
@@ -1,7 +1,8 @@
|
|
|
1
|
-
import { exception2Result, stream2uint8array } from "@adviser/cement";
|
|
1
|
+
import { exception2Result, Result, stream2uint8array } from "@adviser/cement";
|
|
2
2
|
import { inArray, and, eq } from "drizzle-orm/sql/expressions";
|
|
3
3
|
import { isFetchOkResult } from "@vibes.diy/api-types";
|
|
4
4
|
import { ensureLogger } from "@vibes.diy/identity";
|
|
5
|
+
import { isWebpMetadataLeak, transformToWebp, WEBP_RENDITION_MIME } from "./webp-rendition.js";
|
|
5
6
|
const MAX_INLINE_TEXT_CHARS = 64_000;
|
|
6
7
|
function bytesToBase64(bytes) {
|
|
7
8
|
let binary = "";
|
|
@@ -11,6 +12,29 @@ function bytesToBase64(bytes) {
|
|
|
11
12
|
}
|
|
12
13
|
return btoa(binary);
|
|
13
14
|
}
|
|
15
|
+
const inflatedFrom = new WeakMap();
|
|
16
|
+
export function dehydrateFileAttachments(messages) {
|
|
17
|
+
return messages.map((m) => {
|
|
18
|
+
if (m.role !== "user")
|
|
19
|
+
return m;
|
|
20
|
+
if (m.content.some((part) => inflatedFrom.has(part)) === false)
|
|
21
|
+
return m;
|
|
22
|
+
const content = [];
|
|
23
|
+
let lastGroup;
|
|
24
|
+
for (const part of m.content) {
|
|
25
|
+
const origin = inflatedFrom.get(part);
|
|
26
|
+
if (origin === undefined) {
|
|
27
|
+
lastGroup = undefined;
|
|
28
|
+
content.push(part);
|
|
29
|
+
continue;
|
|
30
|
+
}
|
|
31
|
+
if (origin.group !== lastGroup)
|
|
32
|
+
content.push(origin.ref);
|
|
33
|
+
lastGroup = origin.group;
|
|
34
|
+
}
|
|
35
|
+
return { ...m, content };
|
|
36
|
+
});
|
|
37
|
+
}
|
|
14
38
|
function unavailable(name) {
|
|
15
39
|
return { type: "text", text: `[attachment unavailable: ${name}]` };
|
|
16
40
|
}
|
|
@@ -19,6 +43,42 @@ export function stripVibesFileBlocks(messages) {
|
|
|
19
43
|
? { ...m, content: m.content.map((c) => (c.type === "vibes_file" ? unavailable(c.name) : c)) }
|
|
20
44
|
: m);
|
|
21
45
|
}
|
|
46
|
+
export const MODEL_IMAGE_EDGE = 768;
|
|
47
|
+
export const MODEL_IMAGE_MIME = WEBP_RENDITION_MIME;
|
|
48
|
+
async function readAsset(vctx, assetURI) {
|
|
49
|
+
return exception2Result(async () => {
|
|
50
|
+
const fetched = await vctx.storage.fetch(assetURI);
|
|
51
|
+
if (!isFetchOkResult(fetched))
|
|
52
|
+
throw new Error(`asset fetch failed: ${assetURI}`);
|
|
53
|
+
return stream2uint8array(fetched.data);
|
|
54
|
+
});
|
|
55
|
+
}
|
|
56
|
+
async function modelSizedImage(vctx, args) {
|
|
57
|
+
const images = vctx.images;
|
|
58
|
+
const logger = ensureLogger(vctx.sthis, "inflateFileAttachments");
|
|
59
|
+
if (images !== undefined) {
|
|
60
|
+
const rSmall = await exception2Result(async () => {
|
|
61
|
+
const fetched = await vctx.storage.fetch(args.assetURI);
|
|
62
|
+
if (!isFetchOkResult(fetched))
|
|
63
|
+
throw new Error(`asset fetch failed: ${args.assetURI}`);
|
|
64
|
+
return transformToWebp(images, fetched.data, { width: MODEL_IMAGE_EDGE, height: MODEL_IMAGE_EDGE });
|
|
65
|
+
});
|
|
66
|
+
if (rSmall.isOk())
|
|
67
|
+
return Result.Ok({ kind: "image", bytes: rSmall.Ok(), mime: MODEL_IMAGE_MIME });
|
|
68
|
+
if (isWebpMetadataLeak(rSmall.Err())) {
|
|
69
|
+
logger.Warn().Err(rSmall).Str("assetURI", args.assetURI).Msg("model-sized image carried metadata; withholding the picture");
|
|
70
|
+
return Result.Ok({ kind: "withheld" });
|
|
71
|
+
}
|
|
72
|
+
logger.Warn().Err(rSmall).Str("assetURI", args.assetURI).Msg("model-sized image failed; sending the original");
|
|
73
|
+
}
|
|
74
|
+
else {
|
|
75
|
+
logger.Warn().Str("assetURI", args.assetURI).Msg("no Images binding; sending the original");
|
|
76
|
+
}
|
|
77
|
+
const rOriginal = await readAsset(vctx, args.assetURI);
|
|
78
|
+
if (rOriginal.isErr())
|
|
79
|
+
return Result.Err(rOriginal);
|
|
80
|
+
return Result.Ok({ kind: "image", bytes: rOriginal.Ok(), mime: args.mime });
|
|
81
|
+
}
|
|
22
82
|
export async function inflateFileAttachments(vctx, args) {
|
|
23
83
|
const logger = ensureLogger(vctx.sthis, "inflateFileAttachments");
|
|
24
84
|
const refs = [];
|
|
@@ -60,23 +120,31 @@ export async function inflateFileAttachments(vctx, args) {
|
|
|
60
120
|
else if (ref.kind === "image" && !args.modelSupportsImages) {
|
|
61
121
|
parts = [{ type: "text", text: `[Attached image ${ref.name} — the current model cannot view images]` }];
|
|
62
122
|
}
|
|
63
|
-
else {
|
|
64
|
-
const
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
return stream2uint8array(fetched.data);
|
|
69
|
-
});
|
|
70
|
-
if (rBytes.isErr()) {
|
|
71
|
-
logger.Warn().Err(rBytes).Any({ uploadId: ref.uploadId }).Msg("attachment fetch failed");
|
|
123
|
+
else if (ref.kind === "image") {
|
|
124
|
+
const rImage = await modelSizedImage(vctx, { assetURI: row.assetURI, mime: row.mimeType ?? ref.mimeType });
|
|
125
|
+
const image = rImage.isOk() ? rImage.Ok() : undefined;
|
|
126
|
+
if (image === undefined) {
|
|
127
|
+
logger.Warn().Err(rImage).Any({ uploadId: ref.uploadId }).Msg("attachment fetch failed");
|
|
72
128
|
parts = [unavailable(ref.name)];
|
|
73
129
|
}
|
|
74
|
-
else if (
|
|
75
|
-
|
|
130
|
+
else if (image.kind === "withheld") {
|
|
131
|
+
parts = [{ type: "text", text: `[Attached image ${ref.name} — the picture could not be prepared for the model]` }];
|
|
132
|
+
}
|
|
133
|
+
else {
|
|
76
134
|
parts = [
|
|
77
135
|
{ type: "text", text: `Attached file: ${ref.name}` },
|
|
78
|
-
{ type: "image_url", image_url: { url: `data:${mime};base64,${bytesToBase64(
|
|
136
|
+
{ type: "image_url", image_url: { url: `data:${image.mime};base64,${bytesToBase64(image.bytes)}` } },
|
|
79
137
|
];
|
|
138
|
+
const origin = { ref, group: parts };
|
|
139
|
+
for (const part of parts)
|
|
140
|
+
inflatedFrom.set(part, origin);
|
|
141
|
+
}
|
|
142
|
+
}
|
|
143
|
+
else {
|
|
144
|
+
const rBytes = await readAsset(vctx, row.assetURI);
|
|
145
|
+
if (rBytes.isErr()) {
|
|
146
|
+
logger.Warn().Err(rBytes).Any({ uploadId: ref.uploadId }).Msg("attachment fetch failed");
|
|
147
|
+
parts = [unavailable(ref.name)];
|
|
80
148
|
}
|
|
81
149
|
else {
|
|
82
150
|
let text = vctx.sthis.txt.decode(rBytes.Ok());
|
|
@@ -85,6 +153,11 @@ export async function inflateFileAttachments(vctx, args) {
|
|
|
85
153
|
}
|
|
86
154
|
parts = [{ type: "text", text: `<attached-file name="${ref.name}" type="${ref.mimeType}">\n${text}\n</attached-file>` }];
|
|
87
155
|
}
|
|
156
|
+
if (rBytes.isOk()) {
|
|
157
|
+
const origin = { ref, group: parts };
|
|
158
|
+
for (const part of parts)
|
|
159
|
+
inflatedFrom.set(part, origin);
|
|
160
|
+
}
|
|
88
161
|
}
|
|
89
162
|
return parts;
|
|
90
163
|
}
|