@vibes.diy/api-svc 14.0.7 → 14.0.9
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/index.d.ts +1 -0
- package/index.js +1 -0
- package/index.js.map +1 -1
- package/intern/agent-style-tools.js.map +1 -1
- package/intern/backend-connections-callback.js +4 -26
- package/intern/backend-connections-callback.js.map +1 -1
- package/intern/connections-providers.d.ts +23 -0
- package/intern/connections-providers.js +67 -0
- package/intern/connections-providers.js.map +1 -1
- package/intern/notify-connection-expiring.js +2 -4
- package/intern/notify-connection-expiring.js.map +1 -1
- package/intern/pre-allocate.d.ts +0 -2
- package/intern/pre-allocate.js +2 -23
- package/intern/pre-allocate.js.map +1 -1
- package/intern/prompt-assembly.d.ts +0 -8
- package/intern/prompt-assembly.js +0 -93
- package/intern/prompt-assembly.js.map +1 -1
- package/intern/restyle-nudge.d.ts +0 -5
- package/intern/restyle-nudge.js +2 -38
- package/intern/restyle-nudge.js.map +1 -1
- package/intern/restyle-turn.d.ts +1 -19
- package/intern/restyle-turn.js +0 -152
- package/intern/restyle-turn.js.map +1 -1
- package/package.json +11 -11
- package/public/connections-callback.d.ts +30 -0
- package/public/connections-callback.js +236 -0
- package/public/connections-callback.js.map +1 -0
- package/public/connections-oauth.js +11 -12
- package/public/connections-oauth.js.map +1 -1
- package/public/connections-store.d.ts +33 -0
- package/public/connections-store.js +36 -0
- package/public/connections-store.js.map +1 -1
- package/public/github-setup.js +10 -67
- package/public/github-setup.js.map +1 -1
- package/public/prompt-chat-section.d.ts +2 -2
- package/public/prompt-chat-section.js +5 -64
- package/public/prompt-chat-section.js.map +1 -1
package/index.d.ts
CHANGED
|
@@ -75,6 +75,7 @@ export * from "./public/github-webhook.js";
|
|
|
75
75
|
export * from "./public/github-setup.js";
|
|
76
76
|
export * from "./public/connections-store.js";
|
|
77
77
|
export * from "./public/connections-oauth.js";
|
|
78
|
+
export * from "./public/connections-callback.js";
|
|
78
79
|
export * from "./public/ensure-handle-avatar.js";
|
|
79
80
|
export * from "./public/convert-image-evt.js";
|
|
80
81
|
export * from "./public/access-function.js";
|
package/index.js
CHANGED
|
@@ -75,6 +75,7 @@ export * from "./public/github-webhook.js";
|
|
|
75
75
|
export * from "./public/github-setup.js";
|
|
76
76
|
export * from "./public/connections-store.js";
|
|
77
77
|
export * from "./public/connections-oauth.js";
|
|
78
|
+
export * from "./public/connections-callback.js";
|
|
78
79
|
export * from "./public/ensure-handle-avatar.js";
|
|
79
80
|
export * from "./public/convert-image-evt.js";
|
|
80
81
|
export * from "./public/access-function.js";
|
package/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../jsr/index.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../jsr/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"agent-style-tools.js","sourceRoot":"","sources":["../../jsr/intern/agent-style-tools.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"agent-style-tools.js","sourceRoot":"","sources":["../../jsr/intern/agent-style-tools.ts"],"names":[],"mappings":"AAsBA,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AACzC,OAAO,EAAE,IAAI,EAAE,MAAM,SAAS,CAAC;AAC/B,OAAO,EAAE,oBAAoB,EAAsC,MAAM,sBAAsB,CAAC;AAEhG,OAAO,EAAE,iBAAiB,EAAE,cAAc,EAAmB,MAAM,kBAAkB,CAAC;AACtF,OAAO,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AACvD,OAAO,EAAE,UAAU,EAAE,8BAA8B,EAAqB,MAAM,oBAAoB,CAAC;AACnG,OAAO,EAAE,iBAAiB,EAAE,MAAM,kCAAkC,CAAC;AAErE,SAAS,MAAM,CAAC,OAA2D;IACzE,OAAO,MAAM,CAAC,GAAG,CAAC,IAAI,iBAAiB,CAAC,OAAO,CAAC,CAAC,CAAC;AACpD,CAAC;AAwBD,MAAM,CAAC,MAAM,qBAAqB,GAAqB,CAAC,IAAI,EAAE,IAAI,EAAE,EAAE,CACpE,UAAU,CAAC,IAAI,EAAE,EAAE,GAAG,IAAI,EAAE,SAAS,EAAE,8BAA8B,EAAE,CAAC,CAAC;AAiC3E,MAAM,CAAC,KAAK,UAAU,kBAAkB,CACtC,IAAoB,EACpB,IAAwB;IAExB,IAAI,IAAI,CAAC,MAAM,KAAK,SAAS,EAAE,CAAC;QAC9B,OAAO,MAAM,CAAC;YACZ,EAAE,EAAE,KAAK;YACT,MAAM,EAAE,cAAc;YACtB,OAAO,EAAE,8DAA8D;SACxE,CAAC,CAAC;IACL,CAAC;IAED,MAAM,MAAM,GAAG,oBAAoB,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAChD,IAAI,MAAM,YAAY,IAAI,CAAC,MAAM,EAAE,CAAC;QAClC,OAAO,MAAM,CAAC,EAAE,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,eAAe,EAAE,OAAO,EAAE,MAAM,CAAC,OAAO,EAAE,CAAC,CAAC;IACjF,CAAC;IAED,MAAM,IAAI,GAAG,MAAM,cAAc,CAAC,IAAI,EAAE,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;IACjE,IAAI,IAAI,CAAC,KAAK,EAAE;QAAE,OAAO,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC;IAChD,MAAM,GAAG,GAAG,IAAI,CAAC,EAAE,EAAE,CAAC;IAEtB,MAAM,OAAO,GAAG,MAAM,kBAAkB,CAAC,IAAI,EAAE;QAC7C,WAAW,EAAE,GAAG,CAAC,WAAW;QAC5B,OAAO,EAAE,GAAG,CAAC,OAAO;QACpB,MAAM,EAAE,IAAI,CAAC,KAAK,CAAC,MAAM;KAC1B,CAAC,CAAC;IACH,IAAI,OAAO,KAAK,SAAS,EAAE,CAAC;QAK1B,OAAO,MAAM,CAAC;YACZ,EAAE,EAAE,KAAK;YACT,MAAM,EAAE,QAAQ;YAChB,OAAO,EAAE,mFAAmF;SAC7F,CAAC,CAAC;IACL,CAAC;IAED,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,EAAE,OAAO,EAAE,WAAW,EAAE,MAAM,CAAC,WAAW,EAAE,MAAM,EAAE,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC;IAChH,IAAI,MAAM,CAAC,KAAK,EAAE,EAAE,CAAC;QACnB,OAAO,MAAM,CAAC,EAAE,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,wCAAwC,EAAE,CAAC,CAAC;IACpG,CAAC;IACD,MAAM,KAAK,GAAG,MAAM,CAAC,EAAE,EAAE,CAAC;IAO1B,MAAM,MAAM,GAAG,MAAM,iBAAiB,CACpC,IAAI,EACJ;QACE,IAAI,EAAE,mCAAmC;QACzC,WAAW,EAAE,GAAG,CAAC,WAAW;QAC5B,OAAO,EAAE,GAAG,CAAC,OAAO;QACpB,KAAK,EAAE,KAAK,CAAC,KAAK;KACnB,EACD,IAAI,CAAC,KAAK,CAAC,MAAM,CAClB,CAAC;IACF,IAAI,MAAM,CAAC,KAAK,EAAE,IAAI,MAAM,CAAC,EAAE,EAAE,CAAC,KAAK,KAAK,SAAS,EAAE,CAAC;QACtD,OAAO,MAAM,CAAC,EAAE,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,oCAAoC,EAAE,CAAC,CAAC;IAChG,CAAC;IAOD,MAAM,OAAO,GAAG,MAAM,CAAC,EAAE,EAAE,CAAC,QAAQ,CAAC,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC;IAC1D,MAAM,UAAU,GACd,OAAO,EAAE,QAAQ,EAAE,GAAG,CAAC,CAAC,KAAK,KAAK,CAAC,KAAK,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC,IAAI,OAAO,EAAE,QAAQ,EAAE,GAAG,CAAC,CAAC,KAAK,KAAK,CAAC,KAAK,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC,CAAC;IACvH,IAAI,OAAO,KAAK,SAAS,IAAI,OAAO,CAAC,IAAI,KAAK,KAAK,CAAC,KAAK,CAAC,IAAI,IAAI,UAAU,KAAK,KAAK,EAAE,CAAC;QACvF,OAAO,MAAM,CAAC,EAAE,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,WAAW,EAAE,OAAO,EAAE,0DAA0D,EAAE,CAAC,CAAC;IACzH,CAAC;IAID,IAAI,IAAI,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;QAC5B,MAAM,IAAI,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,KAAK,CAAC,KAAK,EAAE,WAAW,EAAE,KAAK,CAAC,WAAW,EAAE,CAAC,CAAC;IAC1E,CAAC;IAED,OAAO,MAAM,CAAC,EAAE,CAAC;QACf,EAAE,EAAE,IAAI;QACR,WAAW,EAAE,GAAG,CAAC,WAAW;QAC5B,OAAO,EAAE,GAAG,CAAC,OAAO;QACpB,WAAW,EAAE,KAAK,CAAC,WAAW;QAC9B,GAAG,CAAC,OAAO,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE,CAAC;KAC9D,CAAC,CAAC;AACL,CAAC"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { and, eq } from "drizzle-orm";
|
|
2
2
|
import { exception2Result, TxtEnDecoderSingleton } from "@adviser/cement";
|
|
3
3
|
import { CONNECTION_PROVIDERS } from "./connections-providers.js";
|
|
4
|
+
import { markGrantDead } from "../public/connections-store.js";
|
|
4
5
|
const MAX_BODY_BYTES = 1024 * 1024;
|
|
5
6
|
function normalizeProviderUrl(provider, path) {
|
|
6
7
|
if (path.startsWith("/") === false)
|
|
@@ -29,19 +30,6 @@ function normalizeProviderUrl(provider, path) {
|
|
|
29
30
|
}
|
|
30
31
|
const ALLOWED_METHODS = new Set(["GET"]);
|
|
31
32
|
const DENIED_REQUEST_HEADERS = new Set(["authorization", "cookie", "user-agent", "host", "content-length"]);
|
|
32
|
-
const SAFE_RESPONSE_HEADERS = [
|
|
33
|
-
"content-type",
|
|
34
|
-
"etag",
|
|
35
|
-
"last-modified",
|
|
36
|
-
"link",
|
|
37
|
-
"location",
|
|
38
|
-
"retry-after",
|
|
39
|
-
"x-github-request-id",
|
|
40
|
-
"x-ratelimit-limit",
|
|
41
|
-
"x-ratelimit-remaining",
|
|
42
|
-
"x-ratelimit-reset",
|
|
43
|
-
"x-ratelimit-used",
|
|
44
|
-
];
|
|
45
33
|
const refuse = (reason) => ({ ok: false, reason });
|
|
46
34
|
function byteLength(s) {
|
|
47
35
|
return TxtEnDecoderSingleton().encode(s).length;
|
|
@@ -49,13 +37,6 @@ function byteLength(s) {
|
|
|
49
37
|
function unpackScopes(packed) {
|
|
50
38
|
return packed.split(/\s+/).filter((s) => s !== "");
|
|
51
39
|
}
|
|
52
|
-
function isCredentialRefusal(status, body) {
|
|
53
|
-
if (status === 401)
|
|
54
|
-
return true;
|
|
55
|
-
if (status !== 403)
|
|
56
|
-
return false;
|
|
57
|
-
return /bad credentials/i.test(body) || /token/i.test(body) || /credential/i.test(body);
|
|
58
|
-
}
|
|
59
40
|
export function makeBackendConnectionsCallback(vctx, base) {
|
|
60
41
|
return async (op) => {
|
|
61
42
|
const providerKey = typeof op?.provider === "string" ? op.provider : "";
|
|
@@ -145,18 +126,15 @@ export function makeBackendConnectionsCallback(vctx, base) {
|
|
|
145
126
|
if (rText.isErr())
|
|
146
127
|
return refuse("upstream_error");
|
|
147
128
|
const text = rText.Ok();
|
|
148
|
-
if (isCredentialRefusal(res.status, text)) {
|
|
149
|
-
const rMark = await exception2Result(() => vctx.sql.db
|
|
150
|
-
.update(t_g)
|
|
151
|
-
.set({ status: "dead", updated: new Date(nowMs).toISOString() })
|
|
152
|
-
.where(and(eq(t_g.userId, userId), eq(t_g.provider, providerKey))));
|
|
129
|
+
if (provider.isCredentialRefusal(res.status, text)) {
|
|
130
|
+
const rMark = await exception2Result(() => markGrantDead({ db: vctx.sql.db, tables: vctx.sql.tables }, { userId, provider: providerKey, expectedAccessToken: grant.accessToken, nowMs }));
|
|
153
131
|
if (rMark.isErr()) {
|
|
154
132
|
console.error(`[connections] could not mark ${providerKey} grant dead:`, rMark.Err().message);
|
|
155
133
|
}
|
|
156
134
|
return refuse("connection_dead");
|
|
157
135
|
}
|
|
158
136
|
const safeHeaders = {};
|
|
159
|
-
for (const name of
|
|
137
|
+
for (const name of provider.safeResponseHeaders) {
|
|
160
138
|
const v = res.headers.get(name);
|
|
161
139
|
if (v !== null)
|
|
162
140
|
safeHeaders[name] = v;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"backend-connections-callback.js","sourceRoot":"","sources":["../../jsr/intern/backend-connections-callback.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,EAAE,EAAE,MAAM,aAAa,CAAC;AACtC,OAAO,EAAE,gBAAgB,EAAE,qBAAqB,EAAE,MAAM,iBAAiB,CAAC;AAQ1E,OAAO,EAAE,oBAAoB,EAA2B,MAAM,4BAA4B,CAAC;
|
|
1
|
+
{"version":3,"file":"backend-connections-callback.js","sourceRoot":"","sources":["../../jsr/intern/backend-connections-callback.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,8 +1,31 @@
|
|
|
1
|
+
export interface ConnectionLongLivedExchange {
|
|
2
|
+
readonly url: string;
|
|
3
|
+
readonly grantType: string;
|
|
4
|
+
}
|
|
5
|
+
export interface ConnectionOAuthPolicy {
|
|
6
|
+
readonly authorizeUrl: string;
|
|
7
|
+
readonly tokenUrl: string;
|
|
8
|
+
readonly clientIdEnvVar: string;
|
|
9
|
+
readonly clientSecretEnvVar: string;
|
|
10
|
+
readonly scopeSeparator: string;
|
|
11
|
+
readonly callbackPath: string;
|
|
12
|
+
readonly authorizeExtraParams?: Readonly<Record<string, string>>;
|
|
13
|
+
readonly longLived?: ConnectionLongLivedExchange;
|
|
14
|
+
}
|
|
15
|
+
export interface ConnectionRefreshPolicy {
|
|
16
|
+
readonly refreshUrl: string;
|
|
17
|
+
readonly grantType: string;
|
|
18
|
+
}
|
|
1
19
|
export interface ConnectionProvider {
|
|
2
20
|
readonly apiOrigin: string;
|
|
3
21
|
readonly userAgent: string;
|
|
4
22
|
readonly defaultAccept: string;
|
|
5
23
|
readonly requiredScopeFor: (pathname: string) => string | undefined;
|
|
24
|
+
readonly scopeProbePaths: readonly string[];
|
|
25
|
+
readonly safeResponseHeaders: readonly string[];
|
|
26
|
+
readonly isCredentialRefusal: (status: number, body: string) => boolean;
|
|
27
|
+
readonly oauth: ConnectionOAuthPolicy;
|
|
28
|
+
readonly refresh?: ConnectionRefreshPolicy;
|
|
6
29
|
}
|
|
7
30
|
export declare const GITHUB_REPO_READ_SCOPE = "read:repo";
|
|
8
31
|
export declare const CONNECTION_PROVIDERS: Readonly<Record<string, ConnectionProvider>>;
|
|
@@ -13,6 +13,73 @@ export const CONNECTION_PROVIDERS = Object.freeze({
|
|
|
13
13
|
return GITHUB_REPO_READ_SCOPE;
|
|
14
14
|
return undefined;
|
|
15
15
|
},
|
|
16
|
+
scopeProbePaths: Object.freeze(["/user", "/user/repos", "/repos/octocat/hello-world"]),
|
|
17
|
+
safeResponseHeaders: Object.freeze([
|
|
18
|
+
"content-type",
|
|
19
|
+
"etag",
|
|
20
|
+
"last-modified",
|
|
21
|
+
"link",
|
|
22
|
+
"location",
|
|
23
|
+
"retry-after",
|
|
24
|
+
"x-github-request-id",
|
|
25
|
+
"x-ratelimit-limit",
|
|
26
|
+
"x-ratelimit-remaining",
|
|
27
|
+
"x-ratelimit-reset",
|
|
28
|
+
"x-ratelimit-used",
|
|
29
|
+
]),
|
|
30
|
+
isCredentialRefusal: (status, body) => {
|
|
31
|
+
if (status === 401)
|
|
32
|
+
return true;
|
|
33
|
+
if (status !== 403)
|
|
34
|
+
return false;
|
|
35
|
+
return /bad credentials/i.test(body) || /token/i.test(body) || /credential/i.test(body);
|
|
36
|
+
},
|
|
37
|
+
oauth: Object.freeze({
|
|
38
|
+
authorizeUrl: "https://github.com/login/oauth/authorize",
|
|
39
|
+
tokenUrl: "https://github.com/login/oauth/access_token",
|
|
40
|
+
clientIdEnvVar: "VIBES_GH_APP_CLIENT_ID",
|
|
41
|
+
clientSecretEnvVar: "VIBES_GH_APP_CLIENT_SECRET",
|
|
42
|
+
scopeSeparator: " ",
|
|
43
|
+
callbackPath: "/github/setup",
|
|
44
|
+
}),
|
|
45
|
+
}),
|
|
46
|
+
threads: Object.freeze({
|
|
47
|
+
apiOrigin: "https://graph.threads.com",
|
|
48
|
+
userAgent: "vibes.diy-connections",
|
|
49
|
+
defaultAccept: "application/json",
|
|
50
|
+
requiredScopeFor: (pathname) => {
|
|
51
|
+
if (pathname === "/v1.0/me")
|
|
52
|
+
return "threads_basic";
|
|
53
|
+
if (pathname === "/v1.0/me/threads")
|
|
54
|
+
return "threads_basic";
|
|
55
|
+
return undefined;
|
|
56
|
+
},
|
|
57
|
+
scopeProbePaths: Object.freeze(["/v1.0/me", "/v1.0/me/threads"]),
|
|
58
|
+
safeResponseHeaders: Object.freeze(["content-type", "etag", "last-modified", "location", "retry-after"]),
|
|
59
|
+
isCredentialRefusal: (status, body) => {
|
|
60
|
+
if (status === 401)
|
|
61
|
+
return true;
|
|
62
|
+
if (status !== 400)
|
|
63
|
+
return false;
|
|
64
|
+
return /OAuthException/.test(body) && /"code"\s*:\s*190\b/.test(body);
|
|
65
|
+
},
|
|
66
|
+
oauth: Object.freeze({
|
|
67
|
+
authorizeUrl: "https://www.threads.com/oauth/authorize",
|
|
68
|
+
tokenUrl: "https://graph.threads.com/oauth/access_token",
|
|
69
|
+
clientIdEnvVar: "VIBES_THREADS_APP_CLIENT_ID",
|
|
70
|
+
clientSecretEnvVar: "VIBES_THREADS_APP_CLIENT_SECRET",
|
|
71
|
+
scopeSeparator: ",",
|
|
72
|
+
callbackPath: "/connections/callback",
|
|
73
|
+
authorizeExtraParams: Object.freeze({ response_type: "code" }),
|
|
74
|
+
longLived: Object.freeze({
|
|
75
|
+
url: "https://graph.threads.com/access_token",
|
|
76
|
+
grantType: "th_exchange_token",
|
|
77
|
+
}),
|
|
78
|
+
}),
|
|
79
|
+
refresh: Object.freeze({
|
|
80
|
+
refreshUrl: "https://graph.threads.com/refresh_access_token",
|
|
81
|
+
grantType: "th_refresh_token",
|
|
82
|
+
}),
|
|
16
83
|
}),
|
|
17
84
|
});
|
|
18
85
|
//# sourceMappingURL=connections-providers.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"connections-providers.js","sourceRoot":"","sources":["../../jsr/intern/connections-providers.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"connections-providers.js","sourceRoot":"","sources":["../../jsr/intern/connections-providers.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,14 +1,12 @@
|
|
|
1
1
|
import { and, eq } from "drizzle-orm/sql/expressions";
|
|
2
2
|
import { isUserSettingDefaultHandle, isUserSettingNotifications, parseArrayWarning, userSettingItem } from "@vibes.diy/api-types";
|
|
3
3
|
import { emitNotification } from "./emit-notification.js";
|
|
4
|
+
import { CONNECTION_PROVIDER_VOCABULARY } from "@vibes.diy/vibe-runtime/connection-providers.js";
|
|
4
5
|
export const CONNECTION_EXPIRY_THRESHOLD_DAYS = [14, 7, 3, 1];
|
|
5
6
|
export const CONNECTION_EXPIRY_MAX_THRESHOLD_DAYS = Math.max(...CONNECTION_EXPIRY_THRESHOLD_DAYS);
|
|
6
7
|
const MS_PER_DAY = 86_400_000;
|
|
7
|
-
const PROVIDER_LABEL = {
|
|
8
|
-
github: "GitHub",
|
|
9
|
-
};
|
|
10
8
|
function bodyFor(grant, daysLeft) {
|
|
11
|
-
const provider =
|
|
9
|
+
const provider = CONNECTION_PROVIDER_VOCABULARY[grant.provider]?.label ?? grant.provider;
|
|
12
10
|
const days = Math.ceil(daysLeft);
|
|
13
11
|
const account = grant.accountLabel === "" ? "" : ` (${grant.accountLabel})`;
|
|
14
12
|
const when = days === 1 ? "tomorrow" : `in ${days} days`;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"notify-connection-expiring.js","sourceRoot":"","sources":["../../jsr/intern/notify-connection-expiring.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,EAAE,EAAE,MAAM,6BAA6B,CAAC;AACtD,OAAO,EAAE,0BAA0B,EAAE,0BAA0B,EAAE,iBAAiB,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAClI,OAAO,EAAE,gBAAgB,EAAuB,MAAM,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"notify-connection-expiring.js","sourceRoot":"","sources":["../../jsr/intern/notify-connection-expiring.ts"],"names":[],"mappings":"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"}
|
package/intern/pre-allocate.d.ts
CHANGED
|
@@ -31,7 +31,6 @@ export interface PreAllocateResult {
|
|
|
31
31
|
}
|
|
32
32
|
export declare const ALWAYS_ON_SKILLS: readonly ["use-viewer"];
|
|
33
33
|
export declare function excludeInitialTurnSkills(skills: readonly string[]): string[];
|
|
34
|
-
export declare function promptMayAddSkill(text: string): Promise<boolean>;
|
|
35
34
|
export interface PreAllocateTestHooks {
|
|
36
35
|
readonly preAllocate?: (vctx: VibesApiSQLCtx, args: {
|
|
37
36
|
prompt: string;
|
|
@@ -39,7 +38,6 @@ export interface PreAllocateTestHooks {
|
|
|
39
38
|
excludeDeferredSkills?: boolean;
|
|
40
39
|
variety?: GenerationVariety;
|
|
41
40
|
}) => Promise<Result<PreAllocateResult>>;
|
|
42
|
-
readonly promptMayAddSkill?: (text: string) => Promise<boolean>;
|
|
43
41
|
}
|
|
44
42
|
export declare function setPreAllocateTestHooks(hooks?: PreAllocateTestHooks): void;
|
|
45
43
|
export declare function preAllocate(vctx: VibesApiSQLCtx, { prompt, userId, excludeDeferredSkills, variety, }: {
|
package/intern/pre-allocate.js
CHANGED
|
@@ -1,8 +1,8 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { Result, exception2Result } from "@adviser/cement";
|
|
2
2
|
import { callAI } from "call-ai";
|
|
3
3
|
import { type } from "arktype";
|
|
4
4
|
import { ensureLogger } from "@vibes.diy/identity";
|
|
5
|
-
import { curatedThemes, drawGenerationVariety,
|
|
5
|
+
import { curatedThemes, drawGenerationVariety, getLlmCatalogNames, makePreAllocUserMessage, preAllocParsed, preAllocSchemaFor, } from "@vibes.diy/prompts";
|
|
6
6
|
import { loadModels } from "../public/list-models.js";
|
|
7
7
|
import { MINT_FALLBACK_THEME } from "./mint-style.js";
|
|
8
8
|
export const ALWAYS_ON_SKILLS = ["use-viewer"];
|
|
@@ -13,27 +13,6 @@ export function excludeInitialTurnSkills(skills) {
|
|
|
13
13
|
}
|
|
14
14
|
const curatedThemeSlugs = new Set(curatedThemes.map((t) => t.slug));
|
|
15
15
|
const PRE_ALLOC_TIMEOUT_MS = 8000;
|
|
16
|
-
const getSkillCueMatcher = Lazy(async () => {
|
|
17
|
-
const catalog = await getLlmCatalog();
|
|
18
|
-
const cues = [
|
|
19
|
-
...new Set(catalog
|
|
20
|
-
.flatMap((c) => c.cues ?? [])
|
|
21
|
-
.map((c) => c.trim().toLowerCase())
|
|
22
|
-
.filter((c) => c.length > 0)),
|
|
23
|
-
];
|
|
24
|
-
if (cues.length === 0)
|
|
25
|
-
return undefined;
|
|
26
|
-
cues.sort((a, b) => b.length - a.length);
|
|
27
|
-
const escaped = cues.map((c) => c.replace(/[.*+?^${}()|[\]\\]/g, "\\$&"));
|
|
28
|
-
return new RegExp(`\\b(?:${escaped.join("|")})\\b`, "i");
|
|
29
|
-
});
|
|
30
|
-
export async function promptMayAddSkill(text) {
|
|
31
|
-
const hook = preAllocateTestHooks?.promptMayAddSkill;
|
|
32
|
-
if (hook !== undefined)
|
|
33
|
-
return hook(text);
|
|
34
|
-
const re = await getSkillCueMatcher();
|
|
35
|
-
return re === undefined ? true : re.test(text);
|
|
36
|
-
}
|
|
37
16
|
let preAllocateTestHooks;
|
|
38
17
|
export function setPreAllocateTestHooks(hooks) {
|
|
39
18
|
preAllocateTestHooks = hooks;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pre-allocate.js","sourceRoot":"","sources":["../../jsr/intern/pre-allocate.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"pre-allocate.js","sourceRoot":"","sources":["../../jsr/intern/pre-allocate.ts"],"names":[],"mappings":"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"}
|
|
@@ -60,11 +60,3 @@ export declare function persistCodegenThemeMarker(vctx: VibesApiSQLCtx, args: {
|
|
|
60
60
|
readonly appSlug: string;
|
|
61
61
|
readonly theme?: string;
|
|
62
62
|
}): Promise<void>;
|
|
63
|
-
export declare const __mergeActiveSkillsTestHooks: {
|
|
64
|
-
beforeWrite?: () => Promise<void>;
|
|
65
|
-
};
|
|
66
|
-
export declare function mergeActiveSkills(vctx: VibesApiSQLCtx, args: {
|
|
67
|
-
readonly ownerHandle: string;
|
|
68
|
-
readonly appSlug: string;
|
|
69
|
-
readonly newSkills: readonly string[];
|
|
70
|
-
}): Promise<string[] | undefined>;
|
|
@@ -2,7 +2,6 @@ import { Result, exception2Result } from "@adviser/cement";
|
|
|
2
2
|
import { PromptAndBlockMsgs, isActiveCodegenTheme, isActiveClarify, isActiveEnrichedPrompt, isActiveFlourishes, isActiveLayoutArchetype, isActiveTextureNote, isActiveSkills, isActiveTheme, isActiveTitle, isDraftOwnerHandle, isPromptResearch, isPromptReq, isPromptStatus, parseArrayWarning, RESEARCH_BLOCK_SEQ, } from "@vibes.diy/api-types";
|
|
3
3
|
import { isCodeBegin, isCodeEnd, isCodeLine, isToplevelLine, isUserChatMessage, } from "@vibes.diy/call-ai-v2";
|
|
4
4
|
import { ensureLogger } from "@vibes.diy/identity";
|
|
5
|
-
import { sql } from "drizzle-orm";
|
|
6
5
|
import { and, eq, ne } from "drizzle-orm/sql/expressions";
|
|
7
6
|
import { getDefaultSkills, makeBaseSystemPrompt } from "@vibes.diy/prompts";
|
|
8
7
|
import { createPromptAssetFetch, promptsPkgBaseUrl } from "./prompt-asset-fetch.js";
|
|
@@ -481,96 +480,4 @@ export async function persistCodegenThemeMarker(vctx, args) {
|
|
|
481
480
|
await writeAppSettingItems(vctx, key, { removeKeys: ["active.codegen-theme"] });
|
|
482
481
|
}
|
|
483
482
|
}
|
|
484
|
-
const MERGE_ACTIVE_SKILLS_MAX_ATTEMPTS = 8;
|
|
485
|
-
const ACTIVE_SKILLS_ITEM_KEY = "active.skills";
|
|
486
|
-
export const __mergeActiveSkillsTestHooks = {};
|
|
487
|
-
export async function mergeActiveSkills(vctx, args) {
|
|
488
|
-
if (args.newSkills.length === 0)
|
|
489
|
-
return undefined;
|
|
490
|
-
const hb = vctx.sql.tables.handleBinding;
|
|
491
|
-
const ownerRow = await vctx.sql.db
|
|
492
|
-
.select({ userId: hb.userId })
|
|
493
|
-
.from(hb)
|
|
494
|
-
.where(eq(hb.handle, args.ownerHandle))
|
|
495
|
-
.limit(1)
|
|
496
|
-
.then((r) => r[0]);
|
|
497
|
-
if (ownerRow === undefined)
|
|
498
|
-
return undefined;
|
|
499
|
-
const key = { userId: ownerRow.userId, ownerHandle: args.ownerHandle, appSlug: args.appSlug };
|
|
500
|
-
const at = vctx.sql.tables.appSettings;
|
|
501
|
-
const existsRow = await vctx.sql.db
|
|
502
|
-
.select({ userId: at.userId })
|
|
503
|
-
.from(at)
|
|
504
|
-
.where(and(eq(at.appSlug, args.appSlug), eq(at.ownerHandle, args.ownerHandle), eq(at.userId, ownerRow.userId)))
|
|
505
|
-
.limit(1)
|
|
506
|
-
.then((r) => r[0]);
|
|
507
|
-
if (existsRow === undefined)
|
|
508
|
-
return undefined;
|
|
509
|
-
await writeAppSettingItems(vctx, key, {});
|
|
510
|
-
const it = vctx.sql.tables.appSettingItems;
|
|
511
|
-
const itemWhere = and(eq(it.userId, key.userId), eq(it.ownerHandle, key.ownerHandle), eq(it.appSlug, key.appSlug), eq(it.itemKey, ACTIVE_SKILLS_ITEM_KEY));
|
|
512
|
-
for (let attempt = 0; attempt < MERGE_ACTIVE_SKILLS_MAX_ATTEMPTS; attempt++) {
|
|
513
|
-
const row = await vctx.sql.db
|
|
514
|
-
.select({ item: it.item, revision: it.revision })
|
|
515
|
-
.from(it)
|
|
516
|
-
.where(itemWhere)
|
|
517
|
-
.limit(1)
|
|
518
|
-
.then((r) => r[0]);
|
|
519
|
-
const existing = row !== undefined && isActiveSkills(row.item) ? [...row.item.skills] : [];
|
|
520
|
-
const baseline = existing.length > 0 ? existing : [...(await getDefaultSkills())];
|
|
521
|
-
const merged = [...baseline];
|
|
522
|
-
for (const s of args.newSkills)
|
|
523
|
-
if (merged.includes(s) === false)
|
|
524
|
-
merged.push(s);
|
|
525
|
-
if (merged.length === baseline.length)
|
|
526
|
-
return undefined;
|
|
527
|
-
await __mergeActiveSkillsTestHooks.beforeWrite?.();
|
|
528
|
-
const entry = { type: "active.skills", skills: merged };
|
|
529
|
-
if (row === undefined) {
|
|
530
|
-
const now = new Date().toISOString();
|
|
531
|
-
const ins = await vctx.sql.db
|
|
532
|
-
.insert(it)
|
|
533
|
-
.values({
|
|
534
|
-
userId: key.userId,
|
|
535
|
-
ownerHandle: key.ownerHandle,
|
|
536
|
-
appSlug: key.appSlug,
|
|
537
|
-
itemKey: ACTIVE_SKILLS_ITEM_KEY,
|
|
538
|
-
item: entry,
|
|
539
|
-
revision: 0,
|
|
540
|
-
updated: now,
|
|
541
|
-
created: now,
|
|
542
|
-
})
|
|
543
|
-
.onConflictDoNothing({ target: [it.userId, it.ownerHandle, it.appSlug, it.itemKey] })
|
|
544
|
-
.returning({ k: it.itemKey });
|
|
545
|
-
if (ins.length > 0) {
|
|
546
|
-
await bumpAppSettingsUpdated(vctx, key);
|
|
547
|
-
return merged;
|
|
548
|
-
}
|
|
549
|
-
}
|
|
550
|
-
else {
|
|
551
|
-
const nextUpdated = new Date().toISOString();
|
|
552
|
-
const upd = await vctx.sql.db
|
|
553
|
-
.update(it)
|
|
554
|
-
.set({ item: entry, revision: sql `${it.revision} + 1`, updated: nextUpdated })
|
|
555
|
-
.where(and(itemWhere, eq(it.revision, row.revision)))
|
|
556
|
-
.returning({ k: it.itemKey });
|
|
557
|
-
if (upd.length > 0) {
|
|
558
|
-
await bumpAppSettingsUpdated(vctx, key);
|
|
559
|
-
return merged;
|
|
560
|
-
}
|
|
561
|
-
}
|
|
562
|
-
}
|
|
563
|
-
ensureLogger(vctx.sthis, "mergeActiveSkills")
|
|
564
|
-
.Warn()
|
|
565
|
-
.Any({ ownerHandle: args.ownerHandle, appSlug: args.appSlug })
|
|
566
|
-
.Msg("skill top-up hit CAS retry cap under settings-write contention");
|
|
567
|
-
return undefined;
|
|
568
|
-
}
|
|
569
|
-
async function bumpAppSettingsUpdated(vctx, key) {
|
|
570
|
-
const at = vctx.sql.tables.appSettings;
|
|
571
|
-
await vctx.sql.db
|
|
572
|
-
.update(at)
|
|
573
|
-
.set({ updated: new Date().toISOString() })
|
|
574
|
-
.where(and(eq(at.userId, key.userId), eq(at.ownerHandle, key.ownerHandle), eq(at.appSlug, key.appSlug)));
|
|
575
|
-
}
|
|
576
483
|
//# sourceMappingURL=prompt-assembly.js.map
|