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,176 @@
|
|
|
1
|
+
import { parseArgs } from "../lib/args.js";
|
|
2
|
+
import { resolveServer, request, normalizeGenerate } from "../lib/client.js";
|
|
3
|
+
import { fileToDataUri, dataUriToFile, defaultOutName, readStdin } from "../lib/files.js";
|
|
4
|
+
import { out, die, dieWithError, color, json } from "../lib/output.js";
|
|
5
|
+
import { config } from "../../config.js";
|
|
6
|
+
|
|
7
|
+
const VALID_MODES = new Set(["auto", "direct"]);
|
|
8
|
+
const VALID_MODERATION = new Set(["auto", "low"]);
|
|
9
|
+
const KNOWN_IMAGE_MODELS = new Set(["gpt-5.5", "gpt-5.4", "gpt-5.4-mini", "gpt-5.3-codex-spark"]);
|
|
10
|
+
|
|
11
|
+
const SPEC = {
|
|
12
|
+
flags: {
|
|
13
|
+
quality: { short: "q", type: "string", default: "low" },
|
|
14
|
+
size: { short: "s", type: "string", default: "1024x1024" },
|
|
15
|
+
count: { short: "n", type: "string", default: "1" },
|
|
16
|
+
ref: { type: "string", repeatable: true },
|
|
17
|
+
out: { short: "o", type: "string" },
|
|
18
|
+
"out-dir": { short: "d", type: "string" },
|
|
19
|
+
json: { type: "boolean" },
|
|
20
|
+
"no-save": { type: "boolean" },
|
|
21
|
+
force: { type: "boolean" },
|
|
22
|
+
stdin: { type: "boolean" },
|
|
23
|
+
timeout: { type: "string", default: "180" },
|
|
24
|
+
server: { type: "string" },
|
|
25
|
+
model: { type: "string" },
|
|
26
|
+
mode: { type: "string", default: "auto" },
|
|
27
|
+
moderation: { type: "string", default: "low" },
|
|
28
|
+
session: { type: "string" },
|
|
29
|
+
"reasoning-effort": { type: "string" },
|
|
30
|
+
"web-search": { type: "boolean" },
|
|
31
|
+
"no-web-search": { type: "boolean" },
|
|
32
|
+
help: { short: "h", type: "boolean" },
|
|
33
|
+
},
|
|
34
|
+
};
|
|
35
|
+
|
|
36
|
+
const HELP = `
|
|
37
|
+
ima2 gen <prompt...> [options]
|
|
38
|
+
|
|
39
|
+
Generate image(s) via the running ima2 server.
|
|
40
|
+
|
|
41
|
+
Options:
|
|
42
|
+
-q, --quality <low|medium|high> Default: low
|
|
43
|
+
-s, --size <WxH | auto> Default: 1024x1024
|
|
44
|
+
-n, --count <1..8> Default: 1
|
|
45
|
+
--ref <file> Attach reference image (repeatable, max 5)
|
|
46
|
+
-o, --out <file> Single-image output path (implies -n 1)
|
|
47
|
+
-d, --out-dir <dir> Output dir for multiple images
|
|
48
|
+
--json Print JSON result to stdout
|
|
49
|
+
--no-save Skip save; print b64 to stdout (use --force for TTY)
|
|
50
|
+
--stdin Read prompt from stdin
|
|
51
|
+
--timeout <sec> Default: 180
|
|
52
|
+
--server <url> Override server URL
|
|
53
|
+
--model <gpt-5.5|gpt-5.4|gpt-5.4-mini>
|
|
54
|
+
--mode <auto|direct> Prompt handling mode. Default: auto
|
|
55
|
+
--moderation <auto|low> Default: low
|
|
56
|
+
--session <id> Apply session style sheet if enabled
|
|
57
|
+
--reasoning-effort <none|low|medium|high|xhigh>
|
|
58
|
+
Override server's reasoning effort
|
|
59
|
+
--web-search / --no-web-search Override default web-search toggle
|
|
60
|
+
|
|
61
|
+
Examples:
|
|
62
|
+
ima2 gen "a shiba in space"
|
|
63
|
+
ima2 gen "poster" --model gpt-5.4 --mode direct --moderation low
|
|
64
|
+
ima2 gen "merge" --ref a.png --ref b.png -q high -o out.png
|
|
65
|
+
cat prompt.txt | ima2 gen --stdin -n 2 -d ./out
|
|
66
|
+
`;
|
|
67
|
+
|
|
68
|
+
export default async function genCmd(argv) {
|
|
69
|
+
const args = parseArgs(argv, SPEC);
|
|
70
|
+
if (args.help) { out(HELP); return; }
|
|
71
|
+
|
|
72
|
+
let prompt = args.positional.join(" ");
|
|
73
|
+
if (args.stdin) {
|
|
74
|
+
const piped = await readStdin();
|
|
75
|
+
if (piped) prompt = prompt ? `${prompt} ${piped}` : piped;
|
|
76
|
+
}
|
|
77
|
+
if (!prompt) die(2, "prompt is required (positional or via --stdin)");
|
|
78
|
+
|
|
79
|
+
const refs = args.ref || [];
|
|
80
|
+
if (refs.length > 5) die(2, "max 5 --ref attachments");
|
|
81
|
+
if (!VALID_MODES.has(args.mode)) die(2, "--mode must be one of: auto, direct");
|
|
82
|
+
if (!VALID_MODERATION.has(args.moderation)) die(2, "--moderation must be one of: auto, low");
|
|
83
|
+
if (args.model && !KNOWN_IMAGE_MODELS.has(args.model)) {
|
|
84
|
+
die(2, "--model must be one of: gpt-5.5, gpt-5.4, gpt-5.4-mini, gpt-5.3-codex-spark");
|
|
85
|
+
}
|
|
86
|
+
const VALID_REASONING = new Set(["none", "low", "medium", "high", "xhigh"]);
|
|
87
|
+
if (args["reasoning-effort"] && !VALID_REASONING.has(args["reasoning-effort"])) {
|
|
88
|
+
die(2, "--reasoning-effort must be one of: none, low, medium, high, xhigh");
|
|
89
|
+
}
|
|
90
|
+
if (args["web-search"] && args["no-web-search"]) {
|
|
91
|
+
die(2, "--web-search and --no-web-search are mutually exclusive");
|
|
92
|
+
}
|
|
93
|
+
|
|
94
|
+
const n = Math.max(1, Math.min(8, parseInt(args.count) || 1));
|
|
95
|
+
const timeoutMs = (parseInt(args.timeout) || 180) * 1000;
|
|
96
|
+
|
|
97
|
+
let server;
|
|
98
|
+
try {
|
|
99
|
+
server = await resolveServer({ serverFlag: args.server });
|
|
100
|
+
} catch (e) {
|
|
101
|
+
if (args.json) json({ ok: false, error: e.message, code: e.code, status: e.status });
|
|
102
|
+
dieWithError(e);
|
|
103
|
+
}
|
|
104
|
+
|
|
105
|
+
const references = await Promise.all(refs.map((p) => fileToDataUri(p)));
|
|
106
|
+
|
|
107
|
+
const body: any = {
|
|
108
|
+
prompt,
|
|
109
|
+
quality: args.quality,
|
|
110
|
+
size: args.size,
|
|
111
|
+
n,
|
|
112
|
+
references,
|
|
113
|
+
model: args.model,
|
|
114
|
+
mode: args.mode,
|
|
115
|
+
moderation: args.moderation,
|
|
116
|
+
sessionId: args.session,
|
|
117
|
+
};
|
|
118
|
+
if (args["reasoning-effort"]) body.reasoningEffort = args["reasoning-effort"];
|
|
119
|
+
if (args["no-web-search"]) body.webSearchEnabled = false;
|
|
120
|
+
else if (args["web-search"]) body.webSearchEnabled = true;
|
|
121
|
+
|
|
122
|
+
let resp;
|
|
123
|
+
try {
|
|
124
|
+
resp = await request(server.base, "/api/generate", { method: "POST", body, timeoutMs });
|
|
125
|
+
} catch (e) {
|
|
126
|
+
if (args.json) json({ ok: false, error: e.message, code: e.code, status: e.status });
|
|
127
|
+
dieWithError(e);
|
|
128
|
+
}
|
|
129
|
+
|
|
130
|
+
const norm = normalizeGenerate(resp);
|
|
131
|
+
if (norm.images.length === 0) die(1, "server returned no images");
|
|
132
|
+
|
|
133
|
+
// --no-save path
|
|
134
|
+
if (args["no-save"]) {
|
|
135
|
+
const totalBytes = norm.images.reduce((s, im) => s + im.image.length, 0);
|
|
136
|
+
if (process.stdout.isTTY && totalBytes > 2 * 1024 * 1024 && !args.force) {
|
|
137
|
+
die(2, "refusing to print >2MB of b64 to TTY; use --force or drop --no-save");
|
|
138
|
+
}
|
|
139
|
+
for (const im of norm.images) out(im.image);
|
|
140
|
+
return;
|
|
141
|
+
}
|
|
142
|
+
|
|
143
|
+
// Save path
|
|
144
|
+
const outDir = args["out-dir"] || null;
|
|
145
|
+
const explicitOut = args.out || null;
|
|
146
|
+
if (explicitOut && norm.images.length > 1) {
|
|
147
|
+
die(2, "--out only supports a single image; use --out-dir for n>1");
|
|
148
|
+
}
|
|
149
|
+
|
|
150
|
+
const savedPaths = [];
|
|
151
|
+
for (let i = 0; i < norm.images.length; i++) {
|
|
152
|
+
const im = norm.images[i];
|
|
153
|
+
let target;
|
|
154
|
+
if (explicitOut) {
|
|
155
|
+
target = explicitOut;
|
|
156
|
+
} else if (outDir) {
|
|
157
|
+
target = `${outDir}/${defaultOutName(i, norm.images.length)}`;
|
|
158
|
+
} else {
|
|
159
|
+
target = `${config.storage.generatedDir}/${defaultOutName(i, norm.images.length)}`;
|
|
160
|
+
}
|
|
161
|
+
await dataUriToFile(im.image, target);
|
|
162
|
+
savedPaths.push(target);
|
|
163
|
+
}
|
|
164
|
+
|
|
165
|
+
if (args.json) {
|
|
166
|
+
json({
|
|
167
|
+
ok: true,
|
|
168
|
+
requestId: norm.requestId,
|
|
169
|
+
elapsed: norm.elapsed,
|
|
170
|
+
images: savedPaths.map((p, i) => ({ path: p, filename: norm.images[i].filename })),
|
|
171
|
+
});
|
|
172
|
+
} else {
|
|
173
|
+
for (const p of savedPaths) out(color.green("✓ ") + p);
|
|
174
|
+
if (norm.elapsed) out(color.dim(`elapsed ${norm.elapsed}s`));
|
|
175
|
+
}
|
|
176
|
+
}
|
|
@@ -0,0 +1,164 @@
|
|
|
1
|
+
import { readFile } from "fs/promises";
|
|
2
|
+
import { extname, basename } from "path";
|
|
3
|
+
import { parseArgs } from "../lib/args.js";
|
|
4
|
+
import { resolveServer, request } from "../lib/client.js";
|
|
5
|
+
import { out, die, color, json, exitCodeForError } from "../lib/output.js";
|
|
6
|
+
import { getCliBrowserId } from "../lib/browser-id.js";
|
|
7
|
+
const HELP = `
|
|
8
|
+
ima2 history <subcommand> [options]
|
|
9
|
+
|
|
10
|
+
Subcommands:
|
|
11
|
+
rm <filename> [--permanent] [--yes] Soft-delete (default) or hard-delete
|
|
12
|
+
restore <filename> --trash-id <id> Restore from trash
|
|
13
|
+
favorite <filename> Toggle favorite status
|
|
14
|
+
import <localfile> Import a local image into history
|
|
15
|
+
|
|
16
|
+
Common options:
|
|
17
|
+
--server <url> Override server URL
|
|
18
|
+
--json JSON output
|
|
19
|
+
--yes Skip destructive confirmation
|
|
20
|
+
`;
|
|
21
|
+
const COMMON_FLAGS = {
|
|
22
|
+
json: { type: "boolean" },
|
|
23
|
+
server: { type: "string" },
|
|
24
|
+
yes: { type: "boolean" },
|
|
25
|
+
permanent: { type: "boolean" },
|
|
26
|
+
"trash-id": { type: "string" },
|
|
27
|
+
help: { short: "h", type: "boolean" },
|
|
28
|
+
};
|
|
29
|
+
async function getServer(args) {
|
|
30
|
+
try {
|
|
31
|
+
return await resolveServer({ serverFlag: args.server });
|
|
32
|
+
}
|
|
33
|
+
catch (e) {
|
|
34
|
+
die(exitCodeForError(e), e.message);
|
|
35
|
+
throw e;
|
|
36
|
+
}
|
|
37
|
+
}
|
|
38
|
+
function handle(e) {
|
|
39
|
+
die(exitCodeForError(e), `${e.message}${e.code ? ` (${e.code})` : ""}`);
|
|
40
|
+
}
|
|
41
|
+
async function readLine() {
|
|
42
|
+
return new Promise((resolve) => {
|
|
43
|
+
let buf = "";
|
|
44
|
+
process.stdin.setEncoding("utf-8");
|
|
45
|
+
const onData = (chunk) => {
|
|
46
|
+
buf += chunk;
|
|
47
|
+
const nl = buf.indexOf("\n");
|
|
48
|
+
if (nl !== -1) {
|
|
49
|
+
process.stdin.removeListener("data", onData);
|
|
50
|
+
process.stdin.pause();
|
|
51
|
+
resolve(buf.slice(0, nl));
|
|
52
|
+
}
|
|
53
|
+
};
|
|
54
|
+
process.stdin.resume();
|
|
55
|
+
process.stdin.on("data", onData);
|
|
56
|
+
});
|
|
57
|
+
}
|
|
58
|
+
async function rmSub(argv) {
|
|
59
|
+
const args = parseArgs(argv, { flags: COMMON_FLAGS });
|
|
60
|
+
const filename = args.positional[0];
|
|
61
|
+
if (!filename)
|
|
62
|
+
die(2, "filename required");
|
|
63
|
+
if (!args.yes && !process.stdin.isTTY)
|
|
64
|
+
die(2, "destructive: pass --yes for non-TTY");
|
|
65
|
+
if (!args.yes) {
|
|
66
|
+
process.stdout.write(`${args.permanent ? "PERMANENTLY delete" : "Soft-delete"} ${filename}? [y/N] `);
|
|
67
|
+
const ans = await readLine();
|
|
68
|
+
if (!/^y(es)?$/i.test(ans.trim())) {
|
|
69
|
+
out("(canceled)");
|
|
70
|
+
return;
|
|
71
|
+
}
|
|
72
|
+
}
|
|
73
|
+
const server = await getServer(args);
|
|
74
|
+
const path = args.permanent
|
|
75
|
+
? `/api/history/${encodeURIComponent(filename)}/permanent`
|
|
76
|
+
: `/api/history/${encodeURIComponent(filename)}`;
|
|
77
|
+
const resp = await request(server.base, path, { method: "DELETE" }).catch(handle);
|
|
78
|
+
if (args.json) {
|
|
79
|
+
json(resp);
|
|
80
|
+
return;
|
|
81
|
+
}
|
|
82
|
+
out(color.green(args.permanent ? "✓ permanently deleted" : "✓ moved to trash"));
|
|
83
|
+
if (resp?.trashId)
|
|
84
|
+
out(color.dim(` trashId: ${resp.trashId}`));
|
|
85
|
+
}
|
|
86
|
+
async function restoreSub(argv) {
|
|
87
|
+
const args = parseArgs(argv, { flags: COMMON_FLAGS });
|
|
88
|
+
const filename = args.positional[0];
|
|
89
|
+
if (!filename)
|
|
90
|
+
die(2, "filename required");
|
|
91
|
+
const trashId = args["trash-id"];
|
|
92
|
+
if (!trashId)
|
|
93
|
+
die(2, "--trash-id required (returned by `history rm <filename>`)");
|
|
94
|
+
const server = await getServer(args);
|
|
95
|
+
const resp = await request(server.base, `/api/history/${encodeURIComponent(filename)}/restore`, {
|
|
96
|
+
method: "POST",
|
|
97
|
+
body: { trashId },
|
|
98
|
+
}).catch(handle);
|
|
99
|
+
if (args.json) {
|
|
100
|
+
json(resp);
|
|
101
|
+
return;
|
|
102
|
+
}
|
|
103
|
+
out(color.green("✓ restored"));
|
|
104
|
+
}
|
|
105
|
+
async function favoriteSub(argv) {
|
|
106
|
+
const args = parseArgs(argv, { flags: COMMON_FLAGS });
|
|
107
|
+
const filename = args.positional[0];
|
|
108
|
+
if (!filename)
|
|
109
|
+
die(2, "filename required");
|
|
110
|
+
const server = await getServer(args);
|
|
111
|
+
const browserId = getCliBrowserId();
|
|
112
|
+
const resp = await request(server.base, "/api/history/favorite", {
|
|
113
|
+
method: "POST",
|
|
114
|
+
body: { filename },
|
|
115
|
+
headers: { "X-Ima2-Browser-Id": browserId },
|
|
116
|
+
}).catch(handle);
|
|
117
|
+
if (args.json) {
|
|
118
|
+
json(resp);
|
|
119
|
+
return;
|
|
120
|
+
}
|
|
121
|
+
out(color.green(resp.isFavorite ? "✓ favorited" : "✓ unfavorited"));
|
|
122
|
+
}
|
|
123
|
+
async function importSub(argv) {
|
|
124
|
+
const args = parseArgs(argv, { flags: COMMON_FLAGS });
|
|
125
|
+
const filepath = args.positional[0];
|
|
126
|
+
if (!filepath)
|
|
127
|
+
die(2, "filename required");
|
|
128
|
+
const buf = await readFile(filepath);
|
|
129
|
+
const ext = extname(filepath).toLowerCase();
|
|
130
|
+
const mime = ext === ".jpg" || ext === ".jpeg" ? "image/jpeg" :
|
|
131
|
+
ext === ".webp" ? "image/webp" : "image/png";
|
|
132
|
+
const server = await getServer(args);
|
|
133
|
+
const resp = await request(server.base, "/api/history/import-local", {
|
|
134
|
+
method: "POST",
|
|
135
|
+
body: buf,
|
|
136
|
+
raw: true,
|
|
137
|
+
headers: {
|
|
138
|
+
"Content-Type": mime,
|
|
139
|
+
"X-Ima2-Original-Filename": basename(filepath),
|
|
140
|
+
},
|
|
141
|
+
}).catch(handle);
|
|
142
|
+
if (args.json) {
|
|
143
|
+
json(resp);
|
|
144
|
+
return;
|
|
145
|
+
}
|
|
146
|
+
out(color.green("✓ imported as ") + (resp?.item?.filename || "(unknown)"));
|
|
147
|
+
}
|
|
148
|
+
const SUB = {
|
|
149
|
+
rm: rmSub,
|
|
150
|
+
restore: restoreSub,
|
|
151
|
+
favorite: favoriteSub,
|
|
152
|
+
import: importSub,
|
|
153
|
+
};
|
|
154
|
+
export default async function historyCmd(argv) {
|
|
155
|
+
const sub = argv[0];
|
|
156
|
+
if (!sub || sub === "--help" || sub === "-h") {
|
|
157
|
+
out(HELP);
|
|
158
|
+
return;
|
|
159
|
+
}
|
|
160
|
+
const handler = SUB[sub];
|
|
161
|
+
if (!handler)
|
|
162
|
+
die(2, `unknown subcommand: ${sub}\n${HELP}`);
|
|
163
|
+
return handler(argv.slice(1));
|
|
164
|
+
}
|
|
@@ -0,0 +1,145 @@
|
|
|
1
|
+
import { readFile } from "fs/promises";
|
|
2
|
+
import { extname, basename } from "path";
|
|
3
|
+
import { parseArgs } from "../lib/args.js";
|
|
4
|
+
import { resolveServer, request } from "../lib/client.js";
|
|
5
|
+
import { out, die, color, json, exitCodeForError } from "../lib/output.js";
|
|
6
|
+
import { getCliBrowserId } from "../lib/browser-id.js";
|
|
7
|
+
|
|
8
|
+
const HELP = `
|
|
9
|
+
ima2 history <subcommand> [options]
|
|
10
|
+
|
|
11
|
+
Subcommands:
|
|
12
|
+
rm <filename> [--permanent] [--yes] Soft-delete (default) or hard-delete
|
|
13
|
+
restore <filename> --trash-id <id> Restore from trash
|
|
14
|
+
favorite <filename> Toggle favorite status
|
|
15
|
+
import <localfile> Import a local image into history
|
|
16
|
+
|
|
17
|
+
Common options:
|
|
18
|
+
--server <url> Override server URL
|
|
19
|
+
--json JSON output
|
|
20
|
+
--yes Skip destructive confirmation
|
|
21
|
+
`;
|
|
22
|
+
|
|
23
|
+
const COMMON_FLAGS = {
|
|
24
|
+
json: { type: "boolean" },
|
|
25
|
+
server: { type: "string" },
|
|
26
|
+
yes: { type: "boolean" },
|
|
27
|
+
permanent: { type: "boolean" },
|
|
28
|
+
"trash-id": { type: "string" },
|
|
29
|
+
help: { short: "h", type: "boolean" },
|
|
30
|
+
};
|
|
31
|
+
|
|
32
|
+
async function getServer(args) {
|
|
33
|
+
try { return await resolveServer({ serverFlag: args.server }); }
|
|
34
|
+
catch (e: any) { die(exitCodeForError(e), e.message); throw e; }
|
|
35
|
+
}
|
|
36
|
+
|
|
37
|
+
function handle(e) {
|
|
38
|
+
die(exitCodeForError(e), `${e.message}${e.code ? ` (${e.code})` : ""}`);
|
|
39
|
+
}
|
|
40
|
+
|
|
41
|
+
async function readLine(): Promise<string> {
|
|
42
|
+
return new Promise((resolve) => {
|
|
43
|
+
let buf = "";
|
|
44
|
+
process.stdin.setEncoding("utf-8");
|
|
45
|
+
const onData = (chunk) => {
|
|
46
|
+
buf += chunk;
|
|
47
|
+
const nl = buf.indexOf("\n");
|
|
48
|
+
if (nl !== -1) {
|
|
49
|
+
process.stdin.removeListener("data", onData);
|
|
50
|
+
process.stdin.pause();
|
|
51
|
+
resolve(buf.slice(0, nl));
|
|
52
|
+
}
|
|
53
|
+
};
|
|
54
|
+
process.stdin.resume();
|
|
55
|
+
process.stdin.on("data", onData);
|
|
56
|
+
});
|
|
57
|
+
}
|
|
58
|
+
|
|
59
|
+
async function rmSub(argv) {
|
|
60
|
+
const args = parseArgs(argv, { flags: COMMON_FLAGS });
|
|
61
|
+
const filename = args.positional[0];
|
|
62
|
+
if (!filename) die(2, "filename required");
|
|
63
|
+
if (!args.yes && !process.stdin.isTTY) die(2, "destructive: pass --yes for non-TTY");
|
|
64
|
+
if (!args.yes) {
|
|
65
|
+
process.stdout.write(`${args.permanent ? "PERMANENTLY delete" : "Soft-delete"} ${filename}? [y/N] `);
|
|
66
|
+
const ans = await readLine();
|
|
67
|
+
if (!/^y(es)?$/i.test(ans.trim())) { out("(canceled)"); return; }
|
|
68
|
+
}
|
|
69
|
+
const server = await getServer(args);
|
|
70
|
+
const path = args.permanent
|
|
71
|
+
? `/api/history/${encodeURIComponent(filename)}/permanent`
|
|
72
|
+
: `/api/history/${encodeURIComponent(filename)}`;
|
|
73
|
+
const resp = await request(server.base, path, { method: "DELETE" }).catch(handle);
|
|
74
|
+
if (args.json) { json(resp); return; }
|
|
75
|
+
out(color.green(args.permanent ? "✓ permanently deleted" : "✓ moved to trash"));
|
|
76
|
+
if (resp?.trashId) out(color.dim(` trashId: ${resp.trashId}`));
|
|
77
|
+
}
|
|
78
|
+
|
|
79
|
+
async function restoreSub(argv) {
|
|
80
|
+
const args = parseArgs(argv, { flags: COMMON_FLAGS });
|
|
81
|
+
const filename = args.positional[0];
|
|
82
|
+
if (!filename) die(2, "filename required");
|
|
83
|
+
const trashId = args["trash-id"];
|
|
84
|
+
if (!trashId) die(2, "--trash-id required (returned by `history rm <filename>`)");
|
|
85
|
+
const server = await getServer(args);
|
|
86
|
+
const resp = await request(server.base, `/api/history/${encodeURIComponent(filename)}/restore`, {
|
|
87
|
+
method: "POST",
|
|
88
|
+
body: { trashId },
|
|
89
|
+
}).catch(handle);
|
|
90
|
+
if (args.json) { json(resp); return; }
|
|
91
|
+
out(color.green("✓ restored"));
|
|
92
|
+
}
|
|
93
|
+
|
|
94
|
+
async function favoriteSub(argv) {
|
|
95
|
+
const args = parseArgs(argv, { flags: COMMON_FLAGS });
|
|
96
|
+
const filename = args.positional[0];
|
|
97
|
+
if (!filename) die(2, "filename required");
|
|
98
|
+
const server = await getServer(args);
|
|
99
|
+
const browserId = getCliBrowserId();
|
|
100
|
+
const resp: any = await request(server.base, "/api/history/favorite", {
|
|
101
|
+
method: "POST",
|
|
102
|
+
body: { filename },
|
|
103
|
+
headers: { "X-Ima2-Browser-Id": browserId },
|
|
104
|
+
}).catch(handle);
|
|
105
|
+
if (args.json) { json(resp); return; }
|
|
106
|
+
out(color.green(resp.isFavorite ? "✓ favorited" : "✓ unfavorited"));
|
|
107
|
+
}
|
|
108
|
+
|
|
109
|
+
async function importSub(argv) {
|
|
110
|
+
const args = parseArgs(argv, { flags: COMMON_FLAGS });
|
|
111
|
+
const filepath = args.positional[0];
|
|
112
|
+
if (!filepath) die(2, "filename required");
|
|
113
|
+
const buf = await readFile(filepath);
|
|
114
|
+
const ext = extname(filepath).toLowerCase();
|
|
115
|
+
const mime =
|
|
116
|
+
ext === ".jpg" || ext === ".jpeg" ? "image/jpeg" :
|
|
117
|
+
ext === ".webp" ? "image/webp" : "image/png";
|
|
118
|
+
const server = await getServer(args);
|
|
119
|
+
const resp: any = await request(server.base, "/api/history/import-local", {
|
|
120
|
+
method: "POST",
|
|
121
|
+
body: buf,
|
|
122
|
+
raw: true,
|
|
123
|
+
headers: {
|
|
124
|
+
"Content-Type": mime,
|
|
125
|
+
"X-Ima2-Original-Filename": basename(filepath),
|
|
126
|
+
},
|
|
127
|
+
}).catch(handle);
|
|
128
|
+
if (args.json) { json(resp); return; }
|
|
129
|
+
out(color.green("✓ imported as ") + (resp?.item?.filename || "(unknown)"));
|
|
130
|
+
}
|
|
131
|
+
|
|
132
|
+
const SUB: Record<string, (argv: any[]) => Promise<void>> = {
|
|
133
|
+
rm: rmSub,
|
|
134
|
+
restore: restoreSub,
|
|
135
|
+
favorite: favoriteSub,
|
|
136
|
+
import: importSub,
|
|
137
|
+
};
|
|
138
|
+
|
|
139
|
+
export default async function historyCmd(argv) {
|
|
140
|
+
const sub = argv[0];
|
|
141
|
+
if (!sub || sub === "--help" || sub === "-h") { out(HELP); return; }
|
|
142
|
+
const handler = SUB[sub];
|
|
143
|
+
if (!handler) die(2, `unknown subcommand: ${sub}\n${HELP}`);
|
|
144
|
+
return handler(argv.slice(1));
|
|
145
|
+
}
|
package/bin/commands/ls.js
CHANGED
|
@@ -1,49 +1,67 @@
|
|
|
1
1
|
import { parseArgs } from "../lib/args.js";
|
|
2
2
|
import { resolveServer, request } from "../lib/client.js";
|
|
3
3
|
import { out, die, color, json, table, exitCodeForError } from "../lib/output.js";
|
|
4
|
-
|
|
5
4
|
const SPEC = {
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
5
|
+
flags: {
|
|
6
|
+
count: { short: "n", type: "string", default: "20" },
|
|
7
|
+
json: { type: "boolean" },
|
|
8
|
+
session: { type: "string" },
|
|
9
|
+
favorites: { type: "boolean" },
|
|
10
|
+
server: { type: "string" },
|
|
11
|
+
help: { short: "h", type: "boolean" },
|
|
12
|
+
},
|
|
12
13
|
};
|
|
13
|
-
|
|
14
14
|
export default async function lsCmd(argv) {
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
}
|
|
48
|
-
|
|
15
|
+
const args = parseArgs(argv, SPEC);
|
|
16
|
+
if (args.help) {
|
|
17
|
+
out("ima2 ls [-n count] [--session <id>] [--favorites] [--json]");
|
|
18
|
+
return;
|
|
19
|
+
}
|
|
20
|
+
let server;
|
|
21
|
+
try {
|
|
22
|
+
server = await resolveServer({ serverFlag: args.server });
|
|
23
|
+
}
|
|
24
|
+
catch (e) {
|
|
25
|
+
die(exitCodeForError(e), e.message);
|
|
26
|
+
}
|
|
27
|
+
const limit = parseInt(args.count) || 20;
|
|
28
|
+
const qs = new URLSearchParams();
|
|
29
|
+
if (args.session)
|
|
30
|
+
qs.set("sessionId", args.session);
|
|
31
|
+
qs.set("limit", String(Math.max(limit, args.favorites ? 200 : limit)));
|
|
32
|
+
const path = `/api/history?${qs.toString()}`;
|
|
33
|
+
let resp;
|
|
34
|
+
try {
|
|
35
|
+
resp = await request(server.base, path);
|
|
36
|
+
}
|
|
37
|
+
catch (e) {
|
|
38
|
+
die(exitCodeForError(e), e.message);
|
|
39
|
+
}
|
|
40
|
+
let items = (resp.items || resp.history || []);
|
|
41
|
+
if (args.favorites)
|
|
42
|
+
items = items.filter((it) => it.isFavorite === true);
|
|
43
|
+
items = items.slice(0, limit);
|
|
44
|
+
if (args.json) {
|
|
45
|
+
json({ items });
|
|
46
|
+
return;
|
|
47
|
+
}
|
|
48
|
+
if (items.length === 0) {
|
|
49
|
+
out(color.dim("(no history)"));
|
|
50
|
+
return;
|
|
51
|
+
}
|
|
52
|
+
table(items, [
|
|
53
|
+
{ key: "filename", label: "FILENAME" },
|
|
54
|
+
{ key: "quality", label: "Q" },
|
|
55
|
+
{ key: "size", label: "SIZE" },
|
|
56
|
+
{ key: "createdAt", label: "WHEN", format: (v) => {
|
|
57
|
+
if (!v)
|
|
58
|
+
return "";
|
|
59
|
+
const d = new Date(v);
|
|
60
|
+
return d.toISOString().replace("T", " ").slice(0, 19);
|
|
61
|
+
} },
|
|
62
|
+
{ key: "prompt", label: "PROMPT", format: (v) => {
|
|
63
|
+
const s = String(v || "").replace(/\s+/g, " ");
|
|
64
|
+
return s.length > 48 ? s.slice(0, 45) + "…" : s;
|
|
65
|
+
} },
|
|
66
|
+
]);
|
|
49
67
|
}
|
|
@@ -0,0 +1,60 @@
|
|
|
1
|
+
import { parseArgs } from "../lib/args.js";
|
|
2
|
+
import { resolveServer, request } from "../lib/client.js";
|
|
3
|
+
import { out, die, color, json, table, exitCodeForError } from "../lib/output.js";
|
|
4
|
+
|
|
5
|
+
const SPEC = {
|
|
6
|
+
flags: {
|
|
7
|
+
count: { short: "n", type: "string", default: "20" },
|
|
8
|
+
json: { type: "boolean" },
|
|
9
|
+
session: { type: "string" },
|
|
10
|
+
favorites: { type: "boolean" },
|
|
11
|
+
server: { type: "string" },
|
|
12
|
+
help: { short: "h", type: "boolean" },
|
|
13
|
+
},
|
|
14
|
+
};
|
|
15
|
+
|
|
16
|
+
export default async function lsCmd(argv) {
|
|
17
|
+
const args = parseArgs(argv, SPEC);
|
|
18
|
+
if (args.help) {
|
|
19
|
+
out("ima2 ls [-n count] [--session <id>] [--favorites] [--json]");
|
|
20
|
+
return;
|
|
21
|
+
}
|
|
22
|
+
|
|
23
|
+
let server;
|
|
24
|
+
try { server = await resolveServer({ serverFlag: args.server }); }
|
|
25
|
+
catch (e) { die(exitCodeForError(e), e.message); }
|
|
26
|
+
|
|
27
|
+
const limit = parseInt(args.count) || 20;
|
|
28
|
+
const qs = new URLSearchParams();
|
|
29
|
+
if (args.session) qs.set("sessionId", args.session);
|
|
30
|
+
qs.set("limit", String(Math.max(limit, args.favorites ? 200 : limit)));
|
|
31
|
+
const path = `/api/history?${qs.toString()}`;
|
|
32
|
+
let resp;
|
|
33
|
+
try { resp = await request(server.base, path); }
|
|
34
|
+
catch (e) { die(exitCodeForError(e), e.message); }
|
|
35
|
+
|
|
36
|
+
let items = (resp.items || resp.history || []);
|
|
37
|
+
if (args.favorites) items = items.filter((it) => it.isFavorite === true);
|
|
38
|
+
items = items.slice(0, limit);
|
|
39
|
+
|
|
40
|
+
if (args.json) { json({ items }); return; }
|
|
41
|
+
|
|
42
|
+
if (items.length === 0) {
|
|
43
|
+
out(color.dim("(no history)"));
|
|
44
|
+
return;
|
|
45
|
+
}
|
|
46
|
+
table(items, [
|
|
47
|
+
{ key: "filename", label: "FILENAME" },
|
|
48
|
+
{ key: "quality", label: "Q" },
|
|
49
|
+
{ key: "size", label: "SIZE" },
|
|
50
|
+
{ key: "createdAt", label: "WHEN", format: (v) => {
|
|
51
|
+
if (!v) return "";
|
|
52
|
+
const d = new Date(v);
|
|
53
|
+
return d.toISOString().replace("T", " ").slice(0, 19);
|
|
54
|
+
} },
|
|
55
|
+
{ key: "prompt", label: "PROMPT", format: (v) => {
|
|
56
|
+
const s = String(v || "").replace(/\s+/g, " ");
|
|
57
|
+
return s.length > 48 ? s.slice(0, 45) + "…" : s;
|
|
58
|
+
} },
|
|
59
|
+
]);
|
|
60
|
+
}
|