@vibes.diy/api-svc 14.3.59 → 14.3.64
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/evento-handler-manifest.js +4 -0
- package/evento-handler-manifest.js.map +1 -1
- package/index.d.ts +5 -0
- package/index.js +5 -0
- package/index.js.map +1 -1
- package/intern/agent-build-tools.d.ts +1 -0
- package/intern/agent-build-tools.js +1 -0
- package/intern/agent-build-tools.js.map +1 -1
- package/intern/agent-dispatcher.js +17 -2
- package/intern/agent-dispatcher.js.map +1 -1
- package/intern/backend-db-callback.js +1 -0
- package/intern/backend-db-callback.js.map +1 -1
- package/intern/components/vibe-page.js +1 -0
- package/intern/components/vibe-page.js.map +1 -1
- package/intern/cross-lane-build-guard.d.ts +10 -0
- package/intern/cross-lane-build-guard.js +17 -0
- package/intern/cross-lane-build-guard.js.map +1 -0
- package/intern/delete-access-gate.js +1 -0
- package/intern/delete-access-gate.js.map +1 -1
- package/intern/draft-chat-store.d.ts +7 -0
- package/intern/ensure-chat-id.js +2 -2
- package/intern/ensure-chat-id.js.map +1 -1
- package/intern/ensure-slug-binding.js +2 -0
- package/intern/ensure-slug-binding.js.map +1 -1
- package/intern/grouped-vibe-import-map.d.ts +3 -0
- package/intern/grouped-vibe-import-map.js +3 -0
- package/intern/grouped-vibe-import-map.js.map +1 -1
- package/intern/guest-build-store.js +1 -0
- package/intern/guest-build-store.js.map +1 -1
- package/intern/mint-decision.d.ts +1 -0
- package/intern/mint-decision.js +3 -0
- package/intern/mint-decision.js.map +1 -1
- package/intern/mint-style.js +5 -1
- package/intern/mint-style.js.map +1 -1
- package/intern/open-turn-store.d.ts +10 -0
- package/intern/open-turn-store.js +28 -1
- package/intern/open-turn-store.js.map +1 -1
- package/intern/pouf-head-css.d.ts +15 -0
- package/intern/pouf-head-css.js +40 -0
- package/intern/pouf-head-css.js.map +1 -0
- package/intern/put-access-gate.d.ts +1 -0
- package/intern/put-access-gate.js +8 -0
- package/intern/put-access-gate.js.map +1 -1
- package/intern/render-vibe.d.ts +2 -1
- package/intern/render-vibe.js +5 -2
- package/intern/render-vibe.js.map +1 -1
- package/package.json +13 -12
- package/public/agent-turn-action.js +3 -0
- package/public/agent-turn-action.js.map +1 -1
- package/public/app-documents-read-eventos.js +17 -0
- package/public/app-documents-read-eventos.js.map +1 -1
- package/public/app-documents-write-eventos.d.ts +1 -0
- package/public/app-documents-write-eventos.js +9 -0
- package/public/app-documents-write-eventos.js.map +1 -1
- package/public/channel-invite-flow.d.ts +6 -0
- package/public/channel-invite-flow.js +102 -0
- package/public/channel-invite-flow.js.map +1 -0
- package/public/channel-invite-signup-match.d.ts +6 -0
- package/public/channel-invite-signup-match.js +31 -0
- package/public/channel-invite-signup-match.js.map +1 -0
- package/public/channel-invite-store.d.ts +62 -0
- package/public/channel-invite-store.js +186 -0
- package/public/channel-invite-store.js.map +1 -0
- package/public/grant-reduce.d.ts +5 -0
- package/public/grant-reduce.js +33 -8
- package/public/grant-reduce.js.map +1 -1
- package/public/handler-llm-request.js +1 -0
- package/public/handler-llm-request.js.map +1 -1
- package/public/inherit-read-resolver.d.ts +1 -0
- package/public/inherit-read-resolver.js +9 -0
- package/public/inherit-read-resolver.js.map +1 -1
- package/public/invite-subject-aliases.d.ts +15 -0
- package/public/invite-subject-aliases.js +77 -0
- package/public/invite-subject-aliases.js.map +1 -0
- package/public/invite-unsubscribe.js +2 -1
- package/public/invite-unsubscribe.js.map +1 -1
- package/public/lookup-handles.js +5 -2
- package/public/lookup-handles.js.map +1 -1
- package/public/prompt-chat-section.js +8 -0
- package/public/prompt-chat-section.js.map +1 -1
- package/public/resolve-invite-subjects.d.ts +4 -0
- package/public/resolve-invite-subjects.js +53 -0
- package/public/resolve-invite-subjects.js.map +1 -0
- package/public/serv-entry-point.js +7 -3
- package/public/serv-entry-point.js.map +1 -1
- package/public/social-flow.js +52 -4
- package/public/social-flow.js.map +1 -1
- package/public/sync-eventos.js +1 -0
- package/public/sync-eventos.js.map +1 -1
- package/public/viewer-channel-resolver.js +9 -0
- package/public/viewer-channel-resolver.js.map +1 -1
- package/public/who-am-i.d.ts +1 -1
- package/public/who-am-i.js +10 -2
- package/public/who-am-i.js.map +1 -1
- package/types.d.ts +1 -0
- package/types.js.map +1 -1
|
@@ -0,0 +1,186 @@
|
|
|
1
|
+
import { exception2Result } from "@adviser/cement";
|
|
2
|
+
import { and, eq, gt, inArray, lte } from "drizzle-orm/sql/expressions";
|
|
3
|
+
import { hashContactKey } from "./social-invite-store.js";
|
|
4
|
+
export const CHANNEL_INVITE_SUBJECT_PREFIX = "invite:";
|
|
5
|
+
export function channelInviteSubject(id) {
|
|
6
|
+
return `${CHANNEL_INVITE_SUBJECT_PREFIX}${id}`;
|
|
7
|
+
}
|
|
8
|
+
export async function insertPendingChannelInviteIfAbsent(sql, input) {
|
|
9
|
+
const t = sql.tables.channelInvites;
|
|
10
|
+
const existing = await selectAppContactRow(sql, input);
|
|
11
|
+
if (existing === undefined) {
|
|
12
|
+
const returned = await sql.db
|
|
13
|
+
.insert(t)
|
|
14
|
+
.values({
|
|
15
|
+
id: input.id,
|
|
16
|
+
ownerHandle: input.ownerHandle,
|
|
17
|
+
appSlug: input.appSlug,
|
|
18
|
+
inviterHandle: input.inviterHandle,
|
|
19
|
+
contactType: input.contactType,
|
|
20
|
+
contactKey: input.contactKey,
|
|
21
|
+
token: input.token,
|
|
22
|
+
state: "pending",
|
|
23
|
+
boundHandle: null,
|
|
24
|
+
boundUserId: null,
|
|
25
|
+
expires: input.expires,
|
|
26
|
+
updated: input.now,
|
|
27
|
+
created: input.now,
|
|
28
|
+
})
|
|
29
|
+
.onConflictDoNothing({ target: [t.ownerHandle, t.appSlug, t.contactType, t.contactKey] })
|
|
30
|
+
.returning({ id: t.id, token: t.token });
|
|
31
|
+
const row = returned[0];
|
|
32
|
+
if (row !== undefined)
|
|
33
|
+
return { inserted: true, id: row.id, token: row.token };
|
|
34
|
+
const winner = await selectAppContactRow(sql, input);
|
|
35
|
+
if (winner === undefined)
|
|
36
|
+
throw new Error("channel invite insert conflicted but no row found");
|
|
37
|
+
return { inserted: false, id: winner.id, token: winner.token };
|
|
38
|
+
}
|
|
39
|
+
const live = existing.state === "pending" && existing.expires > input.now;
|
|
40
|
+
if (live || existing.state === "bound") {
|
|
41
|
+
return { inserted: false, id: existing.id, token: existing.token };
|
|
42
|
+
}
|
|
43
|
+
const refreshed = await sql.db
|
|
44
|
+
.update(t)
|
|
45
|
+
.set({
|
|
46
|
+
inviterHandle: input.inviterHandle,
|
|
47
|
+
contactKey: input.contactKey,
|
|
48
|
+
token: input.token,
|
|
49
|
+
state: "pending",
|
|
50
|
+
boundHandle: null,
|
|
51
|
+
boundUserId: null,
|
|
52
|
+
expires: input.expires,
|
|
53
|
+
updated: input.now,
|
|
54
|
+
created: input.now,
|
|
55
|
+
})
|
|
56
|
+
.where(and(eq(t.id, existing.id), eq(t.token, existing.token), eq(t.state, existing.state)))
|
|
57
|
+
.returning({ id: t.id, token: t.token });
|
|
58
|
+
const row = refreshed[0];
|
|
59
|
+
if (row !== undefined)
|
|
60
|
+
return { inserted: true, id: row.id, token: row.token };
|
|
61
|
+
const current = await selectAppContactRow(sql, input);
|
|
62
|
+
if (current === undefined)
|
|
63
|
+
throw new Error("channel invite refresh lost its row");
|
|
64
|
+
return { inserted: false, id: current.id, token: current.token };
|
|
65
|
+
}
|
|
66
|
+
async function selectAppContactRow(sql, input) {
|
|
67
|
+
const t = sql.tables.channelInvites;
|
|
68
|
+
const rows = await sql.db
|
|
69
|
+
.select()
|
|
70
|
+
.from(t)
|
|
71
|
+
.where(and(eq(t.ownerHandle, input.ownerHandle), eq(t.appSlug, input.appSlug), eq(t.contactType, input.contactType), inArray(t.contactKey, [input.contactKey, hashContactKey(input.contactKey)])));
|
|
72
|
+
return rows.find((r) => r.contactKey === input.contactKey) ?? rows[0];
|
|
73
|
+
}
|
|
74
|
+
export async function selectChannelInviteByToken(sql, token) {
|
|
75
|
+
const t = sql.tables.channelInvites;
|
|
76
|
+
return sql.db
|
|
77
|
+
.select()
|
|
78
|
+
.from(t)
|
|
79
|
+
.where(eq(t.token, token))
|
|
80
|
+
.limit(1)
|
|
81
|
+
.then((r) => r[0]);
|
|
82
|
+
}
|
|
83
|
+
export async function findPendingChannelInvitesForContact(sql, contactType, contactKey, nowIso = new Date().toISOString()) {
|
|
84
|
+
const t = sql.tables.channelInvites;
|
|
85
|
+
return sql.db
|
|
86
|
+
.select({
|
|
87
|
+
id: t.id,
|
|
88
|
+
ownerHandle: t.ownerHandle,
|
|
89
|
+
appSlug: t.appSlug,
|
|
90
|
+
inviterHandle: t.inviterHandle,
|
|
91
|
+
token: t.token,
|
|
92
|
+
expires: t.expires,
|
|
93
|
+
})
|
|
94
|
+
.from(t)
|
|
95
|
+
.where(and(eq(t.state, "pending"), eq(t.contactType, contactType), eq(t.contactKey, contactKey), gt(t.expires, nowIso)));
|
|
96
|
+
}
|
|
97
|
+
export async function markChannelInviteBound(sql, input) {
|
|
98
|
+
const t = sql.tables.channelInvites;
|
|
99
|
+
const row = await sql.db
|
|
100
|
+
.select({ contactKey: t.contactKey, state: t.state })
|
|
101
|
+
.from(t)
|
|
102
|
+
.where(eq(t.id, input.id))
|
|
103
|
+
.limit(1)
|
|
104
|
+
.then((r) => r[0]);
|
|
105
|
+
if (row === undefined || row.state !== "pending")
|
|
106
|
+
return false;
|
|
107
|
+
const returned = await sql.db
|
|
108
|
+
.update(t)
|
|
109
|
+
.set({
|
|
110
|
+
state: "bound",
|
|
111
|
+
boundHandle: input.boundHandle,
|
|
112
|
+
boundUserId: input.boundUserId,
|
|
113
|
+
contactKey: hashContactKey(row.contactKey),
|
|
114
|
+
updated: input.now,
|
|
115
|
+
})
|
|
116
|
+
.where(and(eq(t.id, input.id), eq(t.state, "pending"), eq(t.contactKey, row.contactKey), gt(t.expires, input.now)))
|
|
117
|
+
.returning({ id: t.id });
|
|
118
|
+
return returned.length > 0;
|
|
119
|
+
}
|
|
120
|
+
export async function resolveBoundInviteAliases(sql, input) {
|
|
121
|
+
const t = sql.tables.channelInvites;
|
|
122
|
+
const rows = await sql.db
|
|
123
|
+
.select({ id: t.id, boundHandle: t.boundHandle })
|
|
124
|
+
.from(t)
|
|
125
|
+
.where(and(eq(t.ownerHandle, input.ownerHandle), eq(t.appSlug, input.appSlug), eq(t.boundHandle, input.handle), eq(t.boundUserId, input.userId), eq(t.state, "bound")));
|
|
126
|
+
const out = new Map();
|
|
127
|
+
for (const r of rows) {
|
|
128
|
+
if (r.boundHandle !== null)
|
|
129
|
+
out.set(channelInviteSubject(r.id), r.boundHandle);
|
|
130
|
+
}
|
|
131
|
+
return out;
|
|
132
|
+
}
|
|
133
|
+
export async function countInviterChannelInvitesSince(sql, inviterHandle, sinceIso) {
|
|
134
|
+
const t = sql.tables.channelInvites;
|
|
135
|
+
const rows = await sql.db
|
|
136
|
+
.select({ id: t.id })
|
|
137
|
+
.from(t)
|
|
138
|
+
.where(and(eq(t.inviterHandle, inviterHandle), gt(t.created, sinceIso)));
|
|
139
|
+
return rows.length;
|
|
140
|
+
}
|
|
141
|
+
export async function countContactChannelInvitesEver(sql, contactType, contactKey) {
|
|
142
|
+
const t = sql.tables.channelInvites;
|
|
143
|
+
const rows = await sql.db
|
|
144
|
+
.select({ id: t.id })
|
|
145
|
+
.from(t)
|
|
146
|
+
.where(and(eq(t.contactType, contactType), inArray(t.contactKey, [contactKey, hashContactKey(contactKey)])));
|
|
147
|
+
return rows.length;
|
|
148
|
+
}
|
|
149
|
+
export async function sweepExpiredChannelInvites(sql, nowIso) {
|
|
150
|
+
const t = sql.tables.channelInvites;
|
|
151
|
+
const due = await sql.db
|
|
152
|
+
.select({ id: t.id, ownerHandle: t.ownerHandle, appSlug: t.appSlug, contactType: t.contactType, contactKey: t.contactKey })
|
|
153
|
+
.from(t)
|
|
154
|
+
.where(and(eq(t.state, "pending"), lte(t.expires, nowIso)));
|
|
155
|
+
let expired = 0;
|
|
156
|
+
let failed = 0;
|
|
157
|
+
for (const row of due) {
|
|
158
|
+
const rMutate = await exception2Result(async () => {
|
|
159
|
+
const hashed = hashContactKey(row.contactKey);
|
|
160
|
+
const clash = await sql.db
|
|
161
|
+
.select({ id: t.id })
|
|
162
|
+
.from(t)
|
|
163
|
+
.where(and(eq(t.ownerHandle, row.ownerHandle), eq(t.appSlug, row.appSlug), eq(t.contactType, row.contactType), eq(t.contactKey, hashed)))
|
|
164
|
+
.limit(1)
|
|
165
|
+
.then((r) => r[0]);
|
|
166
|
+
if (clash !== undefined) {
|
|
167
|
+
await sql.db.delete(t).where(and(eq(t.id, row.id), eq(t.state, "pending")));
|
|
168
|
+
}
|
|
169
|
+
else {
|
|
170
|
+
await sql.db
|
|
171
|
+
.update(t)
|
|
172
|
+
.set({ state: "expired", contactKey: hashed, updated: nowIso })
|
|
173
|
+
.where(and(eq(t.id, row.id), eq(t.state, "pending"), eq(t.contactKey, row.contactKey)));
|
|
174
|
+
}
|
|
175
|
+
});
|
|
176
|
+
if (rMutate.isErr()) {
|
|
177
|
+
failed++;
|
|
178
|
+
console.error("[channel-invite] sweep row failed (isolated):", rMutate.Err());
|
|
179
|
+
}
|
|
180
|
+
else {
|
|
181
|
+
expired++;
|
|
182
|
+
}
|
|
183
|
+
}
|
|
184
|
+
return { expired, failed };
|
|
185
|
+
}
|
|
186
|
+
//# sourceMappingURL=channel-invite-store.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"channel-invite-store.js","sourceRoot":"","sources":["../../jsr/public/channel-invite-store.ts"],"names":[],"mappings":"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"}
|
package/public/grant-reduce.d.ts
CHANGED
|
@@ -15,9 +15,12 @@ export declare class GrantReduce {
|
|
|
15
15
|
publicChannels: Set<string>;
|
|
16
16
|
_hydrated: boolean;
|
|
17
17
|
private seedContribution;
|
|
18
|
+
private subjectAliases;
|
|
18
19
|
get isHydrated(): boolean;
|
|
19
20
|
markHydrated(): void;
|
|
20
21
|
setSeed(contribution: DocContribution | undefined): void;
|
|
22
|
+
setSubjectAliases(aliases: ReadonlyMap<string, string>): void;
|
|
23
|
+
namesSubjectPrefix(prefix: string): boolean;
|
|
21
24
|
cloneSeedFrom(other: GrantReduce): void;
|
|
22
25
|
addDoc(docId: string, contribution: DocContribution): void;
|
|
23
26
|
removeDoc(docId: string): void;
|
|
@@ -25,7 +28,9 @@ export declare class GrantReduce {
|
|
|
25
28
|
hasRole(userHandle: string, roleName: string): boolean;
|
|
26
29
|
private rebuild;
|
|
27
30
|
private unionContribution;
|
|
31
|
+
private unionUserGrant;
|
|
28
32
|
}
|
|
33
|
+
export declare const INVITE_SUBJECT_PREFIX = "invite:";
|
|
29
34
|
export declare const RESERVED_OWNER_ROLE = "owner";
|
|
30
35
|
export declare const RESERVED_DEV_ROLE = "~dev";
|
|
31
36
|
export declare function seedOwnerGrants(reduce: GrantReduce, ownerHandle: string | undefined, devHandles?: readonly string[]): void;
|
package/public/grant-reduce.js
CHANGED
|
@@ -34,6 +34,7 @@ export class GrantReduce {
|
|
|
34
34
|
publicChannels = new Set();
|
|
35
35
|
_hydrated = false;
|
|
36
36
|
seedContribution;
|
|
37
|
+
subjectAliases = new Map();
|
|
37
38
|
get isHydrated() {
|
|
38
39
|
return this._hydrated;
|
|
39
40
|
}
|
|
@@ -44,6 +45,20 @@ export class GrantReduce {
|
|
|
44
45
|
this.seedContribution = contribution && hasContent(contribution) ? contribution : undefined;
|
|
45
46
|
this.rebuild();
|
|
46
47
|
}
|
|
48
|
+
setSubjectAliases(aliases) {
|
|
49
|
+
this.subjectAliases = aliases;
|
|
50
|
+
this.rebuild();
|
|
51
|
+
}
|
|
52
|
+
namesSubjectPrefix(prefix) {
|
|
53
|
+
for (const key of this.userGrants.keys())
|
|
54
|
+
if (key.startsWith(prefix))
|
|
55
|
+
return true;
|
|
56
|
+
for (const members of this.effectiveMembers.values())
|
|
57
|
+
for (const m of members)
|
|
58
|
+
if (m.startsWith(prefix))
|
|
59
|
+
return true;
|
|
60
|
+
return false;
|
|
61
|
+
}
|
|
47
62
|
cloneSeedFrom(other) {
|
|
48
63
|
this.setSeed(other.seedContribution);
|
|
49
64
|
}
|
|
@@ -114,6 +129,9 @@ export class GrantReduce {
|
|
|
114
129
|
}
|
|
115
130
|
for (const u of users) {
|
|
116
131
|
set.add(u);
|
|
132
|
+
const alias = this.subjectAliases.get(u);
|
|
133
|
+
if (alias !== undefined)
|
|
134
|
+
set.add(alias);
|
|
117
135
|
}
|
|
118
136
|
}
|
|
119
137
|
for (const [role, channels] of c.grantRoles) {
|
|
@@ -127,20 +145,27 @@ export class GrantReduce {
|
|
|
127
145
|
}
|
|
128
146
|
}
|
|
129
147
|
for (const [user, channels] of c.grantUsers) {
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
this.
|
|
134
|
-
}
|
|
135
|
-
for (const ch of channels) {
|
|
136
|
-
set.add(ch);
|
|
137
|
-
}
|
|
148
|
+
this.unionUserGrant(user, channels);
|
|
149
|
+
const alias = this.subjectAliases.get(user);
|
|
150
|
+
if (alias !== undefined)
|
|
151
|
+
this.unionUserGrant(alias, channels);
|
|
138
152
|
}
|
|
139
153
|
for (const ch of c.grantPublic) {
|
|
140
154
|
this.publicChannels.add(ch);
|
|
141
155
|
}
|
|
142
156
|
}
|
|
157
|
+
unionUserGrant(user, channels) {
|
|
158
|
+
let set = this.userGrants.get(user);
|
|
159
|
+
if (!set) {
|
|
160
|
+
set = new Set();
|
|
161
|
+
this.userGrants.set(user, set);
|
|
162
|
+
}
|
|
163
|
+
for (const ch of channels) {
|
|
164
|
+
set.add(ch);
|
|
165
|
+
}
|
|
166
|
+
}
|
|
143
167
|
}
|
|
168
|
+
export const INVITE_SUBJECT_PREFIX = "invite:";
|
|
144
169
|
export const RESERVED_OWNER_ROLE = "owner";
|
|
145
170
|
export const RESERVED_DEV_ROLE = "~dev";
|
|
146
171
|
export function seedOwnerGrants(reduce, ownerHandle, devHandles = []) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"grant-reduce.js","sourceRoot":"","sources":["../../jsr/public/grant-reduce.ts"],"names":[],"mappings":"AAgCA,SAAS,UAAU,CAAC,CAAkB;IACpC,OAAO,CAAC,CAAC,OAAO,CAAC,IAAI,GAAG,CAAC,IAAI,CAAC,CAAC,UAAU,CAAC,IAAI,GAAG,CAAC,IAAI,CAAC,CAAC,UAAU,CAAC,IAAI,GAAG,CAAC,IAAI,CAAC,CAAC,WAAW,CAAC,IAAI,GAAG,CAAC,CAAC;AACxG,CAAC;AAYD,MAAM,oBAAoB,GAAG,GAAG,CAAC;AAEjC,MAAM,UAAU,mBAAmB,CAAC,IAAsB;IACxD,MAAM,OAAO,GAAG,IAAI,GAAG,EAAuB,CAAC;IAC/C,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;QACjB,KAAK,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC;YACzD,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC,UAAU,CAAC,oBAAoB,CAAC;gBAAE,SAAS;YAC3D,OAAO,CAAC,GAAG,CAAC,IAAI,EAAE,IAAI,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC;QACpC,CAAC;IACH,CAAC;IAED,MAAM,UAAU,GAAG,IAAI,GAAG,EAAuB,CAAC;IAClD,IAAI,IAAI,CAAC,KAAK,EAAE,KAAK,EAAE,CAAC;QACtB,KAAK,MAAM,CAAC,IAAI,EAAE,QAAQ,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE,CAAC;YAChE,UAAU,CAAC,GAAG,CAAC,IAAI,EAAE,IAAI,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC;QAC1C,CAAC;IACH,CAAC;IAED,MAAM,UAAU,GAAG,IAAI,GAAG,EAAuB,CAAC;IAClD,IAAI,IAAI,CAAC,KAAK,EAAE,KAAK,EAAE,CAAC;QACtB,KAAK,MAAM,CAAC,IAAI,EAAE,QAAQ,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE,CAAC;YAChE,UAAU,CAAC,GAAG,CAAC,IAAI,EAAE,IAAI,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC;QAC1C,CAAC;IACH,CAAC;IAED,MAAM,WAAW,GAAG,IAAI,GAAG,CAAS,IAAI,CAAC,KAAK,EAAE,MAAM,IAAI,EAAE,CAAC,CAAC;IAE9D,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,WAAW,EAAE,CAAC;AAC1D,CAAC;AAQD,MAAM,OAAO,WAAW;IAEb,gBAAgB,GAAG,IAAI,GAAG,EAA2B,CAAC;IAG/D,gBAAgB,GAAG,IAAI,GAAG,EAAuB,CAAC;IAElD,UAAU,GAAG,IAAI,GAAG,EAAuB,CAAC;IAE5C,UAAU,GAAG,IAAI,GAAG,EAAuB,CAAC;IAE5C,cAAc,GAAG,IAAI,GAAG,EAAU,CAAC;IAEnC,SAAS,GAAG,KAAK,CAAC;IAOV,gBAAgB,CAA8B;
|
|
1
|
+
{"version":3,"file":"grant-reduce.js","sourceRoot":"","sources":["../../jsr/public/grant-reduce.ts"],"names":[],"mappings":"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"}
|
|
@@ -219,6 +219,7 @@ export async function handlerLlmRequest({ scope, ctx, vctx, blockSeq, req, resCh
|
|
|
219
219
|
appSlug: resChat.appSlug,
|
|
220
220
|
kind: isInitialTurn ? "first-build" : "codegen",
|
|
221
221
|
...(vctx.doInstance === undefined ? {} : { objectId: vctx.doInstance.objectId, instanceId: vctx.doInstance.instanceId }),
|
|
222
|
+
...(vctx.doInstance?.codegenLane === undefined ? {} : { codegenLane: vctx.doInstance.codegenLane }),
|
|
222
223
|
});
|
|
223
224
|
if (rOpen.isErr()) {
|
|
224
225
|
vctx.logger.Warn().Err(rOpen).Any("event", { chatId: req.chatId, promptId }).Msg("open-turn-record-failed");
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"handler-llm-request.js","sourceRoot":"","sources":["../../jsr/public/handler-llm-request.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"handler-llm-request.js","sourceRoot":"","sources":["../../jsr/public/handler-llm-request.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,6 +4,7 @@ import { loadHeadDocs } from "./app-documents-head-query.js";
|
|
|
4
4
|
import { decodeAccessOutputRows } from "./access-output-decoder.js";
|
|
5
5
|
import { filterDocsByChannel } from "./channel-read-filter.js";
|
|
6
6
|
import { extractContribution, newSeededReduce } from "./grant-reduce.js";
|
|
7
|
+
import { applyInviteSubjectAliases } from "./invite-subject-aliases.js";
|
|
7
8
|
import { audienceChannelsForReader, collectAudienceSubjects, inheritChannelKey, presentInheritRead } from "./audience-channels.js";
|
|
8
9
|
import { resolveAudienceMembershipFailClosed } from "./social-store.js";
|
|
9
10
|
import { resolveDbAccess } from "./db-acl-resolver.js";
|
|
@@ -17,6 +18,7 @@ const INHERIT_IN_CHUNK = 200;
|
|
|
17
18
|
const MAX_HOST_GRANT_ROWS = 5000;
|
|
18
19
|
export async function resolveInheritReadChannels(vctx, args) {
|
|
19
20
|
const { ownerHandle, appSlug, outputs, userHandle, access, devHandles } = args;
|
|
21
|
+
const viewerUserId = args.userId ?? null;
|
|
20
22
|
const byDb = new Map();
|
|
21
23
|
let refCount = 0;
|
|
22
24
|
const addRef = (db, docId) => {
|
|
@@ -138,6 +140,13 @@ export async function resolveInheritReadChannels(vctx, args) {
|
|
|
138
140
|
if (grantDocIds.has(row.docId))
|
|
139
141
|
reduce.addDoc(row.docId, extractContribution(descriptor));
|
|
140
142
|
}
|
|
143
|
+
await applyInviteSubjectAliases(vctx, reduce, {
|
|
144
|
+
ownerHandle,
|
|
145
|
+
appSlug,
|
|
146
|
+
dbName: hostDb,
|
|
147
|
+
handle: userHandle,
|
|
148
|
+
userId: viewerUserId,
|
|
149
|
+
});
|
|
141
150
|
const hostEffective = userHandle !== null ? reduce.resolveEffectiveChannels(userHandle) : new Set();
|
|
142
151
|
if (userHandle !== null) {
|
|
143
152
|
const subjects = collectAudienceSubjects(decodedRows.map(({ descriptor }) => descriptor));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"inherit-read-resolver.js","sourceRoot":"","sources":["../../jsr/public/inherit-read-resolver.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAwD9D,OAAO,EAAE,GAAG,EAAE,EAAE,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAC/C,OAAO,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAG7D,OAAO,EAAE,sBAAsB,EAAqD,MAAM,4BAA4B,CAAC;AACvH,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAC/D,OAAO,EAAE,mBAAmB,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACzE,OAAO,EAAE,yBAAyB,EAAE,uBAAuB,EAAE,iBAAiB,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AACnI,OAAO,EAAE,mCAAmC,EAAE,MAAM,mBAAmB,CAAC;AACxE,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AACvD,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AACxD,OAAO,EAAE,UAAU,EAAyB,MAAM,uBAAuB,CAAC;AAC1E,OAAO,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAC;
|
|
1
|
+
{"version":3,"file":"inherit-read-resolver.js","sourceRoot":"","sources":["../../jsr/public/inherit-read-resolver.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,15 @@
|
|
|
1
|
+
import type { VibesApiSQLCtx } from "../types.js";
|
|
2
|
+
import { GrantReduce } from "./grant-reduce.js";
|
|
3
|
+
export declare function applyInviteSubjectAliases(vctx: VibesApiSQLCtx, reduce: GrantReduce, p: {
|
|
4
|
+
readonly ownerHandle: string;
|
|
5
|
+
readonly appSlug: string;
|
|
6
|
+
readonly dbName?: string;
|
|
7
|
+
readonly handle: string | null | undefined;
|
|
8
|
+
readonly userId: string | null | undefined;
|
|
9
|
+
}): Promise<void>;
|
|
10
|
+
export declare function bindPendingInvitesOnFirstAct(vctx: VibesApiSQLCtx, p: {
|
|
11
|
+
readonly ownerHandle: string;
|
|
12
|
+
readonly appSlug: string;
|
|
13
|
+
readonly handle: string;
|
|
14
|
+
readonly userId: string;
|
|
15
|
+
}): Promise<number>;
|
|
@@ -0,0 +1,77 @@
|
|
|
1
|
+
import { parseArrayWarning, userSettingItem, isUserSettingContactEmail } from "@vibes.diy/api-types";
|
|
2
|
+
import { and, eq } from "drizzle-orm/sql/expressions";
|
|
3
|
+
import { INVITE_SUBJECT_PREFIX, extractContribution } from "./grant-reduce.js";
|
|
4
|
+
import { accessOutputForRead } from "./access-output-read.js";
|
|
5
|
+
import { canonicalEmail } from "./social-invite-store.js";
|
|
6
|
+
import { findPendingChannelInvitesForContact, markChannelInviteBound, resolveBoundInviteAliases } from "./channel-invite-store.js";
|
|
7
|
+
export async function applyInviteSubjectAliases(vctx, reduce, p) {
|
|
8
|
+
if (p.handle === null || p.handle === undefined || p.handle.length === 0)
|
|
9
|
+
return;
|
|
10
|
+
if (p.userId === null || p.userId === undefined || p.userId.length === 0)
|
|
11
|
+
return;
|
|
12
|
+
if (reduce.namesSubjectPrefix(INVITE_SUBJECT_PREFIX) === false)
|
|
13
|
+
return;
|
|
14
|
+
try {
|
|
15
|
+
const who = { ownerHandle: p.ownerHandle, appSlug: p.appSlug, handle: p.handle, userId: p.userId };
|
|
16
|
+
let aliases = await resolveBoundInviteAliases(vctx.sql, who);
|
|
17
|
+
const bound = await bindPendingInvitesOnFirstAct(vctx, who);
|
|
18
|
+
if (bound > 0) {
|
|
19
|
+
if (p.dbName === undefined)
|
|
20
|
+
return;
|
|
21
|
+
await rereadGrantOutputs(vctx, reduce, { ownerHandle: p.ownerHandle, appSlug: p.appSlug, dbName: p.dbName });
|
|
22
|
+
aliases = await resolveBoundInviteAliases(vctx.sql, who);
|
|
23
|
+
}
|
|
24
|
+
if (aliases.size > 0)
|
|
25
|
+
reduce.setSubjectAliases(aliases);
|
|
26
|
+
}
|
|
27
|
+
catch (err) {
|
|
28
|
+
console.error("[channel-invite] alias resolve failed (fail-closed, invitee reads as unbound):", err);
|
|
29
|
+
}
|
|
30
|
+
}
|
|
31
|
+
async function rereadGrantOutputs(vctx, reduce, scope) {
|
|
32
|
+
const t = vctx.sql.tables.accessFnOutputs;
|
|
33
|
+
const rows = await vctx.sql.db
|
|
34
|
+
.select({ docId: t.docId, output: accessOutputForRead(vctx.sql) })
|
|
35
|
+
.from(t)
|
|
36
|
+
.where(and(eq(t.ownerHandle, scope.ownerHandle), eq(t.appSlug, scope.appSlug), eq(t.dbName, scope.dbName), eq(t.hasGrants, 1)));
|
|
37
|
+
reduce.docContributions.clear();
|
|
38
|
+
for (const row of rows) {
|
|
39
|
+
reduce.addDoc(row.docId, extractContribution(JSON.parse(row.output)));
|
|
40
|
+
}
|
|
41
|
+
reduce.setSubjectAliases(new Map());
|
|
42
|
+
}
|
|
43
|
+
async function verifiedContactKey(vctx, userId) {
|
|
44
|
+
const t = vctx.sql.tables.userSettings;
|
|
45
|
+
const row = await vctx.sql.db
|
|
46
|
+
.select({ settings: t.settings })
|
|
47
|
+
.from(t)
|
|
48
|
+
.where(eq(t.userId, userId))
|
|
49
|
+
.limit(1)
|
|
50
|
+
.then((r) => r[0]);
|
|
51
|
+
if (row === undefined)
|
|
52
|
+
return undefined;
|
|
53
|
+
const raw = Array.isArray(row.settings) ? row.settings : [];
|
|
54
|
+
const { filtered } = parseArrayWarning(raw, userSettingItem);
|
|
55
|
+
const contact = filtered.find(isUserSettingContactEmail);
|
|
56
|
+
if (contact === undefined || contact.verified !== true || contact.email.length === 0)
|
|
57
|
+
return undefined;
|
|
58
|
+
return canonicalEmail(contact.email);
|
|
59
|
+
}
|
|
60
|
+
export async function bindPendingInvitesOnFirstAct(vctx, p) {
|
|
61
|
+
const contactKey = await verifiedContactKey(vctx, p.userId);
|
|
62
|
+
if (contactKey === undefined)
|
|
63
|
+
return 0;
|
|
64
|
+
const now = new Date().toISOString();
|
|
65
|
+
const pending = await findPendingChannelInvitesForContact(vctx.sql, "email", contactKey, now);
|
|
66
|
+
let bound = 0;
|
|
67
|
+
for (const inv of pending) {
|
|
68
|
+
if (inv.ownerHandle !== p.ownerHandle || inv.appSlug !== p.appSlug)
|
|
69
|
+
continue;
|
|
70
|
+
if (inv.inviterHandle === p.handle)
|
|
71
|
+
continue;
|
|
72
|
+
if (await markChannelInviteBound(vctx.sql, { id: inv.id, boundHandle: p.handle, boundUserId: p.userId, now }))
|
|
73
|
+
bound++;
|
|
74
|
+
}
|
|
75
|
+
return bound;
|
|
76
|
+
}
|
|
77
|
+
//# sourceMappingURL=invite-subject-aliases.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"invite-subject-aliases.js","sourceRoot":"","sources":["../../jsr/public/invite-subject-aliases.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { URI } from "@adviser/cement";
|
|
2
2
|
import { cfDrizzle, createVibesApiTables, toDBFlavour } from "@vibes.diy/api-sql";
|
|
3
3
|
import { addContactSuppression, selectPendingInviteByToken } from "./social-invite-store.js";
|
|
4
|
+
import { selectChannelInviteByToken } from "./channel-invite-store.js";
|
|
4
5
|
function htmlPage(title, body, status) {
|
|
5
6
|
return new Response(`<!doctype html><html><head><meta charset="utf-8"><meta name="viewport" content="width=device-width, initial-scale=1"><title>${title}</title></head>` +
|
|
6
7
|
`<body style="font-family: system-ui, sans-serif; max-width: 32rem; margin: 4rem auto; padding: 0 1rem;"><h1 style="font-size:1.4rem">${title}</h1><p>${body}</p></body></html>`, { status, headers: { "Content-Type": "text/html; charset=utf-8" } });
|
|
@@ -17,7 +18,7 @@ export async function handleInviteUnsubscribe(request, env, sqlOverride) {
|
|
|
17
18
|
db: cfDrizzle(env, env.DB).db,
|
|
18
19
|
tables: createVibesApiTables(toDBFlavour(env.DB_FLAVOUR)),
|
|
19
20
|
};
|
|
20
|
-
const invite = await selectPendingInviteByToken(sql, token);
|
|
21
|
+
const invite = (await selectPendingInviteByToken(sql, token)) ?? (await selectChannelInviteByToken(sql, token));
|
|
21
22
|
if (invite === undefined)
|
|
22
23
|
return donePage();
|
|
23
24
|
await addContactSuppression(sql, {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"invite-unsubscribe.js","sourceRoot":"","sources":["../../jsr/public/invite-unsubscribe.ts"],"names":[],"mappings":"AAUA,OAAO,EAAE,GAAG,EAAE,MAAM,iBAAiB,CAAC;AAEtC,OAAO,EAAE,SAAS,EAAE,oBAAoB,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAElF,OAAO,EAAE,qBAAqB,EAAE,0BAA0B,EAAwB,MAAM,0BAA0B,CAAC;
|
|
1
|
+
{"version":3,"file":"invite-unsubscribe.js","sourceRoot":"","sources":["../../jsr/public/invite-unsubscribe.ts"],"names":[],"mappings":"AAUA,OAAO,EAAE,GAAG,EAAE,MAAM,iBAAiB,CAAC;AAEtC,OAAO,EAAE,SAAS,EAAE,oBAAoB,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAElF,OAAO,EAAE,qBAAqB,EAAE,0BAA0B,EAAwB,MAAM,0BAA0B,CAAC;AACnH,OAAO,EAAE,0BAA0B,EAAE,MAAM,2BAA2B,CAAC;AAEvE,SAAS,QAAQ,CAAC,KAAa,EAAE,IAAY,EAAE,MAAc;IAC3D,OAAO,IAAI,QAAQ,CACjB,+HAA+H,KAAK,iBAAiB;QACnJ,wIAAwI,KAAK,WAAW,IAAI,oBAAoB,EAClL,EAAE,MAAM,EAAE,OAAO,EAAE,EAAE,cAAc,EAAE,0BAA0B,EAAE,EAAE,CACpE,CAAC;AACJ,CAAC;AAMD,SAAS,QAAQ;IACf,OAAO,QAAQ,CAAC,qBAAqB,EAAE,oFAAoF,EAAE,GAAG,CAAC,CAAC;AACpI,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,uBAAuB,CAAC,OAAgB,EAAE,GAAU,EAAE,WAA6B;IACvG,MAAM,KAAK,GAAG,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC;IACxD,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACvB,OAAO,QAAQ,CAAC,cAAc,EAAE,6CAA6C,EAAE,GAAG,CAAC,CAAC;IACtF,CAAC;IAED,MAAM,GAAG,GAAoB,WAAW,IAAI;QAC1C,EAAE,EAAE,SAAS,CAAC,GAAG,EAAE,GAAG,CAAC,EAA2B,CAAC,CAAC,EAAE;QACtD,MAAM,EAAE,oBAAoB,CAAC,WAAW,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;KAC1D,CAAC;IAIF,MAAM,MAAM,GAAG,CAAC,MAAM,0BAA0B,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC,IAAI,CAAC,MAAM,0BAA0B,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC,CAAC;IAGhH,IAAI,MAAM,KAAK,SAAS;QAAE,OAAO,QAAQ,EAAE,CAAC;IAO5C,MAAM,qBAAqB,CAAC,GAAG,EAAE;QAC/B,WAAW,EAAE,OAAO;QACpB,UAAU,EAAE,MAAM,CAAC,UAAU;QAC7B,MAAM,EAAE,cAAc;QACtB,MAAM,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;KACjC,CAAC,CAAC;IACH,OAAO,QAAQ,EAAE,CAAC;AACpB,CAAC"}
|