ima2-gen 1.1.7 → 1.1.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/README.md +56 -27
- package/bin/commands/annotate.js +137 -0
- package/bin/commands/annotate.ts +118 -0
- package/bin/commands/cancel.js +37 -33
- package/bin/commands/cancel.ts +45 -0
- package/bin/commands/canvas-versions.js +91 -0
- package/bin/commands/canvas-versions.ts +80 -0
- package/bin/commands/cardnews.js +293 -0
- package/bin/commands/cardnews.ts +248 -0
- package/bin/commands/comfy.js +63 -0
- package/bin/commands/comfy.ts +54 -0
- package/bin/commands/config.js +270 -0
- package/bin/commands/config.ts +265 -0
- package/bin/commands/edit.js +97 -72
- package/bin/commands/edit.ts +116 -0
- package/bin/commands/gen.js +140 -118
- package/bin/commands/gen.ts +176 -0
- package/bin/commands/history.js +164 -0
- package/bin/commands/history.ts +145 -0
- package/bin/commands/ls.js +60 -42
- package/bin/commands/ls.ts +60 -0
- package/bin/commands/metadata.js +45 -0
- package/bin/commands/metadata.ts +36 -0
- package/bin/commands/multimode.js +159 -0
- package/bin/commands/multimode.ts +146 -0
- package/bin/commands/node.js +176 -0
- package/bin/commands/node.ts +157 -0
- package/bin/commands/observability.js +201 -0
- package/bin/commands/observability.ts +176 -0
- package/bin/commands/ping.js +26 -20
- package/bin/commands/ping.ts +29 -0
- package/bin/commands/prompt.js +506 -0
- package/bin/commands/prompt.ts +421 -0
- package/bin/commands/ps.js +78 -71
- package/bin/commands/ps.ts +78 -0
- package/bin/commands/session.js +308 -0
- package/bin/commands/session.ts +265 -0
- package/bin/commands/show.js +75 -40
- package/bin/commands/show.ts +69 -0
- package/bin/ima2.js +324 -310
- package/bin/ima2.ts +444 -0
- package/bin/lib/args.js +75 -66
- package/bin/lib/args.ts +73 -0
- package/bin/lib/browser-id.js +15 -0
- package/bin/lib/browser-id.ts +16 -0
- package/bin/lib/client.js +91 -83
- package/bin/lib/client.ts +109 -0
- package/bin/lib/error-hints.js +14 -17
- package/bin/lib/error-hints.ts +23 -0
- package/bin/lib/files.js +26 -28
- package/bin/lib/files.ts +39 -0
- package/bin/lib/output.js +44 -42
- package/bin/lib/output.ts +58 -0
- package/bin/lib/platform.js +60 -56
- package/bin/lib/platform.ts +97 -0
- package/bin/lib/sse.js +73 -0
- package/bin/lib/sse.ts +73 -0
- package/bin/lib/star-prompt.js +69 -76
- package/bin/lib/star-prompt.ts +97 -0
- package/bin/lib/storage-doctor.js +34 -35
- package/bin/lib/storage-doctor.ts +38 -0
- package/config.js +147 -190
- package/config.ts +331 -0
- package/docs/API.md +48 -8
- package/docs/CLI.md +190 -0
- package/docs/FAQ.ko.md +5 -5
- package/docs/FAQ.md +5 -5
- package/docs/README.ja.md +71 -25
- package/docs/README.ko.md +61 -24
- package/docs/README.zh-CN.md +73 -27
- package/lib/assetLifecycle.js +130 -130
- package/lib/assetLifecycle.ts +142 -0
- package/lib/canvasVersionStore.js +135 -153
- package/lib/canvasVersionStore.ts +181 -0
- package/lib/cardNewsGenerator.js +127 -142
- package/lib/cardNewsGenerator.ts +162 -0
- package/lib/cardNewsJobStore.js +78 -84
- package/lib/cardNewsJobStore.ts +107 -0
- package/lib/cardNewsManifestStore.js +88 -93
- package/lib/cardNewsManifestStore.ts +112 -0
- package/lib/cardNewsPlanner.js +157 -152
- package/lib/cardNewsPlanner.ts +180 -0
- package/lib/cardNewsPlannerClient.js +101 -98
- package/lib/cardNewsPlannerClient.ts +114 -0
- package/lib/cardNewsPlannerPrompt.js +56 -56
- package/lib/cardNewsPlannerPrompt.ts +60 -0
- package/lib/cardNewsPlannerSchema.js +231 -223
- package/lib/cardNewsPlannerSchema.ts +259 -0
- package/lib/cardNewsRoleTemplateStore.js +39 -41
- package/lib/cardNewsRoleTemplateStore.ts +47 -0
- package/lib/cardNewsTemplateStore.js +171 -175
- package/lib/cardNewsTemplateStore.ts +210 -0
- package/lib/codexDetect.js +44 -47
- package/lib/codexDetect.ts +69 -0
- package/lib/comfyBridge.js +164 -184
- package/lib/comfyBridge.ts +214 -0
- package/lib/db.js +41 -51
- package/lib/db.ts +166 -0
- package/lib/errorClassify.js +62 -78
- package/lib/errorClassify.ts +100 -0
- package/lib/generationErrors.js +140 -103
- package/lib/generationErrors.ts +125 -0
- package/lib/historyList.js +149 -147
- package/lib/historyList.ts +164 -0
- package/lib/imageMetadata.js +86 -89
- package/lib/imageMetadata.ts +111 -0
- package/lib/imageMetadataStore.js +46 -51
- package/lib/imageMetadataStore.ts +67 -0
- package/lib/imageModels.js +38 -45
- package/lib/imageModels.ts +52 -0
- package/lib/inflight.js +131 -150
- package/lib/inflight.ts +204 -0
- package/lib/localImportStore.js +105 -0
- package/lib/localImportStore.ts +111 -0
- package/lib/logger.js +105 -112
- package/lib/logger.ts +150 -0
- package/lib/nodeStore.js +65 -64
- package/lib/nodeStore.ts +81 -0
- package/lib/oauthLauncher.js +61 -59
- package/lib/oauthLauncher.ts +64 -0
- package/lib/oauthNormalize.js +15 -19
- package/lib/oauthNormalize.ts +30 -0
- package/lib/oauthProxy.js +834 -832
- package/lib/oauthProxy.ts +995 -0
- package/lib/openDirectory.js +41 -40
- package/lib/openDirectory.ts +45 -0
- package/lib/pngInfo.js +18 -20
- package/lib/pngInfo.ts +26 -0
- package/lib/promptImport/curatedSources.js +135 -0
- package/lib/promptImport/curatedSources.ts +139 -0
- package/lib/promptImport/discoveryRegistry.js +218 -0
- package/lib/promptImport/discoveryRegistry.ts +236 -0
- package/lib/promptImport/errors.js +10 -10
- package/lib/promptImport/errors.ts +18 -0
- package/lib/promptImport/githubDiscovery.js +238 -0
- package/lib/promptImport/githubDiscovery.ts +248 -0
- package/lib/promptImport/githubFolder.js +302 -0
- package/lib/promptImport/githubFolder.ts +308 -0
- package/lib/promptImport/githubSource.js +194 -171
- package/lib/promptImport/githubSource.ts +239 -0
- package/lib/promptImport/gptImageHints.js +61 -0
- package/lib/promptImport/gptImageHints.ts +68 -0
- package/lib/promptImport/parsePromptCandidates.js +110 -112
- package/lib/promptImport/parsePromptCandidates.ts +153 -0
- package/lib/promptImport/promptIndex.js +230 -0
- package/lib/promptImport/promptIndex.ts +248 -0
- package/lib/promptImport/rankPromptCandidates.js +52 -0
- package/lib/promptImport/rankPromptCandidates.ts +49 -0
- package/lib/providerOptions.js +31 -0
- package/lib/providerOptions.ts +41 -0
- package/lib/referenceImageCompress.js +51 -62
- package/lib/referenceImageCompress.ts +75 -0
- package/lib/refs.js +93 -81
- package/lib/refs.ts +117 -0
- package/lib/requestLogger.js +32 -38
- package/lib/requestLogger.ts +48 -0
- package/lib/responsesImageAdapter.js +351 -0
- package/lib/responsesImageAdapter.ts +352 -0
- package/lib/runtimePorts.js +71 -73
- package/lib/runtimePorts.ts +93 -0
- package/lib/sessionStore.js +179 -230
- package/lib/sessionStore.ts +272 -0
- package/lib/storageMigration.js +247 -245
- package/lib/storageMigration.ts +284 -0
- package/lib/styleSheet.js +86 -90
- package/lib/styleSheet.ts +128 -0
- package/lib/systemTrash.js +18 -0
- package/lib/systemTrash.ts +20 -0
- package/package.json +26 -10
- package/routes/annotations.js +76 -79
- package/routes/annotations.ts +95 -0
- package/routes/canvasVersions.js +50 -54
- package/routes/canvasVersions.ts +64 -0
- package/routes/cardNews.js +158 -171
- package/routes/cardNews.ts +183 -0
- package/routes/comfy.js +23 -31
- package/routes/comfy.ts +39 -0
- package/routes/edit.js +183 -214
- package/routes/edit.ts +230 -0
- package/routes/generate.js +269 -291
- package/routes/generate.ts +309 -0
- package/routes/health.js +102 -107
- package/routes/health.ts +114 -0
- package/routes/history.js +136 -144
- package/routes/history.ts +153 -0
- package/routes/imageImport.js +33 -0
- package/routes/imageImport.ts +33 -0
- package/routes/index.js +18 -16
- package/routes/index.ts +35 -0
- package/routes/metadata.js +60 -64
- package/routes/metadata.ts +71 -0
- package/routes/multimode.js +228 -263
- package/routes/multimode.ts +280 -0
- package/routes/nodes.js +378 -424
- package/routes/nodes.ts +455 -0
- package/routes/promptImport.js +291 -152
- package/routes/promptImport.ts +354 -0
- package/routes/prompts.js +333 -360
- package/routes/prompts.ts +379 -0
- package/routes/sessions.js +277 -285
- package/routes/sessions.ts +292 -0
- package/routes/storage.js +29 -31
- package/routes/storage.ts +39 -0
- package/server.js +189 -196
- package/server.ts +235 -0
- package/ui/dist/.vite/manifest.json +101 -0
- package/ui/dist/assets/CardNewsWorkspace-BJOCey7Z.js +2 -0
- package/ui/dist/assets/NodeCanvas-BZV40eAE.css +1 -0
- package/ui/dist/assets/NodeCanvas-C3dzYNsk.js +7 -0
- package/ui/dist/assets/PromptImportDialog-Dqu1VpUh.js +2 -0
- package/ui/dist/assets/PromptImportDiscoverySection-Dg8T9X0L.js +1 -0
- package/ui/dist/assets/PromptImportFolderSection-DBaqsFO4.js +1 -0
- package/ui/dist/assets/PromptLibraryPanel-p5QqR97M.js +2 -0
- package/ui/dist/assets/SettingsWorkspace-B5bSAZ6u.js +1 -0
- package/ui/dist/assets/index-C9cXwiWE.js +25 -0
- package/ui/dist/assets/index-CGMIkZXn.css +1 -0
- package/ui/dist/assets/index-Cvld7dUZ.js +1 -0
- package/ui/dist/index.html +6 -3
- package/assets/screenshot.png +0 -0
- package/assets/screenshots/classic-generate-light.png +0 -0
- package/assets/screenshots/node-graph-branching.png +0 -0
- package/assets/screenshots/settings-oauth-generation.png +0 -0
- package/assets/screenshots/settings-workspace.png +0 -0
- package/assets/screenshots/style-sheet-editor.png +0 -0
- package/integrations/comfyui/ima2_gen_bridge/__pycache__/__init__.cpython-313.pyc +0 -0
- package/integrations/comfyui/ima2_gen_bridge/__pycache__/nodes.cpython-313.pyc +0 -0
- package/ui/dist/assets/index-DARPdT4Q.css +0 -1
- package/ui/dist/assets/index-ht80GMq4.js +0 -31
- package/ui/dist/assets/index-ht80GMq4.js.map +0 -1
|
@@ -0,0 +1,218 @@
|
|
|
1
|
+
import { mkdir, readFile, rename, writeFile } from "node:fs/promises";
|
|
2
|
+
import { dirname } from "node:path";
|
|
3
|
+
import { promptImportError } from "./errors.js";
|
|
4
|
+
const REGISTRY_VERSION = 1;
|
|
5
|
+
const OWNER_REPO_RE = /^[A-Za-z0-9_.-]+$/;
|
|
6
|
+
const SUPPORTED_EXTENSIONS = new Set(["md", "markdown", "txt"]);
|
|
7
|
+
function registryFile(ctx) {
|
|
8
|
+
return ctx.config.storage.promptImportDiscoveryRegistryFile;
|
|
9
|
+
}
|
|
10
|
+
function emptyRegistry() {
|
|
11
|
+
return { version: REGISTRY_VERSION, updatedAt: null, candidates: {} };
|
|
12
|
+
}
|
|
13
|
+
function normalizeRepoFullName(repo) {
|
|
14
|
+
const value = String(repo || "").trim();
|
|
15
|
+
const parts = value.split("/");
|
|
16
|
+
if (parts.length !== 2 || !OWNER_REPO_RE.test(parts[0]) || !OWNER_REPO_RE.test(parts[1])) {
|
|
17
|
+
throw promptImportError("GITHUB_DISCOVERY_REVIEW_INVALID", "Review repo must be owner/repo");
|
|
18
|
+
}
|
|
19
|
+
return `${parts[0]}/${parts[1]}`;
|
|
20
|
+
}
|
|
21
|
+
function extensionForPath(path) {
|
|
22
|
+
const match = /\.([A-Za-z0-9]+)$/.exec(path);
|
|
23
|
+
return match?.[1]?.toLowerCase() ?? "";
|
|
24
|
+
}
|
|
25
|
+
function assertAllowedPath(path) {
|
|
26
|
+
const value = String(path || "").trim();
|
|
27
|
+
if (!value) {
|
|
28
|
+
throw promptImportError("GITHUB_DISCOVERY_REVIEW_INVALID", "Allowed path is required");
|
|
29
|
+
}
|
|
30
|
+
if (/^https?:\/\//i.test(value)) {
|
|
31
|
+
throw promptImportError("GITHUB_DISCOVERY_REVIEW_INVALID", "Allowed path must be repo-relative");
|
|
32
|
+
}
|
|
33
|
+
if (value.includes("\0") || /%00/i.test(value)) {
|
|
34
|
+
throw promptImportError("GITHUB_DISCOVERY_REVIEW_INVALID", "Allowed path contains a null byte");
|
|
35
|
+
}
|
|
36
|
+
if (/%2f|%5c/i.test(value)) {
|
|
37
|
+
throw promptImportError("GITHUB_DISCOVERY_REVIEW_INVALID", "Allowed path contains an encoded slash");
|
|
38
|
+
}
|
|
39
|
+
if (value.includes("\\") || value.split("/").includes("..")) {
|
|
40
|
+
throw promptImportError("GITHUB_DISCOVERY_REVIEW_INVALID", "Allowed path traversal is not allowed");
|
|
41
|
+
}
|
|
42
|
+
const clean = value.replace(/^\/+/, "");
|
|
43
|
+
const extension = extensionForPath(clean);
|
|
44
|
+
if (!SUPPORTED_EXTENSIONS.has(extension)) {
|
|
45
|
+
throw promptImportError("GITHUB_DISCOVERY_REVIEW_INVALID", "Allowed paths must be .md, .markdown, or .txt");
|
|
46
|
+
}
|
|
47
|
+
return clean;
|
|
48
|
+
}
|
|
49
|
+
function normalizeAllowedPaths(paths, limits) {
|
|
50
|
+
if (paths === undefined)
|
|
51
|
+
return [];
|
|
52
|
+
if (!Array.isArray(paths)) {
|
|
53
|
+
throw promptImportError("GITHUB_DISCOVERY_REVIEW_INVALID", "allowedPaths must be an array");
|
|
54
|
+
}
|
|
55
|
+
if (paths.length > limits.maxRepoIndexFiles) {
|
|
56
|
+
throw promptImportError("GITHUB_DISCOVERY_REVIEW_INVALID", "Too many allowed paths", 413);
|
|
57
|
+
}
|
|
58
|
+
return [...new Set(paths.map(assertAllowedPath))];
|
|
59
|
+
}
|
|
60
|
+
function publicCandidate(candidate) {
|
|
61
|
+
return {
|
|
62
|
+
id: candidate.id,
|
|
63
|
+
repo: candidate.repo,
|
|
64
|
+
owner: candidate.owner,
|
|
65
|
+
name: candidate.name,
|
|
66
|
+
fullName: candidate.fullName,
|
|
67
|
+
htmlUrl: candidate.htmlUrl,
|
|
68
|
+
description: candidate.description,
|
|
69
|
+
defaultBranch: candidate.defaultBranch,
|
|
70
|
+
stars: candidate.stars,
|
|
71
|
+
forks: candidate.forks,
|
|
72
|
+
openIssues: candidate.openIssues,
|
|
73
|
+
updatedAt: candidate.updatedAt,
|
|
74
|
+
pushedAt: candidate.pushedAt,
|
|
75
|
+
licenseSpdx: candidate.licenseSpdx,
|
|
76
|
+
topics: Array.isArray(candidate.topics) ? [...candidate.topics] : [],
|
|
77
|
+
language: candidate.language,
|
|
78
|
+
score: candidate.score,
|
|
79
|
+
scoreReasons: Array.isArray(candidate.scoreReasons) ? [...candidate.scoreReasons] : [],
|
|
80
|
+
warnings: Array.isArray(candidate.warnings) ? [...candidate.warnings] : [],
|
|
81
|
+
status: candidate.status || "candidate",
|
|
82
|
+
query: candidate.query,
|
|
83
|
+
discoveredAt: candidate.discoveredAt,
|
|
84
|
+
reviewedAt: candidate.reviewedAt || null,
|
|
85
|
+
reviewNotes: candidate.reviewNotes || "",
|
|
86
|
+
approvedSource: candidate.approvedSource || null,
|
|
87
|
+
};
|
|
88
|
+
}
|
|
89
|
+
function reviewedSourceId(candidate) {
|
|
90
|
+
return `discovered-${candidate.fullName.toLowerCase().replace(/[^a-z0-9]+/g, "-").replace(/^-|-$/g, "")}`;
|
|
91
|
+
}
|
|
92
|
+
export async function readDiscoveryRegistry(ctx) {
|
|
93
|
+
try {
|
|
94
|
+
const parsed = JSON.parse(await readFile(registryFile(ctx), "utf8"));
|
|
95
|
+
if (parsed.version !== REGISTRY_VERSION)
|
|
96
|
+
return emptyRegistry();
|
|
97
|
+
return {
|
|
98
|
+
version: REGISTRY_VERSION,
|
|
99
|
+
updatedAt: parsed.updatedAt || null,
|
|
100
|
+
candidates: parsed.candidates || {},
|
|
101
|
+
};
|
|
102
|
+
}
|
|
103
|
+
catch {
|
|
104
|
+
return emptyRegistry();
|
|
105
|
+
}
|
|
106
|
+
}
|
|
107
|
+
export async function writeDiscoveryRegistry(ctx, registry) {
|
|
108
|
+
const file = registryFile(ctx);
|
|
109
|
+
await mkdir(dirname(file), { recursive: true });
|
|
110
|
+
const tmp = `${file}.${process.pid}.${Date.now()}.tmp`;
|
|
111
|
+
await writeFile(tmp, JSON.stringify(registry, null, 2));
|
|
112
|
+
await rename(tmp, file);
|
|
113
|
+
}
|
|
114
|
+
export async function listDiscoveryCandidates(ctx, filters = {}) {
|
|
115
|
+
const registry = await readDiscoveryRegistry(ctx);
|
|
116
|
+
const status = typeof filters.status === "string" ? filters.status : null;
|
|
117
|
+
return Object.values(registry.candidates)
|
|
118
|
+
.filter((candidate) => !status || candidate.status === status)
|
|
119
|
+
.map(publicCandidate)
|
|
120
|
+
.sort((a, b) => b.score - a.score || a.fullName.localeCompare(b.fullName));
|
|
121
|
+
}
|
|
122
|
+
export async function upsertDiscoveryCandidates(ctx, candidates) {
|
|
123
|
+
const registry = await readDiscoveryRegistry(ctx);
|
|
124
|
+
const now = new Date().toISOString();
|
|
125
|
+
for (const candidate of candidates) {
|
|
126
|
+
const fullName = normalizeRepoFullName(candidate.fullName || candidate.repo);
|
|
127
|
+
const existing = registry.candidates[fullName];
|
|
128
|
+
registry.candidates[fullName] = {
|
|
129
|
+
...existing,
|
|
130
|
+
...candidate,
|
|
131
|
+
fullName,
|
|
132
|
+
repo: fullName,
|
|
133
|
+
status: existing?.status || candidate.status || "candidate",
|
|
134
|
+
discoveredAt: existing?.discoveredAt || candidate.discoveredAt || now,
|
|
135
|
+
};
|
|
136
|
+
}
|
|
137
|
+
registry.updatedAt = now;
|
|
138
|
+
await writeDiscoveryRegistry(ctx, registry);
|
|
139
|
+
return Object.values(registry.candidates).map(publicCandidate);
|
|
140
|
+
}
|
|
141
|
+
export function reviewedSourceFromCandidate(candidate) {
|
|
142
|
+
const [owner, name] = String(candidate.fullName || candidate.repo).split("/");
|
|
143
|
+
const allowedPaths = Array.isArray(candidate.allowedPaths) ? candidate.allowedPaths : [];
|
|
144
|
+
return {
|
|
145
|
+
id: reviewedSourceId(candidate),
|
|
146
|
+
repo: `${owner}/${name}`,
|
|
147
|
+
owner,
|
|
148
|
+
name,
|
|
149
|
+
displayName: candidate.name || name,
|
|
150
|
+
defaultRef: candidate.defaultBranch || "main",
|
|
151
|
+
allowedPaths,
|
|
152
|
+
extensions: ["md", "markdown", "txt"],
|
|
153
|
+
sourceType: "discovered",
|
|
154
|
+
licenseSpdx: candidate.licenseSpdx || "NOASSERTION",
|
|
155
|
+
requiresAttribution: true,
|
|
156
|
+
trustTier: "reviewed",
|
|
157
|
+
lastVerifiedAt: candidate.reviewedAt || null,
|
|
158
|
+
notes: candidate.reviewNotes || candidate.description || "Reviewed GitHub discovery source.",
|
|
159
|
+
searchSeeds: [candidate.name, candidate.description, ...(candidate.topics || [])].filter(Boolean).slice(0, 8),
|
|
160
|
+
defaultSearch: Boolean(candidate.defaultSearch && allowedPaths.length > 0 && !String(candidate.defaultBranch || "").includes("/")),
|
|
161
|
+
};
|
|
162
|
+
}
|
|
163
|
+
export async function reviewDiscoveryCandidate(ctx, payload) {
|
|
164
|
+
const limits = {
|
|
165
|
+
maxRepoIndexFiles: ctx.config.limits.promptImportMaxRepoIndexFiles,
|
|
166
|
+
};
|
|
167
|
+
const repo = normalizeRepoFullName(payload?.repo);
|
|
168
|
+
const status = String(payload?.status || "");
|
|
169
|
+
if (!["approved", "rejected"].includes(status)) {
|
|
170
|
+
throw promptImportError("GITHUB_DISCOVERY_REVIEW_INVALID", "Review status must be approved or rejected");
|
|
171
|
+
}
|
|
172
|
+
const registry = await readDiscoveryRegistry(ctx);
|
|
173
|
+
const candidate = registry.candidates[repo];
|
|
174
|
+
if (!candidate) {
|
|
175
|
+
throw promptImportError("GITHUB_DISCOVERY_SOURCE_NOT_FOUND", "Discovery candidate was not found", 404);
|
|
176
|
+
}
|
|
177
|
+
const allowedPaths = normalizeAllowedPaths(payload?.allowedPaths, limits);
|
|
178
|
+
const warnings = [...(candidate.warnings || [])];
|
|
179
|
+
const defaultBranch = String(candidate.defaultBranch || "");
|
|
180
|
+
let defaultSearch = Boolean(payload?.defaultSearch);
|
|
181
|
+
if (status !== "approved" || allowedPaths.length === 0)
|
|
182
|
+
defaultSearch = false;
|
|
183
|
+
if (defaultBranch.includes("/")) {
|
|
184
|
+
defaultSearch = false;
|
|
185
|
+
warnings.push("discovery-default-branch-unsupported");
|
|
186
|
+
}
|
|
187
|
+
if (status === "approved" && allowedPaths.length === 0) {
|
|
188
|
+
warnings.push("discovery-requires-paths");
|
|
189
|
+
}
|
|
190
|
+
const reviewed = {
|
|
191
|
+
...candidate,
|
|
192
|
+
allowedPaths,
|
|
193
|
+
status,
|
|
194
|
+
warnings: [...new Set(warnings)],
|
|
195
|
+
defaultSearch,
|
|
196
|
+
reviewedAt: new Date().toISOString(),
|
|
197
|
+
reviewNotes: typeof payload?.reviewNotes === "string" ? payload.reviewNotes.slice(0, 500) : "",
|
|
198
|
+
};
|
|
199
|
+
reviewed.approvedSource = status === "approved" ? reviewedSourceFromCandidate(reviewed) : null;
|
|
200
|
+
registry.candidates[repo] = reviewed;
|
|
201
|
+
registry.updatedAt = reviewed.reviewedAt;
|
|
202
|
+
await writeDiscoveryRegistry(ctx, registry);
|
|
203
|
+
return { candidate: publicCandidate(reviewed), source: reviewed.approvedSource, warnings: reviewed.warnings };
|
|
204
|
+
}
|
|
205
|
+
export async function listReviewedDiscoverySources(ctx, { defaultSearchOnly = false } = {}) {
|
|
206
|
+
const registry = await readDiscoveryRegistry(ctx);
|
|
207
|
+
return Object.values(registry.candidates)
|
|
208
|
+
.filter((candidate) => candidate.status === "approved" && candidate.approvedSource)
|
|
209
|
+
.map((candidate) => candidate.approvedSource)
|
|
210
|
+
.filter((source) => !defaultSearchOnly || source.defaultSearch);
|
|
211
|
+
}
|
|
212
|
+
export async function getReviewedDiscoverySource(ctx, sourceId) {
|
|
213
|
+
const sources = await listReviewedDiscoverySources(ctx);
|
|
214
|
+
return sources.find((source) => source.id === sourceId) || null;
|
|
215
|
+
}
|
|
216
|
+
export async function getDefaultReviewedDiscoverySources(ctx) {
|
|
217
|
+
return listReviewedDiscoverySources(ctx, { defaultSearchOnly: true });
|
|
218
|
+
}
|
|
@@ -0,0 +1,236 @@
|
|
|
1
|
+
import { mkdir, readFile, rename, writeFile } from "node:fs/promises";
|
|
2
|
+
import { dirname } from "node:path";
|
|
3
|
+
import { promptImportError } from "./errors.js";
|
|
4
|
+
|
|
5
|
+
const REGISTRY_VERSION = 1;
|
|
6
|
+
const OWNER_REPO_RE = /^[A-Za-z0-9_.-]+$/;
|
|
7
|
+
const SUPPORTED_EXTENSIONS = new Set(["md", "markdown", "txt"]);
|
|
8
|
+
|
|
9
|
+
function registryFile(ctx) {
|
|
10
|
+
return ctx.config.storage.promptImportDiscoveryRegistryFile;
|
|
11
|
+
}
|
|
12
|
+
|
|
13
|
+
function emptyRegistry() {
|
|
14
|
+
return { version: REGISTRY_VERSION, updatedAt: null, candidates: {} };
|
|
15
|
+
}
|
|
16
|
+
|
|
17
|
+
function normalizeRepoFullName(repo) {
|
|
18
|
+
const value = String(repo || "").trim();
|
|
19
|
+
const parts = value.split("/");
|
|
20
|
+
if (parts.length !== 2 || !OWNER_REPO_RE.test(parts[0]) || !OWNER_REPO_RE.test(parts[1])) {
|
|
21
|
+
throw promptImportError("GITHUB_DISCOVERY_REVIEW_INVALID", "Review repo must be owner/repo");
|
|
22
|
+
}
|
|
23
|
+
return `${parts[0]}/${parts[1]}`;
|
|
24
|
+
}
|
|
25
|
+
|
|
26
|
+
function extensionForPath(path) {
|
|
27
|
+
const match = /\.([A-Za-z0-9]+)$/.exec(path);
|
|
28
|
+
return match?.[1]?.toLowerCase() ?? "";
|
|
29
|
+
}
|
|
30
|
+
|
|
31
|
+
function assertAllowedPath(path) {
|
|
32
|
+
const value = String(path || "").trim();
|
|
33
|
+
if (!value) {
|
|
34
|
+
throw promptImportError("GITHUB_DISCOVERY_REVIEW_INVALID", "Allowed path is required");
|
|
35
|
+
}
|
|
36
|
+
if (/^https?:\/\//i.test(value)) {
|
|
37
|
+
throw promptImportError("GITHUB_DISCOVERY_REVIEW_INVALID", "Allowed path must be repo-relative");
|
|
38
|
+
}
|
|
39
|
+
if (value.includes("\0") || /%00/i.test(value)) {
|
|
40
|
+
throw promptImportError("GITHUB_DISCOVERY_REVIEW_INVALID", "Allowed path contains a null byte");
|
|
41
|
+
}
|
|
42
|
+
if (/%2f|%5c/i.test(value)) {
|
|
43
|
+
throw promptImportError("GITHUB_DISCOVERY_REVIEW_INVALID", "Allowed path contains an encoded slash");
|
|
44
|
+
}
|
|
45
|
+
if (value.includes("\\") || value.split("/").includes("..")) {
|
|
46
|
+
throw promptImportError("GITHUB_DISCOVERY_REVIEW_INVALID", "Allowed path traversal is not allowed");
|
|
47
|
+
}
|
|
48
|
+
const clean = value.replace(/^\/+/, "");
|
|
49
|
+
const extension = extensionForPath(clean);
|
|
50
|
+
if (!SUPPORTED_EXTENSIONS.has(extension)) {
|
|
51
|
+
throw promptImportError("GITHUB_DISCOVERY_REVIEW_INVALID", "Allowed paths must be .md, .markdown, or .txt");
|
|
52
|
+
}
|
|
53
|
+
return clean;
|
|
54
|
+
}
|
|
55
|
+
|
|
56
|
+
function normalizeAllowedPaths(paths, limits) {
|
|
57
|
+
if (paths === undefined) return [];
|
|
58
|
+
if (!Array.isArray(paths)) {
|
|
59
|
+
throw promptImportError("GITHUB_DISCOVERY_REVIEW_INVALID", "allowedPaths must be an array");
|
|
60
|
+
}
|
|
61
|
+
if (paths.length > limits.maxRepoIndexFiles) {
|
|
62
|
+
throw promptImportError("GITHUB_DISCOVERY_REVIEW_INVALID", "Too many allowed paths", 413);
|
|
63
|
+
}
|
|
64
|
+
return [...new Set(paths.map(assertAllowedPath))];
|
|
65
|
+
}
|
|
66
|
+
|
|
67
|
+
function publicCandidate(candidate) {
|
|
68
|
+
return {
|
|
69
|
+
id: candidate.id,
|
|
70
|
+
repo: candidate.repo,
|
|
71
|
+
owner: candidate.owner,
|
|
72
|
+
name: candidate.name,
|
|
73
|
+
fullName: candidate.fullName,
|
|
74
|
+
htmlUrl: candidate.htmlUrl,
|
|
75
|
+
description: candidate.description,
|
|
76
|
+
defaultBranch: candidate.defaultBranch,
|
|
77
|
+
stars: candidate.stars,
|
|
78
|
+
forks: candidate.forks,
|
|
79
|
+
openIssues: candidate.openIssues,
|
|
80
|
+
updatedAt: candidate.updatedAt,
|
|
81
|
+
pushedAt: candidate.pushedAt,
|
|
82
|
+
licenseSpdx: candidate.licenseSpdx,
|
|
83
|
+
topics: Array.isArray(candidate.topics) ? [...candidate.topics] : [],
|
|
84
|
+
language: candidate.language,
|
|
85
|
+
score: candidate.score,
|
|
86
|
+
scoreReasons: Array.isArray(candidate.scoreReasons) ? [...candidate.scoreReasons] : [],
|
|
87
|
+
warnings: Array.isArray(candidate.warnings) ? [...candidate.warnings] : [],
|
|
88
|
+
status: candidate.status || "candidate",
|
|
89
|
+
query: candidate.query,
|
|
90
|
+
discoveredAt: candidate.discoveredAt,
|
|
91
|
+
reviewedAt: candidate.reviewedAt || null,
|
|
92
|
+
reviewNotes: candidate.reviewNotes || "",
|
|
93
|
+
approvedSource: candidate.approvedSource || null,
|
|
94
|
+
};
|
|
95
|
+
}
|
|
96
|
+
|
|
97
|
+
function reviewedSourceId(candidate) {
|
|
98
|
+
return `discovered-${candidate.fullName.toLowerCase().replace(/[^a-z0-9]+/g, "-").replace(/^-|-$/g, "")}`;
|
|
99
|
+
}
|
|
100
|
+
|
|
101
|
+
export async function readDiscoveryRegistry(ctx) {
|
|
102
|
+
try {
|
|
103
|
+
const parsed = JSON.parse(await readFile(registryFile(ctx), "utf8"));
|
|
104
|
+
if (parsed.version !== REGISTRY_VERSION) return emptyRegistry();
|
|
105
|
+
return {
|
|
106
|
+
version: REGISTRY_VERSION,
|
|
107
|
+
updatedAt: parsed.updatedAt || null,
|
|
108
|
+
candidates: parsed.candidates || {},
|
|
109
|
+
};
|
|
110
|
+
} catch {
|
|
111
|
+
return emptyRegistry();
|
|
112
|
+
}
|
|
113
|
+
}
|
|
114
|
+
|
|
115
|
+
export async function writeDiscoveryRegistry(ctx, registry) {
|
|
116
|
+
const file = registryFile(ctx);
|
|
117
|
+
await mkdir(dirname(file), { recursive: true });
|
|
118
|
+
const tmp = `${file}.${process.pid}.${Date.now()}.tmp`;
|
|
119
|
+
await writeFile(tmp, JSON.stringify(registry, null, 2));
|
|
120
|
+
await rename(tmp, file);
|
|
121
|
+
}
|
|
122
|
+
|
|
123
|
+
export async function listDiscoveryCandidates(ctx, filters: any = {}) {
|
|
124
|
+
const registry = await readDiscoveryRegistry(ctx);
|
|
125
|
+
const status = typeof filters.status === "string" ? filters.status : null;
|
|
126
|
+
return Object.values(registry.candidates)
|
|
127
|
+
.filter((candidate: any) => !status || candidate.status === status)
|
|
128
|
+
.map(publicCandidate)
|
|
129
|
+
.sort((a, b) => b.score - a.score || a.fullName.localeCompare(b.fullName));
|
|
130
|
+
}
|
|
131
|
+
|
|
132
|
+
export async function upsertDiscoveryCandidates(ctx, candidates) {
|
|
133
|
+
const registry = await readDiscoveryRegistry(ctx);
|
|
134
|
+
const now = new Date().toISOString();
|
|
135
|
+
for (const candidate of candidates) {
|
|
136
|
+
const fullName = normalizeRepoFullName(candidate.fullName || candidate.repo);
|
|
137
|
+
const existing = registry.candidates[fullName];
|
|
138
|
+
registry.candidates[fullName] = {
|
|
139
|
+
...existing,
|
|
140
|
+
...candidate,
|
|
141
|
+
fullName,
|
|
142
|
+
repo: fullName,
|
|
143
|
+
status: existing?.status || candidate.status || "candidate",
|
|
144
|
+
discoveredAt: existing?.discoveredAt || candidate.discoveredAt || now,
|
|
145
|
+
};
|
|
146
|
+
}
|
|
147
|
+
registry.updatedAt = now;
|
|
148
|
+
await writeDiscoveryRegistry(ctx, registry);
|
|
149
|
+
return Object.values(registry.candidates).map(publicCandidate);
|
|
150
|
+
}
|
|
151
|
+
|
|
152
|
+
export function reviewedSourceFromCandidate(candidate) {
|
|
153
|
+
const [owner, name] = String(candidate.fullName || candidate.repo).split("/");
|
|
154
|
+
const allowedPaths = Array.isArray(candidate.allowedPaths) ? candidate.allowedPaths : [];
|
|
155
|
+
return {
|
|
156
|
+
id: reviewedSourceId(candidate),
|
|
157
|
+
repo: `${owner}/${name}`,
|
|
158
|
+
owner,
|
|
159
|
+
name,
|
|
160
|
+
displayName: candidate.name || name,
|
|
161
|
+
defaultRef: candidate.defaultBranch || "main",
|
|
162
|
+
allowedPaths,
|
|
163
|
+
extensions: ["md", "markdown", "txt"],
|
|
164
|
+
sourceType: "discovered",
|
|
165
|
+
licenseSpdx: candidate.licenseSpdx || "NOASSERTION",
|
|
166
|
+
requiresAttribution: true,
|
|
167
|
+
trustTier: "reviewed",
|
|
168
|
+
lastVerifiedAt: candidate.reviewedAt || null,
|
|
169
|
+
notes: candidate.reviewNotes || candidate.description || "Reviewed GitHub discovery source.",
|
|
170
|
+
searchSeeds: [candidate.name, candidate.description, ...(candidate.topics || [])].filter(Boolean).slice(0, 8),
|
|
171
|
+
defaultSearch: Boolean(candidate.defaultSearch && allowedPaths.length > 0 && !String(candidate.defaultBranch || "").includes("/")),
|
|
172
|
+
};
|
|
173
|
+
}
|
|
174
|
+
|
|
175
|
+
export async function reviewDiscoveryCandidate(ctx, payload) {
|
|
176
|
+
const limits = {
|
|
177
|
+
maxRepoIndexFiles: ctx.config.limits.promptImportMaxRepoIndexFiles,
|
|
178
|
+
};
|
|
179
|
+
const repo = normalizeRepoFullName(payload?.repo);
|
|
180
|
+
const status = String(payload?.status || "");
|
|
181
|
+
if (!["approved", "rejected"].includes(status)) {
|
|
182
|
+
throw promptImportError("GITHUB_DISCOVERY_REVIEW_INVALID", "Review status must be approved or rejected");
|
|
183
|
+
}
|
|
184
|
+
|
|
185
|
+
const registry = await readDiscoveryRegistry(ctx);
|
|
186
|
+
const candidate = registry.candidates[repo];
|
|
187
|
+
if (!candidate) {
|
|
188
|
+
throw promptImportError("GITHUB_DISCOVERY_SOURCE_NOT_FOUND", "Discovery candidate was not found", 404);
|
|
189
|
+
}
|
|
190
|
+
|
|
191
|
+
const allowedPaths = normalizeAllowedPaths(payload?.allowedPaths, limits);
|
|
192
|
+
const warnings = [...(candidate.warnings || [])];
|
|
193
|
+
const defaultBranch = String(candidate.defaultBranch || "");
|
|
194
|
+
let defaultSearch = Boolean(payload?.defaultSearch);
|
|
195
|
+
|
|
196
|
+
if (status !== "approved" || allowedPaths.length === 0) defaultSearch = false;
|
|
197
|
+
if (defaultBranch.includes("/")) {
|
|
198
|
+
defaultSearch = false;
|
|
199
|
+
warnings.push("discovery-default-branch-unsupported");
|
|
200
|
+
}
|
|
201
|
+
if (status === "approved" && allowedPaths.length === 0) {
|
|
202
|
+
warnings.push("discovery-requires-paths");
|
|
203
|
+
}
|
|
204
|
+
|
|
205
|
+
const reviewed = {
|
|
206
|
+
...candidate,
|
|
207
|
+
allowedPaths,
|
|
208
|
+
status,
|
|
209
|
+
warnings: [...new Set(warnings)],
|
|
210
|
+
defaultSearch,
|
|
211
|
+
reviewedAt: new Date().toISOString(),
|
|
212
|
+
reviewNotes: typeof payload?.reviewNotes === "string" ? payload.reviewNotes.slice(0, 500) : "",
|
|
213
|
+
};
|
|
214
|
+
reviewed.approvedSource = status === "approved" ? reviewedSourceFromCandidate(reviewed) : null;
|
|
215
|
+
registry.candidates[repo] = reviewed;
|
|
216
|
+
registry.updatedAt = reviewed.reviewedAt;
|
|
217
|
+
await writeDiscoveryRegistry(ctx, registry);
|
|
218
|
+
return { candidate: publicCandidate(reviewed), source: reviewed.approvedSource, warnings: reviewed.warnings };
|
|
219
|
+
}
|
|
220
|
+
|
|
221
|
+
export async function listReviewedDiscoverySources(ctx, { defaultSearchOnly = false } = {}) {
|
|
222
|
+
const registry = await readDiscoveryRegistry(ctx);
|
|
223
|
+
return Object.values(registry.candidates)
|
|
224
|
+
.filter((candidate: any) => candidate.status === "approved" && candidate.approvedSource)
|
|
225
|
+
.map((candidate: any) => candidate.approvedSource)
|
|
226
|
+
.filter((source) => !defaultSearchOnly || source.defaultSearch);
|
|
227
|
+
}
|
|
228
|
+
|
|
229
|
+
export async function getReviewedDiscoverySource(ctx, sourceId) {
|
|
230
|
+
const sources = await listReviewedDiscoverySources(ctx);
|
|
231
|
+
return sources.find((source) => source.id === sourceId) || null;
|
|
232
|
+
}
|
|
233
|
+
|
|
234
|
+
export async function getDefaultReviewedDiscoverySources(ctx) {
|
|
235
|
+
return listReviewedDiscoverySources(ctx, { defaultSearchOnly: true });
|
|
236
|
+
}
|
|
@@ -1,16 +1,16 @@
|
|
|
1
1
|
export class PromptImportError extends Error {
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
2
|
+
code;
|
|
3
|
+
status;
|
|
4
|
+
constructor(code, message, status = 400) {
|
|
5
|
+
super(message);
|
|
6
|
+
this.name = "PromptImportError";
|
|
7
|
+
this.code = code;
|
|
8
|
+
this.status = status;
|
|
9
|
+
}
|
|
8
10
|
}
|
|
9
|
-
|
|
10
11
|
export function promptImportError(code, message, status = 400) {
|
|
11
|
-
|
|
12
|
+
return new PromptImportError(code, message, status);
|
|
12
13
|
}
|
|
13
|
-
|
|
14
14
|
export function isPromptImportError(error) {
|
|
15
|
-
|
|
15
|
+
return error instanceof PromptImportError || Boolean(error?.code && error?.status);
|
|
16
16
|
}
|
|
@@ -0,0 +1,18 @@
|
|
|
1
|
+
export class PromptImportError extends Error {
|
|
2
|
+
code: any;
|
|
3
|
+
status: any;
|
|
4
|
+
constructor(code, message, status = 400) {
|
|
5
|
+
super(message);
|
|
6
|
+
this.name = "PromptImportError";
|
|
7
|
+
this.code = code;
|
|
8
|
+
this.status = status;
|
|
9
|
+
}
|
|
10
|
+
}
|
|
11
|
+
|
|
12
|
+
export function promptImportError(code, message, status = 400) {
|
|
13
|
+
return new PromptImportError(code, message, status);
|
|
14
|
+
}
|
|
15
|
+
|
|
16
|
+
export function isPromptImportError(error) {
|
|
17
|
+
return error instanceof PromptImportError || Boolean(error?.code && error?.status);
|
|
18
|
+
}
|