editmamei 1.6.0 → 1.7.0

package/dist/backends/gimp/session.js

@@ -122,6 +122,9 @@ export class GimpSession {
     get lastStartOrigin() {
         return this.startOrigin;
     }
+    get generation() {
+        return this.deadGeneration;
+    }
     latestPreviewPath() {
         return join(this.rootDir, 'latest-preview.jpg');
     }

package/dist/core/preview-privacy.js

@@ -0,0 +1,54 @@
+function isImageBlock(value) {
+    if (typeof value !== 'object' || value === null)
+        return false;
+    const block = value;
+    if (block.type === 'image') {
+        return typeof block.data === 'string' && typeof block.mimeType === 'string';
+    }
+    return (block.type === 'resource' &&
+        typeof block.resource?.blob === 'string' &&
+        typeof block.resource.mimeType === 'string' &&
+        block.resource.mimeType.startsWith('image/'));
+}
+function strip(value, counter) {
+    if (Array.isArray(value)) {
+        const out = [];
+        for (const item of value) {
+            if (isImageBlock(item))
+                counter.n++;
+            else
+                out.push(strip(item, counter));
+        }
+        return out;
+    }
+    if (typeof value === 'object' && value !== null) {
+        const out = {};
+        for (const [k, v] of Object.entries(value))
+            out[k] = strip(v, counter);
+        return out;
+    }
+    return value;
+}
+export function hasImageContent(result) {
+    const counter = { n: 0 };
+    strip(result, counter);
+    return counter.n > 0;
+}
+export function withholdImages(result) {
+    const counter = { n: 0 };
+    const stripped = strip(result, counter);
+    if (counter.n === 0)
+        return result;
+    const what = counter.n === 1 ? 'An image was' : `${counter.n} images were`;
+    return {
+        ...stripped,
+        content: [
+            ...(stripped.content ?? []),
+            {
+                type: 'text',
+                text: `${what} withheld because the user's privacy.send_previews_to_llm setting is off. ` +
+                    'Work from the text and numbers; ask the user if you need to see the image.',
+            },
+        ],
+    };
+}

package/dist/core/server.js

@@ -6,6 +6,7 @@ import { ToolRegistry } from './tool-registry.js';
 import { tierOf } from './tool-tiers.js';
 import { groupOf, GROUPS } from './tool-groups.js';
 import { CAMERA_RAW_TOOL, RAW_DEVELOP_TOOL } from './tool-activity.js';
+import { hasImageContent, withholdImages } from './preview-privacy.js';
 import { EDITION } from '../edition.js';
 import { VERSION } from '../version.js';
 import { Session } from './session.js';
@@ -90,6 +91,7 @@ export class EditmameiServer {
     updateInfo = null;
     updateCheck = null;
     updateNoticeShown = false;
+    previewsAllowed = () => loadSettings().settings.privacy.send_previews_to_llm;
     snippetClient = new GoSnippetClient();
     refreshLicenseOnPing = createPingLicenseRefresher();
     moduleUpdateFailed = false;
@@ -436,6 +438,8 @@ export class EditmameiServer {
             const result = await this.toolRegistry.execute(name, args);
             this.session.updateActivity();
             this.trackRawDevelopState(name, result);
+            if (hasImageContent(result) && !this.previewsAllowed())
+                return withholdImages(result);
             return result;
         }
         catch (error) {

package/dist/core/tool-activity.js

@@ -104,11 +104,19 @@ export const MUTATING_TOOLS = new Set([
     'gimp_open_document',
     'gimp_close_document',
     'gimp_add_adjustment',
+    'gimp_add_effect',
     'gimp_filter',
     'gimp_crop_document',
     'gimp_resize_image',
     'gimp_transform_canvas',
     'gimp_create_mask',
+    'gimp_checkpoint',
+    'gimp_layer',
+    'gimp_bake',
+    'gimp_create_document',
+    'gimp_place_image',
+    'gimp_canvas',
+    'gimp_convert_image_mode',
 ]);
 export const RAW_DEVELOP_TOOL = 'ps_develop_raw';
 export const CAMERA_RAW_TOOL = 'ps_apply_camera_raw';

package/dist/core/tool-groups.js

@@ -186,7 +186,15 @@ export const TOOL_GROUPS = {
     gimp_transform_canvas: 'document',
     gimp_add_adjustment: 'adjust',
     gimp_filter: 'filter',
+    gimp_add_effect: 'filter',
     gimp_create_mask: 'masks',
+    gimp_checkpoint: 'document',
+    gimp_layer: 'layers',
+    gimp_bake: 'layers',
+    gimp_create_document: 'document',
+    gimp_place_image: 'layers',
+    gimp_canvas: 'document',
+    gimp_convert_image_mode: 'document',
 };
 export function groupOf(toolName) {
     const group = TOOL_GROUPS[toolName];

package/dist/core/tool-tiers.js

@@ -98,6 +98,7 @@ export const TOOL_TIERS = {
     gimp_inspect: 'community',
     gimp_add_adjustment: 'community',
     gimp_filter: 'community',
+    gimp_add_effect: 'community',
     gimp_crop_document: 'community',
     gimp_resize_image: 'community',
     gimp_transform_canvas: 'community',
@@ -105,6 +106,13 @@ export const TOOL_TIERS = {
     gimp_get_preview: 'community',
     gimp_get_histogram: 'community',
     gimp_compare: 'community',
+    gimp_checkpoint: 'community',
+    gimp_layer: 'community',
+    gimp_bake: 'community',
+    gimp_create_document: 'community',
+    gimp_place_image: 'community',
+    gimp_canvas: 'community',
+    gimp_convert_image_mode: 'community',
 };
 export function tierOf(toolName) {
     const tier = TOOL_TIERS[toolName];

package/dist/modules/gimp/index.js

@@ -5,19 +5,27 @@ import { createGimpCoreTools } from '../../tools/gimp-core-tools.js';
 import { createGimpDocumentTools } from '../../tools/gimp-document-tools.js';
 import { createGimpInspectTools } from '../../tools/gimp-inspect-tools.js';
 import { createGimpAdjustmentTools } from '../../tools/gimp-adjustment-tools.js';
+import { createGimpEffectTools } from '../../tools/gimp-effect-tools.js';
 import { createGimpFilterTools } from '../../tools/gimp-filter-tools.js';
 import { createGimpGeometryTools } from '../../tools/gimp-geometry-tools.js';
 import { createGimpMaskTools } from '../../tools/gimp-mask-tools.js';
 import { createGimpVerifyTools } from '../../tools/gimp-verify-tools.js';
+import { createGimpCheckpointTools } from '../../tools/gimp-checkpoint-tools.js';
+import { createGimpLayerTools } from '../../tools/gimp-layer-tools.js';
+import { createGimpComposeTools } from '../../tools/gimp-compose-tools.js';
 export const gimpFactories = [
     createGimpCoreTools,
     createGimpDocumentTools,
     createGimpInspectTools,
     createGimpAdjustmentTools,
+    createGimpEffectTools,
     createGimpFilterTools,
     createGimpGeometryTools,
     createGimpMaskTools,
     createGimpVerifyTools,
+    createGimpCheckpointTools,
+    createGimpLayerTools,
+    createGimpComposeTools,
 ];
 export const gimpModule = {
     manifest: { id: 'gimp', name: 'Editmamei GIMP Tools', abi: KERNEL_ABI },

package/dist/tools/gimp-adjustment-tools.js

@@ -1,6 +1,6 @@
 import { validateArgs } from '../utils/validate.js';
 import { toolGimpErrorResult } from '../utils/tool-helpers.js';
-import { GIMP_IMAGE_PROP, GIMP_LAYER_PROP, pickSchemaDeclaredKeys } from './gimp-shared.js';
+import { GIMP_IMAGE_PROP, GIMP_LAYER_ID_PROP, GIMP_LAYER_PROP, pickSchemaDeclaredKeys, } from './gimp-shared.js';
 const ADJUST_TYPES = [
     'curves',
     'levels',
@@ -34,6 +34,7 @@ const adjustSchema = {
                 ' The filter applies to that ONE layer, not to the flattened image, so on a multi-layer ' +
                 'document name the layer you mean. A layer inside a layer group can be named directly.',
         },
+        layer_id: GIMP_LAYER_ID_PROP,
         type: {
             type: 'string',
             enum: [...ADJUST_TYPES],
@@ -49,7 +50,8 @@ const adjustSchema = {
                 'creation and cannot change on a re-edit. Only filters Editmamei created can be re-edited ' +
                 '(gimp_filter op=list shows source: "editmamei"); re-editing any other filter (for example ' +
                 'one added in the GIMP GUI) is refused, because its current values cannot be read back ' +
-                'exactly — delete it and re-create it instead.',
+                'exactly — delete it and re-create it instead. A re-edit keeps the filter on its own ' +
+                'layer; `layer` and `layer_id` are ignored.',
         },
         mask: {
             type: 'string',
@@ -338,7 +340,8 @@ export function createGimpAdjustmentTools(gimp) {
                     'gimp_export, and gimp_filter op=delete removes it again. `type` picks the adjustment: ' +
                     'curves, levels, exposure, brightness_contrast, hue_saturation, color_balance, ' +
                     'color_temperature, shadows_highlights, saturation, vibrance, sharpen, noise_reduction, ' +
-                    'gaussian_blur. A filter applies to ONE layer (`layer`, else the selected or top layer), ' +
+                    "gaussian_blur. A field another type uses is refused, naming this type's own fields. A " +
+                    'filter applies to ONE layer (`layer_id` or `layer`, else the selected or top layer), ' +
                     'not to the flattened image — on a multi-layer document, say which layer. For type ' +
                     'vibrance, the knob is the `vibrance` field — `saturation` on that type is a separate ' +
                     'plain multiplier that normally stays untouched. curves: ONE filter per channel — add ' +