@goodandready/dsh-image-gen 0.12.1 → 0.12.2

package/lib/client.js

@@ -72,7 +72,7 @@ window.__ModuleLoader__.load({
         } else if (typeof AbortController !== 'undefined') {
           const ctrl = new AbortController()
           timer = setTimeout(() => {
-            try { ctrl.abort(new Error('Request timeout')) } catch (_) {}
+            try { ctrl.abort(new Error('Request timeout')) } catch (_) { /* ignore abort race */ }
           }, timeoutMs)
           sig = ctrl.signal
         }
@@ -82,7 +82,7 @@ window.__ModuleLoader__.load({
           : (() => {
               const ctrl = new AbortController()
               timer = setTimeout(() => {
-                try { ctrl.abort(new Error('Request timeout')) } catch (_) {}
+                try { ctrl.abort(new Error('Request timeout')) } catch (_) { /* ignore abort race */ }
               }, timeoutMs)
               return ctrl.signal
             })()
@@ -101,12 +101,12 @@ window.__ModuleLoader__.load({
           if (typeof signal.addEventListener === 'function') {
             signal.addEventListener('abort', onCallerAbort, { once: true })
             removeCallerAbort = () => {
-              try { signal.removeEventListener('abort', onCallerAbort) } catch (_) {}
+              try { signal.removeEventListener('abort', onCallerAbort) } catch (_) { /* ignore listener cleanup */ }
             }
           }
         }
         timer = setTimeout(() => {
-          try { ctrl.abort(new Error('Request timeout')) } catch (_) {}
+          try { ctrl.abort(new Error('Request timeout')) } catch (_) { /* ignore abort race */ }
         }, timeoutMs)
         sig = ctrl.signal
       }

package/lib/index.js

@@ -229,7 +229,7 @@ export function apply(ctx, rawConfig) {
     if (typeof settingsSvc?.describe !== 'function') return null
     try {
       const row = settingsSvc.describe().find((r) => r?.ns === NS)
-      if (!row || row.status !== 'ready' || !row.value) return null
+      if (!row || !row.value || (row.status !== undefined && row.status !== 'ready')) return null
       return Config(structuredClone(plainConfig(row.value)))
     } catch (_) {
       return null
@@ -658,6 +658,11 @@ export function apply(ctx, rawConfig) {
 
   // Reset loop guard when user sends a new message (#370)
   if (typeof ctx.on === 'function') {
+    ctx.on('user/message', (session) => {
+      const sid = session?.id || session?.sessionId || session?.conversationId
+      if (sid) resetLoopGuard(sid)
+      else resetLoopGuard()
+    })
     ctx.on('chat/message', (session) => {
       if (session?.id) resetLoopGuard(session.id)
     })

package/lib/tools/character-sheet.js

@@ -1,3 +1,4 @@
+import { resolveInside } from '../security.js'
 import { buildDualOutputMarkdown } from '../resolve-image.js'
 // character-sheet.js — generate_character_sheet tool (#181, #358).
 // Generates multi-angle character model sheets and turnarounds with visual consistency.
@@ -184,7 +185,7 @@ export function registerCharacterSheetTools(ctx, deps) {
 
             const sessionCwd = execCtx?.agent?.session?.header?.cwd
             const targetDir = cfg.outputDir || 'generated/images'
-            const outDir = path.resolve(sessionCwd || process.cwd(), targetDir)
+            const outDir = resolveInside(sessionCwd || process.cwd(), targetDir)
             await mkdir(outDir, { recursive: true })
             diskPath = path.join(outDir, filename)
             await writeFile(diskPath, Buffer.from(finalBytes))

package/lib/tools/diagram.js

@@ -1,3 +1,4 @@
+import { resolveInside } from '../security.js'
 // diagram.js — beautify_diagram tool (#185, #359).
 // Transforms raw Mermaid / Graphviz diagrams into high-end 3D isometric architectural illustrations.
 
@@ -180,7 +181,7 @@ export function registerDiagramTools(ctx, deps) {
 
             const sessionCwd = execCtx?.agent?.session?.header?.cwd
             const targetDir = cfg.outputDir || 'generated/images'
-            const outDir = path.resolve(sessionCwd || process.cwd(), targetDir)
+            const outDir = resolveInside(sessionCwd || process.cwd(), targetDir)
             await mkdir(outDir, { recursive: true })
             diskPath = path.join(outDir, filename)
             await writeFile(diskPath, Buffer.from(finalBytes))

package/lib/tools/pattern.js

@@ -6,7 +6,7 @@ import path from 'node:path'
 import { mkdir, writeFile } from 'node:fs/promises'
 import { makeProviders, toLosslessJson, saveAttachmentSafe, sizeToPixels } from '../providers.js'
 import { trackAndAssertLoopGuard } from '../loop-guard.js'
-import { sanitizeErrorAndLogs } from '../security.js'
+import { sanitizeErrorAndLogs, resolveInside } from '../security.js'
 import {
   buildSeamlessPrompt,
   buildPatternCss,
@@ -95,7 +95,7 @@ export function registerPatternTools(ctx, deps) {
             })
 
             const sessionCwd = exec?.agent?.session?.header?.cwd
-            const outDir = path.resolve(sessionCwd || process.cwd(), cfg.outputDir || 'generated/images')
+            const outDir = resolveInside(sessionCwd || process.cwd(), cfg.outputDir || 'generated/images')
             await mkdir(outDir, { recursive: true })
             const filePath = path.join(outDir, name)
             await writeFile(filePath, gen.bytes)

package/lib/tools/processing-advanced.js

@@ -160,7 +160,7 @@ export function registerProcessingAdvancedTools(ctx, deps) {
             const { attachment, localUrl } = await saveAttachmentSafe(ctx, { bytes: svgBuffer, mediaType: 'image/svg+xml', name })
 
             const sessionCwd = exec?.agent?.session?.header?.cwd
-            const outDir = path.resolve(sessionCwd || process.cwd(), cfg.outputDir || 'generated/images')
+            const outDir = resolveInside(sessionCwd || process.cwd(), cfg.outputDir || 'generated/images')
             await mkdir(outDir, { recursive: true })
             const filePath = path.join(outDir, name)
             await writeFile(filePath, svgBuffer)
@@ -330,7 +330,7 @@ export function registerProcessingAdvancedTools(ctx, deps) {
             const { attachment, localUrl } = await saveAttachmentSafe(ctx, { bytes: svgBuffer, mediaType: 'image/svg+xml', name })
 
             const sessionCwd = exec?.agent?.session?.header?.cwd
-            const outDir = path.resolve(sessionCwd || process.cwd(), cfg.outputDir || 'generated/images')
+            const outDir = resolveInside(sessionCwd || process.cwd(), cfg.outputDir || 'generated/images')
             await mkdir(outDir, { recursive: true })
             const filePath = path.join(outDir, name)
             await writeFile(filePath, svgBuffer)

package/lib/tools/processing-basic.js

@@ -17,7 +17,7 @@ import {
 import { buildDualOutputMarkdown } from '../resolve-image.js'
 import { assertBudgetAvailable, reserveSpend, recordSpend } from '../cost-meter.js'
 import { trackAndAssertLoopGuard } from '../loop-guard.js'
-import { sanitizeErrorAndLogs } from '../security.js'
+import { sanitizeErrorAndLogs, resolveInside } from '../security.js'
 
 export function registerProcessingTools(ctx, deps) {
   const {
@@ -69,7 +69,7 @@ export function registerProcessingTools(ctx, deps) {
             const name = `${stem}.png`
             const { attachment, localUrl } = await saveAttachmentSafe(ctx, { bytes: res.bytes, mediaType: 'image/png', name })
             const sessionCwd = exec?.agent?.session?.header?.cwd
-            const outDir = path.resolve(sessionCwd || process.cwd(), cfg.outputDir || 'generated/images')
+            const outDir = resolveInside(sessionCwd || process.cwd(), cfg.outputDir || 'generated/images')
             await mkdir(outDir, { recursive: true })
             const filePath = path.join(outDir, name)
             await writeFile(filePath, res.bytes)
@@ -151,7 +151,7 @@ export function registerProcessingTools(ctx, deps) {
             const name = `${stem}.png`
             const { attachment, localUrl } = await saveAttachmentSafe(ctx, { bytes: res.bytes, mediaType: 'image/png', name })
             const sessionCwd = exec?.agent?.session?.header?.cwd
-            const outDir = path.resolve(sessionCwd || process.cwd(), cfg.outputDir || 'generated/images')
+            const outDir = resolveInside(sessionCwd || process.cwd(), cfg.outputDir || 'generated/images')
             await mkdir(outDir, { recursive: true })
             const filePath = path.join(outDir, name)
             await writeFile(filePath, res.bytes)
@@ -219,7 +219,7 @@ export function registerProcessingTools(ctx, deps) {
             const stem = `${slugify(args.output_name || 'vector')}-${Date.now().toString(36)}`
             const name = `${stem}.svg`
             const sessionCwd = exec?.agent?.session?.header?.cwd
-            const outDir = path.resolve(sessionCwd || process.cwd(), cfg.outputDir || 'generated/images')
+            const outDir = resolveInside(sessionCwd || process.cwd(), cfg.outputDir || 'generated/images')
             await mkdir(outDir, { recursive: true })
             const filePath = path.join(outDir, name)
             await writeFile(filePath, res.bytes)
@@ -302,7 +302,7 @@ export function registerProcessingTools(ctx, deps) {
               const name = `${stem}.png`
               const { attachment, localUrl } = await saveAttachmentSafe(ctx, { bytes: res.bytes, mediaType: 'image/png', name })
               const sessionCwd = exec?.agent?.session?.header?.cwd
-              const outDir = path.resolve(sessionCwd || process.cwd(), cfg.outputDir || 'generated/images')
+              const outDir = resolveInside(sessionCwd || process.cwd(), cfg.outputDir || 'generated/images')
               await mkdir(outDir, { recursive: true })
               const filePath = path.join(outDir, name)
               await writeFile(filePath, res.bytes)

package/lib/tools/spritesheet.js

@@ -6,7 +6,7 @@ import path from 'node:path'
 import { mkdir, writeFile } from 'node:fs/promises'
 import { makeProviders, toLosslessJson, saveAttachmentSafe } from '../providers.js'
 import { trackAndAssertLoopGuard } from '../loop-guard.js'
-import { sanitizeErrorAndLogs } from '../security.js'
+import { sanitizeErrorAndLogs, resolveInside } from '../security.js'
 import {
   ANIMATION_PRESETS,
   clampFrames,
@@ -112,7 +112,7 @@ export function registerSpritesheetTools(ctx, deps) {
             })
 
             const sessionCwd = exec?.agent?.session?.header?.cwd
-            const outDir = path.resolve(sessionCwd || process.cwd(), cfg.outputDir || 'generated/images')
+            const outDir = resolveInside(sessionCwd || process.cwd(), cfg.outputDir || 'generated/images')
             await mkdir(outDir, { recursive: true })
             const filePath = path.join(outDir, sheetName)
             await writeFile(filePath, svgBuffer)

package/lib/tools/style-matrix.js

@@ -1,4 +1,4 @@
-import { sanitizeErrorAndLogs } from '../security.js'
+import { sanitizeErrorAndLogs, resolveInside } from '../security.js'
 // style-matrix.js — generate_style_matrix tool (#286).
 // Parallel 2×2 style matrix explorer with blind A/B compare and one-click preset selection.
 
@@ -154,7 +154,7 @@ export function registerStyleMatrixTools(ctx, deps) {
 
           const sessionCwd = exec?.agent?.session?.header?.cwd
           const targetDir = cfg.outputDir || 'generated/images'
-          const outDir = path.resolve(sessionCwd || process.cwd(), targetDir)
+          const outDir = resolveInside(sessionCwd || process.cwd(), targetDir)
           await mkdir(outDir, { recursive: true })
 
           const tasks = activeStyles.map((styleName, idx) => async () => {

package/lib/tools/theme-pair.js

@@ -1,3 +1,4 @@
+import { resolveInside } from '../security.js'
 // theme-pair.js — generate_theme_pair tool (#189, #361).
 // Generates complementary Light & Dark mode asset variants with synchronized compositions.
 
@@ -161,7 +162,7 @@ export function registerThemePairTools(ctx, deps) {
 
           const sessionCwd = exec?.agent?.session?.header?.cwd
           const targetDir = cfg.outputDir || 'generated/images'
-          const outDir = path.resolve(sessionCwd || process.cwd(), targetDir)
+          const outDir = resolveInside(sessionCwd || process.cwd(), targetDir)
           await mkdir(outDir, { recursive: true })
 
           const slug = args.output_name ? slugify(args.output_name) : slugify(prompt).slice(0, 36)

package/lib/tools/ui-asset.js

@@ -1,4 +1,4 @@
-import { sanitizeErrorAndLogs } from '../security.js'
+import { sanitizeErrorAndLogs, resolveInside } from '../security.js'
 // ui-asset.js — generate_ui_asset tool (#284).
 // Specialized generator for UI icons, stickers, illustrations, and layout-aware banners with negative space.
 
@@ -221,7 +221,7 @@ export function registerUiAssetTools(ctx, deps) {
 
           const sessionCwd = exec?.agent?.session?.header?.cwd
           const targetDir = cfg.outputDir || 'generated/images'
-          const outDir = path.resolve(sessionCwd || process.cwd(), targetDir)
+          const outDir = resolveInside(sessionCwd || process.cwd(), targetDir)
           await mkdir(outDir, { recursive: true })
           const filePath = path.join(outDir, filename)
           await writeFile(filePath, finalBytes)

package/lib/tools/vision-ocr.js

@@ -1,3 +1,4 @@
+import { resolveInside } from '../security.js'
 // vision-ocr.js — replace_image_text tool (#180, #360).
 // Grounding OCR, background inpainting, and typography re-rendering for visual localization.
 
@@ -295,7 +296,7 @@ export function registerVisionOcrTools(ctx, deps) {
           const usedProvider = gen._fallback?.providerUsed || provider
           const sessionCwd = execCtx?.agent?.session?.header?.cwd
           const targetDir = cfg.outputDir || 'generated/images'
-          const outDir = path.resolve(sessionCwd || process.cwd(), targetDir)
+          const outDir = resolveInside(sessionCwd || process.cwd(), targetDir)
           await mkdir(outDir, { recursive: true })
           const timestamp = Date.now()
           const safeSlug = slugify(String(args.image || '').slice(0, 20)) || 'localized-image'

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@goodandready/dsh-image-gen",
-  "version": "0.12.1",
+  "version": "0.12.2",
   "description": "Image generation for DeepSeek Harness: a generate_image tool with pluggable providers — the FAL queue, any OpenAI-compatible images API, or a ChatGPT/Grok subscription with no API key at all. The picture is shown inline in the conversation; the model receives either a link (works with any chat model) or the image itself (needs dsh-vision-bridge or a vision-capable model).",
   "keywords": [
     "deepseek-harness",