ima2-gen 1.1.21 → 1.1.23
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 +44 -7
- package/bin/commands/video.js +14 -0
- package/bin/ima2.js +14 -4
- package/bin/lib/platform.js +34 -5
- package/docs/README.ko.md +43 -2
- package/lib/agentQueueWorker.js +6 -0
- package/lib/agentRuntime.js +3 -2
- package/lib/atomicWrite.js +14 -0
- package/lib/grokImageAdapter.js +6 -0
- package/lib/grokProxyLauncher.js +5 -3
- package/lib/grokVideoAdapter.js +1 -1
- package/lib/grokVideoPlannerPrompt.js +10 -0
- package/lib/inflight.js +1 -1
- package/lib/oauthLauncher.js +5 -0
- package/lib/videoFrameExtract.js +3 -3
- package/package.json +5 -7
- package/routes/capabilities.js +13 -0
- package/routes/edit.js +2 -1
- package/routes/generate.js +32 -6
- package/routes/health.js +4 -3
- package/routes/multimode.js +2 -1
- package/routes/video.js +35 -3
- package/server.js +29 -2
- package/skills/ima2/SKILL.md +48 -6
- package/ui/dist/.vite/manifest.json +12 -12
- package/ui/dist/assets/{AgentWorkspace-B_hq9CLg.js → AgentWorkspace-C21zqdTZ.js} +1 -1
- package/ui/dist/assets/{CardNewsWorkspace-wD12J7qk.js → CardNewsWorkspace-BN-ga1lG.js} +1 -1
- package/ui/dist/assets/{NodeCanvas-CI_wuPMf.js → NodeCanvas-BbMa4IhI.js} +1 -1
- package/ui/dist/assets/{PromptBuilderPanel-CUTujJUV.js → PromptBuilderPanel-DRwBJRDQ.js} +1 -1
- package/ui/dist/assets/{PromptImportDialog-CUi66jPK.js → PromptImportDialog-Dp85kHCq.js} +2 -2
- package/ui/dist/assets/{PromptImportDiscoverySection-Cm3vrjY4.js → PromptImportDiscoverySection-BE8Q8MLD.js} +1 -1
- package/ui/dist/assets/{PromptImportFolderSection-DOtWTD9n.js → PromptImportFolderSection-PtH5x0sc.js} +1 -1
- package/ui/dist/assets/{PromptLibraryPanel-BMjQegRa.js → PromptLibraryPanel-FnM9tHI9.js} +2 -2
- package/ui/dist/assets/SettingsWorkspace-MARPGyBL.js +1 -0
- package/ui/dist/assets/index-BAFI6htx.js +42 -0
- package/ui/dist/assets/{index-31uVIdt4.js → index-BSXxr_Bt.js} +1 -1
- package/ui/dist/assets/index-DS-ADE7U.css +1 -0
- package/ui/dist/index.html +2 -2
- package/bin/commands/annotate.ts +0 -119
- package/bin/commands/cancel.ts +0 -48
- package/bin/commands/canvas-versions.ts +0 -80
- package/bin/commands/capabilities.ts +0 -110
- package/bin/commands/cardnews.ts +0 -249
- package/bin/commands/comfy.ts +0 -54
- package/bin/commands/config.ts +0 -186
- package/bin/commands/defaults.ts +0 -192
- package/bin/commands/doctor.ts +0 -202
- package/bin/commands/edit.ts +0 -150
- package/bin/commands/gen.ts +0 -214
- package/bin/commands/grok.ts +0 -90
- package/bin/commands/history.ts +0 -146
- package/bin/commands/ls.ts +0 -64
- package/bin/commands/metadata.ts +0 -39
- package/bin/commands/multimode.ts +0 -196
- package/bin/commands/node.ts +0 -166
- package/bin/commands/observability.ts +0 -176
- package/bin/commands/ping.ts +0 -31
- package/bin/commands/prompt-sub/build.ts +0 -101
- package/bin/commands/prompt.ts +0 -492
- package/bin/commands/ps.ts +0 -81
- package/bin/commands/session.ts +0 -266
- package/bin/commands/show.ts +0 -72
- package/bin/commands/skill.ts +0 -70
- package/bin/commands/video.ts +0 -442
- package/bin/ima2.ts +0 -430
- package/bin/lib/args.ts +0 -92
- package/bin/lib/browser-id.ts +0 -16
- package/bin/lib/client.ts +0 -122
- package/bin/lib/config-store.ts +0 -120
- package/bin/lib/destructive-confirm.ts +0 -19
- package/bin/lib/doctor-checks.ts +0 -91
- package/bin/lib/error-hints.ts +0 -23
- package/bin/lib/files.ts +0 -39
- package/bin/lib/output.ts +0 -73
- package/bin/lib/platform.ts +0 -99
- package/bin/lib/recover-output.ts +0 -139
- package/bin/lib/sse.ts +0 -73
- package/bin/lib/star-prompt.ts +0 -97
- package/bin/lib/storage-doctor.ts +0 -39
- package/bin/lib/ui-build.ts +0 -85
- package/config.ts +0 -354
- package/lib/agentCommandParser.ts +0 -69
- package/lib/agentGenerationPlanner.ts +0 -273
- package/lib/agentQuestionResponder.ts +0 -266
- package/lib/agentQueueStore.ts +0 -270
- package/lib/agentQueueWorker.ts +0 -89
- package/lib/agentRuntime.ts +0 -604
- package/lib/agentSettings.ts +0 -72
- package/lib/agentStore.ts +0 -422
- package/lib/agentStoreRows.ts +0 -136
- package/lib/agentTypes.ts +0 -154
- package/lib/apiCachePolicy.ts +0 -11
- package/lib/assetLifecycle.ts +0 -146
- package/lib/canvasVersionStore.ts +0 -223
- package/lib/capabilities.ts +0 -126
- package/lib/cardNewsGenerator.ts +0 -271
- package/lib/cardNewsJobStore.ts +0 -142
- package/lib/cardNewsManifestStore.ts +0 -154
- package/lib/cardNewsPlanner.ts +0 -236
- package/lib/cardNewsPlannerClient.ts +0 -155
- package/lib/cardNewsPlannerPrompt.ts +0 -62
- package/lib/cardNewsPlannerSchema.ts +0 -321
- package/lib/cardNewsRoleTemplateStore.ts +0 -47
- package/lib/cardNewsTemplateStore.ts +0 -252
- package/lib/codexDetect.ts +0 -71
- package/lib/comfyBridge.ts +0 -235
- package/lib/composerSnapshot.ts +0 -33
- package/lib/configKeys.ts +0 -62
- package/lib/db.ts +0 -295
- package/lib/errInfo.ts +0 -43
- package/lib/errorClassify.ts +0 -100
- package/lib/generationCancel.ts +0 -28
- package/lib/generationErrors.ts +0 -238
- package/lib/grokImageAdapter.ts +0 -513
- package/lib/grokMultimodeAdapter.ts +0 -84
- package/lib/grokProxyLauncher.ts +0 -153
- package/lib/grokRuntime.ts +0 -23
- package/lib/grokSizeMapper.ts +0 -71
- package/lib/grokVideoAdapter.ts +0 -458
- package/lib/grokVideoCanvas.ts +0 -26
- package/lib/grokVideoDownload.ts +0 -59
- package/lib/grokVideoPlannerPrompt.ts +0 -67
- package/lib/historyIndex.ts +0 -51
- package/lib/historyList.ts +0 -181
- package/lib/imageMetadata.ts +0 -113
- package/lib/imageMetadataStore.ts +0 -67
- package/lib/imageModels.ts +0 -165
- package/lib/inflight.ts +0 -281
- package/lib/localImportStore.ts +0 -114
- package/lib/logger.ts +0 -161
- package/lib/nodeStore.ts +0 -91
- package/lib/oauthLauncher.ts +0 -94
- package/lib/oauthNormalize.ts +0 -30
- package/lib/oauthProxy/errors.ts +0 -128
- package/lib/oauthProxy/generators.ts +0 -494
- package/lib/oauthProxy/index.ts +0 -28
- package/lib/oauthProxy/prompts.ts +0 -123
- package/lib/oauthProxy/references.ts +0 -45
- package/lib/oauthProxy/runtime.ts +0 -115
- package/lib/oauthProxy/streams.ts +0 -232
- package/lib/oauthProxy/types.ts +0 -9
- package/lib/oauthProxy.ts +0 -3
- package/lib/openDirectory.ts +0 -47
- package/lib/pngInfo.ts +0 -26
- package/lib/promptBuilder/attachments.ts +0 -74
- package/lib/promptBuilder/client.ts +0 -130
- package/lib/promptBuilder/constants.ts +0 -9
- package/lib/promptBuilder/context.ts +0 -36
- package/lib/promptBuilder/errors.ts +0 -12
- package/lib/promptBuilder/requestSchema.ts +0 -56
- package/lib/promptBuilder/responseParser.ts +0 -219
- package/lib/promptBuilder/systemPrompt.ts +0 -135
- package/lib/promptBuilder/transport.ts +0 -94
- package/lib/promptBuilder/types.ts +0 -109
- package/lib/promptImport/curatedSources.ts +0 -141
- package/lib/promptImport/discoveryRegistry.ts +0 -329
- package/lib/promptImport/errors.ts +0 -18
- package/lib/promptImport/githubDiscovery.ts +0 -309
- package/lib/promptImport/githubFolder.ts +0 -397
- package/lib/promptImport/githubSource.ts +0 -257
- package/lib/promptImport/gptImageHints.ts +0 -70
- package/lib/promptImport/parsePromptCandidates.ts +0 -179
- package/lib/promptImport/promptIndex.ts +0 -326
- package/lib/promptImport/rankPromptCandidates.ts +0 -65
- package/lib/promptImport/types.ts +0 -103
- package/lib/promptSafetyPolicy.ts +0 -5
- package/lib/providerOptions.ts +0 -56
- package/lib/referenceImageCompress.ts +0 -84
- package/lib/refs.ts +0 -133
- package/lib/requestLogger.ts +0 -49
- package/lib/responsesDoctor.ts +0 -456
- package/lib/responsesErrors.ts +0 -83
- package/lib/responsesFallback.ts +0 -114
- package/lib/responsesImageAdapter.ts +0 -466
- package/lib/responsesParse.ts +0 -452
- package/lib/responsesTools.ts +0 -28
- package/lib/runtimeContext.ts +0 -146
- package/lib/runtimePorts.ts +0 -105
- package/lib/sessionStore.ts +0 -308
- package/lib/storageMigration.ts +0 -310
- package/lib/styleSheet.ts +0 -139
- package/lib/systemTrash.ts +0 -20
- package/lib/videoContinuity.ts +0 -180
- package/lib/videoFrameExtract.ts +0 -78
- package/lib/videoSeriesChain.ts +0 -29
- package/lib/visibleTextLanguagePolicy.ts +0 -7
- package/routes/agent.ts +0 -308
- package/routes/annotations.ts +0 -118
- package/routes/canvasVersions.ts +0 -69
- package/routes/capabilities.ts +0 -18
- package/routes/cardNews.ts +0 -211
- package/routes/comfy.ts +0 -43
- package/routes/edit.ts +0 -352
- package/routes/generate.ts +0 -492
- package/routes/grok.ts +0 -24
- package/routes/health.ts +0 -123
- package/routes/history.ts +0 -221
- package/routes/imageImport.ts +0 -37
- package/routes/index.ts +0 -52
- package/routes/metadata.ts +0 -77
- package/routes/multimode.ts +0 -499
- package/routes/nodes.ts +0 -578
- package/routes/promptBuilder.ts +0 -37
- package/routes/promptImport.ts +0 -379
- package/routes/prompts.ts +0 -428
- package/routes/quota.ts +0 -89
- package/routes/sessions.ts +0 -317
- package/routes/storage.ts +0 -47
- package/routes/video.ts +0 -300
- package/routes/videoExtended.ts +0 -284
- package/server.ts +0 -293
- package/ui/dist/assets/SettingsWorkspace-PiaVnsdA.js +0 -1
- package/ui/dist/assets/index-CjgnNtgt.css +0 -1
- package/ui/dist/assets/index-Da2s4_-5.js +0 -36
package/lib/apiCachePolicy.ts
DELETED
|
@@ -1,11 +0,0 @@
|
|
|
1
|
-
import type { Express, NextFunction, Request, Response } from "express";
|
|
2
|
-
|
|
3
|
-
export function setApiNoStoreHeaders(_req: Request, res: Response, next: NextFunction) {
|
|
4
|
-
res.setHeader("Cache-Control", "no-store, max-age=0");
|
|
5
|
-
next();
|
|
6
|
-
}
|
|
7
|
-
|
|
8
|
-
export function configureApiCachePolicy(app: Express) {
|
|
9
|
-
app.set("etag", false);
|
|
10
|
-
app.use("/api", setApiNoStoreHeaders);
|
|
11
|
-
}
|
package/lib/assetLifecycle.ts
DELETED
|
@@ -1,146 +0,0 @@
|
|
|
1
|
-
import { getDb } from "./db.js";
|
|
2
|
-
import { mkdir, rename, unlink, access } from "fs/promises";
|
|
3
|
-
import { resolve, sep } from "path";
|
|
4
|
-
import { moveToSystemTrash } from "./systemTrash.js";
|
|
5
|
-
import { config } from "../config.js";
|
|
6
|
-
|
|
7
|
-
function resolveInGenerated(rootDir: string, relPath: string): string {
|
|
8
|
-
void rootDir;
|
|
9
|
-
if (typeof relPath !== "string" || relPath.length === 0) {
|
|
10
|
-
const err: any = new Error("filename required");
|
|
11
|
-
err.status = 400;
|
|
12
|
-
err.code = "INVALID_FILENAME";
|
|
13
|
-
throw err;
|
|
14
|
-
}
|
|
15
|
-
if (relPath.includes("\0")) {
|
|
16
|
-
const err: any = new Error("invalid filename");
|
|
17
|
-
err.status = 400;
|
|
18
|
-
err.code = "INVALID_FILENAME";
|
|
19
|
-
throw err;
|
|
20
|
-
}
|
|
21
|
-
const baseDir = resolve(config.storage.generatedDir);
|
|
22
|
-
const target = resolve(baseDir, relPath);
|
|
23
|
-
if (target !== baseDir && !target.startsWith(baseDir + sep)) {
|
|
24
|
-
const err: any = new Error("filename escapes generated/");
|
|
25
|
-
err.status = 400;
|
|
26
|
-
err.code = "INVALID_FILENAME";
|
|
27
|
-
throw err;
|
|
28
|
-
}
|
|
29
|
-
return target;
|
|
30
|
-
}
|
|
31
|
-
|
|
32
|
-
function nodesReferencingFilename(filename: string): Array<{ sessionId: string; id: string; data: string }> {
|
|
33
|
-
// The client stores imageUrl as `/generated/<encoded filename>` in node data JSON.
|
|
34
|
-
// We scan all sessions' nodes for substring match on the decoded and encoded forms.
|
|
35
|
-
const db = getDb();
|
|
36
|
-
const encoded = encodeURIComponent(filename);
|
|
37
|
-
const rows = db
|
|
38
|
-
.prepare("SELECT session_id AS sessionId, id, data FROM nodes WHERE data LIKE ? OR data LIKE ?")
|
|
39
|
-
.all(`%${filename}%`, `%${encoded}%`) as Array<{ sessionId: string; id: string; data: string }>;
|
|
40
|
-
return rows;
|
|
41
|
-
}
|
|
42
|
-
|
|
43
|
-
function markNodesAssetMissing(filename: string) {
|
|
44
|
-
const db = getDb();
|
|
45
|
-
const rows = nodesReferencingFilename(filename);
|
|
46
|
-
if (rows.length === 0) return { sessionsTouched: 0, nodesTouched: 0 };
|
|
47
|
-
const touchedSessions = new Set<string>();
|
|
48
|
-
const update = db.prepare("UPDATE nodes SET data = ? WHERE session_id = ? AND id = ?");
|
|
49
|
-
const bumpSession = db.prepare("UPDATE sessions SET graph_version = graph_version + 1, updated_at = ? WHERE id = ?");
|
|
50
|
-
const tx = db.transaction(() => {
|
|
51
|
-
for (const r of rows) {
|
|
52
|
-
let data;
|
|
53
|
-
try { data = JSON.parse(r.data); } catch { data = {}; }
|
|
54
|
-
const imgRef = data?.imageUrl || "";
|
|
55
|
-
if (imgRef.includes(filename) || imgRef.includes(encodeURIComponent(filename))) {
|
|
56
|
-
data.imageUrl = null;
|
|
57
|
-
data.status = "asset-missing";
|
|
58
|
-
update.run(JSON.stringify(data), r.sessionId, r.id);
|
|
59
|
-
touchedSessions.add(r.sessionId);
|
|
60
|
-
}
|
|
61
|
-
}
|
|
62
|
-
const t = Date.now();
|
|
63
|
-
for (const sid of touchedSessions) bumpSession.run(t, sid);
|
|
64
|
-
});
|
|
65
|
-
tx();
|
|
66
|
-
return { sessionsTouched: touchedSessions.size, nodesTouched: rows.length };
|
|
67
|
-
}
|
|
68
|
-
|
|
69
|
-
export async function trashAsset(rootDir: string, filename: string) {
|
|
70
|
-
const src = resolveInGenerated(rootDir, filename);
|
|
71
|
-
try {
|
|
72
|
-
await access(src);
|
|
73
|
-
} catch {
|
|
74
|
-
const err: any = new Error("Asset not found");
|
|
75
|
-
err.status = 404;
|
|
76
|
-
err.code = "ASSET_NOT_FOUND";
|
|
77
|
-
throw err;
|
|
78
|
-
}
|
|
79
|
-
|
|
80
|
-
const sidecar = `${src}.json`;
|
|
81
|
-
const paths = [src];
|
|
82
|
-
try {
|
|
83
|
-
await access(sidecar);
|
|
84
|
-
paths.push(sidecar);
|
|
85
|
-
} catch {}
|
|
86
|
-
|
|
87
|
-
let trashMethod: "system" | "internal" = "system";
|
|
88
|
-
try {
|
|
89
|
-
await moveToSystemTrash(paths);
|
|
90
|
-
} catch {
|
|
91
|
-
trashMethod = "internal";
|
|
92
|
-
const trashDir = resolve(config.storage.trashDir);
|
|
93
|
-
await mkdir(trashDir, { recursive: true });
|
|
94
|
-
const trashId = `${Date.now()}_${filename}`;
|
|
95
|
-
for (const p of paths) {
|
|
96
|
-
const dest = resolve(trashDir, p.endsWith(".json") ? `${trashId}.json` : trashId);
|
|
97
|
-
await rename(p, dest);
|
|
98
|
-
}
|
|
99
|
-
}
|
|
100
|
-
|
|
101
|
-
const summary = markNodesAssetMissing(filename);
|
|
102
|
-
return {
|
|
103
|
-
ok: true,
|
|
104
|
-
filename,
|
|
105
|
-
trash: trashMethod,
|
|
106
|
-
undoableInApp: false,
|
|
107
|
-
sessionsTouched: summary.sessionsTouched,
|
|
108
|
-
nodesTouched: summary.nodesTouched,
|
|
109
|
-
};
|
|
110
|
-
}
|
|
111
|
-
|
|
112
|
-
export async function deleteAssetPermanent(rootDir: string, filename: string) {
|
|
113
|
-
const src = resolveInGenerated(rootDir, filename);
|
|
114
|
-
try {
|
|
115
|
-
await access(src);
|
|
116
|
-
} catch {
|
|
117
|
-
const err: any = new Error("Asset not found");
|
|
118
|
-
err.status = 404;
|
|
119
|
-
err.code = "ASSET_NOT_FOUND";
|
|
120
|
-
throw err;
|
|
121
|
-
}
|
|
122
|
-
await unlink(src);
|
|
123
|
-
await unlink(src + ".json").catch(() => {});
|
|
124
|
-
const summary = markNodesAssetMissing(filename);
|
|
125
|
-
return {
|
|
126
|
-
ok: true,
|
|
127
|
-
filename,
|
|
128
|
-
sessionsTouched: summary.sessionsTouched,
|
|
129
|
-
nodesTouched: summary.nodesTouched,
|
|
130
|
-
};
|
|
131
|
-
}
|
|
132
|
-
|
|
133
|
-
export async function restoreAsset(rootDir: string, trashId: string, originalFilename: string) {
|
|
134
|
-
void rootDir;
|
|
135
|
-
const trashDir = resolve(config.storage.trashDir);
|
|
136
|
-
const src = resolve(trashDir, trashId);
|
|
137
|
-
if (!src.startsWith(trashDir + sep) && src !== trashDir) {
|
|
138
|
-
const err: any = new Error("invalid trashId");
|
|
139
|
-
err.status = 400;
|
|
140
|
-
throw err;
|
|
141
|
-
}
|
|
142
|
-
const dst = resolveInGenerated(rootDir, originalFilename);
|
|
143
|
-
await rename(src, dst);
|
|
144
|
-
await rename(src + ".json", dst + ".json").catch(() => {});
|
|
145
|
-
return { ok: true };
|
|
146
|
-
}
|
|
@@ -1,223 +0,0 @@
|
|
|
1
|
-
import { mkdir, writeFile, access, readFile } from "fs/promises";
|
|
2
|
-
import { constants } from "fs";
|
|
3
|
-
import { basename, join, normalize, parse } from "path";
|
|
4
|
-
import { randomBytes } from "crypto";
|
|
5
|
-
import { embedImageMetadataBestEffort } from "./imageMetadataStore.js";
|
|
6
|
-
import { invalidateHistoryIndex } from "./historyIndex.js";
|
|
7
|
-
import type { RuntimeContext } from "./runtimeContext.js";
|
|
8
|
-
|
|
9
|
-
interface CanvasMeta {
|
|
10
|
-
kind: string;
|
|
11
|
-
provider: string;
|
|
12
|
-
format: string;
|
|
13
|
-
prompt: string | null | undefined;
|
|
14
|
-
userPrompt: string | null | undefined;
|
|
15
|
-
promptMode: string;
|
|
16
|
-
createdAt: number;
|
|
17
|
-
canvasMergedAt: number;
|
|
18
|
-
canvasVersion: boolean;
|
|
19
|
-
canvasSourceFilename: string | null;
|
|
20
|
-
canvasEditableFilename: string;
|
|
21
|
-
size?: string | null;
|
|
22
|
-
quality?: string | null;
|
|
23
|
-
model?: string | null;
|
|
24
|
-
moderation?: string | null;
|
|
25
|
-
revisedPrompt?: string | null;
|
|
26
|
-
}
|
|
27
|
-
|
|
28
|
-
interface StoredGeneratedMeta {
|
|
29
|
-
prompt?: string | null;
|
|
30
|
-
userPrompt?: string | null;
|
|
31
|
-
promptMode?: string | null;
|
|
32
|
-
provider?: string | null;
|
|
33
|
-
quality?: string | null;
|
|
34
|
-
size?: string | null;
|
|
35
|
-
model?: string | null;
|
|
36
|
-
moderation?: string | null;
|
|
37
|
-
createdAt?: number;
|
|
38
|
-
canvasMergedAt?: number;
|
|
39
|
-
canvasSourceFilename?: string | null;
|
|
40
|
-
}
|
|
41
|
-
|
|
42
|
-
interface CanvasInput {
|
|
43
|
-
buffer: unknown;
|
|
44
|
-
sourceFilename?: string | null;
|
|
45
|
-
prompt?: string | null;
|
|
46
|
-
}
|
|
47
|
-
|
|
48
|
-
const PNG_SIGNATURE = "89504e470d0a1a0a";
|
|
49
|
-
|
|
50
|
-
function assertPngBuffer(buffer: unknown): asserts buffer is Buffer {
|
|
51
|
-
if (!Buffer.isBuffer(buffer) || buffer.length === 0) {
|
|
52
|
-
const err: any = new Error("PNG body is required");
|
|
53
|
-
err.status = 400;
|
|
54
|
-
err.code = "EMPTY_CANVAS_VERSION";
|
|
55
|
-
throw err;
|
|
56
|
-
}
|
|
57
|
-
if (buffer.subarray(0, 8).toString("hex") !== PNG_SIGNATURE) {
|
|
58
|
-
const err: any = new Error("Canvas version body must be a PNG image");
|
|
59
|
-
err.status = 400;
|
|
60
|
-
err.code = "CANVAS_VERSION_NOT_PNG";
|
|
61
|
-
throw err;
|
|
62
|
-
}
|
|
63
|
-
}
|
|
64
|
-
|
|
65
|
-
function assertSafeFilename(filename: string) {
|
|
66
|
-
if (
|
|
67
|
-
typeof filename !== "string" ||
|
|
68
|
-
filename.length === 0 ||
|
|
69
|
-
filename !== basename(filename) ||
|
|
70
|
-
filename.includes("..") ||
|
|
71
|
-
!/^canvas-[a-zA-Z0-9._-]+\.png$/.test(filename)
|
|
72
|
-
) {
|
|
73
|
-
const err: any = new Error("Invalid canvas version filename");
|
|
74
|
-
err.status = 400;
|
|
75
|
-
err.code = "INVALID_CANVAS_VERSION_FILENAME";
|
|
76
|
-
throw err;
|
|
77
|
-
}
|
|
78
|
-
}
|
|
79
|
-
|
|
80
|
-
function safeSourceBase(sourceFilename: string | null | undefined) {
|
|
81
|
-
const parsed = parse(basename(String(sourceFilename || "image")));
|
|
82
|
-
return parsed.name.replace(/[^a-zA-Z0-9_-]+/g, "-").replace(/^-+|-+$/g, "").slice(0, 80) || "image";
|
|
83
|
-
}
|
|
84
|
-
|
|
85
|
-
function ensureInsideGeneratedDir(generatedDir: string, filename: string) {
|
|
86
|
-
const full = normalize(join(generatedDir, filename));
|
|
87
|
-
const root = normalize(generatedDir);
|
|
88
|
-
if (!full.startsWith(root)) {
|
|
89
|
-
const err: any = new Error("Canvas version path escapes generated directory");
|
|
90
|
-
err.status = 400;
|
|
91
|
-
err.code = "CANVAS_VERSION_PATH_ESCAPE";
|
|
92
|
-
throw err;
|
|
93
|
-
}
|
|
94
|
-
return full;
|
|
95
|
-
}
|
|
96
|
-
|
|
97
|
-
function makeCanvasFilename(sourceFilename: string | null | undefined) {
|
|
98
|
-
const stamp = new Date().toISOString().slice(0, 19).replace(/[-:T]/g, "");
|
|
99
|
-
const rand = randomBytes(3).toString("hex");
|
|
100
|
-
return `canvas-${safeSourceBase(sourceFilename)}-${stamp}-${rand}.png`;
|
|
101
|
-
}
|
|
102
|
-
|
|
103
|
-
async function writeCanvasPng(ctx: RuntimeContext, filename: string, buffer: Buffer, meta: CanvasMeta) {
|
|
104
|
-
await mkdir(ctx.config.storage.generatedDir, { recursive: true });
|
|
105
|
-
const full = ensureInsideGeneratedDir(ctx.config.storage.generatedDir, filename);
|
|
106
|
-
const embedded = await embedImageMetadataBestEffort(buffer, "png", meta, {
|
|
107
|
-
version: ctx.packageVersion,
|
|
108
|
-
});
|
|
109
|
-
await writeFile(full, embedded.buffer);
|
|
110
|
-
await writeFile(`${full}.json`, JSON.stringify(meta)).catch(() => {});
|
|
111
|
-
invalidateHistoryIndex();
|
|
112
|
-
}
|
|
113
|
-
|
|
114
|
-
async function readGeneratedMetadata(ctx: RuntimeContext, filename: string | null | undefined): Promise<StoredGeneratedMeta | null> {
|
|
115
|
-
if (!filename) return null;
|
|
116
|
-
try {
|
|
117
|
-
const full = ensureInsideGeneratedDir(ctx.config.storage.generatedDir, basename(filename));
|
|
118
|
-
return JSON.parse(await readFile(`${full}.json`, "utf8")) as StoredGeneratedMeta;
|
|
119
|
-
} catch {
|
|
120
|
-
return null;
|
|
121
|
-
}
|
|
122
|
-
}
|
|
123
|
-
|
|
124
|
-
function firstString(...values: Array<string | null | undefined>) {
|
|
125
|
-
return values.find((value) => typeof value === "string" && value.trim().length > 0) ?? null;
|
|
126
|
-
}
|
|
127
|
-
|
|
128
|
-
function toGenerateItem(filename: string, meta: CanvasMeta) {
|
|
129
|
-
const url = `/generated/${encodeURIComponent(filename)}`;
|
|
130
|
-
return {
|
|
131
|
-
image: url,
|
|
132
|
-
url,
|
|
133
|
-
thumb: url,
|
|
134
|
-
filename,
|
|
135
|
-
prompt: meta.prompt || undefined,
|
|
136
|
-
userPrompt: meta.userPrompt || meta.prompt || null,
|
|
137
|
-
revisedPrompt: null,
|
|
138
|
-
promptMode: meta.promptMode || "direct",
|
|
139
|
-
provider: meta.provider || "canvas",
|
|
140
|
-
quality: meta.quality || null,
|
|
141
|
-
size: meta.size || null,
|
|
142
|
-
format: "png",
|
|
143
|
-
moderation: meta.moderation || null,
|
|
144
|
-
model: meta.model || null,
|
|
145
|
-
usage: null,
|
|
146
|
-
createdAt: meta.createdAt,
|
|
147
|
-
kind: "edit",
|
|
148
|
-
canvasMergedAt: meta.canvasMergedAt,
|
|
149
|
-
canvasVersion: true,
|
|
150
|
-
canvasSourceFilename: meta.canvasSourceFilename || null,
|
|
151
|
-
canvasEditableFilename: filename,
|
|
152
|
-
};
|
|
153
|
-
}
|
|
154
|
-
|
|
155
|
-
export async function createCanvasVersion(ctx: RuntimeContext, input: CanvasInput) {
|
|
156
|
-
assertPngBuffer(input.buffer);
|
|
157
|
-
const sourceFilename = basename(String(input.sourceFilename || ""));
|
|
158
|
-
if (!sourceFilename) {
|
|
159
|
-
const err: any = new Error("sourceFilename is required");
|
|
160
|
-
err.status = 400;
|
|
161
|
-
err.code = "CANVAS_SOURCE_REQUIRED";
|
|
162
|
-
throw err;
|
|
163
|
-
}
|
|
164
|
-
const filename = makeCanvasFilename(sourceFilename);
|
|
165
|
-
const now = Date.now();
|
|
166
|
-
const sourceMeta = await readGeneratedMetadata(ctx, sourceFilename);
|
|
167
|
-
const prompt = firstString(input.prompt, sourceMeta?.userPrompt, sourceMeta?.prompt);
|
|
168
|
-
const meta = {
|
|
169
|
-
kind: "edit",
|
|
170
|
-
provider: "canvas",
|
|
171
|
-
format: "png",
|
|
172
|
-
prompt,
|
|
173
|
-
userPrompt: prompt,
|
|
174
|
-
promptMode: sourceMeta?.promptMode || "direct",
|
|
175
|
-
createdAt: now,
|
|
176
|
-
canvasMergedAt: now,
|
|
177
|
-
canvasVersion: true,
|
|
178
|
-
canvasSourceFilename: sourceFilename,
|
|
179
|
-
canvasEditableFilename: filename,
|
|
180
|
-
};
|
|
181
|
-
await writeCanvasPng(ctx, filename, input.buffer, meta);
|
|
182
|
-
return toGenerateItem(filename, meta);
|
|
183
|
-
}
|
|
184
|
-
|
|
185
|
-
export async function updateCanvasVersion(ctx: RuntimeContext, filename: string, input: CanvasInput) {
|
|
186
|
-
assertSafeFilename(filename);
|
|
187
|
-
assertPngBuffer(input.buffer);
|
|
188
|
-
const full = ensureInsideGeneratedDir(ctx.config.storage.generatedDir, filename);
|
|
189
|
-
await access(full, constants.F_OK).catch(() => {
|
|
190
|
-
const err: any = new Error("Canvas version not found");
|
|
191
|
-
err.status = 404;
|
|
192
|
-
err.code = "CANVAS_VERSION_NOT_FOUND";
|
|
193
|
-
throw err;
|
|
194
|
-
});
|
|
195
|
-
const now = Date.now();
|
|
196
|
-
const sourceFilename = typeof input.sourceFilename === "string"
|
|
197
|
-
? basename(input.sourceFilename)
|
|
198
|
-
: null;
|
|
199
|
-
const sourceMeta = await readGeneratedMetadata(ctx, sourceFilename);
|
|
200
|
-
const previousMeta = await readGeneratedMetadata(ctx, filename);
|
|
201
|
-
const prompt = firstString(
|
|
202
|
-
input.prompt,
|
|
203
|
-
sourceMeta?.userPrompt,
|
|
204
|
-
sourceMeta?.prompt,
|
|
205
|
-
previousMeta?.userPrompt,
|
|
206
|
-
previousMeta?.prompt,
|
|
207
|
-
);
|
|
208
|
-
const meta = {
|
|
209
|
-
kind: "edit",
|
|
210
|
-
provider: "canvas",
|
|
211
|
-
format: "png",
|
|
212
|
-
prompt,
|
|
213
|
-
userPrompt: prompt,
|
|
214
|
-
promptMode: sourceMeta?.promptMode || previousMeta?.promptMode || "direct",
|
|
215
|
-
createdAt: now,
|
|
216
|
-
canvasMergedAt: now,
|
|
217
|
-
canvasVersion: true,
|
|
218
|
-
canvasSourceFilename: sourceFilename,
|
|
219
|
-
canvasEditableFilename: filename,
|
|
220
|
-
};
|
|
221
|
-
await writeCanvasPng(ctx, filename, input.buffer, meta);
|
|
222
|
-
return toGenerateItem(filename, meta);
|
|
223
|
-
}
|
package/lib/capabilities.ts
DELETED
|
@@ -1,126 +0,0 @@
|
|
|
1
|
-
import { config as runtimeConfigDefault } from "../config.js";
|
|
2
|
-
import { KEY_TO_ENV, WRITABLE_CONFIG_KEYS } from "./configKeys.js";
|
|
3
|
-
import { DEFAULT_IMAGE_QUALITY, VALID_IMAGE_QUALITIES } from "./oauthNormalize.js";
|
|
4
|
-
import type { AppConfig } from "./runtimeContext.js";
|
|
5
|
-
|
|
6
|
-
type CapabilitySource = "local" | "server";
|
|
7
|
-
|
|
8
|
-
const MAX_GENERATED_IMAGES = 8;
|
|
9
|
-
const VALID_MODES = ["auto", "direct"] as const;
|
|
10
|
-
const VALID_PROVIDERS = ["auto", "oauth", "api", "grok"] as const;
|
|
11
|
-
const AGENT_COMMANDS = [
|
|
12
|
-
"skill",
|
|
13
|
-
"capabilities",
|
|
14
|
-
"defaults",
|
|
15
|
-
"gen",
|
|
16
|
-
"video",
|
|
17
|
-
"edit",
|
|
18
|
-
"multimode",
|
|
19
|
-
"node generate",
|
|
20
|
-
"inflight ls",
|
|
21
|
-
"providers",
|
|
22
|
-
"oauth status",
|
|
23
|
-
"grok status",
|
|
24
|
-
"prompt build",
|
|
25
|
-
];
|
|
26
|
-
|
|
27
|
-
function toArray<T>(value: Iterable<T> | T[] | undefined): T[] {
|
|
28
|
-
if (!value) return [];
|
|
29
|
-
if (Array.isArray(value)) return [...value];
|
|
30
|
-
return Array.from(value);
|
|
31
|
-
}
|
|
32
|
-
|
|
33
|
-
export function buildIma2Capabilities({
|
|
34
|
-
appConfig = runtimeConfigDefault,
|
|
35
|
-
packageVersion,
|
|
36
|
-
source,
|
|
37
|
-
server = null,
|
|
38
|
-
}: {
|
|
39
|
-
appConfig?: AppConfig;
|
|
40
|
-
packageVersion: string;
|
|
41
|
-
source: CapabilitySource;
|
|
42
|
-
server?: string | null;
|
|
43
|
-
}) {
|
|
44
|
-
return {
|
|
45
|
-
ok: true,
|
|
46
|
-
name: "ima2",
|
|
47
|
-
source,
|
|
48
|
-
server,
|
|
49
|
-
version: packageVersion,
|
|
50
|
-
commands: AGENT_COMMANDS,
|
|
51
|
-
defaults: {
|
|
52
|
-
oauth: {
|
|
53
|
-
model: appConfig.imageModels.default,
|
|
54
|
-
reasoningEffort: appConfig.imageModels.reasoningEffort,
|
|
55
|
-
},
|
|
56
|
-
api: {
|
|
57
|
-
model: appConfig.apiProvider.defaultImageModel,
|
|
58
|
-
reasoningEffort: appConfig.apiProvider.defaultReasoningEffort,
|
|
59
|
-
size: appConfig.apiProvider.defaultSize,
|
|
60
|
-
webSearchEnabled: appConfig.apiProvider.allowWebSearch,
|
|
61
|
-
},
|
|
62
|
-
grok: {
|
|
63
|
-
model: appConfig.grokProvider.defaultImageModel,
|
|
64
|
-
plannerModel: appConfig.grokProvider.plannerModel,
|
|
65
|
-
},
|
|
66
|
-
},
|
|
67
|
-
valid: {
|
|
68
|
-
imageModels: {
|
|
69
|
-
supported: toArray(appConfig.imageModels.valid),
|
|
70
|
-
unsupported: toArray(appConfig.imageModels.unsupported),
|
|
71
|
-
grokSupported: ["grok-imagine-image", "grok-imagine-image-quality"],
|
|
72
|
-
},
|
|
73
|
-
videoModels: {
|
|
74
|
-
supported: ["grok-imagine-video", "grok-imagine-video-1.5-preview"],
|
|
75
|
-
resolutions: ["480p", "720p"],
|
|
76
|
-
aspectRatios: ["1:1", "16:9", "9:16", "4:3", "3:4", "3:2", "2:3", "auto"],
|
|
77
|
-
durationRange: [1, 15],
|
|
78
|
-
maxReferences: 7,
|
|
79
|
-
},
|
|
80
|
-
reasoningEfforts: toArray(appConfig.imageModels.validReasoningEfforts),
|
|
81
|
-
quality: toArray(VALID_IMAGE_QUALITIES),
|
|
82
|
-
moderation: toArray(appConfig.oauth.validModeration),
|
|
83
|
-
modes: [...VALID_MODES],
|
|
84
|
-
providers: [...VALID_PROVIDERS],
|
|
85
|
-
},
|
|
86
|
-
configKeys: {
|
|
87
|
-
writable: toArray(WRITABLE_CONFIG_KEYS),
|
|
88
|
-
envOverrides: { ...KEY_TO_ENV },
|
|
89
|
-
},
|
|
90
|
-
defaultsMeta: {
|
|
91
|
-
quality: DEFAULT_IMAGE_QUALITY,
|
|
92
|
-
},
|
|
93
|
-
limits: {
|
|
94
|
-
maxRefCount: appConfig.limits.maxRefCount,
|
|
95
|
-
maxGeneratedImages: MAX_GENERATED_IMAGES,
|
|
96
|
-
maxParallel: {
|
|
97
|
-
value: appConfig.limits.maxParallel,
|
|
98
|
-
enforced: false,
|
|
99
|
-
note: "advisory client-side queue guidance only; server-side semaphore is not enforced",
|
|
100
|
-
},
|
|
101
|
-
},
|
|
102
|
-
promptBuilder: {
|
|
103
|
-
available: true,
|
|
104
|
-
route: "/api/prompt-builder/chat",
|
|
105
|
-
cliCommand: "ima2 prompt build",
|
|
106
|
-
structuredOutput: ["intentSummary", "finalPrompt.ko", "finalPrompt.en", "notes"],
|
|
107
|
-
uiOnly: false,
|
|
108
|
-
},
|
|
109
|
-
agentMode: {
|
|
110
|
-
available: true,
|
|
111
|
-
route: "/api/agent/sessions",
|
|
112
|
-
allowedTools: ["ima2.get_image_context", "ima2.web_search", "ima2.generate_image"],
|
|
113
|
-
finalArtifact: "image",
|
|
114
|
-
uiOnly: true,
|
|
115
|
-
cliCommand: null,
|
|
116
|
-
},
|
|
117
|
-
guidance: {
|
|
118
|
-
highQuality: "Use --quality high for requests where output fidelity matters.",
|
|
119
|
-
parallelGeneration: "Run multiple ima2 gen commands as separate queued jobs; no --parallel flag is required.",
|
|
120
|
-
i2i: "Use --ref for reference generation, or ima2 edit <file> --prompt \"<text>\" for image edits.",
|
|
121
|
-
defaults: "Use ima2 defaults set model/reasoning for persistent defaults; request flags remain per-call overrides.",
|
|
122
|
-
promptBuilder: "Use ima2 prompt build --message \"...\" to refine prompt intent. Use ima2 gen / ima2 multimode to generate images. Workspace profile settings are UI-only.",
|
|
123
|
-
video: "Use ima2 video \"<prompt>\" to generate video. Prompts must describe visual flow, motion, sound/no-music, dialogue/no-dialogue, and ending frame. Use ima2 video continue \"<prompt>\" --video <generated.mp4> for branch-local last-frame continuation; --topic is legacy best-effort series context.",
|
|
124
|
-
},
|
|
125
|
-
};
|
|
126
|
-
}
|